Merge branch 'main' of http://10.10.14.176:3000/huanghai/YangPuBaoMing

src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java

@@ -1,5 +1,7 @@
 package com.dsideal.FengHuang.Yp.Controller;
 
+import cn.hutool.captcha.CaptchaUtil;
+import cn.hutool.captcha.LineCaptcha;
 import com.alibaba.fastjson.JSONObject;
 import com.dsideal.FengHuang.Interceptor.EmptyInterface;
 import com.dsideal.FengHuang.Interceptor.IsNumericInterface;
@@ -19,7 +21,10 @@ import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.upload.UploadFile;
 
+import javax.servlet.ServletOutputStream;
+import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.IOException;
 import java.util.List;
 import java.util.UUID;
 
@@ -95,6 +100,7 @@ public class YpController extends Controller {
 
     /**
      * 功能：获取任务信息
+     *
      * @param task_id
      */
     @Before(GET.class)
@@ -309,4 +315,23 @@ public class YpController extends Controller {
         List<Record> list = model.getBx(task_id);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
+
+    /**
+     * 功能：获取验证码
+     调用方法：
+     <img title="点击刷新" class="captcha" src="/login/captcha" onclick="updateCaptcha();">
+     <script>
+     function updateCaptcha() {
+        $(".captcha").attr("src", "/FengHuang/yp/getYzm?v=" + Math.random());
+        $("#captchaInput").val("");
+     }
+     </script>
+
+     后台验证验证码是否正确
+     boolean result = validateCaptcha("inputRandomCode");//inputRandomCode是用户提交过来的验证码
+     */
+    @Before(GET.class)
+    public void getYzm() {
+        renderCaptcha();
+    }
 }

src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java

@@ -40,6 +40,7 @@ public class YpModel {
 
     /**
      * 功能：获取任务信息
+     *
      * @param task_id
      */
     public Record getTask(int task_id) {
@@ -275,17 +276,18 @@ public class YpModel {
         String sql = "select * from t_yp_task_bx_limit where task_id=?";
         List<Record> list = Db.find(sql, task_id);
         Set<Integer> set = new HashSet<>();
-        Map<Integer,Integer> _map=new HashMap<>();
+        Map<Integer, Integer> _map = new HashMap<>();
         for (Record record : list) {
             set.add(record.getInt("bx_id"));
-            _map.put(record.getInt("bx_id"),record.getInt("limit"));
+            _map.put(record.getInt("bx_id"), record.getInt("limit"));
         }
         for (Record record : all) {
             if (set.contains(record.getInt("bx_id"))) {
                 record.set("selected", true);
-                record.set("limit",_map.get(record.getInt("bx_id")));
+                record.set("limit", _map.get(record.getInt("bx_id")));
             } else {
                 record.set("selected", false);
+                record.set("limit", 0);
             }
         }
         return all;