From a94f815a960293529339740f7b2bfcc8a259082b Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 16 Aug 2021 10:45:52 +0800 Subject: [PATCH 01/12] feat: There is no way the MQ create queue key --- .../main/java/com/adc/da/convert/mq/SendConvertMQService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java b/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java index a8ead8d3..d61654ca 100644 --- a/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java +++ b/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java @@ -28,7 +28,7 @@ public class SendConvertMQService { private static final Logger logger = LoggerFactory.getLogger(SendConvertMQService.class); @RabbitListener(bindings = @QueueBinding( - value = @Queue(value = "createStandMQ_SQ_GSAR", durable = "true"), + value = @Queue(value = "createConvertStandMQ_SQ_GSAR", durable = "true"), exchange = @Exchange(value = "convert-exchange_SQ_GSAR", ignoreDeclarationExceptions = "true"), key = "convert-key_SQ_GSAR")) public void createMQ(AttFileEO attFileEO, Message message, Channel channel) throws Exception{ From bb283d79c73d5f72177444f6da52a40915056aa6 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Mon, 16 Aug 2021 11:08:30 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java | 3 +++ .../service/impl/SarLawsAttrDetailedListServiceImpl.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java index 4fc014e7..120a444d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java @@ -115,4 +115,7 @@ public class LawsDto { @ApiModelProperty(value = "文本状态") private String textStatus; + + @ApiModelProperty(value = "适用车型") + private String applyArctic; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 5c056cfe..9028d493 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -51,6 +51,9 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,sarFindDto); for (LawsDto lawsDto:list){ + if (StringUtils.isNoneEmpty(lawsDto.getApplyArctic())){ + lawsDto.setApplyArctic(lawsDto.getApplyArctic()); + } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("stand_id",lawsDto.getId()) .eq("detailed_list_id",sarFindDto.getId()); From a5ae69996d104f6b8829175f324708f6985806ea Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 16 Aug 2021 13:56:49 +0800 Subject: [PATCH 03/12] feat: There is no way the Search Add Stand ES --- .../adc/da/mq/service/SendStandMQService.java | 8 +-- .../impl/SarStandardsInfoServiceImpl.java | 51 ++++++++++++++----- 2 files changed, 44 insertions(+), 15 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/service/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/service/SendStandMQService.java index c14b0e49..7c20c0bc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/service/SendStandMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/service/SendStandMQService.java @@ -180,10 +180,12 @@ public class SendStandMQService { // 动态存储属性字段 for (String field : fieldInfoList) { saveMap.put(field,attrInfoMap.getOrDefault(field,"")); - Object json= new JSONTokener(infoMap.get(field).toString()).nextValue(); String fieldValue = ""; - if(!json.toString().equals("null")){ - fieldValue = infoMap.get(field).toString(); + if(infoMap.get(field) != null && StringUtils.isNotBlank(infoMap.get(field).toString())){ + Object json= new JSONTokener(infoMap.get(field).toString()).nextValue(); + if(!json.toString().equals("null")){ + fieldValue = infoMap.get(field).toString(); + } } saveMap.put(field+"Name",fieldValue); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index b39f5d92..ee3d2b63 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -68,6 +68,7 @@ import org.apache.poi.hwpf.extractor.WordExtractor; import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.xwpf.extractor.XWPFWordExtractor; import org.apache.poi.xwpf.usermodel.XWPFDocument; +import org.json.JSONTokener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; @@ -387,13 +388,19 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getAttrMap = sarStandAttrInfoEODao.selectStandFieldAndData(fieldInfo, row.getId()); + Map getAttrMap = new TreeMap<>(); + if(type.equals("add")){ + String sarStandAttrEOStr = row.getSarStandAttrEOStr(); + getAttrMap = JSONObject.fromObject(sarStandAttrEOStr); + }else { + getAttrMap = sarStandAttrInfoEODao.selectStandFieldAndData(fieldInfo, row.getId()); + } if (InitStandAttrUtil.clobFieldList != null && !InitStandAttrUtil.clobFieldList.isEmpty()) { // 遍历修改所有clob类型的值 for (String clobField : InitStandAttrUtil.clobFieldList) { @@ -457,18 +464,28 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getAttrMap = row.getAttrInfoMap(); if (getAttrMap != null && getAttrMap.size() > 0) { for (Map.Entry entry : getAttrMap.entrySet()) { String name = entry.getKey(); String value = ""; + List valArr = new ArrayList<>(); if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { - value = entry.getValue().toString(); - List valArr = Arrays.asList(value.split(",")); - value = dicTypeEODao.getDicNamesByCodes(valArr); + if(StringUtils.isNotBlank(entry.getValue().toString())){ + Object json= new JSONTokener(entry.getValue().toString()).nextValue(); + if(json instanceof org.json.JSONArray){ + valArr = com.alibaba.fastjson.JSONObject.parseArray(entry.getValue().toString(),String.class); + }else { + value = entry.getValue().toString(); + valArr = Arrays.asList(value.split(",")); + } + if(!valArr.isEmpty()){ + value = dicTypeEODao.getDicNamesByCodes(valArr); + } + } entry.setValue(value); } } @@ -576,10 +593,20 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo); + if(!sarItemVOS.isEmpty()){ + Map collectMap = sarItemVOS.stream().filter((e) -> e.getItemsNum() != null && e.getItemsName() != null) + .collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getItemsName)); + sarStandardsInfoEO.setMapItems(collectMap); + } + createStandMQService.sendStandMQ(sarStandardsInfoEO,"add"); + } } } @@ -1148,7 +1175,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl Date: Mon, 16 Aug 2021 14:57:34 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java | 3 +++ .../java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java | 3 +++ .../com/adc/da/slrs/sarStandItems/entity/SarStandItems.java | 4 ++++ .../mybatis/mapper/SarStandItems/SarStandItemsMapper.xml | 1 + 4 files changed, 11 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java index 5ed30c32..1ab1f864 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java @@ -33,4 +33,7 @@ public class FindSarItemsPageReqDTO { @ApiModelProperty(value = "文件类型") private String fileType; + + @ApiModelProperty(value = "解读内容") + private String readContent; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java index 3d573ee0..769d39c0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java @@ -66,4 +66,7 @@ public class SarItemVO extends BaseEntity { @ApiModelProperty(value = "解读内容--核心技术要点") private String interpretationContent; + + @ApiModelProperty(value = "解读内容") + private String readContent; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java index 0b1f8098..441a01ac 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java @@ -184,5 +184,9 @@ public class SarStandItems extends BaseEntity { @TableId("COMPLIANCE_REQUIR") private String complianceRequire; + @ApiModelProperty(value = "解读内容") + @TableField("read_content") + private String readContent; + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index 45984bb7..248f06d6 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -68,6 +68,7 @@ + From 241d14bac408c533b072a069842bdc8674529836 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Mon, 16 Aug 2021 15:01:03 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=E5=90=8E=E5=8F=B0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2bug~~~~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ndardComplianceAssessResultController.java | 19 ++++++++++++++++--- .../SarStandardComplianceProductAssess.java | 4 ++++ .../SarStandardComplianceProductAssessEO.java | 4 ++++ .../entity/SarStandardsInfoEO.java | 3 +++ 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 36f7e23c..b2f044cb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -59,13 +59,16 @@ public class SarStandardComplianceAssessResultController { if (eo.getStandApplicationType() == 1) { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME"); + queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME",eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); } + if (eo.getType() != null && !eo.getType().trim().equals("")) { + queryWrapper.like("type",eo.getType().trim()); + } IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); while(page.getRecords().remove(null)); @@ -75,13 +78,16 @@ public class SarStandardComplianceAssessResultController { if(eo.getPosition()==1){ QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME"); + queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME",eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); } + if (eo.getType() != null && !eo.getType().trim().equals("")) { + queryWrapper.like("type",eo.getType().trim()); + } IPage page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper); while(page.getRecords().remove(null)); @@ -90,13 +96,16 @@ public class SarStandardComplianceAssessResultController { }else{ QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME"); + queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME",eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); } + if (eo.getType() != null && !eo.getType().trim().equals("")) { + queryWrapper.like("type",eo.getType().trim()); + } IPage page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper); while(page.getRecords().remove(null)); @@ -158,9 +167,13 @@ public class SarStandardComplianceAssessResultController { public ResponseMessage> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); +// queryWrapper.select("*"); + + if (eo.getType() !=null) queryWrapper.like("type",eo.getType()); if (eo.getProductName() != null) queryWrapper.like("product_name", eo.getProductName()); if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId()); if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); +// queryWrapper.last("WHERE type = " + eo.getType()); IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java index 0fff5ae4..c6496762 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java @@ -117,6 +117,10 @@ public class SarStandardComplianceProductAssess extends BaseEntity { @TableField("clause_name") private String clauseName; + @ApiModelProperty(value = "流程UUID") + @TableField("type") + private String type; + private String id; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java index 53b782b2..c91afc56 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java @@ -18,6 +18,10 @@ public class SarStandardComplianceProductAssessEO{ @TableField("STAND_ID") private String standId; + @ApiModelProperty(value = "流程UUID") + @TableField("type") + private String type; + @ApiModelProperty(value = "'项目名称'") private String productName; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java index 9981e6ee..4fb0c327 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java @@ -25,6 +25,9 @@ public class SarStandardsInfoEO { @ApiModelProperty(value = "国内1，国外2") private Integer position=1; + @ApiModelProperty(value = "流程UUID") + @TableField("type") + private String type; @ApiModelProperty("页数") private Integer current=1; From fbefe71f1c632afc05d43a8b38583b5d32e9e497 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 16 Aug 2021 15:43:26 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandardComplianceAssessResultController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index b2f044cb..d231e229 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -169,7 +169,7 @@ public class SarStandardComplianceAssessResultController { QueryWrapper queryWrapper = new QueryWrapper<>(); // queryWrapper.select("*"); - if (eo.getType() !=null) queryWrapper.like("type",eo.getType()); + if (eo.getType() !=null) queryWrapper.eq("type",eo.getType()); if (eo.getProductName() != null) queryWrapper.like("product_name", eo.getProductName()); if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId()); if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); From 32626f3ae1477abbfc9e43227c42330fd79f83ee Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 16 Aug 2021 16:13:04 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E8=BF=87=E5=86=85=E5=A4=96=E6=A0=87?= =?UTF-8?q?=E5=87=86=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandardsInfoController.java | 60 ++++++++------ .../entity/SarStandardsInfoEOPage.java | 3 + .../da/utils/util/SarAdvanceSearchUtil.java | 79 ++++++++++++------- .../SarStandardsInfoMapper.xml | 28 ++++++- 4 files changed, 116 insertions(+), 54 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 186be42a..e333d7ac 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -130,36 +130,52 @@ public class SarStandardsInfoController extends BaseController } } } + + if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); - int i = 0; - for (SarAdvanceSearchVO sarAdvanceSearchVO:searchList){ - if ("SVPPS".equals(sarAdvanceSearchVO.getField()) && StringUtils.isBlank(sarAdvanceSearchVO.getValue())){ - isNull = i; - } - i++; - } - if (-1 != isNull) { - searchList.remove(isNull); - } - if (isNull == 0 && searchList.size() > 0){ - searchList.get(0).setConnect(""); - } - String advanceStr = SarAdvanceSearchUtil.createSql(searchList); - if (null != advanceStr) { - advanceStr = advanceStr.replace("stand_number", "concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',SAR_STANDARDS_INFO.STAND_YEAR)"); - } - if (-1 != isNull && StringUtils.isBlank(advanceStr)){ - advanceStr = advanceStr + " SVPPS is null"; - }else if (-1 != isNull && StringUtils.isNotBlank(advanceStr)){ - advanceStr = advanceStr + " and SVPPS is null"; - } + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList); if (StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { page.setAdvanceSearchStr(null); } } + + + + + +// if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { +// List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); +// int i = 0; +// for (SarAdvanceSearchVO sarAdvanceSearchVO:searchList){ +// if ("SVPPS".equals(sarAdvanceSearchVO.getField()) && StringUtils.isBlank(sarAdvanceSearchVO.getValue())){ +// isNull = i; +// } +// i++; +// } +// if (-1 != isNull) { +// searchList.remove(isNull); +// } +// if (isNull == 0 && searchList.size() > 0){ +// searchList.get(0).setConnect(""); +// } +// String advanceStr = SarAdvanceSearchUtil.createSql(searchList); +// if (null != advanceStr) { +// advanceStr = advanceStr.replace("stand_number", "concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',SAR_STANDARDS_INFO.STAND_YEAR)"); +// } +// if (-1 != isNull && StringUtils.isBlank(advanceStr)){ +// advanceStr = advanceStr + " SVPPS is null"; +// }else if (-1 != isNull && StringUtils.isNotBlank(advanceStr)){ +// advanceStr = advanceStr + " and SVPPS is null"; +// } +// if (StringUtils.isNotBlank(advanceStr)) { +// page.setAdvanceSearchStr(advanceStr); +// } else { +// page.setAdvanceSearchStr(null); +// } +// } if(page.getUserId() == null || page.getUserId().equals("")){ page.setUserId(LoginUserUtil.getUserId()); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java index dcf25cca..7e24c346 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java @@ -87,5 +87,8 @@ public class SarStandardsInfoEOPage extends BasePage { private String orderBy1 = "SAR_STANDARDS_INFO.issue_time"; private String order1 = "desc"; +// zhaokaiyao + private String textStatus;//文本状态 + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java index 7201ccae..c3a9f1a3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java @@ -14,61 +14,61 @@ import java.util.List; public class SarAdvanceSearchUtil { // 拼接sql语句 - public static String createSql (List searchVOList) { + public static String createSql(List searchVOList) { String sqlInfo = ""; StringBuilder sqlBuilder = new StringBuilder(); if (searchVOList != null && !searchVOList.isEmpty()) { for (SarAdvanceSearchVO searchVO : searchVOList) { String sql = ""; if (StringUtils.isNotBlank(searchVO.getValue())) { - if(searchVO.getValue().contains(",")){ - sql += searchVO.getConnect()+"("; + if (searchVO.getValue().contains(",")) { + sql += searchVO.getConnect() + "("; List list = Arrays.asList(searchVO.getValue().split(",")); - for(int i =0;i searchVOList) { + String sqlInfo = ""; + String tableName="SAR_STAND_ATTR_INFO."; + StringBuilder sqlBuilder = new StringBuilder(); + if (searchVOList != null && !searchVOList.isEmpty()) { + + for (int i = 0; i < searchVOList.size(); i++) { + String sql = ""; + SarAdvanceSearchVO searchVO=searchVOList.get(i); + if (StringUtils.isNotBlank(searchVO.getValue())); + if (i==0){ + sql+=tableName+searchVO.getField()+" " + searchVO.getType() + " " + "concat(concat('%','" +searchVO.getValue() + "'),'%') "; + }else { + sql+="AND"+" "+tableName+searchVO.getField()+" " + searchVO.getType() + " " + "concat(concat('%','" +searchVO.getValue() + "'),'%') "; + } + sqlBuilder.append(sql); + } + sqlInfo = sqlBuilder.toString(); + } + + return sqlInfo; + } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 4b56f28b..7e1706b2 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -429,6 +429,9 @@ and replaced_stand_num like concat(concat('%',#{replacedStandNum}),'%') + + and is_relate_access = #{isRelateAccess} + and SAR_STAND_MENU.MENU_ID in @@ -490,11 +493,28 @@ and SAR_STANDARDS_INFO.stand_sort = #{standSort} + + + + and SAR_STANDARDS_INFO.STAND_YEAR = #{standYear} + + + and SAR_STANDARDS_INFO.ISSUE_TIME = #{issueTime} AND dbms_lob.instr(SYNOPSIS, #{synopsis} ,1,1) > 0 + + + + and SAR_STANDARDS_INFO.TEXT_STATUS = #{textStatus} + + + + and SAR_STANDARDS_INFO.IS_RELATE_ACCESS = #{isRelateAccess} + + and SAR_STANDARDS_INFO.id in ( select COLLECT_RES_ID from TS_PERSON_COLLECT where TS_PERSON_COLLECT.VALID_FLAG=0 @@ -502,18 +522,18 @@ and TS_PERSON_COLLECT.user_id=#{userId} ) + and SAR_STAND_ATTR_INFO.GXHBQ is not null and SAR_STAND_ATTR_INFO.GXHBQ like concat(concat('%',#{labelMenuId}),'%') + - and SAR_STAND_ATTR_INFO.SYCLLX = #{applyArctic} - - - and is_relate_access = #{isRelateAccess} + and SAR_STAND_ATTR_INFO.CLLX = #{applyArctic} + and (${advanceSearchStr}) From 68d7a1ab66fc33c783234a57029e7380a8c8eed9 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 16 Aug 2021 16:16:37 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/utils/util/SarAdvanceSearchUtil.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java index c3a9f1a3..bfc545b2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java @@ -79,6 +79,12 @@ public class SarAdvanceSearchUtil { return sqlInfo; } + + /** + * 国内外标准高级查询 对SAR_STAND_ATTR_INFO表自定义字段生成条件语句 + * @param searchVOList + * @return + */ public static String createStandSql(List searchVOList) { String sqlInfo = ""; String tableName="SAR_STAND_ATTR_INFO."; From 690d86a4b8c2958fc529ee176d23c77f1a0fd51c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 17 Aug 2021 09:37:46 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E4=BB=A3=E7=A0=81=E7=B2=BE=E7=AE=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandardComplianceAssessResultController.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index d231e229..924cafd0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -167,18 +167,11 @@ public class SarStandardComplianceAssessResultController { public ResponseMessage> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); -// queryWrapper.select("*"); - if (eo.getType() !=null) queryWrapper.eq("type",eo.getType()); if (eo.getProductName() != null) queryWrapper.like("product_name", eo.getProductName()); if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId()); if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); -// queryWrapper.last("WHERE type = " + eo.getType()); - IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); - -// while(page.getRecords().remove(null)); - return Result.success(page); } From 0529b40897e804ed754c5ac02c165a0bb4d5fe1d Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 17 Aug 2021 09:50:23 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E8=AF=95=E5=9B=BE=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandProjectLibraryController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index eff74842..968efad0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -51,7 +51,7 @@ public class SarStandProjectLibraryController extends BaseController MaintenanceList = sarStandProjectLibraryService.queryMaintenanceProjectWorkFlow(Page,PageSize,sarDto); Map map = new HashMap(); From dbb69c867679ecb6c995e4819acd3350738c6222 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 17 Aug 2021 10:47:27 +0800 Subject: [PATCH 11/12] feat: There is no way the --- .../src/main/java/com/adc/da/main/generate/CodeGen.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java b/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java index 12658804..8e9a93ae 100644 --- a/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java +++ b/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java @@ -18,12 +18,9 @@ public class CodeGen { private static final String PACKAGE_PATH="/adc-da-slrs/src/main"; - private static final String AUTHOR="zyl"; + private static final String AUTHOR="super_liu"; - // x.x.x.x:3306/xxxx --MYSQL - // 192.168.10.140:1521:foton_slrs_test - // foton_slrs_test@101.36.227.22 - private static final String DB_IP="192.168.10.47/foton_slrs_test"; + private static final String DB_IP="127.0.0.1:3306/foton_slrs_test"; private static final String DB_USER="root"; From 1791877be5618c69a1ddfb3eaacba2929be1b1d1 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 17 Aug 2021 15:04:17 +0800 Subject: [PATCH 12/12] feat: There is no way the --- adc-da-main/src/main/resources/application-dev.properties | 6 +++--- .../da/search/service/impl/StandLawsSearchServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index ccba8463..3244c6d5 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -44,10 +44,10 @@ spring.mail.port=587 #spring.rabbitmq.username=uat_pcms #spring.rabbitmq.password=VxsBLL5bJruwzXfS # spring.rabbitmq.publisher-confirms=true -spring.rabbitmq.host=62.234.118.181 +spring.rabbitmq.host=127.0.0.1 spring.rabbitmq.port=5672 -spring.rabbitmq.username=admin -spring.rabbitmq.password=admin +spring.rabbitmq.username=guest +spring.rabbitmq.password=guest # ============================================== # 文档存储路径指向 # ============================================== diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java index d4dcb175..1980b183 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java @@ -97,7 +97,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { result = elasticsearchService.updateDataByIdForMap(fullTextSearchEO,"fulltextserch","fulltextserch",id); } } else { - result = elasticsearchService.updateDataByIdForMap(fullTextSearchEO,"fulltextserch","fulltextserch",id); + result = elasticsearchService.addDataForMap(fullTextSearchEO,"fulltextserch","fulltextserch",id); } } return result;