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

Merge branch 'develop_master' into FOTON

Browse Source
This commit is contained in:
liyawei
2022-11-22 20:34:25 +08:00
parent d2ce68971f e68ff9b658
commit 19d89cb73f
10 changed files with 122 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
+6
View File
@@ -53,6 +53,12 @@ public interface workFlowFeignClient {
@RequestMapping(value = "/bat-wkflow/oaTaskExec/execTask",method = RequestMethod.GET)
Map<String,Object> execTask(@RequestParam("todoId") String todoId);
@RequestMapping(value = "/bat-wkflow/esPrcRelation/acceptTask",method = RequestMethod.GET)
Integer acceptTask(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("taskId") String taskId);
@RequestMapping(value = "/bat-wkflow/esPrcRelation/judgeAcceptTask",method = RequestMethod.GET)
Boolean judgeAcceptTask(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("prcIdGk") String prcIdGk);
@RequestMapping(value = "/bat-wkflow/task/get_verify_by_instance",method = RequestMethod.GET)
Map<String,Object> get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId);
adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java
+10
View File
@@ -80,6 +80,16 @@ public class workFlowFeignClientImpl {
return stringWrapper;
}
public Integer acceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("taskId") String taskId){
Integer integerWrapper = workFlowFeignClient.acceptTask(nowEsId,oaFlag,taskId);
return integerWrapper;
}
public Boolean judgeAcceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("prcIdGk") String prcIdGk){
Boolean booleanWrapper = workFlowFeignClient.judgeAcceptTask(nowEsId,oaFlag,prcIdGk);
return booleanWrapper;
}
public Map<String,Object> get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){
Map<String,Object> stringWrapper = workFlowFeignClient.get_verify_by_instance(taskId,pId);
return stringWrapper;
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+12
View File
@@ -243,6 +243,18 @@ public class WorkFlowController {
return workFlowFeignClient.execTask(todoId);
}
@ApiOperation(value = "管控流程接收任务")
@GetMapping("/acceptTack")
public Integer acceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("taskId") String taskId) {
return workFlowFeignClient.acceptTack(nowEsId,oaFlag,taskId);
}
@ApiOperation(value = "管控流程判断接收任务")
@GetMapping("/judgeAcceptTack")
public ResponseMessage<Boolean> judgeAcceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("prcIdGk") String prcIdGk) {
return Result.success(workFlowFeignClient.judgeAcceptTack(nowEsId,oaFlag,prcIdGk));
}
@ApiOperation(value = "流程实例明细验证是否完成")
@GetMapping("/get_verify_by_instance")
public Map<String,Object> activiti_define_start1(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){
adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
+2
View File
@@ -59,6 +59,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
addInterceptor.excludePathPatterns("/api/lawss/sarLawsInfo/exportStandardsInfoExcel");
// 提供自动发起复审流程 复审数据
addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStandState/getSarBussionessStandStateProcessList");
// 提供企标计划数据
addInterceptor.excludePathPatterns("/api/esRevisePlan/es-revise-plan/getAllPlansByWk");
//pcms项目数据下发开放接口
addInterceptor.excludePathPatterns("/api/sarStandProjectLibrary/save");
addInterceptor.excludePathPatterns("/api/sar-stand-project-team/save");
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java
+9 -1
View File
@@ -46,6 +46,13 @@ public class EsRevisePlanController extends BaseController<EsRevisePlan> {
return Result.success(pageInfo);
}
@ApiOperation(value = "获取所有企标计划给流程")
@GetMapping("getAllPlansByWk")
public List<EsRevisePlan> getAllPlansByWk(String esName){
List<EsRevisePlan> esRevisePlans = iEsRevisePlanService.getAllPlansByWk(esName);
return esRevisePlans;
}
@ApiOperation(value = "多条件查询企标计划")
@PostMapping("queryAllPlans")
public ResponseMessage<Object> queryAllPlans(EsRevisePlan esRevisePlan){
@@ -148,7 +155,7 @@ public class EsRevisePlanController extends BaseController<EsRevisePlan> {
@ApiOperation(value = "添加企标计划")
@PostMapping("addPlan")
public ResponseMessage<Object> addPlan(EsRevisePlan esRevisePlan){
return Result.success(iEsRevisePlanService.addPlan(esRevisePlan));
return iEsRevisePlanService.addPlan(esRevisePlan);
}
@ApiOperation(value = "添加企标计划")
@@ -174,4 +181,5 @@ public class EsRevisePlanController extends BaseController<EsRevisePlan> {
public ResponseMessage<Object> delPlans(String ids){
return Result.success(iEsRevisePlanService.delPlans(ids));
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java
+4 -1
View File
@@ -1,5 +1,6 @@
package com.adc.da.slrs.esRevisePlan.service;
import com.adc.da.http.ResponseMessage;
import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -21,8 +22,10 @@ public interface IEsRevisePlanService extends IService<EsRevisePlan> {
String modPlan(EsRevisePlan esRevisePlan);//编辑
String modPlanByState(EsRevisePlan esRevisePlan);//编辑
String modPlanByProcess(EsRevisePlan esRevisePlan);//编辑
String addPlan(EsRevisePlan esRevisePlan);//插入
ResponseMessage<Object> addPlan(EsRevisePlan esRevisePlan);//插入
int delPlan(String id);//删除
int delPlans(String ids);//批量删除
List<EsRevisePlan> getDataByName(EsRevisePlan esRevisePlan);
List<EsRevisePlan> getAllPlansByWk(String esName);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
+21 -3
View File
@@ -1,5 +1,7 @@
package com.adc.da.slrs.esRevisePlan.service.impl;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.login.util.UserUtils;
import com.adc.da.slrs.esMatingRelation.entity.EsMatingRelation;
import com.adc.da.slrs.esMatingRelation.service.IEsMatingRelationService;
@@ -150,11 +152,11 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
}
@Override
public String addPlan(EsRevisePlan esRevisePlan) {
public ResponseMessage<Object> addPlan(EsRevisePlan esRevisePlan) {
esRevisePlan.setId(UUIDUtils.randomUUID(32));
List<EsRevisePlan> esRevisePlans=esRevisePlanDao.selectPageByName(esRevisePlan);
if (esRevisePlans.size()>0){
return "企标名称不能重复,请更换新的企标名称";
return Result.success("企标名称不能重复,请更换新的企标名称");
}else {
esRevisePlanDao.insertOne(esRevisePlan);
//加日志
@@ -170,7 +172,7 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
+"创建了《"+ esName +"》";
}
esRevisePlanLogDao.insert(new EsRevisePlanLog(null,id,msg,date));
return "操作成功";
return Result.success("200", esRevisePlan.getId(), "操作成功");
}
}
@@ -203,4 +205,20 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
public List<EsRevisePlan> getDataByName(EsRevisePlan esRevisePlan) {
return esRevisePlanDao.selectPageByName(esRevisePlan);
}
@Override
public List<EsRevisePlan> getAllPlansByWk(String esName) {
QueryWrapper<EsRevisePlan> queryWrapper = new QueryWrapper<>();
if (StringUtils.isNotBlank(esName)) {
queryWrapper.lambda().eq(EsRevisePlan::getEsName, esName);
} else {
List<String> planStatus = new ArrayList<>();
planStatus.add("1");
planStatus.add("2");
queryWrapper.lambda().in(EsRevisePlan::getPlanStatus, planStatus);
}
return esRevisePlanDao.selectList(queryWrapper);
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+25 -6
View File
@@ -62,6 +62,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import net.sf.json.JSONObject;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.json.JSONTokener;
import org.slf4j.Logger;
@@ -1333,6 +1334,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
String treeType = standardsInfoEO.getTreeType();
String menuName = standardsInfoEO.getMenuName();
sarStandMenuEO.setMenuId(nowMenuId);
QueryWrapper<SarBussStandMenu> queryWrapper = new QueryWrapper<>();
List<String> menuOldIds = new ArrayList<>();
for (int i = 0; i < standardsInfoEO.getIdlist().length; i++) {
String standId = standardsInfoEO.getIdlist()[i];
sarStandMenuEO.setBussStandId(standId);
@@ -1375,20 +1378,36 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
sarBussStandMenuEODao.deleteByStandIdAndMenuId(sarStandMenuDel);
int op = 0;
if (getInfo == null || getInfo.isEmpty()) {
sarStandMenuEO.setId(UUIDUtils.randomUUID20());
op = sarBussStandMenuEODao.insertSelective(sarStandMenuEO);
queryWrapper.lambda().eq(SarBussStandMenu::getBussStandId, standId);
List<SarBussStandMenu> oldList = sarBussStandMenuEODao.selectList(queryWrapper);
if (CollectionUtils.isNotEmpty(oldList)) {
menuOldIds = oldList.stream().map(SarBussStandMenu::getMenuId).collect(Collectors.toList());
if (!menuOldIds.contains(nowMenuId)) {
sarStandMenuEO.setId(UUIDUtils.randomUUID20());
op = sarBussStandMenuEODao.insertSelective(sarStandMenuEO);
}
}
} else {
sarStandMenuEO.setOldMenuId(secondLevelId);
List<String> menuOldIds = new ArrayList<>();
if(StringUtils.isNotBlank(treeType) && "sarMs".equals(treeType)) {
menuOldIds = iSarMenuStandardService.getChildMenuList(secondLevelId);
sarStandMenuEO.setMenuIds(menuOldIds);
sarStandMenuEO.setId(getInfo.get(0).getId());
op = sarBussStandMenuEODao.updateById(sarStandMenuEO);
}else {
menuOldIds= iTsResourceService.getChildMenuList(secondLevelId);
sarStandMenuEO.setMenuIds(menuOldIds);
op = sarBussStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO);
// menuOldIds= iTsResourceService.getChildMenuList(secondLevelId);
// sarStandMenuEO.setMenuIds(menuOldIds);
// op = sarBussStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO);
queryWrapper.lambda().eq(SarBussStandMenu::getBussStandId, standId);
List<SarBussStandMenu> oldList = sarBussStandMenuEODao.selectList(queryWrapper);
if (CollectionUtils.isNotEmpty(oldList)) {
menuOldIds = oldList.stream().map(SarBussStandMenu::getMenuId).collect(Collectors.toList());
if (!menuOldIds.contains(nowMenuId)) {
sarStandMenuEO.setId(UUIDUtils.randomUUID20());
op = sarBussStandMenuEODao.insertSelective(sarStandMenuEO);
}
}
}
}
if(StringUtils.isNotBlank(treeType) && "sarMs".equals(treeType)) {
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java
+7 -2
View File
@@ -329,11 +329,16 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
@PostMapping("/save")
@ApiOperation("同步车型项目数据")
public ResponseDto save(@RequestBody String jsonStr){
log.info(jsonStr);
log.info("======================================开始同步车型项目数据========================================");
log.info("同步数据内容：" + jsonStr);
if (StringUtils.isBlank(jsonStr)) {
log.info("同步数据内容为空");
return null;
}
Head head = sarStandProjectLibraryService.AnalysisJsonAndStorage(jsonStr);
ResponseDto responseDto = new ResponseDto(head);
log.info("======================================结束同步车型项目数据========================================");
return responseDto;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+26 -14
View File
@@ -86,6 +86,7 @@ import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import net.sf.json.JSONObject;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.util.PDFTextStripper;
@@ -3099,6 +3100,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
SarStandMenu sarStandMenuEO = new SarStandMenu();
String nowMenuId = standardsInfoEO.getMenuId();
sarStandMenuEO.setMenuId(nowMenuId);
QueryWrapper<SarStandMenu> queryWrapper = new QueryWrapper<>();
List<String> menuOldIds = new ArrayList<>();
for (int i = 0; i < standardsInfoEO.getIdlist().length; i++) {
sarStandMenuEO.setStandId(standardsInfoEO.getIdlist()[i]);
sarStandMenuEO.setId(null);
@@ -3125,21 +3128,30 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
sarStandMenuDel.setMenuId(standardsInfoEO.getRootMenuId());
sarStandMenuEODao.deleteByStandIdAndMenuId(sarStandMenuDel);
//重新配置到相应节点
if (getInfo == null || getInfo.isEmpty()) {
sarStandMenuEO.setId(UUIDUtils.randomUUID20());
int size = sarStandMenuEODao.insert(sarStandMenuEO);
// if (size>0){
// return true;
// }
} else {
sarStandMenuEO.setOldMenuId(secondLevelId);
List<String> menuOldIds = sarMenuEOService.getChildMenuList(secondLevelId);
sarStandMenuEO.setMenuIds(menuOldIds);
int size = sarStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO);
// if (size>0) {
// return true;
// }
queryWrapper.lambda().eq(SarStandMenu::getStandId, standardsInfoEO.getIdlist()[i]);
List<SarStandMenu> oldList = sarStandMenuEODao.selectList(queryWrapper);
if (CollectionUtils.isNotEmpty(oldList)) {
menuOldIds = oldList.stream().map(SarStandMenu::getMenuId).collect(Collectors.toList());
if (!menuOldIds.contains(nowMenuId)) {
sarStandMenuEO.setId(UUIDUtils.randomUUID20());
int size = sarStandMenuEODao.insert(sarStandMenuEO);
}
}
// if (getInfo == null || getInfo.isEmpty()) {
// sarStandMenuEO.setId(UUIDUtils.randomUUID20());
// int size = sarStandMenuEODao.insert(sarStandMenuEO);
//// if (size>0){
//// return true;
//// }
// } else {
// sarStandMenuEO.setOldMenuId(secondLevelId);
// List<String> menuOldIds = sarMenuEOService.getChildMenuList(secondLevelId);
// sarStandMenuEO.setMenuIds(menuOldIds);
// int size = sarStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO);
//// if (size>0) {
//// return true;
//// }
// }
}
return true;
}