FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_migration' into 'develop_master'

Browse Source 
feat: There is no way the,  改改改 从企标计划开始 改到 企标标准入库及企标库 改至计划已确认关联之多…… 待改完

See merge request LiuChao/foton-slrs-system-rest!543
This commit is contained in:
super_liu
2022-06-28 18:04:39 +08:00
parent 3ec5d054f2 dd0676c577
commit 4380b2af06
7 changed files with 147 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsPlanController.java
+42
View File
@@ -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不能为空");
}
}
}
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java
+12 -2
View File
@@ -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<EsRevisePlan> list = iEsRevisePlanService.list(qw);
if(!list.isEmpty()){
esRevisePlanDTO.setId(list.get(0).getId());
iEsRevisePlanService.updateById(esRevisePlanDTO);
}else{
iEsRevisePlanService.addPlan(esRevisePlanDTO);
}
}
}
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsPlanService.java
+78
View File
@@ -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<String,String> 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<String,String> 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<EsRevisePlan> list = iEsRevisePlanService.list(qw);
if(!list.isEmpty()){
esRevisePlanDTO.setId(list.get(0).getId());
iEsRevisePlanService.updateById(esRevisePlanDTO);
}else{
iEsRevisePlanService.addPlan(esRevisePlanDTO);
}
}else {
iEsRevisePlanService.addPlan(esRevisePlanDTO);
}
}
}
}
adc-da-slrs/src/main/java/com/adc/da/search/bean/SearchCenter.java
+1 -1
View File
@@ -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
adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java
+3 -2
View File
@@ -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<Map<String, Object>> 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);
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java
+9
View File
@@ -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<EsRevisePlan> {
}
//----------------回来改----------------------上面的------
@ApiOperation(value = "获取是否存在重复名企标名称接口")
@GetMapping("/getDataByNameAndSort")
public ResponseMessage<Integer> 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<Object> getDataByName(EsRevisePlan esRevisePlan){
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java
+2 -2
View File
@@ -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)")