Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

冀北检测点试运行部分接口提交

Browse Source
This commit is contained in:
cdf
2024-05-22 09:54:59 +08:00
parent c41586dcc6
commit 7b7d7de923
16 changed files with 268 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/ISupervisionTempLineRunTestService.java Normal file
View File

@@ -0,0 +1,17 @@
package com.njcn.supervision.service.device;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.supervision.pojo.po.device.SupervisionTempLineRunTest;
/**
* <p>
* 服务类
* </p>
*
* @author hongawen
* @since 2024-05-21
*/
public interface ISupervisionTempLineRunTestService extends IService<SupervisionTempLineRunTest> {
}

9
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/SupervisionTempLineDebugPOService.java
View File

@@ -7,19 +7,20 @@ import com.njcn.supervision.pojo.po.device.SupervisionTempLineDebugPO;
import com.njcn.supervision.pojo.vo.device.SupervisionTempLineDebugVO;
/**
*
* Description:
* Date: 2024/5/17 15:26【需求编号】
*
* @author clam
* @version V1.0.0
*/
public interface SupervisionTempLineDebugPOService extends IService<SupervisionTempLineDebugPO>{
public interface SupervisionTempLineDebugPOService extends IService<SupervisionTempLineDebugPO> {
String addTempLineDebug(SupervisionTempLineDebugParam supervisionTempLineReportParam);
String addTempLineDebug(SupervisionTempLineDebugParam supervisionTempLineReportParam);
Page<SupervisionTempLineDebugVO> getTempLineDeug(SupervisionTempLineDebugParam.SupervisionTempLineDebugQuery supervisionTempLineDebugQuery);
Page<SupervisionTempLineDebugVO> getTempLineDeug(SupervisionTempLineDebugParam.SupervisionTempLineDebugQuery supervisionTempLineDebugQuery);
Page<SupervisionTempLineDebugVO> pageHasDebug(SupervisionTempLineDebugParam.SupervisionTempLineDebugQuery supervisionTempLineDebugQuery);
SupervisionTempLineDebugVO getDetailTempLineDebug(String id);

26
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java
View File

@@ -33,7 +33,7 @@ import java.util.Map;
import java.util.Objects;
/**
*
*
* Description:
* Date: 2024/5/17 15:26【需求编号】
*
@@ -105,6 +105,30 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
return page;
}
@Override
public Page<SupervisionTempLineDebugVO> pageHasDebug(SupervisionTempLineDebugParam.SupervisionTempLineDebugQuery supervisionTempLineDebugQuery) {
QueryWrapper<SupervisionDevMainReportVO> queryWrapper = new QueryWrapper<>();
String userIndex = RequestUtil.getUserIndex();
queryWrapper
.eq("supervision_temp_line_debug.state", DataStateEnum.ENABLE.getCode());
if (StrUtil.isNotBlank(supervisionTempLineDebugQuery.getOrgId())) {
/*获取直接下属子单位*/
List<String> data = deptFeignClient.getDepSonIdtByDeptId(supervisionTempLineDebugQuery.getOrgId()).getData();
queryWrapper.in("supervision_temp_line_debug.org_id", data);
}
//添加上时间范围
queryWrapper.between("supervision_temp_line_debug.Create_Time",
DateUtil.beginOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchEndTime())));
queryWrapper.orderByDesc("supervision_temp_line_debug.Update_Time");
Page<SupervisionTempLineDebugVO> page =this.baseMapper.pageHasDebug(new Page<>(PageFactory.getPageNum(supervisionTempLineDebugQuery), PageFactory.getPageSize(supervisionTempLineDebugQuery)), queryWrapper);
return page;
}
@Override
public SupervisionTempLineDebugVO getDetailTempLineDebug(String id) {
SupervisionTempLineDebugVO supervisionTempLineDebugVO = new SupervisionTempLineDebugVO();

21
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java Normal file
View File

@@ -0,0 +1,21 @@
package com.njcn.supervision.service.device.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.supervision.mapper.device.SupervisionTempLineRunTestMapper;
import com.njcn.supervision.pojo.po.device.SupervisionTempLineRunTest;
import com.njcn.supervision.service.device.ISupervisionTempLineRunTestService;
import org.springframework.stereotype.Service;
/**
* <p>
* 服务实现类
* </p>
*
* @author hongawen
* @since 2024-05-21
*/
@Service
public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl<SupervisionTempLineRunTestMapper, SupervisionTempLineRunTest> implements ISupervisionTempLineRunTestService {
}

10
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java
View File

@@ -50,6 +50,8 @@ public class UserReportNormalServiceImpl extends ServiceImpl<UserReportNormalMap
* 用户信息建档对应的流程定义 KEY
*/
public static final String PROCESS_KEY = "user_go_net";
public static final String PROCESS_OTHER_KEY ="user_treat_check";
private final BpmProcessFeignClient bpmProcessFeignClient;
@@ -72,7 +74,12 @@ public class UserReportNormalServiceImpl extends ServiceImpl<UserReportNormalMap
// 发起 BPM 流程
Map<String, Object> processInstanceVariables = new HashMap<>();
BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY);
if(userReportNormalParam.getType() == 0){
bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY);
}else {
bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_OTHER_KEY);
}
bpmProcessInstanceCreateReqDTO.setBusinessKey(userReportNormalPO.getId());
bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(userReportNormalParam.getStartUserSelectAssignees());
bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables);
@@ -133,6 +140,7 @@ public class UserReportNormalServiceImpl extends ServiceImpl<UserReportNormalMap
UserReportVO.UserReportGoNetVO vo = new UserReportVO.UserReportGoNetVO();
BeanUtil.copyProperties(userReportPO,vo);
BeanUtil.copyProperties(userReportNormalPO,vo);
vo.setOtherReport(userReportNormalPO.getReportUrl());
return vo;
}