From 3f5ab02862ba02c6aabc9b3731128ee93262ff97 Mon Sep 17 00:00:00 2001 From: hansha Date: Sat, 15 Jun 2024 15:15:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DangAnCollectController.java | 193 +++++++++++------- .../com/da/dangan/domain/vo/CszmDatas.java | 26 +++ .../com/da/dangan/domain/vo/CzrkDatas.java | 26 +++ .../com/da/dangan/domain/vo/QyzDatas.java | 26 +++ .../com/da/dangan/domain/vo/YtzmDatas.java | 26 +++ .../com/da/dangan/domain/vo/ZfnyDatas.java | 26 +++ .../com/da/dangan/domain/vo/ZqzDatas.java | 26 +++ .../mapper/dangan/DaBirthDjMapper.xml | 8 +- .../mapper/dangan/DaCzrkdjMapper.xml | 15 +- .../resources/mapper/dangan/DaQyzMapper.xml | 8 +- .../resources/mapper/dangan/DaYtzmMapper.xml | 6 +- .../mapper/dangan/DaZfnyhkcgMapper.xml | 10 +- .../resources/mapper/dangan/DaZqzMapper.xml | 9 +- dangan-ui/src/utils/request.js | 2 +- 14 files changed, 325 insertions(+), 82 deletions(-) create mode 100644 dangan-dangan/src/main/java/com/da/dangan/domain/vo/CszmDatas.java create mode 100644 dangan-dangan/src/main/java/com/da/dangan/domain/vo/CzrkDatas.java create mode 100644 dangan-dangan/src/main/java/com/da/dangan/domain/vo/QyzDatas.java create mode 100644 dangan-dangan/src/main/java/com/da/dangan/domain/vo/YtzmDatas.java create mode 100644 dangan-dangan/src/main/java/com/da/dangan/domain/vo/ZfnyDatas.java create mode 100644 dangan-dangan/src/main/java/com/da/dangan/domain/vo/ZqzDatas.java diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DangAnCollectController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DangAnCollectController.java index 677e31b..767911b 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/controller/DangAnCollectController.java +++ b/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 picRecards) { + String code; + String msg; + int success; + int total; try { //取所有id的集合 List 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 files = new ArrayList<>(); for (DaPicturesRecard picRecard : picRecards) { @@ -124,7 +132,7 @@ public class DangAnCollectController extends BaseController { files.add(file); } // TODO————————多线程循环调用第三方接口 - long start =System.currentTimeMillis(); + long start = System.currentTimeMillis(); /*List> futures = new ArrayList<>(); List results = new ArrayList<>(); for(File file :files){ @@ -140,21 +148,25 @@ public class DangAnCollectController extends BaseController { long end =System.currentTimeMillis(); logger.info("CompletableFuture耗时--——————————————————》"+ (end-start)+"ms");*/ //不使用循环调用接口 直接传递数组 - String result = CallThirdInterface.callThirdInterface(url, files, ywType,ids); - long end =System.currentTimeMillis(); - logger.info("CompletableFuture耗时--——————————————————》"+ (end-start)+"ms"); - //如果result中的code=0代表结果错误 - // 解析JSON字符串 - //! 获取键对应的值 + String result = CallThirdInterface.callThirdInterface(url, files, ywType, ids); + long end = System.currentTimeMillis(); + logger.info("CompletableFuture耗时--——————————————————》" + (end - start) + "ms"); + //! 解析JSON字符串,获取键对应的值 JSONObject jsonobject = new JSONObject(result); - String code = jsonobject.getStr("code"); - String msg = jsonobject.getStr("msg"); - int success = jsonobject.getInt("success"); - int total = jsonobject.getInt("total"); - Long[] failPicids = (Long[])jsonobject.getJSONArray("failPicid").toArray(); - String datas = jsonobject.getStr("datas"); - - // TODO 数据解析 根据业务类型存储识别后的信息 + code = jsonobject.getStr("code"); + msg = jsonobject.getStr("msg"); + success = jsonobject.getInt("success"); + total = jsonobject.getInt("total"); + //如果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 数据解析 根据业务类型存储识别后的信息 /* @@ -163,15 +175,43 @@ public class DangAnCollectController extends BaseController { */ - Long dajlId=null; - switch(ywType){ - case "option1" : + Long dajlId = null; + switch (ywType) { + case "option1": + + //break; + case "option2": + + // break; + case "option3": + + //break; + case "option9": + //获取常住人口信息集合 + List czrkDatas = JSONArray.parseArray(datas, CzrkDatas.class); + for (CzrkDatas czrkData : czrkDatas) { + List picid = czrkData.getPicid(); + // 将Long类型映射为String类型, 并将Stream转换为数组 + String[] spicId = picid.stream().map(Object::toString).toArray(String[]::new); + String picIds = StringUtils.join(spicId, ",");//分号分割 + //存储图片url + List 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 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); + } + } + } - break; - case "option2" : - break; - case "option3" : /*DaCzrkdj daCzrkdj = new DaCzrkdj(); daCzrkdj.setAllPicIds(picIds); daCzrkdj.setAllPics(); @@ -180,36 +220,34 @@ public class DangAnCollectController extends BaseController { daCzrkdjService.insertDaCzrkdj(); //将插入后的id反写回来 dajlid=daCzrkdj.getId();*/ - break; - case "option4" : - - break; - case "option5" : - - break; - case "option6" : + break; + case "option4": - break; - case "option7" : + break; + case "option5": - break; - case "option8" : + break; + case "option6": - break; - case "option9" : + break; + case "option7": - break; - } + break; + case "option8": - //识别成功的图片 ，修改图片信息记录表为已识别 可以用多线程 - for (DaPicturesRecard picRecard : picRecards) { - picRecard.setRecognize("1"); - daPicturesRecardService.updateDaPicturesRecard(picRecard); + 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(); } @@ -222,8 +260,8 @@ public class DangAnCollectController extends BaseController { List uncheked = params.getUnchecked(); String singleOrDouble = params.getSingeOrDouble(); //拼接所有的图片 - List listAll =checked; - if(uncheked!=null&&uncheked.size()>0){ + List listAll = checked; + if (uncheked != null && uncheked.size() > 0) { listAll.addAll(uncheked); } //参数：checked id的集合 @@ -235,7 +273,7 @@ public class DangAnCollectController extends BaseController { System.out.println(allIds.toString()); - if(checked!=null&&checked.size()>0){ + if (checked != null && checked.size() > 0) { try { String ywType = checked.get(0).getYwType(); //获取所有的文件 @@ -246,12 +284,12 @@ public class DangAnCollectController extends BaseController { files.add(file); } // TODO————————多线程循环调用第三方接口 - long start =System.currentTimeMillis(); + long start = System.currentTimeMillis(); //参数:地址、文件、业务类型、单双面： 1单面 2双面 //String result = CallThirdInterface.callThirdInterface(url, files, ywType,singleOrDouble,ids); - String result = CallThirdInterface.callThirdInterface(url, files, ywType,ids); - long end =System.currentTimeMillis(); - logger.info("CompletableFuture耗时--——————————————————》"+ (end-start)+"ms"); + String result = CallThirdInterface.callThirdInterface(url, files, ywType, ids); + long end = System.currentTimeMillis(); + logger.info("CompletableFuture耗时--——————————————————》" + (end - start) + "ms"); // TODO 根据业务类型存储识别后的信息 /* @@ -263,15 +301,15 @@ public class DangAnCollectController extends BaseController { */ - Long dajlId=null; - switch(ywType){ - case "option1" : + Long dajlId = null; + switch (ywType) { + case "option1": break; - case "option2" : + case "option2": break; - case "option3" : + case "option3": /*DaCzrkdj daCzrkdj = new DaCzrkdj(); daCzrkdj.setAllPicIds(picIds); daCzrkdj.setAllPics(); @@ -281,31 +319,31 @@ public class DangAnCollectController extends BaseController { //将插入后的id反写回来 dajlid=daCzrkdj.getId();*/ break; - case "option4" : + case "option4": break; - case "option5" : + case "option5": break; - case "option6" : + case "option6": break; - case "option7" : + case "option7": break; - case "option8" : + case "option8": break; - case "option9" : + case "option9": break; } //识别成功的图片 ，修改图片信息记录表为已识别 可以用多线程 - for (DaPicturesRecard picRecard : checked) { - picRecard.setRecognize("1"); - daPicturesRecardService.updateDaPicturesRecard(picRecard); - } + for (DaPicturesRecard picRecard : checked) { + picRecard.setRecognize("1"); + daPicturesRecardService.updateDaPicturesRecard(picRecard); + } /*if(uncheked!=null&&uncheked.size()>0){ for (DaPicturesRecard picRecard : uncheked) { @@ -320,7 +358,7 @@ public class DangAnCollectController extends BaseController { e.printStackTrace(); return AjaxResult.error(e.getMessage()); } - }else{ + } else { return AjaxResult.error("请选择需要识别的图片"); } @@ -331,8 +369,23 @@ public class DangAnCollectController extends BaseController { * test参数 */ @PostMapping("/test3") - public String test(@RequestParam ("files")MultipartFile[] files,@RequestParam ("datas")Long[] datas){ - return datas.toString(); + public String test() { + 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 = 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()"; } /** @@ -409,7 +462,7 @@ public class DangAnCollectController extends BaseController { /** - * 图片批量识别处理进度 + * 图片批量识别处理进度 */ @GetMapping("/progress") public ResponseEntity getProgress() { @@ -432,7 +485,7 @@ public class DangAnCollectController extends BaseController { multipartFile.transferTo(file); fileList.add(file); } - String result = CallThirdInterface.callThirdInterface(url, fileList, fileType,new ArrayList<>()); + String result = CallThirdInterface.callThirdInterface(url, fileList, fileType, new ArrayList<>()); return result; } diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/vo/CszmDatas.java b/dangan-dangan/src/main/java/com/da/dangan/domain/vo/CszmDatas.java new file mode 100644 index 0000000..5fd652a --- /dev/null +++ b/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 Picid; + private List info; + + public List getPicid() { + return Picid; + } + + public void setPicid(List picid) { + Picid = picid; + } + + public List getInfo() { + return info; + } + + public void setInfo(List info) { + this.info = info; + } +} diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/vo/CzrkDatas.java b/dangan-dangan/src/main/java/com/da/dangan/domain/vo/CzrkDatas.java new file mode 100644 index 0000000..d5852d4 --- /dev/null +++ b/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 Picid; + private List info; + + public List getPicid() { + return Picid; + } + + public void setPicid(List picid) { + Picid = picid; + } + + public List getInfo() { + return info; + } + + public void setInfo(List info) { + this.info = info; + } +} diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/vo/QyzDatas.java b/dangan-dangan/src/main/java/com/da/dangan/domain/vo/QyzDatas.java new file mode 100644 index 0000000..4dc35fa --- /dev/null +++ b/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 Picid; + private List info; + + public List getPicid() { + return Picid; + } + + public void setPicid(List picid) { + Picid = picid; + } + + public List getInfo() { + return info; + } + + public void setInfo(List info) { + this.info = info; + } +} diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/vo/YtzmDatas.java b/dangan-dangan/src/main/java/com/da/dangan/domain/vo/YtzmDatas.java new file mode 100644 index 0000000..1406146 --- /dev/null +++ b/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 Picid; + private List info; + + public List getPicid() { + return Picid; + } + + public void setPicid(List picid) { + Picid = picid; + } + + public List getInfo() { + return info; + } + + public void setInfo(List info) { + this.info = info; + } +} diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/vo/ZfnyDatas.java b/dangan-dangan/src/main/java/com/da/dangan/domain/vo/ZfnyDatas.java new file mode 100644 index 0000000..37ae4ed --- /dev/null +++ b/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 Picid; + private List info; + + public List getPicid() { + return Picid; + } + + public void setPicid(List picid) { + Picid = picid; + } + + public List getInfo() { + return info; + } + + public void setInfo(List info) { + this.info = info; + } +} diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/vo/ZqzDatas.java b/dangan-dangan/src/main/java/com/da/dangan/domain/vo/ZqzDatas.java new file mode 100644 index 0000000..289bafb --- /dev/null +++ b/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 Picid; + private List info; + + public List getPicid() { + return Picid; + } + + public void setPicid(List picid) { + Picid = picid; + } + + public List getInfo() { + return info; + } + + public void setInfo(List info) { + this.info = info; + } +} diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml index 59bb8a2..9e72fd0 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml +++ b/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"> - @@ -54,7 +53,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and yw_type = #{ywType} and mu_id = #{muId} and birth_num = #{birthNum} - and name like concat('%', #{name}, '%') + + and (name like concat('%', #{name}, '%') + or m_name like concat('%', #{name}, '%') + or f_name like concat('%', #{name}, '%') + ) + and birthday = #{birthday} and sex = #{sex} and born_address = #{bornAddress} diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml index cab4628..0dc148f 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml +++ b/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"> - @@ -68,7 +67,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and yw_type = #{ywType} and mu_id = #{muId} and relation = #{relation} - and name like concat('%', #{name}, '%') + + and ( name like concat('%', #{name}, '%') + or hz_name like concat('%', #{name}, '%') + or other_name like concat('%', #{name}, '%') + ) + and other_name like concat('%', #{otherName}, '%') and sex = #{sex} and birthday = #{birthday} @@ -119,9 +123,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and yw_type = #{ywType} and mu_id = #{muId} - and (name like concat('%', #{name}, '%') - or hz_name like concat('%', #{name}, '%')) - or other_name like concat('%', #{name}, '%')) + and ( name like concat('%', #{name}, '%') + or hz_name like concat('%', #{name}, '%') + or other_name like concat('%', #{name}, '%') + ) and other_name like concat('%', #{otherName}, '%') and sex = #{sex} diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml index c8f5765..698f499 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml @@ -55,7 +55,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and mu_id = #{muId} and fw_unit = #{fwUnit} and wj_xh = #{wjXh} - and name1 = #{name1} + + and ( name1 like concat('%', #{name1}, '%') + or name2 like concat('%', #{name1}, '%') + or name3 like concat('%', #{name1}, '%') + or name4 like concat('%', #{name1}, '%') + ) + and sex1 = #{sex1} and card_id1 = #{cardId1} and name2 = #{name2} diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml index 2e5c532..6458d14 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml @@ -51,7 +51,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and mu_id = #{muId} and year = #{year} and xh = #{xh} - and w_name like concat('%', #{wName}, '%') + + and ( w_name like concat('%', #{wName}, '%') + or m_name like concat('%', #{wName}, '%') + ) + and w_unit = #{wUnit} and w_card_id = #{wCardId} and m_name like concat('%', #{mName}, '%') diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml index 8a104e2..d4e74ae 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml @@ -56,7 +56,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and yw_type = #{ywType} and mu_id = #{muId} and num = #{num} - and name like concat('%', #{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}, '%') + ) + and address = #{address} and relation1 = #{relation1} and name1 = #{name1} diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml index 93617df..0d4ac76 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml @@ -61,7 +61,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and yw_type = #{ywType} and mu_id = #{muId} and num = #{num} - and name like concat('%', #{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}, '%') + ) + and card_id = #{cardId} and address = #{address} and dj_jg = #{djJg} diff --git a/dangan-ui/src/utils/request.js b/dangan-ui/src/utils/request.js index ffb0d21..74d3db7 100644 --- a/dangan-ui/src/utils/request.js +++ b/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拦截器