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

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

@@ -1,34 +1,26 @@
 package com.dsideal.FengHuang.Yp.Controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.dsideal.FengHuang.ExcelImportTemplate.StudentImportExcelUtil;
-import com.dsideal.FengHuang.Interceptor.*;
-import com.dsideal.FengHuang.Util.*;
+import com.dsideal.FengHuang.Interceptor.EmptyInterface;
+import com.dsideal.FengHuang.Interceptor.IsNumericInterface;
+import com.dsideal.FengHuang.Util.Base64Util;
+import com.dsideal.FengHuang.Util.CommonUtil;
+import com.dsideal.FengHuang.Util.ExcelExportUtil;
+import com.dsideal.FengHuang.Util.FileUtil;
 import com.dsideal.FengHuang.Yp.Model.YpModel;
 import com.jfinal.aop.Before;
 import com.jfinal.core.Controller;
-import com.jfinal.core.Path;
 import com.jfinal.ext.interceptor.GET;
 import com.jfinal.ext.interceptor.POST;
 import com.jfinal.kit.Kv;
 import com.jfinal.kit.PathKit;
 import com.jfinal.kit.PropKit;
-import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.upload.UploadFile;
-import org.apache.commons.codec.binary.Base64;
-import sun.misc.BASE64Encoder;
 
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.UUID;
 
 public class YpController extends Controller {
@@ -134,10 +126,8 @@ public class YpController extends Controller {
     @Before(GET.class)
     @EmptyInterface({"sfzh"})
     public void evalBx(String sfzh) {
-        int bx_id = model.evalBx(sfzh);
-        Kv kv = Kv.by("success", true);
-        kv.set("message", "获取成功！");
-        kv.set("bx_id", bx_id);
+        Kv kv = model.evalBx(sfzh);
+        kv.set("success", true);
         renderJson(kv);
     }
 
@@ -155,9 +145,9 @@ public class YpController extends Controller {
      * @param tel
      */
     @Before(POST.class)
-    @EmptyInterface({"name","xb","sfzh","address","father_name","mother_name","tel","uuid"})
-    public void save(int task_id, String name, String xb, int bx_id, String address, String father_name, String mother_name, String sfzh, String tel,String uuid) {
-        int result = model.save(task_id, name, xb, bx_id, address, father_name, mother_name, sfzh, tel,uuid);
+    @EmptyInterface({"name", "xb", "sfzh", "address", "father_name", "mother_name", "tel", "uuid"})
+    public void save(int task_id, String name, String xb, int bx_id, String address, String father_name, String mother_name, String sfzh, String tel, String uuid) {
+        int result = model.save(task_id, name, xb, bx_id, address, father_name, mother_name, sfzh, tel, uuid);
 
         Kv kv = Kv.by("success", result);
         if (result == 1) kv.set("message", "获取成功！");
@@ -217,7 +207,7 @@ public class YpController extends Controller {
             return;
         }
 
-        String uuid=UUID.randomUUID().toString();
+        String uuid = UUID.randomUUID().toString();
         //判断目录是不是存在
         File file = new File(PathKit.getWebRootPath() + "/upload");
         if (!file.exists()) {
@@ -230,7 +220,7 @@ public class YpController extends Controller {
         Kv kv = Kv.by("success", true);
         kv.set("message", "上传成功！");
         kv.set("base64", base64);
-        kv.set("uuid",uuid);
+        kv.set("uuid", uuid);
         renderJson(kv);
         //path : /FengHuang/upload/sfzh+".jpg"
     }

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

@@ -90,8 +90,13 @@ public class YpModel {
      *
      * @param sfzh
      */
-    public int evalBx(String sfzh) {
-        if (!IdcardUtil.isValidCard(sfzh)) return -1;//-1代表身份证不合法
+    public Kv evalBx(String sfzh) {
+        Kv kv = Kv.create();
+        if (!IdcardUtil.isValidCard(sfzh)) {
+            kv.set("bx_id", -1);
+            kv.set("bx_name", "身份证不合法");
+            return kv;//-1代表身份证不合法
+        }
         //解析出出生日期
         String birth = IdcardUtil.getBirthByIdCard(sfzh);
 
@@ -101,9 +106,11 @@ public class YpModel {
         //当前年份
         Calendar calendar = Calendar.getInstance();
         int year = calendar.get(Calendar.YEAR);
-        int result = -2;
+        int bx_id = -2;
+        String bx_name = "";
         for (Record record : list) {
-            int bx_id = record.getInt("bx_id");
+            bx_id = record.getInt("bx_id");
+            bx_name = record.getStr("bx_name");
             int start_year_num = record.getInt("start_year_num");
             int end_year_num = record.getInt("end_year_num");
             String start_month_day = record.getStr("start_month_day");
@@ -112,11 +119,17 @@ public class YpModel {
             String st = year - start_year_num + start_month_day;
             String ed = year - end_year_num + end_month_day;
             if (birth.compareTo(st) >= 0 && birth.compareTo(ed) <= 0) {
-                result = bx_id;
                 break;
             }
         }
-        return result;//如果result=-2表示不在指定的时间段内
+        if (bx_id == -2) {
+            kv.set("bx_id", -2);
+            kv.set("bx_name", "出生日期不在指定的时间段内");
+            return kv;
+        }
+        kv.set("bx_id", bx_id);
+        kv.set("bx_name", bx_name);
+        return kv;
     }
 
     /**
@@ -132,7 +145,7 @@ public class YpModel {
      * @param sfzh
      * @param tel
      */
-    public int save(int task_id, String name, String xb, int bx_id, String address, String father_name, String mother_name, String sfzh, String tel,String uuid) {
+    public int save(int task_id, String name, String xb, int bx_id, String address, String father_name, String mother_name, String sfzh, String tel, String uuid) {
         //1、检查身份证号是不是已存在
         String sql = "select count(1) as count from t_yp_record where sfzh=?";
         int count = Db.findFirst(sql, sfzh).getInt("count");
@@ -156,20 +169,22 @@ public class YpModel {
         record.set("mother_name", mother_name);
         record.set("sfzh", sfzh);
         record.set("tel", tel);
-        record.set("pic","/upload/" + uuid + ".jpg");
+        record.set("pic", "/upload/" + uuid + ".jpg");
         Db.save("t_yp_record", "id", record);
         return 1;
     }
+
     /**
      * 功能：查看指定任务的结果
+     *
      * @param task_id
      * @param bx_id
      * @param page
      * @param limit
      */
-    public Page<Record> getTaskInfo(int task_id,int bx_id, int page, int limit){
+    public Page<Record> getTaskInfo(int task_id, int bx_id, int page, int limit) {
         Kv kv = Kv.by("task_id", task_id);
-        kv.set("bx_id",bx_id);
+        kv.set("bx_id", bx_id);
         SqlPara sqlPara = Db.getSqlPara("yp.getTaskInfo", kv);
         Page<Record> pageRecord = Db.paginate(page, limit, sqlPara);
         return pageRecord;