From 54ef64c8526ebdb61c7c399c8b7c4d61aac77de5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=9B?= <879913833@qq.com> Date: Tue, 18 Jan 2022 17:09:03 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/mq/SendStandMQService.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java index e439dc21..1bebf78d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java @@ -211,6 +211,24 @@ public class SendStandMQService { context = context.replace(",,", ","); saveMap.put("content", context); } + +// 如果出现提示查询报错，而且提示 查询内容无法转换为 日期格式的 情况，原因可能是没有把日期转换为字符串，可以考虑放开下面的代码（目前，域内没有报错，但是，本地有问题） +// //部分字段没有转为汉字，在此处转为汉字 +// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("XCXSSRQName")))) { +// saveMap.put("XCXSSRQName"," " + String.valueOf(saveMap.get("XCXSSRQName"))); +// } +// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("ZCCSSRQName")))) { +// saveMap.put("ZCCSSRQName"," " + String.valueOf(saveMap.get("ZCCSSRQName"))); +// } +// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("SSRQName")))) { +// saveMap.put("SSRQName"," " + String.valueOf(saveMap.get("SSRQName"))); +// } +// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("issueTime")))) { +// saveMap.put("issueTime"," " + String.valueOf(saveMap.get("issueTime"))); +// } +// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("ZCCSSRQ")))) { +// saveMap.put("ZCCSSRQ"," " + String.valueOf(saveMap.get("ZCCSSRQ"))); +// } if("add".equals(addOrUpdate)){ sarStandardsInfoService.insertIntoIndexForMap(saveMap); } else { From 87b843c398fe68954a456fa40d4b9a6b7629fc3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=9B?= <879913833@qq.com> Date: Wed, 19 Jan 2022 10:19:16 +0800 Subject: [PATCH 2/9] =?UTF-8?q?es=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/StandLawsSearchServiceImpl.java | 20 ++++++++++++------- .../impl/SarStandardsInfoServiceImpl.java | 3 +++ 2 files changed, 16 insertions(+), 7 deletions(-) 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 e6593226..65e7bfc9 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 @@ -179,8 +179,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBName")).append(" "); }else { contentBuilder.append("归口管理部门:").append(attrInfoMap.get("GKDWName")).append(" "); - contentBuilder.append("起草单位:").append(attrInfoMap.get("FBJGName")).append(" "); - contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMRName")).append(" "); +// contentBuilder.append("起草单位:").append(attrInfoMap.get("FBJGName")).append(" "); + contentBuilder.append("起草单位:").append(attrInfoMap.get("QCDW")).append(" "); +// contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMRName")).append(" "); + contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMR")).append(" "); contentBuilder.append("我司参与深度:").append(attrInfoMap.get("CYSDName")).append(" "); contentBuilder.append("我司参与制标排名:").append(attrInfoMap.get("CYZBPMName")).append(" "); } @@ -188,8 +190,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXName")).append(" "); contentBuilder.append("适用产品线:").append(attrInfoMap.get("SYCPXName")).append(" "); contentBuilder.append("适用认证:").append(attrInfoMap.get("SYRZName")).append(" "); - contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBMName")).append(" "); - contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCSName")).append(" "); +// contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBMName")).append(" "); + contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBM")).append(" "); +// contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCSName")).append(" "); + contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCS")).append(" "); contentBuilder.append("关联模块--乘用车VPPS编码:").append(attrInfoMap.get("CYCVPPSBMName")).append(" "); contentBuilder.append("关联模块--乘用车vpps中文名称:").append(attrInfoMap.get("CYCVPPSCNName")).append(" "); contentBuilder.append("关联模块--卡车VPPS编码:").append(attrInfoMap.get("KCCVPPSBMName")).append(" "); @@ -309,15 +313,17 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { StringBuilder contentBuilder = new StringBuilder(); contentBuilder.append("企标类别:").append(attrInfoMap.get("standSort")).append(" "); contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append(" "); - contentBuilder.append("企标名称:").append(attrInfoMap.get("standName")).append(" "); + contentBuilder.append("企标名称:").append(attrInfoMap.get("stand_name")).append(" "); contentBuilder.append("企标英文名称:").append(attrInfoMap.get("stand_en_name")).append(" "); contentBuilder.append("文本状态:").append(attrInfoMap.get("textStatusBussName")).append(" "); contentBuilder.append("企标实施日期:").append(attrInfoMap.get("putTime")).append(" "); contentBuilder.append("企标发布日期:").append(attrInfoMap.get("issueTime")).append(" "); contentBuilder.append("废止日期:").append(attrInfoMap.get("FZRQBUSSName")).append(" "); contentBuilder.append("复审日期:").append(attrInfoMap.get("FSRQBUSSName")).append(" "); - contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDWName")).append(" "); - contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSSName")).append(" "); +// contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDWName")).append(" "); + contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDW")).append(" "); +// contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSSName")).append(" "); + contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSS")).append(" "); contentBuilder.append("文件上传人员:").append(attrInfoMap.get("WJSCRYBUSSName")).append(" "); contentBuilder.append("适用车型:").append(attrInfoMap.get("SYCXCLASSName")).append(" "); contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXCLASSName")).append(" "); 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 16353926..244fa967 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 @@ -2605,6 +2605,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl Date: Wed, 19 Jan 2022 13:14:27 +0800 Subject: [PATCH 3/9] commit --- .../impl/StandLawsSearchServiceImpl.java | 20 ++++++++++++------- .../com/adc/da/mq/SendStandMQService.java | 18 +++++++++++++++++ .../impl/SarStandardsInfoServiceImpl.java | 3 +++ 3 files changed, 34 insertions(+), 7 deletions(-) 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 e6593226..65e7bfc9 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 @@ -179,8 +179,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBName")).append(" "); }else { contentBuilder.append("归口管理部门:").append(attrInfoMap.get("GKDWName")).append(" "); - contentBuilder.append("起草单位:").append(attrInfoMap.get("FBJGName")).append(" "); - contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMRName")).append(" "); +// contentBuilder.append("起草单位:").append(attrInfoMap.get("FBJGName")).append(" "); + contentBuilder.append("起草单位:").append(attrInfoMap.get("QCDW")).append(" "); +// contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMRName")).append(" "); + contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMR")).append(" "); contentBuilder.append("我司参与深度:").append(attrInfoMap.get("CYSDName")).append(" "); contentBuilder.append("我司参与制标排名:").append(attrInfoMap.get("CYZBPMName")).append(" "); } @@ -188,8 +190,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXName")).append(" "); contentBuilder.append("适用产品线:").append(attrInfoMap.get("SYCPXName")).append(" "); contentBuilder.append("适用认证:").append(attrInfoMap.get("SYRZName")).append(" "); - contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBMName")).append(" "); - contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCSName")).append(" "); +// contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBMName")).append(" "); + contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBM")).append(" "); +// contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCSName")).append(" "); + contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCS")).append(" "); contentBuilder.append("关联模块--乘用车VPPS编码:").append(attrInfoMap.get("CYCVPPSBMName")).append(" "); contentBuilder.append("关联模块--乘用车vpps中文名称:").append(attrInfoMap.get("CYCVPPSCNName")).append(" "); contentBuilder.append("关联模块--卡车VPPS编码:").append(attrInfoMap.get("KCCVPPSBMName")).append(" "); @@ -309,15 +313,17 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { StringBuilder contentBuilder = new StringBuilder(); contentBuilder.append("企标类别:").append(attrInfoMap.get("standSort")).append(" "); contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append(" "); - contentBuilder.append("企标名称:").append(attrInfoMap.get("standName")).append(" "); + contentBuilder.append("企标名称:").append(attrInfoMap.get("stand_name")).append(" "); contentBuilder.append("企标英文名称:").append(attrInfoMap.get("stand_en_name")).append(" "); contentBuilder.append("文本状态:").append(attrInfoMap.get("textStatusBussName")).append(" "); contentBuilder.append("企标实施日期:").append(attrInfoMap.get("putTime")).append(" "); contentBuilder.append("企标发布日期:").append(attrInfoMap.get("issueTime")).append(" "); contentBuilder.append("废止日期:").append(attrInfoMap.get("FZRQBUSSName")).append(" "); contentBuilder.append("复审日期:").append(attrInfoMap.get("FSRQBUSSName")).append(" "); - contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDWName")).append(" "); - contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSSName")).append(" "); +// contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDWName")).append(" "); + contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDW")).append(" "); +// contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSSName")).append(" "); + contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSS")).append(" "); contentBuilder.append("文件上传人员:").append(attrInfoMap.get("WJSCRYBUSSName")).append(" "); contentBuilder.append("适用车型:").append(attrInfoMap.get("SYCXCLASSName")).append(" "); contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXCLASSName")).append(" "); diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java index e439dc21..1bebf78d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java @@ -211,6 +211,24 @@ public class SendStandMQService { context = context.replace(",,", ","); saveMap.put("content", context); } + +// 如果出现提示查询报错，而且提示 查询内容无法转换为 日期格式的 情况，原因可能是没有把日期转换为字符串，可以考虑放开下面的代码（目前，域内没有报错，但是，本地有问题） +// //部分字段没有转为汉字，在此处转为汉字 +// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("XCXSSRQName")))) { +// saveMap.put("XCXSSRQName"," " + String.valueOf(saveMap.get("XCXSSRQName"))); +// } +// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("ZCCSSRQName")))) { +// saveMap.put("ZCCSSRQName"," " + String.valueOf(saveMap.get("ZCCSSRQName"))); +// } +// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("SSRQName")))) { +// saveMap.put("SSRQName"," " + String.valueOf(saveMap.get("SSRQName"))); +// } +// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("issueTime")))) { +// saveMap.put("issueTime"," " + String.valueOf(saveMap.get("issueTime"))); +// } +// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("ZCCSSRQ")))) { +// saveMap.put("ZCCSSRQ"," " + String.valueOf(saveMap.get("ZCCSSRQ"))); +// } if("add".equals(addOrUpdate)){ sarStandardsInfoService.insertIntoIndexForMap(saveMap); } else { 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 16353926..244fa967 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 @@ -2605,6 +2605,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl Date: Wed, 19 Jan 2022 13:28:24 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E7=BB=84=E5=90=8D=E4=B8=8D=E8=83=BD=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkGroupController.java | 44 ++++++++++++++++--- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java index ba18cc02..40b54d6d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java @@ -5,6 +5,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.customWorkGroup.entity.WorkGroupQueryPage; import com.adc.da.slrs.customWorkGroup.service.IWorkGroupService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiModelProperty; import org.apache.ibatis.annotations.Delete; @@ -14,6 +15,8 @@ import com.adc.da.slrs.customWorkGroup.entity.WorkGroup; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; +import java.util.List; + /** *

* 前端控制器 @@ -34,9 +37,18 @@ public class WorkGroupController extends BaseController { @ApiModelProperty("新增工作组") @PostMapping public ResponseMessage addWorkGroup(WorkGroup workGroup) { - boolean add = iWorkGroupService.add(workGroup); + String meg=""; + if (isDistinct(workGroup.getWorkGroup())){ + if (iWorkGroupService.add(workGroup)){ + meg="新增成功!"; + }else { + meg="新增失败!"; + } + }else { + meg="组名已存在!"; + } - return Result.success(add); + return Result.success("200",meg); } @@ -53,7 +65,6 @@ public class WorkGroupController extends BaseController { @GetMapping public ResponseMessage> getWorkGroupLists(WorkGroupQueryPage queryPage){ IPage workGroup = iWorkGroupService.getWorkGroup(queryPage); - return Result.success(workGroup); } @@ -61,11 +72,34 @@ public class WorkGroupController extends BaseController { @ApiModelProperty("修改工作组") @PutMapping public ResponseMessage updateWorkGroup(WorkGroup workGroup){ - boolean update = iWorkGroupService.update(workGroup); + String meg=""; + if (isDistinct(workGroup.getWorkGroup())){ + if (iWorkGroupService.update(workGroup)){ + meg="修改成功!"; + }else { + meg="修改失败"; + } - return Result.success(update); + }else { + meg="组名已存在!"; + } + + return Result.success("200",meg); } + /** + * 判断提交的工作组名称是否重复 + * @param groupName + * @return true 没有重复 false 有重复 + */ + private boolean isDistinct(String groupName){ + QueryWrapper ew = new QueryWrapper<>(); + + ew.eq("work_group_name",groupName); + + List list = iWorkGroupService.list(ew); + return list.isEmpty(); + } } From cb2dde3bb2bcf42b98f59ad97c9be522c644aee6 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 19 Jan 2022 13:43:58 +0800 Subject: [PATCH 5/9] VALID_FLAG = '0' --- .../mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 2 ++ 1 file changed, 2 insertions(+) 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 557e4d0b..4a7f892f 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 @@ -1723,6 +1723,8 @@ SELECT + id, work_group_name AS workGroup, work_leader_id AS workLeaderId, work_people_id AS workPeopleId From 07ce4f1866bc62de7573edddba8ffb6e7e1d1bd5 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 19 Jan 2022 16:27:39 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=96=B0=E9=9C=80?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/slrs/sarUser/controller/TsUserController.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java index a60290a8..118e43d2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java @@ -97,5 +97,13 @@ public class TsUserController extends BaseController { } + @ApiOperation("调研流程查询人 部门专用接口") + @GetMapping("/selectDeptByDY") + public ResponseMessage> selectDeptByDY(@Param("ids") String ids) throws Exception { + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.in("USID",ids.split(",")); + return Result.success(tsUserService.list(queryWrapper)); + } + } From 4821c6c34b2f820c881acd59a1e285e70d04b7ff Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 19 Jan 2022 16:47:43 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8E=BBhtml=E6=A0=87?= =?UTF-8?q?=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/common/TableToExcel.java | 5 + .../SarPublicIdeaAllController.java | 9 +- .../adc/da/utils/removeHtml/RemoveHtml.java | 100 ++++++++++++++++++ 3 files changed, 110 insertions(+), 4 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/utils/removeHtml/RemoveHtml.java diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java index ad1dec71..df9d072e 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java @@ -1,5 +1,6 @@ package com.adc.da.common; +import com.adc.da.utils.removeHtml.RemoveHtml; import org.apache.commons.beanutils.BeanUtils; import org.apache.poi.hssf.usermodel.HSSFCellStyle; import org.apache.poi.ss.usermodel.*; @@ -93,6 +94,10 @@ public class TableToExcel { if (!"commentText".equals(key)) { try { Object val = BeanUtils.getProperty(t, key); + val= RemoveHtml.getResultsFromHtml(String.valueOf(val)); + if ("null".equals(val)){ + val=""; + } if (val instanceof Long) { dataRow.createCell(v++).setCellValue((Long) val); } else if (val instanceof Double) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java index 33e28534..84176653 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java @@ -6,6 +6,7 @@ import com.adc.da.http.Result; import com.adc.da.slrs.sarStandIdea.dao.SarPublicIdeaAllDao; import com.adc.da.slrs.sarStandIdea.entity.*; import com.adc.da.slrs.sarStandIdea.service.Impl.SarPublicIdeaAllServiceImpl; +import com.adc.da.utils.removeHtml.RemoveHtml; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -140,8 +141,8 @@ public class SarPublicIdeaAllController extends BaseController if ("1".equals(type)) { GetExcelDto2 getExcelDto = GetExcelDto2.builder() .partCode(sarPublicIdeaAll.getPartCode()) - .oldText(sarPublicIdeaAll.getOldText()) - .newText(sarPublicIdeaAll.getNewText()) + .oldText(RemoveHtml.getResultsFromHtml(sarPublicIdeaAll.getOldText())) + .newText(RemoveHtml.getResultsFromHtml(sarPublicIdeaAll.getNewText())) .reason(sarPublicIdeaAll.getReason()) .userName(sarPublicIdeaAll.getUserName()) .deptName(sarPublicIdeaAll.getDeptName()) @@ -152,8 +153,8 @@ public class SarPublicIdeaAllController extends BaseController }else { GetExcelDto getExcelDto = GetExcelDto.builder() .partCode(sarPublicIdeaAll.getPartCode()) - .oldText(sarPublicIdeaAll.getOldText()) - .newText(sarPublicIdeaAll.getNewText()) + .oldText(RemoveHtml.getResultsFromHtml(sarPublicIdeaAll.getOldText())) + .newText(RemoveHtml.getResultsFromHtml(sarPublicIdeaAll.getNewText())) .reason(sarPublicIdeaAll.getReason()) .userName(sarPublicIdeaAll.getUserName()) .deptName(sarPublicIdeaAll.getDeptName()) diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/removeHtml/RemoveHtml.java b/adc-da-slrs/src/main/java/com/adc/da/utils/removeHtml/RemoveHtml.java new file mode 100644 index 00000000..8165d3ff --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/removeHtml/RemoveHtml.java @@ -0,0 +1,100 @@ +package com.adc.da.utils.removeHtml; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class RemoveHtml { + + + /** + * 匹配html标签，例如"

xxx

"这种格式 + */ + private static Pattern HTML_TAG_PATTERN = Pattern.compile("<[a-zA-Z]+.*?>([\\s\\S]*?)"); + + /** + * 替换掉html标签里面的style内容 + * + * @param content + * @return + */ + public static String replaceStyle(String content) { + if (content == null || content.length() == 0) { + return content; + } + String regEx = " style=\"(.*?)\""; + Pattern p = Pattern.compile(regEx); + Matcher m = p.matcher(content); + if (m.find()) { + content = m.replaceAll(""); + } + return content; + } + + + /** + * 移除掉
标签 + * + * @param src + * @return + */ + public static String removeBrTag(String src) { + if (src != null && !src.isEmpty()) { + src = src.replaceAll("
", ""); + } + return src; + } + + + /** + * 针对多个标签嵌套的情况进行处理 + * 比如

王者荣耀

+ * 预处理并且正则匹配完之后结果是 王者荣耀 + * 需要手工移除掉前面的起始标签 + * @param content + * @return + */ + public static String replaceStartTag(String content) { + if (content == null || content.length() == 0) { + return content; + } + String regEx = "<[a-zA-Z]*?>([\\s\\S]*?)"; + Pattern p = Pattern.compile(regEx); + Matcher m = p.matcher(content); + if (m.find()) { + content = m.replaceAll(""); + } + return content; + } + + + + /** + * 获取html中的数据 + * @param htmlStr + * @return + */ + public static String getResultsFromHtml(String htmlStr) { + //定义script的正则表达式，去除js可以防止注入 + String scriptRegex="]*?>[\\s\\S]*?<\\/script>"; + //定义style的正则表达式，去除style样式，防止css代码过多时只截取到css样式代码 + String styleRegex="]*?>[\\s\\S]*?<\\/style>"; + //定义HTML标签的正则表达式，去除标签，只提取文字内容 + String htmlRegex="<[^>]+>"; + //定义空格,回车,换行符,制表符 + String spaceRegex = "\\s*|\t|\r|\n"; + + // 过滤script标签 + htmlStr = htmlStr.replaceAll(scriptRegex, ""); + // 过滤style标签 + htmlStr = htmlStr.replaceAll(styleRegex, ""); + // 过滤html标签 + htmlStr = htmlStr.replaceAll(htmlRegex, ""); + // 过滤空格等 + htmlStr = htmlStr.replaceAll(spaceRegex, ""); + return htmlStr.trim(); // 返回文本字符串 + } + + + + +} From 3bd285aacdc0f82a7140851a93e7a2e9cd437708 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 19 Jan 2022 17:17:24 +0800 Subject: [PATCH 9/9] feat: There is no way the, --- .../ActSarItemsBussEOController.java | 10 ++- .../service/ActSarItemsBussEOService.java | 70 +++++++++++++++++-- .../entity/QualityEvaluation.java | 3 + .../java/com/adc/da/utils/util/Utils.java | 6 ++ 4 files changed, 81 insertions(+), 8 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java index a15cbc75..956a30b3 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java @@ -11,9 +11,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/${restPath}/lawss/actSarItemsBuss") @@ -35,4 +33,10 @@ public class ActSarItemsBussEOController extends BaseController { return Result.error("传入数据json不能为空"); } } + + @ApiOperation(value = "手动更新") + @GetMapping("/autoUpdIndex") + public void autoUpdIndex(@RequestParam("pid") String pid,@RequestParam("bussId") String bussId) { + actSarItemsEOService.autoUpdIndex(pid,bussId); + } } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index badbd890..341e3159 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -29,6 +29,7 @@ import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; import com.adc.da.util.UUIDUtils; import com.adc.da.utils.util.InitStandAttrUtil; +import com.adc.da.utils.util.Utils; import com.adc.da.workFlow.dao.ActSarItemsEODao; import com.adc.da.workFlow.entity.BusProcessEvaluationHis; import com.alibaba.fastjson.JSON; @@ -44,8 +45,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; @Service("actSarItemsBussEOService") @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) @@ -78,6 +81,49 @@ public class ActSarItemsBussEOService { @Value("${elas.flag}") private boolean elasflag; + public void autoUpdIndex(String pid,String bussId){ + List evaluationHisFilter = workFlowFeignClient.evaluationHisList(pid); + List evaluationHis = new ArrayList<>(); + Map> listMap = new TreeMap<>(); + + // 按 相同数据分组 + listMap = evaluationHisFilter.stream().collect( + Collectors.groupingBy(a -> Utils.format("{0}#{1}", a.getPId(),a.getTaskInfo()))); + + List evaluations = new ArrayList<>(); + if(!listMap.isEmpty()){ + SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); + listMap.forEach((key, value) -> { + if(!value.isEmpty()){ + evaluationHis.add(value.get(0)); + } + }); + String finalBussId = bussId; + Date date = new Date(); + evaluationHis.forEach(busProcessEvaluationHis -> { + List valueArr = JSONArray.parseArray(busProcessEvaluationHis.getMesg(),JSONObject.class); + if(!valueArr.isEmpty()){ + valueArr.forEach(object -> { + QualityEvaluation evaluation = new QualityEvaluation(); + evaluation.setId(UUIDUtils.randomUUID20()); + evaluation.setLawId(finalBussId); + evaluation.setUserId(object.getString("userId")); + evaluation.setScore(object.getString("score")); + evaluation.setReason(object.getString("reason")); + evaluation.setEvaluationIndex(object.getString("code")); + evaluation.setProcessNode(object.getString("processNode")); + evaluation.setEvaluationType(object.getString("indexType")); + evaluation.setCreateTime(date); + evaluation.setModifyTime(date); + evaluations.add(evaluation); + + }); + } + }); + qualityEvaluationService.saveBatch(evaluations); + } + } + /*** * @Description: 国内外标准流程入库" * @Date: 2020/12/7 13:48 @@ -238,10 +284,24 @@ public class ActSarItemsBussEOService { // saveCompStatusInfo(sarStandardsInfoEO,breakVal,allItems,prcNum); // } - List evaluationHis = workFlowFeignClient.evaluationHisList(pid); + List evaluationHisFilter = workFlowFeignClient.evaluationHisList(pid); + List evaluationHis = new ArrayList<>(); + Map> listMap = new TreeMap<>(); + + // 按 相同数据分组 + listMap = evaluationHisFilter.stream().collect( + Collectors.groupingBy(a -> Utils.format("{0}#{1}", a.getPId(),a.getTaskInfo()))); + List evaluations = new ArrayList<>(); - if(!evaluationHis.isEmpty()){ + if(!listMap.isEmpty()){ + SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); + listMap.forEach((key, value) -> { + if(!value.isEmpty()){ + evaluationHis.add(value.get(0)); + } + }); String finalBussId = bussId; + Date date = new Date(); evaluationHis.forEach(busProcessEvaluationHis -> { List valueArr = JSONArray.parseArray(busProcessEvaluationHis.getMesg(),JSONObject.class); if(!valueArr.isEmpty()){ @@ -255,15 +315,15 @@ public class ActSarItemsBussEOService { evaluation.setEvaluationIndex(object.getString("code")); evaluation.setProcessNode(object.getString("processNode")); evaluation.setEvaluationType(object.getString("indexType")); - evaluation.setCreateTime(new Date()); - evaluation.setModifyTime(new Date()); + evaluation.setCreateTime(date); + evaluation.setModifyTime(date); evaluations.add(evaluation); }); } }); + qualityEvaluationService.saveBatch(evaluations); } - qualityEvaluationService.saveBatch(evaluations); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java index db50f52a..a6398a23 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity; import com.adc.da.base.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -77,10 +78,12 @@ public class QualityEvaluation extends BaseEntity { @ApiModelProperty(value = "创建时间") @TableField(fill = FieldFill.INSERT) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; @ApiModelProperty(value = "更新时间") @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date modifyTime; diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/Utils.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/Utils.java index 27a7a463..f43dfae9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/Utils.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/Utils.java @@ -5,6 +5,8 @@ import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.Row; +import java.text.MessageFormat; + /** * @Description: TODO * @author: super_liu @@ -12,6 +14,10 @@ import org.apache.poi.ss.usermodel.Row; */ public class Utils { + public static String format(String value, Object... paras) { + return MessageFormat.format(value, paras); + } + //判断row是否为空 空返回true public static boolean isRowEmpty(Row row) { if (null == row) {