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

终端周期检测代码调整

Browse Source
This commit is contained in:
xy
2024-07-03 14:18:49 +08:00
parent 306200791a
commit fd23719a41
11 changed files with 165 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/CheckDeviceParam.java
View File

@@ -43,4 +43,10 @@ public class CheckDeviceParam extends BaseParam implements Serializable {
@ApiModelProperty(value = "描述")
private String description;
@ApiModelProperty(value = "本次定检时间")
private String nowCheckTime;
@ApiModelProperty(value = "状态 0：未处理 1：已处理")
private Integer state;
}

13
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/CheckDevice.java
View File

@@ -36,11 +36,17 @@ public class CheckDevice extends BaseEntity implements Serializable {
private String deviceId;
/**
* 定检时间
* 原来定检时间
*/
@MppMultiId("check_time")
private LocalDate checkTime;
/**
* 本次定检时间
*/
@MppMultiId("now_check_time")
private LocalDate nowCheckTime;
/**
* 逾期天数
*/
@@ -66,6 +72,11 @@ public class CheckDevice extends BaseEntity implements Serializable {
*/
private Integer status;
/**
* 状态 0：未处理 1：已处理
*/
private Integer state;
/**
* 描述
*/

10
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/CheckDeviceVo.java
View File

@@ -1,11 +1,13 @@
package com.njcn.supervision.pojo.vo.device;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.njcn.db.bo.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.time.LocalDate;
/**
* <p>
@@ -36,6 +38,14 @@ public class CheckDeviceVo extends BaseEntity implements Serializable {
@ApiModelProperty("装置名称")
private String deviceName;
@ApiModelProperty("本次定检时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate thisTimeCheck;
@ApiModelProperty("下次定检时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate nextTimeCheck;
@ApiModelProperty("逾期天数")
private Integer overdueDay;

5
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/CheckDeviceMapper.xml
View File

@@ -7,12 +7,15 @@
A.*,
B.Name deviceName,
B1.Name substation,
B2.Name dept
B2.Name dept,
C.This_Time_Check thisTimeCheck,
C.Next_Time_Check nextTimeCheck
from
supervision_check_device A
left join pq_line B on A.device_id = B.Id
left join pq_line B1 on B.Pid = B1.Id
left join pq_line B2 on B1.Pid = B2.Id
left join pq_device C on A.device_id = C.Id
<where>
and ${ew.sqlSegment}
</where>

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

@@ -1,11 +1,13 @@
package com.njcn.supervision.service.device.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.text.StrPool;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
import com.njcn.bpm.api.BpmProcessFeignClient;
@@ -18,6 +20,7 @@ import com.njcn.db.constant.DbConstant;
import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
import com.njcn.device.biz.pojo.param.DeptGetLineParam;
import com.njcn.device.pq.api.DeviceFeignClient;
import com.njcn.device.pq.api.GeneralDeviceInfoClient;
import com.njcn.device.pq.pojo.vo.DevDetail;
import com.njcn.supervision.enums.SupervisionKeyEnum;
@@ -26,15 +29,20 @@ import com.njcn.supervision.pojo.param.device.CheckDeviceParam;
import com.njcn.supervision.pojo.po.device.CheckDevice;
import com.njcn.supervision.pojo.po.device.QuitRunningDevice;
import com.njcn.supervision.pojo.po.survey.SurveyTest;
import com.njcn.supervision.pojo.po.user.UserReportNormalPO;
import com.njcn.supervision.pojo.vo.device.CheckDeviceVo;
import com.njcn.supervision.service.device.ICheckDeviceService;
import com.njcn.supervision.utils.InstanceUtil;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.pojo.po.Dept;
import com.njcn.web.factory.PageFactory;
import com.njcn.web.utils.RequestUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.HashMap;
import java.util.List;
@@ -60,10 +68,15 @@ public class CheckDeviceServiceImpl extends MppServiceImpl<CheckDeviceMapper, Ch
private final BpmProcessFeignClient bpmProcessFeignClient;
private final DeptFeignClient deptFeignClient;
private final DeviceFeignClient deviceFeignClient;
@Override
public void addCheckDevice() {
DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
deptGetLineParam.setDeptId(RequestUtil.getDeptIndex());
Dept data = deptFeignClient.getRootDept().getData();
deptGetLineParam.setDeptId(data.getId());
List<String> devList = commTerminalGeneralClient.deptGetDevice(deptGetLineParam)
.getData()
.stream()
@@ -79,6 +92,7 @@ public class CheckDeviceServiceImpl extends MppServiceImpl<CheckDeviceMapper, Ch
checkDevice.setDeviceId(item.getDevIndex());
checkDevice.setCheckTime(item.getNextTimeCheck());
checkDevice.setOverdueDay(new Long(item.getNextTimeCheck().until(LocalDate.now(), ChronoUnit.DAYS)).intValue());
checkDevice.setState(0);
return checkDevice;
})
.collect(Collectors.toList());
@@ -113,9 +127,12 @@ public class CheckDeviceServiceImpl extends MppServiceImpl<CheckDeviceMapper, Ch
//默认根据逾期天数排序
queryWrapper.orderBy(true, false, "A.overdue_day");
}
}
if (!Objects.isNull(param.getStatus())) {
queryWrapper.eq("A.status", param.getStatus());
if (!Objects.isNull(param.getStatus())) {
queryWrapper.eq("A.status", param.getStatus());
}
if (!Objects.isNull(param.getState())) {
queryWrapper.eq("A.state", param.getState());
}
}
queryWrapper.le("A.check_time", LocalDate.now());
return this.baseMapper.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), queryWrapper);
@@ -131,6 +148,7 @@ public class CheckDeviceServiceImpl extends MppServiceImpl<CheckDeviceMapper, Ch
CheckDevice checkDevice = this.baseMapper.selectById(param.getId());
checkDevice.setCheckFilePath(param.getReportPath());
checkDevice.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
checkDevice.setNowCheckTime(LocalDate.parse(param.getNowCheckTime(), DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN)));
// 发起 BPM 流程
Map<String, Object> processInstanceVariables = new HashMap<>();
BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
@@ -156,6 +174,7 @@ public class CheckDeviceServiceImpl extends MppServiceImpl<CheckDeviceMapper, Ch
checkDevice.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
checkDevice.setCheckFilePath(param.getReportPath());
checkDevice.setDescription(param.getDescription());
checkDevice.setNowCheckTime(LocalDate.parse(param.getNowCheckTime(), DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN)));
// 发起 BPM 流程
Map<String, Object> processInstanceVariables = new HashMap<>();
BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
@@ -184,10 +203,17 @@ public class CheckDeviceServiceImpl extends MppServiceImpl<CheckDeviceMapper, Ch
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateProcessStatus(String businessId, Integer status) {
//流程状态整改
CheckDevice checkDevice = this.baseMapper.selectById(businessId);
checkDevice.setStatus(status);
checkDevice.setState(1);
this.updateById(checkDevice);
//修改pq_device定检时间和下次定检时间 5年
String nowCheckTime = checkDevice.getNowCheckTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN));
String nextCheckTime = checkDevice.getNowCheckTime().plusYears(5).format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN));
deviceFeignClient.updateDevCheckTime(checkDevice.getDeviceId(),nowCheckTime,nextCheckTime);
}
@Override