Merge remote-tracking branch 'origin/master'

README.md

@@ -34,3 +34,5 @@
 #影源扫描仪    授权码：V4tMKPYgFtW8vQr4C0s4/g==
 测试临时码：D+1WT4eWDqLseG5433yq9w==
 #系统中扫描上传   连接打印机的电脑需要安装两个：扫描仪驱动M3230.zip、webscan.exe插件 (已上传到项目)   
+
+#TODO timeout时间修改    第三方接口修改  

dangan-admin/src/main/resources/application.yml

@@ -90,6 +90,8 @@ spring:
 
 # token配置
 token:
+  #是否允许账户多终端同时登录（true允许 false不允许）
+  soloLogin: true
   # 令牌自定义标识
   header: Authorization
   # 令牌密钥

dangan-common/src/main/java/com/da/common/constant/Constants.java

@@ -1,8 +1,9 @@
 package com.da.common.constant;
 
-import java.util.Locale;
 import io.jsonwebtoken.Claims;
 
+import java.util.Locale;
+
 /**
  * 通用常量信息
  * 
@@ -10,6 +11,11 @@ import io.jsonwebtoken.Claims;
  */
 public class Constants
 {
+     /**
+     *登录用户编号 redis key
+     */
+     public static final String LOGIN_USERID_KEY = "login_userid:";
+
     /**
      * UTF-8 字符集
      */

dangan-dangan/src/main/java/com/da/dangan/controller/DangAnCollectController.java

@@ -1,18 +1,22 @@
 package com.da.dangan.controller;
 
 import cn.hutool.json.JSONObject;
+import com.alibaba.fastjson2.JSONArray;
 import com.da.common.config.RuoYiConfig;
 import com.da.common.core.controller.BaseController;
 import com.da.common.core.domain.AjaxResult;
 import com.da.common.utils.file.FileUploadUtils;
 import com.da.common.utils.file.FileUtils;
+import com.da.dangan.domain.DaCzrkdj;
 import com.da.dangan.domain.DaPicturesRecard;
+import com.da.dangan.domain.vo.CzrkDatas;
 import com.da.dangan.domain.vo.PicParams;
 import com.da.dangan.service.IDaBirthDjService;
 import com.da.dangan.service.IDaCzrkdjService;
 import com.da.dangan.service.IDaPicturesRecardService;
 import com.da.dangan.util.CallThirdInterface;
 import com.da.framework.config.ServerConfig;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
@@ -111,11 +115,15 @@ public class DangAnCollectController extends BaseController {
      */
     @PostMapping("/recongnize")
     public AjaxResult recognize(@RequestBody List<DaPicturesRecard> picRecards) {
+        String code;
+        String msg;
+        int success;
+        int total;
         try {
             //取所有id的集合
             List<Long> ids = picRecards.stream().map(DaPicturesRecard::getId).collect(Collectors.toList());
             String ywType = picRecards.get(0).getYwType();
-            String singleOrDouble = picRecards.get(0).getSingelOrDouble();
+            // String singleOrDouble = picRecards.get(0).getSingelOrDouble();
             //获取所有的文件
             List<File> files = new ArrayList<>();
             for (DaPicturesRecard picRecard : picRecards) {
@@ -143,15 +151,19 @@ public class DangAnCollectController extends BaseController {
             String result = CallThirdInterface.callThirdInterface(url, files, ywType, ids);
             long end = System.currentTimeMillis();
             logger.info("CompletableFuture耗时--——————————————————》" + (end - start) + "ms");
-            //如果result中的code=0代表结果错误
+            //! 解析JSON字符串,获取键对应的值
-            // 解析JSON字符串
-            //! 获取键对应的值
             JSONObject jsonobject = new JSONObject(result);
-            String code = jsonobject.getStr("code");
+            code = jsonobject.getStr("code");
-            String msg = jsonobject.getStr("msg");
+            msg = jsonobject.getStr("msg");
-            int success = jsonobject.getInt("success");
+            success = jsonobject.getInt("success");
-            int total = jsonobject.getInt("total");
+            total = jsonobject.getInt("total");
-            Long[] failPicids = (Long[])jsonobject.getJSONArray("failPicid").toArray();
+            //如果code=0  识别失败，直接返回
+            if (code.equals("0")) {
+                return AjaxResult.error(msg + ", 成功：" + success + " , 总共：" + total);
+            } else {
+                //识别接口方说：多张识别，要么全识别成功，要么一张也识别不成功 ，所以---------failPicids暂时不用   失败则全失败
+                // String failPicid=jsonobject.getStr("msg");
+
                 String datas = jsonobject.getStr("datas");
 
                 // TODO   数据解析    根据业务类型存储识别后的信息
@@ -167,11 +179,39 @@ public class DangAnCollectController extends BaseController {
                 switch (ywType) {
                     case "option1":
 
-                    break;
+                        //break;
                     case "option2":
 
-                    break;
+                        // break;
                     case "option3":
+
+                        //break;
+                    case "option9":
+                        //获取常住人口信息集合
+                        List<CzrkDatas> czrkDatas = JSONArray.parseArray(datas, CzrkDatas.class);
+                        for (CzrkDatas czrkData : czrkDatas) {
+                            List<Long> picid = czrkData.getPicid();
+                            // 将Long类型映射为String类型, 并将Stream转换为数组
+                            String[] spicId = picid.stream().map(Object::toString).toArray(String[]::new);
+                            String picIds = StringUtils.join(spicId, ",");//分号分割
+                            //存储图片url
+                            List<String> picUrls = picRecards.stream().map(DaPicturesRecard::getPicUrl).collect(Collectors.toList());
+                            String[] pics = picUrls.stream().map(Object::toString).toArray(String[]::new);
+                            String pictures = StringUtils.join(pics, ",");//分号分割
+
+                            List<DaCzrkdj> info = czrkData.getInfo();
+                            if(info!=null&&info.size()>0) {
+                                for (DaCzrkdj daCzrkdj : info) {
+                                    daCzrkdj.setAllPicIds(picIds);
+                                    daCzrkdj.setAllPics(pictures);
+                                    daCzrkdj.setPicIds(picIds);
+                                    daCzrkdj.setPictures(pictures);
+                                    daCzrkdjService.insertDaCzrkdj(daCzrkdj);
+                                }
+                            }
+                        }
+
+
                     /*DaCzrkdj daCzrkdj = new DaCzrkdj();
                     daCzrkdj.setAllPicIds(picIds);
                     daCzrkdj.setAllPics();
@@ -195,21 +235,19 @@ public class DangAnCollectController extends BaseController {
                         break;
                     case "option8":
 
-                    break;
-                case "option9" :
-
                         break;
                 }
-
                 //识别成功的图片 ，修改图片信息记录表为已识别   可以用多线程
                 for (DaPicturesRecard picRecard : picRecards) {
                     picRecard.setRecognize("1");
                     daPicturesRecardService.updateDaPicturesRecard(picRecard);
                 }
+            }
         } catch (Exception e) {
             e.printStackTrace();
             return AjaxResult.error(e.getMessage());
         }
+        // return AjaxResult.success("成功："+success+" , 总共："+total);
         return AjaxResult.success();
     }
 
@@ -331,8 +369,23 @@ public class DangAnCollectController extends BaseController {
      * test参数
      */
     @PostMapping("/test3")
-    public String test(@RequestParam ("files")MultipartFile[] files,@RequestParam ("datas")Long[] datas){
+    public String test() {
-        return datas.toString();
+        String result = "{\"code\": 0, \"datas\": [{\"Picid\": [\"21\"], \"info\": [{\"name\":\"333\"},{\"name\":\"111\"}]}, {\"Picid\": [\"22\"], \"info\":[]]}]}";
+        JSONObject jsonobject = new JSONObject(result);
+        String code = jsonobject.getStr("code");
+        String msg = jsonobject.getStr("msg");
+        Integer success = jsonobject.getInt("success");
+        Integer total = jsonobject.getInt("total");
+        //识别接口方说：多张识别，要么全识别成功，要么一张也识别不成功 ，所以---------failPicids暂时不用   失败则全失败
+        // String failPicid=jsonobject.getStr("msg");
+
+        String datas = jsonobject.getStr("datas");
+        //获取常住人口信息集合
+        List<CzrkDatas> czrkDatas = JSONArray.parseArray(datas, CzrkDatas.class);
+        System.out.println(czrkDatas.get(1).getInfo()==null);
+        System.out.println(czrkDatas.get(1).getInfo().size());
+        System.out.println(czrkDatas.get(0).getInfo().get(0).getName());
+        return "datas.toString()";
     }
 
     /**

dangan-dangan/src/main/java/com/da/dangan/domain/DaPicturesRecard.java

@@ -54,6 +54,18 @@ public class DaPicturesRecard extends BaseEntity
     @Excel(name = "是否已识别")
     private String recognize;
 
+    /** 是否纠错(字典0否1是) */
+    @Excel(name = "是否纠错(字典0否1是)")
+    private String errorCorrect;
+
+    public String getErrorCorrect() {
+        return errorCorrect;
+    }
+
+    public void setErrorCorrect(String errorCorrect) {
+        this.errorCorrect = errorCorrect;
+    }
+
     /**传递参数使用 单双面   0单面  1双面 */
     private String singelOrDouble;
 
@@ -189,6 +201,7 @@ public class DaPicturesRecard extends BaseEntity
                 .append("ywType", getYwType())
                 .append("daJlId", getDaJlId())
                 .append("recognize", getRecognize())
+                .append("errorCorrect", getErrorCorrect())
                 .append("singeOrDouble", getSingelOrDouble())
                 .append("czrkdj", getCzrkdj())
                 .append("csdj", getCsdj())

dangan-dangan/src/main/java/com/da/dangan/domain/DaZqz.java

@@ -1,17 +1,18 @@
 package com.da.dangan.domain;
 
-import java.util.Date;
+import com.da.common.annotation.Excel;
+import com.da.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.da.common.annotation.Excel;
+
-import com.da.common.core.domain.BaseEntity;
+import java.util.Date;
 
 /**
  * 准迁证对象 da_zqz
  *
  * @author hs
- * @date 2024-06-14
+ * @date 2024-06-15
  */
 public class DaZqz extends BaseEntity
 {
@@ -60,6 +61,11 @@ public class DaZqz extends BaseEntity
     @Excel(name = "性别1")
     private String sex1;
 
+    /** 出生日期1 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "出生日期1", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date birthDate1;
+
     /** 身份证号1 */
     @Excel(name = "身份证号1")
     private String cardId1;
@@ -76,6 +82,11 @@ public class DaZqz extends BaseEntity
     @Excel(name = "性别2")
     private String sex2;
 
+    /** 出生日期2 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "出生日期2", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date birthDate2;
+
     /** 身份证号2 */
     @Excel(name = "身份证号2")
     private String cardId2;
@@ -88,6 +99,11 @@ public class DaZqz extends BaseEntity
     @Excel(name = "姓名3")
     private String name3;
 
+    /** 出生日期3 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "出生日期3", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date birthDate3;
+
     /** 性别3 */
     @Excel(name = "性别3")
     private String sex3;
@@ -108,6 +124,11 @@ public class DaZqz extends BaseEntity
     @Excel(name = "性别4")
     private String sex4;
 
+    /** 出生日期4 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "出生日期4", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date birthDate4;
+
     /** 身份证号4 */
     @Excel(name = "身份证号4")
     private String cardId4;
@@ -272,6 +293,15 @@ public class DaZqz extends BaseEntity
     {
         return sex1;
     }
+    public void setBirthDate1(Date birthDate1)
+    {
+        this.birthDate1 = birthDate1;
+    }
+
+    public Date getBirthDate1()
+    {
+        return birthDate1;
+    }
     public void setCardId1(String cardId1)
     {
         this.cardId1 = cardId1;
@@ -308,6 +338,15 @@ public class DaZqz extends BaseEntity
     {
         return sex2;
     }
+    public void setBirthDate2(Date birthDate2)
+    {
+        this.birthDate2 = birthDate2;
+    }
+
+    public Date getBirthDate2()
+    {
+        return birthDate2;
+    }
     public void setCardId2(String cardId2)
     {
         this.cardId2 = cardId2;
@@ -335,6 +374,15 @@ public class DaZqz extends BaseEntity
     {
         return name3;
     }
+    public void setBirthDate3(Date birthDate3)
+    {
+        this.birthDate3 = birthDate3;
+    }
+
+    public Date getBirthDate3()
+    {
+        return birthDate3;
+    }
     public void setSex3(String sex3)
     {
         this.sex3 = sex3;
@@ -380,6 +428,15 @@ public class DaZqz extends BaseEntity
     {
         return sex4;
     }
+    public void setBirthDate4(Date birthDate4)
+    {
+        this.birthDate4 = birthDate4;
+    }
+
+    public Date getBirthDate4()
+    {
+        return birthDate4;
+    }
     public void setCardId4(String cardId4)
     {
         this.cardId4 = cardId4;
@@ -539,18 +596,22 @@ public class DaZqz extends BaseEntity
                 .append("relation1", getRelation1())
                 .append("name1", getName1())
                 .append("sex1", getSex1())
+                .append("birthDate1", getBirthDate1())
                 .append("cardId1", getCardId1())
                 .append("relation2", getRelation2())
                 .append("name2", getName2())
                 .append("sex2", getSex2())
+                .append("birthDate2", getBirthDate2())
                 .append("cardId2", getCardId2())
                 .append("relation3", getRelation3())
                 .append("name3", getName3())
+                .append("birthDate3", getBirthDate3())
                 .append("sex3", getSex3())
                 .append("cardId3", getCardId3())
                 .append("relation4", getRelation4())
                 .append("name4", getName4())
                 .append("sex4", getSex4())
+                .append("birthDate4", getBirthDate4())
                 .append("cardId4", getCardId4())
                 .append("fwdw", getFwdw())
                 .append("qrAddress", getQrAddress())

dangan-dangan/src/main/java/com/da/dangan/domain/vo/CszmDatas.java

@@ -0,0 +1,26 @@
+package com.da.dangan.domain.vo;
+
+import com.da.dangan.domain.DaBirthDj;
+
+import java.util.List;
+
+public class CszmDatas {
+  private List<Long> Picid;
+  private  List<DaBirthDj> info;
+
+    public List<Long> getPicid() {
+        return Picid;
+    }
+
+    public void setPicid(List<Long> picid) {
+        Picid = picid;
+    }
+
+    public List<DaBirthDj> getInfo() {
+        return info;
+    }
+
+    public void setInfo(List<DaBirthDj> info) {
+        this.info = info;
+    }
+}

dangan-dangan/src/main/java/com/da/dangan/domain/vo/CzrkDatas.java

@@ -0,0 +1,26 @@
+package com.da.dangan.domain.vo;
+
+import com.da.dangan.domain.DaCzrkdj;
+
+import java.util.List;
+
+public class CzrkDatas {
+  private List<Long> Picid;
+  private  List<DaCzrkdj> info;
+
+    public List<Long> getPicid() {
+        return Picid;
+    }
+
+    public void setPicid(List<Long> picid) {
+        Picid = picid;
+    }
+
+    public List<DaCzrkdj> getInfo() {
+        return info;
+    }
+
+    public void setInfo(List<DaCzrkdj> info) {
+        this.info = info;
+    }
+}

dangan-dangan/src/main/java/com/da/dangan/domain/vo/QyzDatas.java

@@ -0,0 +1,26 @@
+package com.da.dangan.domain.vo;
+
+import com.da.dangan.domain.DaQyz;
+
+import java.util.List;
+
+public class QyzDatas {
+  private List<Long> Picid;
+  private  List<DaQyz> info;
+
+    public List<Long> getPicid() {
+        return Picid;
+    }
+
+    public void setPicid(List<Long> picid) {
+        Picid = picid;
+    }
+
+    public List<DaQyz> getInfo() {
+        return info;
+    }
+
+    public void setInfo(List<DaQyz> info) {
+        this.info = info;
+    }
+}

dangan-dangan/src/main/java/com/da/dangan/domain/vo/YtzmDatas.java

@@ -0,0 +1,26 @@
+package com.da.dangan.domain.vo;
+
+import com.da.dangan.domain.DaYtzm;
+
+import java.util.List;
+
+public class YtzmDatas {
+  private List<Long> Picid;
+  private  List<DaYtzm> info;
+
+    public List<Long> getPicid() {
+        return Picid;
+    }
+
+    public void setPicid(List<Long> picid) {
+        Picid = picid;
+    }
+
+    public List<DaYtzm> getInfo() {
+        return info;
+    }
+
+    public void setInfo(List<DaYtzm> info) {
+        this.info = info;
+    }
+}

dangan-dangan/src/main/java/com/da/dangan/domain/vo/ZfnyDatas.java

@@ -0,0 +1,26 @@
+package com.da.dangan.domain.vo;
+
+import com.da.dangan.domain.DaZfnyhkcg;
+
+import java.util.List;
+
+public class ZfnyDatas {
+  private List<Long> Picid;
+  private  List<DaZfnyhkcg> info;
+
+    public List<Long> getPicid() {
+        return Picid;
+    }
+
+    public void setPicid(List<Long> picid) {
+        Picid = picid;
+    }
+
+    public List<DaZfnyhkcg> getInfo() {
+        return info;
+    }
+
+    public void setInfo(List<DaZfnyhkcg> info) {
+        this.info = info;
+    }
+}

dangan-dangan/src/main/java/com/da/dangan/domain/vo/ZqzDatas.java

@@ -0,0 +1,26 @@
+package com.da.dangan.domain.vo;
+
+import com.da.dangan.domain.DaZqz;
+
+import java.util.List;
+
+public class ZqzDatas {
+  private List<Long> Picid;
+  private  List<DaZqz> info;
+
+    public List<Long> getPicid() {
+        return Picid;
+    }
+
+    public void setPicid(List<Long> picid) {
+        Picid = picid;
+    }
+
+    public List<DaZqz> getInfo() {
+        return info;
+    }
+
+    public void setInfo(List<DaZqz> info) {
+        this.info = info;
+    }
+}

dangan-dangan/src/main/java/com/da/dangan/service/impl/DaBirthDjServiceImpl.java

@@ -2,10 +2,13 @@ package com.da.dangan.service.impl;
 
 import com.da.common.utils.DateUtils;
 import com.da.dangan.domain.DaBirthDj;
+import com.da.dangan.domain.DaPicturesRecard;
 import com.da.dangan.mapper.DaBirthDjMapper;
+import com.da.dangan.mapper.DaPicturesRecardMapper;
 import com.da.dangan.service.IDaBirthDjService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -20,7 +23,8 @@ public class DaBirthDjServiceImpl implements IDaBirthDjService
 {
     @Autowired
     private DaBirthDjMapper daBirthDjMapper;
-
+    @Autowired
+    private DaPicturesRecardMapper daPicturesRecardMapper;
     /**
      * 查询出生登记
      * 
@@ -65,8 +69,21 @@ public class DaBirthDjServiceImpl implements IDaBirthDjService
      * @return 结果
      */
     @Override
+    @Transactional
     public int updateDaBirthDj(DaBirthDj daBirthDj)
     {
+        //修改纠错时   同步修改对应识别图片的纠错标识
+        if(daBirthDj.getErrorCorrect().equals("1")){
+            String picIds = daBirthDj.getPicIds();
+            String[] split = picIds.split(",");
+            for(String picId :split){
+                Long picid = Long.parseLong(picId);
+                DaPicturesRecard picturesRecard = new DaPicturesRecard();
+                picturesRecard.setId(picid);
+                picturesRecard.setErrorCorrect("1");
+                daPicturesRecardMapper.updateDaPicturesRecard(picturesRecard);
+            }
+        }
         daBirthDj.setUpdateTime(DateUtils.getNowDate());
         return daBirthDjMapper.updateDaBirthDj(daBirthDj);
     }

dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCzrkdjServiceImpl.java

@@ -2,10 +2,13 @@ package com.da.dangan.service.impl;
 
 import com.da.common.utils.DateUtils;
 import com.da.dangan.domain.DaCzrkdj;
+import com.da.dangan.domain.DaPicturesRecard;
 import com.da.dangan.mapper.DaCzrkdjMapper;
+import com.da.dangan.mapper.DaPicturesRecardMapper;
 import com.da.dangan.service.IDaCzrkdjService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -20,7 +23,8 @@ public class DaCzrkdjServiceImpl implements IDaCzrkdjService
 {
     @Autowired
     private DaCzrkdjMapper daCzrkdjMapper;
-
+    @Autowired
+    private DaPicturesRecardMapper daPicturesRecardMapper;
     /**
      * 查询常住人口登记
      * 
@@ -65,8 +69,20 @@ public class DaCzrkdjServiceImpl implements IDaCzrkdjService
      * @return 结果
      */
     @Override
+    @Transactional
     public int updateDaCzrkdj(DaCzrkdj daCzrkdj)
-    {
+    {   //修改纠错时   同步修改对应识别图片的纠错标识
+        if(daCzrkdj.getErrorCorrect().equals("1")){
+            String picIds = daCzrkdj.getPicIds();
+            String[] split = picIds.split(",");
+            for(String picId :split){
+                Long picid = Long.parseLong(picId);
+                DaPicturesRecard picturesRecard = new DaPicturesRecard();
+                picturesRecard.setId(picid);
+                picturesRecard.setErrorCorrect("1");
+                daPicturesRecardMapper.updateDaPicturesRecard(picturesRecard);
+            }
+        }
         daCzrkdj.setUpdateTime(DateUtils.getNowDate());
         return daCzrkdjMapper.updateDaCzrkdj(daCzrkdj);
     }

dangan-dangan/src/main/java/com/da/dangan/service/impl/DaQyzServiceImpl.java

@@ -1,11 +1,14 @@
 package com.da.dangan.service.impl;
 
 import com.da.common.utils.DateUtils;
+import com.da.dangan.domain.DaPicturesRecard;
 import com.da.dangan.domain.DaQyz;
+import com.da.dangan.mapper.DaPicturesRecardMapper;
 import com.da.dangan.mapper.DaQyzMapper;
 import com.da.dangan.service.IDaQyzService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -20,7 +23,8 @@ public class DaQyzServiceImpl implements IDaQyzService
 {
     @Autowired
     private DaQyzMapper daQyzMapper;
-
+    @Autowired
+    private DaPicturesRecardMapper daPicturesRecardMapper;
     /**
      * 查询迁移证
      * 
@@ -65,8 +69,21 @@ public class DaQyzServiceImpl implements IDaQyzService
      * @return 结果
      */
     @Override
+    @Transactional
     public int updateDaQyz(DaQyz daQyz)
     {
+        //修改纠错时   同步修改对应识别图片的纠错标识
+        if(daQyz.getErrorCorrect().equals("1")){
+            String picIds = daQyz.getPicIds();
+            String[] split = picIds.split(",");
+            for(String picId :split){
+                Long picid = Long.parseLong(picId);
+                DaPicturesRecard picturesRecard = new DaPicturesRecard();
+                picturesRecard.setId(picid);
+                picturesRecard.setErrorCorrect("1");
+                daPicturesRecardMapper.updateDaPicturesRecard(picturesRecard);
+            }
+        }
         daQyz.setUpdateTime(DateUtils.getNowDate());
         return daQyzMapper.updateDaQyz(daQyz);
     }

dangan-dangan/src/main/java/com/da/dangan/service/impl/DaYtzmServiceImpl.java

@@ -1,12 +1,16 @@
 package com.da.dangan.service.impl;
 
-import java.util.List;
 import com.da.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.da.dangan.domain.DaPicturesRecard;
-import org.springframework.stereotype.Service;
-import com.da.dangan.mapper.DaYtzmMapper;
 import com.da.dangan.domain.DaYtzm;
+import com.da.dangan.mapper.DaPicturesRecardMapper;
+import com.da.dangan.mapper.DaYtzmMapper;
 import com.da.dangan.service.IDaYtzmService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * 一胎证明Service业务层处理
@@ -19,7 +23,8 @@ public class DaYtzmServiceImpl implements IDaYtzmService
 {
     @Autowired
     private DaYtzmMapper daYtzmMapper;
-
+    @Autowired
+    private DaPicturesRecardMapper daPicturesRecardMapper;
     /**
      * 查询一胎证明
      * 
@@ -64,8 +69,21 @@ public class DaYtzmServiceImpl implements IDaYtzmService
      * @return 结果
      */
     @Override
+    @Transactional
     public int updateDaYtzm(DaYtzm daYtzm)
     {
+        //修改纠错时   同步修改对应识别图片的纠错标识
+        if(daYtzm.getErrorCorrect().equals("1")){
+            String picIds = daYtzm.getPicIds();
+            String[] split = picIds.split(",");
+            for(String picId :split){
+                Long picid = Long.parseLong(picId);
+                DaPicturesRecard picturesRecard = new DaPicturesRecard();
+                picturesRecard.setId(picid);
+                picturesRecard.setErrorCorrect("1");
+                daPicturesRecardMapper.updateDaPicturesRecard(picturesRecard);
+            }
+        }
         daYtzm.setUpdateTime(DateUtils.getNowDate());
         return daYtzmMapper.updateDaYtzm(daYtzm);
     }

dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZfnyhkcgServiceImpl.java

@@ -1,12 +1,16 @@
 package com.da.dangan.service.impl;
 
-import java.util.List;
 import com.da.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.da.dangan.domain.DaPicturesRecard;
-import org.springframework.stereotype.Service;
-import com.da.dangan.mapper.DaZfnyhkcgMapper;
 import com.da.dangan.domain.DaZfnyhkcg;
+import com.da.dangan.mapper.DaPicturesRecardMapper;
+import com.da.dangan.mapper.DaZfnyhkcgMapper;
 import com.da.dangan.service.IDaZfnyhkcgService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * 转非农业人口批复存根Service业务层处理
@@ -19,7 +23,8 @@ public class DaZfnyhkcgServiceImpl implements IDaZfnyhkcgService
 {
     @Autowired
     private DaZfnyhkcgMapper daZfnyhkcgMapper;
-
+    @Autowired
+    private DaPicturesRecardMapper daPicturesRecardMapper;
     /**
      * 查询转非农业人口批复存根
      * 
@@ -64,8 +69,21 @@ public class DaZfnyhkcgServiceImpl implements IDaZfnyhkcgService
      * @return 结果
      */
     @Override
+    @Transactional
     public int updateDaZfnyhkcg(DaZfnyhkcg daZfnyhkcg)
     {
+        //修改纠错时   同步修改对应识别图片的纠错标识
+        if(daZfnyhkcg.getErrorCorrect().equals("1")){
+            String picIds = daZfnyhkcg.getPicIds();
+            String[] split = picIds.split(",");
+            for(String picId :split){
+                Long picid = Long.parseLong(picId);
+                DaPicturesRecard picturesRecard = new DaPicturesRecard();
+                picturesRecard.setId(picid);
+                picturesRecard.setErrorCorrect("1");
+                daPicturesRecardMapper.updateDaPicturesRecard(picturesRecard);
+            }
+        }
         daZfnyhkcg.setUpdateTime(DateUtils.getNowDate());
         return daZfnyhkcgMapper.updateDaZfnyhkcg(daZfnyhkcg);
     }

dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZqzServiceImpl.java

@@ -1,12 +1,16 @@
 package com.da.dangan.service.impl;
 
-import java.util.List;
 import com.da.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.da.dangan.domain.DaPicturesRecard;
-import org.springframework.stereotype.Service;
-import com.da.dangan.mapper.DaZqzMapper;
 import com.da.dangan.domain.DaZqz;
+import com.da.dangan.mapper.DaPicturesRecardMapper;
+import com.da.dangan.mapper.DaZqzMapper;
 import com.da.dangan.service.IDaZqzService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * 准迁证Service业务层处理
@@ -19,7 +23,8 @@ public class DaZqzServiceImpl implements IDaZqzService
 {
     @Autowired
     private DaZqzMapper daZqzMapper;
-
+    @Autowired
+    private DaPicturesRecardMapper daPicturesRecardMapper;
     /**
      * 查询准迁证
      * 
@@ -64,8 +69,21 @@ public class DaZqzServiceImpl implements IDaZqzService
      * @return 结果
      */
     @Override
+    @Transactional
     public int updateDaZqz(DaZqz daZqz)
     {
+        //修改纠错时   同步修改对应识别图片的纠错标识
+        if(daZqz.getErrorCorrect().equals("1")){
+            String picIds = daZqz.getPicIds();
+            String[] split = picIds.split(",");
+            for(String picId :split){
+                Long picid = Long.parseLong(picId);
+                DaPicturesRecard picturesRecard = new DaPicturesRecard();
+                picturesRecard.setId(picid);
+                picturesRecard.setErrorCorrect("1");
+                daPicturesRecardMapper.updateDaPicturesRecard(picturesRecard);
+            }
+        }
         daZqz.setUpdateTime(DateUtils.getNowDate());
         return daZqzMapper.updateDaZqz(daZqz);
     }

dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml

@@ -3,7 +3,6 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.da.dangan.mapper.DaBirthDjMapper">
-    
     <resultMap type="DaBirthDj" id="DaBirthDjResult">
         <result property="id"    column="id"    />
         <result property="ywType"    column="yw_type"    />
@@ -54,7 +53,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
             <if test="muId != null "> and mu_id = #{muId}</if>
             <if test="birthNum != null  and birthNum != ''"> and birth_num = #{birthNum}</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="name != null  and name != ''">
+             and (name like concat('%', #{name}, '%')
+                 or m_name like  concat('%', #{name}, '%')
+                 or f_name like  concat('%', #{name}, '%')
+                 )
+            </if>
             <if test="birthday != null "> and birthday = #{birthday}</if>
             <if test="sex != null  and sex != ''"> and sex = #{sex}</if>
             <if test="bornAddress != null  and bornAddress != ''"> and born_address = #{bornAddress}</if>

dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml

@@ -3,7 +3,6 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.da.dangan.mapper.DaCzrkdjMapper">
-    
     <resultMap type="DaCzrkdj" id="DaCzrkdjResult">
         <result property="id"    column="id"    />
         <result property="ywType"    column="yw_type"    />
@@ -68,7 +67,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
             <if test="muId != null "> and mu_id = #{muId}</if>
             <if test="relation != null  and relation != ''"> and relation = #{relation}</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="name != null  and name != ''">
+                and ( name like concat('%', #{name}, '%')
+                or hz_name like concat('%', #{name}, '%')
+                or other_name like concat('%', #{name}, '%')
+                )
+             </if>
             <if test="otherName != null  and otherName != ''"> and other_name like concat('%', #{otherName}, '%')</if>
             <if test="sex != null  and sex != ''"> and sex = #{sex}</if>
             <if test="birthday != null "> and birthday = #{birthday}</if>
@@ -120,8 +124,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="muId != null "> and mu_id = #{muId}</if>
             <if test="name != null  and name != ''">
              and ( name like concat('%', #{name}, '%')
-                or hz_name like concat('%', #{name}, '%'))
+                   or hz_name like concat('%', #{name}, '%')
-                or other_name like concat('%', #{name}, '%'))
+                   or other_name like concat('%', #{name}, '%')
+                )
              </if>
             <if test="otherName != null  and otherName != ''"> and other_name like concat('%', #{otherName}, '%')</if>
             <if test="sex != null  and sex != ''"> and sex = #{sex}</if>

dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml

@@ -15,6 +15,7 @@
         <result property="ywType"    column="yw_type"    />
         <result property="daJlId"    column="da_jl_id"    />
         <result property="recognize"    column="recognize"    />
+        <result property="errorCorrect"    column="error_correct"    />
         <result property="remark"    column="remark"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -23,7 +24,7 @@
     </resultMap>
 
     <sql id="selectDaPicturesRecardVo">
-        select id, pic_name, pic_url, wlsj_id, wlsj_path, mu_id, mu_path, yw_type,da_jl_id, recognize, remark, create_by, create_time, update_by, update_time from da_pictures_recard
+        select id, pic_name, pic_url, wlsj_id, wlsj_path, mu_id, mu_path, yw_type, da_jl_id, recognize, error_correct, remark, create_by, create_time, update_by, update_time from da_pictures_recard
     </sql>
 
     <select id="selectDaPicturesRecardList" parameterType="DaPicturesRecard" resultMap="DaPicturesRecardResult">
@@ -38,6 +39,7 @@
             <if test="daJlId != null "> and da_jl_id = #{daJlId}</if>
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
             <if test="recognize != null  and recognize != ''"> and recognize = #{recognize}</if>
+            <if test="errorCorrect != null  and errorCorrect != ''"> and error_correct = #{errorCorrect}</if>
         </where>
             order by id DESC
     </select>
@@ -59,6 +61,7 @@
             <if test="ywType != null">yw_type,</if>
             <if test="daJlId != null">da_jl_id,</if>
             <if test="recognize != null">recognize,</if>
+            <if test="errorCorrect != null and errorCorrect != ''">error_correct,</if>
             <if test="remark != null">remark,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -75,6 +78,7 @@
             <if test="ywType != null">#{ywType},</if>
             <if test="daJlId != null">#{daJlId},</if>
             <if test="recognize != null">#{recognize},</if>
+            <if test="errorCorrect != null and errorCorrect != ''">#{errorCorrect},</if>
             <if test="remark != null">#{remark},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -95,6 +99,7 @@
             <if test="ywType != null">yw_type = #{ywType},</if>
             <if test="daJlId != null">da_jl_id = #{daJlId},</if>
             <if test="recognize != null">recognize = #{recognize},</if>
+            <if test="errorCorrect != null and errorCorrect != ''">error_correct = #{errorCorrect},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml

@@ -55,7 +55,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="muId != null "> and mu_id = #{muId}</if>
             <if test="fwUnit != null  and fwUnit != ''"> and fw_unit = #{fwUnit}</if>
             <if test="wjXh != null  and wjXh != ''"> and wj_xh = #{wjXh}</if>
-            <if test="name1 != null  and name1 != ''"> and name1 = #{name1}</if>
+            <if test="name1 != null  and name1 != ''">
+                and ( name1 like concat('%', #{name1}, '%')
+                or name2 like concat('%', #{name1}, '%')
+                or name3 like concat('%', #{name1}, '%')
+                or name4 like concat('%', #{name1}, '%')
+                )
+            </if>
             <if test="sex1 != null  and sex1 != ''"> and sex1 = #{sex1}</if>
             <if test="cardId1 != null  and cardId1 != ''"> and card_id1 = #{cardId1}</if>
             <if test="name2 != null  and name2 != ''"> and name2 = #{name2}</if>

dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml

@@ -51,7 +51,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="muId != null "> and mu_id = #{muId}</if>
             <if test="year != null  and year != ''"> and year = #{year}</if>
             <if test="xh != null  and xh != ''"> and xh = #{xh}</if>
-            <if test="wName != null  and wName != ''"> and w_name like concat('%', #{wName}, '%')</if>
+            <if test="wName != null  and wName != ''">
+             and ( w_name like concat('%', #{wName}, '%')
+                   or m_name like concat('%', #{wName}, '%')
+                )
+            </if>
             <if test="wUnit != null  and wUnit != ''"> and w_unit = #{wUnit}</if>
             <if test="wCardId != null  and wCardId != ''"> and w_card_id = #{wCardId}</if>
             <if test="mName != null  and mName != ''"> and m_name like concat('%', #{mName}, '%')</if>

dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml

@@ -56,7 +56,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
             <if test="muId != null "> and mu_id = #{muId}</if>
             <if test="num != null  and num != ''"> and num = #{num}</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="name != null  and name != ''">
+             and ( name like concat('%', #{name}, '%')
+                or name1 like concat('%', #{name}, '%')
+                or name2 like concat('%', #{name}, '%')
+                or name3 like concat('%', #{name}, '%')
+                or name4 like concat('%', #{name}, '%')
+                or name5 like concat('%', #{name}, '%')
+                )
+             </if>
             <if test="address != null  and address != ''"> and address = #{address}</if>
             <if test="relation1 != null  and relation1 != ''"> and relation1 = #{relation1}</if>
             <if test="name1 != null  and name1 != ''"> and name1 = #{name1}</if>

dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml

@@ -16,18 +16,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="relation1"    column="relation1"    />
         <result property="name1"    column="name1"    />
         <result property="sex1"    column="sex1"    />
+        <result property="birthDate1"    column="birth_date1"    />
         <result property="cardId1"    column="card_id1"    />
         <result property="relation2"    column="relation2"    />
         <result property="name2"    column="name2"    />
         <result property="sex2"    column="sex2"    />
+        <result property="birthDate2"    column="birth_date2"    />
         <result property="cardId2"    column="card_id2"    />
         <result property="relation3"    column="relation3"    />
         <result property="name3"    column="name3"    />
+        <result property="birthDate3"    column="birth_date3"    />
         <result property="sex3"    column="sex3"    />
         <result property="cardId3"    column="card_id3"    />
         <result property="relation4"    column="relation4"    />
         <result property="name4"    column="name4"    />
         <result property="sex4"    column="sex4"    />
+        <result property="birthDate4"    column="birth_date4"    />
         <result property="cardId4"    column="card_id4"    />
         <result property="fwdw"    column="fwdw"    />
         <result property="qrAddress"    column="qr_address"    />
@@ -52,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDaZqzVo">
-        select id, yw_type, mu_id, num, name, card_id, address, dj_jg, relation1, name1, sex1, card_id1, relation2, name2, sex2, card_id2, relation3, name3, sex3, card_id3, relation4, name4, sex4, card_id4, fwdw, qr_address, zq_reason, pzjg, cbr, qf_date, pic_ids, pictures, all_pic_ids, all_pics, error_correct, audit_status, audit_name, audit_result, audit_reason, remark, create_by, create_time, update_by, update_time from da_zqz
+        select id, yw_type, mu_id, num, name, card_id, address, dj_jg, relation1, name1, sex1, birth_date1, card_id1, relation2, name2, sex2, birth_date2, card_id2, relation3, name3, birth_date3, sex3, card_id3, relation4, name4, sex4, birth_date4, card_id4, fwdw, qr_address, zq_reason, pzjg, cbr, qf_date, pic_ids, pictures, all_pic_ids, all_pics, error_correct, audit_status, audit_name, audit_result, audit_reason, remark, create_by, create_time, update_by, update_time from da_zqz
     </sql>
 
     <select id="selectDaZqzList" parameterType="DaZqz" resultMap="DaZqzResult">
@@ -61,25 +65,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
             <if test="muId != null "> and mu_id = #{muId}</if>
             <if test="num != null  and num != ''"> and num = #{num}</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="name != null  and name != ''">
+             and ( name like concat('%', #{name}, '%')
+                or name1 like concat('%', #{name}, '%')
+                or name2 like concat('%', #{name}, '%')
+                or name3 like concat('%', #{name}, '%')
+                or name4 like concat('%', #{name}, '%')
+                )
+             </if>
             <if test="cardId != null  and cardId != ''"> and card_id = #{cardId}</if>
             <if test="address != null  and address != ''"> and address = #{address}</if>
             <if test="djJg != null  and djJg != ''"> and dj_jg = #{djJg}</if>
             <if test="relation1 != null  and relation1 != ''"> and relation1 = #{relation1}</if>
             <if test="name1 != null  and name1 != ''"> and name1 = #{name1}</if>
             <if test="sex1 != null  and sex1 != ''"> and sex1 = #{sex1}</if>
+            <if test="birthDate1 != null "> and birth_date1 = #{birthDate1}</if>
             <if test="cardId1 != null  and cardId1 != ''"> and card_id1 = #{cardId1}</if>
             <if test="relation2 != null  and relation2 != ''"> and relation2 = #{relation2}</if>
             <if test="name2 != null  and name2 != ''"> and name2 = #{name2}</if>
             <if test="sex2 != null  and sex2 != ''"> and sex2 = #{sex2}</if>
+            <if test="birthDate2 != null "> and birth_date2 = #{birthDate2}</if>
             <if test="cardId2 != null  and cardId2 != ''"> and card_id2 = #{cardId2}</if>
             <if test="relation3 != null  and relation3 != ''"> and relation3 = #{relation3}</if>
             <if test="name3 != null  and name3 != ''"> and name3 = #{name3}</if>
+            <if test="birthDate3 != null "> and birth_date3 = #{birthDate3}</if>
             <if test="sex3 != null  and sex3 != ''"> and sex3 = #{sex3}</if>
             <if test="cardId3 != null  and cardId3 != ''"> and card_id3 = #{cardId3}</if>
             <if test="relation4 != null  and relation4 != ''"> and relation4 = #{relation4}</if>
             <if test="name4 != null  and name4 != ''"> and name4 = #{name4}</if>
             <if test="sex4 != null  and sex4 != ''"> and sex4 = #{sex4}</if>
+            <if test="birthDate4 != null "> and birth_date4 = #{birthDate4}</if>
             <if test="cardId4 != null  and cardId4 != ''"> and card_id4 = #{cardId4}</if>
             <if test="fwdw != null  and fwdw != ''"> and fwdw = #{fwdw}</if>
             <if test="qrAddress != null  and qrAddress != ''"> and qr_address = #{qrAddress}</if>
@@ -117,18 +132,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="relation1 != null">relation1,</if>
             <if test="name1 != null">name1,</if>
             <if test="sex1 != null">sex1,</if>
+            <if test="birthDate1 != null">birth_date1,</if>
             <if test="cardId1 != null">card_id1,</if>
             <if test="relation2 != null">relation2,</if>
             <if test="name2 != null">name2,</if>
             <if test="sex2 != null">sex2,</if>
+            <if test="birthDate2 != null">birth_date2,</if>
             <if test="cardId2 != null">card_id2,</if>
             <if test="relation3 != null">relation3,</if>
             <if test="name3 != null">name3,</if>
+            <if test="birthDate3 != null">birth_date3,</if>
             <if test="sex3 != null">sex3,</if>
             <if test="cardId3 != null">card_id3,</if>
             <if test="relation4 != null">relation4,</if>
             <if test="name4 != null">name4,</if>
             <if test="sex4 != null">sex4,</if>
+            <if test="birthDate4 != null">birth_date4,</if>
             <if test="cardId4 != null">card_id4,</if>
             <if test="fwdw != null">fwdw,</if>
             <if test="qrAddress != null">qr_address,</if>
@@ -162,18 +181,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="relation1 != null">#{relation1},</if>
             <if test="name1 != null">#{name1},</if>
             <if test="sex1 != null">#{sex1},</if>
+            <if test="birthDate1 != null">#{birthDate1},</if>
             <if test="cardId1 != null">#{cardId1},</if>
             <if test="relation2 != null">#{relation2},</if>
             <if test="name2 != null">#{name2},</if>
             <if test="sex2 != null">#{sex2},</if>
+            <if test="birthDate2 != null">#{birthDate2},</if>
             <if test="cardId2 != null">#{cardId2},</if>
             <if test="relation3 != null">#{relation3},</if>
             <if test="name3 != null">#{name3},</if>
+            <if test="birthDate3 != null">#{birthDate3},</if>
             <if test="sex3 != null">#{sex3},</if>
             <if test="cardId3 != null">#{cardId3},</if>
             <if test="relation4 != null">#{relation4},</if>
             <if test="name4 != null">#{name4},</if>
             <if test="sex4 != null">#{sex4},</if>
+            <if test="birthDate4 != null">#{birthDate4},</if>
             <if test="cardId4 != null">#{cardId4},</if>
             <if test="fwdw != null">#{fwdw},</if>
             <if test="qrAddress != null">#{qrAddress},</if>
@@ -211,18 +234,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="relation1 != null">relation1 = #{relation1},</if>
             <if test="name1 != null">name1 = #{name1},</if>
             <if test="sex1 != null">sex1 = #{sex1},</if>
+            <if test="birthDate1 != null">birth_date1 = #{birthDate1},</if>
             <if test="cardId1 != null">card_id1 = #{cardId1},</if>
             <if test="relation2 != null">relation2 = #{relation2},</if>
             <if test="name2 != null">name2 = #{name2},</if>
             <if test="sex2 != null">sex2 = #{sex2},</if>
+            <if test="birthDate2 != null">birth_date2 = #{birthDate2},</if>
             <if test="cardId2 != null">card_id2 = #{cardId2},</if>
             <if test="relation3 != null">relation3 = #{relation3},</if>
             <if test="name3 != null">name3 = #{name3},</if>
+            <if test="birthDate3 != null">birth_date3 = #{birthDate3},</if>
             <if test="sex3 != null">sex3 = #{sex3},</if>
             <if test="cardId3 != null">card_id3 = #{cardId3},</if>
             <if test="relation4 != null">relation4 = #{relation4},</if>
             <if test="name4 != null">name4 = #{name4},</if>
             <if test="sex4 != null">sex4 = #{sex4},</if>
+            <if test="birthDate4 != null">birth_date4 = #{birthDate4},</if>
             <if test="cardId4 != null">card_id4 = #{cardId4},</if>
             <if test="fwdw != null">fwdw = #{fwdw},</if>
             <if test="qrAddress != null">qr_address = #{qrAddress},</if>

dangan-framework/src/main/java/com/da/framework/security/handle/LogoutSuccessHandlerImpl.java

@@ -1,23 +1,23 @@
 package com.da.framework.security.handle;
 
-import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
 import com.alibaba.fastjson2.JSON;
 import com.da.common.constant.Constants;
 import com.da.common.core.domain.AjaxResult;
 import com.da.common.core.domain.model.LoginUser;
-import com.da.common.utils.MessageUtils;
 import com.da.common.utils.ServletUtils;
 import com.da.common.utils.StringUtils;
 import com.da.framework.manager.AsyncManager;
 import com.da.framework.manager.factory.AsyncFactory;
 import com.da.framework.web.service.TokenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 
 /**
  * 自定义退出处理类 返回成功
@@ -36,7 +36,7 @@ public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler
      * @return
      */
     @Override
-    public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication)
+    /*public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication)
             throws IOException, ServletException
     {
         LoginUser loginUser = tokenService.getLoginUser(request);
@@ -49,5 +49,23 @@ public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler
             AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, MessageUtils.message("user.logout.success")));
         }
         ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.success(MessageUtils.message("user.logout.success"))));
+    }*/
+    public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication)
+            throws IOException, ServletException
+    {
+        LoginUser loginUser = tokenService.getLoginUser(request);
+        if (StringUtils.isNotNull(loginUser))
+        {
+            String userName = loginUser.getUsername();
+            // 删除用户缓存记录（旧方法）
+            //tokenService.delLoginUser(loginUser.getToken());
+
+            // 删除用户缓存记录 只允许单用户登录（关键）
+            tokenService.delLoginUser(loginUser.getToken(), loginUser.getUser().getUserId());
+
+            // 记录用户退出日志
+            AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, "退出成功"));
+        }
+        ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.success("退出成功")));
     }
 }

dangan-framework/src/main/java/com/da/framework/web/service/SysLoginService.java

@@ -1,12 +1,5 @@
 package com.da.framework.web.service;
 
-import javax.annotation.Resource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.stereotype.Component;
 import com.da.common.constant.CacheConstants;
 import com.da.common.constant.Constants;
 import com.da.common.constant.UserConstants;
@@ -14,11 +7,7 @@ import com.da.common.core.domain.entity.SysUser;
 import com.da.common.core.domain.model.LoginUser;
 import com.da.common.core.redis.RedisCache;
 import com.da.common.exception.ServiceException;
-import com.da.common.exception.user.BlackListException;
+import com.da.common.exception.user.*;
-import com.da.common.exception.user.CaptchaException;
-import com.da.common.exception.user.CaptchaExpireException;
-import com.da.common.exception.user.UserNotExistsException;
-import com.da.common.exception.user.UserPasswordNotMatchException;
 import com.da.common.utils.DateUtils;
 import com.da.common.utils.MessageUtils;
 import com.da.common.utils.StringUtils;
@@ -28,6 +17,15 @@ import com.da.framework.manager.factory.AsyncFactory;
 import com.da.framework.security.context.AuthenticationContextHolder;
 import com.da.system.service.ISysConfigService;
 import com.da.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
 
 /**
  * 登录校验方法
@@ -37,6 +35,9 @@ import com.da.system.service.ISysUserService;
 @Component
 public class SysLoginService
 {
+    // 是否允许账户多终端同时登录（true允许 false不允许）
+    @Value("${token.soloLogin}")
+    private boolean soloLogin;
     @Autowired
     private TokenService tokenService;
 
@@ -96,6 +97,21 @@ public class SysLoginService
         AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
         LoginUser loginUser = (LoginUser) authentication.getPrincipal();
         recordLoginInfo(loginUser.getUserId());
+
+        //---------------------------------------添加如下代码，验证如果用户不允许多终端同时登录，清除缓存信息
+        if (!soloLogin)
+        {
+            // 如果用户不允许多终端同时登录，清除缓存信息
+            String userIdKey = Constants.LOGIN_USERID_KEY + loginUser.getUser().getUserId();
+            String userKey = redisCache.getCacheObject(userIdKey);
+            if (StringUtils.isNotEmpty(userKey))
+            {
+                redisCache.deleteObject(userIdKey);
+                redisCache.deleteObject(userKey);
+            }
+        }
+        //----------------新增代码结束
+
         // 生成token
         return tokenService.createToken(loginUser);
     }

dangan-framework/src/main/java/com/da/framework/web/service/TokenService.java

@@ -1,14 +1,5 @@
 package com.da.framework.web.service;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import javax.servlet.http.HttpServletRequest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 import com.da.common.constant.CacheConstants;
 import com.da.common.constant.Constants;
 import com.da.common.core.domain.model.LoginUser;
@@ -22,6 +13,16 @@ import eu.bitwalker.useragentutils.UserAgent;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * token验证处理
@@ -33,6 +34,10 @@ public class TokenService
 {
     private static final Logger log = LoggerFactory.getLogger(TokenService.class);
 
+    // 是否允许账户多终端同时登录（true允许 false不允许）
+    @Value("${token.soloLogin}")
+    private boolean soloLogin;
+
     // 令牌自定义标识
     @Value("${token.header}")
     private String header;
@@ -96,15 +101,29 @@ public class TokenService
     /**
      * 删除用户身份信息
      */
-    public void delLoginUser(String token)
+/*    public void delLoginUser(String token)
     {
         if (StringUtils.isNotEmpty(token))
         {
             String userKey = getTokenKey(token);
             redisCache.deleteObject(userKey);
         }
+    }*/
+    public void delLoginUser(String token, Long userId)
+    {
+        if (StringUtils.isNotEmpty(token))
+        {
+            String userKey = getTokenKey(token);
+            redisCache.deleteObject(userKey);
+        }
+        if (!soloLogin && StringUtils.isNotNull(userId))
+        {
+            String userIdKey = getUserIdKey(userId);
+            redisCache.deleteObject(userIdKey);
+        }
     }
 
+
     /**
      * 创建令牌
      *
@@ -144,13 +163,28 @@ public class TokenService
      *
      * @param loginUser 登录信息
      */
-    public void refreshToken(LoginUser loginUser)
+/*    public void refreshToken(LoginUser loginUser)
+    {
+        loginUser.setLoginTime(System.currentTimeMillis());
+        loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
+        // 根据uuid将loginUser缓存
+        String userKey = getTokenKey(loginUser.getToken());
+        redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
+    }*/
+    public String refreshToken(LoginUser loginUser)
     {
         loginUser.setLoginTime(System.currentTimeMillis());
         loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
         // 根据uuid将loginUser缓存
         String userKey = getTokenKey(loginUser.getToken());
         redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
+        if (!soloLogin)
+        {
+            // 缓存用户唯一标识，防止同一帐号，同时登录
+            String userIdKey = getUserIdKey(loginUser.getUser().getUserId());
+            redisCache.setCacheObject(userIdKey, userKey, expireTime, TimeUnit.MINUTES);
+        }
+        return userKey;
     }
 
     /**
@@ -168,6 +202,11 @@ public class TokenService
         loginUser.setOs(userAgent.getOperatingSystem().getName());
     }
 
+    private String getUserIdKey(Long userId)
+    {
+        return Constants.LOGIN_USERID_KEY + userId;
+    }
+
     /**
      * 从数据声明生成令牌
      *

dangan-ui/src/utils/request.js

@@ -17,7 +17,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 100000
 })
 
 // request拦截器
@@ -93,7 +93,8 @@ service.interceptors.response.use(res => {
         isRelogin.show = false;
       });
     }
-      return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
+      //return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
+      return Promise.reject('会话已过期，或者被挤下线，请重新登录。')
     } else if (code === 500) {
       Message({ message: msg, type: 'error' })
       return Promise.reject(new Error(msg))