From aa3bdac315920fae99827376240ba2502549bf40 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 28 Jun 2022 17:55:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=20?= =?UTF-8?q?=E6=94=B9=E6=94=B9=E6=94=B9=20=E4=BB=8E=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=BC=80=E5=A7=8B=20=E6=94=B9=E5=88=B0=20?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E5=8F=8A?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=BA=93=20=E6=94=B9=E8=87=B3=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=B7=B2=E7=A1=AE=E8=AE=A4=E5=85=B3=E8=81=94=E4=B9=8B?= =?UTF-8?q?=E5=A4=9A=E2=80=A6=E2=80=A6=20=E5=BE=85=E6=94=B9=E5=AE=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ActSarItemsPlanController.java | 42 ++++++++++ .../service/ActSarItemsBussEOService.java | 14 +++- .../service/ActSarItemsPlanService.java | 78 +++++++++++++++++++ .../controller/EsRevisePlanController.java | 9 +++ .../esRevisePlan/entity/EsRevisePlan.java | 4 +- 5 files changed, 143 insertions(+), 4 deletions(-) create mode 100644 adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsPlanController.java create mode 100644 adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsPlanService.java diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsPlanController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsPlanController.java new file mode 100644 index 00000000..8483188a --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsPlanController.java @@ -0,0 +1,42 @@ +package com.adc.da.workFlow.controller; + + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO; +import com.adc.da.workFlow.service.ActSarItemsEOService; +import com.adc.da.workFlow.service.ActSarItemsPlanService; +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.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/${restPath}/lawss/actSarItemsPlan") +@Api(tags = "业务系统立项流程入库") +public class ActSarItemsPlanController { + + @Autowired + private ActSarItemsPlanService actSarItemsEOService; + +// private static final Logger logger = LoggerFactory.getLogger(AttFileEOController.class); + + @Value("${file.path}") + private String filePath;//文件存储路径 + + @ApiOperation(value = "立项入库流程入库") + @PostMapping("/processCreatePlan") + public ResponseMessage processCreatePlan(String infoJson) throws Exception { + if (StringUtils.isNotBlank(infoJson)) { + actSarItemsEOService.processCreatePlan(infoJson); + return Result.success("入库成功"); + } else { + return Result.error("传入数据json不能为空"); + } + } +} 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 a1624bf4..03c57e90 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 @@ -169,7 +169,7 @@ public class ActSarItemsBussEOService { esRevisePlanDTO.setUnitName(QCDW); esRevisePlanDTO.setDrafter(QCRBUSSID); esRevisePlanDTO.setDrafterName(QCRBUSS); - esRevisePlanDTO.setPlanStatus("0"); + esRevisePlanDTO.setPlanStatus("6"); esRevisePlanDTO.setReviseStatus("2"); esRevisePlanDTO.setDraftTime(DateUtil.printToDate(draftTime)); esRevisePlanDTO.setReleaseTime(DateUtil.printToDate(releaseTime)); @@ -180,7 +180,17 @@ public class ActSarItemsBussEOService { esRevisePlanDTO.setArea(SYCXCLASS); esRevisePlanDTO.setRqbName(DTQBBHBUSS); esRevisePlanDTO.setLxd(LXD); - iEsRevisePlanService.addPlan(esRevisePlanDTO); + + QueryWrapper qw = new QueryWrapper(); + qw.eq("es_name",standName); + qw.eq("buss_sort",standSort); + List list = iEsRevisePlanService.list(qw); + if(!list.isEmpty()){ + esRevisePlanDTO.setId(list.get(0).getId()); + iEsRevisePlanService.updateById(esRevisePlanDTO); + }else{ + iEsRevisePlanService.addPlan(esRevisePlanDTO); + } } } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsPlanService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsPlanService.java new file mode 100644 index 00000000..67ed83a6 --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsPlanService.java @@ -0,0 +1,78 @@ +package com.adc.da.workFlow.service; + +import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; +import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; +import com.adc.da.workFlow.dao.ActSarItemsEODao; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.apache.commons.lang3.StringUtils; +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.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service("actSarItemsPlanService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class ActSarItemsPlanService { + + private static final Logger logger = LoggerFactory.getLogger(ActSarItemsPlanService.class); + + @Autowired + private IEsRevisePlanService iEsRevisePlanService; + + + @Value("${elas.flag}") + private boolean elasflag; + + public void processCreatePlan(String standJson) throws Exception{ + JSONObject object = new JSONObject(); + object = JSONObject.parseObject(standJson); + if (object != null && !object.isEmpty()) { + Map plan_status=new HashMap<>(); + plan_status.put("未开始","0"); + plan_status.put("制定中","1"); + plan_status.put("修订中","2"); + plan_status.put("已取消","3"); + plan_status.put("已完成","4"); + plan_status.put("立项已完成","5"); + plan_status.put("计划已确认","6"); + Map revise_status=new HashMap<>(); + revise_status.put("制定","1"); + revise_status.put("修订","2"); + + EsRevisePlan esRevisePlanDTO=new EsRevisePlan(); + esRevisePlanDTO.setEsName(object.getString("esName")); + esRevisePlanDTO.setUnit(object.getString("unit")); + esRevisePlanDTO.setUnitName(object.getString("unitName")); + esRevisePlanDTO.setDrafter(object.getString("drafter")); + esRevisePlanDTO.setPlanStatus("5"); + esRevisePlanDTO.setReviseStatus(revise_status.get(object.getString("reviseStatus"))); + esRevisePlanDTO.setDraftTime(object.getDate("firstDraftTime")); + esRevisePlanDTO.setReleaseTime(object.getDate("planTime")); + esRevisePlanDTO.setBussSort(object.getString("bussSort")); + if(StringUtils.isNotBlank(object.getString("esName")) && StringUtils.isNotBlank(object.getString("bussSort"))){ + QueryWrapper qw = new QueryWrapper(); + qw.eq("es_name",object.getString("esName")); + qw.eq("buss_sort",object.getString("bussSort")); + List list = iEsRevisePlanService.list(qw); + if(!list.isEmpty()){ + esRevisePlanDTO.setId(list.get(0).getId()); + iEsRevisePlanService.updateById(esRevisePlanDTO); + }else{ + iEsRevisePlanService.addPlan(esRevisePlanDTO); + } + }else { + iEsRevisePlanService.addPlan(esRevisePlanDTO); + } + } + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java index 0bfc5a1f..7a8719ef 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -5,6 +5,7 @@ import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.ApiOperation; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; @@ -54,6 +55,14 @@ public class EsRevisePlanController extends BaseController { } //----------------回来改----------------------上面的------ + @ApiOperation(value = "获取是否存在重复名企标名称接口") + @GetMapping("/getDataByNameAndSort") + public ResponseMessage getDataByNameAndSort(EsRevisePlan esRevisePlan){ + QueryWrapper qw = new QueryWrapper(); + qw.eq("buss_sort",esRevisePlan.getBussSort()); + qw.eq("es_name",esRevisePlan.getEsName()); + return Result.success(iEsRevisePlanService.count(qw)); + } @ApiOperation(value = "获取是否存在重复名企标名称接口") @GetMapping("/getDataByName") public ResponseMessage getDataByName(EsRevisePlan esRevisePlan){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java index 0c38b17d..f96fc6d8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -71,10 +71,10 @@ public class EsRevisePlan extends BasePage { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private Date releaseTime; - @ApiModelProperty(value = "起草责任单位") + @ApiModelProperty(value = "起草责任单位ID") private String unit; - @ApiModelProperty(value = "起草责任单位ID") + @ApiModelProperty(value = "起草责任单位名称") private String unitName; @ApiModelProperty(value = "引入企业标准json(标准id)") From dd0676c577f1673633be9a175bbe301ea036ef35 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 28 Jun 2022 18:04:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20UPDN?= =?UTF-8?q?ONEXISTENT=5FnameEn=20(=E5=8F=AA=E6=94=AF=E6=8C=81=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3,=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4ES=20=E8=8B=B1=E6=96=87=E5=AD=97=E6=AE=B5=E4=B8=8D?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=9A=84=E6=95=B0=E6=8D=AE)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/search/bean/SearchCenter.java | 2 +- .../com/adc/da/search/server/ResetSearchCenterService.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/bean/SearchCenter.java b/adc-da-slrs/src/main/java/com/adc/da/search/bean/SearchCenter.java index 648ebc02..4565eb87 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/bean/SearchCenter.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/bean/SearchCenter.java @@ -25,7 +25,7 @@ public class SearchCenter { @ApiModelProperty(value = "执行参数 ALL 存在更新 不存在新增 ,UPD 只 更新存在 es 里的标准 ,ADD 只新增不存在 es 的标准," + " DEL 只删除不存在标准库的数据（删除只能用DEL 减少自动错删）," + "UPDNONEXISTENT (只支持文本查询接口)更新不存在字段业务数据（其他任务导致ES不同步）, UPDNONEXISTENT_TEXTSTATUS (只支持文本查询接口,文本状态高亮字段不同步重置)," + - "UPDNONEXISTENT_nameEn (只支持文本查询接口,维护ES 英文字段不存在的数据)") + "UPDNONEXISTENT_NAMEEN (只支持文本查询接口,维护ES 英文字段不存在的数据)") private String execType; @NotNull diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java index 1550c547..c4678dc0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java @@ -1165,7 +1165,7 @@ public class ResetSearchCenterService { } }).collect(Collectors.toList()); esIdList = filterList.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); - }else if("UPDNONEXISTENT_nameEn".equals(searchCenter.getExecType().toUpperCase())){ + }else if("UPDNONEXISTENT_NAMEEN".equals(searchCenter.getExecType().toUpperCase())){ List> filterList = searchListData.stream().filter(stringObjectMap -> { if(stringObjectMap.get("nameEnTitle") == null){ return true; @@ -1221,7 +1221,8 @@ public class ResetSearchCenterService { if(!updList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "UPD".equals(searchCenter.getExecType().toUpperCase()) || "UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase()) - || "UPDNONEXISTENT_TEXTSTATUS".equals(searchCenter.getExecType().toUpperCase()))){ + || "UPDNONEXISTENT_TEXTSTATUS".equals(searchCenter.getExecType().toUpperCase()) + || "UPDNONEXISTENT_NAMEEN".equals(searchCenter.getExecType().toUpperCase()))){ for(SarBussionessStand sarBussionessStandEO : updList){ countUpdateSuccess++; bussAttrInfoShowSearchDetails(sarBussionessStandEO);