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:
Superman_Main
2021-11-23 21:16:46 +08:00
parent 56401bbc35 e1ee94ad1a
commit 5f16c6fd62
18 changed files with 191 additions and 37 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
+3
View File
@@ -44,6 +44,9 @@ public interface workFlowFeignClient {
@RequestMapping(value = "/bat-wkflow/todoTaskList",method = RequestMethod.POST)
List<BusProcessName> todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery);
@RequestMapping(value = "/bat-wkflow/todoTaskListNew",method = RequestMethod.POST)
List<BusProcessName> todoTaskListByUserIdNew(@RequestBody TaskCommonQuery taskCommonQuery);
@RequestMapping(value = "/bat-wkflow/completeTask",method = RequestMethod.POST)
Wrapper<String> completeTaskByUserId(@RequestBody BusMes busMes);
adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java
+5
View File
@@ -64,6 +64,11 @@ public class workFlowFeignClientImpl {
return mapWrapper;
}
public List<BusProcessName> todoTaskListByUserIdNew(@RequestBody TaskCommonQuery taskCommonQuery){
List<BusProcessName> mapWrapper = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery);
return mapWrapper;
}
/**
* 开始分页
* @param list
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+21
View File
@@ -280,6 +280,27 @@ public class WorkFlowController {
return pageInfo;
}
@ApiOperation(value = "我的待办任务列表")
@PostMapping("/todoTaskListNew")
public PageInfo<BusProcessName> todoTaskListNew(@RequestBody TaskCommonQuery taskCommonQuery){
List<BusProcessName> busProcessNames = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery);
List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize());
PageInfo<BusProcessName> pageInfo= new PageInfo<BusProcessName>();
if(busProcessNames!=null){
pageInfo.setList(list1);
pageInfo.setPageNo(taskCommonQuery.getCurrent());
pageInfo.setCount(Long.valueOf(busProcessNames.size()));
pageInfo.setPageSize(taskCommonQuery.getSize());
}else{
List<BusProcessName> list = new ArrayList<>();
pageInfo.setList(list);
pageInfo.setPageNo(taskCommonQuery.getCurrent());
pageInfo.setCount(Long.valueOf(0));
pageInfo.setPageSize(taskCommonQuery.getSize());
}
return pageInfo;
}
@ApiOperation(value = "完成任务")
@PostMapping("/completeTask")
public Wrapper<String> completeTaskByUserId( BusMes busMes){
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java
+5
View File
@@ -2,9 +2,14 @@ package com.adc.da.slrs.sarStandWarning.dao;
import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Param;
public interface EarlyWarningEODao extends BaseMapper<EarlyWarningEO> {
IPage<EarlyWarningEO> selectWarningPage(IPage<EarlyWarningEO> page, @Param(Constants.WRAPPER) QueryWrapper<EarlyWarningEO> queryWrapper);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java
+10
View File
@@ -72,5 +72,15 @@ public class EarlyWarningEO extends BaseEntity {
@TableField("POWER")
private String power;
@TableField(exist = false)
private String issueTime;
@TableField(exist = false)
private String SSRQ;
@TableField(exist = false)
private String XCXSSRQ;
@TableField(exist = false)
private String ZCCSSRQ;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationNationalStandardController.java
+12
View File
@@ -1,6 +1,8 @@
package com.adc.da.slrs.sarStandardComplianceAssessResult.controller;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
import com.adc.da.slrs.sarStandardComplianceAssessResult.service.impl.SarInterpretationNationalStandardServiceImpl;
import io.swagger.annotations.ApiOperation;
@@ -37,4 +39,14 @@ public class SarInterpretationNationalStandardController extends BaseController<
return sarInterpretationNationalStandardService.saveBath(findStandDto);
}
@ApiOperation(value = "修改技术评估结果")
@PostMapping("/updateById")
public ResponseMessage<String> updateById(@RequestBody SarInterpretationNationalStandard findStandDto){
if (sarInterpretationNationalStandardService.updateData(findStandDto)) {
return Result.success("success");
}else {
return Result.error("error");
}
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
+1 -1
View File
@@ -79,7 +79,7 @@ public class SarStandardComplianceAssessResultController {
if (eo.getPosition() == 1) {
QueryWrapper<SarInterpretationNationalStandard> queryWrapper = new QueryWrapper<>();
IPage<SarInterpretationNationalStandard> 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,risk_degree");
if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) {
queryWrapper.like("STAND_NAME", eo.getStandName().trim());
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java
+3
View File
@@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.dao;
import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
/**
* <p>
@@ -13,4 +14,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface SarInterpretationNationalStandardDao extends BaseMapper<SarInterpretationNationalStandard> {
boolean updateData(@Param("find") SarInterpretationNationalStandard findStandDto);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java
+5
View File
@@ -93,4 +93,9 @@ public class SarInterpretationNationalStandard extends BaseEntity {
@TableField("ID")
private String id;
@ApiModelProperty(value = "风险程度")
@TableField("risk_degree")
private String riskDegree;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java
+2
View File
@@ -16,4 +16,6 @@ import java.util.List;
public interface ISarInterpretationNationalStandardService extends IService<SarInterpretationNationalStandard> {
String saveBath(List<SarInterpretationNationalStandard> sarInterpretationNationalStandards);
boolean updateData(SarInterpretationNationalStandard findStandDto);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java
+7 -2
View File
@@ -24,8 +24,8 @@ import java.util.List;
@Service
public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl<SarInterpretationNationalStandardDao, SarInterpretationNationalStandard> implements ISarInterpretationNationalStandardService {
// @Autowired
// SarStandardComplianceProductAssessDao sarStandardComplianceProductAssessDao;
@Autowired
SarInterpretationNationalStandardDao sarInterpretationNationalStandardDao;
@Override
public String saveBath(List<SarInterpretationNationalStandard> sarInterpretationNationalStandards) {
@@ -50,4 +50,9 @@ public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl<Sa
String res = flag ? "1":"0";
return res;
}
@Override
public boolean updateData(SarInterpretationNationalStandard findStandDto) {
return sarInterpretationNationalStandardDao.updateData(findStandDto);
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+13 -12
View File
@@ -53,6 +53,9 @@ import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao;
import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService;
import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService;
import com.adc.da.slrs.sarUser.service.ITsUserService;
import com.adc.da.slrs.standardSplit.dao.SarFileSplitInfoEODao;
import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEO;
import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEOPage;
import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
import com.adc.da.slrs.tsDictionaryType.dao.TsDicTypeDao;
import com.adc.da.slrs.tsDictionaryType.dao.TsDictionaryDao;
@@ -539,16 +542,23 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
return resultMap;
}
@Autowired
private SarFileSplitInfoEODao sarFileSplitInfoEODao;
public void attrInfoShowDetails(List<SarStandardsInfo> sarlist) throws Exception {
for (SarStandardsInfo row : sarlist) {
attrInfoDetails(row);
Map<String, Object> getAttrMap = row.getAttrInfoMap();
if (getAttrMap != null && getAttrMap.size() > 0) {
//存在的分解单文本名称列表
LinkedList<String> itemExistList = new LinkedList<>();
//判断文本是否已被拆分,把已被拆分过的文件给前端判断是否显示分解单
SarFileSplitInfoEOPage sarFileSplitInfoEOPage = new SarFileSplitInfoEOPage();
sarFileSplitInfoEOPage.setStandId(row.getId());
List<SarFileSplitInfoEO> sarFileSplitInfoEOS = sarFileSplitInfoEODao.queryByPageOwn(sarFileSplitInfoEOPage);
List<String> itemExistList = sarFileSplitInfoEOS.stream()
.map(item -> item.getFileType())
.collect(Collectors.toList());
getAttrMap.put("itemExistList",itemExistList);
for (Map.Entry<String, Object> entry : getAttrMap.entrySet()) {
String name = entry.getKey();
String value = "";
@@ -557,15 +567,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
if (StringUtils.isNotBlank(value)) {
List<AttFileEO> fileObj = attFileEOService.getMultiFileInfos(value);
entry.setValue(fileObj);
//以标准id和文本类型查询分解单表 有数据设标记为为 1
FindSarItemsPageReqDTO sarItemCount = new FindSarItemsPageReqDTO();
sarItemCount.setStandId(row.getId());
sarItemCount.setFileType(name);
Integer sarItemsCount = standItemsDao.sarItemCount(sarItemCount);
if (sarItemsCount>0){
//存在分解单的文本名称存入列表
itemExistList.add(name);
}
}
}else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) {
value = entry.getValue().toString();
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java
+8
View File
@@ -144,4 +144,12 @@ public class SarStandFileEOController extends BaseController<SarStandFileEO> {
return Result.success(sarStandFileEOS);
}
@ApiOperation(value = "查询文本信息")
@GetMapping("/queryFileInfoNew")
public ResponseMessage<List<SarStandFileEO>> queryFileInfoNew(@RequestParam("standId") String standId,@RequestParam("type") String type){
List<SarStandFileEO> sarStandFileEOS = sarStandFileEOService.selectFileByStandIdOCR(standId,type);
return Result.success(sarStandFileEOS);
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java
+2
View File
@@ -25,4 +25,6 @@ public interface SarStandFileEOService {
List<SarStandFileEO> selectFileByStandId(String standId);
List<SarStandFileEO> selectFileByStandIdOCR(String standId,String type);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java
+25 -17
View File
@@ -4,6 +4,8 @@ import com.adc.da.att.service.IAttFileEOService;
import com.adc.da.person.entity.PersonMsgEO;
import com.adc.da.slrs.sarStandAttrDetails.service.ISarStandAttrDetailsService;
import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService;
import com.adc.da.slrs.standardSplit.dao.*;
import com.adc.da.slrs.standardSplit.service.SarLawsInfoEOService;
import com.adc.da.att.entity.AttFileEO;
@@ -52,6 +54,8 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
@Autowired
private ISarStandAttrDetailsService sarStandAttrDetailsEOService;
@Autowired
private ISarStandardsInfoService sarStandardsInfoService;
@Autowired
private IAttFileEOService attFileEOService;
@@ -122,8 +126,11 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
//用来往标准分解单里添加数据
List<SarStandItems> standList = new ArrayList<>();
SarStandardsInfo sarStandardsInfo=sarStandardsInfoService.getById(sarFileSplitInfoEO.getStandId());
// 拆分文件主表中插入数据
sarFileSplitInfoEO.setStandName(sarStandardsInfo.getStandName());
sarFileSplitInfoEO.setStandNameSplit(sarStandardsInfo.getStandName());
sarFileSplitInfoEO.setStandNumSplit(sarStandardsInfo.getStandSort()+" "+sarStandardsInfo.getStandNumber()+"-"+sarStandardsInfo.getStandYear());
sarFileSplitInfoEO.setId(UUIDUtils.randomUUID20());
sarFileSplitInfoEO.setValidFlag(0);
sarFileSplitInfoEO.setCreationTime(new Date());
@@ -368,22 +375,23 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
sarFileSplitItemsValEODao.insertForeach(itemValList);
//用来往标准分解单插入数据
messageList.forEach(item -> {
//new一个对象
SarStandItems standItems1 = new SarStandItems();
//standItems1里的这个值为messageList里的ItermsConditions
standItems1.setId(UUIDUtils.randomUUID20())
.setFileType(sarFileSplitInfoEO.getFileType())
.setStandId(sarFileSplitInfoEO.getStandId())
.setItemsNum(item.getItemsNum())
.setItemsName(item.getItemsName())
.setTermsConditions(item.getItermsConditions())
.setEditFlag(item.getEditFlag());
standList.add(standItems1);
});
sarFileSplitItemsEODao.insertStandSplitForeach(standList);
// 2021/11/23改用标准详情手动插入
// //用来往标准分解单插入数据
// messageList.forEach(item -> {
// //new一个对象
// SarStandItems standItems1 = new SarStandItems();
// //standItems1里的这个值为messageList里的ItermsConditions
// standItems1.setId(UUIDUtils.randomUUID20())
// .setFileType(sarFileSplitInfoEO.getFileType())
// .setStandId(sarFileSplitInfoEO.getStandId())
// .setItemsNum(item.getItemsNum())
// .setItemsName(item.getItemsName())
// .setTermsConditions(item.getItermsConditions())
// .setEditFlag(item.getEditFlag());
//
// standList.add(standItems1);
// });
// sarFileSplitItemsEODao.insertStandSplitForeach(standList);
} else {
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java
+28 -5
View File
@@ -1,6 +1,5 @@
package com.adc.da.slrs.standardSplit.service.impl;
import com.adc.da.slrs.standardSplit.dao.SarStandAttrDetailsEODao;
import com.adc.da.slrs.standardSplit.dao.SarStandFileEODao;
import com.adc.da.slrs.standardSplit.entity.SarStandFileEO;
import com.adc.da.slrs.standardSplit.entity.SarStandFileEOPage;
@@ -12,17 +11,16 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
@Service
@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
public class SarStandFileEOServiceImpl implements SarStandFileEOService {
private static final Logger logger = LoggerFactory.getLogger(SarStandFileEOServiceImpl.class);
@Autowired
private SarStandFileEODao sarStandFileEODao;
@Autowired
private SarStandAttrDetailsEODao sarStandAttrDetailsEODao;
@Override
public List<SarStandFileEO> getStandFileListByPage(SarStandFileEOPage stand){
@@ -80,8 +78,33 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService {
});
return sarStandFileEOS;
}
//type == 0 是pdf type==1 是doc
@Override
public List<SarStandFileEO> selectFileByStandIdOCR(String standId , String type) {
QueryWrapper<SarStandFileEO> queryWrapper= new QueryWrapper<>();
// return sarStandFileEODao.selectFileByStandId(standId);r
queryWrapper.eq("STAND_ID",standId);
List<SarStandFileEO> sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper);
if ("0".equals(type)){
List<SarStandFileEO> remove=new ArrayList<>();
sarStandFileEOS.forEach(sarStandFileEO -> {
if (!sarStandFileEO.getFileName().contains(".PDF") && !sarStandFileEO.getFileName().contains(".pdf") ){
remove.add(sarStandFileEO);
}
});
sarStandFileEOS.removeAll(remove);
}else {
List<SarStandFileEO> remove=new ArrayList<>();
sarStandFileEOS.forEach(sarStandFileEO -> {
if (!sarStandFileEO.getFileName().contains(".DOC") && !sarStandFileEO.getFileName().contains(".doc") ){
remove.add(sarStandFileEO);
}
});
sarStandFileEOS.removeAll(remove);
}
return sarStandFileEOS;
}
}
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEO.xml
+33
View File
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.adc.da.slrs.sarStandWarning.dao.EarlyWarningEODao">
<!-- Result Map-->
<resultMap id="resultMap" type="com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO" >
<id column="id" property="id" />
<result column="STAND_ID" property="standId" />
<result column="STAND_NAME" property="standName" />
<result column="STAND_TYPE" property="standType"/>
<result column="STAND_CODE" property="standCode"/>
<result column="XCXSSRQ" property="XCXSSRQ"/>
<result column="ZCCSSRQ" property="ZCCSSRQ"/>
<result column="SSRQ" property="SSRQ"/>
<result column="PUT_TIME" property="putTime" />
<result column="APPLY_TYPE" property="applyType" />
<result column="ITEMS_ID" property="itemsId" />
<result column="ITEMS_NUM" property="itemsNum" />
<result column="ITEMS_NAME" property="itemsName" />
<result column="POLICY_ID" property="policyId" />
<result column="POLICY_NAME" property="policyName" />
<result column="DUTY_ENGINEER" property="dutyEngineer" />
<result column="DUTY_ENGINEER" property="dutyEngineer" />
<result column="DUTY_ENGINEER" property="dutyEngineer" />
<result column="issue_time" property="issueTime" />
</resultMap>
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml
+8
View File
@@ -6,4 +6,12 @@
resultType="com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarBaseStandardInfo">
select distinct STAND_ID as standard_id, STAND_NUMBER as standard_number, STAND_NAME as standard_name, STAND_TYPE as standard_type, INTERPRETATION_TIME from sar_interpretation_national_standard
</select>
<update id="updateData">
update sar_interpretation_national_standard set risk_degree = #{find.riskDegree}
where sar_interpretation_national_standard.STAND_ID = #{find.standId}
and sar_interpretation_national_standard.STAND_NUMBER =#{find.standNumber}
and sar_interpretation_national_standard.STAND_NAME=#{find.standName}
and sar_interpretation_national_standard.INTERPRETATION_TIME = #{find.interpretationTime}
</update>
</mapper>