From 388127e8966dc2ab54521d5a7ceb15baa1da06bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Fri, 2 Jun 2023 18:18:28 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E9=A2=84=E8=A7=88=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E7=AC=AC=E4=BA=8C=E7=A7=8D=E5=B7=A5=E4=BD=9C=E7=A5=A8?= =?UTF-8?q?=EF=BC=8C=E6=B0=B4=E5=8A=9B=E6=9C=BA=E6=A2=B0=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ticket/constants/WorkTicketConstants.java | 132 +++++----- .../workTicket/entity/WorkTicketInfoEntity.java | 11 +- .../ticket/twoTicket/constant/TicketConstant.java | 58 +++++ .../controller/TicketProcessController.java | 3 +- .../twoTicket/service/TicketProcessService.java | 4 +- .../service/impl/TicketProcessServiceImpl.java | 277 ++++++++++++++------- .../hzims/ticket/twoTicket/utils/WordHelper.java | 229 +++++++++++++++++ .../hzims/ticket/twoTicket/utils/WordMapUtils.java | 120 +++++++++ .../ticket/twoTicket/vo/process/WorkTicketVo.java | 5 - .../java/com/hnac/hzims/ticket/utils/PdfUtils.java | 53 ++-- ...工作票危险点分析及控制措施票.docx | Bin 29439 -> 28979 bytes .../template/水力机械工作票模版.docx | Bin 0 -> 39730 bytes .../template/电气第一种工作票模版.docx | Bin 43047 -> 43033 bytes .../template/电气第二种工作票模版.docx | Bin 0 -> 38430 bytes 14 files changed, 707 insertions(+), 185 deletions(-) create mode 100644 hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/constant/TicketConstant.java create mode 100644 hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/utils/WordHelper.java create mode 100644 hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/utils/WordMapUtils.java create mode 100644 hzims-service/ticket/src/main/resources/template/水力机械工作票模版.docx create mode 100644 hzims-service/ticket/src/main/resources/template/电气第二种工作票模版.docx diff --git a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/constants/WorkTicketConstants.java b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/constants/WorkTicketConstants.java index 9fa55b4..68fbb3f 100644 --- a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/constants/WorkTicketConstants.java +++ b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/constants/WorkTicketConstants.java @@ -2,77 +2,85 @@ package com.hnac.hzims.ticket.constants; import lombok.AllArgsConstructor; import lombok.Getter; + import java.util.Arrays; import java.util.Optional; /** * 工作票中所需常数定义 + * * @author hx */ public interface WorkTicketConstants { - @AllArgsConstructor - enum WorkTicketMeasureTypeEnum { - /**第一种安措**/ - ONE("1","matterLibraryListOne"), - /**第二种安措**/ - TWO("2","matterLibraryListTwo"), - /**第三种安措**/ - THREE("3","matterLibraryListThree"), - FOUR("4","matterLibraryListFour"), - Five("5","matterLibraryListFive"), - Flow("6","matterLibraryListFlow"), - ; - @Getter - private String type; - @Getter - private String convertAttributes; - } + @AllArgsConstructor + enum WorkTicketMeasureTypeEnum { + /** 第一种安措 **/ + ONE("1", "matterLibraryListOne"), + /** 第二种安措 **/ + TWO("2", "matterLibraryListTwo"), + /** 第三种安措 **/ + THREE("3", "matterLibraryListThree"), + FOUR("4", "matterLibraryListFour"), + Five("5", "matterLibraryListFive"), + Flow("6", "matterLibraryListFlow"), + //第二种工作票 + SEVEN("7", "matterLibraryListSeven"), + //水力机器工作票 + EIGHT("8", "matterLibraryListEight"), + NINE("9", "matterLibraryListNine"), + TEN("10", "matterLibraryListTen"), + + ; + @Getter + private String type; + @Getter + private String convertAttributes; + } - @AllArgsConstructor - enum FirstWorkTicketStatusEnum { - /**签发**/ - SIGN(1,"签发"), - /**收到工作票**/ - RECEIVE(2,"收到工作票"), - /**许可人许可**/ - LICENSE(3,"许可人许可"), - /**确认条件具备**/ - CONFIRM_MEASURE(4,"确认条件具备"), - /**工作负责人确认工作**/ - CONFIRM_WORK(5,"工作负责人确认工作"), - /**许可人确认工作结束**/ - WORK_FINISH(6,"许可人确认工作结束"), - /**工作票终结**/ - TICKET_FINISH(7,"工作票终结"), - /**结束**/ - FINISH(8,"结束"), - /**许可人延期确认**/ - LICENSE_DELAY(9,"许可人延期确认"), - /**负责人延期确认**/ - CONFIRM_DELAY(10,"负责人延期确认"), - /**作废**/ - INVALID(11,"作废"), - /**逾期**/ - OVERDUE(12,"逾期"), - /**线下开票**/ - OFFLINE(13,"线下开票"), - /**线下执行任务**/ - OFFLINE_OPERATE(14,"线下执行任务"), - /**线下许可人许可**/ - OFFLINE_LICENSE(15,"线下许可人许可"), - /**线下结束**/ - OFFLINE_END(16,"线下结束") - ; - @Getter - private Integer status; - @Getter - private String description; + @AllArgsConstructor + enum FirstWorkTicketStatusEnum { + /** 签发 **/ + SIGN(1, "签发"), + /** 收到工作票 **/ + RECEIVE(2, "收到工作票"), + /** 许可人许可 **/ + LICENSE(3, "许可人许可"), + /** 确认条件具备 **/ + CONFIRM_MEASURE(4, "确认条件具备"), + /** 工作负责人确认工作 **/ + CONFIRM_WORK(5, "工作负责人确认工作"), + /** 许可人确认工作结束 **/ + WORK_FINISH(6, "许可人确认工作结束"), + /** 工作票终结 **/ + TICKET_FINISH(7, "工作票终结"), + /** 结束 **/ + FINISH(8, "结束"), + /** 许可人延期确认 **/ + LICENSE_DELAY(9, "许可人延期确认"), + /** 负责人延期确认 **/ + CONFIRM_DELAY(10, "负责人延期确认"), + /** 作废 **/ + INVALID(11, "作废"), + /** 逾期 **/ + OVERDUE(12, "逾期"), + /** 线下开票 **/ + OFFLINE(13, "线下开票"), + /** 线下执行任务 **/ + OFFLINE_OPERATE(14, "线下执行任务"), + /** 线下许可人许可 **/ + OFFLINE_LICENSE(15, "线下许可人许可"), + /** 线下结束 **/ + OFFLINE_END(16, "线下结束"); + @Getter + private Integer status; + @Getter + private String description; - public static FirstWorkTicketStatusEnum getEnumByStatus(Integer status) { - Optional statusOptional = Arrays.stream(FirstWorkTicketStatusEnum.class.getEnumConstants()) - .filter(e-> status.equals(e.getStatus())).findAny(); - return statusOptional.orElse(null); - } - } + public static FirstWorkTicketStatusEnum getEnumByStatus(Integer status) { + Optional statusOptional = Arrays.stream(FirstWorkTicketStatusEnum.class.getEnumConstants()) + .filter(e -> status.equals(e.getStatus())).findAny(); + return statusOptional.orElse(null); + } + } } diff --git a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/entity/WorkTicketInfoEntity.java b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/entity/WorkTicketInfoEntity.java index 77e63a0..ff89923 100644 --- a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/entity/WorkTicketInfoEntity.java +++ b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/entity/WorkTicketInfoEntity.java @@ -316,8 +316,8 @@ public class WorkTicketInfoEntity extends TenantEntity implements Serializable { /** * 工作条件（false 停电 true 不停电） */ - @ApiModelProperty("工作条件（false 停电 true 不停电）") - private Boolean isPower; + @ApiModelProperty("工作条件（停电或不停电）") + private String power; /** @@ -414,6 +414,13 @@ public class WorkTicketInfoEntity extends TenantEntity implements Serializable { /** + * 用户Id + */ + @ApiModelProperty("用户Id") + private String flowUserId; + + + /** * 当前任务名 */ @ApiModelProperty("当前任务名") diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/constant/TicketConstant.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/constant/TicketConstant.java new file mode 100644 index 0000000..f74288f --- /dev/null +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/constant/TicketConstant.java @@ -0,0 +1,58 @@ +package com.hnac.hzims.ticket.twoTicket.constant; + +/** + * 定义ticket常量 + * @Author WL + * @Version v1.0 + * @Serial 1.0 + * @Date 2023/6/2 13:48 + */ +public class TicketConstant { + + /** + * window操作系统工作票访问路径 + */ + public static final String TICKET_WINDOW_PATH = "hzims-service/ticket/src/main/resources/template"; + + /** + * Liunx操作系统工作票访问路径 + */ + public static final String TICKET_LIUNX_PATH = "/data/hzims/ticket/word/template/ticket"; + + + /** + * window操作系统工作票合并输出路径 + */ + public static final String TICKET_WINDOW_MERGE_PATH = "D:\\导出excel\\"; + + /** + * liunx操作系统工作票合并输出路径 + */ + public static final String TICKET_LIUNX_MERGE_PATH = "/data/hzims/ticket/word/template/ticket/ouput/"; + + /** + * os.name + */ + public static final String OS_NAME = System.getProperty("os.name"); + + + /** + * 安全隔离措施附页 + */ + public static final String SECURE_PAGE = "/secondary/工作票安全措施附页.docx"; + + /** + * 危险点分析与预控措施票 + */ + public static final String SAFETY_PAGE = "/secondary/工作票危险点分析及控制措施票.docx"; + /** + * 动火工作票 + */ + public static final String FLIGHT_PAGE = "/secondary/动火工作票.docx"; + + /** + * 有限空间监测记录单 + */ + public static final String SPACE_PAGE = "/secondary/有限空间监测记录单.docx"; + +} diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/controller/TicketProcessController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/controller/TicketProcessController.java index caf10e2..a15519d 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/controller/TicketProcessController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/controller/TicketProcessController.java @@ -61,8 +61,9 @@ public class TicketProcessController { @ApiOperation(value = "新预览") @ApiOperationSupport(order = 11) public void preview(@RequestParam(value = "ticketId", required = true) Long ticketId, + @RequestParam(value = "status", required = true) Integer status, HttpServletResponse response) { - ticketProcessService.newPreview(ticketId, response); + ticketProcessService.newPreview(ticketId, status, response); } } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/TicketProcessService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/TicketProcessService.java index 156e974..c4522ba 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/TicketProcessService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/TicketProcessService.java @@ -30,8 +30,10 @@ public interface TicketProcessService { /** * 新预览 + * + * @param status * @param response * @return */ - void newPreview(Long ticketId, HttpServletResponse response); + void newPreview(Long ticketId, Integer status, HttpServletResponse response); } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java index 5931c64..da04670 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java @@ -20,12 +20,15 @@ import com.hnac.hzims.ticket.constants.TicketConstants; import com.hnac.hzims.ticket.constants.WorkTicketConstants; import com.hnac.hzims.ticket.processflow.strategy.core.ProcessIdWorker; import com.hnac.hzims.ticket.response.ProcessWorkFlowResponse; +import com.hnac.hzims.ticket.twoTicket.constant.TicketConstant; import com.hnac.hzims.ticket.twoTicket.entity.TicketInfoDanger; import com.hnac.hzims.ticket.twoTicket.entity.WorkTicketFinish; import com.hnac.hzims.ticket.twoTicket.service.IFirstWorkTicketService; import com.hnac.hzims.ticket.twoTicket.service.IWorkTicketFinishService; import com.hnac.hzims.ticket.twoTicket.service.TicketInfoDangerService; import com.hnac.hzims.ticket.twoTicket.service.TicketProcessService; +import com.hnac.hzims.ticket.twoTicket.utils.WordHelper; +import com.hnac.hzims.ticket.twoTicket.utils.WordMapUtils; import com.hnac.hzims.ticket.twoTicket.vo.process.FristWorkTicketVo; import com.hnac.hzims.ticket.twoTicket.vo.process.WorkTicketVo; import com.hnac.hzims.ticket.utils.MergeDocUtils; @@ -58,7 +61,8 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.FileOutputStream; +import java.time.Duration; +import java.time.Instant; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.*; @@ -148,28 +152,28 @@ public class TicketProcessServiceImpl implements TicketProcessService { public void startUp(WorkTicketVo workTicketVo) { log.info("执行 com.hnac.hzims.ticket.twoTicket.service.impl【startUp】 。。。方法"); if (workTicketVo.getWorkTicket().getSignage() == null) { - throw new ServiceException("站点编码不能为空"); + throw new ServiceException("票据抬头未配置，请您到站点管理配置"); } StationEntity stationEntity = new StationEntity(); stationEntity.setCode(workTicketVo.getWorkTicket().getSignageCode()); R stationClientOne = stationClient.getOne(stationEntity); if (!stationClientOne.isSuccess()) { - throw new IllegalArgumentException("站点编码不能为空"); + throw new IllegalArgumentException("票据抬头未配置，请您到站点管理配置?"); } StationEntity station = stationClientOne.getData(); if (station == null) { - throw new ServiceException("站点编码不能为空"); + throw new ServiceException("票据抬头未配置，请您到站点管理配置"); } log.info("前端查的站点编号 :{}", workTicketVo.getWorkTicket().getSignage()); log.info("后端查寻的站点编码 :{}", station.getSignage()); if (!workTicketVo.getWorkTicket().getSignage().equals(station.getSignage())) { - throw new ServiceException("站点编码不能为空"); + throw new ServiceException("站点标识不能为空"); } //获取站点编号 String signage = station.getSignage(); if (StringUtils.isBlank(signage) || signage.length() < 2) { - throw new ServiceException("站点编码不能为空"); + throw new ServiceException("站点标识不能为空"); } signage = signage.length() == 2 ? station.getSignage() : station.getSignage().substring(0, 2); @@ -405,6 +409,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { // log.error("获取用户信息失败"); // workTicket.setNextStepOperator(null); // } + workTicket.setFlowUserId(response.getUserId()); workTicket.setNextStepOperator(response.getNextStepOperator()); } @@ -504,35 +509,36 @@ public class TicketProcessServiceImpl implements TicketProcessService { * @param workTicketVo */ public void dealProcess(String newFirstWorkTicketFlowKey, WorkTicketVo workTicketVo) { + Instant start = Instant.now(); //若为线下工作票 则无需开启工作流 Integer status = WorkTicketConstants.FirstWorkTicketStatusEnum.SIGN.getStatus(); if (status.intValue() != workTicketVo.getWorkTicket().getFlowStatus().intValue()) { return; } - log.info("租户Id:{}", AuthUtil.getTenantId()); - log.info("用户部门Id: {}", AuthUtil.getUser().getDeptId()); - log.info("用户Id: {}", AuthUtil.getUserId()); + //log.info("租户Id:{}", AuthUtil.getTenantId()); + //log.info("用户部门Id: {}", AuthUtil.getUser().getDeptId()); + //log.info("用户Id: {}", AuthUtil.getUserId()); //获取签发人角色下的人员 - R> listR = userClient.relationUserListByRoleAlias(AuthUtil.getTenantId(), Long.parseLong(AuthUtil.getUser().getDeptId()), TicketConstants.SIGNER_ROLE); - if (!listR.isSuccess() || CollectionUtil.isEmpty(listR.getData())) { - throw new ServiceException("工作票签发人角色下未查询到相关人员"); - } - log.info("获取签发人角色下的人员: {}", listR.getData()); + // R> listR = userClient.relationUserListByRoleAlias(AuthUtil.getTenantId(), Long.parseLong(AuthUtil.getUser().getDeptId()), TicketConstants.SIGNER_ROLE); + // if (!listR.isSuccess() || CollectionUtil.isEmpty(listR.getData())) { + // throw new ServiceException("工作票签发人角色下未查询到相关人员"); + // } Map params = new HashMap<>(4); params.put("workTicketVo", workTicketVo); //已开启流程 - workTicketVo.setIsState(true); - log.info("获取表单的数据： {}", workTicketVo); R processInstanceContainNameByKey = flowClient.startProcessInstanceContainNameByKey(newFirstWorkTicketFlowKey, String.valueOf(workTicketVo.getWorkTicket().getId()), workTicketVo.getWorkTicket().getWorkContent(), params); log.info("processInstanceContainNameByKey.isSuccess() : {}", processInstanceContainNameByKey.isSuccess()); - log.info("processInstanceContainNameByKey.getData() : {}", processInstanceContainNameByKey.getData()); - log.info("BladeFlow processInstanceContainNameByKey:{}", processInstanceContainNameByKey); if (!processInstanceContainNameByKey.isSuccess() && processInstanceContainNameByKey.getCode() == 500) { log.error("processInstanceContainNameByKey {}", processInstanceContainNameByKey.getMsg()); throw new ServiceException("不好意思,您暂无权限..."); } log.info("获取启动流程数据 : {}", processInstanceContainNameByKey); + Duration between = Duration.between(start, Instant.now()); + System.out.println("================================================================"); + System.err.println("耗时: " + (between.getSeconds()) + "秒"); + System.err.println("耗时: " + (between.toMillis()) + "毫秒"); + System.out.println("================================================================"); } @@ -660,12 +666,13 @@ public class TicketProcessServiceImpl implements TicketProcessService { * 新预览 * * @param ticketId + * @param status * @param response * @return */ @SneakyThrows @Override - public void newPreview(Long ticketId, HttpServletResponse response) { + public void newPreview(Long ticketId, Integer status, HttpServletResponse response) { String fileName = IdWorker.get32UUID() + ".docx"; // response.setContentType("application/octet-stream;charset=ISO8859-1"); response.setHeader("Content-Disposition", "attachment; filename=" + fileName); @@ -675,65 +682,67 @@ public class TicketProcessServiceImpl implements TicketProcessService { WorkTicketVo workTicketVo = ticketInfoService.selectDetailsById(ticketId); //将查询的数据转换为map Map workTicketInfoMap = this.convertMap(workTicketVo); + Map resultMap = WordHelper.resultMap(workTicketInfoMap); //创建新的map - for (Map.Entry stringObjectEntry : workTicketInfoMap.entrySet()) { + for (Map.Entry stringObjectEntry : resultMap.entrySet()) { log.info("获取map : " + stringObjectEntry.getKey() + "=====>" + stringObjectEntry.getValue()); } WorkTicketInfoEntity workTicket = workTicketVo.getWorkTicket(); if ((workTicket.getIsSafety() == null && workTicket.getIsHazard() == null && workTicket.getIsLimited() == null && workTicket.getIsRailway() == null) || (workTicket.getIsSafety() == null || workTicket.getIsHazard() == null || workTicket.getIsLimited() == null || workTicket.getIsRailway() == null)) { - extractedWithWord(response, workTicketInfoMap); + extractedWithWord(response, resultMap, status); return; } //如果4个多为false 或为空 附件不展示附件 if (!workTicket.getIsSafety() && !workTicket.getIsHazard() && !workTicket.getIsLimited() && !workTicket.getIsRailway()) { - extractedWithWord(response, workTicketInfoMap); + extractedWithWord(response, resultMap, status); return; } - List docFileList = new ArrayList<>(); + List docFileList = new ArrayList<>(); // /template/secondary/工作票安全措施附页.docx - String os = System.getProperty("os.name"); - + String os = TicketConstant.OS_NAME; String prefix = null; //Windows操作系统 if (os != null && os.toLowerCase().startsWith("windows")) { - prefix = "hzims-service/ticket/src/main/resources/template"; + prefix = TicketConstant.TICKET_WINDOW_PATH; } else { - prefix = "/data/hzims/ticket/word/template/ticket"; + prefix = TicketConstant.TICKET_LIUNX_PATH; } + //获取工作票种类 + String workTicketStatus = WordMapUtils.getWorkTicketStatus(status); - docFileList.add(new File(prefix + "/电气第一种工作票模版.docx")); + docFileList.add(new File(prefix + "/" + workTicketStatus)); //安全隔离措施附页 (true,展示附件,false,不展示附件) if (workTicket.getIsSafety()) { - addFile(prefix, "/secondary/工作票安全措施附页.docx", docFileList); + addFile(prefix, TicketConstant.SECURE_PAGE, docFileList); // setWorkTicketPrincipalChange(docFileList); } //危险点分析与预控措施票 (true,展示附件,false,不展示附件) if (workTicket.getIsSafety()) { - addFile(prefix, "/secondary/工作票危险点分析及控制措施票.docx", docFileList); + addFile(prefix, TicketConstant.SAFETY_PAGE, docFileList); // setWorkTicketHazardPointChange(docFileList); } //动火工作票 (true,展示附件,false,不展示附件) if (workTicket.getIsRailway()) { - addFile(prefix, "/secondary/动火工作票.docx", docFileList); + addFile(prefix, TicketConstant.FLIGHT_PAGE, docFileList); // setWorkTicketRailwayChange(docFileList); } //有限空间监测记录单(true,展示附件,false,不展示附件) if (workTicket.getIsLimited()) { - addFile(prefix, "/secondary/有限空间监测记录单.docx", docFileList); + addFile(prefix, TicketConstant.SPACE_PAGE, docFileList); // setWorkTicketLimitedChange(docFileList); } String name = LocalDate.now() + "-" + UUID.randomUUID().toString().replaceAll("-", ""); String docPath = null; if (os != null && os.toLowerCase().startsWith("windows")) { - docPath = "D:\\导出excel\\"; + docPath = TicketConstant.TICKET_WINDOW_MERGE_PATH; } else { - docPath = "/data/hzims/ticket/word/template/ticket/ouput/"; + docPath = TicketConstant.TICKET_LIUNX_MERGE_PATH; } docPath = docPath + name + ".docx"; @@ -742,7 +751,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { //导入文档 File file = new File(docPath); MergeDocUtils.mergeDoc(docFileList, file); - XWPFDocument xwpfDocument = WordExportUtil.exportWord07(docPath, workTicketInfoMap); + XWPFDocument xwpfDocument = WordExportUtil.exportWord07(docPath, resultMap); xwpfDocument.write(response.getOutputStream()); //删除路径 file.delete(); @@ -754,18 +763,23 @@ public class TicketProcessServiceImpl implements TicketProcessService { * * @param response * @param workTicketInfoMap + * @param status * @throws Exception */ - private static void extractedWithWord(HttpServletResponse response, Map workTicketInfoMap) throws Exception { - XWPFDocument doc = WordExportUtil.exportWord07("template/电气第一种工作票模版.docx", workTicketInfoMap); - String os = System.getProperty("os.name"); + private static void extractedWithWord(HttpServletResponse response, Map workTicketInfoMap, Integer status) throws Exception { + String workTicketStatus = WordMapUtils.getWorkTicketStatus(status); + String os = TicketConstant.OS_NAME; //Windows操作系统 if (os != null && os.toLowerCase().startsWith("windows")) { + String url = "template/" + workTicketStatus; + XWPFDocument doc = WordExportUtil.exportWord07(url, workTicketInfoMap); log.info("当前系统版本是:{}", os); - String name = "D:/导出excel/电气第一种工作票模版.docx"; - FileOutputStream fos = new FileOutputStream(name); - doc.write(fos); + //String name = "D:/导出excel/电气第一种工作票模版.docx"; + //FileOutputStream fos = new FileOutputStream(name); + doc.write(response.getOutputStream()); } else { + String url = TicketConstant.TICKET_LIUNX_PATH + "/" + workTicketStatus; + XWPFDocument doc = WordExportUtil.exportWord07(url, workTicketInfoMap); //其它操作系统 log.info("当前系统版本是:{}", os); ServletOutputStream outputStream = response.getOutputStream(); @@ -793,38 +807,35 @@ public class TicketProcessServiceImpl implements TicketProcessService { log.info("安全措施: {}", safetyMeasuresList); if (CollectionUtils.isNotEmpty(safetyMeasuresList)) { Map workTicketInfoMap1 = new HashMap<>(); - Map> measureMap = safetyMeasuresList.stream(). - collect(Collectors.groupingBy(WorkTicketSafetyMeasureEntity::getType)); - Arrays.stream(WorkTicketConstants.WorkTicketMeasureTypeEnum.class.getEnumConstants()) - .forEach(measureEnum -> { - if (CollectionUtil.isNotEmpty(measureMap.get(measureEnum.getType()))) { - List> mapList = new ArrayList<>(); - int tempIndex = 1, index = 1; - List workTicketSafetyMeasureEntities = measureMap - .get(measureEnum.getType()); - for (WorkTicketSafetyMeasureEntity measureVO : workTicketSafetyMeasureEntities) { - String type = measureEnum.getType(); - if (tempIndex != Integer.valueOf(type)) { - index = 1; - tempIndex++; - } - log.info("获取安全措施的信息: {}", measureVO); - Map map = PdfUtils.objectToMap(measureVO, true); - map.put("index", index); - map.put("safetyMeasure", ObjectUtil.isNotEmpty(map.get("measure")) ? map.get("measure") : null); - String status = TicketConstants.SafetyMeasureStatusEnum.FINISH.getStatus() - .equals(measureVO.getStatus()) ? "√" : ""; - map.put("status", status); - mapList.add(map); - index++; - } - workTicketInfoMap1.put(measureEnum.getConvertAttributes(), mapList); - } else { - workTicketInfoMap1.put(measureEnum.getConvertAttributes(), - new ArrayList()); + Map> measureMap = safetyMeasuresList.stream().collect(Collectors.groupingBy(WorkTicketSafetyMeasureEntity::getType)); + Arrays.stream(WorkTicketConstants.WorkTicketMeasureTypeEnum.class.getEnumConstants()).forEach(measureEnum -> { + if (CollectionUtil.isNotEmpty(measureMap.get(measureEnum.getType()))) { + List> mapList = new ArrayList<>(); + int tempIndex = 1, index = 1; + List workTicketSafetyMeasureEntities = measureMap.get(measureEnum.getType()); + for (WorkTicketSafetyMeasureEntity measureVO : workTicketSafetyMeasureEntities) { + String type = measureEnum.getType(); + if (tempIndex != Integer.valueOf(type)) { + index = 1; + tempIndex++; } - }); + log.info("获取安全措施的信息: {}", measureVO); + Map map = PdfUtils.objectToMap(measureVO, true); + map.put("index", index); + map.put("safetyMeasure", ObjectUtil.isNotEmpty(map.get("measure")) ? map.get("measure") : null); + String status = TicketConstants.SafetyMeasureStatusEnum.FINISH.getStatus().equals(measureVO.getStatus()) ? "√" : ""; + map.put("status", status); + mapList.add(map); + index++; + } + workTicketInfoMap1.put(measureEnum.getConvertAttributes(), mapList); + } else { + workTicketInfoMap1.put(measureEnum.getConvertAttributes(), new ArrayList()); + } + }); + //验证工作措施是有有数据 + this.isMatterLibraryList(workTicketInfoMap1); // 工作地点保留带电部位或注意事项 this.matterLibraryListWithMap(workTicketInfoMap1); result.putAll(workTicketInfoMap1); @@ -876,31 +887,118 @@ public class TicketProcessServiceImpl implements TicketProcessService { return newItem; }).collect(Collectors.toList()); - map.put("ticketInfoDangers", CollectionUtils.isNotEmpty(collect) ? collect - : new ArrayList>()); + map.put("ticketInfoDangers", CollectionUtils.isNotEmpty(collect) ? collect : new ArrayList>()); result.putAll(map); } + //工作票危险点分析及控制措施票 + WordMapUtils.newMapWithList("ticketInfoDangers", result, true, 4, "maintenance", "dangerousPoint"); //7. 是否包含 - isExists(result); - + this.isExists(result); + //8. 存入新的数据 + this.addMapPut(result); return result; } /** + * 验证是否有数据 + * + * @param workTicketInfoMap + */ + private void isMatterLibraryList(Map workTicketInfoMap) { + //1. 第一种工作票 + //1.1 应断开断路器和隔离开关，包括填写前已断开断路器和隔离开关（注明编号）、应取熔断器（保险） + WordMapUtils.newMapWithList(WorkTicketConstants.WorkTicketMeasureTypeEnum.ONE.getConvertAttributes(), workTicketInfoMap, true, 6, "safetyMeasure", "status"); + //1.2 应装设接地线、隔板、隔罩（注明确切地点），应合上接地刀闸（注明双重名称） + WordMapUtils.newMapWithList(WorkTicketConstants.WorkTicketMeasureTypeEnum.TWO.getConvertAttributes(), workTicketInfoMap, true, 3, "safetyMeasure", "status"); + //1.3 应装设遮拦、应挂标识牌及防止二次回路误碰等措施（注明确实地点、名称） + WordMapUtils.newMapWithList(WorkTicketConstants.WorkTicketMeasureTypeEnum.THREE.getConvertAttributes(), workTicketInfoMap, true, 6, "safetyMeasure", "status"); + + //2. 第二种工作票 + //2.1 应断开断路器和隔离开关，包括填写前已断开断路器和隔离开关（注明编号）、应取熔断器（保险） + WordMapUtils.newMapWithList(WorkTicketConstants.WorkTicketMeasureTypeEnum.SEVEN.getConvertAttributes(), workTicketInfoMap, true, 6, "safetyMeasure", "status"); + + + //3. 水利机器工作票 + //3.1 必须采取的安全措施 + WordMapUtils.newMapWithList(WorkTicketConstants.WorkTicketMeasureTypeEnum.EIGHT.getConvertAttributes(), workTicketInfoMap, true, 8, "safetyMeasure", "status"); + //3.2 检修工作要求检修人员自行执行的安全措施（由工作负责人填写） + WordMapUtils.newMapWithList(WorkTicketConstants.WorkTicketMeasureTypeEnum.NINE.getConvertAttributes(), workTicketInfoMap, true, 5, "safetyMeasure", "status"); + //3.3 检修工作要求检修人员自行执行的安全措施（由工作负责人填写） + WordMapUtils.newMapWithList(WorkTicketConstants.WorkTicketMeasureTypeEnum.TEN.getConvertAttributes(), workTicketInfoMap, true, 5, "safetyMeasure", "status"); + + + } + + + /** + * 存入新的数据 + * + * @param result + */ + private void addMapPut(Map result) { + log.info("存入新的数据"); + //许可人确认安全措施，负责人确认安全措施 + if (WordHelper.isNoneBlank(result, "licenseTime")) { + log.info("许可人确认安全措施，负责人确认安全措施"); + String principalName = WordHelper.toMapAsString(result, "principalName", 10); + result.put("principalName1", principalName); + } else { + WordHelper.putMap(result, "principalName1", 10); + } + + //负责人变更 + if (WordHelper.isNoneBlank(result, "initialPrincipalName")) { + log.info("负责人变更"); + //签发人 + String signerName = WordHelper.toMapAsString(result, "signerName", 10); + result.put("signerName2", signerName); + //许可人 + String licensorName = WordHelper.toMapAsString(result, "licensorName", 10); + result.put("licensorName1", licensorName); + } else { + WordHelper.putMap(result, "signerName2", 10); + WordHelper.putMap(result, "licensorName1", 10); + } + + //延期 + if (WordHelper.isNoneBlank(result, "changeTime")) { + log.info("延期"); + //负责人 + String licensorName = WordHelper.toMapAsString(result, "principalName", 10); + result.put("principalName2", licensorName); + }else { + WordHelper.putMap(result, "principalName2", 10); + } + + //许可人确认工作票终结 + + if (WordHelper.isNoneBlank(result, "workEndTime")) { + log.info("许可人确认工作票终结"); + //负责人 + String principalName = WordHelper.toMapAsString(result, "principalName", 10); + result.put("principalName3", principalName); + //许可人 + String licensorName = WordHelper.toMapAsString(result, "licensorName", 10); + result.put("licensorName2", licensorName); + }else { + WordHelper.putMap(result, "principalName3", 10); + WordHelper.putMap(result, "licensorName2", 10); + } + } + + + /** * 工作地点保留带电部位或注意事项 - * 2 个map集合转成一个map集合 + * 2 个map集合转成一个map集合 + * * @param workTicketInfoMap */ private static void matterLibraryListWithMap(Map workTicketInfoMap) { - List> matterLibraryListFive1 = - workTicketInfoMap.get("matterLibraryListFive") == null ? new ArrayList>() - : (List>) workTicketInfoMap.get("matterLibraryListFive"); - List> matterLibraryListFlow1 = workTicketInfoMap.get("matterLibraryListFlow") == null - ? new ArrayList>() - : (List>) workTicketInfoMap.get("matterLibraryListFlow"); + List> matterLibraryListFive1 = workTicketInfoMap.get("matterLibraryListFive") == null ? new ArrayList>() : (List>) workTicketInfoMap.get("matterLibraryListFive"); + List> matterLibraryListFlow1 = workTicketInfoMap.get("matterLibraryListFlow") == null ? new ArrayList>() : (List>) workTicketInfoMap.get("matterLibraryListFlow"); if (matterLibraryListFive1 != null && matterLibraryListFlow1 != null) { List> matterLibraryListFive = matterLibraryListFive1; @@ -930,23 +1028,27 @@ public class TicketProcessServiceImpl implements TicketProcessService { } workTicketInfoMap.put("matterLibraryList", CollectionUtils.isEmpty(maps) ? new ArrayList<>() : maps); - } + + + WordMapUtils.newMapWithList("matterLibraryList", workTicketInfoMap, true, 3, null); + } /** * 判断是否包含，是否存在 + * * @param result */ private static void isExists(Map result) { if (!result.containsKey("ticketInfoDangers")) { - result.put("ticketInfoDangers",new ArrayList>()); + result.put("ticketInfoDangers", new ArrayList>()); } //项目名称 - if (!result.containsKey("projectName")) { - result.put("projectName","\u00A0 "); + if (!result.containsKey("projectName") || StringUtils.isBlank((CharSequence) result.get("projectName"))) { + result.put("projectName", "\u00A0 "); } } @@ -1004,7 +1106,6 @@ public class TicketProcessServiceImpl implements TicketProcessService { } - /** * 添加文件 * @@ -1018,7 +1119,6 @@ public class TicketProcessServiceImpl implements TicketProcessService { } - /** * value true转 ☑ 或 false转 □ * @@ -1033,6 +1133,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { } } + } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/utils/WordHelper.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/utils/WordHelper.java new file mode 100644 index 0000000..8240377 --- /dev/null +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/utils/WordHelper.java @@ -0,0 +1,229 @@ +package com.hnac.hzims.ticket.twoTicket.utils; + + +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import lombok.AllArgsConstructor; +import lombok.Data; +import org.apache.commons.lang3.StringUtils; + +import java.util.*; + +/** + * @Author WL + * @Version v1.0 + * @Serial 1.0 + * @Date 2023/6/2 14:27 + */ +public class WordHelper extends StringUtils { + + + /** + * Object转 toString + * + * @param object + * @return + */ + public static String toString(Object object) { + return object == null ? null : object.toString().trim(); + } + + + /** + * Map ===》 string + * + * @param result map + * @param key 值 + * @param count 存在多少空格 + * @return + */ + public static String toMapAsString(Map result, String key, int count) { + String signerName = WordHelper.toString(result.get(key)); + return isNotBlank(signerName) ? signerName : "\u00A0" + printSpace(count); + } + + + /** + * 存入map + * + * @param result map + * @param key 值 + * @param count 存在多少空格 + * @return + */ + public static void putMap(Map result, String key, int count) { + result.put(key, "\u00A0" + printSpace(count)); + } + + + /** + * 判断map是否为空 + */ + public static boolean isBlank(Map result, String key) { + String value = WordHelper.toString(result.get(key)); + if (StringUtils.isBlank(value)) { + return true; + } + return false; + } + + + /** + * 判断map不为为空 + */ + public static boolean isNoneBlank(Map result, String key) { + String value = WordHelper.toString(result.get(key)).trim(); + System.out.println(value.length()); + if (StringUtils.isNoneBlank(value)) { + return true; + } + return false; + } + + + /** + * 打印多少空格 + */ + public static String printSpace(int count) { + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < count; i++) { + sb.append(" "); + } + return sb.toString(); + } + + /** + * map验证是value否为null + * + * @param params + */ + public static Map resultMap(Map params) { + //创建新的Map + Map result = new HashMap<>(); + isContainsKey(params,result); + //遍历 + Set> entries = params.entrySet(); + for (Map.Entry entry : entries) { + listEntryMap(result, entry.getKey(), entry.getValue()); + } + return result; + } + + + /** + * 包含移除 + * @param params + * @param result + */ + private static void isContainsKey(Map params, Map result) { + + if (params.containsKey("principalName1")) { + result.put("principalName1", params.get("principalName1")); + params.remove("principalName1"); + } + + if (params.containsKey("signerName2")) { + result.put("signerName2", params.get("signerName2")); + params.remove("signerName2"); + } + + if (params.containsKey("licensorName1")) { + result.put("licensorName1", params.get("licensorName1")); + params.remove("licensorName1"); + } + + + if (params.containsKey("principalName2")) { + result.put("principalName2", params.get("principalName2")); + params.remove("principalName2"); + } + + + if (params.containsKey("principalName3")) { + result.put("principalName3", params.get("principalName3")); + params.remove("principalName3"); + } + + + if (params.containsKey("licensorName2")) { + result.put("licensorName2", params.get("licensorName2")); + params.remove("licensorName2"); + } + + } + + /** + * + */ + public static void listEntryMap(Map result, String key, Object value) { + List params = new ArrayList<>(); + paramsList(params); + for (Entry entry : params) { + isEntryMap(result, entry.getFileName(), key, value, entry.getCount()); + } + + } + + + @Data + @AllArgsConstructor + static class Entry { + /** + * key值 + */ + private String fileName; + + /** + * count + */ + private Integer count; + + } + + + /** + * 存储list + * + * @param params + */ + private static void paramsList(List params) { + params.add(new Entry("initialPrincipalName", 10)); + params.add(new Entry("principalChangeTime", 10)); + params.add(new Entry("principalName", 10)); + params.add(new Entry("jobReceiver", 10)); + params.add(new Entry("jobReceiverTime", 10)); + params.add(new Entry("watchPrincipalEndTime", 10)); + params.add(new Entry("licenseTime", 10)); + params.add(new Entry("signerDateTime", 10)); + params.add(new Entry("classGroupName", 10)); + params.add(new Entry("code", 10)); + params.add(new Entry("signerName", 10)); + params.add(new Entry("watchPrincipalName", 10)); + params.add(new Entry("projectName", 10)); + params.add(new Entry("groundNum", 5)); + params.add(new Entry("dismantleNum", 5)); + params.add(new Entry("retainNum", 5)); + } + + + /** + * 验证map是否为空 + * + * @param result + * @param fieldName + * @param key + * @param value + * @param count + */ + public static void isEntryMap(Map result, String fieldName, String key, Object value, int count) { + if (fieldName.equals(key)) { + // Object newValue = Optional.ofNullable(value).orElse("\u00A0" + printSpace(count)); + Object newValue = StringUtils.isNoneBlank(toString(value).trim()) ? value : "\u00A0" + printSpace(count); + result.put(key, newValue); + } else { + Object newValue = StringUtils.isNoneBlank(toString(value).trim()) ? value : "\u00A0"; + result.put(key, newValue); + } + } + + +} diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/utils/WordMapUtils.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/utils/WordMapUtils.java new file mode 100644 index 0000000..cdb46e2 --- /dev/null +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/utils/WordMapUtils.java @@ -0,0 +1,120 @@ +package com.hnac.hzims.ticket.twoTicket.utils; + +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @Author WL + * @Version v1.0 + * @Serial 1.0 + * @Date 2023/6/2 7:39 + */ +public class WordMapUtils { + + + + /** + * word 表格转换 + * + * @param key key值 + * @param result 存入数据 + * @param isIndex 是否需要索引 + * @param size word最多的表格数据 + * @param keys 多个key值 + */ + public static void newMapWithList(String key, Map result + , boolean isIndex, int size, String... keys) { + List> list = (List>) result.get(key); + if (CollectionUtils.isEmpty(list)) { + List> newMatterLibraryListTHREE = new ArrayList<>(); + for (int i = 1; i <= size; i++) { + Map map = new HashMap<>(); + //是否需要索引 + if (isIndex) { + map.put("index", i); + } + // 是否有keys + if (keys != null) { + for (String value : keys) { + map.put(value, ""); + } + } + newMatterLibraryListTHREE.add(map); + } + result.put(key, + newMatterLibraryListTHREE); + } else { + + int tempSize = list.size(); + + List> newList = new ArrayList<>(); + if (size > tempSize) { + int sizeLimit = 1; + int tempIndex = 1; + for (int i = 0; i < size; i++) { + Map map = new HashMap<>(); + if (tempSize >= sizeLimit) { + Map stringObjectMap = list.get(i); + // map.putAll(stringObjectMap); + newList.add(stringObjectMap); + tempIndex++; + sizeLimit++; + }else { + //是否需要索引 + if (isIndex) { + map.put("index", tempIndex); + + } + // 是否有keys + if (keys != null) { + for (String value : keys) { + map.put(value, ""); + } + } + tempIndex++; + newList.add(map); + } + } + } else { + for (int i = 0; i < tempSize; i++) { + Map map = list.get(i); + if (isIndex) { + map.put("index", i + 1); + } + newList.add(map); + } + } + result.put(key, newList); + } + } + + + + + /** + * 通过状态获取是第几种工作票 + */ + public static String getWorkTicketStatus(Integer status) { + String pathName = null; + switch (status) { + case 1: + pathName = "电气第一种工作票模版.docx"; + break; + case 2: + pathName = "电气第二种工作票模版.docx"; + break; + case 3: + pathName = "水力机械工作票模版.docx"; + break; + default: + pathName = "电气第一种工作票模版.docx"; + break; + } + return pathName; + } + +} diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/process/WorkTicketVo.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/process/WorkTicketVo.java index 58da938..2dfa1e7 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/process/WorkTicketVo.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/process/WorkTicketVo.java @@ -69,11 +69,6 @@ public class WorkTicketVo { private WorkTicketPrincipalChangeEntity workTicketPrincipalChange; - /** - * 开启流程 - */ - private Boolean isState = true; - diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/utils/PdfUtils.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/utils/PdfUtils.java index 3e7b2d9..45251de 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/utils/PdfUtils.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/utils/PdfUtils.java @@ -257,33 +257,34 @@ public class PdfUtils { result.put(StringUtil.isNoneBlank(defaultValue.name()) ? defaultValue.name() : field.getName(), ObjectUtil.isNotEmpty(defaultValue.value()) ? defaultValue.value() : value); } else { - if ("initialPrincipalName".equals(field.getName()) - || "principalChangeTime".equals(field.getName()) - || "principalName".equals(field.getName()) - || "jobReceiver".equals(field.getName()) - || "jobReceiverTime".equals(field.getName()) - || "watchPrincipalEndTime".equals(field.getName()) - || "licenseTime".equals(field.getName()) - || "licensorName".equals(field.getName()) - || "signerDateTime".equals(field.getName()) - || "classGroupName".equals(field.getName()) - || "code".equals(field.getName()) - || "signerName".equals(field.getName()) - || "watchPrincipalName".equals(field.getName())) - { - result.put(field.getName(), Optional.ofNullable(value).orElse("\u00A0 ")); - - } else if ( - "groundNum".equals(field.getName()) || - "dismantleNum".equals(field.getName()) || - "retainNum".equals(field.getName()) - - ) { - result.put(field.getName(), Optional.ofNullable(value).orElse("\u00A0 ")); - } else { + // if ("initialPrincipalName".equals(field.getName()) + // || "principalChangeTime".equals(field.getName()) + // || "principalName".equals(field.getName()) + // || "jobReceiver".equals(field.getName()) + // || "jobReceiverTime".equals(field.getName()) + // || "watchPrincipalEndTime".equals(field.getName()) + // || "licenseTime".equals(field.getName()) + // || "licensorName".equals(field.getName()) + // || "signerDateTime".equals(field.getName()) + // || "classGroupName".equals(field.getName()) + // || "code".equals(field.getName()) + // || "signerName".equals(field.getName()) + // || "watchPrincipalName".equals(field.getName()) + // || "projectName".equals(field.getName())) + // { + // result.put(field.getName(), Optional.ofNullable(value).orElse("\u00A0 ")); + // + // } else if ( + // "groundNum".equals(field.getName()) || + // "dismantleNum".equals(field.getName()) || + // "retainNum".equals(field.getName()) + // + // ) { + // result.put(field.getName(), Optional.ofNullable(value).orElse("\u00A0 ")); + // } else { //如果导出word为null会出现{{ ,value设置"\u00A0" - result.put(field.getName(), Optional.ofNullable(value).orElse("\u00A0")); - } + result.put(field.getName(), Optional.ofNullable(value).orElse("")); + //} } diff --git a/hzims-service/ticket/src/main/resources/template/secondary/工作票危险点分析及控制措施票.docx b/hzims-service/ticket/src/main/resources/template/secondary/工作票危险点分析及控制措施票.docx index 46cec0fcbc9904a61475e19417977f87bdaacbe7..591306f4dd39a664c81e9ae1a1e23d5978d32aad 100644 GIT binary patch delta 15363 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

Mrg@_y=l%sB`icIM}c9 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 delta 15769 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 literal 0 HcmV?d00001 diff --git a/hzims-service/ticket/src/main/resources/template/电气第一种工作票模版.docx b/hzims-service/ticket/src/main/resources/template/电气第一种工作票模版.docx index 76478f2e4d9021ea4b61370fdbb0bdce5660ed43..f2760d0ff4c335bd1cbe226286a379ecaa2612e6 100644 GIT binary patch delta 17241 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 literal 0 HcmV?d00001 From 1cff3d96692e0b54c33f8c4a8309800f072f3c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Mon, 5 Jun 2023 08:24:17 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E7=9A=84=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TicketProcessServiceImpl.java | 10 +++---- .../hzims/ticket/twoTicket/utils/WordHelper.java | 1 - .../java/com/hnac/hzims/ticket/utils/PdfUtils.java | 32 ++-------------------- 3 files changed, 6 insertions(+), 37 deletions(-) diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java index da04670..73bd986 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java @@ -535,10 +535,10 @@ public class TicketProcessServiceImpl implements TicketProcessService { log.info("获取启动流程数据 : {}", processInstanceContainNameByKey); Duration between = Duration.between(start, Instant.now()); - System.out.println("================================================================"); - System.err.println("耗时: " + (between.getSeconds()) + "秒"); - System.err.println("耗时: " + (between.toMillis()) + "毫秒"); - System.out.println("================================================================"); + log.info("================================================================"); + log.info("耗时: " + (between.getSeconds()) + "秒"); + log.info("耗时: " + (between.toMillis()) + "毫秒"); + log.info("================================================================"); } @@ -774,8 +774,6 @@ public class TicketProcessServiceImpl implements TicketProcessService { String url = "template/" + workTicketStatus; XWPFDocument doc = WordExportUtil.exportWord07(url, workTicketInfoMap); log.info("当前系统版本是:{}", os); - //String name = "D:/导出excel/电气第一种工作票模版.docx"; - //FileOutputStream fos = new FileOutputStream(name); doc.write(response.getOutputStream()); } else { String url = TicketConstant.TICKET_LIUNX_PATH + "/" + workTicketStatus; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/utils/WordHelper.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/utils/WordHelper.java index 8240377..8147ea9 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/utils/WordHelper.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/utils/WordHelper.java @@ -216,7 +216,6 @@ public class WordHelper extends StringUtils { */ public static void isEntryMap(Map result, String fieldName, String key, Object value, int count) { if (fieldName.equals(key)) { - // Object newValue = Optional.ofNullable(value).orElse("\u00A0" + printSpace(count)); Object newValue = StringUtils.isNoneBlank(toString(value).trim()) ? value : "\u00A0" + printSpace(count); result.put(key, newValue); } else { diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/utils/PdfUtils.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/utils/PdfUtils.java index 45251de..d9f32cc 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/utils/PdfUtils.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/utils/PdfUtils.java @@ -257,36 +257,8 @@ public class PdfUtils { result.put(StringUtil.isNoneBlank(defaultValue.name()) ? defaultValue.name() : field.getName(), ObjectUtil.isNotEmpty(defaultValue.value()) ? defaultValue.value() : value); } else { - // if ("initialPrincipalName".equals(field.getName()) - // || "principalChangeTime".equals(field.getName()) - // || "principalName".equals(field.getName()) - // || "jobReceiver".equals(field.getName()) - // || "jobReceiverTime".equals(field.getName()) - // || "watchPrincipalEndTime".equals(field.getName()) - // || "licenseTime".equals(field.getName()) - // || "licensorName".equals(field.getName()) - // || "signerDateTime".equals(field.getName()) - // || "classGroupName".equals(field.getName()) - // || "code".equals(field.getName()) - // || "signerName".equals(field.getName()) - // || "watchPrincipalName".equals(field.getName()) - // || "projectName".equals(field.getName())) - // { - // result.put(field.getName(), Optional.ofNullable(value).orElse("\u00A0 ")); - // - // } else if ( - // "groundNum".equals(field.getName()) || - // "dismantleNum".equals(field.getName()) || - // "retainNum".equals(field.getName()) - // - // ) { - // result.put(field.getName(), Optional.ofNullable(value).orElse("\u00A0 ")); - // } else { - //如果导出word为null会出现{{ ,value设置"\u00A0" - result.put(field.getName(), Optional.ofNullable(value).orElse("")); - //} - - + //如果导出word为null会出现{{ ,value设置"\u00A0" + result.put(field.getName(), Optional.ofNullable(value).orElse("")); } }); } From 1cc419302feee61996ef6312c64ad999becfcc8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Mon, 5 Jun 2023 10:35:04 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E7=A5=A8process=5Fdict=E5=AD=97=E5=85=B8=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/TicketProcessConstant.java | 5 +- .../controller/ProcessDictController.java | 44 ++++++++ .../ticket/processflow/entity/ProcessDict.java | 113 +++++++++++++++++++++ .../processflow/mapper/ProcessDictMapper.java | 14 +++ .../processflow/mapper/xml/ProcessTypeMapper.xml | 5 - .../processflow/service/ProcessDictService.java | 22 ++++ .../service/impl/ProcessDictServiceImpl.java | 33 ++++++ .../serviceimpl/OneTicketProcessServiceImpl.java | 15 ++- .../service/impl/TicketProcessServiceImpl.java | 16 ++- .../service/impl/WorkTicketInfoServiceImpl.java | 2 +- .../ticket/src/main/resources/application.yml | 1 + .../mapper/processflow/ProcessDictMapper.xml | 5 + .../mapper/processflow/ProcessTypeMapper.xml | 5 + 13 files changed, 267 insertions(+), 13 deletions(-) create mode 100644 hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/controller/ProcessDictController.java create mode 100644 hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/entity/ProcessDict.java create mode 100644 hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/mapper/ProcessDictMapper.java delete mode 100644 hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/mapper/xml/ProcessTypeMapper.xml create mode 100644 hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/service/ProcessDictService.java create mode 100644 hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/service/impl/ProcessDictServiceImpl.java create mode 100644 hzims-service/ticket/src/main/resources/mapper/processflow/ProcessDictMapper.xml create mode 100644 hzims-service/ticket/src/main/resources/mapper/processflow/ProcessTypeMapper.xml diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/constant/TicketProcessConstant.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/constant/TicketProcessConstant.java index 46a48bc..7bef5ea 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/constant/TicketProcessConstant.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/constant/TicketProcessConstant.java @@ -10,5 +10,8 @@ package com.hnac.hzims.ticket.processflow.constant; */ public class TicketProcessConstant { - public final static String STARTEVENT = "workTicketFlow"; + /** + * 第一种工作票的key + */ + public static final String FIRST_TICKET_KEY = "networking"; } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/controller/ProcessDictController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/controller/ProcessDictController.java new file mode 100644 index 0000000..f6b6fdf --- /dev/null +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/controller/ProcessDictController.java @@ -0,0 +1,44 @@ +package com.hnac.hzims.ticket.processflow.controller; + +import com.hnac.hzims.ticket.processflow.entity.ProcessDict; +import com.hnac.hzims.ticket.processflow.service.ProcessDictService; +import groovy.util.logging.Slf4j; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Author WL + * @Version v1.0 + * @Serial 1.0 + * @Date 2023/6/5 9:35 + */ + +@Slf4j +@RequestMapping("/process-dict") +@RestController +@RequiredArgsConstructor +public class ProcessDictController { + + + private final ProcessDictService processDictService; + + + + + @GetMapping("/test") + public void test(){ + ProcessDict processDict = new ProcessDict(); + processDict.setDictKey("networking"); + processDict.setDictSort(0); + processDict.setDictValue("workTicketFlow"); + processDict.setDictLabel("第一种工作票"); + processDict.setIsDefault("Y"); + processDict.setRemark("第一种工作票"); + processDict.setDictType("工作票"); + processDictService.save(processDict); + } + + +} diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/entity/ProcessDict.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/entity/ProcessDict.java new file mode 100644 index 0000000..d2240cb --- /dev/null +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/entity/ProcessDict.java @@ -0,0 +1,113 @@ +package com.hnac.hzims.ticket.processflow.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springblade.core.mp.base.BaseEntity; +import org.springblade.core.tenant.mp.TenantEntity; + +import java.time.LocalDateTime; +import java.util.Date; + +/** + * 票据字典表 + * @Author WL + * @Version v1.0 + * @Serial 1.0 + * @Date 2023/6/5 8:33 + */ +@Data +@ApiModel(value = "ProcessDict",description = "票据字典表") +@Accessors(chain = true) +public class ProcessDict { + + + /** + * 票据编码 + */ + @TableId(value = "dictCode",type = IdType.AUTO) + @ApiModelProperty("票据编码") + private Long dictCode; + + + /** + *票据排序 + */ + @ApiModelProperty("票据排序") + private Integer dictSort; + + + /** + *票据字典码 + */ + @ApiModelProperty("票据字典码") + private String dictKey; + + + /** + *票据流程标识 + */ + @ApiModelProperty("票据流程标识") + private String dictValue; + + + + /** + *票据标签 + */ + @ApiModelProperty("票据标签") + private String dictLabel; + + /** + *票据类型 + */ + @ApiModelProperty("票据类型") + private String dictType; + + /** + *是否默认（Y是 N否） + */ + @ApiModelProperty("是否默认（Y是 N否）") + private String isDefault; + + + /** + *状态（0正常 1停用） + */ + @ApiModelProperty("状态（0正常 1停用）") + private Integer status; + + + + /** + * 所属机构 + */ + @ApiModelProperty("所属机构") + private Long createDept; + + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createTime; + + + /** + * 更新时间 + */ + @ApiModelProperty("更新时间") + private LocalDateTime updateTime; + + + + /** + * 票据备注 + */ + @ApiModelProperty("票据备注") + private String remark; +} diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/mapper/ProcessDictMapper.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/mapper/ProcessDictMapper.java new file mode 100644 index 0000000..2bb86f5 --- /dev/null +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/mapper/ProcessDictMapper.java @@ -0,0 +1,14 @@ +package com.hnac.hzims.ticket.processflow.mapper; + +import com.hnac.hzims.ticket.processflow.entity.ProcessDict; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + +/** + * @Author WL + * @Version v1.0 + * @Serial 1.0 + * @Date 2023/6/5 8:49 + */ +public interface ProcessDictMapper extends UserDataScopeBaseMapper { + +} diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/mapper/xml/ProcessTypeMapper.xml b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/mapper/xml/ProcessTypeMapper.xml deleted file mode 100644 index 39ffa8c..0000000 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/mapper/xml/ProcessTypeMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/service/ProcessDictService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/service/ProcessDictService.java new file mode 100644 index 0000000..7113a06 --- /dev/null +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/service/ProcessDictService.java @@ -0,0 +1,22 @@ +package com.hnac.hzims.ticket.processflow.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.hnac.hzims.ticket.processflow.entity.ProcessDict; + +/** + * @Author WL + * @Version v1.0 + * @Serial 1.0 + * @Date 2023/6/5 8:52 + */ +public interface ProcessDictService extends IService { + + + /** + * 根据字典key查询字典value + */ + String selectDictValueByKey(String dictKey); + + + +} diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/service/impl/ProcessDictServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/service/impl/ProcessDictServiceImpl.java new file mode 100644 index 0000000..84fbfd9 --- /dev/null +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/service/impl/ProcessDictServiceImpl.java @@ -0,0 +1,33 @@ +package com.hnac.hzims.ticket.processflow.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hnac.hzims.ticket.processflow.entity.ProcessDict; +import com.hnac.hzims.ticket.processflow.mapper.ProcessDictMapper; +import com.hnac.hzims.ticket.processflow.service.ProcessDictService; +import groovy.util.logging.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * @Author WL + * @Version v1.0 + * @Serial 1.0 + * @Date 2023/6/5 8:59 + */ +@Slf4j +@Service +public class ProcessDictServiceImpl extends ServiceImpl implements ProcessDictService { + /** + * 根据字典key查询字典value + * + * @param dictKey + */ + @Override + public String selectDictValueByKey(String dictKey) { + LambdaQueryChainWrapper processDictLambdaQueryChainWrapper = new LambdaQueryChainWrapper<>(baseMapper); + processDictLambdaQueryChainWrapper.eq(ProcessDict::getDictKey,dictKey); + return processDictLambdaQueryChainWrapper.one().getDictValue(); + } +} diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/OneTicketProcessServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/OneTicketProcessServiceImpl.java index 82f64ce..1255079 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/OneTicketProcessServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/OneTicketProcessServiceImpl.java @@ -1,6 +1,7 @@ package com.hnac.hzims.ticket.processflow.strategy.serviceimpl; import com.hnac.hzims.ticket.processflow.constant.TicketProcessConstant; +import com.hnac.hzims.ticket.processflow.service.ProcessDictService; import com.hnac.hzims.ticket.response.ProcessWorkFlowResponse; import com.hnac.hzims.ticket.processflow.strategy.abstracts.ProcessAbstractService; import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue; @@ -9,6 +10,8 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import static com.hnac.hzims.ticket.processflow.constant.TicketProcessConstant.FIRST_TICKET_KEY; + /** * 开工作票流程实现类 * @@ -27,6 +30,15 @@ public class OneTicketProcessServiceImpl extends ProcessAbstractService { private final TicketProcessService ticketProcessService; + + private final ProcessDictService processDictService; + + + + + + + /** * 设置执行那种实现类 * @@ -36,7 +48,8 @@ public class OneTicketProcessServiceImpl extends ProcessAbstractService { @Override public Boolean isWorkflowProcess(WorkflowQueue flowQueue) { log.info("是否执行开第一种工作票流程环节操作~~~~,流程ticket: {}", flowQueue); - if (TicketProcessConstant.STARTEVENT.equals(flowQueue.getProcessDefinitionKey())) { + String dictValue = processDictService.selectDictValueByKey(FIRST_TICKET_KEY); + if (dictValue.equals(flowQueue.getProcessDefinitionKey())) { log.info("已执行第一种开工作票流程环节操作~~~~"); return true; } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java index 73bd986..2c8d482 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java @@ -18,6 +18,7 @@ import com.hnac.hzims.operational.station.entity.StationEntity; import com.hnac.hzims.operational.station.feign.IStationClient; import com.hnac.hzims.ticket.constants.TicketConstants; import com.hnac.hzims.ticket.constants.WorkTicketConstants; +import com.hnac.hzims.ticket.processflow.service.ProcessDictService; import com.hnac.hzims.ticket.processflow.strategy.core.ProcessIdWorker; import com.hnac.hzims.ticket.response.ProcessWorkFlowResponse; import com.hnac.hzims.ticket.twoTicket.constant.TicketConstant; @@ -68,6 +69,8 @@ import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; +import static com.hnac.hzims.ticket.processflow.constant.TicketProcessConstant.FIRST_TICKET_KEY; + /** * 开票处理流程实现类 @@ -112,8 +115,6 @@ public class TicketProcessServiceImpl implements TicketProcessService { private final IAccessTaskClient accessTaskClient; - private String newFirstWorkTicketFlowKey = "workTicketFlow"; - private final IStationClient stationClient; @@ -141,6 +142,9 @@ public class TicketProcessServiceImpl implements TicketProcessService { private final TicketInfoDangerService ticketInfoDangerService; + private final ProcessDictService processDictService; + + /** * 启动开票流程 * @@ -188,9 +192,11 @@ public class TicketProcessServiceImpl implements TicketProcessService { this.saveSafetyMeasures(workTicketVo.getSafetyMeasuresList(), workTicketVo.getWorkTicket()); //5. 保存工作任务 this.saveWorkTicketContentDto(workTicketVo.getWorkTicketContentDtoList(), workTicketVo.getWorkTicket()); - //6. 开启动作流 - this.dealProcess(newFirstWorkTicketFlowKey, workTicketVo); - //7. 处理任务 + //6. 查询第一种工作票值 + String dictValue = processDictService.selectDictValueByKey(FIRST_TICKET_KEY); + //7. 开启动作流 + this.dealProcess(dictValue, workTicketVo); + //8. 处理任务 this.returnTicket(workTicketVo); } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java index 1da1885..0105a3d 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java @@ -256,7 +256,7 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl { User user = UserCache.getUser(item.getCreateUser()); if (user != null) { - item.setCreateUserName(UserCache.getUser(item.getCreateUser()).getName()); + item.setCreateUserName(user.getName()); } }); diff --git a/hzims-service/ticket/src/main/resources/application.yml b/hzims-service/ticket/src/main/resources/application.yml index 9341ce3..1de0a34 100644 --- a/hzims-service/ticket/src/main/resources/application.yml +++ b/hzims-service/ticket/src/main/resources/application.yml @@ -16,6 +16,7 @@ swagger: + #ticket: # workTickets: # - status: 1 diff --git a/hzims-service/ticket/src/main/resources/mapper/processflow/ProcessDictMapper.xml b/hzims-service/ticket/src/main/resources/mapper/processflow/ProcessDictMapper.xml new file mode 100644 index 0000000..1882427 --- /dev/null +++ b/hzims-service/ticket/src/main/resources/mapper/processflow/ProcessDictMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/hzims-service/ticket/src/main/resources/mapper/processflow/ProcessTypeMapper.xml b/hzims-service/ticket/src/main/resources/mapper/processflow/ProcessTypeMapper.xml new file mode 100644 index 0000000..39ffa8c --- /dev/null +++ b/hzims-service/ticket/src/main/resources/mapper/processflow/ProcessTypeMapper.xml @@ -0,0 +1,5 @@ + + + + + From 6368d17363e42c211eaf894ca71bfad637b9fec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Mon, 5 Jun 2023 18:03:32 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E7=A5=A8=E9=A2=84=E8=A7=88=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ticket/processflow/entity/ProcessDict.java | 4 +- .../ticket/twoTicket/entity/WorkTicketFinish.java | 4 ++ .../service/impl/TicketProcessServiceImpl.java | 67 +++++++++++++++------ .../service/impl/WorkTicketFinishServiceImpl.java | 5 +- .../hzims/ticket/twoTicket/utils/WordHelper.java | 6 +- ...工作票危险点分析及控制措施票.docx | Bin 28979 -> 30611 bytes .../template/电气第一种工作票模版.docx | Bin 43033 -> 42691 bytes 7 files changed, 61 insertions(+), 25 deletions(-) diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/entity/ProcessDict.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/entity/ProcessDict.java index d2240cb..185fef7 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/entity/ProcessDict.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/entity/ProcessDict.java @@ -2,6 +2,7 @@ package com.hnac.hzims.ticket.processflow.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -22,13 +23,14 @@ import java.util.Date; @Data @ApiModel(value = "ProcessDict",description = "票据字典表") @Accessors(chain = true) +@TableName("process_dict") public class ProcessDict { /** * 票据编码 */ - @TableId(value = "dictCode",type = IdType.AUTO) + @TableId(type = IdType.AUTO) @ApiModelProperty("票据编码") private Long dictCode; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/entity/WorkTicketFinish.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/entity/WorkTicketFinish.java index 145b692..b785073 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/entity/WorkTicketFinish.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/entity/WorkTicketFinish.java @@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.time.LocalDateTime; @@ -124,6 +126,8 @@ public class WorkTicketFinish implements Serializable { /** * 结束时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime workEndTime; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java index 2c8d482..15ce51e 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java @@ -5,9 +5,11 @@ import cn.afterturn.easypoi.word.WordExportUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.operational.access.entity.OperAccessTaskEntity; import com.hnac.hzims.operational.access.feign.IOperAccessTaskClient; @@ -250,16 +252,21 @@ public class TicketProcessServiceImpl implements TicketProcessService { e.printStackTrace(); } //更新安全措施 - List safetyMeasuresList = workTicketVo.getSafetyMeasuresList(); - if (CollectionUtils.isNotEmpty(safetyMeasuresList)) { - log.info("获取安全措施的数据：{}", safetyMeasuresList); - safetyMeasuresList.forEach(item -> { - if (ObjectUtils.isNotEmpty(item.getTicketId())) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(WorkTicketSafetyMeasureEntity::getTicketId, item.getTicketId()); - workTicketSafetyMeasureService.update(item, queryWrapper); + try { + List safetyMeasuresList = workTicketVo.getSafetyMeasuresList(); + if (CollectionUtils.isNotEmpty(safetyMeasuresList)) { + log.info("获取安全措施的数据：{}", safetyMeasuresList); + for (WorkTicketSafetyMeasureEntity item : safetyMeasuresList) { + if (ObjectUtils.isNotEmpty(item.getId())) { + workTicketSafetyMeasureService.updateById(item); + }else { + item.setTicketId(workTicketInfo.getId()); + workTicketSafetyMeasureService.save(item); + } } - }); + } + } catch (Exception e) { + e.printStackTrace(); } //工作票工作任务组 // List workTicketContentDtoList = workTicketVo.getWorkTicketContentDtoList(); @@ -299,7 +306,9 @@ public class TicketProcessServiceImpl implements TicketProcessService { //工作结束 WorkTicketFinish workTicketFinish = workTicketVo.getWorkTicketFinish(); try { - if (ObjectUtils.isNotEmpty(workTicketFinish) && 99 == workTicket.getFlowStatus().intValue()) { + + log.info("工作结束==============>"+ (workTicket.getFlowStatus().intValue())); + if (ObjectUtils.isNotEmpty(workTicketFinish)) { WorkTicketFinish ticketFinish = workTicketFinishService.selectByTicketId(workTicketInfo.getId()); log.info("获取工作结束：{}", workTicketFinish); if (ObjectUtils.isEmpty(workTicketFinish.getId()) || ObjectUtils.isEmpty(ticketFinish)) { @@ -427,6 +436,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { workTicket.setFlowTaskName("结束"); workTicket.setNextStepOperator(" "); workTicket.setStepOperator(" "); + workTicket.setFlowStatus(999); } else { workTicket.setFlowTaskId(taskId); workTicket.setFlowTaskName(response.getTaskName()); @@ -856,7 +866,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { WorkTicketDelayEntity workTicketDelay = workTicketVo.getWorkTicketDelay(); log.info("工作票延期: {}", workTicketDelay); if (ObjectUtils.isNotEmpty(workTicketDelay)) { - result.putAll(PdfUtils.objectToMapResult(workTicket, result)); + result.putAll(PdfUtils.objectToMapResult(workTicketDelay, result)); } else { result.putAll(PdfUtils.objectToMapResult(new WorkTicketDelayEntity(), result)); } @@ -973,12 +983,11 @@ public class TicketProcessServiceImpl implements TicketProcessService { //负责人 String licensorName = WordHelper.toMapAsString(result, "principalName", 10); result.put("principalName2", licensorName); - }else { + } else { WordHelper.putMap(result, "principalName2", 10); } //许可人确认工作票终结 - if (WordHelper.isNoneBlank(result, "workEndTime")) { log.info("许可人确认工作票终结"); //负责人 @@ -987,7 +996,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { //许可人 String licensorName = WordHelper.toMapAsString(result, "licensorName", 10); result.put("licensorName2", licensorName); - }else { + } else { WordHelper.putMap(result, "principalName3", 10); WordHelper.putMap(result, "licensorName2", 10); } @@ -1065,12 +1074,32 @@ public class TicketProcessServiceImpl implements TicketProcessService { * @param maps 新的Map * @param i 索引 */ - private static void listWichMap(List> matterLibraryListFive, List> matterLibraryListFlow, List> maps, int i) { - Map stringObjectMap = matterLibraryListFive.get(i); - Map stringObjectMap1 = matterLibraryListFlow.get(i); + private static void listWichMap(List> matterLibraryListFive, + List> matterLibraryListFlow, List> maps, int i) { HashMap objectObjectHashMap = new HashMap<>(); - objectObjectHashMap.put("safetyMeasure", stringObjectMap.get("safetyMeasure")); - objectObjectHashMap.put("safetyMeasure1", stringObjectMap1.get("safetyMeasure")); + if (matterLibraryListFive.size() > 0) { + if (matterLibraryListFive.size() <= i) { + objectObjectHashMap.put("safetyMeasure", ""); + } else { + Map stringObjectMap = matterLibraryListFive.get(i); + objectObjectHashMap.put("safetyMeasure", stringObjectMap.get("safetyMeasure")); + } + } else { + objectObjectHashMap.put("safetyMeasure", ""); + } + + + if (matterLibraryListFlow.size() > 0) { + if (matterLibraryListFlow.size() <= i) { + objectObjectHashMap.put("safetyMeasure1", ""); + } else { + Map stringObjectMap = matterLibraryListFive.get(i); + objectObjectHashMap.put("safetyMeasure1", stringObjectMap.get("safetyMeasure")); + } + }else { + objectObjectHashMap.put("safetyMeasure1", ""); + } + maps.add(objectObjectHashMap); } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/WorkTicketFinishServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/WorkTicketFinishServiceImpl.java index f6e0b8e..83519ba 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/WorkTicketFinishServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/WorkTicketFinishServiceImpl.java @@ -2,6 +2,7 @@ package com.hnac.hzims.ticket.twoTicket.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.ticket.twoTicket.entity.WorkTicketFinish; import com.hnac.hzims.ticket.twoTicket.mapper.WorkTicketFinishMapper; @@ -34,8 +35,8 @@ public class WorkTicketFinishServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(WorkTicketFinish::getTicketId, ticketId); queryWrapper.orderByDesc(WorkTicketFinish::getCreateTime); - queryWrapper.last("limit 1"); - return this.getOne(queryWrapper); + List list = this.list(queryWrapper); + return CollectionUtils.isNotEmpty(list) ? list.get(0) : null; } /** diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/utils/WordHelper.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/utils/WordHelper.java index 8147ea9..e8505ad 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/utils/WordHelper.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/utils/WordHelper.java @@ -71,8 +71,7 @@ public class WordHelper extends StringUtils { * 判断map不为为空 */ public static boolean isNoneBlank(Map result, String key) { - String value = WordHelper.toString(result.get(key)).trim(); - System.out.println(value.length()); + String value = WordHelper.toString(result.get(key)); if (StringUtils.isNoneBlank(value)) { return true; } @@ -116,6 +115,7 @@ public class WordHelper extends StringUtils { */ private static void isContainsKey(Map params, Map result) { + if (params.containsKey("principalName1")) { result.put("principalName1", params.get("principalName1")); params.remove("principalName1"); @@ -219,7 +219,7 @@ public class WordHelper extends StringUtils { Object newValue = StringUtils.isNoneBlank(toString(value).trim()) ? value : "\u00A0" + printSpace(count); result.put(key, newValue); } else { - Object newValue = StringUtils.isNoneBlank(toString(value).trim()) ? value : "\u00A0"; + Object newValue = StringUtils.isNoneBlank(toString(value).trim()) ? value : "\u00A0" + printSpace(4); result.put(key, newValue); } } diff --git a/hzims-service/ticket/src/main/resources/template/secondary/工作票危险点分析及控制措施票.docx b/hzims-service/ticket/src/main/resources/template/secondary/工作票危险点分析及控制措施票.docx index 591306f4dd39a664c81e9ae1a1e23d5978d32aad..5e86dca86b0163cacad3efb447dfa0409a3c8538 100644 GIT binary patch delta 17416 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 diff --git a/hzims-service/ticket/src/main/resources/template/电气第一种工作票模版.docx b/hzims-service/ticket/src/main/resources/template/电气第一种工作票模版.docx index f2760d0ff4c335bd1cbe226286a379ecaa2612e6..4684a3555ba8bf2649e184cd12c55b0e33cf7bd8 100644 GIT binary patch delta 17003 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 From 3a41ebfaccacd052a049d70356c899ab66035bd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Tue, 6 Jun 2023 11:31:17 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=A5=A8=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hnac/hzims/message/MessageConstants.java | 1 + .../service/impl/TicketProcessServiceImpl.java | 59 ++++++++++++++++++++-- 2 files changed, 56 insertions(+), 4 deletions(-) diff --git a/hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/MessageConstants.java b/hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/MessageConstants.java index e6a42b3..7b7fbdb 100644 --- a/hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/MessageConstants.java +++ b/hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/MessageConstants.java @@ -53,6 +53,7 @@ public class MessageConstants { DUTY("duty","值班消息"), SAFE("safe","安全消息"), ACCESS("access","检修消息"), + TICKETMESSAGE("ticket-message","工作票消息"), ; @Getter private String key; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java index 15ce51e..15202c8 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java @@ -11,6 +11,9 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; import com.hnac.hzims.common.logs.utils.StringUtils; +import com.hnac.hzims.message.MessageConstants; +import com.hnac.hzims.message.dto.MessagePushRecordDto; +import com.hnac.hzims.message.fegin.IMessageClient; import com.hnac.hzims.operational.access.entity.OperAccessTaskEntity; import com.hnac.hzims.operational.access.feign.IOperAccessTaskClient; import com.hnac.hzims.operational.feign.IAccessTaskClient; @@ -54,6 +57,7 @@ import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.flow.core.entity.BladeFlow; import org.springblade.flow.core.feign.IFlowClient; +import org.springblade.system.feign.ISysClient; import org.springblade.system.user.cache.UserCache; import org.springblade.system.user.entity.User; import org.springblade.system.user.feign.IUserClient; @@ -147,6 +151,13 @@ public class TicketProcessServiceImpl implements TicketProcessService { private final ProcessDictService processDictService; + + private final IMessageClient messageClient; + + + private final ISysClient sysClient; + + /** * 启动开票流程 * @@ -306,15 +317,16 @@ public class TicketProcessServiceImpl implements TicketProcessService { //工作结束 WorkTicketFinish workTicketFinish = workTicketVo.getWorkTicketFinish(); try { - log.info("工作结束==============>"+ (workTicket.getFlowStatus().intValue())); if (ObjectUtils.isNotEmpty(workTicketFinish)) { WorkTicketFinish ticketFinish = workTicketFinishService.selectByTicketId(workTicketInfo.getId()); log.info("获取工作结束：{}", workTicketFinish); if (ObjectUtils.isEmpty(workTicketFinish.getId()) || ObjectUtils.isEmpty(ticketFinish)) { + log.info("获取工作结束保存成功"); workTicketFinish.setTicketId(workTicketInfo.getId()); workTicketFinishService.save(workTicketFinish); } else { + log.info("获取工作结束更新成功"); workTicketDelay.setInitialTime(LocalDateTime.now()); workTicketFinishService.updateByTicketId(workTicketFinish); } @@ -384,6 +396,47 @@ public class TicketProcessServiceImpl implements TicketProcessService { } catch (Exception e) { e.printStackTrace(); } + + + + //推送消息 + MessagePushRecordDto message = new MessagePushRecordDto(); + message.setBusinessClassify("business"); + message.setBusinessKey(MessageConstants.BusinessClassifyEnum.TICKETMESSAGE.getKey()); + message.setSubject(MessageConstants.BusinessClassifyEnum.TICKETMESSAGE.getDescription()); + message.setTaskId(workTicketInfo.getId()); + message.setTenantId("200000"); + message.setTypes(Arrays.asList(MessageConstants.APP_PUSH, MessageConstants.WS_PUSH)); + message.setPushType(MessageConstants.IMMEDIATELY); + //您有一张工作票待审批，工作内容：*****，审批环节：*****； + String countent = + "您有一张工作票待审批,工作内容：".concat(workTicketInfo.getWorkContent()) + .concat("，审批环节：") + .concat(response.getTaskName()); + message.setContent(countent); + message.setDeptId(workTicketInfo.getCreateDept()); + R deptName = sysClient.getDeptName(workTicketInfo.getCreateDept()); + if (deptName.isSuccess()) { + message.setDeptName(deptName.getData()); + } + String userIds = response.getUserId(); + if (StringUtils.isBlank(userIds)){ + log.error("推送的消息不能为空哦,{}",userIds); + return; + } + String[] split = userIds.split(","); + for (String userId : split) { + message.setPusher(userId); + User user = UserCache.getUser(NumberUtils.toLong(userId)); + if (ObjectUtils.isNotEmpty(user)) { + message.setPusherName(user.getName()); + } + message.setAccount(userId); + + message.setCreateUser(NumberUtils.toLong(userId)); + messageClient.sendMessage(message); + } + } @@ -432,7 +485,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { String taskId = response.getTaskId(); if (StringUtils.isEmpty(taskId)) { workTicket.setFlowDescription("结束"); - workTicket.setFlowTaskId(" "); + // workTicket.setFlowTaskId(" "); workTicket.setFlowTaskName("结束"); workTicket.setNextStepOperator(" "); workTicket.setStepOperator(" "); @@ -1165,8 +1218,6 @@ public class TicketProcessServiceImpl implements TicketProcessService { dataConversion.put(key, BooleanUtils.toBoolean(newValue) ? "☑" : "□"); } } - - } From b89c1f4b5a90bb1d8ec1ea0e7c0400a34932a845 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Tue, 6 Jun 2023 17:20:35 +0800 Subject: [PATCH 06/14] =?UTF-8?q?#=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=8A=BD=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzims/operational/config/vo/StationRealVo.java | 12 + .../main/constant/HomePageConstant.java | 2 +- .../hzims/operational/main/vo/RealAttributeVo.java | 46 + .../hzims/operational/main/vo/RealDeviceVo.java | 26 + .../hzims/operational/main/vo/RealStationVo.java | 48 + .../hnac/hzims/operational/main/vo/WeatherVo.java | 24 + hzims-service/hzims-scheduled/pom.xml | 65 +- .../hnac/hzims/scheduled/config/XxlJobConfig.java | 59 - .../mapper/equipment/WorkshopInfoMapper.java | 10 + .../mapper/operation/AbnormalAlarmMapper.java | 12 +- .../scheduled/mapper/operation/GenerateMapper.java | 17 + .../operation/HistoryAbnormalAlarmMapper.java | 21 - .../operation/HzimsAnalyzeModelStationMapper.java | 13 - .../mapper/operation/ModelStationMapper.java | 12 + .../scheduled/mapper/operation/PowerMapper.java | 11 + .../scheduled/mapper/operation/RecordMapper.java | 17 + .../mapper/operation/StAlarmRecordMapper.java | 14 - .../mapper/operation/StFocusPropertiesMapper.java | 13 - .../mapper/operation/StationAttrConfigMapper.java | 6 +- .../mapper/operation/StationAttributeMapper.java | 11 +- .../scheduled/mapper/operation/StationMapper.java | 13 +- .../scheduled/mapper/operation/UseMapper.java | 13 + .../scheduled/scheduled/MonitorScheduledTask.java | 65 + .../scheduled/RealTargetScheduledTask.java | 126 ++ .../scheduled/scheduled/ReportScheduledTask.java | 14 + .../scheduled/scheduled/ScheduledCreateTask.java | 54 - .../scheduled/scheduled/ShowScheduledTask.java | 14 + .../scheduled/scheduled/StAlamRecordTask.java | 101 -- .../scheduled/service/AbnormalAlarmService.java | 19 - .../service/HistoryAbnormalAlarmService.java | 16 - .../service/IHzimsAnalyzeModelStationService.java | 17 - .../service/IMainSystemMonitoringService.java | 16 - .../scheduled/service/IRealMonitorService.java | 13 - .../service/IStationAttrConfigService.java | 16 - .../service/IStationAttributeService.java | 13 - .../hzims/scheduled/service/IStationService.java | 27 - .../hzims/scheduled/service/IWaterService.java | 11 - .../scheduled/service/StAlamRecordService.java | 14 - .../service/StFocusPropertiesService.java | 14 - .../service/equipment/WorkshopInfoService.java | 12 + .../equipment/impl/WorkshopInfoServiceImpl.java | 20 + .../service/impl/AbnormalAlarmServiceImpl.java | 242 ---- .../impl/HistoryAbnormalAlarmServiceImpl.java | 41 - .../impl/HzimsAnalyzeModelStationServiceImpl.java | 17 - .../impl/MainSystemMonitoringServiceImpl.java | 51 - .../service/impl/RealMonitorServiceImpl.java | 713 --------- .../service/impl/StAlamRecordServiceImpl.java | 42 - .../service/impl/StFocusPropertiesServiceImpl.java | 164 --- .../service/impl/StationAttrConfigServiceImpl.java | 42 - .../service/impl/StationAttributeServiceImpl.java | 22 - .../scheduled/service/impl/StationServiceImpl.java | 60 - .../scheduled/service/impl/WaterServiceImpl.java | 201 --- .../service/operation/AbnormalAlarmService.java | 15 + .../service/operation/AnalyseDataService.java | 22 + .../service/operation/GenerateService.java | 25 + .../service/operation/ModelStationService.java | 12 + .../service/operation/MonitorService.java | 16 + .../scheduled/service/operation/PowerService.java | 17 + .../service/operation/RealTargetService.java | 34 + .../scheduled/service/operation/RecordService.java | 13 + .../operation/StationAttrConfigService.java | 14 + .../service/operation/StationAttributeService.java | 14 + .../service/operation/StationService.java | 12 + .../scheduled/service/operation/UseService.java | 29 + .../operation/impl/AbnormalAlarmServiceImpl.java | 33 + .../operation/impl/AnalyseDataServiceImpl.java | 139 ++ .../operation/impl/GenerateServiceImpl.java | 112 ++ .../operation/impl/ModelStationServiceImpl.java | 16 + .../service/operation/impl/MonitorServiceImpl.java | 744 ++++++++++ .../service/operation/impl/PowerServiceImpl.java | 77 + .../operation/impl/RealTargetServiceImpl.java | 1512 ++++++++++++++++++++ .../service/operation/impl/RecordServiceImpl.java | 36 + .../impl/StationAttrConfigServiceImpl.java | 34 + .../impl/StationAttributeServiceImpl.java | 36 + .../service/operation/impl/StationServiceImpl.java | 19 + .../service/operation/impl/UseServiceImpl.java | 99 ++ .../hnac/hzims/scheduled/vo/RealAttributeVo.java | 52 - .../com/hnac/hzims/scheduled/vo/RealDeviceVo.java | 33 - .../com/hnac/hzims/scheduled/vo/RealStationVo.java | 54 - .../com/hnac/hzims/scheduled/vo/StationRealVo.java | 17 - .../com/hnac/hzims/scheduled/vo/WeatherVo.java | 30 - .../src/main/resources/application.yml | 208 --- .../mapper/equipment/WorkshopInfoMapper.xml | 5 + .../mapper/operation/AbnormalAlarmMapper.xml | 12 +- .../resources/mapper/operation/GenerateMapper.xml | 5 + .../mapper/operation/ModelStationMapper.xml | 21 + .../resources/mapper/operation/PowerMapper.xml | 32 + .../resources/mapper/operation/RecordMapper.xml | 29 + .../mapper/operation/StAlarmRecordMapper.xml | 19 - .../mapper/operation/StationAttrConfigMapper.xml | 5 + .../mapper/operation/StationAttributeMapper.xml | 15 + .../resources/mapper/operation/StationMapper.xml | 6 + .../main/resources/mapper/operation/UseMapper.xml | 4 + .../controller/CentralMonitorController.java | 2 +- .../config/service/CentralMonitorService.java | 2 +- .../service/impl/CentralMonitorServiceImpl.java | 2 +- .../service/impl/StAlamRecordServiceImpl.java | 22 +- .../hzims/operational/config/vo/StationRealVo.java | 12 - .../main/service/impl/HydropowerServiceImpl.java | 1 + .../service/impl/RealMonitorServiceImpl.java | 8 +- .../operational/station/vo/RealAttributeVo.java | 46 - .../hzims/operational/station/vo/RealDeviceVo.java | 26 - .../operational/station/vo/RealStationVo.java | 48 - .../hzims/operational/station/vo/WeatherVo.java | 24 - 104 files changed, 3735 insertions(+), 2727 deletions(-) create mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/config/vo/StationRealVo.java create mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/RealAttributeVo.java create mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/RealDeviceVo.java create mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/RealStationVo.java create mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WeatherVo.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/config/XxlJobConfig.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/equipment/WorkshopInfoMapper.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/GenerateMapper.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/HistoryAbnormalAlarmMapper.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/HzimsAnalyzeModelStationMapper.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/ModelStationMapper.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/PowerMapper.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/RecordMapper.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/StAlarmRecordMapper.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/StFocusPropertiesMapper.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/UseMapper.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/MonitorScheduledTask.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/RealTargetScheduledTask.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ReportScheduledTask.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ScheduledCreateTask.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ShowScheduledTask.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/StAlamRecordTask.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/AbnormalAlarmService.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/HistoryAbnormalAlarmService.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IHzimsAnalyzeModelStationService.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IMainSystemMonitoringService.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IRealMonitorService.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IStationAttrConfigService.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IStationAttributeService.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IStationService.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IWaterService.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/StAlamRecordService.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/StFocusPropertiesService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/WorkshopInfoService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/WorkshopInfoServiceImpl.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/AbnormalAlarmServiceImpl.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/HistoryAbnormalAlarmServiceImpl.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/HzimsAnalyzeModelStationServiceImpl.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/MainSystemMonitoringServiceImpl.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/RealMonitorServiceImpl.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/StAlamRecordServiceImpl.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/StFocusPropertiesServiceImpl.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/StationAttrConfigServiceImpl.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/StationAttributeServiceImpl.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/StationServiceImpl.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/WaterServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/AbnormalAlarmService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/AnalyseDataService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/GenerateService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/ModelStationService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/MonitorService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/PowerService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/RealTargetService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/RecordService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/StationAttrConfigService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/StationAttributeService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/StationService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/UseService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/AbnormalAlarmServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/AnalyseDataServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/GenerateServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/ModelStationServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/MonitorServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/PowerServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/RealTargetServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/RecordServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/StationAttrConfigServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/StationAttributeServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/StationServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/UseServiceImpl.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/vo/RealAttributeVo.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/vo/RealDeviceVo.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/vo/RealStationVo.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/vo/StationRealVo.java delete mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/vo/WeatherVo.java delete mode 100644 hzims-service/hzims-scheduled/src/main/resources/application.yml create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/equipment/WorkshopInfoMapper.xml create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/operation/GenerateMapper.xml create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/operation/ModelStationMapper.xml create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/operation/PowerMapper.xml create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/operation/RecordMapper.xml delete mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/operation/StAlarmRecordMapper.xml create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/operation/StationAttrConfigMapper.xml create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/operation/StationAttributeMapper.xml create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/operation/StationMapper.xml create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/operation/UseMapper.xml delete mode 100644 hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/vo/StationRealVo.java delete mode 100644 hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/vo/RealAttributeVo.java delete mode 100644 hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/vo/RealDeviceVo.java delete mode 100644 hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/vo/RealStationVo.java delete mode 100644 hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/vo/WeatherVo.java diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/config/vo/StationRealVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/config/vo/StationRealVo.java new file mode 100644 index 0000000..e61f1d2 --- /dev/null +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/config/vo/StationRealVo.java @@ -0,0 +1,12 @@ +package com.hnac.hzims.operational.config.vo; + +import lombok.Data; + +@Data +public class StationRealVo { + + private String station; + + private String[] realId; + +} diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/constant/HomePageConstant.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/constant/HomePageConstant.java index 30f464f..2879db1 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/constant/HomePageConstant.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/constant/HomePageConstant.java @@ -146,7 +146,7 @@ public interface HomePageConstant { // 水利-泵组实时属性名称 String JOINT_RELAY = "joint_relay"; // 开机状态 String SWITCH_ON_OFF = "switch_on_off"; // 开机状态 - String OFF = "1"; // 开机 + String OFF = "1.0"; // 开机 String ON = "0"; // 关机 String ELECTRICITY_CONSUMPTION = "electricity_consumption"; // 用电量 diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/RealAttributeVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/RealAttributeVo.java new file mode 100644 index 0000000..52a73ff --- /dev/null +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/RealAttributeVo.java @@ -0,0 +1,46 @@ +package com.hnac.hzims.operational.main.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class RealAttributeVo implements Serializable { + + @ApiModelProperty("属性名称") + private String name; + + @ApiModelProperty("属性数值") + private String value; + + @ApiModelProperty("属性单位") + private String unit; + + @ApiModelProperty("属性类型：1-遥信 2-遥测") + private Integer type; + + @ApiModelProperty("属性实时数据Id") + private String realId; + + @ApiModelProperty("告警Id") + private Long id; + + @ApiModelProperty("属性状态：0：正常、1：预警、2：告警、3：空值、4：黄色、5：橙色") + private int status; + + @ApiModelProperty("属性质量") + private int quality; + + @ApiModelProperty("属性时间") + private String time; + + @ApiModelProperty("属性故障ID") + private String fdpFaultId; + + @ApiModelProperty("监测点") + private String fdpMonitorId; + + @ApiModelProperty("属性故障值") + private Double fdpRate; +} diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/RealDeviceVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/RealDeviceVo.java new file mode 100644 index 0000000..0522108 --- /dev/null +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/RealDeviceVo.java @@ -0,0 +1,26 @@ +package com.hnac.hzims.operational.main.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class RealDeviceVo implements Serializable { + + @ApiModelProperty("设备编号") + private String deviceCode; + + @ApiModelProperty("设备名称") + private String deviceName; + + @ApiModelProperty("设备状态") + private Integer state; + + @ApiModelProperty("排序字段") + private Integer sort; + + @ApiModelProperty("设备属性集合") + private List attbtList; +} diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/RealStationVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/RealStationVo.java new file mode 100644 index 0000000..515d623 --- /dev/null +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/RealStationVo.java @@ -0,0 +1,48 @@ +package com.hnac.hzims.operational.main.vo; + +import io.swagger.annotations.ApiModelProperty; +import io.swagger.models.auth.In; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class RealStationVo implements Serializable { + + @ApiModelProperty("站点Id") + private String stationCode; + + @ApiModelProperty("站点名称") + private String stationName; + + @ApiModelProperty("站点机构Id") + private Long stationDeptId; + + @ApiModelProperty("站点类型") + private String serverType; + + @ApiModelProperty("当前天气") + private WeatherVo nowWater; + + @ApiModelProperty("总有功率") + private Double powerSum; + + @ApiModelProperty("降水") + private String precipitation; + + @ApiModelProperty("最大前池水位") + private Double waterLevelMax; + + @ApiModelProperty("前池水位") + private Double waterLevel; + + @ApiModelProperty("设备集合") + private List deviceList; + + @ApiModelProperty("站点状态 : 0-正常 1-数据中断") + private Integer status; + + @ApiModelProperty("排序") + private Integer sort; +} diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WeatherVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WeatherVo.java new file mode 100644 index 0000000..284e995 --- /dev/null +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WeatherVo.java @@ -0,0 +1,24 @@ +package com.hnac.hzims.operational.main.vo; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class WeatherVo implements Serializable { + + /**当前天气状况和图标的代码，图标可通过天气状况和图标下载; //100**/ + private String icon; + + /**实况温度，默认单位：摄氏度; //21**/ + private String temp; + + /**实况天气状况的文字描述，包括阴晴雨雪等天气状态的描述; //晴**/ + private String text; + + /**预报当天最高温度; //4**/ + private String tempMax; + + /**预报当天最低温度; //-5**/ + private String tempMin; +} diff --git a/hzims-service/hzims-scheduled/pom.xml b/hzims-service/hzims-scheduled/pom.xml index 4183ad7..87e3691 100644 --- a/hzims-service/hzims-scheduled/pom.xml +++ b/hzims-service/hzims-scheduled/pom.xml @@ -2,15 +2,15 @@ - 4.0.0 com.hnac.hzims hzims-service 4.0.0-SNAPSHOT + 4.0.0 hzims-scheduled - + jar 8 8 @@ -81,42 +81,6 @@ com.xuxueli xxl-job-core - - - - org.apache.poi - ooxml-schemas - 1.4 - - - org.jfree - jcommon - 1.0.24 - - - org.jfree - jfreechart - 1.5.0 - - - com.hikvision.ga - artemis-http-client - - - - - org.apache.httpcomponents - httpclient - - - - - - org.freemarker - freemarker - - - com.hnac.hzims equipment-api @@ -146,47 +110,22 @@ com.google.zxing javase - org.springblade blade-user-api - - org.apache.commons commons-collections4 - - - org.springframework.boot - spring-boot-starter-websocket - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - cn.hutool hutool-http - - cn.hutool hutool-core - - - - org.java-websocket - Java-WebSocket - - org.springblade blade-resource-api diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/config/XxlJobConfig.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/config/XxlJobConfig.java deleted file mode 100644 index 6b473a9..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/config/XxlJobConfig.java +++ /dev/null @@ -1,59 +0,0 @@ -// package com.hnac.hzims.scheduled.config; -// -// import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; -// import lombok.extern.slf4j.Slf4j; -// import org.springframework.beans.factory.annotation.Value; -// import org.springframework.context.annotation.Bean; -// import org.springframework.context.annotation.ComponentScan; -// import org.springframework.context.annotation.Configuration; -// -// /** -// * @Author WL -// * @Version v1.0 -// * @Serial 1.0 -// * @Date 2022/1/8 10:23 -// */ -// @Slf4j -// @Configuration -// //指定任务Handler所在包路径 -// public class XxlJobConfig { -// -// -// @Value("${xxl.job.admin.addresses}") -// private String adminAddresses; -// -// @Value("${xxl.job.executor.appname}") -// private String appName; -// -// @Value("${xxl.job.executor.ip}") -// private String ip; -// -// @Value("${xxl.job.executor.port}") -// private int port; -// -// @Value("${xxl.job.accessToken}") -// private String accessToken; -// -// @Value("${xxl.job.executor.logpath}") -// private String logPath; -// -// @Value("${xxl.job.executor.logretentiondays}") -// private int logRetentionDays; -// -// -// @Bean(initMethod = "start", destroyMethod = "destroy") -// public XxlJobSpringExecutor xxlJobExecutor() { -// log.info("====xxl-job config init===="); -// XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor(); -// xxlJobSpringExecutor.setAdminAddresses(adminAddresses); -// xxlJobSpringExecutor.setAppName(appName); -// xxlJobSpringExecutor.setIp(ip); -// xxlJobSpringExecutor.setPort(port); -// xxlJobSpringExecutor.setAccessToken(accessToken); -// xxlJobSpringExecutor.setLogPath(logPath); -// xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays); -// return xxlJobSpringExecutor; -// } -// -// } -// diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/equipment/WorkshopInfoMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/equipment/WorkshopInfoMapper.java new file mode 100644 index 0000000..3e0d5c4 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/equipment/WorkshopInfoMapper.java @@ -0,0 +1,10 @@ +package com.hnac.hzims.scheduled.mapper.equipment; + +import com.hnac.hzims.equipment.entity.WorkshopInfoEntity; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + +/** + * @author ysj + */ +public interface WorkshopInfoMapper extends UserDataScopeBaseMapper { +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/AbnormalAlarmMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/AbnormalAlarmMapper.java index b677a4e..12876bd 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/AbnormalAlarmMapper.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/AbnormalAlarmMapper.java @@ -1,20 +1,14 @@ package com.hnac.hzims.scheduled.mapper.operation; import com.hnac.hzims.operational.alert.entity.AbnormalAlarmEntity; -import org.apache.ibatis.annotations.Param; import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; import java.util.List; /** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 10:30 + * @author ysj */ -public interface AbnormalAlarmMapper extends UserDataScopeBaseMapper{ +public interface AbnormalAlarmMapper extends UserDataScopeBaseMapper { - AbnormalAlarmEntity getAbnormalAlarm(@Param("stationId") String stationId, @Param("type") String type); - - List getAbnormalAlarmList(); + List abnormalAlarms(); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/GenerateMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/GenerateMapper.java new file mode 100644 index 0000000..7f2eaa1 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/GenerateMapper.java @@ -0,0 +1,17 @@ +package com.hnac.hzims.scheduled.mapper.operation; + +import com.hnac.hzims.operational.fill.entity.GenerateEntity; +import org.apache.ibatis.annotations.Param; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + +import java.util.List; + +/** + * @author ysj + * @date 2023/04/10 11:22:14 + * @version 4.0.0 + */ +public interface GenerateMapper extends UserDataScopeBaseMapper { + + List records(@Param("date") String date,@Param("station") String station); +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/HistoryAbnormalAlarmMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/HistoryAbnormalAlarmMapper.java deleted file mode 100644 index e680c53..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/HistoryAbnormalAlarmMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hnac.hzims.scheduled.mapper.operation; - -import com.hnac.hzims.operational.alert.entity.HistoryAbnormalAlarmEntity; -import org.apache.ibatis.annotations.Param; -import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; - -import java.util.List; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 11:12 - */ -public interface HistoryAbnormalAlarmMapper extends UserDataScopeBaseMapper { - - List getHistoryAbnormalAlarm(@Param("stationId") String stationId, @Param("type") String type); - - - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/HzimsAnalyzeModelStationMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/HzimsAnalyzeModelStationMapper.java deleted file mode 100644 index 41ad4ad..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/HzimsAnalyzeModelStationMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.scheduled.mapper.operation; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzims.operational.station.entity.HzimsAnalyzeModelStationEntity; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/22 11:43 - */ -public interface HzimsAnalyzeModelStationMapper extends BaseMapper { -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/ModelStationMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/ModelStationMapper.java new file mode 100644 index 0000000..907e4ff --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/ModelStationMapper.java @@ -0,0 +1,12 @@ +package com.hnac.hzims.scheduled.mapper.operation; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hnac.hzims.operational.station.entity.HzimsAnalyzeModelStationEntity; + + +/** + * @author ysj + */ +public interface ModelStationMapper extends BaseMapper { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/PowerMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/PowerMapper.java new file mode 100644 index 0000000..d463fd1 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/PowerMapper.java @@ -0,0 +1,11 @@ +package com.hnac.hzims.scheduled.mapper.operation; + +import com.hnac.hzims.operational.fill.entity.PowerEntity; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + +/** + * @author ysj + */ +public interface PowerMapper extends UserDataScopeBaseMapper { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/RecordMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/RecordMapper.java new file mode 100644 index 0000000..27d01a1 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/RecordMapper.java @@ -0,0 +1,17 @@ +package com.hnac.hzims.scheduled.mapper.operation; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.hnac.hzims.operational.config.entity.StAlarmRecordEntity; +import com.hnac.hzims.operational.config.vo.StAlarmRecordVo; + +import java.util.List; + +/** + * @author ysj + */ +public interface RecordMapper extends BaseMapper { + + Long insertReturnId(StAlarmRecordEntity record); +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/StAlarmRecordMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/StAlarmRecordMapper.java deleted file mode 100644 index 8b3e211..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/StAlarmRecordMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.hnac.hzims.scheduled.mapper.operation; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzims.operational.config.entity.StAlarmRecordEntity; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 15:47 - */ -public interface StAlarmRecordMapper extends BaseMapper { - Long insertReturnId(StAlarmRecordEntity record); -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/StFocusPropertiesMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/StFocusPropertiesMapper.java deleted file mode 100644 index 68d7a3d..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/StFocusPropertiesMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.scheduled.mapper.operation; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzims.operational.config.entity.StFocusPropertiesEntity; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 11:28 - */ -public interface StFocusPropertiesMapper extends BaseMapper { -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/StationAttrConfigMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/StationAttrConfigMapper.java index 76a7952..04a16ee 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/StationAttrConfigMapper.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/StationAttrConfigMapper.java @@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hnac.hzims.operational.station.entity.StationAttrConfigEntity; /** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 16:09 + * @author ysj */ public interface StationAttrConfigMapper extends BaseMapper { + } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/StationAttributeMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/StationAttributeMapper.java index 89cf2a3..9cfd0f9 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/StationAttributeMapper.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/StationAttributeMapper.java @@ -1,13 +1,16 @@ package com.hnac.hzims.scheduled.mapper.operation; import com.hnac.hzims.operational.station.entity.StationAttributeEntity; +import org.apache.ibatis.annotations.Mapper; import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; +import java.util.List; + /** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 11:39 + * @author hx */ +@Mapper public interface StationAttributeMapper extends UserDataScopeBaseMapper { + + List PointUnit(); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/StationMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/StationMapper.java index 3b81746..f1d3745 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/StationMapper.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/StationMapper.java @@ -1,21 +1,12 @@ package com.hnac.hzims.scheduled.mapper.operation; + import com.hnac.hzims.operational.station.entity.StationEntity; import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; -import java.util.List; - /** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 10:36 + * @author ysj */ public interface StationMapper extends UserDataScopeBaseMapper { - List selectStationByType(Integer stationType, Integer serveType); - - List selectAll(); - - List selectStationByInCode(List codes); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/UseMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/UseMapper.java new file mode 100644 index 0000000..364bce0 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/UseMapper.java @@ -0,0 +1,13 @@ +package com.hnac.hzims.scheduled.mapper.operation; + +import com.hnac.hzims.operational.fill.entity.UseEntity; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + +/** + * @author ysj + * @date 2023/04/10 11:22:14 + * @version 4.0.0 + */ +public interface UseMapper extends UserDataScopeBaseMapper { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/MonitorScheduledTask.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/MonitorScheduledTask.java new file mode 100644 index 0000000..ed0af83 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/MonitorScheduledTask.java @@ -0,0 +1,65 @@ +package com.hnac.hzims.scheduled.scheduled; + +import com.hnac.hzims.scheduled.service.operation.MonitorService; +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Date; + +import static com.hnac.hzims.operational.main.constant.MainConstants.*; + + +/** + * @author ysj + */ +@Slf4j +@Component +public class MonitorScheduledTask { + + @Autowired + private MonitorService service; + + /** + * realId刷新 + */ + @XxlJob(REAL_ID_DATA) + public ReturnT loadRealId(String param) { + if (Func.isBlank(param)) { + param = DateUtil.format(new Date(), "yyyy-MM"); + } + service.loadRealId(param); + return new ReturnT<>("SUCCESS"); + } + + /** + * 实时数据刷新 + * @return ReturnT + */ + @XxlJob(REAL_TIME_DATA) + //@Scheduled(cron = "0/40 * * * * ? ") + public ReturnT loadRealData(String param) throws Exception { + if (Func.isBlank(param)) { + param = DateUtil.format(new Date(), "yyyy-MM"); + } + service.loadRealData(param); + return new ReturnT<>("SUCCESS"); + } + + /** + * 集中监控数据处理 + * @return ReturnT + */ + @XxlJob(CENTRALIZED_MONITORING) + public ReturnT loadMonitoring(String param) throws Exception { + if (Func.isBlank(param)) { + param = DateUtil.format(new Date(), "yyyy-MM"); + } + service.loadMonitoring(param); + return new ReturnT<>("SUCCESS"); + } +} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/RealTargetScheduledTask.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/RealTargetScheduledTask.java new file mode 100644 index 0000000..b589578 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/RealTargetScheduledTask.java @@ -0,0 +1,126 @@ +package com.hnac.hzims.scheduled.scheduled; + +import com.hnac.hzims.operational.main.constant.HomePageConstant; +import com.hnac.hzims.scheduled.service.operation.RealTargetService; +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Arrays; +import java.util.Date; + +import static com.hnac.hzims.operational.main.constant.MainConstants.*; + + +/** + * @author ysj + */ +@Slf4j +@Component +public class RealTargetScheduledTask { + + @Autowired + private RealTargetService service; + + + /** + * 水电站-机组实时加载 + */ + @XxlJob(LOAD_HYDROPOWER_UNIT_REAL) + public ReturnT loadHydropowerReal(String param) { + if (Func.isBlank(param)) { + param = DateUtil.format(new Date(), "yyyy-MM"); + } + service.loadHydropowerReal(param); + return new ReturnT<>("SUCCESS"); + } + + /** + * 水电站-机组指标加载 + */ + @XxlJob(LOAD_HYDROPOWER_UNIT_TARGET) + public ReturnT loadHydropowerTarget(String param) { + if (Func.isBlank(param)) { + param = DateUtil.format(new Date(), "yyyy-MM"); + } + service.loadHydropowerTarget(param); + return new ReturnT<>("SUCCESS"); + } + + /** + * 水利-泵组实时加载 + */ + @XxlJob(LOAD_WATER_PUMP_REAL) + public ReturnT loadWaterPumpReal(String param) { + if (Func.isBlank(param)) { + param = DateUtil.format(new Date(), "yyyy-MM"); + } + service.loadWaterPumpReal(param); + return new ReturnT<>("SUCCESS"); + } + + + /** + * 水利-泵组指标加载 + */ + @XxlJob(LOAD_WATER_PUMP_TARGET) + public ReturnT loadWaterPumpTarget(String param) { + if (Func.isBlank(param)) { + param = DateUtil.format(new Date(), "yyyy-MM"); + } + service.loadWaterPumpTarget(param); + return new ReturnT<>("SUCCESS"); + } + + /** + * 水利-站点水位数据 + */ + @XxlJob(LOAD_WATER_LEVEL) + public ReturnT loadWaterLevel(String param) { + if (Func.isBlank(param)) { + param = DateUtil.format(new Date(), "yyyy-MM"); + } + service.loadWaterLevel(param); + return new ReturnT<>("SUCCESS"); + } + + /** + * 光伏站-逆变器实时加载 + */ + @XxlJob(LOAD_PHOTOVOLTAIC_REAL) + public ReturnT loadPhotovoltaicReal(String param) { + if (Func.isBlank(param)) { + param = DateUtil.format(new Date(), "yyyy-MM"); + } + service.loadPhotovoltaicReal(param); + return new ReturnT<>("SUCCESS"); + } + + /** + * 光伏站-逆变器指标加载 + */ + @XxlJob(LOAD_PHOTOVOLTAIC_TARGET) + public ReturnT loadPhotovoltaicTarget(String param) { + if (Func.isBlank(param)) { + param = DateUtil.format(new Date(), "yyyy-MM"); + } + service.loadPhotovoltaicTarget(param); + return new ReturnT<>("SUCCESS"); + } + + /** + * 获取站点近3年发电量数据 + */ + @XxlJob(ELECTRICITY_GENERATION_RECENT_YEAR) + public ReturnT loadPowerData(String param) { + if (Func.isBlank(param)) { + param = DateUtil.format(new Date(), "yyyy-MM"); + } + service.loadPowerData(param, Arrays.asList(HomePageConstant.HYDROPOWER,HomePageConstant.PHOTOVOLTAIC),2,3); + return new ReturnT<>("SUCCESS"); + } +} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ReportScheduledTask.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ReportScheduledTask.java new file mode 100644 index 0000000..b5d19a6 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ReportScheduledTask.java @@ -0,0 +1,14 @@ +package com.hnac.hzims.scheduled.scheduled; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + + +/** + * @author ysj + */ +@Slf4j +@Component +public class ReportScheduledTask { + +} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ScheduledCreateTask.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ScheduledCreateTask.java deleted file mode 100644 index 81cb979..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ScheduledCreateTask.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.hnac.hzims.scheduled.scheduled; - -import com.hnac.hzims.scheduled.service.IWaterService; -import com.xxl.job.core.biz.model.ReturnT; -import com.xxl.job.core.handler.annotation.XxlJob; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.tool.utils.Func; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.Date; - -import static com.hnac.hzims.operational.main.constant.MainConstants.LOAD_WATER_LEVEL; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/22 11:21 - */ -@Slf4j -@Component -public class ScheduledCreateTask { - - @Autowired - private IWaterService waterService; - - /** - * 水利-站点水位数据 - * @return ReturnT - */ - @XxlJob(LOAD_WATER_LEVEL) - public ReturnT loadWaterLevel(String param) throws Exception { - if (Func.isBlank(param)) { - param = DateUtil.format(new Date(), "yyyy-MM"); - } - waterService.loadWaterLevel(param); - return new ReturnT<>("SUCCESS"); - } - - - - /** - * 水利-站点水位数据 - * @return ReturnT - */ - @XxlJob("cheshi") - public ReturnT cheshi(String param) throws Exception { - System.out.println("执行呢方法"); - return new ReturnT<>("SUCCESS"); - } - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ShowScheduledTask.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ShowScheduledTask.java new file mode 100644 index 0000000..c7bb905 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ShowScheduledTask.java @@ -0,0 +1,14 @@ +package com.hnac.hzims.scheduled.scheduled; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + + +/** + * @author ysj + */ +@Slf4j +@Component +public class ShowScheduledTask { + +} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/StAlamRecordTask.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/StAlamRecordTask.java deleted file mode 100644 index b253c41..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/StAlamRecordTask.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.hnac.hzims.scheduled.scheduled; - -import com.hnac.hzims.scheduled.service.AbnormalAlarmService; -import com.hnac.hzims.scheduled.service.IRealMonitorService; -import com.hnac.hzims.scheduled.service.StFocusPropertiesService; -import com.xxl.job.core.biz.model.ReturnT; -import com.xxl.job.core.handler.annotation.XxlJob; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.tool.utils.Func; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - -import java.util.Date; - -import static com.hnac.hzims.operational.main.constant.MainConstants.*; - -/** - * 集中监控 - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 10:17 - */ -@Slf4j -@Component -public class StAlamRecordTask { - - @Value("${hzims.operation.comprehensiveD}") - public String path; - - // @Autowired - private IRealMonitorService monitorService; - - @Autowired - private AbnormalAlarmService abnormalAlarmService; - - @Autowired - private StFocusPropertiesService stFocusPropertiesService; - - /** - * 数据中断告警 - * @return ReturnT - */ - @XxlJob(ALARM_DATA_HANDLE) - public ReturnT alarmDataHandle(String param) throws Exception { - if (Func.isBlank(param)) { - param = DateUtil.format(new Date(), "yyyy-MM"); - } - abnormalAlarmService.alarmDataHandle(param); - return new ReturnT<>("SUCCESS"); - } - - - - /** - * realId获取 - * @return ReturnT - */ - @XxlJob(REAL_ID_DATA) - public ReturnT realIdData(String param) throws Exception { - if (Func.isBlank(param)) { - param = DateUtil.format(new Date(), "yyyy-MM"); - } - stFocusPropertiesService.getStationRealIds(param); - return new ReturnT<>("SUCCESS"); - } - - /** - * 站点实时数据 - * @return ReturnT - */ - @XxlJob(REAL_TIME_DATA) - //@Scheduled(cron = "0/40 * * * * ? ") - public ReturnT realTimeData(String param) throws Exception { - if (Func.isBlank(param)) { - param = DateUtil.format(new Date(), "yyyy-MM"); - } - monitorService.realTimeData(param); - return new ReturnT<>("SUCCESS"); - } - - - - /** - * 集中监控数据处理 - * @return ReturnT - */ - @XxlJob(CENTRALIZED_MONITORING) - //@Scheduled(cron = "0/40 * * * * ? ") - public ReturnT centralizedMonitoring(String param) throws Exception { - if (Func.isBlank(param)) { - param = DateUtil.format(new Date(), "yyyy-MM"); - } - monitorService.centralizedMonitoring(param); - return new ReturnT<>("SUCCESS"); - } - - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/AbnormalAlarmService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/AbnormalAlarmService.java deleted file mode 100644 index 180d275..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/AbnormalAlarmService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.hnac.hzims.scheduled.service; - -import com.hnac.hzims.operational.alert.entity.AbnormalAlarmEntity; -import org.springblade.core.mp.base.BaseService; - -import java.util.List; - -/** - * 告警处理接口 - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 10:20 - */ -public interface AbnormalAlarmService extends BaseService { - void alarmDataHandle(String param); - - List getAbnormalAlarmList(); -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/HistoryAbnormalAlarmService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/HistoryAbnormalAlarmService.java deleted file mode 100644 index 4c2816e..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/HistoryAbnormalAlarmService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hnac.hzims.scheduled.service; - -import com.hnac.hzims.operational.alert.entity.HistoryAbnormalAlarmEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 11:09 - */ -public interface HistoryAbnormalAlarmService extends BaseService { - - - HistoryAbnormalAlarmEntity getAbnormalAlarm(String station, String soeType); -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IHzimsAnalyzeModelStationService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IHzimsAnalyzeModelStationService.java deleted file mode 100644 index 15c7b7a..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IHzimsAnalyzeModelStationService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hnac.hzims.scheduled.service; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.hnac.hzims.operational.station.entity.HzimsAnalyzeModelStationEntity; -import org.springblade.core.mp.base.BaseService; - -import java.util.List; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/22 11:31 - */ -public interface IHzimsAnalyzeModelStationService extends BaseService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IMainSystemMonitoringService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IMainSystemMonitoringService.java deleted file mode 100644 index d9b6c4e..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IMainSystemMonitoringService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hnac.hzims.scheduled.service; - -import com.hnac.hzims.equipment.vo.EminfoAndEmParamVo; - -import java.util.List; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 14:00 - */ -public interface IMainSystemMonitoringService { - - List getEmInfoList(); -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IRealMonitorService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IRealMonitorService.java deleted file mode 100644 index 9de496f..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IRealMonitorService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.scheduled.service; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 10:20 - */ -public interface IRealMonitorService { - void realTimeData(String param); - - void centralizedMonitoring(String param); -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IStationAttrConfigService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IStationAttrConfigService.java deleted file mode 100644 index 747bcc4..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IStationAttrConfigService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hnac.hzims.scheduled.service; - -import com.hnac.hzims.operational.station.entity.StationAttrConfigEntity; -import org.springblade.core.mp.base.BaseService; - -import java.util.List; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 16:06 - */ -public interface IStationAttrConfigService extends BaseService { - List getHideList(); -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IStationAttributeService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IStationAttributeService.java deleted file mode 100644 index 0713bb1..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IStationAttributeService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.scheduled.service; - -import com.hnac.hzims.operational.station.entity.StationAttributeEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 11:34 - */ -public interface IStationAttributeService extends BaseService { -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IStationService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IStationService.java deleted file mode 100644 index 246d261..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IStationService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hnac.hzims.scheduled.service; - -import com.hnac.hzims.operational.station.entity.StationEntity; -import org.springblade.core.mp.base.BaseService; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 10:33 - */ -public interface IStationService extends BaseService { - - List getStationByType(Integer stationType, Integer serveType); - - List getAll(); - - List getStationByInCode(List strings); - - - List getStationType(Integer serveType,List typeList,List departIdList); - - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IWaterService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IWaterService.java deleted file mode 100644 index e50d049..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/IWaterService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.scheduled.service; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/22 11:22 - */ -public interface IWaterService { - void loadWaterLevel(String param); -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/StAlamRecordService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/StAlamRecordService.java deleted file mode 100644 index cff89fd..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/StAlamRecordService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.hnac.hzims.scheduled.service; - -import com.hnac.hzims.operational.config.entity.StAlarmRecordEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 15:41 - */ -public interface StAlamRecordService extends BaseService { - Long insertAlert(String stationId, String monitorId); -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/StFocusPropertiesService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/StFocusPropertiesService.java deleted file mode 100644 index 479b4b3..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/StFocusPropertiesService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.hnac.hzims.scheduled.service; - -import com.hnac.hzims.operational.config.entity.StFocusPropertiesEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 10:21 - */ -public interface StFocusPropertiesService extends BaseService { - void getStationRealIds(String param); -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/WorkshopInfoService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/WorkshopInfoService.java new file mode 100644 index 0000000..3fe8199 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/WorkshopInfoService.java @@ -0,0 +1,12 @@ +package com.hnac.hzims.scheduled.service.equipment; + +import com.hnac.hzims.equipment.entity.WorkshopInfoEntity; +import org.springblade.core.mp.base.BaseService; + + +/** + * @author hx + */ +public interface WorkshopInfoService extends BaseService { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/WorkshopInfoServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/WorkshopInfoServiceImpl.java new file mode 100644 index 0000000..20aed9a --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/WorkshopInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.hnac.hzims.scheduled.service.equipment.impl; + +import com.hnac.hzims.equipment.entity.WorkshopInfoEntity; +import com.hnac.hzims.scheduled.mapper.equipment.WorkshopInfoMapper; +import com.hnac.hzims.scheduled.service.equipment.WorkshopInfoService; +import groovy.util.logging.Slf4j; +import lombok.AllArgsConstructor; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * @author hx + */ +@Service +@AllArgsConstructor +@Slf4j +public class WorkshopInfoServiceImpl extends BaseServiceImpl implements WorkshopInfoService { + + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/AbnormalAlarmServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/AbnormalAlarmServiceImpl.java deleted file mode 100644 index 9a57ee4..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/AbnormalAlarmServiceImpl.java +++ /dev/null @@ -1,242 +0,0 @@ -package com.hnac.hzims.scheduled.service.impl; - -import com.hnac.hzims.message.MessageConstants; -import com.hnac.hzims.message.dto.MessagePushRecordDto; -import com.hnac.hzims.message.fegin.IMessageClient; -import com.hnac.hzims.operational.alert.constants.AbnormalAlarmConstant; -import com.hnac.hzims.operational.alert.entity.AbnormalAlarmEntity; -import com.hnac.hzims.operational.alert.entity.HistoryAbnormalAlarmEntity; -import com.hnac.hzims.operational.main.constant.HomePageConstant; -import com.hnac.hzims.operational.station.entity.StationEntity; -import com.hnac.hzims.scheduled.mapper.operation.AbnormalAlarmMapper; -import com.hnac.hzims.scheduled.service.AbnormalAlarmService; -import com.hnac.hzims.scheduled.service.HistoryAbnormalAlarmService; -import com.hnac.hzims.scheduled.service.IStationService; -import com.hnac.hzinfo.datasearch.soe.ISoeClient; -import com.hnac.hzinfo.datasearch.soe.domian.SoeData; -import com.hnac.hzinfo.datasearch.soe.domian.SoeQueryConditionByStation; -import com.hnac.hzinfo.sdk.core.response.HzPage; -import com.hnac.hzinfo.sdk.core.response.Result; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.CollectionUtil; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.tool.utils.ObjectUtil; -import org.springblade.core.tool.utils.StringUtil; -import org.springblade.system.feign.ISysClient; -import org.springblade.system.user.entity.User; -import org.springblade.system.user.feign.IUserClient; -import org.springframework.stereotype.Service; - -import java.time.LocalDateTime; -import java.util.*; -import java.util.concurrent.CompletableFuture; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 10:29 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class AbnormalAlarmServiceImpl extends BaseServiceImpl implements AbnormalAlarmService { - - - private final IStationService stationService; - - - private final HistoryAbnormalAlarmService historyAbnormalAlarmService; - - private final ISysClient sysClient; - - private final ISoeClient soeClient; - - private final IUserClient userClient; - - private final IMessageClient messageClient; - - - /** - * 数据中断、数据异常告警 - * @param param - */ - @Override - public void alarmDataHandle(String param) { - // 查询代运维站点 - List stations = stationService.getStationByType(null, HomePageConstant.HYDROPOWER_SERVETYPE); - if(CollectionUtil.isEmpty(stations)){ - return; - } - SoeQueryConditionByStation query = new SoeQueryConditionByStation(); - query.setTypes(AbnormalAlarmConstant.SEND_MESSSAGE_TYPE_LIST); - query.setStationIds(stations.stream().map(StationEntity::getCode).collect(Collectors.toList())); - Calendar calendar = Calendar.getInstance(); - query.setEndTime(LocalDateTime.parse(DateUtil.format(calendar.getTime(), DateUtil.PATTERN_DATETIME),DateUtil.DATETIME_FORMATTER)); - calendar.add(Calendar.MINUTE,-2); - query.setBeginTime(LocalDateTime.parse(DateUtil.format(calendar.getTime() , DateUtil.PATTERN_DATETIME),DateUtil.DATETIME_FORMATTER)); - query.setNeedPage(false); - log.error("alarm_data_handle_param : {}",query); - Result> result = soeClient.getByStationsAndTime(query); - // 未查询到告警信息 - if(!result.isSuccess() || ObjectUtil.isEmpty(result.getData().getRecords())){ - return; - } - log.error("alarm_data_handle_begin_result : {}",result.getData().getRecords()); - // 遍历告警信息 - List list = new ArrayList<>(result.getData().getRecords().stream().sorted(Comparator.comparing(SoeData::getTs).reversed()) - .collect(Collectors.toMap(o -> o.getStation() + o.getSoeType(), Function.identity(), (o1, o2) -> o1)).values()); - log.error("alarm_data_handle_end_result : {}",list); - list.forEach(item -> { - AbnormalAlarmEntity queryEntity = this.baseMapper.getAbnormalAlarm(item.getStation(),item.getSoeType()); - boolean flag = AbnormalAlarmConstant.ABNORMAL_STATUS.equals(item.getSoeAlarmType()); - String stationName = Optional.ofNullable(stations.stream().filter(o-> o.getCode().equals(item.getStation())).collect(Collectors.toList())).map(o->o.get(0).getName()).orElse(null); - if(ObjectUtil.isEmpty(queryEntity)){ - AbnormalAlarmEntity entity = new AbnormalAlarmEntity(); - entity.setStationId(item.getStation()); - entity.setStationName(stationName); - entity.setRealId(item.getRealId()); - entity.setSoeExplain(item.getSoeExplain()); - entity.setType(item.getSoeType()); - entity.setStartTime(item.getTs()); - entity.setEndTime(null); - entity.setStatus(0); - if(flag){ - entity.setStartTime(null); - entity.setEndTime(item.getTs()); - entity.setStatus(1); - } - // 保存告警信息 - this.save(entity); - return; - } - queryEntity.setSoeExplain(item.getSoeExplain()); - queryEntity.setStationName(stationName); - queryEntity.setType(item.getSoeType()); - queryEntity.setStartTime(queryEntity.getStartTime()); - queryEntity.setUpdateTime(new Date()); - queryEntity.setEndTime(null); - queryEntity.setStatus(0); - if(flag){ - queryEntity.setEndTime(item.getTs()); - queryEntity.setStatus(1); - } - this.updateById(queryEntity); - }); - - // 异步保存历史告警 - CompletableFuture.supplyAsync(()-> this.saveHistoryAlarm(result.getData().getRecords(),stations)); - } - - - /** - * 保存告警历史信息 - * @param list - * @return - */ - private String saveHistoryAlarm(List list,List stations) { - list.forEach(item -> { - Date ts = DateUtil.parse(DateUtil.format(item.getTs(),DateUtil.PATTERN_DATETIME),DateUtil.DATETIME_FORMAT); - // 历史数据异常查询 - HistoryAbnormalAlarmEntity queryEntity = this.historyAbnormalAlarmService.getAbnormalAlarm(item.getStation(),item.getSoeType()); - // 数据中断恢复 - boolean flag = AbnormalAlarmConstant.ABNORMAL_STATUS.equals(item.getSoeAlarmType()); - String stationName = Optional.ofNullable(stations.stream().filter(o-> o.getCode().equals(item.getStation())).collect(Collectors.toList())).map(o->o.get(0).getName()).orElse(null); - if(ObjectUtil.isEmpty(queryEntity) || !flag){ - HistoryAbnormalAlarmEntity entity = new HistoryAbnormalAlarmEntity(); - entity.setAlarmId(item.getId()); - entity.setStationId(item.getStation()); - entity.setStationName(stationName); - entity.setRealId(item.getRealId()); - entity.setSoeExplain(item.getSoeExplain()); - entity.setType(item.getSoeType()); - entity.setStartTime(ts); - entity.setStatus(0); - this.historyAbnormalAlarmService.save(entity); - // 消息推送 - this.sendAlarmMessage(Collections.singletonList(entity),stations); - return; - } - queryEntity.setSoeExplain(item.getSoeExplain()); - queryEntity.setUpdateTime(new Date()); - queryEntity.setEndTime(ts); - queryEntity.setStatus(1); - this.historyAbnormalAlarmService.updateById(queryEntity); - }); - return "success"; - } - - - - /** - * 告警消息推送 - * @param entitys - */ - private void sendAlarmMessage(List entitys,List stations) { - if(CollectionUtil.isEmpty(entitys)){ - return; - } - // 告警等级 ：事故、数据中断 - List alarms = entitys.stream().filter(entity -> AbnormalAlarmConstant.SEND_MESSSAGE_TYPE_LIST.contains(entity.getType())).collect(Collectors.toList()); - if(CollectionUtil.isEmpty(alarms)){ - return; - } - // 查询站点用户 - entitys.forEach(entity->{ - if(StringUtil.isEmpty(entity.getStationId())){ - return; - } - List depts = stations.stream().filter(station -> station.getCode().equals(entity.getStationId())).map(StationEntity::getRefDept).collect(Collectors.toList()); - if(CollectionUtil.isEmpty(depts)){ - return; - } - // 获取站点用户 - R> result = userClient.userListByDeptId(depts.get(0)); - if(!result.isSuccess() || CollectionUtil.isEmpty(result.getData())){ - return; - } - MessagePushRecordDto message = new MessagePushRecordDto(); - message.setBusinessClassify("warning"); - message.setBusinessKey(MessageConstants.BusinessClassifyEnum.WARNING.getKey()); - message.setSubject(MessageConstants.BusinessClassifyEnum.WARNING.getDescription()); - message.setTaskId(entity.getId()); - message.setTenantId("200000"); - message.setContent(entity.getSoeExplain()); - message.setTypes(Arrays.asList(MessageConstants.APP_PUSH, MessageConstants.WS_PUSH)); - message.setPushType(MessageConstants.IMMEDIATELY); - message.setDeptId(depts.get(0)); - R deptName = sysClient.getDeptName(depts.get(0)); - if (deptName.isSuccess()) { - message.setDeptName(deptName.getData()); - } - User admin = userClient.userByAccount("200000", "admin").getData(); - message.setCreateDept(admin.getCreateDept()); - message.setCreateUser(admin.getCreateUser()); - result.getData().forEach(user->{ - message.setPusher(String.valueOf(user.getId())); - message.setPusherName(user.getName()); - message.setAccount(String.valueOf(user.getId())); - messageClient.sendMessage(message); - }); - }); - } - - - /** - * 查询实时告警数据 - * @return - */ - @Override - public List getAbnormalAlarmList() { - List alarmList = this.baseMapper.getAbnormalAlarmList(); - if(CollectionUtil.isEmpty(alarmList)){ - return new ArrayList<>(); - } - return alarmList; - } -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/HistoryAbnormalAlarmServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/HistoryAbnormalAlarmServiceImpl.java deleted file mode 100644 index 6824c7a..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/HistoryAbnormalAlarmServiceImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.hnac.hzims.scheduled.service.impl; - -import com.hnac.hzims.operational.alert.entity.HistoryAbnormalAlarmEntity; -import com.hnac.hzims.scheduled.mapper.operation.HistoryAbnormalAlarmMapper; -import com.hnac.hzims.scheduled.service.HistoryAbnormalAlarmService; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.core.tool.utils.CollectionUtil; -import org.springframework.stereotype.Service; - -import java.util.Comparator; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 11:12 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class HistoryAbnormalAlarmServiceImpl extends BaseServiceImpl implements HistoryAbnormalAlarmService { - /** - * 查询单条历史告警 - * - * @param station - * @param soeType - * @return - */ - @Override - public HistoryAbnormalAlarmEntity getAbnormalAlarm(String station, String soeType) { - List alarms = this.baseMapper.getHistoryAbnormalAlarm(station, soeType); - if(CollectionUtil.isEmpty(alarms)){ - return null; - } - return alarms.stream().sorted(Comparator.comparing(HistoryAbnormalAlarmEntity::getStartTime)).collect(Collectors.toList()).get(0); - } -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/HzimsAnalyzeModelStationServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/HzimsAnalyzeModelStationServiceImpl.java deleted file mode 100644 index 26c1e39..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/HzimsAnalyzeModelStationServiceImpl.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hnac.hzims.scheduled.service.impl; - -import com.hnac.hzims.operational.station.entity.HzimsAnalyzeModelStationEntity; -import com.hnac.hzims.scheduled.mapper.operation.HzimsAnalyzeModelStationMapper; -import com.hnac.hzims.scheduled.service.IHzimsAnalyzeModelStationService; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/22 11:42 - */ -@Service -public class HzimsAnalyzeModelStationServiceImpl extends BaseServiceImpl implements IHzimsAnalyzeModelStationService { -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/MainSystemMonitoringServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/MainSystemMonitoringServiceImpl.java deleted file mode 100644 index 2620394..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/MainSystemMonitoringServiceImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.hnac.hzims.scheduled.service.impl; - -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; -import com.hnac.hzims.equipment.vo.EminfoAndEmParamVo; -import com.hnac.hzims.scheduled.service.IMainSystemMonitoringService; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.tool.utils.ObjectUtil; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 14:01 - */ -@Service -@Slf4j -@RequiredArgsConstructor -public class MainSystemMonitoringServiceImpl implements IMainSystemMonitoringService { - - - private final RedisTemplate redisTemplate; - - - @Value("${hzims.equipment.emInfo.emInfoList}") - public String emInfoListPath; - - /** - * 从Redis获取设备信息 - * - * @return - */ - @Override - public List getEmInfoList() { - List list = new ArrayList<>(); - Object json = redisTemplate.opsForValue().get(emInfoListPath); - if (ObjectUtil.isNotEmpty(json)) { - list = JSONObject.parseObject(json.toString(), new TypeReference>() { - }); - } - return list; - } - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/RealMonitorServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/RealMonitorServiceImpl.java deleted file mode 100644 index 4a595ad..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/RealMonitorServiceImpl.java +++ /dev/null @@ -1,713 +0,0 @@ -package com.hnac.hzims.scheduled.service.impl; - -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.hnac.hzims.equipment.vo.EminfoAndEmParamVo; -import com.hnac.hzims.fdp.vo.FdpFaultStatusVo; -import com.hnac.hzims.operational.config.entity.StAlarmRecordEntity; -import com.hnac.hzims.operational.config.enume.ConfigStatus; -import com.hnac.hzims.operational.main.constant.HomePageConstant; -import com.hnac.hzims.operational.station.entity.StationAttributeEntity; -import com.hnac.hzims.operational.station.entity.StationEntity; -import com.hnac.hzims.scheduled.service.*; -import com.hnac.hzims.scheduled.vo.RealAttributeVo; -import com.hnac.hzims.scheduled.vo.RealDeviceVo; -import com.hnac.hzims.scheduled.vo.RealStationVo; -import com.hnac.hzims.scheduled.vo.StationRealVo; -import com.hnac.hzinfo.sdk.v5.redis.RedisClient; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.MapUtils; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.CollectionUtil; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.tool.utils.ObjectUtil; -import org.springblade.core.tool.utils.StringUtil; -import org.springblade.system.entity.Dept; -import org.springblade.system.feign.ISysClient; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Service; - -import javax.validation.constraints.NotNull; -import java.util.*; -import java.util.concurrent.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 13:54 - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class RealMonitorServiceImpl implements IRealMonitorService { - - @NotNull - private final IStationAttributeService attbtService; - - - private final AbnormalAlarmService abnormalAlarmService; - - private final StAlamRecordService alertService; - - @NotNull - private final IStationService stationService; - @NotNull - private final IMainSystemMonitoringService maintenanceTaskService; - @NotNull - private final RedisTemplate redisTemplate; - - - private final IMainSystemMonitoringService systemMonitoringService; - - - private final RedisClient redisClient; - - @NotNull - private final ISysClient sysClient; - - - private final IStationAttrConfigService stationAttrConfigService; - - @Value("${hzims.operation.monitor.realId}") - public String moniter_realId_key; - - @Value("${hzims.operation.monitor.station}") - public String moniter_station_key; - - @Value("${hzims.equipment.fdp.redisData}") - public String fdp_fault_data_key; - - @Value("${hzims.operation.homePage.activePowerKey}") - public String active_power_key; - - @Value("${hzims.equipment.fdp.greaterThan}") - public Double greater_than; - - @Value("${hzims.equipment.fdp.lessThan}") - public Double less_than; - - @Value("${hzims.equipment.fdp.beEqualOrGreaterThan}") - public Double be_equal_or_greater_than; - - @Value("${hzims.operation.region.deviceClassifyKey}") - private String device_classify_key; - - @Value("${hzims.operation.realIdKeyGather}") - public String real_id_key_gather_path; - - @Value("${hzims.operation.realIdKey}") - public String real_id_key_path; - - @Value("${hzims.operation.homePage.jointRelayKey}") - public String joint_relay_key; - - /** - * 10站点为一组数据 - */ - private static final Integer MAX_SEND = 5; - - private final static String loadwater_level_key = "hzims:operation:loadwater:level:key"; - - - @Override - public void realTimeData(String param) { - Long beginTime = System.currentTimeMillis(); - // 获取设备 - List devices = systemMonitoringService.getEmInfoList(); - // 设备开关机集合监测点 - List switchOnOff = devices.stream().map(o->{ - Map points = o.getPoint(); - if(CollectionUtil.isEmpty(points)){ - return ""; - } - String jointRelay = points.get(HomePageConstant.JOINT_RELAY); - if(!StringUtil.isEmpty(jointRelay)){ - return jointRelay; - } - String onOff = points.get(HomePageConstant.SWITCH_ON_OFF); - if(!StringUtil.isEmpty(onOff)){ - return onOff; - } - return ""; - }).collect(Collectors.toList()); - // 获取站点缓存数据 - List stationRealVos = (List) redisTemplate.opsForValue().get(moniter_realId_key); - if(CollectionUtil.isEmpty(stationRealVos)){ - return; - } - // 数据切割 - int limit = countStep(stationRealVos.size()); - List> list = Stream.iterate(0, n -> n + 1).limit(limit).parallel().map(a -> stationRealVos.stream().skip((long) a * MAX_SEND).limit(MAX_SEND).parallel().collect(Collectors.toList())).collect(Collectors.toList()); - ExecutorService pool = Executors.newFixedThreadPool(limit); - // - Map valueMap = new ConcurrentHashMap<>(); - // > - Map> keyMap = new ConcurrentHashMap<>(); - CountDownLatch countDownLatch = new CountDownLatch(limit); - pool.execute(()-> list.forEach(stations -> { - stations.forEach(stationReal -> { - String[] realIdArr = stationReal.getRealId(); - List realIds = Stream.of(realIdArr).collect(Collectors.toList()); - if(CollectionUtil.isEmpty(realIds)){ - return; - } - log.error("real_time_data: {},{}",stationReal.getStation(),realIds); - List objects = redisClient.getBatchRealDataByRealId(stationReal.getStation(),realIds); - for(int i = 0; i < realIds.size() ;i++){ - if(ObjectUtil.isEmpty(objects.get(i))){ - log.error(realIds.get(i) + "is null"); - }else{ - Map attribute = (Map) JSONObject.parse(objects.get(i)); - attribute.put("realId",attribute.get("k")); - attribute.put("value",attribute.get("v")); - attribute.put("time",attribute.get("t")); - attribute.remove("v"); - attribute.remove("k"); - attribute.remove("t"); - this.getCheckMap(attribute,switchOnOff); - valueMap.put(realIdArr[i],attribute.get("value")); - keyMap.put(realIdArr[i],attribute); - } - } - }); - countDownLatch.countDown(); - })); - // 等待所有线程执行完成 - try { - countDownLatch.await(); - } catch (InterruptedException e) { - e.printStackTrace(); - Thread.currentThread().interrupt(); - } - pool.shutdown(); - // redis 存储 - redisTemplate.opsForValue().set(real_id_key_path,JSONObject.toJSONString(valueMap)); - redisTemplate.opsForValue().set(real_id_key_gather_path,JSONObject.toJSONString(keyMap)); - Long endTime = System.currentTimeMillis(); - Long time = endTime - beginTime; - log.error("处理redis实时数据 耗时 ： {}",time); - } - - - - /** - * 计算切分次数 - */ - private static Integer countStep(Integer size) { - return (size + MAX_SEND - 1) / MAX_SEND; - } - - - /** - * 监测点过期数据检查 - * @param value - * @return - */ - private void getCheckMap(Map value,List switchOnOff){ - // 不处理开机状态监测点 - if(switchOnOff.contains(value.get("realId"))){ - return; - } - String time = value.get("time"); - if(StringUtil.isEmpty(time)){ - return; - } - Date date = DateUtil.parse(time,DateUtil.PATTERN_DATETIME); - // 实时数据超出10分钟未刷新，值置为 0 显示 - if(System.currentTimeMillis() - date.getTime() > 10 * 60 * 1000L){ - value.put("value","0"); - } - } - - - - - /** - * 集中监控数据处理 - * @param param - */ - @Override - public void centralizedMonitoring(String param) { - long beginTime = System.currentTimeMillis(); - Thread thread = Thread.currentThread(); - Object json = redisTemplate.opsForValue().get(real_id_key_gather_path); - if (ObjectUtil.isEmpty(json)) { - return; - } - Map> map = JSONObject.parseObject(json.toString(), new TypeReference>>() { - }); - if (MapUtils.isEmpty(map)) { - return; - } - log.info(thread.getName() + "步骤1获取检测点数据耗时 ： {}",System.currentTimeMillis() - beginTime); - beginTime = System.currentTimeMillis(); - // 获取所有设备重点属性 - List list = attbtService.list(new LambdaQueryWrapper() {{ - isNotNull(StationAttributeEntity::getStationId); - eq(StationAttributeEntity::getIsDeleted, "0"); - orderByAsc(StationAttributeEntity::getSort); - }}); - if (CollectionUtil.isEmpty(list)) { - return; - } - log.info(thread.getName() + "步骤2获取监控配置监测点 耗时 ： {}",System.currentTimeMillis() - beginTime); - beginTime = System.currentTimeMillis(); - // 获取所有告警记录 - List alertList = alertService.list(new LambdaQueryWrapper() {{ - orderByDesc(StAlarmRecordEntity::getCreateTime); - }}); - log.info(thread.getName() + "步骤3获取告警记录 耗时 ： {}",System.currentTimeMillis() - beginTime); - beginTime = System.currentTimeMillis(); - List alarmList = abnormalAlarmService.getAbnormalAlarmList(); - log.info(thread.getName() + "步骤4获取数据中断告警记录 耗时 ： {}",System.currentTimeMillis() - beginTime); - beginTime = System.currentTimeMillis(); - // 获取所有故障记录 - List faultList = this.getFdpFaultAll(); - log.info(thread.getName() + "步骤5获取故障记录 耗时 ： {}",System.currentTimeMillis() - beginTime); - beginTime = System.currentTimeMillis(); - // 所有设备分类 - Map> deviceClassifyMap = (Map>) redisTemplate.opsForValue().get(device_classify_key); - log.info(thread.getName() + "步骤6获取设备分类 耗时 ： {}",System.currentTimeMillis() - beginTime); - beginTime = System.currentTimeMillis(); - // 所有设备 - List emList = maintenanceTaskService.getEmInfoList(); - log.info(thread.getName() + "步骤7获取设备信息 耗时 ： {}",System.currentTimeMillis() - beginTime); - beginTime = System.currentTimeMillis(); - // 根据站点分组 - Map> stationAttbtMap = list.stream().collect(Collectors.groupingBy(StationAttributeEntity::getStationId)); - // 获取站点列表 - List stationEntityList = stationService.getStationByInCode(new ArrayList<>(stationAttbtMap.keySet())); - log.info(thread.getName() + "步骤8站点列表 耗时 ： {}",System.currentTimeMillis() - beginTime); - beginTime = System.currentTimeMillis(); - // 隐藏设备列表 - List hideList = stationAttrConfigService.getHideList(); - // 分割,每个map限制10个长度 - List>> handleList = this.mapChunk(stationAttbtMap); - log.info(thread.getName() + "步骤9监测点数据切割 耗时 ： {}",System.currentTimeMillis() - beginTime); - beginTime = System.currentTimeMillis(); - // 创建线程池 - ExecutorService pool = Executors.newFixedThreadPool(handleList.size()); - CountDownLatch countDownLatch = new CountDownLatch(handleList.size()); - log.info(thread.getName() +"步骤10创建线程 耗时 ： {}",System.currentTimeMillis() - beginTime); - beginTime = System.currentTimeMillis(); - // 所有机构 - R> deptAll = sysClient. getDeptList(); - // 存储数据节点 - List stationList = new CopyOnWriteArrayList<>(); - pool.execute(()->{ - // 线程处理数据 - for(Map> item : handleList){ - item.forEach((key,value)->{ - RealStationVo station = new RealStationVo(); - // 站点编码 - station.setStationCode(key); - // 设置站点状态 - this.setStationStatus(alarmList,station,key); - // 名称、限制水位、服务类型、机构、排序 - this.stationParam(stationEntityList,station,deptAll.getData()); - // 根据设备名称分组 - Map> deviceAttbtMap = value.stream().filter(o -> !hideList.contains(o.getEmName())).collect(Collectors.groupingBy(StationAttributeEntity::getEmName)); - List deviceList = new ArrayList<>(); - // device - 设备,arrbt - 设备重点属性 - deviceAttbtMap.forEach((device, attbt) -> { - RealDeviceVo deviceVo = new RealDeviceVo(); - // 设备名称 - deviceVo.setDeviceName(device); - deviceVo.setDeviceCode(attbt.get(0).getEmCode()); - // 设备处理 - this.handleDevice(attbt, map, deviceVo, alertList, faultList); - deviceList.add(deviceVo); - }); - // 设备状态 - this.getDeviceParam(emList, deviceClassifyMap, deviceList); - station.setDeviceList(deviceList.stream().sorted(Comparator.comparing((RealDeviceVo::getDeviceName))).collect(Collectors.toList())); - stationList.add(station); - }); - countDownLatch.countDown(); - } - }); - log.info(thread.getName() + "步骤11线程数据处理 耗时 ： {}",System.currentTimeMillis() - beginTime); - beginTime = System.currentTimeMillis(); - // 等待所有线程执行完成 - try { - countDownLatch.await(); - } catch (InterruptedException e) { - e.printStackTrace(); - Thread.currentThread().interrupt(); - } - pool.shutdown(); - log.info(thread.getName() + "步骤12所有线程完成 耗时 ： {}",System.currentTimeMillis() - beginTime); - redisTemplate.opsForValue().set(moniter_station_key, stationList); - } - - - /** - * map分割 - * - * @param - * @param - * @param chunkMap - * @return - */ - private List> mapChunk(Map chunkMap) { - if (chunkMap == null || RealMonitorServiceImpl.MAX_SEND <= 0) { - List> list = new ArrayList<>(); - list.add(chunkMap); - return list; - } - Set keySet = chunkMap.keySet(); - Iterator iterator = keySet.iterator(); - int i = 1; - List> total = new ArrayList<>(); - Map tem = new HashMap<>(); - while (iterator.hasNext()) { - k next = iterator.next(); - tem.put(next, chunkMap.get(next)); - if (i == RealMonitorServiceImpl.MAX_SEND) { - total.add(tem); - tem = new HashMap<>(); - i = 0; - } - i++; - } - if (!CollectionUtil.isEmpty(tem)) { - total.add(tem); - } - return total; - } - - - - /** - * 设备参数设置 - * - * @param emList - * @param deviceClassifyMap - * @param deviceList - */ - private void getDeviceParam(List emList, Map> deviceClassifyMap, List deviceList) { - if (CollectionUtil.isEmpty(emList) || CollectionUtil.isEmpty(deviceList) || MapUtils.isEmpty(deviceClassifyMap)) { - return; - } - List faultList = deviceClassifyMap.get(HomePageConstant.FAULT); - List maintaintList = deviceClassifyMap.get(HomePageConstant.MAINTAIN); - List overhaultList = deviceClassifyMap.get(HomePageConstant.OVERHAUL); - List runtList = deviceClassifyMap.get(HomePageConstant.RUN); - List sparetList = deviceClassifyMap.get(HomePageConstant.SPARE); - deviceList.forEach(device -> { - if (StringUtil.isBlank(device.getDeviceCode())) { - device.setState(-1); - return; - } - List list = emList.stream().filter(o -> null != o.getId() && o.getId().toString().equals(device.getDeviceCode())).collect(Collectors.toList()); - if (CollectionUtil.isEmpty(list)) { - device.setState(-1); - return; - } - String deviceCode = list.get(0).getEmCode(); - if (StringUtil.isBlank(deviceCode)) { - device.setState(-1); - return; - } - // 故障 - if (CollectionUtil.isNotEmpty(faultList) && faultList.contains(deviceCode)) { - device.setState(4); - // 保养 - } else if (CollectionUtil.isNotEmpty(maintaintList) && maintaintList.contains(deviceCode)) { - device.setState(3); - // 备用 - } else if (CollectionUtil.isNotEmpty(sparetList) && sparetList.contains(deviceCode)) { - device.setState(2); - // 运行 - } else if (CollectionUtil.isNotEmpty(runtList) && runtList.contains(deviceCode)) { - device.setState(1); - // 检修 - } else if (CollectionUtil.isNotEmpty(overhaultList) && overhaultList.contains(deviceCode)) { - device.setState(0); - // 未知 - } else { - device.setState(-1); - } - }); - } - /** - * 获取所有告警记录 - * - * @return - */ - private List getFdpFaultAll() { - Object json = redisTemplate.opsForValue().get(fdp_fault_data_key); - if (ObjectUtil.isEmpty(json)) { - return new ArrayList<>(); - } - return (List) json; - } - - - - /** - * 设置站点状态 - * @param alarmList - * @param station - * @param key - */ - private void setStationStatus(List alarmList, RealStationVo station, String key) { - station.setStatus(0); - if(alarmList.contains(key)){ - station.setStatus(1); - } - } - - - /** - * 获取站点属性 - * @param stationEntityList - * @param item - */ - private void stationParam(List stationEntityList, RealStationVo item,List deptAll) { - if(CollectionUtil.isEmpty(stationEntityList)){ - return; - } - List filterList = stationEntityList.stream().filter(o->item.getStationCode().equals(o.getCode())).collect(Collectors.toList()); - if(CollectionUtil.isEmpty(filterList)){ - return; - } - StationEntity station = filterList.get(0); - if(ObjectUtil.isEmpty(station)){ - return; - } - item.setStationName(station.getName()); - item.setWaterLevelMax(station.getLimitWaterLevel()); - item.setServerType(station.getServeType()); - item.setStationDeptId(station.getRefDept()); - // 排序 - List list = deptAll.stream().filter(o-> station.getRefDept().equals(o.getId())).collect(Collectors.toList()); - if(CollectionUtil.isEmpty(list)){ - return; - } - item.setSort(list.get(0).getSort()); - } - - - - /** - * 设备处理 - * - * @param list - * @param map - * @param device - */ - private void handleDevice(List list, Map> map, - RealDeviceVo device, List alertList, - List faultList) { - if (CollectionUtil.isEmpty(list) || MapUtils.isEmpty(map)) { - return; - } - List attbtList = new ArrayList<>(); - list.forEach(item -> { - RealAttributeVo realAttributeVo = new RealAttributeVo(); - // 设备重点属性处理 : 单条-item - Map real = map.get(item.getMonitorId()); - if(MapUtils.isEmpty(real)){ - realAttributeVo.setName(item.getAttributes()); - realAttributeVo.setType(item.getAttributeType()); - realAttributeVo.setRealId(item.getMonitorId()); - realAttributeVo.setQuality(-1); - realAttributeVo.setStatus(0); - realAttributeVo.setValue("0"); - realAttributeVo.setUnit(item.getUnit()); - attbtList.add(realAttributeVo); - return; - } - realAttributeVo = handleAttbt(item, real, alertList, faultList); - if (ObjectUtil.isEmpty(realAttributeVo)) { - return; - } - attbtList.add(realAttributeVo); - }); - device.setAttbtList(attbtList); - } - - - /** - * 设备单条重点属性处理 - * - * @param item - * @param real - * @return - */ - private RealAttributeVo handleAttbt(StationAttributeEntity item, Map real, - List alertList, List faultList) { - RealAttributeVo attest = new RealAttributeVo(); - this.setAttbtParam(attest, real); - attest.setRealId(item.getMonitorId()); - attest.setName(item.getAttributes()); - attest.setUnit(item.getUnit()); - attest.setType(item.getAttributeType()); - String value = Optional.ofNullable(attest.getValue()).orElse("-"); - // 正常状态 - attest.setStatus(ConfigStatus.ConfigStatusEnum.NORMAL.getStatus()); - int quality = Optional.ofNullable(attest.getQuality()).orElse(-1); - String time = Optional.ofNullable(attest.getTime()).orElse(""); - // 延时状态 ：质量为空 && 时间为空 - if (-1 == quality && StringUtil.isEmpty(time)) { - attest.setStatus(ConfigStatus.ConfigStatusEnum.GRAY.getStatus()); - } - int type = item.getAttributeType(); - switch (type) { - case 1://遥测 - // 预警状态 ：value值为"1" && quality值为0 - if ("1".equals(value) && 0 == quality) { - attest.setStatus(ConfigStatus.ConfigStatusEnum.RED.getStatus()); - } - break; - case 2://遥信 - signalyRemote(item, attest, quality, value, alertList); - //处理 - break; - default: - throw new IllegalStateException("Unexpected type: " + type); - } - // 故障信息设置 - accidentDetails(attest, faultList, value); - return attest; - } - - /** - * 故障信息设置 - * - * @param attest - * @param faultList - * @param value - */ - private void accidentDetails(RealAttributeVo attest, List faultList, String value) { - if (CollectionUtil.isEmpty(faultList) || "-".equals(value)) { - return; - } - List fault = faultList.stream().filter(o -> o.getRealId().equals(attest.getRealId())).collect(Collectors.toList()); - if (CollectionUtil.isEmpty(fault)) { - return; - } - FdpFaultStatusVo fdpFaultStatusVo = fault.get(0); - // 黄色 - if (fdpFaultStatusVo.getValue() > greater_than && fdpFaultStatusVo.getValue() < less_than) { - attest.setStatus(ConfigStatus.ConfigStatusEnum.YELLOW.getStatus()); - // 橙色 - } else if (fdpFaultStatusVo.getValue() >= be_equal_or_greater_than) { - attest.setStatus(ConfigStatus.ConfigStatusEnum.ORANGE.getStatus()); - } - attest.setFdpRate(fdpFaultStatusVo.getValue()); - attest.setFdpFaultId(fdpFaultStatusVo.getFaultId()); - attest.setFdpMonitorId(fdpFaultStatusVo.getMonitorId()); - } - - /** - * 重点属性类型-遥信 ：数据逻辑处理 - * - * @param attest - */ - private void signalyRemote(StationAttributeEntity item, RealAttributeVo attest, int quality, String strValue, List alertList) { - //需要所有值的数据不为null，并且满足条件才会进去添加数据返回id - if (null == item.getUpUpLimit() || null == item.getDownDownLimit() || null == item.getUpLimit() || null == item.getDownLimit()) { - return; - } - if (-1 == quality) { - return; - } - if (quality != 0) { - return; - } - if ("-".equals(strValue)) { - return; - } - double upup = item.getUpUpLimit(); - double lwlw = item.getDownDownLimit(); - double up = item.getUpLimit(); - double lw = item.getDownLimit(); - //查询出来已处理告警记录 - List handleList = alertList.stream().filter(o -> o.getStationId().equals(item.getStationId()) && o.getRealId().equals(attest.getRealId()) && o.getStatus() == 1).collect(Collectors.toList()); - //查询出来未处理告警记录 - List recordList = alertList.stream().filter(o -> o.getStationId().equals(item.getStationId()) && o.getRealId().equals(attest.getRealId()) && o.getStatus() == 0).collect(Collectors.toList()); - long past = 0L; - double value = Double.parseDouble(strValue); - if (value > upup || value < lwlw) { - if (CollectionUtil.isNotEmpty(handleList)) { - // 现在时间 - 处理时间 - past = System.currentTimeMillis() - handleList.get(0).getProcessTime().getTime(); - } - boolean isOverrun = ((CollectionUtil.isEmpty(handleList) && CollectionUtil.isEmpty(recordList)) || (past / 1000 / 60 > 30 && CollectionUtil.isEmpty(recordList))); - if (isOverrun) { - Long alertId = alertService.insertAlert(item.getStationId(), item.getMonitorId()); - attest.setId(alertId); - attest.setStatus(ConfigStatus.ConfigStatusEnum.YELLOW.getStatus()); - } else if (CollectionUtil.isNotEmpty(recordList)) { - StAlarmRecordEntity record = recordList.get(0); - attest.setId(record.getId()); - // 告警处理完成 - if (record.getProcessTime() != null && record.getStatus() == (byte) 1) { - attest.setStatus(ConfigStatus.ConfigStatusEnum.NORMAL.getStatus()); - // 告警未处理 - } else if (record.getProcessTime() == null && record.getStatus() == (byte) 0) { - attest.setStatus(ConfigStatus.ConfigStatusEnum.HAND_DELAY_STATUS.getStatus()); - } - } - } else if (value > up && value < upup || value < lw && value > lwlw) { - if (CollectionUtil.isNotEmpty(handleList)) { - // 现在时间 - 处理时间 - past = System.currentTimeMillis() - handleList.get(0).getProcessTime().getTime(); - } - boolean exist = ((CollectionUtil.isEmpty(handleList) && CollectionUtil.isEmpty(recordList)) || (past / 1000 / 60 > 30 && CollectionUtil.isEmpty(recordList))); - if (exist){ - Long alertId = alertService.insertAlert(item.getStationId(), item.getMonitorId()); - attest.setId(alertId); - attest.setStatus(ConfigStatus.ConfigStatusEnum.YELLOW.getStatus()); - // 存在告警记录 - } else if (CollectionUtil.isNotEmpty(recordList)) { - StAlarmRecordEntity record = recordList.get(0); - if (recordList.get(0).getStatus() == (byte) 0 && recordList.get(0).getCreateTime() != null) { - attest.setId(record.getId()); - attest.setStatus(ConfigStatus.ConfigStatusEnum.RED.getStatus()); - } else { - attest.setId(recordList.get(0).getId()); - attest.setStatus(ConfigStatus.ConfigStatusEnum.NORMAL.getStatus()); - } - } - } - } - /** - * 设置重点属性参数 - * - * @param attest - * @param real - */ - private void setAttbtParam(RealAttributeVo attest, Map real) { - if (CollectionUtil.isEmpty(real)) { - return; - } - real.forEach((key, value) -> { - if (StringUtil.isBlank(value)) { - return; - } - switch (key) { - case "q": - attest.setQuality(Integer.parseInt(value)); - break; - case "realId": - attest.setRealId(value); - break; - case "value": - attest.setValue(Optional.ofNullable(value).orElse("-")); - break; - case "time": - attest.setTime(value); - break; - } - }); - } -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/StAlamRecordServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/StAlamRecordServiceImpl.java deleted file mode 100644 index 06d1fd0..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/StAlamRecordServiceImpl.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.hnac.hzims.scheduled.service.impl; - -import com.hnac.hzims.operational.config.entity.StAlarmRecordEntity; -import com.hnac.hzims.scheduled.mapper.operation.StAlarmRecordMapper; -import com.hnac.hzims.scheduled.service.StAlamRecordService; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.Date; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 15:46 - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class StAlamRecordServiceImpl extends BaseServiceImpl implements StAlamRecordService { - - - /** - * 添加告警 - * @param stationId - * @param realId - * @return - */ - @Override - public Long insertAlert(String stationId, String realId) { - StAlarmRecordEntity record = new StAlarmRecordEntity(); - record.setStationId(stationId); - record.setRealId(realId); - record.setStatus(0); - record.setCreateTime(new Date()); - log.info("insert_alert_entity:{}",record); - return this.baseMapper.insertReturnId(record); - } - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/StFocusPropertiesServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/StFocusPropertiesServiceImpl.java deleted file mode 100644 index f10b67e..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/StFocusPropertiesServiceImpl.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.hnac.hzims.scheduled.service.impl; - -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.google.common.collect.Lists; -import com.hnac.hzims.equipment.entity.WorkshopInfoEntity; -import com.hnac.hzims.equipment.feign.IEmInfoClient; -import com.hnac.hzims.equipment.feign.IWorkshopInfoClient; -import com.hnac.hzims.equipment.vo.EminfoAndEmParamVo; -import com.hnac.hzims.operational.config.entity.StFocusPropertiesEntity; -import com.hnac.hzims.operational.main.constant.HomePageConstant; -import com.hnac.hzims.operational.station.entity.StationAttributeEntity; -import com.hnac.hzims.operational.station.entity.StationEntity; -import com.hnac.hzims.scheduled.mapper.operation.StFocusPropertiesMapper; -import com.hnac.hzims.scheduled.service.IStationAttributeService; -import com.hnac.hzims.scheduled.service.IStationService; -import com.hnac.hzims.scheduled.service.StFocusPropertiesService; -import com.hnac.hzims.scheduled.vo.StationRealVo; -import com.hnac.hzinfo.datasearch.analyse.IAnalyseDataSearchClient; -import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeCodeBySignagesVO; -import com.hnac.hzinfo.sdk.analyse.po.MultiAnalyzeCodePO; -import lombok.RequiredArgsConstructor; -import org.springblade.core.log.logger.BladeLogger; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.CollectionUtil; -import org.springblade.core.tool.utils.Func; -import org.springblade.core.tool.utils.ObjectUtil; -import org.springblade.core.tool.utils.StringUtil; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 11:27 - */ -@Service -@RequiredArgsConstructor -public class StFocusPropertiesServiceImpl extends BaseServiceImpl implements StFocusPropertiesService { - - - private final IStationService stationService; - - private final IStationAttributeService attbtService; - - private final IEmInfoClient emInfoClient; - - private final IAnalyseDataSearchClient analyseDataSearchClient; - - private final IWorkshopInfoClient workshopInfoClient; - - private final RedisTemplate redisTemplate; - - private final BladeLogger logger; - - @Value("${hzims.operation.monitor.realId}") - public String moniter_realId_key; - - @Value("${hzims.equipment.emInfo.emInfoList}") - public String em_info_list_path; - - @Override - public void getStationRealIds(String param) { - // 所有站点 - List stationList = stationService.getAll(); - if(CollectionUtil.isEmpty(stationList)){ - return; - } - // 设备监测点list - Object json = redisTemplate.opsForValue().get(em_info_list_path); - List eminfoAndEmParams = JSONObject.parseObject(json.toString(), new TypeReference>() {}); - // 厂房监测点list - List wsMonitorList = this.getRealIdByWsCodeAndSign(); - // 实时监控监测点list - List timeList = attbtService.list(new LambdaQueryWrapper() {{ - eq(StationAttributeEntity::getIsDeleted, "0"); - isNotNull(StationAttributeEntity::getMonitorId); - orderByAsc(StationAttributeEntity::getSort); - }}); - // 监测点存储list - List list = new ArrayList<>(); - stationList.forEach(station->{ - StationRealVo stationRealVo = new StationRealVo(); - stationRealVo.setStation(station.getCode()); - List realDeviceList = this.getRealDeviceList(station.getRefDept(),eminfoAndEmParams); - // 厂站匹配站点监测点集合 - List realWsList = wsMonitorList.stream().filter( - o -> Func.isNotEmpty(o.getStation()) && o.getStation().equals(station.getCode()) - ).map(AnalyzeCodeBySignagesVO::getRealId).collect(Collectors.toList()); - // 实时监控匹配站点监测点集合 - List realTimeList = timeList.stream().filter(o -> null != o.getStationId() && o.getStationId().equals(station.getCode())).map(StationAttributeEntity::getMonitorId).collect(Collectors.toList()); - if(CollectionUtil.isNotEmpty(realTimeList)){ - realDeviceList.addAll(realTimeList); - } - if(CollectionUtil.isNotEmpty(realWsList)) { - realDeviceList.addAll(realWsList); - } - if(CollectionUtil.isEmpty(realDeviceList)){ - return; - } - List realList = realDeviceList.stream().distinct().collect(Collectors.toList()); - String[] realArr = StringUtil.join(realList,",").split(","); - stationRealVo.setRealId(realArr); - list.add(stationRealVo); - }); - redisTemplate.opsForValue().set(moniter_realId_key,list); - } - - - - private List getRealIdByWsCodeAndSign() { - R> wsInfoListR = workshopInfoClient.getAllWorkshop(); - List wsInfoList = Optional.ofNullable(wsInfoListR).filter(r -> r.isSuccess() && CollectionUtil.isNotEmpty(wsInfoListR.getData())) - .map(R::getData).orElse(null); - if(CollectionUtil.isEmpty(wsInfoList)) { - return Lists.newArrayList(); - } - Function getAnalyzeCodePO = wsCode -> { - MultiAnalyzeCodePO multiAnalyzeCodePO = new MultiAnalyzeCodePO(); - multiAnalyzeCodePO.setDeviceCode(wsCode); - multiAnalyzeCodePO.setSignages(Lists.newArrayList(HomePageConstant.PV_JOINT_RELAY,HomePageConstant.PV_REACTIVE_POWER,HomePageConstant.PV_GENERATION_CAPACITY)); - return multiAnalyzeCodePO; - }; - List analyzeCodePOList = wsInfoList.stream().map(WorkshopInfoEntity::getNumber).map(getAnalyzeCodePO).collect(Collectors.toList()); - R> analyzeCodeBySignages = analyseDataSearchClient.getAnalyzeCodeBySignages(analyzeCodePOList); - return Optional.ofNullable(analyzeCodeBySignages).filter(r -> r.isSuccess()).map(R::getData).orElse(Lists.newArrayList()); - } - - - - /** - * 获取站点realId - * @param refDept - * @param eminfoAndEmParams - * @return - */ - private List getRealDeviceList(Long refDept, List eminfoAndEmParams) { - // 参数检查 - if(CollectionUtil.isEmpty(eminfoAndEmParams) || ObjectUtil.isEmpty(refDept)){ - return new ArrayList<>(); - } - // 有效设备 - List filters = eminfoAndEmParams.stream().filter(o-> o.getCreateDept().equals(refDept)).collect(Collectors.toList()); - if(CollectionUtil.isEmpty(filters)){ - return new ArrayList<>(); - } - // 遍历设备 - List result = new ArrayList<>(); - for(EminfoAndEmParamVo device : filters){ - result.addAll(device.getPoint().values()); - } - return result; - } -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/StationAttrConfigServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/StationAttrConfigServiceImpl.java deleted file mode 100644 index 58bd475..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/StationAttrConfigServiceImpl.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.hnac.hzims.scheduled.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hnac.hzims.operational.station.entity.StationAttrConfigEntity; -import com.hnac.hzims.scheduled.mapper.operation.StationAttrConfigMapper; -import com.hnac.hzims.scheduled.service.IStationAttrConfigService; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.core.tool.utils.CollectionUtil; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 16:07 - */ -@Service -@Slf4j -@AllArgsConstructor -public class StationAttrConfigServiceImpl extends BaseServiceImpl - implements IStationAttrConfigService { - - - @Override - public List getHideList() { - List list = this.list(new QueryWrapper() {{ - eq("ENABLE_SHOW", false); - eq("IS_DELETED",0); - }}); - if(CollectionUtil.isEmpty(list)){ - return new ArrayList<>(); - } - return list.stream().map(StationAttrConfigEntity::getEmName).collect(Collectors.toList()); - } - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/StationAttributeServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/StationAttributeServiceImpl.java deleted file mode 100644 index ae6cc6c..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/StationAttributeServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.hnac.hzims.scheduled.service.impl; - -import com.hnac.hzims.operational.station.entity.StationAttributeEntity; -import com.hnac.hzims.scheduled.mapper.operation.StationAttributeMapper; -import com.hnac.hzims.scheduled.service.IStationAttributeService; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 11:39 - */ -@Service -@Slf4j -@RequiredArgsConstructor -public class StationAttributeServiceImpl extends BaseServiceImpl implements IStationAttributeService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/StationServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/StationServiceImpl.java deleted file mode 100644 index 7490ba6..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/StationServiceImpl.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.hnac.hzims.scheduled.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.hnac.hzims.operational.station.entity.StationEntity; -import com.hnac.hzims.scheduled.mapper.operation.StationMapper; -import com.hnac.hzims.scheduled.service.IStationService; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.core.tool.utils.CollectionUtil; -import org.springblade.core.tool.utils.ObjectUtil; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 10:36 - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class StationServiceImpl extends BaseServiceImpl implements IStationService { - - @Override - public List getStationByType(Integer stationType, Integer serveType) { - return this.baseMapper.selectStationByType(stationType, serveType); - } - - @Override - public List getAll() { - return this.baseMapper.selectAll(); - } - - - @Override - public List getStationByInCode(List codes) { - return this.baseMapper.selectStationByInCode(codes); - } - - - - @Override - public List getStationType(Integer serveType, List typeList, List departIdList) { - return this.list(new LambdaQueryWrapper() {{ - eq(StationEntity::getIsDeleted, 0); - if (ObjectUtil.isNotEmpty(serveType)) { - eq(StationEntity::getServeType, serveType); - } - if (CollectionUtil.isNotEmpty(typeList)) { - in(StationEntity::getType, typeList); - } - if (CollectionUtil.isNotEmpty(departIdList)) { - in(StationEntity::getRefDept, departIdList); - } - }}); - } -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/WaterServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/WaterServiceImpl.java deleted file mode 100644 index 0218fe0..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/impl/WaterServiceImpl.java +++ /dev/null @@ -1,201 +0,0 @@ -package com.hnac.hzims.scheduled.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.hnac.hzims.EquipmentConstants; -import com.hnac.hzims.operational.main.constant.HomePageConstant; -import com.hnac.hzims.operational.main.vo.WaterLevelVo; -import com.hnac.hzims.operational.station.entity.HzimsAnalyzeModelStationEntity; -import com.hnac.hzims.operational.station.entity.StationEntity; -import com.hnac.hzims.scheduled.service.IHzimsAnalyzeModelStationService; -import com.hnac.hzims.scheduled.service.IStationService; -import com.hnac.hzims.scheduled.service.IWaterService; -import com.hnac.hzinfo.datasearch.analyse.IAnalyseDataSearchClient; -import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData; -import com.hnac.hzinfo.datasearch.analyse.po.AnalyseCodeByAnalyseDataPO; -import com.hnac.hzinfo.datasearch.analyse.po.AnalyzeDataConditionPO; -import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeCodeBySignagesVO; -import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeDataConditionVO; -import com.hnac.hzinfo.datasearch.real.po.RealDataSearchPO; -import com.hnac.hzinfo.sdk.analyse.po.MultiAnalyzeCodePO; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.CollectionUtil; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.tool.utils.StringUtil; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Service; - -import java.time.LocalDateTime; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/22 11:23 - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class WaterServiceImpl implements IWaterService { - - - private final IStationService stationService; - - - private final IHzimsAnalyzeModelStationService modelStationService; - - - - private final IAnalyseDataSearchClient analyseDataSearchClient; - - - - private final RedisTemplate redisTemplate; - - - - private final static String loadwater_level_key = "hzims:operation:loadwater:level:key"; - /** - * 水利-站点水位数据 - * @param param - */ - @Override - public void loadWaterLevel(String param) { - // 有效站点模型 - List modelList = getModelStationList(); - if(CollectionUtil.isEmpty(modelList)){ - return; - } - List list = new ArrayList<>(); - modelList.forEach(item -> { - List multiAnalyzeCodePOList = new ArrayList<>(); - MultiAnalyzeCodePO multiAnalyzeCodePO = new MultiAnalyzeCodePO(); - multiAnalyzeCodePO.setDeviceCode(item.getInstanceCode()); - multiAnalyzeCodePO.setSignages(Collections.singletonList(HomePageConstant.FRONT_WATER_LEVEL)); - multiAnalyzeCodePOList.add(multiAnalyzeCodePO); - R> result = analyseDataSearchClient.getAnalyzeCodeBySignages(multiAnalyzeCodePOList); - if(!result.isSuccess() || CollectionUtil.isEmpty(result.getData())){ - return; - } - WaterLevelVo waterLevelVo = new WaterLevelVo(); - waterLevelVo.setStationCode(item.getStationId()); - // 前水位 - double frontWaterLevel = this.getWaterLevel(item.getInstanceCode(),HomePageConstant.FRONT_WATER_LEVEL); - waterLevelVo.setFrontWaterLevel(frontWaterLevel); - // 后水位 - double rearWaterLevel = this.getWaterLevel(item.getInstanceCode(),HomePageConstant.REAR_WATER_LEVEL); - waterLevelVo.setRearWaterLevel(rearWaterLevel); - // 前水位当日曲线 - Map frontCurveMap = this.getWaterLevelMap(item.getInstanceCode(),HomePageConstant.FRONT_WATER_LEVEL); - waterLevelVo.setFrontCurveMap(frontCurveMap); - // 后水位当日曲线 - Map rearCurveMap = this.getWaterLevelMap(item.getInstanceCode(),HomePageConstant.REAR_WATER_LEVEL); - waterLevelVo.setRearCurveMap(rearCurveMap); - list.add(waterLevelVo); - }); - redisTemplate.opsForValue().set(loadwater_level_key,list); - } - - - /** - * 获取水位实时数据 - * @param instanceCode - * @param signage - * @return - */ - private double getWaterLevel(String instanceCode, String signage) { - RealDataSearchPO realData = new RealDataSearchPO(); - realData.setAnalyzeCode(instanceCode); - List signages = Collections.singletonList(signage); - realData.setSignages(signages); - // 调用fegin接口查询实时数据 - R> R = analyseDataSearchClient.getRealDataByAnalyzeCode(realData); - if(!R.isSuccess() || CollectionUtil.isEmpty(R.getData())){ - return 0.0; - } - // 时间限制 - String time = R.getData().get(0).getTime(); - if(StringUtil.isEmpty(time) || "-".equals(time)){ - return 0.0; - } - Date date = DateUtil.parse(time, "yyyy-MM-dd HH:mm:ss.sss"); - if(System.currentTimeMillis() - date.getTime() > 30 * 60 * 1000L){ - return 0.0; - } - return Double.parseDouble(R.getData().get(0).getValue()); - } - - - - /** - * 获取水位当年数据 - * @param instanceCode - * @param signage - * @return - */ - private Map getWaterLevelMap(String instanceCode, String signage) { - LocalDateTime beginTime = LocalDateTime.parse(DateUtil.format(new Date(), "yyyy-MM-dd 00:00:00"), DateUtil.DATETIME_FORMATTER); - LocalDateTime endTime = LocalDateTime.now(); - AnalyseCodeByAnalyseDataPO po = new AnalyseCodeByAnalyseDataPO(); - List signboardConditions = new ArrayList<>(); - AnalyzeDataConditionPO analyzeDataConditionPO = new AnalyzeDataConditionPO(); - analyzeDataConditionPO.setFull(1); - analyzeDataConditionPO.setSignages(signage); - // 取数规则: 0=(整点值/最早值)、1=最大值、2=最小值、3=平均值、4=（累计值/和值)、5=（变化值/差值） 6=最新值 - analyzeDataConditionPO.setAccessRules(EquipmentConstants.AccessRulesEnum.FINAL_CYCLE.getType()); - // 周期类型: 0-> s(秒) 1->、m(分)、2->h(小时)3->、d(天)4->、w(周)5->、n(自然月)、6->y(自然年) - analyzeDataConditionPO.setSaveTimeType(2); - // 间隔 - analyzeDataConditionPO.setTimeInterval(1); - analyzeDataConditionPO.setBeginTime(beginTime); - analyzeDataConditionPO.setEndTime(endTime); - signboardConditions.add(analyzeDataConditionPO); - po.setDeviceCode(instanceCode); - po.setSignboardConditions(signboardConditions); - R> R = analyseDataSearchClient.getAnalyzeDataByAnalyzeCodeAndSignages(po); - if(!R.isSuccess() || CollectionUtil.isEmpty(R.getData())){ - return null; - } - if(CollectionUtil.isEmpty(R.getData().get(0).getList())){ - return null; - } - return R.getData().get(0).getList().stream().collect(Collectors.toMap(key-> { - Date dateTime = DateUtil.parse(key.getTs(), "yyyy-MM-dd HH:mm:ss.s"); - return dateTime.getHours(); - }, value -> { - if(StringUtil.isBlank(value.getVal())){ - return "0"; - } - return value.getVal(); - })); - } - - /** - * 获取有效站点模型 - * @return - */ - private List getModelStationList() { - // 水利站点(All) - List stationList = stationService.getStationType(HomePageConstant.HYDROPOWER_SERVETYPE, null, null); - if(CollectionUtil.isEmpty(stationList)){ - return null; - } - // 站点code集合 - List codes = stationList.stream().map(StationEntity::getCode).collect(Collectors.toList()); - if(CollectionUtil.isEmpty(codes)){ - return null; - } - // 查询站点模型列表 - List list = modelStationService.list(new LambdaQueryWrapper() {{ - in(HzimsAnalyzeModelStationEntity::getStationId, codes); - }}); - if(CollectionUtil.isEmpty(list)){ - return null; - } - return list; - } -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/AbnormalAlarmService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/AbnormalAlarmService.java new file mode 100644 index 0000000..53997ff --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/AbnormalAlarmService.java @@ -0,0 +1,15 @@ +package com.hnac.hzims.scheduled.service.operation; + +import com.hnac.hzims.operational.alert.entity.AbnormalAlarmEntity; +import org.springblade.core.mp.base.BaseService; + +import java.util.List; + +/** + * 告警处理接口 + * @author ysj + */ +public interface AbnormalAlarmService extends BaseService { + + List abnormalAlarms(); +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/AnalyseDataService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/AnalyseDataService.java new file mode 100644 index 0000000..7f2fb5c --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/AnalyseDataService.java @@ -0,0 +1,22 @@ +package com.hnac.hzims.scheduled.service.operation; + +import com.hnac.hzinfo.datasearch.analyse.vo.AnalyseDataTaosVO; +import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeCodeBySignagesVO; +import com.hnac.hzinfo.sdk.analyse.po.MultiAnalyzeCodePO; + +import java.util.List; +import java.util.function.Function; + + +/** + * @author ysj + */ +public interface AnalyseDataService { + + List getAnalyzeCodeBySignages(Function convert, T resource); + + + List periodTargetData(String startTime, String endTime, Integer accessRules, Integer cycleType, String deviceCode, String signages); + + Float periodTargetFloat(String startTime, String endTime, Integer accessRules, Integer cycleType, String deviceCode, Integer ride ,String signages); +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/GenerateService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/GenerateService.java new file mode 100644 index 0000000..8f9e1b1 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/GenerateService.java @@ -0,0 +1,25 @@ +package com.hnac.hzims.scheduled.service.operation; + +import com.hnac.hzims.operational.fill.entity.GenerateEntity; +import com.hnac.hzims.operational.main.vo.GenerationPowerVo; +import com.hnac.hzims.operational.main.vo.PowerMonthVo; +import org.springblade.core.mp.base.BaseService; + +import java.util.List; + +/** + * @author ysj + * @date 2023/04/10 11:16:07 + * @version 4.0.0 + */ +public interface GenerateService extends BaseService { + + // 查询填报用电量 + Float generate(String date,String station); + + // 查询30天填报用电量 + List generate30Day(String day, String station); + + // 获取站点填报发电量 + List generateThreeYear(String start, String end, String station); +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/ModelStationService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/ModelStationService.java new file mode 100644 index 0000000..e8e4560 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/ModelStationService.java @@ -0,0 +1,12 @@ +package com.hnac.hzims.scheduled.service.operation; + + +import com.hnac.hzims.operational.station.entity.HzimsAnalyzeModelStationEntity; +import org.springblade.core.mp.base.BaseService; + +/** + * @author ysj + */ +public interface ModelStationService extends BaseService { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/MonitorService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/MonitorService.java new file mode 100644 index 0000000..087a7e5 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/MonitorService.java @@ -0,0 +1,16 @@ +package com.hnac.hzims.scheduled.service.operation; + +/** + * WEB水电站首页接口 + * @author ysj + */ +public interface MonitorService { + + // realId刷新 + void loadRealId(String param); + + // 集中监控数据处理 + void loadMonitoring(String param); + + void loadRealData(String param); +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/PowerService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/PowerService.java new file mode 100644 index 0000000..d6d3007 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/PowerService.java @@ -0,0 +1,17 @@ +package com.hnac.hzims.scheduled.service.operation; + +import com.hnac.hzims.operational.fill.entity.PowerEntity; +import com.hnac.hzims.operational.main.vo.PowerMonthVo; +import org.springblade.core.mp.base.BaseService; + +import java.util.List; + +/** + * @author ysj + */ +public interface PowerService extends BaseService { + + Double generate(String date,Long station); + + List generateThreeYear(String start,String end,Long station); +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/RealTargetService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/RealTargetService.java new file mode 100644 index 0000000..43afd9e --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/RealTargetService.java @@ -0,0 +1,34 @@ +package com.hnac.hzims.scheduled.service.operation; + +import java.util.List; + +/** + * WEB水电站首页接口 + * @author ysj + */ +public interface RealTargetService { + + // 水电站实时数据加载 + void loadHydropowerReal(String param); + + // 水电站指标数据加载 + void loadHydropowerTarget(String param); + + // 泵站实时数据加载 + void loadWaterPumpReal(String param); + + // 泵站指标数据加载 + void loadWaterPumpTarget(String param); + + // 站点水位指标数据 + void loadWaterLevel(String param); + + // 光伏站实时数据加载 + void loadPhotovoltaicReal(String param); + + // 光伏站指标数据加载 + void loadPhotovoltaicTarget(String param); + + // 光伏、水电站近3年发电量 + void loadPowerData(String param, List types, Integer serveType, int year); +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/RecordService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/RecordService.java new file mode 100644 index 0000000..00da41d --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/RecordService.java @@ -0,0 +1,13 @@ +package com.hnac.hzims.scheduled.service.operation; + + +import com.hnac.hzims.operational.config.entity.StAlarmRecordEntity; +import org.springblade.core.mp.base.BaseService; + +/** + * @author ysj + */ +public interface RecordService extends BaseService { + + Long insertAlert(String stationId, String monitorId); +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/StationAttrConfigService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/StationAttrConfigService.java new file mode 100644 index 0000000..47dce3f --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/StationAttrConfigService.java @@ -0,0 +1,14 @@ +package com.hnac.hzims.scheduled.service.operation; + +import com.hnac.hzims.operational.station.entity.StationAttrConfigEntity; +import org.springblade.core.mp.base.BaseService; + +import java.util.List; + +/** + * @author ysj + */ +public interface StationAttrConfigService extends BaseService { + + List getHideList(); +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/StationAttributeService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/StationAttributeService.java new file mode 100644 index 0000000..53479ba --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/StationAttributeService.java @@ -0,0 +1,14 @@ +package com.hnac.hzims.scheduled.service.operation; + +import com.hnac.hzims.operational.station.entity.StationAttributeEntity; +import org.springblade.core.mp.base.BaseService; + +import java.util.Map; + +/** + * @author hx + */ +public interface StationAttributeService extends BaseService { + + Map PointUnit(); +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/StationService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/StationService.java new file mode 100644 index 0000000..2757282 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/StationService.java @@ -0,0 +1,12 @@ +package com.hnac.hzims.scheduled.service.operation; + +import com.hnac.hzims.operational.station.entity.StationEntity; +import org.springblade.core.mp.base.BaseService; + +/** + * @author ysj + */ +public interface StationService extends BaseService { + + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/UseService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/UseService.java new file mode 100644 index 0000000..72dc927 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/UseService.java @@ -0,0 +1,29 @@ +package com.hnac.hzims.scheduled.service.operation; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.hnac.hzims.operational.fill.entity.UseEntity; +import com.hnac.hzims.operational.fill.vo.QueryVo; +import com.hnac.hzims.operational.fill.vo.UseVo; +import com.hnac.hzims.operational.main.vo.UsrPowerVo; +import org.springblade.core.mp.base.BaseService; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; + +import java.util.List; +import java.util.Map; + +/** + * @author ysj + * @date 2023/04/10 11:16:07 + * @version 4.0.0 + */ +public interface UseService extends BaseService { + + // 查询填报用电量 + Float use(String date,String station); + + // 查询30天填报用电量 + List use30Day(String day, String station); + + Map generateThreeYear(String start, String end, String station); +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/AbnormalAlarmServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/AbnormalAlarmServiceImpl.java new file mode 100644 index 0000000..fa8ef8a --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/AbnormalAlarmServiceImpl.java @@ -0,0 +1,33 @@ +package com.hnac.hzims.scheduled.service.operation.impl; + +import com.hnac.hzims.operational.alert.entity.AbnormalAlarmEntity; +import com.hnac.hzims.scheduled.mapper.operation.AbnormalAlarmMapper; +import com.hnac.hzims.scheduled.service.operation.AbnormalAlarmService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.utils.CollectionUtil; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * 告警实现类 + * @author ysj + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class AbnormalAlarmServiceImpl extends BaseServiceImpl implements AbnormalAlarmService { + + + @Override + public List abnormalAlarms() { + List alarmList = this.baseMapper.abnormalAlarms(); + if(CollectionUtil.isEmpty(alarmList)){ + return new ArrayList<>(); + } + return alarmList; + } +} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/AnalyseDataServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/AnalyseDataServiceImpl.java new file mode 100644 index 0000000..b469c8a --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/AnalyseDataServiceImpl.java @@ -0,0 +1,139 @@ +package com.hnac.hzims.scheduled.service.operation.impl; + +import com.google.common.collect.Lists; +import com.hnac.hzims.scheduled.service.operation.AnalyseDataService; +import com.hnac.hzinfo.datasearch.analyse.IAnalyseDataSearchClient; +import com.hnac.hzinfo.datasearch.analyse.po.AnalyseCodeByAnalyseDataPO; +import com.hnac.hzinfo.datasearch.analyse.po.AnalyzeDataConditionPO; +import com.hnac.hzinfo.datasearch.analyse.vo.AnalyseDataTaosVO; +import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeCodeBySignagesVO; +import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeDataConditionVO; +import com.hnac.hzinfo.sdk.analyse.po.MultiAnalyzeCodePO; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.CollectionUtil; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.ObjectUtil; +import org.springblade.core.tool.utils.StringUtil; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Optional; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * @author hx + */ +@Service +@AllArgsConstructor +@Slf4j +public class AnalyseDataServiceImpl implements AnalyseDataService { + + private final IAnalyseDataSearchClient analyseDataSearchClient; + + @Override + public List getAnalyzeCodeBySignages(Function convert, T resource) { + List result = Lists.newArrayList(); + List multiAnalyzeCodePOList = Lists.newArrayList(resource).stream().map(convert).collect(Collectors.toList()); + R> analyzeCodeBySignResult = analyseDataSearchClient.getAnalyzeCodeBySignages(multiAnalyzeCodePOList); + if(analyzeCodeBySignResult.isSuccess() && CollectionUtil.isNotEmpty(analyzeCodeBySignResult.getData())) { + result = analyzeCodeBySignResult.getData(); + } + return result; + } + + /*** + * 指标数据列表查询 + * @param startTime 开始时间 + * @param endTime 结束时间 + * @param accessRules 取数规则 : 0=最早值 1=最大值 2=最小值 3=平均值 4=和值 5=差值 6=最新值 + * @param cycleType 间隔周期 : 0-> 秒 1-> 分 2-> 小时 3->天 4-> 周 5-> 月 6-> 年 + * @param deviceCode 设备编号 + * @param signages 指标 + * @return + */ + @Override + public List periodTargetData(String startTime, String endTime, Integer accessRules, Integer cycleType, String deviceCode, String signages) { + AnalyseCodeByAnalyseDataPO po = new AnalyseCodeByAnalyseDataPO(); + List signboardConditions = new ArrayList<>(); + AnalyzeDataConditionPO analyzeDataConditionPO = new AnalyzeDataConditionPO(); + analyzeDataConditionPO.setFull(1); + po.setDeviceCode(deviceCode); + analyzeDataConditionPO.setSignages(signages); + analyzeDataConditionPO.setKeepFigures(2); + analyzeDataConditionPO.setAccessRules(accessRules); + analyzeDataConditionPO.setSaveTimeType(cycleType); + // 间隔 + analyzeDataConditionPO.setTimeInterval(1); + analyzeDataConditionPO.setBeginTime(LocalDateTime.parse(DateUtil.format(new Date(), startTime), DateTimeFormatter.ofPattern(DateUtil.PATTERN_DATETIME))); + analyzeDataConditionPO.setEndTime(LocalDateTime.parse(DateUtil.format(new Date(), endTime), DateTimeFormatter.ofPattern(DateUtil.PATTERN_DATETIME))); + signboardConditions.add(analyzeDataConditionPO); + po.setSignboardConditions(signboardConditions); + log.error("period_target_data_request {}",po); + R> result = analyseDataSearchClient.getAnalyzeDataByAnalyzeCodeAndSignages(po); + if (!result.isSuccess() || CollectionUtil.isEmpty(result.getData())) { + return new ArrayList<>(); + } + log.error("period_target_data_resp {}",result); + return result.getData().get(0).getList(); + } + + /*** + * 指标数据列表查询 + * @param startTime 开始时间 + * @param endTime 结束时间 + * @param accessRules 取数规则 : 0=最早值 1=最大值 2=最小值 3=平均值 4=和值 5=差值 6=最新值 + * @param cycleType 间隔周期 : 0-> 秒 1-> 分 2-> 小时 3->天 4-> 周 5-> 月 6-> 年 + * @param deviceCode 设备编号 + * @param ride 配电比 + * @param signages 指标 + * @return + */ + @Override + public Float periodTargetFloat(String startTime, String endTime, Integer accessRules, Integer cycleType, String deviceCode,Integer ride,String signages) { + AnalyseCodeByAnalyseDataPO po = new AnalyseCodeByAnalyseDataPO(); + List signboardConditions = new ArrayList<>(); + AnalyzeDataConditionPO analyzeDataConditionPO = new AnalyzeDataConditionPO(); + analyzeDataConditionPO.setFull(1); + po.setDeviceCode(deviceCode); + analyzeDataConditionPO.setSignages(signages); + analyzeDataConditionPO.setKeepFigures(2); + analyzeDataConditionPO.setAccessRules(accessRules); + analyzeDataConditionPO.setSaveTimeType(cycleType); + // 间隔 + analyzeDataConditionPO.setTimeInterval(1); + analyzeDataConditionPO.setBeginTime(LocalDateTime.parse(DateUtil.format(new Date(), startTime), DateTimeFormatter.ofPattern(DateUtil.PATTERN_DATETIME))); + analyzeDataConditionPO.setEndTime(LocalDateTime.parse(DateUtil.format(new Date(), endTime), DateTimeFormatter.ofPattern(DateUtil.PATTERN_DATETIME))); + signboardConditions.add(analyzeDataConditionPO); + po.setSignboardConditions(signboardConditions); + R> result = analyseDataSearchClient.getAnalyzeDataByAnalyzeCodeAndSignages(po); + if (!result.isSuccess() || CollectionUtil.isEmpty(result.getData())) { + return 0f; + } + List records = result.getData(); + if(CollectionUtil.isEmpty(records)){ + return 0f; + } + AnalyzeDataConditionVO analyzeDataConditionVO = records.get(0); + if (ObjectUtil.isEmpty(analyzeDataConditionVO)) { + return 0f; + } + List analyseDataTaosVOList = analyzeDataConditionVO.getList(); + if (CollectionUtil.isEmpty(analyseDataTaosVOList)) { + return 0f; + } + AnalyseDataTaosVO analyseDataTaosVO = analyzeDataConditionVO.getList().get(0); + if (ObjectUtil.isEmpty(analyseDataTaosVO) || StringUtil.isBlank(analyseDataTaosVO.getVal())) { + return 0f; + } + return Float.parseFloat(Optional.ofNullable(analyseDataTaosVO.getVal()).orElse("0")) * ride; + } + + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/GenerateServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/GenerateServiceImpl.java new file mode 100644 index 0000000..470f95e --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/GenerateServiceImpl.java @@ -0,0 +1,112 @@ +package com.hnac.hzims.scheduled.service.operation.impl; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hnac.hzims.operational.fill.entity.GenerateEntity; +import com.hnac.hzims.operational.main.vo.GenerationPowerVo; +import com.hnac.hzims.operational.main.vo.PowerMonthVo; +import com.hnac.hzims.scheduled.mapper.operation.GenerateMapper; +import com.hnac.hzims.scheduled.service.operation.GenerateService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.utils.CollectionUtil; +import org.springblade.core.tool.utils.DateUtil; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author ysj + * @date 2023/04/10 11:16:07 + * @version 4.0.0 + */ +@Slf4j +@Service +@AllArgsConstructor +public class GenerateServiceImpl extends BaseServiceImpl implements GenerateService { + + /** + * 根据时间、机构查询用电量 + * @param date 时间: 年 - yyyy/月 yyyy-mm/日 yyyy-mm-dd + * @param station 所属机构 + * @return + */ + @Override + public Float generate(String date, String station) { + List powers = this.list(Wrappers.lambdaQuery() + .likeRight(GenerateEntity::getFillDate,date) + .eq(GenerateEntity::getStationCode,station) + ); + if(CollectionUtil.isEmpty(powers)){ + return 0f; + } + return (float) powers.stream().mapToDouble(GenerateEntity::getGenerate).sum(); + } + + /** + * 查询30天填报用电量 + * @param day : 结束日期 yyyy-MM-dd + * @param station 站点编码 + * @return + */ + @Override + public List generate30Day(String day, String station) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtil.parse(day,DateUtil.PATTERN_DATE)); + String end = DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATE); + calendar.add(Calendar.DAY_OF_MONTH,-29); + String start = DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATE); + List records = this.list(Wrappers.lambdaQuery() + .between(GenerateEntity::getFillDate,start,end) + .eq(GenerateEntity::getStationCode,station) + ); + if(CollectionUtil.isEmpty(records)){ + return new ArrayList<>(); + } + return records.stream().map(record->{ + GenerationPowerVo generate = new GenerationPowerVo(); + generate.setDate(record.getFillDate()); + if(Math.abs(record.getGenerate()) <= 0){ + generate.setGenerate(0f); + }else{ + generate.setGenerate(Float.parseFloat(record.getGenerate().toString())); + } + return generate; + }).collect(Collectors.toList()); + } + + /** + * + * @param start 时间: 年 - yyyy/月 yyyy-mm/日 yyyy-mm-dd + * @param end 时间: 年 - yyyy/月 yyyy-mm/日 yyyy-mm-dd + * @param station 站点编码 + * @return + */ + @Override + public List generateThreeYear(String start, String end, String station) { + List records = this.list(Wrappers.lambdaQuery() + .eq(GenerateEntity::getStationCode,station) + .between(GenerateEntity::getFillDate,start,end) + ); + if(CollectionUtil.isEmpty(records)){ + return new ArrayList<>(); + } + // 返回结果 + return records.stream().peek( + record-> record.setFillDate(DateUtil.format(DateUtil.parse(record.getFillDate(),"yyyy-MM"),"yyyy-MM") + "-01") + ).collect(Collectors.toMap(GenerateEntity::getFillDate,GenerateEntity::getGenerate,Double::sum)). + entrySet().stream().map(entry->{ + PowerMonthVo mon = new PowerMonthVo(); + mon.setStrMonth(entry.getKey()); + if(Math.abs(entry.getValue()) <= 0){ + mon.setPower(0f); + }else{ + mon.setPower(Float.parseFloat(entry.getValue().toString())); + } + return mon; + }).collect(Collectors.toList()); + } +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/ModelStationServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/ModelStationServiceImpl.java new file mode 100644 index 0000000..946fdab --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/ModelStationServiceImpl.java @@ -0,0 +1,16 @@ +package com.hnac.hzims.scheduled.service.operation.impl; + + +import com.hnac.hzims.operational.station.entity.HzimsAnalyzeModelStationEntity; +import com.hnac.hzims.scheduled.mapper.operation.ModelStationMapper; +import com.hnac.hzims.scheduled.service.operation.ModelStationService; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * @author ysj + */ +@Service +public class ModelStationServiceImpl extends BaseServiceImpl implements ModelStationService { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/MonitorServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/MonitorServiceImpl.java new file mode 100644 index 0000000..06145f6 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/MonitorServiceImpl.java @@ -0,0 +1,744 @@ +package com.hnac.hzims.scheduled.service.operation.impl; + +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.google.common.collect.Lists; +import com.google.common.util.concurrent.ThreadFactoryBuilder; +import com.hnac.hzims.equipment.entity.WorkshopInfoEntity; +import com.hnac.hzims.equipment.vo.EminfoAndEmParamVo; +import com.hnac.hzims.fdp.vo.FdpFaultStatusVo; +import com.hnac.hzims.operational.config.entity.StAlarmRecordEntity; +import com.hnac.hzims.operational.config.enume.ConfigStatus; +import com.hnac.hzims.operational.config.vo.StationRealVo; +import com.hnac.hzims.operational.main.constant.HomePageConstant; +import com.hnac.hzims.operational.main.vo.RealAttributeVo; +import com.hnac.hzims.operational.main.vo.RealDeviceVo; +import com.hnac.hzims.operational.main.vo.RealStationVo; +import com.hnac.hzims.operational.station.entity.StationAttributeEntity; +import com.hnac.hzims.operational.station.entity.StationEntity; +import com.hnac.hzims.scheduled.service.equipment.WorkshopInfoService; +import com.hnac.hzims.scheduled.service.operation.*; +import com.hnac.hzinfo.datasearch.analyse.IAnalyseDataSearchClient; +import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeCodeBySignagesVO; +import com.hnac.hzinfo.sdk.analyse.po.MultiAnalyzeCodePO; +import com.hnac.hzinfo.sdk.v5.redis.RedisClient; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.MapUtils; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.*; +import org.springblade.system.entity.Dept; +import org.springblade.system.feign.ISysClient; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Service; + +import java.util.*; +import java.util.concurrent.*; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +/** + * 集中监控数据获取实现类 + * @author ysj + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class MonitorServiceImpl implements MonitorService { + + private final RecordService alertService; + private final StationService stationService; + private final StationAttributeService attbtService; + private final WorkshopInfoService workshopInfoService; + private final AbnormalAlarmService abnormalAlarmService; + private final StationAttrConfigService attrConfigService; + private final RedisTemplate redisTemplate; + private final ISysClient sysClient; + private final RedisClient redisClient; + private final IAnalyseDataSearchClient analyseDataSearchClient; + + @Value("${hzims.equipment.emInfo.emInfoList}") + public String device_cache_final; + + @Value("${hzims.operation.realIdKey}") + public String real_cache_final; + + @Value("${hzims.operation.realIdKeyGather}") + public String real_gather_cache_final; + + @Value("${hzims.operation.realIdKeyGather}") + public String real_data_cache_final; + + @Value("${hzims.equipment.fdp.redisData}") + public String fdp_fault_cache_final; + + @Value("${hzims.equipment.fdp.lessThan}") + public Double less_than_cache_final; + + @Value("${hzims.equipment.fdp.greaterThan}") + public Double greater_than_cache_final; + + @Value("${hzims.operation.monitor.realId}") + public String moniter_realId_cache_final; + + @Value("${hzims.operation.monitor.station}") + public String moniter_station_cache_final; + + @Value("${hzims.equipment.fdp.beEqualOrGreaterThan}") + public Double be_equa_cache_final; + + @Value("${hzims.operation.region.deviceClassifyKey}") + private String device_classify_cache_final; + + @Override + public void loadRealId(String param) { + // 所有站点 + List stationList = stationService.list(); + if(CollectionUtil.isEmpty(stationList)){ + return; + } + // 设备监测点list + Object json = redisTemplate.opsForValue().get(device_cache_final); + List eminfoAndEmParams = JSONObject.parseObject(json.toString(), new TypeReference>() {}); + // 厂房监测点list + List wsMonitorList = this.getRealIdByWsCodeAndSign(); + // 实时监控监测点list + List timeList = attbtService.list(new LambdaQueryWrapper() {{ + eq(StationAttributeEntity::getIsDeleted, "0"); + isNotNull(StationAttributeEntity::getMonitorId); + orderByAsc(StationAttributeEntity::getSort); + }}); + // 监测点存储list + List list = new ArrayList<>(); + stationList.forEach(station->{ + StationRealVo stationRealVo = new StationRealVo(); + stationRealVo.setStation(station.getCode()); + List realDeviceList = this.getRealDeviceList(station.getRefDept(),eminfoAndEmParams); + // 厂站匹配站点监测点集合 + List realWsList = wsMonitorList.stream().filter( + o -> Func.isNotEmpty(o.getStation()) && o.getStation().equals(station.getCode()) + ).map(AnalyzeCodeBySignagesVO::getRealId).collect(Collectors.toList()); + // 实时监控匹配站点监测点集合 + List realTimeList = timeList.stream().filter(o -> null != o.getStationId() && o.getStationId().equals(station.getCode())).map(StationAttributeEntity::getMonitorId).collect(Collectors.toList()); + if(CollectionUtil.isNotEmpty(realTimeList)){ + realDeviceList.addAll(realTimeList); + } + if(CollectionUtil.isNotEmpty(realWsList)) { + realDeviceList.addAll(realWsList); + } + if(CollectionUtil.isEmpty(realDeviceList)){ + return; + } + List realList = realDeviceList.stream().distinct().collect(Collectors.toList()); + String[] realArr = StringUtil.join(realList,",").split(","); + stationRealVo.setRealId(realArr); + list.add(stationRealVo); + }); + redisTemplate.opsForValue().set(moniter_realId_cache_final,list); + } + + @Override + public void loadRealData(String param) { + // 获取设备 + List devices = JSONObject.parseObject(redisTemplate.opsForValue().get(device_cache_final).toString(),new TypeReference>() {});; + // 设备开关机集合监测点 + List switchOnOff = devices.stream().map(o->{ + Map points = o.getPoint(); + if(CollectionUtil.isEmpty(points)){ + return ""; + } + String jointRelay = points.get(HomePageConstant.JOINT_RELAY); + if(!StringUtil.isEmpty(jointRelay)){ + return jointRelay; + } + String onOff = points.get(HomePageConstant.SWITCH_ON_OFF); + if(!StringUtil.isEmpty(onOff)){ + return onOff; + } + return ""; + }).collect(Collectors.toList()); + // 获取站点缓存数据 + List stationRealVos = (List) redisTemplate.opsForValue().get(moniter_realId_cache_final); + if(CollectionUtil.isEmpty(stationRealVos)){ + return; + } + // 数据切割 + int limit = countStep(stationRealVos.size()); + List> list = Stream.iterate(0, n -> n + 1).limit(limit).parallel().map(a -> stationRealVos.stream().skip((long) a * 5).limit(5).parallel().collect(Collectors.toList())).collect(Collectors.toList()); + ExecutorService pool = Executors.newFixedThreadPool(limit); + // + Map valueMap = new ConcurrentHashMap<>(); + // > + Map> keyMap = new ConcurrentHashMap<>(); + CountDownLatch countDownLatch = new CountDownLatch(limit); + pool.execute(()-> list.forEach(stations -> { + stations.forEach(stationReal -> { + String[] realIdArr = stationReal.getRealId(); + List realIds = Stream.of(realIdArr).collect(Collectors.toList()); + if(CollectionUtil.isEmpty(realIds)){ + return; + } + log.error("real_time_data: {},{}",stationReal.getStation(),realIds); + List objects = redisClient.getBatchRealDataByRealId(stationReal.getStation(),realIds); + for(int i = 0; i < realIds.size() ;i++){ + if(ObjectUtil.isEmpty(objects.get(i))){ + log.error(realIds.get(i) + "is null"); + }else{ + Map attribute = (Map) JSONObject.parse(objects.get(i)); + attribute.put("realId",attribute.get("k")); + attribute.put("value",attribute.get("v")); + attribute.put("time",attribute.get("t")); + attribute.remove("v"); + attribute.remove("k"); + attribute.remove("t"); + this.getCheckMap(attribute,switchOnOff); + valueMap.put(realIdArr[i],attribute.get("value")); + keyMap.put(realIdArr[i],attribute); + } + } + }); + countDownLatch.countDown(); + })); + // 等待所有线程执行完成 + try { + countDownLatch.await(); + } catch (InterruptedException e) { + e.printStackTrace(); + Thread.currentThread().interrupt(); + } + pool.shutdown(); + // redis 存储 + redisTemplate.opsForValue().set(real_cache_final,JSONObject.toJSONString(valueMap)); + redisTemplate.opsForValue().set(real_gather_cache_final,JSONObject.toJSONString(keyMap)); + } + + /** + * 计算切分次数 + */ + private static Integer countStep(Integer size) { + return (size + 5 - 1) / 5; + } + + /** + * 监测点过期数据检查 + * @param value + * @return + */ + private void getCheckMap(Map value,List switchOnOff){ + // 不处理开机状态监测点 + if(switchOnOff.contains(value.get("realId"))){ + return; + } + String time = value.get("time"); + if(StringUtil.isEmpty(time)){ + return; + } + Date date = DateUtil.parse(time,DateUtil.PATTERN_DATETIME); + // 实时数据超出10分钟未刷新，值置为 0 显示 + if(System.currentTimeMillis() - date.getTime() > 10 * 60 * 1000L){ + value.put("value","0"); + } + } + + /** + * 集中监控数据处理 + * @param param + */ + @Override + public void loadMonitoring(String param) { + Thread thread = Thread.currentThread(); + Object json = redisTemplate.opsForValue().get(real_data_cache_final); + if (ObjectUtil.isEmpty(json)) { + return; + } + Map> map = JSONObject.parseObject(json.toString(), new TypeReference>>() { + }); + if (MapUtils.isEmpty(map)) { + return; + } + // 获取所有设备重点属性 + List list = attbtService.list(new LambdaQueryWrapper() {{ + isNotNull(StationAttributeEntity::getStationId); + eq(StationAttributeEntity::getIsDeleted, "0"); + orderByAsc(StationAttributeEntity::getSort); + }}); + if (CollectionUtil.isEmpty(list)) { + return; + } + // 获取所有告警记录 + List alertList = alertService.list(new LambdaQueryWrapper() {{ + orderByDesc(StAlarmRecordEntity::getCreateTime); + }}); + List alarmList = abnormalAlarmService.abnormalAlarms(); + // 获取所有故障记录 + List faultList = this.getFdpFaultAll(); + // 所有设备分类 + Map> deviceClassifyMap = (Map>) redisTemplate.opsForValue().get(device_classify_cache_final); + // 所有设备 + List devices = JSONObject.parseObject(redisTemplate.opsForValue().get(device_cache_final).toString(),new TypeReference>() {}); + // 根据站点分组 + Map> stationAttbtMap = list.stream().collect(Collectors.groupingBy(StationAttributeEntity::getStationId)); + // 获取站点列表 + List stationEntityList = stationService.list(Wrappers.lambdaQuery() + .in(StationEntity::getCode,new ArrayList<>(stationAttbtMap.keySet()))); + // 隐藏设备列表 + List hideList = attrConfigService.getHideList(); + // 分割,每个map限制10个长度 + List>> handleList = this.mapChunk(stationAttbtMap); + // 创建线程池 + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder().setNameFormat("load-monitoring-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(5, 5, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + CountDownLatch countDownLatch = new CountDownLatch(handleList.size()); + // 所有机构 + R> deptAll = sysClient.getDeptList(); + // 存储数据节点 + List stationList = new CopyOnWriteArrayList<>(); + pool.execute(()->{ + // 线程处理数据 + for(Map> item : handleList){ + item.forEach((key,value)->{ + RealStationVo station = new RealStationVo(); + // 站点编码 + station.setStationCode(key); + // 设置站点状态 + this.setStationStatus(alarmList,station,key); + // 名称、限制水位、服务类型、机构、排序 + this.stationParam(stationEntityList,station,deptAll.getData()); + // 根据设备名称分组 + Map> deviceAttbtMap = value.stream().filter(o -> !hideList.contains(o.getEmName())).collect(Collectors.groupingBy(StationAttributeEntity::getEmName)); + List deviceList = new ArrayList<>(); + // device - 设备,arrbt - 设备重点属性 + deviceAttbtMap.forEach((device, attbt) -> { + RealDeviceVo deviceVo = new RealDeviceVo(); + // 设备名称 + deviceVo.setDeviceName(device); + deviceVo.setDeviceCode(attbt.get(0).getEmCode()); + // 设备处理 + this.handleDevice(attbt, map, deviceVo, alertList, faultList); + deviceList.add(deviceVo); + }); + // 设备状态 + this.getDeviceParam(devices, deviceClassifyMap, deviceList); + station.setDeviceList(deviceList.stream().sorted(Comparator.comparing((RealDeviceVo::getDeviceName))).collect(Collectors.toList())); + stationList.add(station); + }); + countDownLatch.countDown(); + } + }); + // 等待所有线程执行完成 + try { + countDownLatch.await(); + } catch (InterruptedException e) { + e.printStackTrace(); + Thread.currentThread().interrupt(); + } + pool.shutdown(); + redisTemplate.opsForValue().set(moniter_station_cache_final, stationList); + } + + /** + * 设备处理 + * + * @param list + * @param map + * @param device + */ + private void handleDevice(List list, Map> map, + RealDeviceVo device, List alertList, + List faultList) { + if (CollectionUtil.isEmpty(list) || MapUtils.isEmpty(map)) { + return; + } + List attbtList = new ArrayList<>(); + list.forEach(item -> { + RealAttributeVo realAttributeVo = new RealAttributeVo(); + // 设备重点属性处理 : 单条-item + Map real = map.get(item.getMonitorId()); + if(MapUtils.isEmpty(real)){ + realAttributeVo.setName(item.getAttributes()); + realAttributeVo.setType(item.getAttributeType()); + realAttributeVo.setRealId(item.getMonitorId()); + realAttributeVo.setQuality(-1); + realAttributeVo.setStatus(0); + realAttributeVo.setValue("0"); + realAttributeVo.setUnit(item.getUnit()); + attbtList.add(realAttributeVo); + return; + } + realAttributeVo = handleAttbt(item, real, alertList, faultList); + if (ObjectUtil.isEmpty(realAttributeVo)) { + return; + } + attbtList.add(realAttributeVo); + }); + device.setAttbtList(attbtList); + } + + /** + * 获取站点属性 + * @param stationEntityList + * @param item + */ + private void stationParam(List stationEntityList, RealStationVo item,List deptAll) { + if(CollectionUtil.isEmpty(stationEntityList)){ + return; + } + List filterList = stationEntityList.stream().filter(o->item.getStationCode().equals(o.getCode())).collect(Collectors.toList()); + if(CollectionUtil.isEmpty(filterList)){ + return; + } + StationEntity station = filterList.get(0); + if(ObjectUtil.isEmpty(station)){ + return; + } + item.setStationName(station.getName()); + item.setWaterLevelMax(station.getLimitWaterLevel()); + item.setServerType(station.getServeType()); + item.setStationDeptId(station.getRefDept()); + // 排序 + List list = deptAll.stream().filter(o-> station.getRefDept().equals(o.getId())).collect(Collectors.toList()); + if(CollectionUtil.isEmpty(list)){ + return; + } + item.setSort(list.get(0).getSort()); + } + + /** + * 设备参数设置 + * + * @param devices + * @param deviceClassifyMap + * @param deviceList + */ + private void getDeviceParam(List devices, Map> deviceClassifyMap, List deviceList) { + if (CollectionUtil.isEmpty(devices) || CollectionUtil.isEmpty(deviceList) || MapUtils.isEmpty(deviceClassifyMap)) { + return; + } + List faultList = deviceClassifyMap.get(HomePageConstant.FAULT); + List maintaintList = deviceClassifyMap.get(HomePageConstant.MAINTAIN); + List overhaultList = deviceClassifyMap.get(HomePageConstant.OVERHAUL); + List runtList = deviceClassifyMap.get(HomePageConstant.RUN); + List sparetList = deviceClassifyMap.get(HomePageConstant.SPARE); + deviceList.forEach(device -> { + if (StringUtil.isBlank(device.getDeviceCode())) { + device.setState(-1); + return; + } + List list = devices.stream().filter(o -> null != o.getId() && o.getId().toString().equals(device.getDeviceCode())).collect(Collectors.toList()); + if (CollectionUtil.isEmpty(list)) { + device.setState(-1); + return; + } + String deviceCode = list.get(0).getEmCode(); + if (StringUtil.isBlank(deviceCode)) { + device.setState(-1); + return; + } + // 故障 + if (CollectionUtil.isNotEmpty(faultList) && faultList.contains(deviceCode)) { + device.setState(4); + // 保养 + } else if (CollectionUtil.isNotEmpty(maintaintList) && maintaintList.contains(deviceCode)) { + device.setState(3); + // 备用 + } else if (CollectionUtil.isNotEmpty(sparetList) && sparetList.contains(deviceCode)) { + device.setState(2); + // 运行 + } else if (CollectionUtil.isNotEmpty(runtList) && runtList.contains(deviceCode)) { + device.setState(1); + // 检修 + } else if (CollectionUtil.isNotEmpty(overhaultList) && overhaultList.contains(deviceCode)) { + device.setState(0); + // 未知 + } else { + device.setState(-1); + } + }); + } + + /** + * 设备单条重点属性处理 + * + * @param item + * @param real + * @return + */ + private RealAttributeVo handleAttbt(StationAttributeEntity item, Map real, + List alertList, List faultList) { + RealAttributeVo attest = new RealAttributeVo(); + this.setAttbtParam(attest, real); + attest.setRealId(item.getMonitorId()); + attest.setName(item.getAttributes()); + attest.setUnit(item.getUnit()); + attest.setType(item.getAttributeType()); + String value = Optional.ofNullable(attest.getValue()).orElse("-"); + // 正常状态 + attest.setStatus(ConfigStatus.ConfigStatusEnum.NORMAL.getStatus()); + int quality = Optional.ofNullable(attest.getQuality()).orElse(-1); + String time = Optional.ofNullable(attest.getTime()).orElse(""); + // 延时状态 ：质量为空 && 时间为空 + if (-1 == quality && StringUtil.isEmpty(time)) { + attest.setStatus(ConfigStatus.ConfigStatusEnum.GRAY.getStatus()); + } + int type = item.getAttributeType(); + switch (type) { + case 1://遥测 + // 预警状态 ：value值为"1" && quality值为0 + if ("1".equals(value) && 0 == quality) { + attest.setStatus(ConfigStatus.ConfigStatusEnum.RED.getStatus()); + } + break; + case 2://遥信 + signalyRemote(item, attest, quality, value, alertList); + //处理 + break; + default: + throw new IllegalStateException("Unexpected type: " + type); + } + // 故障信息设置 + accidentDetails(attest, faultList, value); + return attest; + } + + /** + * 设置重点属性参数 + * + * @param attest + * @param real + */ + private void setAttbtParam(RealAttributeVo attest, Map real) { + if (CollectionUtil.isEmpty(real)) { + return; + } + real.forEach((key, value) -> { + if (StringUtil.isBlank(value)) { + return; + } + switch (key) { + case "q": + attest.setQuality(Integer.parseInt(value)); + break; + case "realId": + attest.setRealId(value); + break; + case "value": + attest.setValue(Optional.ofNullable(value).orElse("-")); + break; + case "time": + attest.setTime(value); + break; + default: + break; + } + }); + } + + /** + * 故障信息设置 + * + * @param attest + * @param faultList + * @param value + */ + private void accidentDetails(RealAttributeVo attest, List faultList, String value) { + if (CollectionUtil.isEmpty(faultList) || "-".equals(value)) { + return; + } + List fault = faultList.stream().filter(o -> o.getRealId().equals(attest.getRealId())).collect(Collectors.toList()); + if (CollectionUtil.isEmpty(fault)) { + return; + } + FdpFaultStatusVo fdpFaultStatusVo = fault.get(0); + // 黄色 + if (fdpFaultStatusVo.getValue() > greater_than_cache_final && fdpFaultStatusVo.getValue() < less_than_cache_final) { + attest.setStatus(ConfigStatus.ConfigStatusEnum.YELLOW.getStatus()); + // 橙色 + } else if (fdpFaultStatusVo.getValue() >= be_equa_cache_final) { + attest.setStatus(ConfigStatus.ConfigStatusEnum.ORANGE.getStatus()); + } + attest.setFdpRate(fdpFaultStatusVo.getValue()); + attest.setFdpFaultId(fdpFaultStatusVo.getFaultId()); + attest.setFdpMonitorId(fdpFaultStatusVo.getMonitorId()); + } + + /** + * 重点属性类型-遥信 ：数据逻辑处理 + * + * @param attest + */ + private void signalyRemote(StationAttributeEntity item, RealAttributeVo attest, int quality, String strValue, List alertList) { + //需要所有值的数据不为null，并且满足条件才会进去添加数据返回id + if (null == item.getUpUpLimit() || null == item.getDownDownLimit() || null == item.getUpLimit() || null == item.getDownLimit()) { + return; + } + if (-1 == quality) { + return; + } + if (quality != 0) { + return; + } + if ("-".equals(strValue)) { + return; + } + double upup = item.getUpUpLimit(); + double lwlw = item.getDownDownLimit(); + double up = item.getUpLimit(); + double lw = item.getDownLimit(); + //查询出来已处理告警记录 + List handleList = alertList.stream().filter(o -> o.getStationId().equals(item.getStationId()) && o.getRealId().equals(attest.getRealId()) && o.getStatus() == 1).collect(Collectors.toList()); + //查询出来未处理告警记录 + List recordList = alertList.stream().filter(o -> o.getStationId().equals(item.getStationId()) && o.getRealId().equals(attest.getRealId()) && o.getStatus() == 0).collect(Collectors.toList()); + long past = 0L; + double value = Double.parseDouble(strValue); + if (value > upup || value < lwlw) { + if (CollectionUtil.isNotEmpty(handleList)) { + // 现在时间 - 处理时间 + past = System.currentTimeMillis() - handleList.get(0).getProcessTime().getTime(); + } + boolean isOverrun = ((CollectionUtil.isEmpty(handleList) && CollectionUtil.isEmpty(recordList)) || (past / 1000 / 60 > 30 && CollectionUtil.isEmpty(recordList))); + if (isOverrun) { + Long alertId = alertService.insertAlert(item.getStationId(), item.getMonitorId()); + attest.setId(alertId); + attest.setStatus(ConfigStatus.ConfigStatusEnum.YELLOW.getStatus()); + } else if (CollectionUtil.isNotEmpty(recordList)) { + StAlarmRecordEntity record = recordList.get(0); + attest.setId(record.getId()); + // 告警处理完成 + if (record.getProcessTime() != null && record.getStatus() == (byte) 1) { + attest.setStatus(ConfigStatus.ConfigStatusEnum.NORMAL.getStatus()); + // 告警未处理 + } else if (record.getProcessTime() == null && record.getStatus() == (byte) 0) { + attest.setStatus(ConfigStatus.ConfigStatusEnum.HAND_DELAY_STATUS.getStatus()); + } + } + } else if (value > up && value < upup || value < lw && value > lwlw) { + if (CollectionUtil.isNotEmpty(handleList)) { + // 现在时间 - 处理时间 + past = System.currentTimeMillis() - handleList.get(0).getProcessTime().getTime(); + } + boolean exist = ((CollectionUtil.isEmpty(handleList) && CollectionUtil.isEmpty(recordList)) || (past / 1000 / 60 > 30 && CollectionUtil.isEmpty(recordList))); + if (exist){ + Long alertId = alertService.insertAlert(item.getStationId(), item.getMonitorId()); + attest.setId(alertId); + attest.setStatus(ConfigStatus.ConfigStatusEnum.YELLOW.getStatus()); + // 存在告警记录 + } else if (CollectionUtil.isNotEmpty(recordList)) { + StAlarmRecordEntity record = recordList.get(0); + if (recordList.get(0).getStatus() == (byte) 0 && recordList.get(0).getCreateTime() != null) { + attest.setId(record.getId()); + attest.setStatus(ConfigStatus.ConfigStatusEnum.RED.getStatus()); + } else { + attest.setId(recordList.get(0).getId()); + attest.setStatus(ConfigStatus.ConfigStatusEnum.NORMAL.getStatus()); + } + } + } + } + + /** + * 设置站点状态 + * @param alarmList + * @param station + * @param key + */ + private void setStationStatus(List alarmList, RealStationVo station, String key) { + station.setStatus(0); + if(alarmList.contains(key)){ + station.setStatus(1); + } + } + + /** + * 获取所有告警记录 + * + * @return + */ + private List getFdpFaultAll() { + Object json = redisTemplate.opsForValue().get(fdp_fault_cache_final); + if (ObjectUtil.isEmpty(json)) { + return new ArrayList<>(); + } + return (List) json; + } + + /** + * map分割 + * + * @param + * @param + * @param chunkMap + * @return + */ + private List> mapChunk(Map chunkMap) { + if (chunkMap == null) { + return Lists.newArrayList(); + } + Set keySet = chunkMap.keySet(); + Iterator iterator = keySet.iterator(); + int i = 1; + List> total = new ArrayList<>(); + Map tem = new HashMap<>(); + while (iterator.hasNext()) { + k next = iterator.next(); + tem.put(next, chunkMap.get(next)); + if (i == 5) { + total.add(tem); + tem = new HashMap<>(); + i = 0; + } + i++; + } + if (!CollectionUtil.isEmpty(tem)) { + total.add(tem); + } + return total; + } + + /** + * 获取厂房监测点 + * @return + */ + private List getRealIdByWsCodeAndSign() { + List wsInfoList = workshopInfoService.list(); + if(CollectionUtil.isEmpty(wsInfoList)) { + return Lists.newArrayList(); + } + Function getAnalyzeCodePO = wsCode -> { + MultiAnalyzeCodePO multiAnalyzeCodePO = new MultiAnalyzeCodePO(); + multiAnalyzeCodePO.setDeviceCode(wsCode); + multiAnalyzeCodePO.setSignages(Lists.newArrayList(HomePageConstant.PV_JOINT_RELAY,HomePageConstant.PV_REACTIVE_POWER,HomePageConstant.PV_GENERATION_CAPACITY)); + return multiAnalyzeCodePO; + }; + List analyzeCodePOList = wsInfoList.stream().map(WorkshopInfoEntity::getNumber).map(getAnalyzeCodePO).collect(Collectors.toList()); + R> analyzeCodeBySignages = analyseDataSearchClient.getAnalyzeCodeBySignages(analyzeCodePOList); + return Optional.ofNullable(analyzeCodeBySignages).filter(r -> r.isSuccess()).map(R::getData).orElse(Lists.newArrayList()); + } + + /** + * 获取站点realId + * @param refDept + * @param eminfoAndEmParams + * @return + */ + private List getRealDeviceList(Long refDept, List eminfoAndEmParams) { + // 参数检查 + if(CollectionUtil.isEmpty(eminfoAndEmParams) || ObjectUtil.isEmpty(refDept)){ + return new ArrayList<>(); + } + // 有效设备 + List filters = eminfoAndEmParams.stream().filter(o-> o.getCreateDept().equals(refDept)).collect(Collectors.toList()); + if(CollectionUtil.isEmpty(filters)){ + return new ArrayList<>(); + } + // 遍历设备 + List result = new ArrayList<>(); + for(EminfoAndEmParamVo device : filters){ + result.addAll(device.getPoint().values()); + } + return result; + } +} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/PowerServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/PowerServiceImpl.java new file mode 100644 index 0000000..265a8b7 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/PowerServiceImpl.java @@ -0,0 +1,77 @@ +package com.hnac.hzims.scheduled.service.operation.impl; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hnac.hzims.operational.fill.entity.PowerEntity; +import com.hnac.hzims.operational.main.vo.PowerMonthVo; +import com.hnac.hzims.scheduled.mapper.operation.PowerMapper; +import com.hnac.hzims.scheduled.service.operation.PowerService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.utils.CollectionUtil; +import org.springblade.core.tool.utils.DateUtil; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + + +@Slf4j +@Service +@AllArgsConstructor +public class PowerServiceImpl extends BaseServiceImpl implements PowerService { + + + /** + * 根据时间、机构查询发电量 + * @param date 时间: 年 - yyyy/月 yyyy-mm/日 yyyy-mm-dd + * @param station 所属机构 + * @return + */ + @Override + public Double generate(String date, Long station) { + List powers = this.list(Wrappers.lambdaQuery() + .likeRight(PowerEntity::getMon,date) + .eq(PowerEntity::getCreateDept,station) + // 类型: 光伏 + .eq(PowerEntity::getType,1) + ); + if(CollectionUtil.isEmpty(powers)){ + return 0.0; + } + return powers.stream().mapToDouble(PowerEntity::getPowerMon).sum(); + } + + /** + * + * @param start 开始时间 : yyyy-mm + * @param end 结束时间 : yyyy-mm + * @param station 所属机构 + * @return + */ + @Override + public List generateThreeYear(String start, String end, Long station) { + List fills = this.list(Wrappers.lambdaQuery() + .between(PowerEntity::getMon,start,end) + .eq(PowerEntity::getCreateDept,station) + // 类型: 光伏 + .eq(PowerEntity::getType,1) + ); + if(CollectionUtil.isEmpty(fills)){ + return new ArrayList<>(); + + } + return fills.stream().map(fill->{ + PowerMonthVo mon = new PowerMonthVo(); + mon.setStrMonth(DateUtil.format(DateUtil.parse(fill.getMon(),"yyyy-MM"),DateUtil.PATTERN_DATE)); + if(Math.abs(fill.getPowerMon()) <= 0){ + mon.setPower(0f); + }else{ + mon.setPower(Float.parseFloat(fill.getPowerMon().toString())); + } + return mon; + }).collect(Collectors.toList()); + } + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/RealTargetServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/RealTargetServiceImpl.java new file mode 100644 index 0000000..eacda88 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/RealTargetServiceImpl.java @@ -0,0 +1,1512 @@ +package com.hnac.hzims.scheduled.service.operation.impl; + +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hnac.hzims.EquipmentConstants; +import com.hnac.hzims.equipment.vo.EminfoAndEmParamVo; +import com.hnac.hzims.operational.main.constant.HomePageConstant; +import com.hnac.hzims.operational.main.vo.*; +import com.hnac.hzims.operational.station.StationConstants; +import com.hnac.hzims.operational.station.entity.HzimsAnalyzeModelStationEntity; +import com.hnac.hzims.operational.station.entity.StationEntity; +import com.hnac.hzims.scheduled.service.operation.*; +import com.hnac.hzinfo.datasearch.PointData; +import com.hnac.hzinfo.datasearch.analyse.IAnalyseDataSearchClient; +import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData; +import com.hnac.hzinfo.datasearch.analyse.po.AnalyseCodeByAnalyseDataPO; +import com.hnac.hzinfo.datasearch.analyse.vo.AnalyseDataTaosVO; +import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeCodeBySignagesVO; +import com.hnac.hzinfo.datasearch.history.IHistoryDataSearchClient; +import com.hnac.hzinfo.datasearch.history.OriginalDataQuery; +import com.hnac.hzinfo.datasearch.real.po.RealDataSearchPO; +import com.hnac.hzinfo.sdk.analyse.po.MultiAnalyzeCodePO; +import com.hnac.hzinfo.sdk.core.response.HzPage; +import com.hnac.hzinfo.sdk.core.response.Result; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.MapUtils; +import org.springblade.core.log.exception.ServiceException; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.CollectionUtil; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.ObjectUtil; +import org.springblade.core.tool.utils.StringUtil; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.*; +import java.util.stream.Collectors; + +/** + * APP首页实现类 + * @author ysj + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class RealTargetServiceImpl implements RealTargetService { + + private final UseService useService; + + private final PowerService powerService; + + private final StationService stationService; + + private final GenerateService generateService; + + private final AnalyseDataService analyseDataService; + + private final StationAttributeService attributeService; + + private final ModelStationService modelStationService; + + private final RedisTemplate redisTemplate; + + private final IAnalyseDataSearchClient analyseDataSearchClient; + + private final IHistoryDataSearchClient historyDataSearchClient; + + @Value("${hzims.equipment.emInfo.emInfoList}") + public String device_cache_cofig_final; + + @Value("${hzims.operation.realIdKey}") + public String real_id_cofig_final; + + private final static String recent_year_power_data = "hzims:operation:key:power:data"; + private final static String load_hydropower_unit_real_key = "hzims:operation:loadhydropowerunit:real:key"; + private final static String load_hydropower_unit_target_key = "hzims:operation:loadhydropowerunit:target:key"; + private final static String loadwaterpump_target_key = "hzims:operation:loadwaterpump:target:key"; + private final static String loadwaterpump_real_key = "hzims:operation:loadwaterpump:real:key"; + private final static String loadwater_level_key = "hzims:operation:loadwater:level:key"; + private final static String loadwater_group_key = "hzims:operation:group:key"; + private final static String load_photovoltaic_real_key = "hzims:operation:photovoltaic:real:key"; + private final static String load_photovoltaic_target_key = "hzims:operation:photovoltaic:target:key"; + + + + /** + * 加载水电站机组实时数据 + * @param param + */ + @Override + public void loadHydropowerReal(String param) { + // 水电站站点 + List stations = stationService.list(Wrappers.lambdaQuery() + .eq(StationEntity::getType,HomePageConstant.HYDROPOWER) + ); + if(CollectionUtil.isEmpty(stations)){ + return; + } + // 水电站设备 + List devices = this.pumpDevices(stations.stream().map(StationEntity::getRefDept).collect(Collectors.toList())); + if(CollectionUtil.isEmpty(devices)){ + return; + } + // 实时数据 + Map map = this.getRealMap(); + // 单位 + Map unitMap = this.attributeService.PointUnit(); + // 实时数据 + List reals = devices.stream().map(device->{ + HydropowerUnitRealVo real = new HydropowerUnitRealVo(); + real.setDeptId(device.getCreateDept()); + real.setDeviceCode(device.getEmCode()); + real.setDeptName(device.getName()); + real.setDeviceName(device.getName()); + // 装机容量 + real.setInstalledCapacity(device.getInstalledCapacity()); + // 开关机状态 + real.setState(this.state(device,map)); + // 有功功率 + real.setActivePower(this.getSignageValue(device,map,HomePageConstant.HYDROPOWER_ACTIVE_POWER)); + // 无功功率 + real.setReactivePower(this.getSignageValue(device,map,HomePageConstant.HYDROPOWER_REACTIVE_POWER)); + // 功率因数 + real.setPowerFactor(this.getSignageValue(device,map,HomePageConstant.HYDROPOWER_POWERFACTOR)); + // 机组频率 + real.setFrequency(this.getSignageValue(device,map,HomePageConstant.HYDROPOWER_FREQUENCY)); + // 导叶开度 + real.setGuideOpen(this.getSignageValue(device,map,HomePageConstant.HYDROPOWER_GUIDEOPEN)); + // 定子电压 + real.setStatorVoltage(this.getSignageValue(device,map,HomePageConstant.HYDROPOWER_VOLTAGE)); + // 定子电流 + real.setStatorCurrent(this.getSignageValue(device,map,HomePageConstant.HYDROPOWER_CURRENT)); + // 单位设置 + this.setttingUnit(device,unitMap,real); + return real; + }).collect(Collectors.toList()); + if(CollectionUtil.isEmpty(reals)){ + return; + } + redisTemplate.opsForValue().set(load_hydropower_unit_real_key,reals); + } + + /** + * 加载水电站机组指标数据 + * @param param + */ + @Override + public void loadHydropowerTarget(String param) { + // 水电站站点 + List stations = stationService.list(Wrappers.lambdaQuery() + //.eq(StationEntity::getServeType,HomePageConstant.HYDROPOWER_SERVETYPE) + .eq(StationEntity::getType,HomePageConstant.HYDROPOWER) + ); + if(CollectionUtil.isEmpty(stations)){ + return; + } + // 补充填补发电指标 + List targets = this.generteFill(stations); + // 水电站设备 + List devices = this.pumpDevices(stations.stream().map(StationEntity::getRefDept).collect(Collectors.toList())); + if(CollectionUtil.isNotEmpty(devices)){ + targets.addAll(devices.stream().map(device->{ + HydropowerUnitTargetVo target = new HydropowerUnitTargetVo(); + target.setDeptId(device.getCreateDept()); + target.setDeviceCode(device.getEmCode()); + target.setDeviceName(device.getName()); + target.setDeptName(device.getName()); + // 当年发电量 + target.setPowerYear(this.getGenerationPower(device,0)); + // 当月发电量 + target.setPowerMon(this.getGenerationPower(device,1)); + // 当日发电量 + target.setPowerDay(this.getGenerationPower(device,2)); + // 当天有功功率 + target.setActivePowerVoList(this.getLoadsByDay(device)); + // 30天发电量 + target.setGenerationPowerVoList(this.getGenerationPowerList(device)); + return target; + }).collect(Collectors.toList())); + } + // 站点指标数据为空 + if(CollectionUtil.isEmpty(targets)){ + return; + } + redisTemplate.opsForValue().set(load_hydropower_unit_target_key,targets); + } + + /** + * 水利-泵组实时加载 + * @param param + */ + @Override + public void loadWaterPumpReal(String param) { + // 水利站点 + List stations = stationService.list(Wrappers.lambdaQuery() + .eq(StationEntity::getServeType,HomePageConstant.HYDROPOWER_SERVETYPE) + .in(StationEntity::getType,HomePageConstant.waterList) + ); + if(CollectionUtil.isEmpty(stations)){ + return; + } + // 泵站设备 + List devices = this.pumpDevices(stations.stream().map(StationEntity::getRefDept).collect(Collectors.toList())); + if(CollectionUtil.isEmpty(devices)){ + return; + } + // 实时数据 + Map map = this.getRealMap(); + List list = devices.stream().map(device->{ + WaterPumpRealVo real = new WaterPumpRealVo(); + real.setDeptId(device.getCreateDept()); + real.setDeviceCode(device.getEmCode()); + real.setDeptName(device.getName()); + // 装机容量 + real.setInstalledCapacity(device.getInstalledCapacity()); + // 开机状态 + real.setState(this.pumpState(device,map)); + // 功率因数 + real.setPowerFactor(this.getSignageValue(device,map,HomePageConstant.POWER_FACTOR)); + // 有功功率 + real.setActivePower(this.floatValue(device,map,HomePageConstant.ACTIVE_POWER)); + // 无功功率 + real.setReactivePower(this.floatValue(device,map,HomePageConstant.REACTIVE_POWER)); + // 电压 + real.setVoltage(this.getSignageValue(device,map,HomePageConstant.VOLTAGE)); + // 电流 + real.setCurrent(this.getSignageValue(device,map,HomePageConstant.CURRENT)); + return real; + }).collect(Collectors.toList()); + redisTemplate.opsForValue().set(loadwaterpump_real_key,list); + } + + /** + * 水利-泵组指标加载 + * @param param + */ + @Override + public void loadWaterPumpTarget(String param) { + // 水利站点 + List stations = stationService.list(Wrappers.lambdaQuery() + .eq(StationEntity::getServeType,HomePageConstant.HYDROPOWER_SERVETYPE) + .in(StationEntity::getType,HomePageConstant.waterList) + ); + if(CollectionUtil.isEmpty(stations)){ + return; + } + // 泵站设备 + List devices = this.pumpDevices(stations.stream().map(StationEntity::getRefDept).collect(Collectors.toList())); + // 补充站点填报发电量 + List list = this.useFill(stations); + // 站点设备数据统计 + if(CollectionUtil.isNotEmpty(devices)){ + list.addAll(devices.stream().map(device->{ + WaterPumpTargetVo target = new WaterPumpTargetVo(); + target.setDeptId(device.getCreateDept()); + target.setDeviceCode(device.getEmCode()); + target.setDeptName(device.getName()); + // 当年用电量 + target.setUsrPowerYear(this.getUsrPowerYear(device)); + // 当月用电量 + target.setUsrPowerMon(this.getUsrPowerMon(device)); + // 当日用电量 + target.setUsrPowerDay(this.getUsrPowerDay(device)); + // 当日机组有功功率 + target.setActivePowerVoList(this.getActivePowerVoList(device)); + // 近30天用电量 + target.setUsrPowerVoList(this.getUsrPowerVoList(device)); + // 近3年用电量 + target.setUsrYearMap(this.getUsrYearMap(device)); + // 月运行次数、时长 + WaterRunVo runMon = this.getRunData(device,1); + target.setRunCountMon(runMon.getCount()); + target.setRunDurationMon(runMon.getHour()); + // 年运行次数、时长 + WaterRunVo runYear = this.getRunData(device,0); + target.setRunCountYear(runYear.getCount()); + target.setRunDurationYear(runYear.getHour()); + return target; + }).collect(Collectors.toList())); + } + redisTemplate.opsForValue().set(loadwaterpump_target_key,list); + } + + /** + * 水利-站点水位数据 + * @param param + */ + @Override + public void loadWaterLevel(String param) { + // 有效站点模型 + List modelList = getModelStationList(); + if(CollectionUtil.isEmpty(modelList)){ + return; + } + List list = new ArrayList<>(); + modelList.forEach(item -> { + List multiAnalyzeCodePOList = new ArrayList<>(); + MultiAnalyzeCodePO multiAnalyzeCodePO = new MultiAnalyzeCodePO(); + multiAnalyzeCodePO.setDeviceCode(item.getInstanceCode()); + multiAnalyzeCodePO.setSignages(Collections.singletonList(HomePageConstant.FRONT_WATER_LEVEL)); + multiAnalyzeCodePOList.add(multiAnalyzeCodePO); + R> result = analyseDataSearchClient.getAnalyzeCodeBySignages(multiAnalyzeCodePOList); + if(!result.isSuccess() || CollectionUtil.isEmpty(result.getData())){ + return; + } + WaterLevelVo waterLevelVo = new WaterLevelVo(); + waterLevelVo.setStationCode(item.getStationId()); + // 前水位 + double frontWaterLevel = this.getWaterLevel(item.getInstanceCode(),HomePageConstant.FRONT_WATER_LEVEL); + waterLevelVo.setFrontWaterLevel(frontWaterLevel); + // 后水位 + double rearWaterLevel = this.getWaterLevel(item.getInstanceCode(),HomePageConstant.REAR_WATER_LEVEL); + waterLevelVo.setRearWaterLevel(rearWaterLevel); + // 前水位当日曲线 + Map frontCurveMap = this.getWaterLevelMap(item.getInstanceCode(),HomePageConstant.FRONT_WATER_LEVEL); + waterLevelVo.setFrontCurveMap(frontCurveMap); + // 后水位当日曲线 + Map rearCurveMap = this.getWaterLevelMap(item.getInstanceCode(),HomePageConstant.REAR_WATER_LEVEL); + waterLevelVo.setRearCurveMap(rearCurveMap); + list.add(waterLevelVo); + }); + redisTemplate.opsForValue().set(loadwater_level_key,list); + } + + /** + * 光伏站-逆变器实时加载 + * + * @param param + */ + + @Override + public void loadPhotovoltaicReal(String param) { + // 查询设备 + List devices = this.getPhotovoltaicDevice(); + if (CollectionUtil.isEmpty(devices)) { + return; + } + // 取redis实时数据 + Map map = this.getRealMap(); + if (MapUtils.isEmpty(map)) { + return; + } + // redis缓存设备实时数据 + List history = (List) redisTemplate.opsForValue().get(load_photovoltaic_real_key); + // 设备实时数据 + List list = devices.stream().map(device -> { + PhotovoltaicRealVo real = new PhotovoltaicRealVo(); + real.setDeptId(device.getCreateDept()); + real.setDeviceCode(device.getEmCode()); + real.setDeviceName(device.getName()); + real.setState(this.getPhotovoltaicState(device, map)); + // 容量 + real.setCapacity(device.getInstalledCapacity()); + // 发电量 + real.setGenerate(this.getSignageValue(device, map, HomePageConstant.PV_GENERATION_CAPACITY)); + // 功率 + real.setLoad(this.getSignageValue(device, map, HomePageConstant.PV_LOAD)); + // 交流电压 + real.setVoltage(this.getSignageValue(device, map, HomePageConstant.PV_VOLTAGE)); + // 交流电流 + real.setCurrent(this.getSignageValue(device, map, HomePageConstant.PV_CURRENT)); + // 交流电压2 + real.setVoltage_two(this.getSignageValue(device, map, HomePageConstant.PV_VOLTAGE_TWO)); + // 交流电流2 + real.setCurrent_two(this.getSignageValue(device, map, HomePageConstant.PV_CURRENT_TWO)); + // 交流电压3 + real.setVoltage_three(this.getSignageValue(device, map, HomePageConstant.PV_VOLTAGE_THREE)); + // 交流电流3 + real.setCurrent_three(this.getSignageValue(device, map, HomePageConstant.PV_CURRENT_THREE)); + // 直流电流1 + real.setDirect_one(this.getSignageValue(device, map, HomePageConstant.DIRECT_ONE)); + // 直流电流2 + real.setDirect_two(this.getSignageValue(device, map, HomePageConstant.DIRECT_TWO)); + // 直流电流3 + real.setDirect_three(this.getSignageValue(device, map, HomePageConstant.DIRECT_THREE)); + // 直流电流4 + real.setDirect_four(this.getSignageValue(device, map, HomePageConstant.DIRECT_FOUR)); + // 直流电流5 + real.setDirect_five(this.getSignageValue(device, map, HomePageConstant.DIRECT_FIVE)); + // 直流电流6 + real.setDirect_six(this.getSignageValue(device, map, HomePageConstant.DIRECT_SIX)); + // 直流电流7 + real.setDirect_seven(this.getSignageValue(device, map, HomePageConstant.DIRECT_SEVEN)); + // 直流电流8 + real.setDirect_eight(this.getSignageValue(device, map, HomePageConstant.DIRECT_EIGHT)); + // 直流电流9 + real.setDirect_nine(this.getSignageValue(device, map, HomePageConstant.DIRECT_NINE)); + // 直流电流10 + real.setDirect_ten(this.getSignageValue(device, map, HomePageConstant.DIRECT_TEN)); + // 直流电流11 + real.setDirect_eleven(this.getSignageValue(device, map, HomePageConstant.DIRECT_ELEVEN)); + // 直流电流12 + real.setDirect_twelve(this.getSignageValue(device, map, HomePageConstant.DIRECT_TWELVE)); + // 直流电压1 + real.setDc_voltage_one(this.getSignageValue(device, map, HomePageConstant.DC_VOLTAGE_ONE)); + // 直流电压2 + real.setDc_voltage_two(this.getSignageValue(device, map, HomePageConstant.DC_VOLTAGE_TWO)); + // 直流电压3 + real.setDc_voltage_three(this.getSignageValue(device, map, HomePageConstant.DC_VOLTAGE_THREE)); + // 直流电压4 + real.setDc_voltage_four(this.getSignageValue(device, map, HomePageConstant.DC_VOLTAGE_FOUR)); + // 直流电压5 + real.setDc_voltage_five(this.getSignageValue(device, map, HomePageConstant.DC_VOLTAGE_FIVE)); + // 直流电压6 + real.setDc_voltage_six(this.getSignageValue(device, map, HomePageConstant.DC_VOLTAGE_SIX)); + // 直流电压7 + real.setDc_voltage_seven(this.getSignageValue(device, map, HomePageConstant.DC_VOLTAGE_SEVEN)); + // 直流电压8 + real.setDc_voltage_eight(this.getSignageValue(device, map, HomePageConstant.DC_VOLTAGE_EIGHT)); + // 直流电压9 + real.setDc_voltage_nine(this.getSignageValue(device, map, HomePageConstant.DC_VOLTAGE_NINE)); + // 直流电压10 + real.setDc_voltage_ten(this.getSignageValue(device, map, HomePageConstant.DC_VOLTAGE_TEN)); + // 直流电压11 + real.setDc_voltage_eleven(this.getSignageValue(device, map, HomePageConstant.DC_VOLTAGE_ELEVEN)); + // 直流电压12 + real.setDc_voltage_twelve(this.getSignageValue(device, map, HomePageConstant.DC_VOLTAGE_TWELVE)); + // 串流电流1 + real.setDirect_one(this.getSignageValue(device, map, HomePageConstant.DIRECT_ONE)); + // 串流电流2 + real.setSeries_two(this.getSignageValue(device, map, HomePageConstant.SERIES_TWO)); + // 串流电流3 + real.setSeries_three(this.getSignageValue(device, map, HomePageConstant.SERIES_THREE)); + // 串流电流4 + real.setSeries_four(this.getSignageValue(device, map, HomePageConstant.SERIES_FOUR)); + // 串流电流5 + real.setSeries_five(this.getSignageValue(device, map, HomePageConstant.SERIES_FIVE)); + // 串流电流6 + real.setSeries_six(this.getSignageValue(device, map, HomePageConstant.SERIES_SIX)); + // 串流电流7 + real.setSeries_seven(this.getSignageValue(device, map, HomePageConstant.SERIES_SEVEN)); + // 串流电流8 + real.setSeries_eight(this.getSignageValue(device, map, HomePageConstant.SERIES_EIGHT)); + // 串流电流9 + real.setSeries_nine(this.getSignageValue(device, map, HomePageConstant.SERIES_NINE)); + // 串流电流10 + real.setSeries_ten(this.getSignageValue(device, map, HomePageConstant.SERIES_TEN)); + // 串流电流11 + real.setSeries_eleven(this.getSignageValue(device, map, HomePageConstant.SERIES_ELEVEN)); + // 串流电流12 + real.setSeries_twelve(this.getSignageValue(device, map, HomePageConstant.SERIES_TWELVE)); + // 串流电压1 + real.setSe_voltage_one(this.getSignageValue(device, map, HomePageConstant.SE_VOLTAGE_ONE)); + // 串流电压2 + real.setSe_voltage_two(this.getSignageValue(device, map, HomePageConstant.SE_VOLTAGE_TWO)); + // 串流电压3 + real.setSe_voltage_three(this.getSignageValue(device, map, HomePageConstant.SE_VOLTAGE_THREE)); + // 串流电压4 + real.setSe_voltage_four(this.getSignageValue(device, map, HomePageConstant.SE_VOLTAGE_FOUR)); + // 串流电压5 + real.setSe_voltage_five(this.getSignageValue(device, map, HomePageConstant.SE_VOLTAGE_FIVE)); + // 串流电压6 + real.setSe_voltage_six(this.getSignageValue(device, map, HomePageConstant.SE_VOLTAGE_SIX)); + // 串流电压7 + real.setSe_voltage_seven(this.getSignageValue(device, map, HomePageConstant.SE_VOLTAGE_SEVEN)); + // 串流电压8 + real.setSe_voltage_eight(this.getSignageValue(device, map, HomePageConstant.SE_VOLTAGE_EIGHT)); + // 串流电压9 + real.setSe_voltage_nine(this.getSignageValue(device, map, HomePageConstant.SE_VOLTAGE_NINE)); + // 串流电压10 + real.setSe_voltage_ten(this.getSignageValue(device, map, HomePageConstant.SE_VOLTAGE_TEN)); + // 串流电压11 + real.setSe_voltage_eleven(this.getSignageValue(device, map, HomePageConstant.SE_VOLTAGE_ELEVEN)); + // 串流电压12 + real.setSe_voltage_twelve(this.getSignageValue(device, map, HomePageConstant.SE_VOLTAGE_TWELVE)); + // 上次功率 + real.setLastLoad(this.getLastLoad(device, history)); + return real; + }).collect(Collectors.toList()); + // 存储redis + redisTemplate.opsForValue().set(load_photovoltaic_real_key, list); + } + + + + /** + * 光伏站-逆变器指标加载 + * + * @param param + */ + @Override + public void loadPhotovoltaicTarget(String param) { + // 有效设备 + List devices = this.getPhotovoltaicDevice(); + if (CollectionUtil.isEmpty(devices)) { + return; + } + List list = new ArrayList<>(); + // 接入站点设备统计 + devices.forEach(device -> { + PhotovoltaicTargetVo target = new PhotovoltaicTargetVo(); + target.setDeptId(device.getCreateDept()); + target.setDeviceCode(device.getEmCode()); + target.setDeviceName(device.getName()); + target.setDeptName(device.getName()); + // 当日运行时长 + target.setRunHours(this.runHours(device.getPoint().get(HomePageConstant.PV_JOINT_RELAY))); + // 年发电量 + target.setGenerationYear((double) this.sumValueByTime(device.getEmCode(), device.getRideCount(), "0")); + // 月发电量 + target.setGenerationMon((double) this.sumValueByTime(device.getEmCode(), device.getRideCount(), "1")); + // 日发电量 + target.setGenerationDay((double) this.sumValueByTime(device.getEmCode(), device.getRideCount(), "2")); + // 昨日发电量 + target.setGenerationYesterday((double) this.sumValueByTime(device.getEmCode(), device.getRideCount(), "3")); + // 收益 + target.setIncome(target.getGenerationDay() * 0.34); + // 节约标准煤 + target.setTec(target.getGenerationMon() * 0.0001229); + // 二氧化碳减排 + target.setCo2(target.getGenerationMon() * 0.000997); + // 减少森林砍伐 + target.setDeforest(target.getGenerationMon() * 0.000553); + // 当天有功功率 + target.setActivePowerVoList(this.photovoltaicLoadsByDay(device)); + // 30天发电量 + target.setGenerationPowerVoList(this.getGenerateByMon(device)); + list.add(target); + }); + // 补充站点填报发电量 + List stations = stationService.list(Wrappers.lambdaQuery() + .eq(StationEntity::getType, HomePageConstant.PHOTOVOLTAIC) + .eq(StationEntity::getServeType, HomePageConstant.HYDROPOWER_SERVETYPE) + ); + if(CollectionUtil.isNotEmpty(stations)){ + list.addAll(this.generateFill(stations)); + } + redisTemplate.opsForValue().set(load_photovoltaic_target_key, list); + } + + + /** + * 当日用电量 + * @param device + * @return + */ + private float getUsrPowerDay(EminfoAndEmParamVo device) { + String time = DateUtil.format(new Date(),DateUtil.PATTERN_DATE); + // 当日用电量 + return analyseDataService.periodTargetFloat(time + " 00:00:00",time + " 23:59:59",5,3,device.getEmCode(),device.getRideCount(),HomePageConstant.ELECTRICITY_CONSUMPTION); + + } + + /** + * 当月用电量 + * @param device + * @return + */ + private float getUsrPowerMon(EminfoAndEmParamVo device) { + String start = DateUtil.format(new Date(), "yyyy-MM") + "-01 00:00:00"; + String end = DateUtil.format(new Date(), DateUtil.PATTERN_DATETIME); + // 当月用电量 + return analyseDataService.periodTargetFloat(start,end,5,5,device.getEmCode(),device.getRideCount(),HomePageConstant.ELECTRICITY_CONSUMPTION); + } + + /** + * 当年用电量 + * @param device + * @return + */ + private float getUsrPowerYear(EminfoAndEmParamVo device) { + Calendar calendar = Calendar.getInstance(); + String end = DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATETIME); + calendar.setTime(new Date()); + calendar.add(Calendar.MONTH, -calendar.get(Calendar.MONTH)); + calendar.add(Calendar.DATE, -calendar.get(Calendar.DATE) + 1); + String start = DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATETIME); + // 当年用电量 + return analyseDataService.periodTargetFloat(start,end,5,6,device.getEmCode(),device.getRideCount(),HomePageConstant.ELECTRICITY_CONSUMPTION); + } + + /** + * 当日机组有功功率 + * @param device + * @return + */ + public List getActivePowerVoList(EminfoAndEmParamVo device) { + String startTime = DateUtil.format(new Date(), "yyyy-MM-dd 00:00:00"); + String endTime = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"); + List datas = analyseDataService.periodTargetData(startTime,endTime,2,6,device.getEmCode(),HomePageConstant.ACTIVE_POWER); + if(CollectionUtil.isEmpty(datas)){ + return new ArrayList<>(); + } + return datas.stream().map(data->{ + ActivePowerVo active = new ActivePowerVo(); + Date dateTime = DateUtil.parse(data.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + active.setHour(dateTime.getHours()); + if (StringUtil.isBlank(data.getVal())) { + active.setActivePower("0"); + }else { + active.setActivePower(data.getVal()); + } + return active; + }).collect(Collectors.toList()); + } + + /** + * 近30天用电量 + * @param device + * @return + */ + private List getUsrPowerVoList(EminfoAndEmParamVo device) { + String start = DateUtil.format(new Date(),DateUtil.PATTERN_DATE) + " 00:00:00"; + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.DAY_OF_MONTH,-29); + String end = DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATETIME); + List records = analyseDataService.periodTargetData(start,end,5,EquipmentConstants.CycleTypeEnum.DAY_CYCLE.getType(),device.getEmCode(),HomePageConstant.ELECTRICITY_CONSUMPTION); + if(CollectionUtil.isEmpty(records)){ + return new ArrayList<>(); + } + return records.stream().map(record -> { + UsrPowerVo usr = new UsrPowerVo(); + Date time = DateUtil.parse(record.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + usr.setDate(DateUtil.format(time,DateUtil.PATTERN_DATE)); + usr.setUsrPower(Float.valueOf(Optional.ofNullable(record.getVal()).orElse("0"))); + return usr; + }).collect(Collectors.toList()); + } + + /** + * 近3年发电量 + * + * @param device + * @return + */ + private Map getUsrYearMap(EminfoAndEmParamVo device) { + // 开始时间 + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.MONTH, -calendar.get(Calendar.MONTH) + 12); + calendar.add(Calendar.DATE, -calendar.get(Calendar.DATE) + 1); + String end = DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATE) + " 00:00:00"; + // 结束日期 + calendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR) - 3); + calendar.add(Calendar.MONTH, -calendar.get(Calendar.MONTH)); + String start = DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATE) + " 00:00:00"; + // 查询数据 + List records = analyseDataService.periodTargetData(start,end,5,5,device.getEmCode(),HomePageConstant.ELECTRICITY_CONSUMPTION); + if(CollectionUtil.isEmpty(records)){ + return new HashMap<>(); + } + return records.stream().map(record -> { + PowerMonthVo generate = new PowerMonthVo(); + Date time = DateUtil.parse(record.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + generate.setStrMonth(DateUtil.format(time, DateUtil.PATTERN_DATE)); + generate.setPower(Float.parseFloat(Optional.ofNullable(record.getVal()).orElse("0")) * device.getRideCount()); + return generate; + }).collect(Collectors.toMap(PowerMonthVo::getStrMonth,PowerMonthVo::getPower)); + } + + /** + * 获取运行数据 + * @param device + * @param type + * @return + */ + private WaterRunVo getRunData(EminfoAndEmParamVo device, int type) { + // 默认返回运行数据 + WaterRunVo waterRunVo = new WaterRunVo(); + waterRunVo.setCount(0); + waterRunVo.setHour(0.0); + Map point = device.getPoint(); + if(MapUtils.isEmpty(point)){ + return waterRunVo; + } + // 监测点 + String realId = point.get(HomePageConstant.SWITCH_ON_OFF); + if(StringUtil.isBlank(realId)){ + return waterRunVo; + } + // 确定查询时间范围: 年、月 + Date startDate,endDate; + Calendar calendar = Calendar.getInstance(); + calendar.setTime(new Date()); + switch (type){ + case 0: + endDate = calendar.getTime(); + calendar.add(Calendar.MONTH, -calendar.get(Calendar.MONTH)); + calendar.add(Calendar.DATE, -calendar.get(Calendar.DATE) + 1); + startDate = calendar.getTime(); + break; + case 1: + endDate = calendar.getTime(); + calendar.add(Calendar.DATE, -calendar.get(Calendar.DATE) + 1); + calendar.add(Calendar.HOUR_OF_DAY, -calendar.get(Calendar.HOUR_OF_DAY)); + calendar.add(Calendar.MINUTE, -calendar.get(Calendar.MINUTE)); + calendar.add(Calendar.SECOND, -calendar.get(Calendar.SECOND)); + startDate = calendar.getTime(); + break; + default: + throw new IllegalStateException("Unexpected value: " + type); + } + return this.getRunConvertData(realId,startDate,endDate,waterRunVo); + } + + /** + * 获取时间范围内开机次数、运行时长 + * @param realId + * @param startDate + * @param endDate + * @param waterRunVo + * @return + */ + private WaterRunVo getRunConvertData(String realId, Date startDate, Date endDate, WaterRunVo waterRunVo) { + OriginalDataQuery originalDataQuery = new OriginalDataQuery(); + originalDataQuery.setRealId(realId); + originalDataQuery.setBeginTime(startDate); + originalDataQuery.setEndTime(endDate); + originalDataQuery.setLimit(100000); + originalDataQuery.setPage(1); + // 查询时间范围开关机监测点历史数据 + Result> R = historyDataSearchClient.getOriginalDataByRealIds(originalDataQuery); + if(!R.isSuccess() || ObjectUtil.isEmpty(R.getData())){ + return waterRunVo; + } + // 过滤相邻开关机状态相同数据 + List result = this.getFilterList(R.getData().getRecords()); + if(CollectionUtil.isEmpty(result)){ + return waterRunVo; + } + // 开机次数 + int count = (int) result.stream().filter(o->HomePageConstant.OFF.equals(o.getValue())).count(); + waterRunVo.setCount(count); + // 开机运行时长 + long time = this.getRunTime(result,startDate,endDate); + waterRunVo.setHour(BigDecimal.valueOf(time / (1000 * 60 * 60.00)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); + return waterRunVo; + } + + /** + * 过滤相邻开关机状态相同数据 + * @param list + * @return + */ + private List getFilterList(List list) { + if(CollectionUtil.isEmpty(list)){ + return null; + } + List result = new ArrayList<>(); + // 遍历数据 + for(int i = 0; i< list.size() ; i++){ + // 第一个数据保存下来 + if(i == 0){ + result.add(list.get(i)); + continue; + } + // 遍历数据状态 + String value = list.get(i).getValue(); + if(StringUtil.isBlank(value)){ + continue; + } + // 上一条数据状态 + String up_value = list.get(i-1).getValue(); + if(value.equals(up_value)){ + continue; + } + result.add(list.get(i)); + } + return result; + } + + /** + * 获取运行时长 + * @param result + * @return + */ + private long getRunTime(List result,Date startDate,Date endDate) { + if(result.size() == 1){ + // 一直开机 + if(HomePageConstant.OFF.equals(result.get(0).getValue())){ + return endDate.getTime() - startDate.getTime(); + } + // 一直关机 + return 0; + } + long time=0; + // 遍历累计开机时长 + for(int i = 0; i< result.size() ; i++){ + // 记录为开机状态 就计算到下次关机的时间差 + if(HomePageConstant.ON.equals(result.get(i).getValue())){ + continue; + } + Date endTime,startTime = DateUtil.parse(result.get(i).getTime(), DateUtil.PATTERN_DATETIME); + // 遍历至最后一条数据,累计至当前时间 + if(i == result.size() - 1){ + endTime = endDate; + } + else { + endTime = DateUtil.parse(result.get(i+1).getTime(), DateUtil.PATTERN_DATETIME); + } + time += endTime.getTime() - startTime.getTime(); + } + return time; + } + + /** + * 获取填报用电量 + * @param stations + * @return + */ + private List useFill(List stations) { + Calendar calendar = Calendar.getInstance(); + String day = DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATE); + String mon = DateUtil.format(calendar.getTime(),"yyyy-MM"); + String year = String.valueOf(calendar.get(Calendar.YEAR)); + return stations.stream().map(station ->{ + WaterPumpTargetVo target = new WaterPumpTargetVo(); + target.setDeptId(station.getRefDept()); + target.setDeptName(station.getName()); + // 月运行次数、时长 + target.setRunCountMon(0); + target.setRunDurationMon(0.0); + // 年运行次数、时长 + target.setRunCountYear(0); + target.setRunDurationYear(0.0); + // 当年用电量 + target.setUsrPowerYear(useService.use(year,station.getCode())); + // 当月用电量 + target.setUsrPowerMon(useService.use(mon,station.getCode())); + // 当日用电量 + target.setUsrPowerDay(useService.use(day,station.getCode())); + if(StationConstants.DATA_ORIGIN_FILL.equals(station.getDataOrigin())){ + // 30天用电量 + target.setUsrPowerVoList(useService.use30Day(day,station.getCode())); + } + // 近3年用电量 + target.setUsrYearMap(this.useThreeYear(station.getCode())); + return target; + }).collect(Collectors.toList()); + } + + /** + * 获取水位实时数据 + * @param instanceCode + * @param signage + * @return + */ + private double getWaterLevel(String instanceCode, String signage) { + RealDataSearchPO realData = new RealDataSearchPO(); + realData.setAnalyzeCode(instanceCode); + List signages = Collections.singletonList(signage); + realData.setSignages(signages); + // 调用fegin接口查询实时数据 + R> R = analyseDataSearchClient.getRealDataByAnalyzeCode(realData); + if(!R.isSuccess() || CollectionUtil.isEmpty(R.getData())){ + return 0.0; + } + // 时间限制 + String time = R.getData().get(0).getTime(); + if(StringUtil.isEmpty(time) || "-".equals(time)){ + return 0.0; + } + Date date = DateUtil.parse(time, "yyyy-MM-dd HH:mm:ss.sss"); + if(System.currentTimeMillis() - date.getTime() > 30 * 60 * 1000L){ + return 0.0; + } + return Double.parseDouble(R.getData().get(0).getValue()); + } + + /** + * 获取水位当年数据 + * @param instanceCode + * @param signage + * @return + */ + private Map getWaterLevelMap(String instanceCode, String signage) { + String beginTime = DateUtil.format(new Date(), DateUtil.PATTERN_DATE) + " 00:00:00"; + String endTime = DateUtil.format(new Date(), DateUtil.PATTERN_DATE); + AnalyseCodeByAnalyseDataPO po = new AnalyseCodeByAnalyseDataPO(); + List datas = analyseDataService.periodTargetData(beginTime, endTime,2, 6,instanceCode,signage); + if(CollectionUtil.isEmpty(datas)){ + return new HashMap<>(); + } + return datas.stream().collect(Collectors.toMap( + key-> { + Date dateTime = DateUtil.parse(key.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + return dateTime.getHours(); + }, + value -> { + if(StringUtil.isBlank(value.getVal())){ + return "0"; + } + return value.getVal(); + }) + ); + } + + /** + * 填报近3年发电量 + * @param station + * @return + */ + private Map useThreeYear(String station) { + // 开始时间 + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.MONTH, -calendar.get(Calendar.MONTH) + 12); + calendar.add(Calendar.DATE, -calendar.get(Calendar.DATE) + 1); + String end = DateUtil.format(calendar.getTime(),"yyyy-MM"); + // 结束日期 + calendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR) - 3); + calendar.add(Calendar.MONTH, -calendar.get(Calendar.MONTH)); + String start = DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATE); + return useService.generateThreeYear(start,end,station); + } + + + /** + * 获取有效站点模型 + * @return + */ + private List getModelStationList() { + // 水利站点(All) + List stations = stationService.list(new LambdaQueryWrapper() {{ + eq(StationEntity::getServeType, HomePageConstant.HYDROPOWER_SERVETYPE); + }}); + if(CollectionUtil.isEmpty(stations)){ + return new ArrayList<>(); + } + // 站点code集合 + List codes = stations.stream().map(StationEntity::getCode).collect(Collectors.toList()); + if(CollectionUtil.isEmpty(codes)){ + return new ArrayList<>(); + } + // 查询站点模型列表 + List list = modelStationService.list(new LambdaQueryWrapper() {{ + in(HzimsAnalyzeModelStationEntity::getStationId, codes); + }}); + if(CollectionUtil.isEmpty(list)){ + return new ArrayList<>(); + } + return list; + } + + /** + * 获取开机状态 + * @param device + * @return + */ + private int pumpState(EminfoAndEmParamVo device,Map map) { + // 获取开关机监测点实时数据 + double value = this.getSignageValue(device,map,HomePageConstant.SWITCH_ON_OFF); + // 开机状态 + if (Math.abs(value) <= 0) { + return 0; + } + return 1; + } + + /** + * 有功功率 + * @param device + * @return + */ + private float floatValue(EminfoAndEmParamVo device,Map map,String target) { + // 获取有功功率监测点实时数据 + double value = this.getSignageValue(device,map,target); + // 转换float + return Float.parseFloat(String.valueOf(value)); + } + + /** + * 设备状态 + * @param device + * @param map + * @return + */ + private Boolean state(EminfoAndEmParamVo device, Map map) { + if(Math.abs(this.getSignageValue(device,map,HomePageConstant.JOINT_RELAY)) > 0){ + return true; + } + return Math.abs(this.getSignageValue(device, map, HomePageConstant.ACTIVE_POWER)) > 0; + } + + /** + * 近年发电量数据 + * + * @param param 时间 + * @param serveType 站点类型 + * @param year 近几年 + */ + @Override + public void loadPowerData(String param, List types, Integer serveType, int year) { + // 站点查询 + List stationList = stationService.list(new LambdaQueryWrapper() {{ + if (ObjectUtil.isNotEmpty(serveType)) { + eq(StationEntity::getServeType, serveType); + } + if (CollectionUtil.isNotEmpty(types)) { + in(StationEntity::getType, types); + } + }}); + // 设备信息 + List devices = JSONObject.parseObject(redisTemplate.opsForValue().get(device_cache_cofig_final).toString(), new TypeReference>() { + }); + // 开始时间 + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.MONTH, -calendar.get(Calendar.MONTH) + 12); + calendar.add(Calendar.DATE, -calendar.get(Calendar.DATE) + 1); + String end = DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATE) + " 00:00:00"; + // 结束日期 + calendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR) - year); + calendar.add(Calendar.MONTH, -calendar.get(Calendar.MONTH)); + String start = DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATE) + " 00:00:00"; + // 存储数据map ：<站点id,<月份,发电量>> + Map> powerMap = new HashMap<>(); + stationList.forEach(station -> { + // 站点设备集合 + List stationDevices = devices.stream().filter(device -> device.getCreateDept().equals(station.getRefDept())).collect(Collectors.toList()); + log.error("load_power_data station :" + station.getCode() + "==== device :" + stationDevices ); + Map generateMap = this.getGenerateYear(station,stationDevices,start,end); + if(MapUtils.isEmpty(generateMap)){ + return; + } + powerMap.put(station.getId(),generateMap); + }); + redisTemplate.opsForValue().set(recent_year_power_data, powerMap); + } + + + /** + * 当天有功功率 + * @param device + * @return + */ + private List getLoadsByDay(EminfoAndEmParamVo device) { + String start = DateUtil.format(new Date(), DateUtil.PATTERN_DATE) + " 00:00:00"; + String end = DateUtil.format(new Date(), DateUtil.PATTERN_DATETIME); + List records = analyseDataService.periodTargetData(start, end, 3, 2, device.getEmCode(), HomePageConstant.PV_LOAD); + if (CollectionUtil.isEmpty(records)) { + return new ArrayList<>(); + } + return records.stream().map(record -> { + ActivePowerVo load = new ActivePowerVo(); + Date time = DateUtil.parse(record.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + load.setHour(time.getHours()); + load.setActivePower(Optional.ofNullable(record.getVal()).orElse("0")); + return load; + }).sorted(Comparator.comparing(ActivePowerVo::getHour)).collect(Collectors.toList()); + } + + /** + * 获取年发电量 + * @param devices + * @param start + * @param end + * @return + */ + private Map getGenerateYear(StationEntity station,List devices, String start, String end) { + List datas = new ArrayList<>(); + // 设备采集发电量 + if(CollectionUtil.isNotEmpty(devices)){ + devices.forEach(device->{ + List records = analyseDataService.periodTargetData(start,end,5,5,device.getEmCode(),HomePageConstant.HYDROPOWER_GENERATE_POWER); + if(CollectionUtil.isEmpty(records)){ + return; + } + datas.addAll(records.stream().map(record -> { + PowerMonthVo generate = new PowerMonthVo(); + Date time = DateUtil.parse(record.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + generate.setStrMonth(DateUtil.format(time,DateUtil.PATTERN_DATE)); + generate.setPower(Float.parseFloat(Optional.ofNullable(record.getVal()).orElse("0")) * device.getRideCount()); + return generate; + }).collect(Collectors.toList())); + }); + } + // 补充填报数据 + datas.addAll(this.generateFill(station,start,end)); + if(CollectionUtil.isEmpty(datas)){ + return null; + } + return datas.stream().collect(Collectors.toMap(PowerMonthVo::getStrMonth, PowerMonthVo::getPower, Float::sum)); + } + + + /** + * 获取填报用电量 + * @param stations + * @return + */ + private List generteFill(List stations) { + Calendar calendar = Calendar.getInstance(); + String day = DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATE); + String mon = DateUtil.format(calendar.getTime(),"yyyy-MM"); + String year = String.valueOf(calendar.get(Calendar.YEAR)); + return stations.stream().map(station ->{ + HydropowerUnitTargetVo target = new HydropowerUnitTargetVo(); + target.setDeptId(station.getRefDept()); + target.setDeptName(station.getName()); + // 当年发电量 + target.setPowerYear(generateService.generate(year,station.getCode())); + // 当月发电量 + target.setPowerMon(generateService.generate(mon,station.getCode())); + // 当日发电量 + target.setPowerDay(generateService.generate(day,station.getCode())); + // 30天发电量 + target.setGenerationPowerVoList(generateService.generate30Day(day,station.getCode())); + return target; + }).collect(Collectors.toList()); + } + + + /** + * 补充填报数据 + * @param station + * @param start + * @param end + */ + private List generateFill(StationEntity station, String start, String end) { + start = DateUtil.format(DateUtil.parse(start,DateUtil.PATTERN_DATETIME),"yyyy-MM"); + end = DateUtil.format(DateUtil.parse(end,DateUtil.PATTERN_DATETIME),"yyyy-MM"); + // 光伏 + if(HomePageConstant.PHOTOVOLTAIC.equals(station.getType())){ + return powerService.generateThreeYear(start,end,station.getRefDept()); + } + // 水电 + return generateService.generateThreeYear(start,end,station.getCode()); + } + + /** + * 获取开机状态 + * + * @param device + * @return + */ + private int getPhotovoltaicState(EminfoAndEmParamVo device, Map map) { + // 获取开关机监测点实时数据 + Double value = this.getSignageValue(device, map, HomePageConstant.PV_JOINT_RELAY); + // 开机状态 + if (Math.abs(value) <= 0) { + return 0; + } + return 1; + } + + /** + * 获取上一次功率 + * + * @param device + * @param history + * @return + */ + private Double getLastLoad(EminfoAndEmParamVo device, List history) { + if (CollectionUtil.isEmpty(history)) { + return 0.0; + } + List historyDevice = history.stream().filter(o -> o.getDeviceCode().equals(device.getEmCode())).collect(Collectors.toList()); + if (CollectionUtil.isEmpty(historyDevice)) { + return 0.0; + } + return historyDevice.get(0).getLoad(); + } + + /** + * 获取光伏设备 + * + * @return + */ + private List getPhotovoltaicDevice() { + // 光伏站点 + List stations = stationService.list(Wrappers.lambdaQuery() + .eq(StationEntity::getServeType,HomePageConstant.HYDROPOWER_SERVETYPE) + .eq(StationEntity::getType,HomePageConstant.PHOTOVOLTAIC) + ); + if (CollectionUtil.isEmpty(stations)) { + return new ArrayList<>(); + } + // 设备 + List devices = JSONObject.parseObject(redisTemplate.opsForValue().get(device_cache_cofig_final).toString(), new TypeReference>() { + }); + if (CollectionUtil.isEmpty(devices)) { + return new ArrayList<>(); + } + return devices.stream().filter(device -> + stations.stream().map(StationEntity::getRefDept).collect(Collectors.toList()).contains(device.getCreateDept()) + ).collect(Collectors.toList()); + } + + /** + * 当天运行时长 + * + * @param realId + * @return + */ + private Double runHours(String realId) { + Calendar calendar = Calendar.getInstance(); + Date end = calendar.getTime(); + calendar.add(Calendar.HOUR_OF_DAY, -calendar.get(Calendar.HOUR_OF_DAY)); + calendar.add(Calendar.MINUTE, -calendar.get(Calendar.MINUTE)); + calendar.add(Calendar.SECOND, -calendar.get(Calendar.SECOND)); + Date start = calendar.getTime(); + OriginalDataQuery originalDataQuery = new OriginalDataQuery(); + originalDataQuery.setRealId(realId); + originalDataQuery.setBeginTime(start); + originalDataQuery.setEndTime(end); + originalDataQuery.setLimit(100000); + originalDataQuery.setPage(1); + // 查询时间范围开关机监测点历史数据 + Result> R = historyDataSearchClient.getOriginalDataByRealIds(originalDataQuery); + if (!R.isSuccess() || ObjectUtil.isEmpty(R.getData())) { + return 0.0; + } + // 过滤相邻开关机状态相同数据 + List result = this.getFilterList(R.getData().getRecords()); + if (CollectionUtil.isEmpty(result)) { + return 0.0; + } + // 开机运行时长 + long time = this.getRunTime(result, start, end); + return BigDecimal.valueOf(time / (1000 * 60 * 60.00)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + } + + /** + * 根据事件查询数据值 + * + * @param deviceCode + * @param rideCount + * @param type + * @return + */ + private float sumValueByTime(String deviceCode, int rideCount, String type) { + Calendar calendar = Calendar.getInstance(); + String start, end; + int cycleType = 3; + switch (type) { + //年 + case "0": + calendar.add(Calendar.HOUR_OF_DAY, +1); + end = DateUtil.format(calendar.getTime(), DateUtil.PATTERN_DATETIME); + calendar.setTime(new Date()); + calendar.add(Calendar.MONTH, -calendar.get(Calendar.MONTH)); + calendar.add(Calendar.DAY_OF_MONTH, -calendar.get(Calendar.DATE) + 1); + calendar.add(Calendar.HOUR_OF_DAY, -calendar.get(Calendar.HOUR_OF_DAY)); + calendar.add(Calendar.MINUTE, -calendar.get(Calendar.MINUTE)); + calendar.add(Calendar.SECOND, -calendar.get(Calendar.SECOND)); + start = DateUtil.format(calendar.getTime(), DateUtil.PATTERN_DATETIME); + cycleType = 6; + break; + //月 + case "1": + start = DateUtil.format(new Date(), "yyyy-MM") + "-01 00:00:00"; + end = DateUtil.format(new Date(), DateUtil.PATTERN_DATETIME); + cycleType = 5; + break; + //日 + case "2": + start = DateUtil.format(new Date(), DateUtil.PATTERN_DATE) + " 00:00:00"; + end = DateUtil.format(new Date(), DateUtil.PATTERN_DATETIME); + break; + //昨日 + case "3": + calendar.add(Calendar.DAY_OF_MONTH, -1); + calendar.add(Calendar.HOUR_OF_DAY, -calendar.get(Calendar.HOUR_OF_DAY)); + calendar.add(Calendar.MINUTE, -calendar.get(Calendar.MINUTE)); + calendar.add(Calendar.SECOND, -calendar.get(Calendar.SECOND)); + start = DateUtil.format(calendar.getTime(), DateUtil.PATTERN_DATETIME); + end = DateUtil.format(new Date(), DateUtil.PATTERN_DATE) + " 00:00:00"; + break; + default: + throw new ServiceException("无效查询类型！"); + } + return analyseDataService.periodTargetFloat(start, end, 5, cycleType, deviceCode, rideCount, HomePageConstant.PV_GENERATION_CAPACITY); + } + + /** + * 当天有功功率 + * + * @param device + * @return + */ + private List photovoltaicLoadsByDay(EminfoAndEmParamVo device) { + String start = DateUtil.format(new Date(), DateUtil.PATTERN_DATE) + " 00:00:00"; + String end = DateUtil.format(new Date(), DateUtil.PATTERN_DATETIME); + List records = analyseDataService.periodTargetData(start, end, 1, 2, device.getEmCode(), HomePageConstant.PV_LOAD); + if (CollectionUtil.isEmpty(records)) { + return new ArrayList<>(); + } + return records.stream().map(record -> { + PhotovoltaicPowerVo load = new PhotovoltaicPowerVo(); + Date time = DateUtil.parse(record.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + load.setHour(time.getHours()); + load.setActivePower(Optional.ofNullable(record.getVal()).orElse("0")); + return load; + }).sorted(Comparator.comparing(PhotovoltaicPowerVo::getHour)).collect(Collectors.toList()); + } + + /** + * 近30天发电量 + * + * @param device + * @return + */ + private List getGenerateByMon(EminfoAndEmParamVo device) { + Calendar calendar = Calendar.getInstance(); + String end = DateUtil.format(calendar.getTime(), DateUtil.PATTERN_DATETIME); + calendar.add(Calendar.DAY_OF_MONTH, -29); + calendar.add(Calendar.HOUR_OF_DAY, -calendar.get(Calendar.HOUR_OF_DAY)); + calendar.add(Calendar.MINUTE, -calendar.get(Calendar.MINUTE)); + calendar.add(Calendar.SECOND, -calendar.get(Calendar.SECOND)); + String start = DateUtil.format(calendar.getTime(), DateUtil.PATTERN_DATETIME); + List records = analyseDataService.periodTargetData(start, end, 5, 3, device.getEmCode(), HomePageConstant.PV_GENERATION_CAPACITY); + if (CollectionUtil.isEmpty(records)) { + return new ArrayList<>(); + } + return records.stream().map(record -> { + GenerationPowerVo generate = new GenerationPowerVo(); + Date time = DateUtil.parse(record.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + generate.setDate(DateUtil.format(time, DateUtil.PATTERN_DATE)); + generate.setGenerate(Float.valueOf(Optional.ofNullable(record.getVal()).orElse("0"))); + return generate; + }).sorted(Comparator.comparing(GenerationPowerVo::getDate)).collect(Collectors.toList()); + } + + /** + * 获取光伏站点填报数据 + * @param stations + * @return + */ + private List generateFill(List stations) { + Calendar calendar = Calendar.getInstance(); + String mon = DateUtil.format(calendar.getTime(),"yyyy-MM"); + String year = String.valueOf(calendar.get(Calendar.YEAR)); + return stations.stream().map(station ->{ + PhotovoltaicTargetVo target = new PhotovoltaicTargetVo(); + target.setDeptId(station.getRefDept()); + target.setDeptName(station.getName()); + // 当日运行时长 + target.setRunHours(0.0); + // 日发电量 + target.setGenerationDay(0.0); + // 昨日发电量 + target.setGenerationYesterday(0.0); + // 收益 + target.setIncome(0.0); + // 日发电量 + // 月发电量 + target.setGenerationMon(powerService.generate(mon,station.getRefDept())); + // 节约标准煤 + target.setTec(target.getGenerationMon() * 0.0001229); + // 二氧化碳减排 + target.setCo2(target.getGenerationMon() * 0.000997); + // 减少森林砍伐 + target.setDeforest(target.getGenerationMon() * 0.000553); + // 年发电量 + target.setGenerationYear(powerService.generate(year,station.getRefDept())); + // 30天发电量 + return target; + }).collect(Collectors.toList()); + } + + /** + * 泵站设备 + * @param stations + * @return + */ + private List pumpDevices(List stations){ + if(CollectionUtil.isEmpty(stations)){ + return new ArrayList<>(); + } + List devices = null; + Object json = redisTemplate.opsForValue().get(device_cache_cofig_final); + if (ObjectUtil.isNotEmpty(json)) { + devices = JSONObject.parseObject(json.toString(),new TypeReference>() {}); + } + if(CollectionUtil.isEmpty(devices)){ + return new ArrayList<>(); + } + return devices.stream().filter(device->stations.contains(device.getCreateDept())).collect(Collectors.toList()); + } + + /** + * 获取实时数据 + * @return + */ + private Map getRealMap() { + String json = (String) redisTemplate.opsForValue().get(real_id_cofig_final); + if(StringUtil.isBlank(json)){ + return null; + } + return JSONObject.parseObject(json, new TypeReference>() {}); + } + + + /** + * 获取监测点实时数据 + * @param device + * @param targets + * @return + */ + private double getSignageValue(EminfoAndEmParamVo device,Map map, String targets) { + if(ObjectUtil.isEmpty(device) || MapUtils.isEmpty(map)){ + return 0.0; + } + Map point = device.getPoint(); + if(MapUtils.isEmpty(point)){ + return 0.0; + } + String realId = point.get(targets); + if(StringUtil.isBlank(realId)){ + return 0.0; + } + String value = map.get(realId); + if(StringUtil.isBlank(value)){ + return 0.0; + } + // 获取value + return Double.parseDouble(value); + } + + /** + * 单位设置 + * @param device + * @param unitMap + * @param realVo + */ + private void setttingUnit(EminfoAndEmParamVo device, Map unitMap, HydropowerUnitRealVo realVo) { + if(MapUtils.isEmpty(unitMap)){ + return; + } + // 有功功率单位 + String power = unitMap.get(device.getId()+HomePageConstant.CONCAT_P); + if(StringUtil.isNotBlank(power)){ + realVo.setPowerUnit(power); + } else { + realVo.setPowerUnit("kW"); + } + // 无功功率 + String reactivePowerUnit = unitMap.get(device.getId()+HomePageConstant.CONCAT_Q); + if(StringUtil.isNotBlank(reactivePowerUnit)){ + realVo.setReactivePowerUnit(reactivePowerUnit); + } else { + realVo.setReactivePowerUnit("kVa r"); + } + // 定子电压单位 + String voltage = unitMap.get(device.getId()+HomePageConstant.CONCAT_UAB); + if(StringUtil.isNotBlank(voltage)){ + realVo.setVoltageUnit(voltage); + } else { + realVo.setVoltageUnit("V"); + } + // 定子电流单位 + String current = unitMap.get(device.getId()+HomePageConstant.CONCAT_IA); + if(StringUtil.isNotBlank(current)){ + realVo.setCurrentUnit(current); + } else { + realVo.setCurrentUnit("A"); + } + } + + /** + * 获取年、月、日发电量 + * @param device + * @param scope + * @return + */ + private float getGenerationPower(EminfoAndEmParamVo device,int scope) { + String start,end; + int accessRules; + Calendar calendar = Calendar.getInstance(); + switch (scope){ + // 年 + case 0: + end = DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATETIME); + calendar.setTime(new Date()); + calendar.add(Calendar.MONTH, -calendar.get(Calendar.MONTH)); + calendar.add(Calendar.DATE, -calendar.get(Calendar.DATE) + 1); + start = DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATE) + " 00:00:00"; + accessRules = EquipmentConstants.CycleTypeEnum.YEAR_CYCLE.getType(); + break; + // 月 + case 1: + start = DateUtil.format(new Date(), "yyyy-MM") + "-01 00:00:00"; + end = DateUtil.format(new Date(), DateUtil.PATTERN_DATETIME); + accessRules = EquipmentConstants.CycleTypeEnum.MONTH_CYCLE.getType(); + break; + // 日 + case 2: + String time = DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATE); + start = time + " 00:00:00"; + end = time + " 23:59:59"; + accessRules = EquipmentConstants.CycleTypeEnum.DAY_CYCLE.getType(); + break; + default: + throw new IllegalStateException("Unexpected value: " + scope); + } + return analyseDataService.periodTargetFloat(start,end,5,accessRules,device.getEmCode(),device.getRideCount(),HomePageConstant.HYDROPOWER_GENERATE_POWER); + } + + /** + * 近30天发电量 + * @param device + * @return + */ + private List getGenerationPowerList(EminfoAndEmParamVo device) { + String start = DateUtil.format(new Date(), "yyyy-MM") + "-01 00:00:00"; + String end = DateUtil.format(new Date(), DateUtil.PATTERN_DATETIME); + List records = analyseDataService.periodTargetData(start,end,5,EquipmentConstants.CycleTypeEnum.DAY_CYCLE.getType(),device.getEmCode(),HomePageConstant.HYDROPOWER_GENERATE_POWER); + if(CollectionUtil.isEmpty(records)){ + return new ArrayList<>(); + } + return records.stream().map(record -> { + GenerationPowerVo generate = new GenerationPowerVo(); + Date time = DateUtil.parse(record.getTs(), "yyyy-MM-dd HH:mm:ss.s"); + generate.setDate(DateUtil.format(time,DateUtil.PATTERN_DATE)); + generate.setGenerate(Float.parseFloat(Optional.ofNullable(record.getVal()).orElse("0")) * device.getRideCount()); + return generate; + }).collect(Collectors.toList()); + } +} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/RecordServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/RecordServiceImpl.java new file mode 100644 index 0000000..d5489b8 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/RecordServiceImpl.java @@ -0,0 +1,36 @@ +package com.hnac.hzims.scheduled.service.operation.impl; + +import com.hnac.hzims.operational.config.entity.StAlarmRecordEntity; +import com.hnac.hzims.scheduled.mapper.operation.RecordMapper; +import com.hnac.hzims.scheduled.service.operation.RecordService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.Date; + +/** + * @author ysj + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class RecordServiceImpl extends BaseServiceImpl implements RecordService { + + /** + * 添加告警 + * @param stationId + * @param realId + * @return + */ + @Override + public Long insertAlert(String stationId, String realId) { + StAlarmRecordEntity record = new StAlarmRecordEntity(); + record.setStationId(stationId); + record.setRealId(realId); + record.setStatus(0); + record.setCreateTime(new Date()); + return this.baseMapper.insertReturnId(record); + } +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/StationAttrConfigServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/StationAttrConfigServiceImpl.java new file mode 100644 index 0000000..d928365 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/StationAttrConfigServiceImpl.java @@ -0,0 +1,34 @@ +package com.hnac.hzims.scheduled.service.operation.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.hnac.hzims.operational.station.entity.StationAttrConfigEntity; +import com.hnac.hzims.scheduled.mapper.operation.StationAttrConfigMapper; +import com.hnac.hzims.scheduled.service.operation.StationAttrConfigService; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.utils.CollectionUtil; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author ysj + */ +@Service +@Slf4j +public class StationAttrConfigServiceImpl extends BaseServiceImpl implements StationAttrConfigService { + + @Override + public List getHideList() { + List list = this.list(new QueryWrapper() {{ + eq("ENABLE_SHOW", false); + eq("IS_DELETED",0); + }}); + if(CollectionUtil.isEmpty(list)){ + return new ArrayList<>(); + } + return list.stream().map(StationAttrConfigEntity::getEmName).collect(Collectors.toList()); + } +} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/StationAttributeServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/StationAttributeServiceImpl.java new file mode 100644 index 0000000..122278e --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/StationAttributeServiceImpl.java @@ -0,0 +1,36 @@ +package com.hnac.hzims.scheduled.service.operation.impl; + +import com.hnac.hzims.operational.station.entity.StationAttributeEntity; +import com.hnac.hzims.scheduled.mapper.operation.StationAttributeMapper; +import com.hnac.hzims.scheduled.service.operation.StationAttributeService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.utils.CollectionUtil; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @author hx + */ +@Service +@Slf4j +@RequiredArgsConstructor +public class StationAttributeServiceImpl extends BaseServiceImpl implements StationAttributeService { + + /** + * 获取集中监控监测点单位 + * @return + */ + @Override + public Map PointUnit() { + List list = this.baseMapper.PointUnit(); + if(CollectionUtil.isEmpty(list)){ + return null; + } + return list.stream().collect(Collectors.toMap(StationAttributeEntity::getAttributes, StationAttributeEntity::getUnit)); + } +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/StationServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/StationServiceImpl.java new file mode 100644 index 0000000..8735909 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/StationServiceImpl.java @@ -0,0 +1,19 @@ +package com.hnac.hzims.scheduled.service.operation.impl; + +import com.hnac.hzims.operational.station.entity.StationEntity; +import com.hnac.hzims.scheduled.mapper.operation.StationMapper; +import com.hnac.hzims.scheduled.service.operation.StationService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * @author hx + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class StationServiceImpl extends BaseServiceImpl implements StationService { + +} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/UseServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/UseServiceImpl.java new file mode 100644 index 0000000..82ba5b1 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/UseServiceImpl.java @@ -0,0 +1,99 @@ +package com.hnac.hzims.scheduled.service.operation.impl; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hnac.hzims.operational.fill.entity.UseEntity; +import com.hnac.hzims.operational.main.vo.UsrPowerVo; +import com.hnac.hzims.scheduled.mapper.operation.UseMapper; +import com.hnac.hzims.scheduled.service.operation.UseService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.utils.CollectionUtil; +import org.springblade.core.tool.utils.DateUtil; +import org.springframework.stereotype.Service; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * @author ysj + * @date 2023/04/10 11:16:07 + * @version 4.0.0 + */ +@Slf4j +@Service +@AllArgsConstructor +public class UseServiceImpl extends BaseServiceImpl implements UseService { + + /** + * 根据时间、机构查询用电量 + * @param date 时间: 年 - yyyy/月 yyyy-mm/日 yyyy-mm-dd + * @param station 所属机构 + * @return + */ + @Override + public Float use(String date, String station) { + List powers = this.list(Wrappers.lambdaQuery() + .likeRight(UseEntity::getFillDate,date) + .eq(UseEntity::getStationCode,station) + ); + if(CollectionUtil.isEmpty(powers)){ + return 0f; + } + return (float) powers.stream().mapToDouble(UseEntity::getEmploy).sum(); + } + + /** + * 查询30天填报用电量 + * @param day : 结束日期 yyyy-MM-dd + * @param station 站点编码 + * @return + */ + @Override + public List use30Day(String day, String station) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtil.parse(day,DateUtil.PATTERN_DATE)); + String end = DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATE); + calendar.add(Calendar.DAY_OF_MONTH,-29); + String start = DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATE); + List records = this.list(Wrappers.lambdaQuery() + .between(UseEntity::getFillDate,start,end) + .eq(UseEntity::getStationCode,station) + ); + if(CollectionUtil.isEmpty(records)){ + return new ArrayList<>(); + } + return records.stream().map(record->{ + UsrPowerVo use = new UsrPowerVo(); + use.setDate(record.getFillDate()); + if(Math.abs(record.getEmploy()) <= 0){ + use.setUsrPower(0f); + }else{ + use.setUsrPower(Float.parseFloat(record.getEmploy().toString())); + } + return use; + }).collect(Collectors.toList()); + } + + /** + * 查询近3年的填报用电量 + * @param start + * @param end + * @param station + * @return + */ + @Override + public Map generateThreeYear(String start, String end, String station) { + List records = this.list(Wrappers.lambdaQuery() + .between(UseEntity::getFillDate,start,end) + .eq(UseEntity::getStationCode,station) + ); + if(CollectionUtil.isEmpty(records)){ + return new HashMap<>(); + + } + return records.stream().peek(record-> record.setFillDate(DateUtil.format(DateUtil.parse(record.getFillDate(),"yyyy-MM"),"yyyy-MM") + "-01")). + collect(Collectors.toMap(UseEntity::getFillDate, value->Float.parseFloat(value.getEmploy().toString()),Float::sum)); + } + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/vo/RealAttributeVo.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/vo/RealAttributeVo.java deleted file mode 100644 index 00ea9d8..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/vo/RealAttributeVo.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.hnac.hzims.scheduled.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 15:27 - */ -@Data -public class RealAttributeVo implements Serializable { - - @ApiModelProperty("属性名称") - private String name; - - @ApiModelProperty("属性数值") - private String value; - - @ApiModelProperty("属性单位") - private String unit; - - @ApiModelProperty("属性类型：1-遥信 2-遥测") - private Integer type; - - @ApiModelProperty("属性实时数据Id") - private String realId; - - @ApiModelProperty("告警Id") - private Long id; - - @ApiModelProperty("属性状态：0：正常、1：预警、2：告警、3：空值、4：黄色、5：橙色") - private int status; - - @ApiModelProperty("属性质量") - private int quality; - - @ApiModelProperty("属性时间") - private String time; - - @ApiModelProperty("属性故障ID") - private String fdpFaultId; - - @ApiModelProperty("监测点") - private String fdpMonitorId; - - @ApiModelProperty("属性故障值") - private Double fdpRate; -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/vo/RealDeviceVo.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/vo/RealDeviceVo.java deleted file mode 100644 index 330a5df..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/vo/RealDeviceVo.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.hnac.hzims.scheduled.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 15:26 - */ -@Data -public class RealDeviceVo implements Serializable { - - @ApiModelProperty("设备编号") - private String deviceCode; - - @ApiModelProperty("设备名称") - private String deviceName; - - @ApiModelProperty("设备状态") - private Integer state; - - @ApiModelProperty("排序字段") - private Integer sort; - - @ApiModelProperty("设备属性集合") - private List attbtList; -} - diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/vo/RealStationVo.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/vo/RealStationVo.java deleted file mode 100644 index 00a0c9e..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/vo/RealStationVo.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.hnac.hzims.scheduled.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 15:24 - */ -@Data -public class RealStationVo implements Serializable { - - @ApiModelProperty("站点Id") - private String stationCode; - - @ApiModelProperty("站点名称") - private String stationName; - - @ApiModelProperty("站点机构Id") - private Long stationDeptId; - - @ApiModelProperty("站点类型") - private String serverType; - - @ApiModelProperty("当前天气") - private WeatherVo nowWater; - - @ApiModelProperty("总有功率") - private Double powerSum; - - @ApiModelProperty("降水") - private String precipitation; - - @ApiModelProperty("最大前池水位") - private Double waterLevelMax; - - @ApiModelProperty("前池水位") - private Double waterLevel; - - @ApiModelProperty("设备集合") - private List deviceList; - - @ApiModelProperty("站点状态 : 0-正常 1-数据中断") - private Integer status; - - @ApiModelProperty("排序") - private Integer sort; -} - diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/vo/StationRealVo.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/vo/StationRealVo.java deleted file mode 100644 index 8e9d7da..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/vo/StationRealVo.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hnac.hzims.scheduled.vo; - -import lombok.Data; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 11:43 - */ -@Data -public class StationRealVo { - - private String station; - - private String[] realId; -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/vo/WeatherVo.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/vo/WeatherVo.java deleted file mode 100644 index bd46d22..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/vo/WeatherVo.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.hnac.hzims.scheduled.vo; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Author WL - * @Version v1.0 - * @Serial 1.0 - * @Date 2023/5/19 15:25 - */ -@Data -public class WeatherVo implements Serializable { - - /**当前天气状况和图标的代码，图标可通过天气状况和图标下载; //100**/ - private String icon; - - /**实况温度，默认单位：摄氏度; //21**/ - private String temp; - - /**实况天气状况的文字描述，包括阴晴雨雪等天气状态的描述; //晴**/ - private String text; - - /**预报当天最高温度; //4**/ - private String tempMax; - - /**预报当天最低温度; //-5**/ - private String tempMin; -} diff --git a/hzims-service/hzims-scheduled/src/main/resources/application.yml b/hzims-service/hzims-scheduled/src/main/resources/application.yml deleted file mode 100644 index e738d56..0000000 --- a/hzims-service/hzims-scheduled/src/main/resources/application.yml +++ /dev/null @@ -1,208 +0,0 @@ -#服务器端口 -server: - port: 8501 - -#数据源配置 -spring: - cloud: - nacos: - discovery: - server-addr: 175.6.40.67:10056 - config: - server-addr: 175.6.40.67:10056 - application: - name: hzims-scheduled - main: - allow-bean-definition-overriding: true - #排除DruidDataSourceAutoConfigure - autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure - datasource: - dynamic: - primary: operational #设置默认的数据源或者数据源组,默认值即为master - strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源 - datasource: - operational: - url: jdbc:mysql://192.168.1.3:3576/dev_hzims_operation?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true - username: root - password: 123 - redis: - # redis数据库索引（默认为0），我们使用索引为0的数据库，避免和其他数据库冲突 - database: 0 - # redis服务器地址（默认为localhost） - host: 192.168.1.3 - # redis端口（默认为6379） - port: 3577 - # redis访问密码（默认为空） - password: 1qaz2WSX@redis - -#xxl: -# job: -# accessToken: '' -# admin: -# addresses: http://192.168.1.3:7009/xxl-job-admin -# executor: -# appname: hzims-operational -# ip: 192.168.1.3 -# logpath: /data/applogs/xxl-job/jobhandler -# logretentiondays: -1 -# port: 28501 - -xxl: - job: - accessToken: '' - admin: - addresses: http://192.168.5.128:9080/xxl-job-admin - executor: - appname: hzims-operational - ip: 192.168.18.232 - logpath: /data/applogs/xxl-job/jobhandler - logretentiondays: -1 - port: 28501 - - -#mybatis-plus配置 -mybatis-plus: - mapper-locations: classpath*:/mapper/**/*.xml - #实体扫描，多个package用逗号或者分号分隔 -# typeAliasesPackage: com.hnac.hzims.**.entity - configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - -#swagger扫描路径配置 -swagger: - base-packages: - - org.springbalde - - com.hnac - -hzims: - # 视频配置地址随机码 - video: - random-code: qnrld30yto85cji5 - # 视频配置秘钥属性 - videoProperties: - appKey: 21111042 - videoHost: 42.192.39.246:443 - appSecret: QXRevZ2AQeXtmlYZT6Rf - equipment: - emInfo: - code: hzims:equipment:emInfo:deviceCode.stationDeviceCode - emInfoList: hzims:equipment:emInfo:deviceCode.emInfoList - fdp: - redisData: hzims:equipment:fdp:fault.data.realIdAndValueList - greaterThan: 0.3 - lessThan: 0.9 - beEqualOrGreaterThan: 0.9 - alert: - # 接收告警的websocket url - ws-url: wss://175.6.40.67:9036/api/hzinfo-data-socket/websocket/soe - config: - #接收遥测或遥信实时数据的websocket url - ws-url: wss://175.6.40.67:9036/api/hzinfo-data-socket/websocket/data - level: - ws-url: wss://175.6.40.67:9036/api/hzinfo-data-socket/websocket/alarm - pdf: - # pdf文件存储路径，请配置绝对路径 - #file-path: /data/inspect/pdf/file - file-path: D:/data/hzinfo/file # windows - operation: - access: - task-key: hzims:operation:access:task - alert: - saveDefectIsOpen: true - save: - area: - url: http://49.234.126.72:8255/apiIntroduction/demo/saveHzimsArea - station: - url: http://49.234.126.72:8255/apiIntroduction/demo/saveHzimsStation - defect: - repair: /data/hzims/operational/defect/repair/应急抢修单.docx - area: - report: hzims.operation.area.report - monitor: - station: hzims:operation:monitor:station - realId : hzims:operation:monitor:realId - region: - areaDutyInfoKey: hzims:operation:region:areaDutyInfoKey - deviceClassifyKey: hzims.operation.region.deviceClassifyKey - projectDepartmentId: 200000000000101 - projectDepartmentName: 智能运维事业部 - notInDept: 2000000000001010048,2000000000001010049,2000000000001010050 - tenantId: 200000 - #工单返回记录(暂存) - workOrder: - access: hzims:operation:workOrder.access - defect: hzims:operation:workOrder.defect - task: - # 消息推送存入redis的key值 - templateCode: - maintenance: - taskDispose: hzinfo:operation:maintenance:task - # 消息推送code - jgPushCode: ops-push - comprehensiveD: hzims:operation:comprehensiveD:real.time - realIdKey: hzims:operation:comprehensiveD:realIdKey.realData - lastDayRealIdKey: hzims:operation:comprehensiveD:lastDayRealIdKey.realData - realIdKeyGather: hzims:operation:comprehensiveD:realIdKeyGather.realData - homePage: - charge: - url: https://www.hznychh.cn/api/charging-manage/manage/external/provide?secretKey=f5aee9fe24e4d1d80eb7564414392bc3 - activePowerKey: hzims:operation:homePage:activePowerKey - jointRelayKey: hzims:operation:homePage:jointRelayKey - systemMonitoring: - hydropowerStation: - hisData: hzims:operation:homePage:systemMonitoring:hydropowerStation:hisData:. - hisDataActivePower: hzims:operation:homePage:systemMonitoring:hydropowerStation:hisDataActivePower:. - theDayHydrograph: hzims:operation:homePage:systemMonitoring:hydropowerStation:theDayHydrograph:. - yearGeneration: hzims:operation:homePage:systemMonitoring:hydropowerStation:yearGeneration.data - hisDataNew: hzims:operation:homePage:systemMonitoring:hydropowerStation:hisDataNew - theDayHydrographNew: hzims:operation:homePage:systemMonitoring:hydropowerStation:theDayHydrographNew - alarm: - # "0-默认", "1-系统", "2-告警", "3-故障", "4-用户操作", "5-遥测越限", "6-遥信变位", "7-注册信息", "8-信息提示", "9-设备巡检", "10-遥控操作", "11-遥测越限恢复","12-未定义","13-通讯中断","14-数据异常" - types: 3,2,5,13,14 - -category: - id: 1384429129110360065 - -sanya: - one: 2000000000001010048 - tow: 2000000000001010049 - hoop: 2000000000001010050 - -defect: - # 超时自动甄别时间间隔：单位（小时） - discriminateDeadline: 1 - # 默认计划工时：单位（小时） - defaultPlanHoure: 8 - -blade: - data: - sdk: - enabled: true - url: http://175.6.40.67:37681/api/hzinfo-data-config - appId: '1635888805125099521' - appSecret: f4b6a4dc696b36445d2e5d38bbab2417 - redisIp: 192.168.1.13 - redisPort: 3577 - password: L_MM&h=+Nm&p)U9sk.uH - maxKeys: 1000 - data-scope: - enabled: false - lock: - enabled: true - address: redis://192.168.1.3:3577 - password: - database: 0 - ssl: false - -url: - video: - stationsPath: http://localhost:10001/stations - monitorsPath: http://localhost:10001/monitor - login: https://175.6.40.67:9300/hzApi/auth/mix/login?tenantId=200000&account=videoViewers&pwd=e10adc3949ba59abbe56e057f20f883e&grant_type=password&scope=all&type=account - water-out: - #工单受理 - orderCrtPackage: http://175.6.40.67:9021/api/water-out/orderCrt/package - orderCrtGrabPackage: http://175.6.40.67:9021/api/water-out/orderCrt/grabPackage - - diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/equipment/WorkshopInfoMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/equipment/WorkshopInfoMapper.xml new file mode 100644 index 0000000..933d153 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/equipment/WorkshopInfoMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/AbnormalAlarmMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/AbnormalAlarmMapper.xml index 49c1076..aab621f 100644 --- a/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/AbnormalAlarmMapper.xml +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/AbnormalAlarmMapper.xml @@ -2,16 +2,10 @@ - - select distinct station_id from hzims_abnormal_alarm where is_deleted = 0 - and type in (13,14) - and `STATUS` = 0 + and type in (13,14) + and `STATUS` = 0 diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/GenerateMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/GenerateMapper.xml new file mode 100644 index 0000000..2f3e18b --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/GenerateMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/ModelStationMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/ModelStationMapper.xml new file mode 100644 index 0000000..df6a033 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/ModelStationMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/PowerMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/PowerMapper.xml new file mode 100644 index 0000000..73820fc --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/PowerMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + ID, MON, INSTALLED_CAPACITY , PLANNED_POWER_YEAR , PLANNED_POWER_MON , POWER_MON , POWER_RATE_MON ,POWER_YEAR , + POWER_RATE_YEAR , DOUBLE_QUALIFY_RATE , TYPE , TENANT_ID, STATUS, CREATE_TIME, UPDATE_TIME, CREATE_USER, UPDATE_USER, + IS_DELETED, CREATE_DEPT + + + diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/RecordMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/RecordMapper.xml new file mode 100644 index 0000000..6086a5f --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/RecordMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + SELECT LAST_INSERT_ID() AS id + + insert into hy_st_alarm_record (id, station_id, real_id, + status, phone_record, process_desc, + create_time, processor, process_time + ) + values (#{id,jdbcType=BIGINT}, #{stationId,jdbcType=VARCHAR}, #{realId,jdbcType=VARCHAR}, + #{status,jdbcType=TINYINT}, #{phoneRecord,jdbcType=VARCHAR}, #{processDesc,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, #{processor,jdbcType=VARCHAR}, #{processTime,jdbcType=TIMESTAMP} + ) + + diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/StAlarmRecordMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/StAlarmRecordMapper.xml deleted file mode 100644 index cfe513d..0000000 --- a/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/StAlarmRecordMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - SELECT LAST_INSERT_ID() AS id - - insert into hy_st_alarm_record (id, station_id, real_id, - status, phone_record, process_desc, - create_time, processor, process_time - ) - values (#{id,jdbcType=BIGINT}, #{stationId,jdbcType=VARCHAR}, #{realId,jdbcType=VARCHAR}, - #{status,jdbcType=TINYINT}, #{phoneRecord,jdbcType=VARCHAR}, #{processDesc,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}, #{processor,jdbcType=VARCHAR}, #{processTime,jdbcType=TIMESTAMP} - ) - - - \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/StationAttrConfigMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/StationAttrConfigMapper.xml new file mode 100644 index 0000000..bf7b1e0 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/StationAttrConfigMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/StationAttributeMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/StationAttributeMapper.xml new file mode 100644 index 0000000..525d6fc --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/StationAttributeMapper.xml @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/StationMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/StationMapper.xml new file mode 100644 index 0000000..23312d6 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/StationMapper.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/UseMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/UseMapper.xml new file mode 100644 index 0000000..021eaf7 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/UseMapper.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/CentralMonitorController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/CentralMonitorController.java index da4018a..0989365 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/CentralMonitorController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/CentralMonitorController.java @@ -3,7 +3,7 @@ package com.hnac.hzims.operational.config.controller; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.hnac.hzims.operational.config.service.CentralMonitorService; import com.hnac.hzims.operational.station.service.IRealMonitorService; -import com.hnac.hzims.operational.station.vo.RealStationVo; +import com.hnac.hzims.operational.main.vo.RealStationVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/CentralMonitorService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/CentralMonitorService.java index 46bedcf..040e7c9 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/CentralMonitorService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/CentralMonitorService.java @@ -1,7 +1,7 @@ package com.hnac.hzims.operational.config.service; -import com.hnac.hzims.operational.station.vo.RealStationVo; +import com.hnac.hzims.operational.main.vo.RealStationVo; import java.util.List; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/CentralMonitorServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/CentralMonitorServiceImpl.java index 07b632d..2124c9c 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/CentralMonitorServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/CentralMonitorServiceImpl.java @@ -4,7 +4,7 @@ import com.hnac.hzims.operational.config.service.CentralMonitorService; import com.hnac.hzims.operational.main.constant.HomePageConstant; import com.hnac.hzims.operational.station.entity.StationEntity; import com.hnac.hzims.operational.station.service.IStationService; -import com.hnac.hzims.operational.station.vo.RealStationVo; +import com.hnac.hzims.operational.main.vo.RealStationVo; import lombok.RequiredArgsConstructor; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.CollectionUtil; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java index 5114295..95e30cd 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java @@ -236,7 +236,7 @@ public class StAlamRecordServiceImpl extends BaseServiceImpl stFocusPropertiesEntity.getUpperUpperLimit() || Double.valueOf(value) < stFocusPropertiesEntity.getLowerLowerLimit())) { if (alarmList.size() > 0) { - time = new Date().getTime() - alarmList.get(0).getProcessTime().getTime(); + time = System.currentTimeMillis() - alarmList.get(0).getProcessTime().getTime(); } if ((recordList.size() == 0 && alarmList.size() == 0) || (time / 1000 / 60 > 30 && recordList.size() == 0)) { isWarn = setStAlarmRecordEntity(dataSet, stFocusPropertiesEntity, isWarn, 2, true); @@ -251,7 +251,7 @@ public class StAlamRecordServiceImpl extends BaseServiceImpl stFocusPropertiesEntity.getUpperLimit() && Double.valueOf(value) < stFocusPropertiesEntity.getUpperUpperLimit()) || (Double.valueOf(value) > stFocusPropertiesEntity.getLowerLowerLimit() && Double.valueOf(value) < stFocusPropertiesEntity.getLowerLimit()))) { if (alarmList.size() > 0) { - time = new Date().getTime() - alarmList.get(0).getProcessTime().getTime(); + time = System.currentTimeMillis() - alarmList.get(0).getProcessTime().getTime(); } if ((recordList.size() == 0 && alarmList.size() == 0) || (time / 1000 / 60 > 30 && recordList.size() == 0)) { isWarn = setStAlarmRecordEntity(dataSet, stFocusPropertiesEntity, isWarn, ConfigStatus.ConfigStatusEnum.RED.getStatus(), false); @@ -728,7 +728,7 @@ public class StAlamRecordServiceImpl extends BaseServiceImpl getFaultList(String code) { List stations = this.getStationByUserAuth(code);; - if(CollectionUtil.isEmpty(stations)){ + /*if(CollectionUtil.isEmpty(stations)){ return null; } String result = fdpMonitorClient.getFaultList(); @@ -738,7 +738,21 @@ public class StAlamRecordServiceImpl extends BaseServiceImpl list = JSONArray.parseArray(result,FaultVo.class); if(CollectionUtil.isEmpty(list)){ return new ArrayList<>(); - } + }*/ + List list = new ArrayList<>(); + FaultVo test =new FaultVo(); + test.setInfo("可是我不会忘"); + test.setFtype("1"); + test.setFaultId("114233824210698186"); + test.setName("爱来爱去空一场"); + test.setStationName("海南三亚大隆一级电站"); + test.setStation("902100000026"); + test.setStatus("0"); + test.setCreateTime("2023-06-01 09:55:33"); + test.setOrd("1"); + test.setFtype("1"); + test.setFinfo("你说人这东西可信不可信，骗子脸上又不会写字"); + list.add(test); Map map = stations.stream().collect(Collectors.toMap(StationEntity::getCode,StationEntity::getName)); // 查询已处理预警数据 List handles = handleService.handles(Collections.singletonList(AbnormalAlarmConstant.EARLY_WARNING),null); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/vo/StationRealVo.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/vo/StationRealVo.java deleted file mode 100644 index e61f1d2..0000000 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/vo/StationRealVo.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hnac.hzims.operational.config.vo; - -import lombok.Data; - -@Data -public class StationRealVo { - - private String station; - - private String[] realId; - -} diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java index 8a6cb12..f1f74b4 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java @@ -269,6 +269,7 @@ public class HydropowerServiceImpl implements HydropowerService { stationList.forEach(station -> { // 站点设备集合 List stationDevices = devices.stream().filter(device -> device.getCreateDept().equals(station.getRefDept())).collect(Collectors.toList()); + log.error("load_power_data station :" + station.getCode() + "==== device :" + stationDevices ); Map generateMap = this.getGenerateYear(station,stationDevices,start,end); if(MapUtils.isEmpty(generateMap)){ return; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/RealMonitorServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/RealMonitorServiceImpl.java index 7150980..9cd48e0 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/RealMonitorServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/RealMonitorServiceImpl.java @@ -27,10 +27,10 @@ import com.hnac.hzims.operational.station.service.IRealMonitorService; import com.hnac.hzims.operational.station.service.IStationAttrConfigService; import com.hnac.hzims.operational.station.service.IStationAttributeService; import com.hnac.hzims.operational.station.service.IStationService; -import com.hnac.hzims.operational.station.vo.RealAttributeVo; -import com.hnac.hzims.operational.station.vo.RealDeviceVo; -import com.hnac.hzims.operational.station.vo.RealStationVo; -import com.hnac.hzims.operational.station.vo.WeatherVo; +import com.hnac.hzims.operational.main.vo.RealAttributeVo; +import com.hnac.hzims.operational.main.vo.RealDeviceVo; +import com.hnac.hzims.operational.main.vo.RealStationVo; +import com.hnac.hzims.operational.main.vo.WeatherVo; import com.hnac.hzinfo.sdk.v5.redis.RedisClient; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/vo/RealAttributeVo.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/vo/RealAttributeVo.java deleted file mode 100644 index 7e6c9c2..0000000 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/vo/RealAttributeVo.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.hnac.hzims.operational.station.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -public class RealAttributeVo implements Serializable { - - @ApiModelProperty("属性名称") - private String name; - - @ApiModelProperty("属性数值") - private String value; - - @ApiModelProperty("属性单位") - private String unit; - - @ApiModelProperty("属性类型：1-遥信 2-遥测") - private Integer type; - - @ApiModelProperty("属性实时数据Id") - private String realId; - - @ApiModelProperty("告警Id") - private Long id; - - @ApiModelProperty("属性状态：0：正常、1：预警、2：告警、3：空值、4：黄色、5：橙色") - private int status; - - @ApiModelProperty("属性质量") - private int quality; - - @ApiModelProperty("属性时间") - private String time; - - @ApiModelProperty("属性故障ID") - private String fdpFaultId; - - @ApiModelProperty("监测点") - private String fdpMonitorId; - - @ApiModelProperty("属性故障值") - private Double fdpRate; -} diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/vo/RealDeviceVo.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/vo/RealDeviceVo.java deleted file mode 100644 index 5d7319e..0000000 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/vo/RealDeviceVo.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hnac.hzims.operational.station.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -public class RealDeviceVo implements Serializable { - - @ApiModelProperty("设备编号") - private String deviceCode; - - @ApiModelProperty("设备名称") - private String deviceName; - - @ApiModelProperty("设备状态") - private Integer state; - - @ApiModelProperty("排序字段") - private Integer sort; - - @ApiModelProperty("设备属性集合") - private List attbtList; -} diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/vo/RealStationVo.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/vo/RealStationVo.java deleted file mode 100644 index 876eaf5..0000000 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/vo/RealStationVo.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hnac.hzims.operational.station.vo; - -import io.swagger.annotations.ApiModelProperty; -import io.swagger.models.auth.In; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -public class RealStationVo implements Serializable { - - @ApiModelProperty("站点Id") - private String stationCode; - - @ApiModelProperty("站点名称") - private String stationName; - - @ApiModelProperty("站点机构Id") - private Long stationDeptId; - - @ApiModelProperty("站点类型") - private String serverType; - - @ApiModelProperty("当前天气") - private WeatherVo nowWater; - - @ApiModelProperty("总有功率") - private Double powerSum; - - @ApiModelProperty("降水") - private String precipitation; - - @ApiModelProperty("最大前池水位") - private Double waterLevelMax; - - @ApiModelProperty("前池水位") - private Double waterLevel; - - @ApiModelProperty("设备集合") - private List deviceList; - - @ApiModelProperty("站点状态 : 0-正常 1-数据中断") - private Integer status; - - @ApiModelProperty("排序") - private Integer sort; -} diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/vo/WeatherVo.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/vo/WeatherVo.java deleted file mode 100644 index fb9b7b3..0000000 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/vo/WeatherVo.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hnac.hzims.operational.station.vo; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class WeatherVo implements Serializable { - - /**当前天气状况和图标的代码，图标可通过天气状况和图标下载; //100**/ - private String icon; - - /**实况温度，默认单位：摄氏度; //21**/ - private String temp; - - /**实况天气状况的文字描述，包括阴晴雨雪等天气状态的描述; //晴**/ - private String text; - - /**预报当天最高温度; //4**/ - private String tempMax; - - /**预报当天最低温度; //-5**/ - private String tempMin; -} From dda76a358c72730ed9b4f5c1c907edcf9f7a9440 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Tue, 6 Jun 2023 17:25:13 +0800 Subject: [PATCH 07/14] =?UTF-8?q?#=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=8A=BD=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/StAlamRecordServiceImpl.java | 32 ++++++---------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java index 95e30cd..e43b935 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java @@ -728,7 +728,7 @@ public class StAlamRecordServiceImpl extends BaseServiceImpl getFaultList(String code) { List stations = this.getStationByUserAuth(code);; - /*if(CollectionUtil.isEmpty(stations)){ + if(CollectionUtil.isEmpty(stations)){ return null; } String result = fdpMonitorClient.getFaultList(); @@ -737,29 +737,15 @@ public class StAlamRecordServiceImpl extends BaseServiceImpl list = JSONArray.parseArray(result,FaultVo.class); if(CollectionUtil.isEmpty(list)){ - return new ArrayList<>(); - }*/ - List list = new ArrayList<>(); - FaultVo test =new FaultVo(); - test.setInfo("可是我不会忘"); - test.setFtype("1"); - test.setFaultId("114233824210698186"); - test.setName("爱来爱去空一场"); - test.setStationName("海南三亚大隆一级电站"); - test.setStation("902100000026"); - test.setStatus("0"); - test.setCreateTime("2023-06-01 09:55:33"); - test.setOrd("1"); - test.setFtype("1"); - test.setFinfo("你说人这东西可信不可信，骗子脸上又不会写字"); - list.add(test); - Map map = stations.stream().collect(Collectors.toMap(StationEntity::getCode,StationEntity::getName)); - // 查询已处理预警数据 - List handles = handleService.handles(Collections.singletonList(AbnormalAlarmConstant.EARLY_WARNING),null); - if(CollectionUtil.isEmpty(handles)){ - return list.stream().filter(fault -> map.containsKey(fault.getStation())).peek(o-> o.setStationName(map.get(o.getStation()))).collect(Collectors.toList()); + return null; } - return list.stream().filter(fault -> !handles.stream().map(AlarmHandleEntity::getAlarmId).collect(Collectors.toList()).contains(fault.getFaultId()) && map.containsKey(fault.getStation())).peek(o-> o.setStationName(map.get(o.getStation()))).collect(Collectors.toList()); + log.error("fault_list_stations: {}",stations); + log.error("fault_list_list: {}",list); + Map map = stations.stream().collect(Collectors.toMap(StationEntity::getCode,StationEntity::getName)); + return list.stream().filter(fault -> map.containsKey(fault.getStation())).map(o->{ + o.setStationName(map.get(o.getStation())); + return o; + }).collect(Collectors.toList()); } From e04a7bf95543acf4bf7f5e59b04e21ce7a9d6b87 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Wed, 7 Jun 2023 08:57:13 +0800 Subject: [PATCH 08/14] =?UTF-8?q?#=20=E6=8E=A5=E7=AB=99=E7=AB=99=E7=82=B9?= =?UTF-8?q?=E6=8E=A8=E9=80=81FDP=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hnac/hzims/fdp/request/StationInfoReq.java | 3 +++ .../hnac/hzims/fdp/service/impl/FdpQuestionServiceImpl.java | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/request/StationInfoReq.java b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/request/StationInfoReq.java index c4e56ed..d77141c 100644 --- a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/request/StationInfoReq.java +++ b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/request/StationInfoReq.java @@ -36,4 +36,7 @@ public class StationInfoReq implements Serializable { @ApiModelProperty("站点描述") private String stationDesc; + @ApiModelProperty("租户ID") + private String tenantId; + } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpQuestionServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpQuestionServiceImpl.java index a70d510..44b498a 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpQuestionServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpQuestionServiceImpl.java @@ -20,6 +20,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.logger.BladeLogger; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.StringUtil; @@ -51,13 +52,16 @@ public class FdpQuestionServiceImpl implements IFdpQuestionService { R stationResult = stationClient.getStationByCode(stationCode); if(stationResult.isSuccess()) { StationEntity stationEntity = stationResult.getData(); + log.info("请求体为：{}",AuthUtil.getTenantId()); StationInfoReq infoReq = StationInfoReq.builder() - .stationId(stationCode) - .stationName(stationEntity.getName()) - .type(this.getStationType(stationEntity.getType())) - .stationDesc(Optional.ofNullable(stationDesc).orElse("")) + .stationId(stationCode) + .stationName(stationEntity.getName()) + .type(this.getStationType(stationEntity.getType())) + .stationDesc(Optional.ofNullable(stationDesc).orElse("")) + .tenantId("200000") .build(); if(Func.isNotEmpty(infoReq.getType())) { + log.info("请求体为：{}",JSON.toJSONString(infoReq)); HttpResponse httpResponse = HttpRequest.post(fdpUrlConfiguration.getSubmitStationInfo()) .body(JSON.toJSONString(infoReq)) .execute(); From 8a89d867993bfd31d78d2467841a0bc6db239d11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Wed, 7 Jun 2023 10:52:41 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E7=A5=A8=E6=A8=A1=E5=9D=97,=E5=90=AF=E5=8A=A8=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E5=BE=85=E5=A4=84=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hnac/hzims/message/MessageConstants.java | 1 + .../entity/StandardTicketInfoEntity.java | 58 ++++ .../constant/TicketProcessConstant.java | 6 + .../consumer/StandardWorkTicketConsumer.java | 7 +- .../controller/ProcessDictController.java | 20 +- .../processflow/strategy/core/ProcessIdWorker.java | 2 +- .../serviceimpl/OneTicketProcessServiceImpl.java | 6 +- .../OperationTicketProcessServiceImpl.java | 69 ++++ .../controller/OperationTicketController.java | 47 +++ .../service/OperationTicketService.java | 28 ++ .../service/impl/OperationTicketServiceImpl.java | 360 +++++++++++++++++++++ .../service/impl/TicketProcessServiceImpl.java | 153 +++++---- .../vo/operation/StandardTicketInfoVo.java | 120 +++++++ .../vo/operation/StandardTicketMeasureVo.java | 57 ++++ 14 files changed, 863 insertions(+), 71 deletions(-) create mode 100644 hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/OperationTicketProcessServiceImpl.java create mode 100644 hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/OperationTicketController.java create mode 100644 hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/OperationTicketService.java create mode 100644 hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java create mode 100644 hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/operation/StandardTicketInfoVo.java create mode 100644 hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/operation/StandardTicketMeasureVo.java diff --git a/hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/MessageConstants.java b/hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/MessageConstants.java index 7b7fbdb..6741a3f 100644 --- a/hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/MessageConstants.java +++ b/hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/MessageConstants.java @@ -54,6 +54,7 @@ public class MessageConstants { SAFE("safe","安全消息"), ACCESS("access","检修消息"), TICKETMESSAGE("ticket-message","工作票消息"), + OPERATIONTICKETMESSAGE("operation-ticket-message","操作票消息"), ; @Getter private String key; diff --git a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/standardTicket/entity/StandardTicketInfoEntity.java b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/standardTicket/entity/StandardTicketInfoEntity.java index 9d273d7..62c627d 100644 --- a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/standardTicket/entity/StandardTicketInfoEntity.java +++ b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/standardTicket/entity/StandardTicketInfoEntity.java @@ -125,4 +125,62 @@ public class StandardTicketInfoEntity extends TenantEntity implements Serializab @ApiModelProperty("是否评价") private Integer isEvaluate; + + + /** + * AA/AAA/AAAA由建站时建站人填写必须系统验证唯一性 + * 站点标识-两票编码 + */ + @ApiModelProperty("站点标识-两票编码") + private String signage; + + + /** + * 编号（原站点ID） + */ + @ApiModelProperty("编号（原站点ID）") + private String signageCode; + + + /** + * 流程状态' + */ + @ApiModelProperty("流程状态") + private Integer flowStatus; + + /** + * 流程描述 + */ + @ApiModelProperty("流程描述") + private String flowDescription; + + + /** + * 下一个审批人 + */ + @ApiModelProperty("下一个审批人") + private String nextStepOperator; + + + /** + * 用户Id + */ + @ApiModelProperty("用户Id") + private String flowUserId; + + + /** + * 当前任务名 + */ + @ApiModelProperty("当前任务名") + private String flowTaskName; + + + /** + * 当前任务名 + */ + @ApiModelProperty("当前任务名") + private String flowTaskId; + + } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/constant/TicketProcessConstant.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/constant/TicketProcessConstant.java index 7bef5ea..1ad02a8 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/constant/TicketProcessConstant.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/constant/TicketProcessConstant.java @@ -14,4 +14,10 @@ public class TicketProcessConstant { * 第一种工作票的key */ public static final String FIRST_TICKET_KEY = "networking"; + + + /** + * 操作票 + */ + public static final String OPERATION_TICKET_KEY = "moreActionBankDirect"; } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/consumer/StandardWorkTicketConsumer.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/consumer/StandardWorkTicketConsumer.java index 5936bed..956dc1e 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/consumer/StandardWorkTicketConsumer.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/consumer/StandardWorkTicketConsumer.java @@ -44,11 +44,12 @@ public class StandardWorkTicketConsumer implements IQueueConsume { WorkflowQueue ticker = new WorkflowQueue(); ticker.setProcessDefinitionKey(taskDefinitionKey); //判断执行具体的实现类 - ProcessService ticketService = ticketServiceList.stream().filter(item -> item.isWorkflowProcess(ticker)).findFirst().orElse(null); - if (ObjectUtils.isNotEmpty(ticketService)) { + ProcessService processService = + ticketServiceList.stream().filter(item -> item.isWorkflowProcess(ticker)).findFirst().orElse(null); + if (ObjectUtils.isNotEmpty(processService)) { //执行业务方法 try { - ticketService.calculate(response); + processService.calculate(response); } catch (Exception e) { e.printStackTrace(); //todo 业务出错误 做补偿 diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/controller/ProcessDictController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/controller/ProcessDictController.java index f6b6fdf..f267139 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/controller/ProcessDictController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/controller/ProcessDictController.java @@ -29,14 +29,24 @@ public class ProcessDictController { @GetMapping("/test") public void test(){ + // ProcessDict processDict = new ProcessDict(); + // processDict.setDictKey("networking"); + // processDict.setDictSort(0); + // processDict.setDictValue("workTicketFlow"); + // processDict.setDictLabel("第一种工作票"); + // processDict.setIsDefault("Y"); + // processDict.setRemark("第一种工作票"); + // processDict.setDictType("工作票"); + // processDictService.save(processDict); + ProcessDict processDict = new ProcessDict(); - processDict.setDictKey("networking"); + processDict.setDictKey("moreActionBankDirect"); processDict.setDictSort(0); - processDict.setDictValue("workTicketFlow"); - processDict.setDictLabel("第一种工作票"); + processDict.setDictValue("standardTicketFlow"); + processDict.setDictLabel("操作票"); processDict.setIsDefault("Y"); - processDict.setRemark("第一种工作票"); - processDict.setDictType("工作票"); + processDict.setRemark("操作票"); + processDict.setDictType("两票管理"); processDictService.save(processDict); } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/core/ProcessIdWorker.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/core/ProcessIdWorker.java index 6fcddf2..6e1fdf9 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/core/ProcessIdWorker.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/core/ProcessIdWorker.java @@ -136,7 +136,7 @@ public class ProcessIdWorker { //6. sequencing 大于等于1000 的话，从头开始 if (sequencing.get() >= 1000) { sequencing.compareAndSet(sequencing.get(), 1); - System.out.println("sequencing >= 1000 被执行呢"); + log.error("sequencing >= 1000 被执行呢"); redisTemplate.delete(key); // cacheMap.remove(key); return sequencing.get(); diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/OneTicketProcessServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/OneTicketProcessServiceImpl.java index 1255079..4b1c653 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/OneTicketProcessServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/OneTicketProcessServiceImpl.java @@ -47,13 +47,13 @@ public class OneTicketProcessServiceImpl extends ProcessAbstractService { */ @Override public Boolean isWorkflowProcess(WorkflowQueue flowQueue) { - log.info("是否执行开第一种工作票流程环节操作~~~~,流程ticket: {}", flowQueue); + log.info("是否执行开工作票流程环节操作~~~~,流程ticket: {}", flowQueue); String dictValue = processDictService.selectDictValueByKey(FIRST_TICKET_KEY); if (dictValue.equals(flowQueue.getProcessDefinitionKey())) { - log.info("已执行第一种开工作票流程环节操作~~~~"); + log.info("已执行工作票流程环节操作~~~~"); return true; } - log.error("未是否执行第一种开工作票流程环节操作，请联系管理员~~~~"); + log.error("未是否执行工作票流程环节操作，请联系管理员~~~~"); return false; } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/OperationTicketProcessServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/OperationTicketProcessServiceImpl.java new file mode 100644 index 0000000..7590575 --- /dev/null +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/OperationTicketProcessServiceImpl.java @@ -0,0 +1,69 @@ +package com.hnac.hzims.ticket.processflow.strategy.serviceimpl; + +import com.hnac.hzims.ticket.processflow.service.ProcessDictService; +import com.hnac.hzims.ticket.processflow.strategy.abstracts.ProcessAbstractService; +import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue; +import com.hnac.hzims.ticket.response.ProcessWorkFlowResponse; +import com.hnac.hzims.ticket.standardTicket.service.OperationTicketService; +import com.hnac.hzims.ticket.twoTicket.service.TicketProcessService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import static com.hnac.hzims.ticket.processflow.constant.TicketProcessConstant.OPERATION_TICKET_KEY; + +/** + * 开工作票流程实现类 + * + * @Author dfy + * @Version v1.0 + * @Serial 1.0 + * @Date 2023/3/28 8:47 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class OperationTicketProcessServiceImpl extends ProcessAbstractService { + + + + private final OperationTicketService operationTicketService; + + + + private final ProcessDictService processDictService; + + + + + + + + /** + * 设置执行那种实现类 + * + * @param flowQueue + * @return + */ + @Override + public Boolean isWorkflowProcess(WorkflowQueue flowQueue) { + log.info("是否执行开操作票流程环节操作~~~~,流程flowQueue: {}", flowQueue); + String dictValue = processDictService.selectDictValueByKey(OPERATION_TICKET_KEY); + if (dictValue.equals(flowQueue.getProcessDefinitionKey())) { + log.info("已执行操作票流程环节操作~~~~"); + return true; + } + log.error("未是否执行操作票流程环节操作，请联系管理员~~~~"); + return false; + } + + /** + * 两票管理业务方法 + * + * @param response + */ + @Override + public void calculate(ProcessWorkFlowResponse response) { + operationTicketService.findPending(response); + } +} diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/OperationTicketController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/OperationTicketController.java new file mode 100644 index 0000000..b47e1e2 --- /dev/null +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/OperationTicketController.java @@ -0,0 +1,47 @@ +package com.hnac.hzims.ticket.standardTicket.controller; + +import com.hnac.hzims.ticket.standardTicket.service.OperationTicketService; +import com.hnac.hzims.ticket.twoTicket.vo.operation.StandardTicketInfoVo; +import com.hnac.hzims.ticket.twoTicket.vo.process.WorkTicketVo; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.api.R; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 操作票 + * @Author WL + * @Version v1.0 + * @Serial 1.0 + * @Date 2023/6/6 13:46 + */ +@RequiredArgsConstructor +@Slf4j +@RequestMapping("/operation-ticket") +@RestController +public class OperationTicketController { + + + private final OperationTicketService operationTicketService; + + + /** + * 启动流程 + * + * @return + */ + @ApiOperation("启动流程") + @PostMapping("/startUp") + public R start(@RequestBody StandardTicketInfoVo StandardTicketInfoVo) { + operationTicketService.startUp(StandardTicketInfoVo); + return R.success("申请开票成功"); + } + + + + +} diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/OperationTicketService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/OperationTicketService.java new file mode 100644 index 0000000..f92497d --- /dev/null +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/OperationTicketService.java @@ -0,0 +1,28 @@ +package com.hnac.hzims.ticket.standardTicket.service; + +import com.hnac.hzims.ticket.response.ProcessWorkFlowResponse; +import com.hnac.hzims.ticket.twoTicket.vo.operation.StandardTicketInfoVo; +import com.hnac.hzims.ticket.twoTicket.vo.process.WorkTicketVo; + +/** + * @Author WL + * @Version v1.0 + * @Serial 1.0 + * @Date 2023/6/6 13:48 + */ +public interface OperationTicketService { + + + /** + * 启动流程 + * @param standardTicketInfoVo + */ + void startUp(StandardTicketInfoVo standardTicketInfoVo); + + + /** + * 待处理 + * @param response + */ + void findPending(ProcessWorkFlowResponse response); +} diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java new file mode 100644 index 0000000..7934a21 --- /dev/null +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java @@ -0,0 +1,360 @@ +package com.hnac.hzims.ticket.standardTicket.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.hnac.hzims.common.logs.utils.StringUtils; +import com.hnac.hzims.message.MessageConstants; +import com.hnac.hzims.message.dto.MessagePushRecordDto; +import com.hnac.hzims.message.fegin.IMessageClient; +import com.hnac.hzims.operational.station.entity.StationEntity; +import com.hnac.hzims.operational.station.feign.IStationClient; +import com.hnac.hzims.ticket.processflow.service.ProcessDictService; +import com.hnac.hzims.ticket.processflow.strategy.core.ProcessIdWorker; +import com.hnac.hzims.ticket.response.ProcessWorkFlowResponse; +import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity; +import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketMeasureEntity; +import com.hnac.hzims.ticket.standardTicket.service.IStandardTicketInfoService; +import com.hnac.hzims.ticket.standardTicket.service.IStandardTicketMeasureService; +import com.hnac.hzims.ticket.standardTicket.service.OperationTicketService; +import com.hnac.hzims.ticket.twoTicket.vo.operation.StandardTicketInfoVo; +import com.hnac.hzims.ticket.twoTicket.vo.operation.StandardTicketMeasureVo; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.math.NumberUtils; +import org.springblade.core.log.exception.ServiceException; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.flow.core.entity.BladeFlow; +import org.springblade.flow.core.feign.IFlowClient; +import org.springblade.system.feign.ISysClient; +import org.springblade.system.user.cache.UserCache; +import org.springblade.system.user.entity.User; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.time.Duration; +import java.time.Instant; +import java.time.LocalDateTime; +import java.util.*; +import java.util.stream.Collectors; + +import static com.hnac.hzims.ticket.processflow.constant.TicketProcessConstant.OPERATION_TICKET_KEY; + +/** + * @Author WL + * @Version v1.0 + * @Serial 1.0 + * @Date 2023/6/6 13:49 + */ + +@Slf4j +@Service +@RequiredArgsConstructor +public class OperationTicketServiceImpl implements OperationTicketService { + + private final IStandardTicketInfoService standardTicketInfoService; + + private final IStandardTicketMeasureService standardTicketMeasureService; + + private final IStationClient stationClient; + + + private final ProcessIdWorker processIdWorker; + + + private final ProcessDictService processDictService; + + + private final IFlowClient flowClient; + + + private final IMessageClient messageClient; + + + private final ISysClient sysClient; + + + /** + * 启动流程 + * + * @param standardTicketInfoVo + */ + @Override + public void startUp(StandardTicketInfoVo standardTicketInfoVo) { + log.info("执行 com.hnac.hzims.ticket.standardTicket.service.impl【startUp】 。。。方法"); + if (standardTicketInfoVo.getSignage() == null) { + throw new ServiceException("票据抬头未配置，请您到站点管理配置"); + } + StationEntity stationEntity = new StationEntity(); + stationEntity.setCode(standardTicketInfoVo.getSignageCode()); + R stationClientOne = stationClient.getOne(stationEntity); + if (!stationClientOne.isSuccess()) { + throw new IllegalArgumentException("票据抬头未配置，请您到站点管理配置?"); + } + StationEntity station = stationClientOne.getData(); + if (station == null) { + throw new ServiceException("票据抬头未配置，请您到站点管理配置"); + } + log.info("前端查的站点编号 :{}", standardTicketInfoVo.getSignage()); + log.info("后端查寻的站点编码 :{}", station.getSignage()); + if (!standardTicketInfoVo.getSignage().equals(station.getSignage())) { + throw new ServiceException("票据抬头未配置，请您到站点管理配置"); + } + + //获取站点编号 + String signage = station.getSignage(); + if (StringUtils.isBlank(signage) || signage.length() < 2) { + throw new ServiceException("票据抬头未配置，请您到站点管理配置"); + } + signage = signage.length() == 2 ? station.getSignage() : station.getSignage().substring(0, 2); + + standardTicketInfoVo.setSignage(signage); + standardTicketInfoVo.setSignageCode(station.getCode()); + //2. 获取编码 + String code = processIdWorker.getTicketByCode(standardTicketInfoVo.getSignage(), this.getTicketWichCode(standardTicketInfoVo.getTicketType()), LocalDateTime.now()); + standardTicketInfoVo.setCode(code); + //3. 保存操作对象 + this.saveStandardTicketInfo(standardTicketInfoVo); + //5. 保存安全措施 + List standardTicketInfoVos = this.saveStandardTicketMeasure( + this.saveStandardTicketMeasureWichTicket(standardTicketInfoVo)); + standardTicketInfoVo.setStandardTicketMeasureVos(standardTicketInfoVos); + //6. 查询第一种工作票值 + String dictValue = processDictService.selectDictValueByKey(OPERATION_TICKET_KEY); + // 7.启动流程 + this.startProcess(standardTicketInfoVo, dictValue); + } + + /** + * 待处理 + * + * @param response + */ + @Override + public void findPending(ProcessWorkFlowResponse response) { + log.info("获取businessKey: {}", response.getBusinessKey()); + log.info("获取taskId: {} ", response.getTaskId()); + log.info("获取下一个审批人是: {} ", response.getNextStepOperator()); + log.info("获取下一个用户Id是: {} ", response.getUserId()); + log.info("获取当前任务名称是: {} ", response.getTaskName()); + log.info("获取根据handleType区分是用户还是候选组角色: {}", response.getHandleType()); + //json转换表单 + String formData = JSON.toJSONString(response.getVariables()); + log.info("获取表单的数据：{}", formData); + StandardTicketInfoVo standardTicketInfoVo = null; + try { + JSONObject jsonObject = JSONObject.parseObject(formData); + standardTicketInfoVo = JSONObject.toJavaObject(jsonObject, StandardTicketInfoVo.class); + } catch (Exception e) { + log.error("获取表单出现异常了~~~~"); + throw new IllegalArgumentException(e.getMessage()); + } + + //1.查询操作票信息 + Long id = NumberUtils.toLong(response.getBusinessKey()); + StandardTicketInfoEntity standardTicketInfoEntity = standardTicketInfoService.getById(id); + if (ObjectUtils.isEmpty(standardTicketInfoEntity)) { + log.error("获取操作票不存在"); + return; + } + //设置id + StandardTicketInfoEntity newStandardTicketInfoEntity = new StandardTicketInfoEntity(); + BeanUtils.copyProperties(standardTicketInfoVo, newStandardTicketInfoEntity); + newStandardTicketInfoEntity.setId(id); + //填充操作票信息 + saveStandardTicketInfoEntity(newStandardTicketInfoEntity, response); + newStandardTicketInfoEntity.setProcessInstanceId(response.getProcessInstanceId()); + standardTicketInfoService.updateById(newStandardTicketInfoEntity); + + //更新安全措施 + List standardTicketMeasureVos = standardTicketInfoVo.getStandardTicketMeasureVos(); + if (CollectionUtils.isNotEmpty(standardTicketMeasureVos)) { + List standardTicketMeasureEntities = standardTicketMeasureVos.stream().map(standardTicketMeasureVo -> { + StandardTicketMeasureEntity standardTicketMeasureEntity = new StandardTicketMeasureEntity(); + BeanUtils.copyProperties(standardTicketMeasureVo, standardTicketMeasureEntity); + return standardTicketMeasureEntity; + }).collect(Collectors.toList()); + standardTicketMeasureService.updateBatchById(standardTicketMeasureEntities); + } + + + //推送消息 + if (response.getTaskId() != null) { + MessagePushRecordDto message = new MessagePushRecordDto(); + message.setBusinessClassify("business"); + message.setBusinessKey(MessageConstants.BusinessClassifyEnum.OPERATIONTICKETMESSAGE.getKey()); + message.setSubject(MessageConstants.BusinessClassifyEnum.OPERATIONTICKETMESSAGE.getDescription()); + message.setTaskId(standardTicketInfoEntity.getId()); + message.setTenantId("200000"); + message.setTypes(Arrays.asList(MessageConstants.APP_PUSH, MessageConstants.WS_PUSH)); + message.setPushType(MessageConstants.IMMEDIATELY); + //您有一张工作票待审批，工作内容：*****，审批环节：*****； + String countent = + "您有一张工作票待审批,工作内容：".concat(standardTicketInfoEntity.getTitle()) + .concat("，审批环节：") + .concat(response.getTaskName()); + message.setContent(countent); + message.setDeptId(standardTicketInfoEntity.getCreateDept()); + R deptName = sysClient.getDeptName(standardTicketInfoEntity.getCreateDept()); + if (deptName.isSuccess()) { + message.setDeptName(deptName.getData()); + } + String userIds = response.getUserId(); + if (StringUtils.isBlank(userIds)) { + log.error("推送的消息不能为空哦,{}", userIds); + return; + } + String[] split = userIds.split(","); + for (String userId : split) { + message.setPusher(userId); + User user = UserCache.getUser(NumberUtils.toLong(userId)); + if (ObjectUtils.isNotEmpty(user)) { + message.setPusherName(user.getName()); + } + message.setAccount(userId); + + message.setCreateUser(NumberUtils.toLong(userId)); + messageClient.sendMessage(message); + } + } + } + + /** + * 填充数据 + * + * @param newStandardTicketInfoEntity + * @param response + */ + private void saveStandardTicketInfoEntity(StandardTicketInfoEntity newStandardTicketInfoEntity, ProcessWorkFlowResponse response) { + String flowDescription = ""; + //如果response.getHandleType() 是0使用户 + newStandardTicketInfoEntity.setFlowUserId(response.getUserId()); + newStandardTicketInfoEntity.setNextStepOperator(response.getNextStepOperator()); + flowDescription = "审批中,当前环节是".concat(response.getTaskName()).concat("，待").concat(response.getNextStepOperator()).concat("审批"); + //如果taskId为空 + String taskId = response.getTaskId(); + if (StringUtils.isEmpty(taskId)) { + newStandardTicketInfoEntity.setFlowDescription("结束"); + newStandardTicketInfoEntity.setFlowTaskId(" "); + newStandardTicketInfoEntity.setFlowTaskName("结束"); + newStandardTicketInfoEntity.setNextStepOperator(" "); + newStandardTicketInfoEntity.setFlowStatus(999); + } else { + newStandardTicketInfoEntity.setFlowTaskId(taskId); + newStandardTicketInfoEntity.setFlowTaskName(response.getTaskName()); + newStandardTicketInfoEntity.setFlowDescription(flowDescription); + } + } + + /** + * 启动流程 + * + * @param standardTicketInfoVo + * @param dictValue + */ + private void startProcess(StandardTicketInfoVo standardTicketInfoVo, String dictValue) { + Instant start = Instant.now(); + Map params = new HashMap<>(4); + params.put("standardTicketInfoVo", standardTicketInfoVo); + params.put("taskId", standardTicketInfoVo.getId()); + params.put("guardianUserIds", "taskUser_".concat(standardTicketInfoVo.getGuardian().toString())); + //已开启流程 + R processInstanceContainNameByKey = flowClient.startProcessInstanceContainNameByKey(dictValue, + String.valueOf(standardTicketInfoVo.getId()), standardTicketInfoVo.getTitle(), params); + if (!processInstanceContainNameByKey.isSuccess()) { + log.error("processInstanceContainNameByKey {}", processInstanceContainNameByKey.getMsg()); + throw new ServiceException("不好意思,您暂无权限..."); + } + Duration between = Duration.between(start, Instant.now()); + log.info("================================================================"); + log.info("耗时: " + (between.getSeconds()) + "秒"); + log.info("耗时: " + (between.toMillis()) + "毫秒"); + log.info("================================================================"); + } + + + /** + * 设置安全措施值 + * + * @param standardTicketInfoVo + * @return + */ + private List saveStandardTicketMeasureWichTicket(StandardTicketInfoVo standardTicketInfoVo) { + List standardTicketMeasureVos = standardTicketInfoVo.getStandardTicketMeasureVos(); + if (CollectionUtils.isNotEmpty(standardTicketMeasureVos)) { + List measureEntityList = BeanUtil.copyProperties(standardTicketMeasureVos, + StandardTicketMeasureEntity.class); + List collect = measureEntityList.stream().map(item -> { + item.setTicketId(standardTicketInfoVo.getId()); + return item; + }).collect(Collectors.toList()); + return collect; + + } + return null; + } + + /** + * 保存安全措施 + * + * @param measureEntityList + * @return + */ + private List saveStandardTicketMeasure(List measureEntityList) { + if (CollectionUtils.isEmpty(measureEntityList)) { + log.error("安全措施为空哦"); + return new ArrayList<>(); + } + boolean save = standardTicketMeasureService.saveBatch(measureEntityList); + if (!save) { + throw new ServiceException("Save failed"); + } + + return measureEntityList.stream().map(item -> { + StandardTicketMeasureVo standardTicketMeasureVo = new StandardTicketMeasureVo(); + BeanUtils.copyProperties(item, standardTicketMeasureVo); + return standardTicketMeasureVo; + }).collect(Collectors.toList()); + } + + /** + * 保存工作对象 + * + * @param standardTicketInfoVo + * @return + */ + private void saveStandardTicketInfo(StandardTicketInfoVo standardTicketInfoVo) { + StandardTicketInfoEntity standardTicketInfo = new StandardTicketInfoEntity(); + BeanUtils.copyProperties(standardTicketInfoVo, standardTicketInfo); + boolean save = standardTicketInfoService.save(standardTicketInfo); + if (!save) { + throw new ServiceException("Save failed"); + } + BeanUtils.copyProperties(standardTicketInfo, standardTicketInfoVo); + } + + + /** + * 工作类型生成工作票类型 + */ + private String getTicketWichCode(String type) { + String result = null; + switch (type) { + case "3": + result = "DZ"; + break; + case "4": + result = type; + break; + case "5": + result = type; + break; + default: + result = "DZ"; + break; + } + return result; + } +} diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java index 15202c8..d536b9d 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java @@ -4,12 +4,10 @@ package com.hnac.hzims.ticket.twoTicket.service.impl; import cn.afterturn.easypoi.word.WordExportUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; -import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; +import com.google.common.collect.Lists; import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.message.MessageConstants; import com.hnac.hzims.message.dto.MessagePushRecordDto; @@ -151,7 +149,6 @@ public class TicketProcessServiceImpl implements TicketProcessService { private final ProcessDictService processDictService; - private final IMessageClient messageClient; @@ -184,20 +181,21 @@ public class TicketProcessServiceImpl implements TicketProcessService { log.info("前端查的站点编号 :{}", workTicketVo.getWorkTicket().getSignage()); log.info("后端查寻的站点编码 :{}", station.getSignage()); if (!workTicketVo.getWorkTicket().getSignage().equals(station.getSignage())) { - throw new ServiceException("站点标识不能为空"); + throw new ServiceException("票据抬头未配置，请您到站点管理配置"); } //获取站点编号 String signage = station.getSignage(); if (StringUtils.isBlank(signage) || signage.length() < 2) { - throw new ServiceException("站点标识不能为空"); + throw new ServiceException("票据抬头未配置，请您到站点管理配置"); } signage = signage.length() == 2 ? station.getSignage() : station.getSignage().substring(0, 2); workTicketVo.getWorkTicket().setSignage(signage); workTicketVo.getWorkTicket().setSignageCode(station.getCode()); //2. 获取编码 - String code = processIdWorker.getTicketByCode(workTicketVo.getWorkTicket().getSignage(), workTicketVo.getWorkTicket().getType(), LocalDateTime.now()); + String code = processIdWorker.getTicketByCode(workTicketVo.getWorkTicket().getSignage(), this.getTicketWichCode(workTicketVo.getWorkTicket().getType()), + LocalDateTime.now()); workTicketVo.getWorkTicket().setCode(code); //3 .保存工作对象 this.saveWorkTicketInfo(workTicketVo.getWorkTicket()); @@ -270,7 +268,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { for (WorkTicketSafetyMeasureEntity item : safetyMeasuresList) { if (ObjectUtils.isNotEmpty(item.getId())) { workTicketSafetyMeasureService.updateById(item); - }else { + } else { item.setTicketId(workTicketInfo.getId()); workTicketSafetyMeasureService.save(item); } @@ -279,20 +277,24 @@ public class TicketProcessServiceImpl implements TicketProcessService { } catch (Exception e) { e.printStackTrace(); } - //工作票工作任务组 - // List workTicketContentDtoList = workTicketVo.getWorkTicketContentDtoList(); - // if (CollectionUtils.isNotEmpty(workTicketContentDtoList)) { - // log.info("获取工作票工作任务组：{}", workTicketContentDtoList); - // workTicketContentDtoList.forEach(item -> { - // if (ObjectUtils.isEmpty(item.getId())) { - // LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - // queryWrapper.eq(WorkTicketContentEntity::getTicketId, workTicketInfo.getId()); - // contentService.update(item, queryWrapper); - // } else { - // contentService.updateById(item); - // } - // }); - // } + // 第二种 工作票工作任务组 + List workTicketContentDtoList = workTicketVo.getWorkTicketContentDtoList(); + try { + if (CollectionUtils.isNotEmpty(workTicketContentDtoList)) { + log.info("获取工作票工作任务组：{}", workTicketContentDtoList); + workTicketContentDtoList.forEach(item -> { + if (ObjectUtils.isEmpty(item.getId())) { + contentService.save(item); + } else { + contentService.updateById(item); + } + }); + } + } catch (Exception e) { + e.printStackTrace(); + } + + // 工作票延期 WorkTicketDelayEntity workTicketDelay = workTicketVo.getWorkTicketDelay(); try { @@ -314,10 +316,12 @@ public class TicketProcessServiceImpl implements TicketProcessService { } catch (Exception e) { e.printStackTrace(); } + + //工作结束 WorkTicketFinish workTicketFinish = workTicketVo.getWorkTicketFinish(); try { - log.info("工作结束==============>"+ (workTicket.getFlowStatus().intValue())); + log.info("工作结束==============>" + (workTicket.getFlowStatus().intValue())); if (ObjectUtils.isNotEmpty(workTicketFinish)) { WorkTicketFinish ticketFinish = workTicketFinishService.selectByTicketId(workTicketInfo.getId()); log.info("获取工作结束：{}", workTicketFinish); @@ -398,43 +402,48 @@ public class TicketProcessServiceImpl implements TicketProcessService { } + if (response.getTaskId() != null || response.getUserId() != null) { + //推送消息 + try { + MessagePushRecordDto message = new MessagePushRecordDto(); + message.setBusinessClassify("business"); + message.setBusinessKey(MessageConstants.BusinessClassifyEnum.TICKETMESSAGE.getKey()); + message.setSubject(MessageConstants.BusinessClassifyEnum.TICKETMESSAGE.getDescription()); + message.setTaskId(workTicketInfo.getId()); + message.setTenantId("200000"); + message.setTypes(Arrays.asList(MessageConstants.APP_PUSH, MessageConstants.WS_PUSH)); + message.setPushType(MessageConstants.IMMEDIATELY); + //您有一张工作票待审批，工作内容：*****，审批环节：*****； + String countent = + "您有一张工作票待审批,工作内容：".concat(workTicketInfo.getWorkContent()) + .concat("，审批环节：") + .concat(response.getTaskName()); + message.setContent(countent); + message.setDeptId(workTicketInfo.getCreateDept()); + R deptName = sysClient.getDeptName(workTicketInfo.getCreateDept()); + if (deptName.isSuccess()) { + message.setDeptName(deptName.getData()); + } + String userIds = response.getUserId(); + if (StringUtils.isBlank(userIds)) { + log.error("推送的消息不能为空哦,{}", userIds); + return; + } + String[] split = userIds.split(","); + for (String userId : split) { + message.setPusher(userId); + User user = UserCache.getUser(NumberUtils.toLong(userId)); + if (ObjectUtils.isNotEmpty(user)) { + message.setPusherName(user.getName()); + } + message.setAccount(userId); - //推送消息 - MessagePushRecordDto message = new MessagePushRecordDto(); - message.setBusinessClassify("business"); - message.setBusinessKey(MessageConstants.BusinessClassifyEnum.TICKETMESSAGE.getKey()); - message.setSubject(MessageConstants.BusinessClassifyEnum.TICKETMESSAGE.getDescription()); - message.setTaskId(workTicketInfo.getId()); - message.setTenantId("200000"); - message.setTypes(Arrays.asList(MessageConstants.APP_PUSH, MessageConstants.WS_PUSH)); - message.setPushType(MessageConstants.IMMEDIATELY); - //您有一张工作票待审批，工作内容：*****，审批环节：*****； - String countent = - "您有一张工作票待审批,工作内容：".concat(workTicketInfo.getWorkContent()) - .concat("，审批环节：") - .concat(response.getTaskName()); - message.setContent(countent); - message.setDeptId(workTicketInfo.getCreateDept()); - R deptName = sysClient.getDeptName(workTicketInfo.getCreateDept()); - if (deptName.isSuccess()) { - message.setDeptName(deptName.getData()); - } - String userIds = response.getUserId(); - if (StringUtils.isBlank(userIds)){ - log.error("推送的消息不能为空哦,{}",userIds); - return; - } - String[] split = userIds.split(","); - for (String userId : split) { - message.setPusher(userId); - User user = UserCache.getUser(NumberUtils.toLong(userId)); - if (ObjectUtils.isNotEmpty(user)) { - message.setPusherName(user.getName()); + message.setCreateUser(NumberUtils.toLong(userId)); + messageClient.sendMessage(message); + } + } catch (Exception e) { + e.printStackTrace(); } - message.setAccount(userId); - - message.setCreateUser(NumberUtils.toLong(userId)); - messageClient.sendMessage(message); } } @@ -479,6 +488,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { // } workTicket.setFlowUserId(response.getUserId()); workTicket.setNextStepOperator(response.getNextStepOperator()); + flowDescription = "审批中,当前环节是".concat(response.getTaskName()).concat("，待").concat(response.getNextStepOperator()).concat("审批"); } //如果taskId为空 @@ -1149,7 +1159,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { Map stringObjectMap = matterLibraryListFive.get(i); objectObjectHashMap.put("safetyMeasure1", stringObjectMap.get("safetyMeasure")); } - }else { + } else { objectObjectHashMap.put("safetyMeasure1", ""); } @@ -1217,7 +1227,32 @@ public class TicketProcessServiceImpl implements TicketProcessService { if (StringUtils.isNoneBlank(newValue)) { dataConversion.put(key, BooleanUtils.toBoolean(newValue) ? "☑" : "□"); } + + } + + /** + * 工作类型生成工作票类型 + */ + private String getTicketWichCode(String type) { + String result = null; + switch (type) { + case "6": + result = "D1"; + break; + case "7": + result = "D2"; + break; + case "8": + result = "JX"; + break; + default: + result = "D1"; + break; + } + return result; + } + } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/operation/StandardTicketInfoVo.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/operation/StandardTicketInfoVo.java new file mode 100644 index 0000000..70ca8e5 --- /dev/null +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/operation/StandardTicketInfoVo.java @@ -0,0 +1,120 @@ +package com.hnac.hzims.ticket.twoTicket.vo.operation; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springblade.core.tenant.mp.TenantEntity; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; +import java.util.List; + +/** + * @Author WL + * @Version v1.0 + * @Serial 1.0 + * @Date 2023/6/6 15:39 + */ +@Data +@Accessors(chain = true) +public class StandardTicketInfoVo extends TenantEntity { + + + @ApiModelProperty("票据类型") + private String ticketType; + + + + @ApiModelProperty("单位") + private String company; + + @ApiModelProperty("工作流ID") + private String processInstanceId; + + + @ApiModelProperty("编号") + private String code; + + @ApiModelProperty("发令人") + private Long issueOrderPerson; + + @ApiModelProperty("受令人") + private Long accessOrderPerson; + + @ApiModelProperty("发令时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime issueOrderTime; + + @ApiModelProperty("操作开始时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime startTime; + + @ApiModelProperty("操作结束时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime endTime; + + @ApiModelProperty("操作任务") + private String title; + + @ApiModelProperty("任务类型") + private String taskType; + + @ApiModelProperty("关联业务任务ID") + private Long taskId; + + @ApiModelProperty("关联业务名称") + private String taskName; + + @ApiModelProperty("备注") + private String remark; + + @ApiModelProperty("监护人") + private Long guardian; + + @ApiModelProperty("操作人") + private Long operator; + + @ApiModelProperty("操作时间") + private LocalDateTime operateTime; + + @ApiModelProperty("负责人确认时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime guardianshipTime; + + @ApiModelProperty("值班负责人") + private Long principal; + + @ApiModelProperty("值班负责人确认时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime principalTime; + + @ApiModelProperty("是否评价") + private Integer isEvaluate; + + + /** + * AA/AAA/AAAA由建站时建站人填写必须系统验证唯一性 + * 站点标识-两票编码 + */ + @ApiModelProperty("站点标识-两票编码") + private String signage; + + + /** + * 编号（原站点ID） + */ + @ApiModelProperty("编号（原站点ID）") + private String signageCode; + + + /** + * 安全措施 + */ + private List standardTicketMeasureVos; +} diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/operation/StandardTicketMeasureVo.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/operation/StandardTicketMeasureVo.java new file mode 100644 index 0000000..03702a7 --- /dev/null +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/operation/StandardTicketMeasureVo.java @@ -0,0 +1,57 @@ +package com.hnac.hzims.ticket.twoTicket.vo.operation; + +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springblade.core.mp.support.QueryField; +import org.springblade.core.mp.support.SqlCondition; +import org.springblade.core.tenant.mp.TenantEntity; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +/** + * @Author WL + * @Version v1.0 + * @Serial 1.0 + * @Date 2023/6/6 15:47 + */ +@Data +public class StandardTicketMeasureVo extends TenantEntity { + + + private static final long serialVersionUID = 8503146008417850183L; + + @ApiModelProperty("标准票ID") + private Long ticketId; + + @ApiModelProperty("分组") + private Long matterGroup; + + @ApiModelProperty("安全措施ID") + private Long measureId; + + @ApiModelProperty("安全措施") + private String measure; + + @ApiModelProperty("执行人") + private Long executor; + + @ApiModelProperty("执行时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime executeTime; + + @ApiModelProperty("执行图片") + private String executeImgUrl; + + @ApiModelProperty("执行备注") + private String remark; + + @ApiModelProperty("操作事项排序") + private Integer sort; +} From b6fbe31558bb1d45b1900b37e434793c523a6164 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Wed, 7 Jun 2023 10:57:08 +0800 Subject: [PATCH 10/14] =?UTF-8?q?#=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=8A=BD=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scheduled/mapper/equipment/PlanMapper.java | 17 + .../scheduled/mapper/operation/AccessMapper.java | 11 + .../scheduled/mapper/operation/DefectMapper.java | 12 + .../mapper/operation/MaintenanceMapper.java | 11 + .../scheduled/mapper/operation/OtherMapper.java | 11 + .../mapper/operation/OverDetailsMapper.java | 11 + .../scheduled/mapper/operation/OverMapper.java | 11 + .../scheduled/mapper/operation/SolveMapper.java | 11 + .../mapper/ticket/TicketEvaluateMapper.java | 11 + .../scheduled/mapper/ticket/TicketMapper.java | 13 + .../scheduled/mapper/ticket/WorkTicketMapper.java | 14 + .../scheduled/scheduled/ShowScheduledTask.java | 24 + .../scheduled/service/equipment/PlanService.java | 16 + .../service/equipment/impl/PlanServiceImpl.java | 33 + .../scheduled/service/operation/AccessService.java | 14 + .../scheduled/service/operation/DefectService.java | 14 + .../service/operation/MaintenanceService.java | 15 + .../service/operation/MonitorService.java | 5 +- .../scheduled/service/operation/OtherService.java | 11 + .../service/operation/OverDetailsService.java | 12 + .../scheduled/service/operation/OverService.java | 11 + .../scheduled/service/operation/ShowService.java | 9 + .../scheduled/service/operation/SolveService.java | 11 + .../service/operation/impl/AccessServiceImpl.java | 51 + .../service/operation/impl/DefectServiceImpl.java | 55 + .../operation/impl/MaintenanceServiceImpl.java | 50 + .../service/operation/impl/OtherServiceImpl.java | 19 + .../operation/impl/OverDetailsServiceImpl.java | 19 + .../service/operation/impl/OverServiceImpl.java | 19 + .../operation/impl/RealTargetServiceImpl.java | 1 - .../service/operation/impl/ShowServiceImpl.java | 480 +++++++++ .../service/operation/impl/SolveServiceImpl.java | 20 + .../service/ticket/TicketEvaluateService.java | 11 + .../scheduled/service/ticket/TicketService.java | 16 + .../service/ticket/WorkTicketService.java | 7 + .../ticket/impl/TicketEvaluateServiceImpl.java | 20 + .../service/ticket/impl/TicketServiceImpl.java | 85 ++ .../service/ticket/impl/WorkTicketServiceImpl.java | 1093 ++++++++++++++++++++ .../main/resources/mapper/equipment/PlanMapper.xml | 38 + .../resources/mapper/operation/AccessMapper.xml | 5 + .../resources/mapper/operation/DefectMapper.xml | 4 + .../mapper/operation/MaintenanceMapper.xml | 27 + .../resources/mapper/operation/OtherMapper.xml | 25 + .../mapper/operation/OverDetailsMapper.xml | 26 + .../main/resources/mapper/operation/OverMapper.xml | 26 + .../resources/mapper/operation/SolveMapper.xml | 24 + .../mapper/ticket/TicketEvaluateMapper.xml | 5 + .../main/resources/mapper/ticket/TicketMapper.xml | 5 + .../resources/mapper/ticket/WorkTicketMapper.xml | 4 + .../defect/service/IOperDefectService.java | 90 +- .../hzims/operational/fill/mapper/OtherMapper.java | 8 - .../hzims/operational/fill/mapper/OtherMapper.xml | 25 - 52 files changed, 2441 insertions(+), 125 deletions(-) create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/equipment/PlanMapper.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/AccessMapper.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/DefectMapper.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/MaintenanceMapper.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/OtherMapper.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/OverDetailsMapper.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/OverMapper.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/SolveMapper.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/ticket/TicketEvaluateMapper.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/ticket/TicketMapper.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/ticket/WorkTicketMapper.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/PlanService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/PlanServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/AccessService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/DefectService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/MaintenanceService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/OtherService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/OverDetailsService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/OverService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/ShowService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/SolveService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/AccessServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/DefectServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/MaintenanceServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/OtherServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/OverDetailsServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/OverServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/ShowServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/SolveServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/TicketEvaluateService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/TicketService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/WorkTicketService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketEvaluateServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkTicketServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/equipment/PlanMapper.xml create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/operation/AccessMapper.xml create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/operation/DefectMapper.xml create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/operation/MaintenanceMapper.xml create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/operation/OtherMapper.xml create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/operation/OverDetailsMapper.xml create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/operation/OverMapper.xml create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/operation/SolveMapper.xml create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/ticket/TicketEvaluateMapper.xml create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/ticket/TicketMapper.xml create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/ticket/WorkTicketMapper.xml delete mode 100644 hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/mapper/OtherMapper.java delete mode 100644 hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/mapper/OtherMapper.xml diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/equipment/PlanMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/equipment/PlanMapper.java new file mode 100644 index 0000000..d2948fa --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/equipment/PlanMapper.java @@ -0,0 +1,17 @@ +package com.hnac.hzims.scheduled.mapper.equipment; + + +import com.hnac.hzims.equipment.entity.PlanGenerationEntity; +import org.apache.ibatis.annotations.Param; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + +import java.util.List; + +/** + * @author ysj + */ +public interface PlanMapper extends UserDataScopeBaseMapper { + + // 查询计划发电量 + List planGeneration(@Param("stationIds") List stationIds, @Param("deptIds") List deptIds, @Param("date") String date); +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/AccessMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/AccessMapper.java new file mode 100644 index 0000000..a9b5957 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/AccessMapper.java @@ -0,0 +1,11 @@ +package com.hnac.hzims.scheduled.mapper.operation; + +import com.hnac.hzims.operational.access.entity.OperAccessTaskEntity; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + +/** + * @author ysj + */ +public interface AccessMapper extends UserDataScopeBaseMapper { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/DefectMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/DefectMapper.java new file mode 100644 index 0000000..34d3a1c --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/DefectMapper.java @@ -0,0 +1,12 @@ +package com.hnac.hzims.scheduled.mapper.operation; + +import com.hnac.hzims.operational.defect.entity.OperDefectEntity; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + +/** + * @author ysj + */ +public interface DefectMapper extends UserDataScopeBaseMapper { + + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/MaintenanceMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/MaintenanceMapper.java new file mode 100644 index 0000000..2480f52 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/MaintenanceMapper.java @@ -0,0 +1,11 @@ +package com.hnac.hzims.scheduled.mapper.operation; + +import com.hnac.hzims.operational.maintenance.entity.OperMaintenanceTaskEntity; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + +/** + * @author ysj + */ +public interface MaintenanceMapper extends UserDataScopeBaseMapper { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/OtherMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/OtherMapper.java new file mode 100644 index 0000000..90c2d6d --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/OtherMapper.java @@ -0,0 +1,11 @@ +package com.hnac.hzims.scheduled.mapper.operation; + +import com.hnac.hzims.operational.fill.entity.OtherEntity; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + +/** + * @author ysj + */ +public interface OtherMapper extends UserDataScopeBaseMapper { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/OverDetailsMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/OverDetailsMapper.java new file mode 100644 index 0000000..32582ec --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/OverDetailsMapper.java @@ -0,0 +1,11 @@ +package com.hnac.hzims.scheduled.mapper.operation; + +import com.hnac.hzims.operational.fill.entity.OverDetailsEntity; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + +/** + * @author ysj + */ +public interface OverDetailsMapper extends UserDataScopeBaseMapper { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/OverMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/OverMapper.java new file mode 100644 index 0000000..17f20f9 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/OverMapper.java @@ -0,0 +1,11 @@ +package com.hnac.hzims.scheduled.mapper.operation; + +import com.hnac.hzims.operational.fill.entity.OverEntity; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + +/** + * @author ysj + */ +public interface OverMapper extends UserDataScopeBaseMapper { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/SolveMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/SolveMapper.java new file mode 100644 index 0000000..e09fef2 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/SolveMapper.java @@ -0,0 +1,11 @@ +package com.hnac.hzims.scheduled.mapper.operation; + +import com.hnac.hzims.operational.fill.entity.SolveEntity; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + +/** + * @author ysj + */ +public interface SolveMapper extends UserDataScopeBaseMapper { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/ticket/TicketEvaluateMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/ticket/TicketEvaluateMapper.java new file mode 100644 index 0000000..31feb3e --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/ticket/TicketEvaluateMapper.java @@ -0,0 +1,11 @@ +package com.hnac.hzims.scheduled.mapper.ticket; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hnac.hzims.ticket.allTicket.entity.TicketInfoEvaluateEntity; + +/** + * @author ysj + */ +public interface TicketEvaluateMapper extends BaseMapper { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/ticket/TicketMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/ticket/TicketMapper.java new file mode 100644 index 0000000..a17dd00 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/ticket/TicketMapper.java @@ -0,0 +1,13 @@ +package com.hnac.hzims.scheduled.mapper.ticket; + +import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity; +import org.apache.ibatis.annotations.Mapper; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + +/** + * @author ysj + */ +@Mapper +public interface TicketMapper extends UserDataScopeBaseMapper { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/ticket/WorkTicketMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/ticket/WorkTicketMapper.java new file mode 100644 index 0000000..e30a55e --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/ticket/WorkTicketMapper.java @@ -0,0 +1,14 @@ +package com.hnac.hzims.scheduled.mapper.ticket; + +import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity; +import org.apache.ibatis.annotations.Mapper; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + +/** + * @author ysj + */ +@Mapper +public interface WorkTicketMapper extends UserDataScopeBaseMapper { + + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ShowScheduledTask.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ShowScheduledTask.java index c7bb905..426502e 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ShowScheduledTask.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ShowScheduledTask.java @@ -1,8 +1,18 @@ package com.hnac.hzims.scheduled.scheduled; +import com.hnac.hzims.scheduled.service.operation.ShowService; +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.Date; + +import static com.hnac.hzims.operational.main.constant.MainConstants.LOAD_HOME_TARGET; + /** * @author ysj @@ -11,4 +21,18 @@ import org.springframework.stereotype.Component; @Component public class ShowScheduledTask { + @Autowired + private ShowService service; + + /** + * 首页-指标数据加载 + */ + @XxlJob(LOAD_HOME_TARGET) + public ReturnT loadHomeTarget(String param) { + if (Func.isBlank(param)) { + param = DateUtil.format(new Date(), "yyyy-MM"); + } + service.loadHomeTarget(param); + return new ReturnT<>("SUCCESS"); + } } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/PlanService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/PlanService.java new file mode 100644 index 0000000..52f4d3a --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/PlanService.java @@ -0,0 +1,16 @@ +package com.hnac.hzims.scheduled.service.equipment; + +import com.hnac.hzims.equipment.entity.PlanGenerationEntity; +import org.springblade.core.mp.base.BaseService; + +import java.util.List; + +/** + * @author ysj + */ +public interface PlanService extends BaseService { + + + // 查询计划发电量 + List planGeneration(List stationIds, List deptIds, String date); +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/PlanServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/PlanServiceImpl.java new file mode 100644 index 0000000..1091c99 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/PlanServiceImpl.java @@ -0,0 +1,33 @@ +package com.hnac.hzims.scheduled.service.equipment.impl; + +import com.hnac.hzims.equipment.entity.PlanGenerationEntity; +import com.hnac.hzims.scheduled.mapper.equipment.PlanMapper; +import com.hnac.hzims.scheduled.service.equipment.PlanService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author ysj + */ +@Service +@Slf4j +@AllArgsConstructor +public class PlanServiceImpl extends BaseServiceImpl implements PlanService { + + + /** + * 查询计划发电量 + * @param stationIds + * @param deptIds + * @param date + * @return + */ + @Override + public List planGeneration(List stationIds, List deptIds, String date) { + return this.baseMapper.planGeneration(stationIds,deptIds,date); + } +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/AccessService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/AccessService.java new file mode 100644 index 0000000..f42d943 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/AccessService.java @@ -0,0 +1,14 @@ +package com.hnac.hzims.scheduled.service.operation; + +import com.hnac.hzims.operational.access.entity.OperAccessTaskEntity; +import org.springblade.core.mp.base.BaseService; + +import java.util.List; + +/** + * @author ysj + */ +public interface AccessService extends BaseService { + + double accessCount(List areas); +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/DefectService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/DefectService.java new file mode 100644 index 0000000..929732f --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/DefectService.java @@ -0,0 +1,14 @@ +package com.hnac.hzims.scheduled.service.operation; + +import com.hnac.hzims.operational.defect.entity.OperDefectEntity; +import org.springblade.core.mp.base.BaseService; + +import java.util.List; + +/** + * @author Lch + */ +public interface DefectService extends BaseService { + + Double defectCount(List areas); +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/MaintenanceService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/MaintenanceService.java new file mode 100644 index 0000000..49b4012 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/MaintenanceService.java @@ -0,0 +1,15 @@ +package com.hnac.hzims.scheduled.service.operation; + +import com.hnac.hzims.operational.maintenance.entity.OperMaintenanceTaskEntity; +import org.springblade.core.mp.base.BaseService; + +import java.util.List; + +/** + * @author ysj + */ +public interface MaintenanceService extends BaseService { + + // 查询当年日常维护数量 + Integer maintenanceCount(List departList); +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/MonitorService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/MonitorService.java index 087a7e5..d9bfd85 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/MonitorService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/MonitorService.java @@ -9,8 +9,9 @@ public interface MonitorService { // realId刷新 void loadRealId(String param); + // 实时数据刷新 + void loadRealData(String param); + // 集中监控数据处理 void loadMonitoring(String param); - - void loadRealData(String param); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/OtherService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/OtherService.java new file mode 100644 index 0000000..50451a4 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/OtherService.java @@ -0,0 +1,11 @@ +package com.hnac.hzims.scheduled.service.operation; + +import com.hnac.hzims.operational.fill.entity.OtherEntity; +import org.springblade.core.mp.base.BaseService; + +/** + * @author ysj + */ +public interface OtherService extends BaseService { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/OverDetailsService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/OverDetailsService.java new file mode 100644 index 0000000..13e6eab --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/OverDetailsService.java @@ -0,0 +1,12 @@ +package com.hnac.hzims.scheduled.service.operation; + + +import com.hnac.hzims.operational.fill.entity.OverDetailsEntity; +import org.springblade.core.mp.base.BaseService; + +/** + * @author ysj + */ +public interface OverDetailsService extends BaseService { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/OverService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/OverService.java new file mode 100644 index 0000000..3412374 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/OverService.java @@ -0,0 +1,11 @@ +package com.hnac.hzims.scheduled.service.operation; + +import com.hnac.hzims.operational.fill.entity.OverEntity; +import org.springblade.core.mp.base.BaseService; + +/** + * @author ysj + */ +public interface OverService extends BaseService { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/ShowService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/ShowService.java new file mode 100644 index 0000000..a86eed7 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/ShowService.java @@ -0,0 +1,9 @@ +package com.hnac.hzims.scheduled.service.operation; + +/** + * @author ysj + */ +public interface ShowService { + + void loadHomeTarget(String param); +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/SolveService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/SolveService.java new file mode 100644 index 0000000..5888433 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/SolveService.java @@ -0,0 +1,11 @@ +package com.hnac.hzims.scheduled.service.operation; + +import com.hnac.hzims.operational.fill.entity.SolveEntity; +import org.springblade.core.mp.base.BaseService; + +/** + * @author ysj + */ +public interface SolveService extends BaseService { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/AccessServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/AccessServiceImpl.java new file mode 100644 index 0000000..1a1fb7c --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/AccessServiceImpl.java @@ -0,0 +1,51 @@ +package com.hnac.hzims.scheduled.service.operation.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.hnac.hzims.operational.access.entity.OperAccessTaskEntity; +import com.hnac.hzims.scheduled.mapper.operation.AccessMapper; +import com.hnac.hzims.scheduled.service.operation.AccessService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.utils.CollectionUtil; +import org.springframework.stereotype.Service; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.util.List; + + +/** + * @author ysj + */ +@Service +@Slf4j +@AllArgsConstructor +public class AccessServiceImpl extends BaseServiceImpl implements AccessService { + + /** + * 查询当年检修任务数量 + * @param areas + * @return + */ + @Override + public double accessCount(List areas) { + if(CollectionUtil.isEmpty(areas)) { + return 0; + } + LocalDate firstDay = LocalDate.now().withDayOfYear(1); + LocalDateTime firstDateTime = LocalDateTime.of(firstDay, LocalTime.MIN); + LocalDateTime now = LocalDateTime.now(); + //日常维护 + List accesss = this.list(new LambdaQueryWrapper(){{ + ge(OperAccessTaskEntity::getPlanStartTime,firstDateTime); + le(OperAccessTaskEntity::getPlanStartTime,now); + in(OperAccessTaskEntity::getCreateDept,areas); + }}); + if(CollectionUtil.isEmpty(accesss)){ + return 0; + } + return accesss.size(); + } +} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/DefectServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/DefectServiceImpl.java new file mode 100644 index 0000000..84af907 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/DefectServiceImpl.java @@ -0,0 +1,55 @@ +package com.hnac.hzims.scheduled.service.operation.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.hnac.hzims.operational.defect.entity.OperDefectEntity; +import com.hnac.hzims.scheduled.mapper.operation.DefectMapper; +import com.hnac.hzims.scheduled.service.operation.DefectService; +import lombok.AllArgsConstructor; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.utils.CollectionUtil; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author ysj + */ +@Service +@AllArgsConstructor +public class DefectServiceImpl extends BaseServiceImpl implements DefectService { + + /** + * 获取消缺率 + * @param areas + * @return + */ + @Override + public Double defectCount(List areas) { + if(CollectionUtil.isEmpty(areas)) { + return 100.00; + } + LocalDate firstDay = LocalDate.now().withDayOfYear(1); + LocalDateTime firstDateTime = LocalDateTime.of(firstDay, LocalTime.MIN); + LocalDateTime now = LocalDateTime.now(); + List pTaskList = this.list(new LambdaQueryWrapper(){{ + ge(OperDefectEntity::getCreateTime,firstDateTime); + le(OperDefectEntity::getCreateTime,now); + in(OperDefectEntity::getCreateDept,areas); + }}); + if(CollectionUtil.isEmpty(pTaskList)){ + return 0.0; + } + // 缺陷处理完成数 + List finishTask = pTaskList.stream().filter(defect -> "1".equals(defect.getHandleStatus())).collect(Collectors.toList()); + if(CollectionUtil.isEmpty(finishTask)){ + return 0.0; + } + // 消缺率 = (缺陷数 / 总数) * 100 + return BigDecimal.valueOf(finishTask.size() / (double) pTaskList.size() * 100).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + } +} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/MaintenanceServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/MaintenanceServiceImpl.java new file mode 100644 index 0000000..6ec8d3e --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/MaintenanceServiceImpl.java @@ -0,0 +1,50 @@ +package com.hnac.hzims.scheduled.service.operation.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.hnac.hzims.operational.maintenance.entity.OperMaintenanceTaskEntity; +import com.hnac.hzims.scheduled.mapper.operation.MaintenanceMapper; +import com.hnac.hzims.scheduled.service.operation.MaintenanceService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.utils.CollectionUtil; +import org.springframework.stereotype.Service; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.util.List; + +/** + * @author ysj + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class MaintenanceServiceImpl extends BaseServiceImpl implements MaintenanceService { + + /** + * 获取日常维护数量 + * @param departList + * @return + */ + @Override + public Integer maintenanceCount(List departList) { + if(CollectionUtil.isEmpty(departList)){ + return 0; + } + LocalDate firstDay = LocalDate.now().withDayOfYear(1); + LocalDateTime firstDateTime = LocalDateTime.of(firstDay, LocalTime.MIN); + LocalDateTime now = LocalDateTime.now(); + //日常维护 + List mTaskList = this.list(new LambdaQueryWrapper(){{ + ge(OperMaintenanceTaskEntity::getDisposeTime,firstDateTime); + le(OperMaintenanceTaskEntity::getDisposeTime,now); + in(OperMaintenanceTaskEntity::getCreateDept,departList); + }}); + if(CollectionUtil.isEmpty(mTaskList)){ + return 0; + } + return mTaskList.size(); + } +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/OtherServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/OtherServiceImpl.java new file mode 100644 index 0000000..202c396 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/OtherServiceImpl.java @@ -0,0 +1,19 @@ +package com.hnac.hzims.scheduled.service.operation.impl; + +import com.hnac.hzims.operational.fill.entity.OtherEntity; +import com.hnac.hzims.scheduled.mapper.operation.OtherMapper; +import com.hnac.hzims.scheduled.service.operation.OtherService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * @author ysj + */ +@Slf4j +@Service +@AllArgsConstructor +public class OtherServiceImpl extends BaseServiceImpl implements OtherService { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/OverDetailsServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/OverDetailsServiceImpl.java new file mode 100644 index 0000000..dc69ec3 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/OverDetailsServiceImpl.java @@ -0,0 +1,19 @@ +package com.hnac.hzims.scheduled.service.operation.impl; + +import com.hnac.hzims.operational.fill.entity.OverDetailsEntity; +import com.hnac.hzims.scheduled.mapper.operation.OverDetailsMapper; +import com.hnac.hzims.scheduled.service.operation.OverDetailsService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * @author ysj + */ +@Slf4j +@Service +@AllArgsConstructor +public class OverDetailsServiceImpl extends BaseServiceImpl implements OverDetailsService { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/OverServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/OverServiceImpl.java new file mode 100644 index 0000000..f629fc7 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/OverServiceImpl.java @@ -0,0 +1,19 @@ +package com.hnac.hzims.scheduled.service.operation.impl; + +import com.hnac.hzims.operational.fill.entity.OverEntity; +import com.hnac.hzims.scheduled.mapper.operation.OverMapper; +import com.hnac.hzims.scheduled.service.operation.OverService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * @author ysj + */ +@Slf4j +@Service +@AllArgsConstructor +public class OverServiceImpl extends BaseServiceImpl implements OverService { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/RealTargetServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/RealTargetServiceImpl.java index eacda88..c34da3f 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/RealTargetServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/RealTargetServiceImpl.java @@ -87,7 +87,6 @@ public class RealTargetServiceImpl implements RealTargetService { private final static String load_photovoltaic_target_key = "hzims:operation:photovoltaic:target:key"; - /** * 加载水电站机组实时数据 * @param param diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/ShowServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/ShowServiceImpl.java new file mode 100644 index 0000000..5d87218 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/ShowServiceImpl.java @@ -0,0 +1,480 @@ +package com.hnac.hzims.scheduled.service.operation.impl; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.google.common.util.concurrent.ThreadFactoryBuilder; +import com.hnac.hzims.equipment.entity.PlanGenerationEntity; +import com.hnac.hzims.operational.fill.entity.*; +import com.hnac.hzims.operational.main.constant.HomePageConstant; +import com.hnac.hzims.operational.main.vo.*; +import com.hnac.hzims.operational.station.entity.StationEntity; +import com.hnac.hzims.scheduled.service.equipment.PlanService; +import com.hnac.hzims.scheduled.service.operation.*; +import com.hnac.hzims.scheduled.service.ticket.TicketService; +import com.hnac.hzims.ticket.allTicket.vo.DoublePassRateVO; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.CollectionUtil; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.ObjectUtil; +import org.springblade.core.tool.utils.StringUtil; +import org.springblade.system.cache.DictCache; +import org.springblade.system.entity.Dept; +import org.springblade.system.feign.ISysClient; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Service; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.math.BigDecimal; +import java.net.HttpURLConnection; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.util.Date; +import java.util.List; +import java.util.concurrent.*; +import java.util.stream.Collectors; + +/** + * @author ysj + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class ShowServiceImpl implements ShowService { + + private final OverService overService; + private final PlanService planService; + private final PowerService powerService; + private final SolveService solveService; + private final OtherService otherService; + private final AccessService accessService; + private final TicketService ticketService; + private final DefectService defectService; + private final StationService stationService; + private final OverDetailsService detailsService; + private final MaintenanceService maintenanceService; + private final RedisTemplate redisTemplate; + private final ISysClient sysClient; + + + private final static String charge = "hzims:operation:key:charge"; + private final static String home_target_cache_final = "load:operation:home:target:key"; + private final static String hydropower_real_cache_final = "hzims:operation:loadhydropowerunit:real:key"; + private final static String hydropower_target_cache_final = "hzims:operation:loadhydropowerunit:target:key"; + private final static String photovoltaic_real_cache_final = "hzims:operation:photovoltaic:real:key"; + private final static String photovoltaic_target_cache_final = "hzims:operation:photovoltaic:target:key"; + + @Value("${hzims.operation.homePage.charge.url}") + public String charge_url; + + /** + * 集团总指标-首页数据 + */ + @Override + public void loadHomeTarget(String param) { + List targets = HomePageConstant.HOME_TYPES.stream().map(type->{ + if(type == 0) { + return this.hydropowerTaget(); + } + if (type == 1) { + return this.windTaget(); + } + if (type == 2) { + return this.waterStorageTaget(true); + } + if (type == 3) { + return this.waterStorageTaget(false); + } + if (type == 4) { + return this.networkTaget(); + } + if (type == 5) { + return this.photovoltaicTaget(); + } + if (type == 6) { + return this.affairsTaget(); + } + if(type == 7) { + return this.chargeTarget(); + } + return new TargetVo(); + }).collect(Collectors.toList()); + redisTemplate.opsForValue().set(home_target_cache_final,targets.stream().filter(( target -> ObjectUtil.isNotEmpty(target.getType()))).collect(Collectors.toList())); + } + + /** + * 水电站指标 + * @return + */ + private TargetVo hydropowerTaget() { + TargetVo target = new TargetVo(); + target.setType(HomePageConstant.HYDROPOWER); + target.setTypeName(DictCache.getValue("stationType", HomePageConstant.HYDROPOWER)); + // 实时数据 + List reals = (List) redisTemplate.opsForValue().get(hydropower_real_cache_final); + // 指标数据 + List targets = (List) redisTemplate.opsForValue().get(hydropower_target_cache_final); + if(CollectionUtil.isNotEmpty(reals)){ + // 装机容量 + target.setTaget_one(reals.stream().mapToDouble(HydropowerUnitRealVo::getInstalledCapacity).sum()); + } + if(CollectionUtil.isNotEmpty(targets)){ + // 发电量 + target.setTaget_two(targets.stream().mapToDouble(HydropowerUnitTargetVo::getPowerYear).sum()); + } + // 计划发电量 + List stations = stationService.list(Wrappers.lambdaQuery() + .eq(StationEntity::getServeType,HomePageConstant.HYDROPOWER_SERVETYPE) + .eq(StationEntity::getType,HomePageConstant.HYDROPOWER)); + if(CollectionUtil.isNotEmpty(stations)){ + List plans = planService.planGeneration(stations.stream().map(StationEntity::getCode).collect(Collectors.toList()), null, DateUtil.format(new Date(), "yyyy")); + if(CollectionUtil.isNotEmpty(plans)){ + double plan = plans.stream().mapToDouble(PlanGenerationEntity::getPlanGeneration).sum(); + if(Math.abs(plan) > 0){ + target.setTaget_three(BigDecimal.valueOf(target.getTaget_two() / plan * 100).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); + } + } + } + // 双票合格率 + R> result = sysClient.getDeptList(); + if(result.isSuccess() && CollectionUtil.isNotEmpty(result.getData()) && CollectionUtil.isNotEmpty(stations)){ + List areas = result.getData().stream().filter(dept -> stations.stream().map(StationEntity::getRefDept).collect(Collectors.toList()).contains(dept.getId())).map(Dept::getParentId).collect(Collectors.toList()); + if(CollectionUtil.isNotEmpty(areas)){ + LocalDateTime firstDateTime = LocalDateTime.of(LocalDate.now().withDayOfYear(1), LocalTime.MIN); + DoublePassRateVO pass = ticketService.doublePassRate(areas, firstDateTime, LocalDateTime.now()); + if(ObjectUtil.isNotEmpty(pass)){ + target.setTaget_four(Double.valueOf(pass.getDoublePassRate())); + } + } + } + return target; + } + + /** + * 风电指标 + * @return + */ + private TargetVo windTaget() { + TargetVo target = new TargetVo(); + target.setType(HomePageConstant.WIND_POWER); + target.setTypeName(DictCache.getValue("stationType", HomePageConstant.WIND_POWER)); + // 填报发电量 + List stations = stationService.list(Wrappers.lambdaQuery() + .eq(StationEntity::getServeType,HomePageConstant.HYDROPOWER_SERVETYPE) + .eq(StationEntity::getType,HomePageConstant.WIND_POWER)); + if(CollectionUtil.isEmpty(stations)){ + return target; + } + QueryWrapper queryWrapper = new QueryWrapper() {{ + in("create_dept", stations.stream().map(StationEntity::getRefDept).collect(Collectors.toList())); + eq("type", HomePageConstant.WIND_POWER_TYPE); + likeRight("mon", DateUtil.format(new Date(),"yyyy")); + }}; + List list = powerService.list(queryWrapper); + if(CollectionUtil.isEmpty(list)){ + return target; + } + double plan = list.stream().mapToDouble(PowerEntity::getPlannedPowerMon).sum(); + double pass = list.stream().mapToDouble(power -> Double.parseDouble(power.getDoubleQualifyRate())).sum(); + // 装机容量 + target.setTaget_one(list.stream().map(PowerEntity::getInstalledCapacity).collect(Collectors.toSet()).stream().mapToDouble(Double::valueOf).sum()); + // 发电量 + target.setTaget_two(list.stream().mapToDouble(PowerEntity::getPowerMon).sum()); + if(Math.abs(plan) > 0){ + // 发电完成率 + target.setTaget_three(BigDecimal.valueOf(target.getTaget_two() / plan * 100).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); + } + // 双票合格率 + target.setTaget_four(BigDecimal.valueOf(pass / list.size()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); + return target; + } + + /** + * 储能指标 + * @param flag : true - 水利 false - 储能 + * @return + */ + private TargetVo waterStorageTaget(boolean flag) { + TargetVo target = new TargetVo(); + if(flag){ + target.setType(HomePageConstant.WATER_CONSERVANCY); + target.setTypeName(DictCache.getValue("stationType", HomePageConstant.WATER_CONSERVANCY)); + }else{ + target.setType(HomePageConstant.ENERGY_STORAGE); + target.setTypeName(DictCache.getValue("stationType", HomePageConstant.ENERGY_STORAGE)); + } + // 查询储能站点 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(StationEntity::getServeType,HomePageConstant.HYDROPOWER_SERVETYPE); + if(flag){ + wrapper.eq(StationEntity::getType,HomePageConstant.WATER_CONSERVANCY); + }else{ + wrapper.eq(StationEntity::getType,HomePageConstant.ENERGY_STORAGE); + } + List stations = stationService.list(wrapper); + if(CollectionUtil.isEmpty(stations)){ + return target; + } + // 获取储能区域级别机构 + R> result = sysClient.getDeptList(); + if(result.isSuccess() && CollectionUtil.isNotEmpty(result.getData()) && CollectionUtil.isNotEmpty(stations)){ + List areas = result.getData().stream().filter(dept -> stations.stream().map(StationEntity::getRefDept).collect(Collectors.toList()).contains(dept.getId())).map(Dept::getParentId).collect(Collectors.toList()); + if(CollectionUtil.isNotEmpty(areas)){ + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder().setNameFormat("storage-taget-pool-%d").build(); + ScheduledExecutorService exe = new ScheduledThreadPoolExecutor(4, namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + // 监控线程执行完后返回结果 + CountDownLatch countDownLatch = new CountDownLatch(4); + // 日常维护 + exe.execute(() -> { + target.setTaget_one(Double.valueOf(maintenanceService.maintenanceCount(areas))); + countDownLatch.countDown(); + }); + // 检修任务 + exe.execute(() -> { + target.setTaget_two(accessService.accessCount(areas)); + countDownLatch.countDown(); + }); + // 消缺率 + exe.execute(() -> { + target.setTaget_three(defectService.defectCount(areas)); + countDownLatch.countDown(); + }); + // 双票合格率 + exe.execute(() -> { + LocalDate firstDay = LocalDate.now().withDayOfYear(1); + LocalDateTime firstDateTime = LocalDateTime.of(firstDay, LocalTime.MIN); + DoublePassRateVO pass = ticketService.doublePassRate(areas, firstDateTime, LocalDateTime.now()); + if (ObjectUtil.isNotEmpty(pass)) { + target.setTaget_four(Double.valueOf(pass.getDoublePassRate())); + } + countDownLatch.countDown(); + }); + try { + countDownLatch.await(); + } catch (InterruptedException e) { + e.printStackTrace(); + Thread.currentThread().interrupt(); + } + exe.shutdown(); + } + } + return target; + } + + /** + * 配网 + * @return + */ + private TargetVo networkTaget() { + TargetVo target = new TargetVo(); + target.setType(HomePageConstant.DISTRIBUTION_NETWORK); + target.setTypeName(DictCache.getValue("stationType", HomePageConstant.DISTRIBUTION_NETWORK)); + // 线程池 + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder().setNameFormat("network-taget-pool-%d").build(); + ScheduledExecutorService exe = new ScheduledThreadPoolExecutor(3, namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + // 监控线程执行完后返回结果 + CountDownLatch countDownLatch = new CountDownLatch(3); + // 当月 + LocalDate firstDay = LocalDate.now().withDayOfYear(1); + LocalDateTime firstDateTime = LocalDateTime.of(firstDay, LocalTime.MIN); + // 检修卡 + exe.execute(()->{ + List overs = overService.list(new QueryWrapper() {{ + ge("create_time", firstDateTime); + le("create_time", LocalDateTime.now()); + }}); + if(CollectionUtil.isEmpty(overs)){ + countDownLatch.countDown(); + return; + } + List details = detailsService.list(new QueryWrapper() {{ + ge("create_time", firstDateTime); + le("create_time", LocalDateTime.now()); + in("over_id",overs.stream().map(OverEntity::getId).collect(Collectors.toList())); + }}); + if(CollectionUtil.isEmpty(details)){ + countDownLatch.countDown(); + return; + } + target.setTaget_one(details.stream().mapToDouble(OverDetailsEntity::getQuantity).sum()); + countDownLatch.countDown(); + }); + // 消缺 + exe.execute(()->{ + List solves = solveService.list(new QueryWrapper() {{ + ge("create_time", firstDateTime); + le("create_time", LocalDateTime.now()); + }}); + if(CollectionUtil.isEmpty(solves)){ + countDownLatch.countDown(); + return; + } + target.setTaget_two(solves.stream().mapToDouble(SolveEntity::getSolveQuantity).sum()); + countDownLatch.countDown(); + }); + // 其他 + exe.execute(()->{ + List others = otherService.list(new QueryWrapper() {{ + ge("create_time", firstDateTime); + le("create_time", LocalDateTime.now()); + }}); + if(CollectionUtil.isEmpty(others)){ + countDownLatch.countDown(); + return; + } + // FA上线率 + double online = others.stream().mapToDouble(o-> Double.parseDouble(o.getOnlineRate())).sum(); + if(Math.abs(online) > 0){ + target.setTaget_three(BigDecimal.valueOf(online / others.size()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); + } + // FA投入条数 + target.setTaget_four(others.stream().mapToDouble(OtherEntity::getFaQuantity).sum()); + countDownLatch.countDown(); + }); + // 等待所有线程执行完成 + try { + countDownLatch.await(); + } catch (InterruptedException e) { + e.printStackTrace(); + Thread.currentThread().interrupt(); + } + return target; + } + + /** + * 光伏指标 + * @return + */ + private TargetVo photovoltaicTaget() { + TargetVo target = new TargetVo(); + target.setType(HomePageConstant.PHOTOVOLTAIC); + target.setTypeName(DictCache.getValue("stationType", HomePageConstant.PHOTOVOLTAIC)); + // 实时数据 + List reals = (List) redisTemplate.opsForValue().get(photovoltaic_real_cache_final); + // 指标数据 + List targets = (List) redisTemplate.opsForValue().get(photovoltaic_target_cache_final); + if(CollectionUtil.isNotEmpty(reals)){ + // 装机容量 + target.setTaget_one(reals.stream().mapToDouble(PhotovoltaicRealVo::getCapacity).sum()); + } + if(CollectionUtil.isNotEmpty(targets)){ + // 发电量 + target.setTaget_two(targets.stream().mapToDouble(PhotovoltaicTargetVo::getGenerationYear).sum()); + } + // 计划发电量、双票合格率 + List stations = stationService.list(Wrappers.lambdaQuery() + .eq(StationEntity::getServeType,HomePageConstant.HYDROPOWER_SERVETYPE) + .eq(StationEntity::getType,HomePageConstant.PHOTOVOLTAIC)); + if(CollectionUtil.isNotEmpty(stations)){ + QueryWrapper queryWrapper = new QueryWrapper() {{ + in("create_dept", stations.stream().map(StationEntity::getRefDept).collect(Collectors.toList())); + eq("type", HomePageConstant.PHOTOVOLTAIC_TYPE); + likeRight("mon", DateUtil.format(new Date(),"yyyy")); + }}; + List list = powerService.list(queryWrapper); + if(CollectionUtil.isEmpty(list)){ + return target; + } + double plan = list.stream().mapToDouble(PowerEntity::getPlannedPowerMon).sum(); + double pass = list.stream().mapToDouble(power -> Double.parseDouble(power.getDoubleQualifyRate())).sum(); + if(Math.abs(plan) > 0){ + // 发电完成率 + target.setTaget_three(BigDecimal.valueOf(target.getTaget_two() / plan * 100).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); + } + // 双票合格率 + target.setTaget_four(BigDecimal.valueOf(pass / list.size()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); + } + return target; + } + + /** + * 水务指标 + * @return + */ + private TargetVo affairsTaget() { + TargetVo target = new TargetVo(); + target.setType(HomePageConstant.WATER_AFFAIRS); + target.setTypeName(DictCache.getValue("stationType", HomePageConstant.WATER_AFFAIRS)); + // TODO 统计业务数据 + return target; + } + + /** + * 充电桩 + * @return + */ + private TargetVo chargeTarget() { + TargetVo target = (TargetVo) redisTemplate.opsForValue().get(charge); + if(ObjectUtil.isNotEmpty(target)){ + return target; + } + target = new TargetVo(); + try { + URL serverUrl = new URL(charge_url); + HttpURLConnection conn = (HttpURLConnection) serverUrl.openConnection(); + conn.setRequestMethod("GET"); + conn.setRequestProperty("Content-type", "application/json"); + //必须设置false，否则会自动redirect到重定向后的地址 + conn.setInstanceFollowRedirects(false); + conn.connect(); + String result = responseFormat(conn); + if (StringUtil.isBlank(result)) { + return new TargetVo(); + } + JSONObject jsonObject = JSONObject.parseObject(result); + JSONObject data = JSONObject.parseObject(jsonObject.get("data").toString()); + target.setType(HomePageConstant.CHARGE); + target.setTypeName(DictCache.getValue("stationType", HomePageConstant.CHARGE)); + target.setTaget_one(Double.valueOf(data.get("ordersCount").toString())); + target.setTaget_two(Double.valueOf(data.get("todayDegree").toString())); + target.setTaget_three(Double.valueOf(data.get("income").toString())); + target.setTaget_four(Double.valueOf(data.get("kilowatt").toString())); + target.setCharge(Integer.valueOf(data.get("stationNum").toString())); + redisTemplate.opsForValue().set(charge,target); + redisTemplate.expire(charge,30, TimeUnit.MINUTES); + } catch (Exception e) { + target.setType(HomePageConstant.CHARGE); + target.setTypeName(DictCache.getValue("stationType", HomePageConstant.CHARGE)); + target.setTaget_one(0.0); + target.setTaget_two(0.0); + target.setTaget_three(0.0); + target.setTaget_four(0.0); + target.setCharge(0); + log.error("charge_target_exception: {} ", e.getMessage()); + } + return target; + } + + /*** + * 获取返回的内容 + * @param connection + * @return + */ + private String responseFormat(HttpURLConnection connection) { + StringBuilder stringBuilder = new StringBuilder(); + //将返回的输入流转换成字符串 + try ( + InputStream inputStream = connection.getInputStream(); + InputStreamReader inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8); + BufferedReader bufferedReader = new BufferedReader(inputStreamReader) + ) { + String str; + while ((str = bufferedReader.readLine()) != null) { + stringBuilder.append(str); + } + } catch (IOException e) { + return null; + } + return stringBuilder.toString(); + } +} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/SolveServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/SolveServiceImpl.java new file mode 100644 index 0000000..6d5238a --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/SolveServiceImpl.java @@ -0,0 +1,20 @@ +package com.hnac.hzims.scheduled.service.operation.impl; + +import com.hnac.hzims.operational.fill.entity.SolveEntity; +import com.hnac.hzims.scheduled.mapper.operation.SolveMapper; +import com.hnac.hzims.scheduled.service.operation.SolveService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * @author ysj + */ +@Slf4j +@Service +@AllArgsConstructor +public class SolveServiceImpl extends BaseServiceImpl implements SolveService { + + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/TicketEvaluateService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/TicketEvaluateService.java new file mode 100644 index 0000000..ad99144 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/TicketEvaluateService.java @@ -0,0 +1,11 @@ +package com.hnac.hzims.scheduled.service.ticket; + +import com.hnac.hzims.ticket.allTicket.entity.TicketInfoEvaluateEntity; +import org.springblade.core.mp.base.BaseService; + +/** + * @author hx + */ +public interface TicketEvaluateService extends BaseService { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/TicketService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/TicketService.java new file mode 100644 index 0000000..5716e58 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/TicketService.java @@ -0,0 +1,16 @@ +package com.hnac.hzims.scheduled.service.ticket; + +import com.hnac.hzims.ticket.allTicket.vo.DoublePassRateVO; +import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity; +import org.springblade.core.mp.base.BaseService; + +import java.time.LocalDateTime; +import java.util.List; + +/** + * @author ysj + */ +public interface TicketService extends BaseService { + + DoublePassRateVO doublePassRate(List areas, LocalDateTime firstDateTime, LocalDateTime now); +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/WorkTicketService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/WorkTicketService.java new file mode 100644 index 0000000..536b410 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/WorkTicketService.java @@ -0,0 +1,7 @@ +package com.hnac.hzims.scheduled.service.ticket; + +import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity; +import org.springblade.core.mp.base.BaseService; + +public interface WorkTicketService extends BaseService { +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketEvaluateServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketEvaluateServiceImpl.java new file mode 100644 index 0000000..1bd217e --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketEvaluateServiceImpl.java @@ -0,0 +1,20 @@ +package com.hnac.hzims.scheduled.service.ticket.impl; + +import com.hnac.hzims.scheduled.mapper.ticket.TicketEvaluateMapper; +import com.hnac.hzims.scheduled.service.ticket.TicketEvaluateService; +import com.hnac.hzims.ticket.allTicket.entity.TicketInfoEvaluateEntity; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * @author ysj + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class TicketEvaluateServiceImpl extends BaseServiceImpl implements TicketEvaluateService { + + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java new file mode 100644 index 0000000..204a17b --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java @@ -0,0 +1,85 @@ +package com.hnac.hzims.scheduled.service.ticket.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.hnac.hzims.scheduled.mapper.ticket.TicketMapper; +import com.hnac.hzims.scheduled.service.ticket.TicketEvaluateService; +import com.hnac.hzims.scheduled.service.ticket.TicketService; +import com.hnac.hzims.scheduled.service.ticket.WorkTicketService; +import com.hnac.hzims.ticket.allTicket.entity.TicketInfoEvaluateEntity; +import com.hnac.hzims.ticket.allTicket.vo.DoublePassRateVO; +import com.hnac.hzims.ticket.constants.TicketConstants; +import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity; +import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.utils.CollectionUtil; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author ysj + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class TicketServiceImpl extends BaseServiceImpl implements TicketService { + + private final WorkTicketService workTicketService; + private final TicketEvaluateService ticketEvaluateService; + + /** + * 获取双票合格率 + * @param depatList + * @param firstDateTime + * @param now + * @return + */ + @Override + public DoublePassRateVO doublePassRate(List depatList, LocalDateTime firstDateTime, LocalDateTime now) { + DoublePassRateVO doublePassRateVO = new DoublePassRateVO(); + // 查询操作票 + List standardList = this.list(new LambdaQueryWrapper() {{ + ge(StandardTicketInfoEntity::getCreateTime, firstDateTime); + le(StandardTicketInfoEntity::getCreateTime, now); + in(StandardTicketInfoEntity::getCreateDept, depatList); + }}); + // 查询工作票 + List workList = workTicketService.list(new LambdaQueryWrapper() {{ + ge(WorkTicketInfoEntity::getCreateTime, firstDateTime); + le(WorkTicketInfoEntity::getCreateTime, now); + in(WorkTicketInfoEntity::getCreateDept, depatList); + }}); + if (CollectionUtil.isEmpty(standardList) && CollectionUtil.isEmpty(workList)) { + doublePassRateVO.setDoubleTicketCount(0); + doublePassRateVO.setDoubleTicketPassCount(0); + doublePassRateVO.setDoublePassRate("0"); + return doublePassRateVO; + } + List standardIdList = new ArrayList<>(); + standardIdList.addAll(standardList.stream().map(StandardTicketInfoEntity::getId).collect(Collectors.toList())); + standardIdList.addAll(workList.stream().map(WorkTicketInfoEntity::getId).collect(Collectors.toList())); + doublePassRateVO.setDoubleTicketCount(standardIdList.size()); + // 查询合格评价 + List evaluateList = ticketEvaluateService.list(new LambdaQueryWrapper() {{ + ge(TicketInfoEvaluateEntity::getCreateTime, firstDateTime); + le(TicketInfoEvaluateEntity::getCreateTime, now); + in(TicketInfoEvaluateEntity::getTicketId, standardIdList); + eq(TicketInfoEvaluateEntity::getStatus, TicketConstants.TicketQualifiedEnum.Qualified.getCode()); + }}); + if (CollectionUtil.isEmpty(evaluateList)) { + doublePassRateVO.setDoubleTicketPassCount(0); + doublePassRateVO.setDoublePassRate("0"); + return doublePassRateVO; + } + double doublePassRate = BigDecimal.valueOf(evaluateList.size() / (double) standardIdList.size() * 100).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + doublePassRateVO.setDoubleTicketPassCount(evaluateList.size()); + doublePassRateVO.setDoublePassRate(String.valueOf(doublePassRate)); + return doublePassRateVO; + } +} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkTicketServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkTicketServiceImpl.java new file mode 100644 index 0000000..13dbc45 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkTicketServiceImpl.java @@ -0,0 +1,1093 @@ +package com.hnac.hzims.scheduled.service.ticket.impl; + +import cn.afterturn.easypoi.excel.entity.TemplateExportParams; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.google.common.collect.Lists; +import com.hnac.hzims.common.logs.utils.StringUtils; +import com.hnac.hzims.operational.access.constants.AccessConstants; +import com.hnac.hzims.operational.access.entity.OperAccessTaskEntity; +import com.hnac.hzims.operational.access.feign.IOperAccessTaskClient; +import com.hnac.hzims.operational.maintenance.dto.OperMaintenanceTaskDTO; +import com.hnac.hzims.operational.maintenance.feign.ITaskClient; +import com.hnac.hzims.ticket.allTicket.entity.TicketInfoEvaluateEntity; +import com.hnac.hzims.ticket.allTicket.service.TicketInfoEvaluateService; +import com.hnac.hzims.ticket.areamonthly.vo.StandardTicketWithAreaVo; +import com.hnac.hzims.ticket.areamonthly.vo.StandardWorkVo; +import com.hnac.hzims.ticket.aspect.AroundFlow; +import com.hnac.hzims.ticket.constants.TicketConstants; +import com.hnac.hzims.ticket.twoTicket.entity.TicketInfoDanger; +import com.hnac.hzims.ticket.twoTicket.entity.WorkTicketFinish; +import com.hnac.hzims.ticket.twoTicket.service.TicketInfoDangerService; +import com.hnac.hzims.ticket.twoTicket.service.impl.WorkTicketFinishServiceImpl; +import com.hnac.hzims.ticket.twoTicket.vo.process.WorkTicketVo; +import com.hnac.hzims.ticket.utils.ExcelUtil; +import com.hnac.hzims.ticket.utils.PdfUtils; +import com.hnac.hzims.ticket.workTicket.entity.*; +import com.hnac.hzims.ticket.workTicket.mapper.WorkDelayNoScopeMapper; +import com.hnac.hzims.ticket.workTicket.mapper.WorkTicketInfoMapper; +import com.hnac.hzims.ticket.workTicket.wrapper.WorkTicketDelayWrapper; +import com.hnac.hzims.ticket.workTicket.wrapper.WorkTicketInfoWrapper; +import com.hnac.hzims.vo.SafeCheckStatisticVO; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.map.HashedMap; +import org.apache.poi.ss.usermodel.Workbook; +import org.springblade.core.log.exception.ServiceException; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.mp.support.BladePage; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.CollectionUtil; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.core.tool.utils.ObjectUtil; +import org.springblade.flow.core.entity.BladeFlow; +import org.springblade.flow.core.feign.IFlowClient; +import org.springblade.flow.core.vo.ComleteTask; +import org.springblade.system.user.cache.UserCache; +import org.springblade.system.user.entity.User; +import org.springblade.system.user.feign.IUserClient; +import org.springframework.beans.BeanUtils; +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 org.springframework.util.Assert; + +import javax.servlet.http.HttpServletResponse; +import java.time.LocalDateTime; +import java.time.YearMonth; +import java.time.format.DateTimeFormatter; +import java.time.temporal.TemporalAdjusters; +import java.util.*; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; +import java.util.stream.Collectors; + + +/** + *

+ * 工作票 服务实现类 + *

+ * + * @author hx + * @since 2021-10-22 + */ +@Service +@Slf4j +@RequiredArgsConstructor +public class WorkTicketServiceImpl extends BaseServiceImpl implements IWorkTicketInfoService { + + private final IWorkTicketSafetyMeasureService workTicketSafetyMeasureService; + private final IWorkTicketPrincipalChangeService workTicketPrincipalChangeService; + private final IWorkTicketDelayService delayService; + private final IWorkTicketMembersChangeService workTicketMembersChangeService; + private final IWorkTicketOperateTimeService workTicketOperateTimeService; + private final IWorkTicketFlowService workTicketFlowService; + private final IFlowClient flowClient; + private final IUserClient userClient; + private final WorkDelayNoScopeMapper workDelayNoScopeMapper; + private final IOperAccessTaskClient operAccessTaskClient; + private final ITaskClient taskClient; + private final TicketInfoEvaluateService ticketInfoEvaluateService; + private final IWorkTicketContentService workTicketContentService; + private final WorkTicketFinishServiceImpl workTicketFinishService; + private final TicketInfoDangerService ticketInfoDangerService; + + /** 生成两票编号锁 **/ + private Lock lock = new ReentrantLock(); + + /** word模板预览导出保存路径 **/ + @Value("${hzims.ticket.path.xlsx.savePath}") + private String xlsSavePath; + + @Value("${hzims.ticket.first-work-flow-key}") + private String firstWorkTicketFlowKey; + + @Value("${hzims.tenantId}") + private String tenantId; + + @Value("${hzims.ticket.path.pdf.savePath}") + private String pdfSavePath; + + @Override + @Transactional + @AroundFlow + public R doSave(WorkTicketInfoDto req) { + req.setCode(this.getWorkTicketCode()); + req.setStatus(Func.isEmpty(req.getPrincipal()) || Func.isEmpty(req.getClassGroupMembers()) ? TicketConstants.FirstWorkTicketFlowStatusEnum.OFFLINE.getStatus() : TicketConstants.FirstWorkTicketFlowStatusEnum.SIGN.getStatus()); + boolean flag = this.save(req); + /**保存安全措施**/ + if (flag && CollectionUtil.isNotEmpty(req.getWorkTicketSafetyMeasureDtoList())) { + req.getWorkTicketSafetyMeasureDtoList().forEach(workTicketSafetyMeasureDto -> { + workTicketSafetyMeasureDto.setTicketId(req.getId()); + workTicketSafetyMeasureService.save(workTicketSafetyMeasureDto); + }); + } + if (Func.isEmpty(req.getPrincipal()) || Func.isEmpty(req.getClassGroupMembers())) { + //将票据ID会传至计划/任务内 + returnTicket(req); + return R.success("开票成功！该票走线下未开启流程"); + } + /**开启工作流**/ + BladeFlow bladeFlow = this.startProcessInstance(firstWorkTicketFlowKey, req); + this.update(Wrappers.lambdaUpdate().set(WorkTicketInfoEntity::getProcessInstanceId, bladeFlow.getProcessInstanceId()).eq(WorkTicketInfoEntity::getId, req.getId())); + //将票据ID会传至计划/任务内 + returnTicket(req); + return R.success("保存成功"); + } + + /** + * 工作票延期 进入许可人确认工作票延期 + * + * @param ticketId 工作票ID + * @param status 状态 + * @param completeTask 工作流进行 + */ + @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED) + public void delay(Long ticketId, Integer status, ComleteTask completeTask) { + //新增延期信息 + Assert.notNull(completeTask.getVariables().get("delay"), "延期信息不能为空"); + WorkTicketDelayEntity delayEntity = (WorkTicketDelayEntity) completeTask.getVariables().get("delay"); + delayService.save(delayEntity); + //更新负责人确认执行情况流程 填充信息 + WorkTicketFlowEntity workTicketFlowEntity = workTicketFlowService.getOne(Wrappers.lambdaQuery().eq(WorkTicketFlowEntity::getTicketId, ticketId).eq(WorkTicketFlowEntity::getFlowCode, TicketConstants.FirstWorkTicketFlowStatusEnum.CONFIRM_WORK_FINISH.getStatus()).orderByDesc(WorkTicketFlowEntity::getCreateTime).last("limit 1;")); + workTicketFlowService.update(Wrappers.lambdaUpdate().set(WorkTicketFlowEntity::getExecutor, AuthUtil.getUserId().toString()).set(WorkTicketFlowEntity::getExecuteTime, LocalDateTime.now()).eq(WorkTicketFlowEntity::getId, workTicketFlowEntity.getId())); + //更新工作票状态 + this.update(Wrappers.lambdaUpdate().set(WorkTicketInfoEntity::getStatus, status).eq(WorkTicketInfoEntity::getId, ticketId)); + //创建延期流程 + WorkTicketInfoEntity infoEntity = this.getById(ticketId); + WorkTicketFlowEntity currentFlowEntity = new WorkTicketFlowEntity(); + currentFlowEntity.setTicketId(ticketId); + currentFlowEntity.setFlowCode(status.toString()); + currentFlowEntity.setExecutor(infoEntity.getLicensor().toString()); + currentFlowEntity.setProcTaskId((String) completeTask.getVariables().get("procTaskId")); + workTicketFlowService.save(workTicketFlowEntity); + //进入工作流下一步 + R result = flowClient.completeTask(completeTask); + if (!result.isSuccess()) { + throw new ServiceException("执行工作流失败"); + } + } + + @Override + public R detail(Long id) { + WorkTicketInfoEntity workTicketInfoEntity = this.getById(id); + if (ObjectUtil.isEmpty(workTicketInfoEntity)) { + return R.fail("未查询到该ID对应的记录"); + } else { + WorkTicketInfoVO workTicketInfoVO = WorkTicketInfoWrapper.build().entityVO(workTicketInfoEntity); + + /**获取工作票安全措施列表**/ + WorkTicketSafetyMeasureDto workTicketSafetyMeasureDto = new WorkTicketSafetyMeasureDto(); + workTicketSafetyMeasureDto.setTicketId(id); + List workTicketSafetyMeasureVOList = workTicketSafetyMeasureService.list(workTicketSafetyMeasureDto); + workTicketInfoVO.setWorkTicketSafetyMeasureVOList(workTicketSafetyMeasureVOList); + + /**获取工作票负责人变更**/ + WorkTicketPrincipalChangeDto workTicketPrincipalChangeDto = new WorkTicketPrincipalChangeDto(); + workTicketPrincipalChangeDto.setTicketId(id); + List workTicketPrincipalChangeVOList = workTicketPrincipalChangeService.list(workTicketPrincipalChangeDto); + workTicketInfoVO.setWorkTicketPrincipalChangeVOList(workTicketPrincipalChangeVOList); + + /**获取工作票工作组员变更**/ + WorkTicketMembersChangeDto workTicketMembersChangeDto = new WorkTicketMembersChangeDto(); + workTicketMembersChangeDto.setTicketId(id); + List workTicketMembersChangeVOList = workTicketMembersChangeService.list(workTicketMembersChangeDto); + workTicketInfoVO.setWorkTicketMembersChangeVOList(workTicketMembersChangeVOList); + + /**获取工作票跨日运行时间列表**/ + WorkTicketOperateTimeDto workTicketOperateTimeDto = new WorkTicketOperateTimeDto(); + workTicketOperateTimeDto.setTicketId(id); + List workTicketOperateTimeVOList = workTicketOperateTimeService.list(workTicketOperateTimeDto); + workTicketInfoVO.setWorkTicketOperateTimeVOList(workTicketOperateTimeVOList); + + /**获取工作票处理流程列表**/ + WorkTicketFlowDto workTicketFlowDto = new WorkTicketFlowDto(); + workTicketFlowDto.setTicketId(id); + List workTicketFlowVOList = workTicketFlowService.list(workTicketFlowDto); + workTicketInfoVO.setWorkTicketFlowVOList(workTicketFlowVOList); + + /**获取工作票延期列表**/ + WorkTicketDelayDto workTicketDelayDto = new WorkTicketDelayDto(); + workTicketDelayDto.setTicketId(id); + List workTicketDelayList = workDelayNoScopeMapper.selectList(new LambdaQueryWrapper() {{ + eq(WorkTicketDelayEntity::getTicketId, id); + eq(WorkTicketDelayEntity::getIsDeleted, 0L); + }}); + if (CollectionUtil.isNotEmpty(workTicketDelayList)) { + workTicketInfoVO.setWorkTicketDelayVOList(WorkTicketDelayWrapper.build().listVO(workTicketDelayList)); + } + + return R.data(workTicketInfoVO); + } + } + + @Override + public R> queryList(WorkTicketInfoDto req, Query query) { + LambdaQueryWrapper lqw = this.getQueryWrapper(req); + if (ObjectUtil.isNotEmpty(req.getCreateDept())) { + lqw.eq(WorkTicketInfoEntity::getCreateDept, req.getCreateDept()); + } + + lqw.orderByDesc(WorkTicketInfoEntity::getCreateTime).orderByDesc(WorkTicketInfoEntity::getUpdateTime); + IPage pages = this.page(Condition.getPage(query), lqw); + //数据转换 + IPage workTicketInfoVOIPage = new Page<>(pages.getCurrent(), pages.getSize()); + workTicketInfoVOIPage.setRecords(WorkTicketInfoWrapper.build().listVO(pages.getRecords())); + workTicketInfoVOIPage.setPages(pages.getPages()); + workTicketInfoVOIPage.setTotal(pages.getTotal()); + //获取创建人 + workTicketInfoVOIPage.getRecords().forEach(item -> { + User user = UserCache.getUser(item.getCreateUser()); + if (user != null) { + item.setCreateUserName(user.getName()); + } + }); + + + return R.data(workTicketInfoVOIPage); + } + + @Override + public List list(WorkTicketInfoDto req) { + LambdaQueryWrapper lqw = this.getQueryWrapper(req); + List workTicketInfoEntityList = this.list(lqw); + return CollectionUtil.isNotEmpty(workTicketInfoEntityList) ? WorkTicketInfoWrapper.build().listVO(workTicketInfoEntityList) : null; + } + + @Override + @Transactional + public R remove(Long id, String comment) { + WorkTicketInfoEntity entity = this.getById(id); + if (ObjectUtil.isEmpty(entity)) { + return R.fail(400, "删除失败！未查询到相关记录"); + } + + boolean flag = this.update(Wrappers.lambdaUpdate().set(WorkTicketInfoEntity::getStatus, TicketConstants.FirstWorkTicketFlowStatusEnum.TERMINATION.getStatus()).eq(WorkTicketInfoEntity::getId, id)); + + /**线下单独删除**/ + if (TicketConstants.FirstWorkTicketFlowStatusEnum.OFFLINE.getStatus().equals(entity.getStatus())) { + return R.status(flag); + } + /**终止工作流**/ + R r = flowClient.delProcessInstanceById(entity.getProcessInstanceId(), comment); + if (!r.isSuccess()) { + throw new ServiceException("终止工作流失败!"); + } + return R.success("删除成功！"); + } + + @Override + public void exportWorkTicketTemplate(Long id, HttpServletResponse response) { + exportWorkTicketInfoPdf(id, response); + } + + @Override + @SuppressWarnings("unchecked") + public void exportWorkTicketInfoPdf(Long id, HttpServletResponse response) { + R workTicketInfoVOR = this.detail(id); + if (!workTicketInfoVOR.isSuccess()) { + log.error("未查询到相关工作票记录！"); + return; + } + WorkTicketInfoVO workTicketInfoVO = workTicketInfoVOR.getData(); + //将workTicketInfoVO封装进Map,以便pdf导出 + Map workTicketInfoMap = new HashMap<>(); + try { + workTicketInfoMap = PdfUtils.objectToMap(workTicketInfoVO); + } catch (Exception e) { + log.info("转换对象失败！"); + } + //安全措施 + if (CollectionUtil.isNotEmpty(workTicketInfoVO.getWorkTicketSafetyMeasureVOList())) { + Map> measureMap = workTicketInfoVO.getWorkTicketSafetyMeasureVOList().stream().collect(Collectors.groupingBy(WorkTicketSafetyMeasureVO::getType)); + if (ObjectUtil.isNotEmpty(measureMap.get(TicketConstants.MEASURE_TYPE_ONE))) { + workTicketInfoMap.put("matterLibraryListOne", measureMap.get(TicketConstants.MEASURE_TYPE_ONE).stream().map(measure -> { + Map map = PdfUtils.objectToMap(measure); + map.put("safetyMeasure", ObjectUtil.isNotEmpty(map.get("measure")) ? map.get("measure") : null); + String status = TicketConstants.SafetyMeasureStatusEnum.FINISH.getStatus().equals(measure.getStatus()) ? TicketConstants.SafetyMeasureStatusEnum.FINISH.getDescribe() : " "; + map.put("status", status); + return map; + }).collect(Collectors.toList())); + } else { + workTicketInfoMap.put("matterLibraryListOne", new ArrayList>(1)); + } + if (ObjectUtil.isNotEmpty(measureMap.get(TicketConstants.MEASURE_TYPE_TWO))) { + workTicketInfoMap.put("matterLibraryListTwo", measureMap.get(TicketConstants.MEASURE_TYPE_TWO).stream().map(measure -> { + Map map = PdfUtils.objectToMap(measure); + map.put("safetyMeasure", ObjectUtil.isNotEmpty(map.get("measure")) ? map.get("measure") : null); + String status = TicketConstants.SafetyMeasureStatusEnum.FINISH.getStatus().equals(measure.getStatus()) ? TicketConstants.SafetyMeasureStatusEnum.FINISH.getDescribe() : " "; + map.put("status", status); + return map; + }).collect(Collectors.toList())); + } else { + workTicketInfoMap.put("matterLibraryListTwo", new ArrayList>(1)); + } + if (ObjectUtil.isNotEmpty(measureMap.get(TicketConstants.MEASURE_TYPE_THREE))) { + workTicketInfoMap.put("matterLibraryListThree", measureMap.get(TicketConstants.MEASURE_TYPE_THREE).stream().map(measure -> { + Map map = PdfUtils.objectToMap(measure); + map.put("safetyMeasure", ObjectUtil.isNotEmpty(map.get("measure")) ? map.get("measure") : null); + String status = TicketConstants.SafetyMeasureStatusEnum.FINISH.getStatus().equals(measure.getStatus()) ? TicketConstants.SafetyMeasureStatusEnum.FINISH.getDescribe() : " "; + map.put("status", status); + return map; + }).collect(Collectors.toList())); + } else { + workTicketInfoMap.put("matterLibraryListThree", new ArrayList>(1)); + } + } + //线下开票确认人为空 + workTicketInfoMap.put("membersConfirm", TicketConstants.FirstWorkTicketFlowStatusEnum.OFFLINE.getStatus().equals(workTicketInfoVO.getStatus()) ? "" : workTicketInfoVO.getMembersName()); + //获取工作票工作流处理信息 + List workTicketFlowVOList = workTicketInfoVO.getWorkTicketFlowVOList(); + //签发 + List signFlow = workTicketFlowVOList.stream().filter(f -> TicketConstants.FirstWorkTicketFlowStatusEnum.LICENSE.getStatus().equals(Integer.parseInt(f.getFlowCode()))).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(signFlow)) { + workTicketInfoMap.put("signer", signFlow.get(0).getCreateUserName()); + workTicketInfoMap.put("signTime", DateUtil.format(signFlow.get(0).getCreateTime(), TicketConstants.TICKET_DATE_PATTERN)); + } else { + workTicketInfoMap.put("signer", ""); + workTicketInfoMap.put("signTime", ""); + } + //许可人许可 + if (Func.isNotEmpty(workTicketInfoVO.getLicenseTime())) { + workTicketInfoMap.put("licensorConfirm", workTicketInfoVO.getLicensorName()); + workTicketInfoMap.put("licenseTime", DateUtil.format(workTicketInfoVO.getLicenseTime(), TicketConstants.TICKET_DATE_PATTERN)); + } else { + workTicketInfoMap.put("licensorConfirm", ""); + workTicketInfoMap.put("licenseTime", ""); + } + + /**负责人收到工作票**/ + List receiveFlow = workTicketFlowVOList.stream().filter(f -> TicketConstants.FirstWorkTicketFlowStatusEnum.CONFIRM_MEASURE_PRINCIPAL.getStatus().equals(Integer.parseInt(f.getFlowCode()))).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(receiveFlow)) { + workTicketInfoMap.put("receivePrincipal", receiveFlow.get(0).getCreateUserName()); + workTicketInfoMap.put("receiveTime", DateUtil.format(receiveFlow.get(0).getCreateTime(), TicketConstants.TICKET_DATE_PATTERN)); + workTicketInfoMap.put("principalConfirm", workTicketInfoVO.getPrincipalName()); + } else { + workTicketInfoMap.put("receivePrincipal", ""); + workTicketInfoMap.put("receiveTime", ""); + workTicketInfoMap.put("principalConfirm", ""); + } + /**负责人确认安全事项**/ + List confirmFlow = workTicketFlowVOList.stream().filter(f -> TicketConstants.FirstWorkTicketFlowStatusEnum.CONFIRM_MEASURE_MEMBERS.getStatus().equals(Integer.parseInt(f.getFlowCode()))).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(confirmFlow)) { + workTicketInfoMap.put("confirmPrincipal", confirmFlow.get(0).getCreateUserName()); + workTicketInfoMap.put("confirmTime", DateUtil.format(confirmFlow.get(0).getCreateTime(), TicketConstants.TICKET_DATE_PATTERN)); + } else { + workTicketInfoMap.put("confirmPrincipal", ""); + workTicketInfoMap.put("confirmTime", ""); + } + /**工作结束**/ + List finishFlow = workTicketFlowVOList.stream().filter(f -> TicketConstants.FirstWorkTicketFlowStatusEnum.END.getStatus().equals(Integer.parseInt(f.getFlowCode()))).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(finishFlow)) { + workTicketInfoMap.put("finisher", finishFlow.get(0).getCreateUserName()); + workTicketInfoMap.put("finishTime", DateUtil.format(finishFlow.get(0).getCreateTime(), TicketConstants.TICKET_DATE_PATTERN)); + workTicketInfoMap.put("principalFinish", workTicketInfoVO.getPrincipalName()); + } else { + workTicketInfoMap.put("finisher", ""); + workTicketInfoMap.put("finishTime", ""); + workTicketInfoMap.put("principalFinish", ""); + } + /**工作终结**/ + List endFlow = workTicketFlowVOList.stream().filter(f -> TicketConstants.FirstWorkTicketFlowStatusEnum.FINISH.getStatus().intValue() == Integer.parseInt(f.getFlowCode())).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(endFlow)) { + workTicketInfoMap.put("endLicensor", endFlow.get(0).getCreateUserName()); + workTicketInfoMap.put("endTime", DateUtil.format(endFlow.get(0).getCreateTime(), TicketConstants.TICKET_DATE_PATTERN)); + workTicketInfoMap.put("groundSwitchCount", ObjectUtil.isNotEmpty(endFlow.get(0).getGroundSwitchCount()) ? endFlow.get(0).getGroundSwitchCount() : ""); + workTicketInfoMap.put("groundWireCode", ObjectUtil.isNotEmpty(endFlow.get(0).getGroundWireCode()) ? endFlow.get(0).getGroundWireCode() : ""); + workTicketInfoMap.put("groundWireCount", ObjectUtil.isNotEmpty(endFlow.get(0).getGroundWireCount()) ? endFlow.get(0).getGroundWireCount() : ""); + } else { + workTicketInfoMap.put("endLicensor", ""); + workTicketInfoMap.put("endTime", ""); + workTicketInfoMap.put("groundSwitchCount", ""); + workTicketInfoMap.put("groundWireCode", ""); + workTicketInfoMap.put("groundWireCount", ""); + } + /**负责人变更**/ + List workTicketPrincipalChangeVOList = workTicketInfoVO.getWorkTicketPrincipalChangeVOList(); + if (CollectionUtil.isNotEmpty(workTicketPrincipalChangeVOList)) { + workTicketInfoMap.put("initPrincipal", workTicketPrincipalChangeVOList.get(0).getInitialPrincipalName()); + workTicketInfoMap.put("changePrincipal", workTicketPrincipalChangeVOList.get(0).getChangePrincipalName()); + workTicketInfoMap.put("principalChangeSigner", workTicketPrincipalChangeVOList.get(0).getCreateUserName()); + workTicketInfoMap.put("principalChangeTime", DateUtil.format(workTicketPrincipalChangeVOList.get(0).getCreateTime(), TicketConstants.TICKET_DATE_PATTERN)); + } else { + workTicketInfoMap.put("initPrincipal", ""); + workTicketInfoMap.put("changePrincipal", ""); + workTicketInfoMap.put("principalChangeSigner", ""); + workTicketInfoMap.put("principalChangeTime", ""); + } + /**工作成员变更**/ + List membersChangeList = workTicketInfoVO.getWorkTicketMembersChangeVOList(); + if (CollectionUtil.isNotEmpty(membersChangeList)) { + /**工作成员变更详情**/ + String membersChangeSituation = membersChangeList.stream().map(mc -> DateUtil.format(mc.getCreateTime(), TicketConstants.TICKET_DATE_PATTERN).concat(":").concat(mc.getChangeMembersName())).collect(Collectors.joining(";")); + workTicketInfoMap.put("membersChangeSituation", membersChangeSituation); + workTicketInfoMap.put("memberChangePrincipal", membersChangeList.get(0).getCreateUserName()); + } else { + workTicketInfoMap.put("membersChangeSituation", ""); + workTicketInfoMap.put("memberChangePrincipal", ""); + } + /**工作票延期**/ + List workTicketDelayVOList = workTicketInfoVO.getWorkTicketDelayVOList(); + if (CollectionUtil.isNotEmpty(workTicketDelayVOList)) { + WorkTicketDelayVO workTicketDelayVO = workTicketDelayVOList.get(0); + workTicketInfoMap.put("delayTime", DateUtil.format(workTicketDelayVO.getChangeTime(), TicketConstants.TICKET_DATE_PATTERN)); + workTicketInfoMap.put("delayPrincipal", workTicketDelayVO.getCreateUserName()); + workTicketInfoMap.put("delayPrincipalTime", DateUtil.format(workTicketDelayVO.getCreateTime(), TicketConstants.TICKET_DATE_PATTERN)); + workTicketInfoMap.put("delayLicensor", workTicketDelayVO.getLicensorName()); + workTicketInfoMap.put("delayLicenseTime", DateUtil.format(workTicketDelayVO.getLicenseTime(), TicketConstants.TICKET_DATE_PATTERN)); + } else { + workTicketInfoMap.put("delayTime", ""); + workTicketInfoMap.put("delayPrincipal", ""); + workTicketInfoMap.put("delayPrincipalTime", ""); + workTicketInfoMap.put("delayLicensor", ""); + workTicketInfoMap.put("delayLicenseTime", ""); + } + + /**跨日工作时间**/ + List operateList = workTicketInfoVO.getWorkTicketOperateTimeVOList(); + if (CollectionUtil.isNotEmpty(operateList)) { + List> operateMapList = operateList.stream().map(operate -> { + Map map = new HashMap<>(4); + map.put("startTime", DateUtil.format(operate.getStartTime(), TicketConstants.TICKET_DATE_PATTERN)); + map.put("endTime", DateUtil.format(operate.getEndTime(), TicketConstants.TICKET_DATE_PATTERN)); + map.put("principal", operate.getPrincipalName()); + map.put("licensor", operate.getLicensorName()); + return map; + }).collect(Collectors.toList()); + workTicketInfoMap.put("operateMapList", operateMapList); + } else { + List> operateMapList = new ArrayList<>(); + Map map = new HashMap<>(4); + map.put("startTime", ""); + map.put("endTime", ""); + map.put("principal", ""); + map.put("licensor", ""); + operateMapList.add(map); + workTicketInfoMap.put("operateMapList", operateMapList); + } + + /**运行值班人员暂为空**/ + workTicketInfoMap.put("dutyPersonName", "/"); + + String fileName = TicketConstants.WordFileNameEnum.getFileNameByType(workTicketInfoVO.getType()) + PdfUtils.XLSX_SUFFIX; + log.info("工作票模板为：{}", fileName); + TemplateExportParams templateExportParams = new TemplateExportParams("template/" + fileName, true); + Workbook workbook = null; + try { + workbook = ExcelUtil.getWorkbook(templateExportParams, workTicketInfoMap); + } catch (Exception e) { + e.printStackTrace(); + } + //上传xlsx至服务器 + try { + ExcelUtil.upload(workbook, xlsSavePath, workTicketInfoVO.getWorkContent() + PdfUtils.XLSX_SUFFIX); + } catch (Exception e) { + e.printStackTrace(); + } + //将xlsx文件转换为pdf并保存 + String pdfFileName = workTicketInfoVO.getWorkContent() + PdfUtils.PDF_SUFFIX; + String xlsFileName = workTicketInfoVO.getWorkContent() + PdfUtils.XLSX_SUFFIX; + PdfUtils.convertPdf(xlsSavePath, xlsFileName, pdfSavePath, pdfFileName); + String savePath = pdfSavePath + pdfFileName; + // 设置response参数，可以打开下载页面 + PdfUtils.readPdf(response, savePath); + } + + @Override + @Transactional + public R completeTask(WorkTicketInfoDto req, BladeFlow flow) { + ComleteTask task = new ComleteTask(); + task.setTaskId(flow.getTaskId()); + task.setComment(flow.getComment()); + task.setAttachments(flow.getAttachments()); + task.setFlag(flow.getFlag()); + task.setProcessInstanceId(flow.getProcessInstanceId()); + task.setVariables(flow.getVariables()); + + //待许可时获取许可人角色下用户开启工作流 + if (TicketConstants.FirstWorkTicketFlowStatusEnum.LICENSE.getStatus().equals(req.getStatus())) { + R> userListR = userClient.relationUserListByRoleAlias(AuthUtil.getTenantId(), req.getCreateDept(), TicketConstants.LICENSOR_ROLE); + if (!userListR.isSuccess()) { + throw new ServiceException(userListR.getMsg()); + } + Map variables = CollectionUtil.isEmpty(flow.getVariables()) ? new HashMap<>() : flow.getVariables(); + String taskUser = userListR.getData().stream().map(u -> "taskUser_".concat(u.getId().toString())).collect(Collectors.joining(",")); + variables.put("licenseUserIds", taskUser); + task.setVariables(variables); + } + log.info("工作流对象为：{}", JSONObject.toJSONString(flow)); + + if (TicketConstants.FirstWorkTicketFlowStatusEnum.LICENSE.getStatus().equals(req.getStatus())) { + req.setSigner(AuthUtil.getUserId()); + } else if (TicketConstants.FirstWorkTicketFlowStatusEnum.CONFIRM_MEASURE_PRINCIPAL.getStatus().equals(req.getStatus())) { + req.setLicensor(AuthUtil.getUserId()); + } else if (TicketConstants.FirstWorkTicketFlowStatusEnum.INVALID.getStatus().equals(req.getStatus())) { + this.invalidTicket(req); + } + + //更新状态 + boolean flag = this.update(Wrappers.lambdaUpdate().set(WorkTicketInfoEntity::getStatus, req.getStatus()).set(WorkTicketInfoEntity::getPrincipal, req.getPrincipal()).set(WorkTicketInfoEntity::getLicensor, req.getLicensor()).set(WorkTicketInfoEntity::getLicenseTime, req.getLicenseTime()).set(WorkTicketInfoEntity::getLicenseEndTime, req.getLicenseEndTime()).eq(WorkTicketInfoEntity::getId, req.getId())); + + //新增流程信息 + WorkTicketFlowEntity workTicketFlowEntity = new WorkTicketFlowEntity(); + workTicketFlowEntity.setTicketId(req.getId()); + workTicketFlowEntity.setFlowCode(req.getStatus().toString()); + workTicketFlowEntity.setExecutor(AuthUtil.getUserId().toString()); + workTicketFlowEntity.setExecuteTime(LocalDateTime.now()); + workTicketFlowEntity.setRemark(Optional.ofNullable(flow.getVariables()).map(v -> v.get("remark")).map(s -> s.toString()).orElse("")); + workTicketFlowEntity.setSignImgPath(Optional.ofNullable(flow.getVariables()).map(v -> v.get("signImgPath")).map(s -> s.toString()).orElse("")); + workTicketFlowEntity.setGroundWireCount(Optional.ofNullable(flow.getVariables()).map(v -> v.get("groundWireCount")).map(s -> Integer.parseInt(s.toString())).orElse(null)); + workTicketFlowEntity.setGroundSwitchCount(Optional.ofNullable(flow.getVariables()).map(v -> v.get("groundSwitchCount")).map(s -> Integer.parseInt(s.toString())).orElse(null)); + workTicketFlowEntity.setStatus(req.getStatus()); + workTicketFlowService.save(workTicketFlowEntity); + //执行流程 + R flowResult = flowClient.completeTask(task); + //更新任务状态 + updateAccessStatus(req); + + if (!flowResult.isSuccess()) { + throw new ServiceException("执行工作流失败！"); + } + + return R.success("操作成功！"); + } + + @Transactional(rollbackFor = Exception.class) + public void updateAccessStatus(WorkTicketInfoDto req) { + if (TicketConstants.TaskTypeEnum.JXRW.getType().equals(req.getTaskType()) || TicketConstants.TaskTypeEnum.JXJH.getType().equals(req.getTaskType())) { + log.info("许可通过：{}", JSONObject.toJSONString(req)); + //许可人通过将检修任务状态设为执行中 + if (TicketConstants.FirstWorkTicketFlowStatusEnum.CONFIRM_MEASURE_PRINCIPAL.getStatus().equals(req.getStatus())) { + OperAccessTaskEntity taskEntity = new OperAccessTaskEntity(); + taskEntity.setId(req.getTaskId()); + taskEntity.setStatus(AccessConstants.ACCESS_TASK_STATUS_1); + //设置开始时间 + taskEntity.setActStartTime(DateUtil.now()); + operAccessTaskClient.updateById(taskEntity); + } + } + } + + /*** + * 票据作废时 对应任务ID应该置空 + * @param req + */ + public void invalidTicket(WorkTicketInfoDto req) { + if (TicketConstants.TaskTypeEnum.JXRW.getType().equals(req.getTaskType()) || TicketConstants.TaskTypeEnum.JXJH.getType().equals(req.getTaskType())) { + OperAccessTaskEntity taskEntity = new OperAccessTaskEntity(); + taskEntity.setId(req.getTaskId()); + taskEntity.setInvalid(true); + taskEntity.setTicketId(null); + operAccessTaskClient.updateById(taskEntity); + } + if (TicketConstants.TaskTypeEnum.RCWH.getType().equals(req.getTaskType())) { + OperMaintenanceTaskDTO dto = new OperMaintenanceTaskDTO(); + dto.setId(req.getTaskId()); + dto.setInvalid(true); + //dto.setTicketId(null); + taskClient.doUpdateTaskById(dto); + } + } + + /*** + * 回传票据ID + * @param req + */ + @Transactional(rollbackFor = Exception.class) + public void returnTicket(WorkTicketInfoDto req) { + if (TicketConstants.TaskTypeEnum.JXRW.getType().equals(req.getTaskType())) { + OperAccessTaskEntity taskEntity = new OperAccessTaskEntity(); + taskEntity.setId(req.getTaskId()); + taskEntity.setTicketId(req.getId()); + operAccessTaskClient.updateById(taskEntity); + } + if (TicketConstants.TaskTypeEnum.RCWH.getType().equals(req.getTaskType())) { + OperMaintenanceTaskDTO dto = new OperMaintenanceTaskDTO(); + dto.setId(req.getTaskId()); + dto.setTicketId(req.getId()); + taskClient.doUpdateTaskById(dto); + } + } + + /** + * 获取queryWrapper + * + * @param req + * @return + */ + private LambdaQueryWrapper getQueryWrapper(WorkTicketInfoDto req) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper(); + if (Func.isNotBlank(req.getProcessInstanceId())) { + lqw.eq(WorkTicketInfoEntity::getProcessInstanceId, req.getProcessInstanceId()); + } + if (Func.isNotEmpty(req.getType())) { + lqw.eq(WorkTicketInfoEntity::getType, req.getType()); + } + if (Func.isNotEmpty(req.getTaskType())) { + lqw.eq(WorkTicketInfoEntity::getTaskType, req.getTaskType()); + } + if (Func.isNotEmpty(req.getCode())) { + lqw.like(WorkTicketInfoEntity::getCode, req.getCode()); + } + if (Func.isNotEmpty(req.getStatus())) { + lqw.eq(WorkTicketInfoEntity::getStatus, req.getStatus()); + } + if (Func.isNotEmpty(req.getCompany())) { + lqw.like(WorkTicketInfoEntity::getType, "%".concat(req.getCompany()).concat("%")); + } + if (Func.isNotEmpty(req.getClassGroup())) { + lqw.eq(WorkTicketInfoEntity::getClassGroup, req.getClassGroup()); + } + if (Func.isNotEmpty(req.getTaskId())) { + lqw.eq(WorkTicketInfoEntity::getTaskId, req.getTaskId()); + } + if (Func.isNotEmpty(req.getClassGroup())) { + lqw.eq(WorkTicketInfoEntity::getClassGroup, req.getClassGroup()); + } + if (Func.isNotEmpty(req.getClassGroupMembers())) { + lqw.like(WorkTicketInfoEntity::getClassGroupMembers, "%".concat(req.getClassGroupMembers()).concat("%")); + } + if (Func.isNotEmpty(req.getWorkContent())) { + lqw.like(WorkTicketInfoEntity::getWorkContent, "%".concat(req.getWorkContent()).concat("%")); + } + if (Func.isNotEmpty(req.getSigner())) { + lqw.eq(WorkTicketInfoEntity::getSigner, req.getSigner()); + } + if (Func.isNotEmpty(req.getLicensor())) { + lqw.eq(WorkTicketInfoEntity::getLicensor, req.getLicensor()); + } + if (Func.isNotEmpty(req.getStartTime())) { + lqw.ge(WorkTicketInfoEntity::getCreateTime, req.getStartTime()); + } + if (Func.isNotEmpty(req.getEndTime())) { + lqw.le(WorkTicketInfoEntity::getCreateTime, req.getEndTime()); + } + if (!CollectionUtil.isEmpty(req.getDeptIds())) { + lqw.in(WorkTicketInfoEntity::getCreateDept, req.getDeptIds()); + } + return lqw; + } + + /** + * 开启一个流程实例 + * + * @author hx + **/ + @Override + public BladeFlow startProcessInstance(String processDefinitionKey, WorkTicketInfoEntity workTicketInfoEntity) { + /**获取签发人角色下的人员**/ + R> listR = userClient.relationUserListByRoleAlias(tenantId, Long.parseLong(AuthUtil.getUser().getDeptId()), TicketConstants.SIGNER_ROLE); + if (!listR.isSuccess() || CollectionUtil.isEmpty(listR.getData())) { + throw new ServiceException("工作票签发人角色下未查询到相关人员"); + } + String signUserIds = listR.getData().stream().map(user -> "taskUser_".concat(user.getId().toString())).collect(Collectors.joining(",")); + + Map params = new HashMap(2) {{ + put("taskId", workTicketInfoEntity.getId()); + put("signUserIds", signUserIds); + }}; + + R r = flowClient.startProcessInstanceContainNameByKey(processDefinitionKey, "workTicket:task:" + workTicketInfoEntity.getId(), workTicketInfoEntity.getWorkContent(), params); + if (!r.isSuccess()) { + throw new ServiceException(r.getMsg()); + } + return r.getData(); + } + + /** + * 许可人通过线下工作票 + * + * @param req + * @return + */ + @Override + public R licenseOfflineTicket(WorkTicketInfoDto req) { + Long ticketId = req.getId(); + WorkTicketInfoEntity infoEntity = getById(ticketId); + //获取许可人角色下的人员 + R> listR = userClient.relationUserListByRoleAlias(tenantId, infoEntity.getCreateDept(), TicketConstants.LICENSOR_ROLE); + if (!listR.isSuccess() || CollectionUtil.isEmpty(listR.getData())) { + throw new ServiceException("工作票许可人角色下未查询到相关人员"); + } + List userId = listR.getData().stream().map(User::getId).distinct().collect(Collectors.toList()); + if (!userId.contains(AuthUtil.getUserId())) { + throw new ServiceException("当前操作人没有许可人角色，无法执行该操作"); + } + update(Wrappers.lambdaUpdate().set(WorkTicketInfoEntity::getStatus, TicketConstants.FirstWorkTicketFlowStatusEnum.OFFLINE_LICENSE.getStatus()).set(WorkTicketInfoEntity::getLicensor, AuthUtil.getUserId()).set(WorkTicketInfoEntity::getLicenseTime, LocalDateTime.now()).set(WorkTicketInfoEntity::getLicenseEndTime, req.getLicenseEndTime()).eq(WorkTicketInfoEntity::getId, ticketId)); + return R.success("操作成功"); + } + + /** + * 完成线下工作票 + * + * @param ticketAccessTaskDto + * @return + */ + @Override + public R finishOfflineTicket(TicketAccessTaskDto ticketAccessTaskDto) { + //更新工作票 + WorkTicketInfoDto infoDto = ticketAccessTaskDto.getWorkTicketInfoDto(); + update(Wrappers.lambdaUpdate().set(WorkTicketInfoEntity::getStatus, TicketConstants.FirstWorkTicketFlowStatusEnum.OFFLINE_END.getStatus()).eq(WorkTicketInfoEntity::getId, infoDto.getId())); + //获取工作票实体类 + WorkTicketInfoEntity infoEntity = getById(infoDto.getId()); + //根据任务类型执行任务 + if (ObjectUtil.isEmpty(infoEntity.getTaskType())) { + return R.success("操作成功"); + } + //FIXME 日常维护、检修任务暂时不形成闭环（因许可人无需填入任务结束完成所需参数，故选择由执行人手动闭环） ~2022--05-06 +// if(TicketConstants.TaskTypeEnum.JXRW.getType().equals(infoEntity.getTaskType()) +// || TicketConstants.TaskTypeEnum.JXJH.getType().equals(infoEntity.getTaskType())) { +// //执行检修任务 +// OperAccessTaskDTO accessTaskDTO = ticketAccessTaskDto.getAccessTaskDTO(); +// accessTaskDTO.setId(infoEntity.getTaskId()); +// if(ObjectUtil.isNotEmpty(accessTaskDTO) && ObjectUtil.isNotEmpty(accessTaskDTO.getId())){ +// log.info("线下检修任务执行调用传参为：{}",JSONObject.toJSONString(accessTaskDTO)); +// //operAccessTaskClient.finishAccessTask(accessTaskDTO); +// } +// } +// else if(TicketConstants.TaskTypeEnum.RCWH.getType().equals(infoEntity.getTaskType())) { +// //执行日常维护任务 +// OperMaintenanceTaskDTO operMaintenanceTaskDTO = new OperMaintenanceTaskDTO(); +// operMaintenanceTaskDTO.setId(infoEntity.getTaskId()); +// operMaintenanceTaskDTO.setStatus(MaintenanceConstant.TASK_STATUS_3); +// if(ObjectUtil.isNotEmpty(operMaintenanceTaskDTO) && ObjectUtil.isNotEmpty(operMaintenanceTaskDTO.getId()) ){ +// ComleteTask comleteTask = new ComleteTask(); +// comleteTask.setProcessInstanceId(operMaintenanceTaskDTO.getProcessInstanceId()); +// comleteTask.setFlag("ok"); +// comleteTask.setPass(true); +// comleteTask.setComment("执行完成"); +// TaskFlowDTO taskFlowDTO = TaskFlowDTO.builder().taskDTO(operMaintenanceTaskDTO).comleteTask(comleteTask).build(); +// log.info("线下日常维护任务执行调用传参为：{}",JSONObject.toJSONString(taskFlowDTO)); +// //R result = taskClient.updateTaskStatus(taskFlowDTO); +// } +// } + return R.success("操作成功"); + } + + /*** + * 获取工作票编号 + * @return + */ + @Override + public String getWorkTicketCode() { + String code = ""; + lock.lock(); + try { + /**获取当前时间**/ + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyMM"); + YearMonth yearMonth = YearMonth.now(); + String tym = yearMonth.format(formatter); + LocalDateTime date = LocalDateTime.now(); + LocalDateTime firstDay = date.with(TemporalAdjusters.firstDayOfMonth()).withHour(0).withMinute(0).withSecond(0); + LocalDateTime lastDay = date.with(TemporalAdjusters.lastDayOfMonth()).withHour(23).withMinute(59).withSecond(59); + log.info("当月第一天：{}；当月最后一天{}", firstDay, lastDay); + /**获取当月工作票总条数**/ + List infoEntityList = this.list(new LambdaQueryWrapper() {{ + ge(WorkTicketInfoEntity::getCreateTime, firstDay); + le(WorkTicketInfoEntity::getCreateTime, lastDay); + }}); + if (CollectionUtil.isEmpty(infoEntityList)) { + code = TicketConstants.TicketCodePreEnum.DQ_WORK.getPrefix().concat("-").concat(tym).concat("-001"); + } else { + code = TicketConstants.TicketCodePreEnum.DQ_WORK.getPrefix().concat("-").concat(tym).concat("-").concat(String.format("%03d", infoEntityList.size() + 1)); + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + lock.unlock(); + } + return code; + } + + /** + * 获取安全检查工作票项统计 + * + * @param startDate 开始时间 + * @param endDate 结束时间 + * @param dept 机构ID + * @return WorkTicketStatisticVO统计对象 + */ + @Override + public SafeCheckStatisticVO getWorkTicketStatistic(String startDate, String endDate, Long dept) { + return this.baseMapper.getWorkTicketStatistic(startDate, endDate, dept); + } + + /** + * 验证角色是否能查询到相关人员 + * + * @param deptId 机构ID + * @param roleAliasArray 角色 按逗号分隔 + * @return + */ + @Override + public R> verificationRole(Long deptId, String roleAliasArray) { + Map result = new HashedMap(2); + List failRoleAliasList = Lists.newArrayList(); + AtomicBoolean flag = new AtomicBoolean(true); + Arrays.stream(roleAliasArray.split(",")).forEach(roleAlias -> { + //查询机构下角色是否有对应人员列表 + R> listR = userClient.relationUserListByRoleAlias(tenantId, deptId, roleAlias); + if (!listR.isSuccess() || ObjectUtil.isEmpty(listR.getData())) { + failRoleAliasList.add(roleAlias); + flag.set(false); + } + }); + result.put("flag", flag.get()); + if (CollectionUtil.isNotEmpty(failRoleAliasList)) { + result.put("message", "验证失败，获取" + JSON.toJSONString(failRoleAliasList) + "角色下的人员失败"); + } + + return R.data(result); + } + + /** + * 根据月份和区域查询工作票列表详情 + * + * @param pageEntity + * @param areaVo + * @return + */ + @Override + public BladePage workTicketListByMonthAndArea(Page pageEntity, StandardTicketWithAreaVo areaVo) { + //1.查询 + QueryWrapper queryWrapper = new QueryWrapper<>(); + + //开票来源 + queryWrapper.eq(Func.isNotEmpty(areaVo.getTaskType()), "sti.task_type", areaVo.getTaskType()); + //编号 + queryWrapper.like(Func.isNotEmpty(areaVo.getCode()), "sti.code", areaVo.getCode()); + + //状态 + queryWrapper.eq(Func.isNotEmpty(areaVo.getStatus()), "sti.status", areaVo.getStatus()); + + //开始时间 + queryWrapper.lt(Func.isNotEmpty(areaVo.getStartTime()), "sti.create_time", areaVo.getStartTime()); + + //结束时间 + queryWrapper.le(Func.isNotEmpty(areaVo.getEndTime()), "sti.create_time", areaVo.getEndTime()); + + + queryWrapper.eq("sti.create_dept", areaVo.getAreaId()); + queryWrapper.eq(areaVo.getYearMonth() != null, "date_format(sti.create_time,'%Y-%m')", areaVo.getYearMonth()); + //如果为1为合格 + // queryWrapper.eq("tie.status",1); + Page workTicketInfoEntityPage = baseMapper.selectPages(pageEntity, queryWrapper); + //数据转换 + List standardWorkList = new ArrayList<>(); + if (CollectionUtil.isNotEmpty(workTicketInfoEntityPage.getRecords())) { + standardWorkList = workTicketInfoEntityPage.getRecords().stream().map(workTicketInfoEntity -> { + StandardWorkVo standardWorkVo = new StandardWorkVo(); + BeanUtils.copyProperties(workTicketInfoEntity, standardWorkVo); + return standardWorkVo; + }).collect(Collectors.toList()); + } + + IPage page = new Page<>(); + page.setRecords(standardWorkList); + page.setTotal(workTicketInfoEntityPage.getTotal()); + page.setCurrent(workTicketInfoEntityPage.getCurrent()); + page.setSize(workTicketInfoEntityPage.getSize()); + BladePage bladePage = BladePage.of(page); + return bladePage; + } + + + /** + * 判断是否存在合格率 如果存在返回true 否则为false + * + * @param item + * @return + */ + private boolean isTicketPercentById(WorkTicketInfoEntity item) { + LambdaQueryWrapper ticketInfoEvaluateEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); + ticketInfoEvaluateEntityLambdaQueryWrapper.eq(TicketInfoEvaluateEntity::getTicketId, item.getId()); + ticketInfoEvaluateEntityLambdaQueryWrapper.eq(TicketInfoEvaluateEntity::getStatus, TicketConstants.TicketQualifiedEnum.Qualified.getCode()); + // 查询合格评价 + int count = ticketInfoEvaluateService.count(ticketInfoEvaluateEntityLambdaQueryWrapper); + return count > 0; + } + + + /** + * 更新状态值 + * + * @param status + * @param description + * @param id + */ + @Override + public void updateFlowStatusById(Integer status, String description, Long id) { + LambdaUpdateWrapper queryWrapper = new LambdaUpdateWrapper<>(); + queryWrapper.set(WorkTicketInfoEntity::getFlowStatus, status); + queryWrapper.set(WorkTicketInfoEntity::getFlowDescription, description); + queryWrapper.eq(WorkTicketInfoEntity::getId, id); + } + + /** + * 获取工作详情 + * + * @param ticketId + * @return + */ + @Override + public WorkTicketVo selectDetailsById(Long ticketId) { + WorkTicketVo workTicketVo = new WorkTicketVo(); + + //1. 获取工作票详情数据 + WorkTicketInfoEntity workTicketInfo = this.getById(ticketId); + if (ObjectUtils.isEmpty(workTicketInfo)) { + throw new ServiceException("未查询到ticketId对应的信息"); + } + + //赋值签发人 + if (workTicketInfo.getSigner() != null) { + User user = UserCache.getUser(workTicketInfo.getSigner()); + workTicketInfo.setSignerName(user == null ? null : user.getName()); + } + + if (workTicketInfo.getSigner() != null && workTicketInfo.getSignerName() == null) { + User user = UserCache.getUser(workTicketInfo.getSigner()); + workTicketInfo.setSignerName(user == null ? null : user.getName()); + } + + //赋值许可人名称 + if (workTicketInfo.getLicensor() != null) { + User user = UserCache.getUser(workTicketInfo.getLicensor()); + workTicketInfo.setLicensorName(user == null ? null : user.getName()); + } + + if (workTicketInfo.getLicensor() != null && workTicketInfo.getLicensorName() == null) { + User user = UserCache.getUser(workTicketInfo.getLicensor()); + workTicketInfo.setLicensorName(user == null ? null : user.getName()); + } + + // 负责值班负责人 + if (workTicketInfo.getWatchPrincipal() != null) { + User user = UserCache.getUser(workTicketInfo.getWatchPrincipal()); + workTicketInfo.setWatchPrincipalName(user == null ? null : user.getName()); + } + + if (workTicketInfo.getWatchPrincipal() != null && workTicketInfo.getWatchPrincipalName() == null) { + User user = UserCache.getUser(workTicketInfo.getWatchPrincipal()); + workTicketInfo.setWatchPrincipalName(user == null ? null : user.getName()); + } + + + StringBuilder sb = new StringBuilder(); + String classGroupMembers = workTicketInfo.getClassGroupMembers(); + if (StringUtils.isNoneBlank(classGroupMembers)) { + // System.out.println("获取classGroupMembers ==> " + classGroupMembers); + String[] split = classGroupMembers.split(","); + for (String classGroupMember : split) { + System.out.println(classGroupMember); + if (StringUtils.isNoneBlank(classGroupMember)) { + boolean matches = classGroupMember.matches("[0-9]+"); + if (matches) { + User user = UserCache.getUser(Long.valueOf(classGroupMember)); + String name = user == null ? null : user.getName(); + if (StringUtils.isNotBlank(name)) { + sb.append(name).append(","); + } + } + } + } + + //统计人数 + if (workTicketInfo.getTotalPerson() == null) { + workTicketInfo.setTotalPerson(sb.toString().trim().split(",").length); + } + + //成员信息 + if (workTicketInfo.getClassGroupMembersName() == null) { + workTicketInfo.setClassGroupMembersName(sb.toString().endsWith(",") ? + sb.toString().substring(0, sb.length() - 1) : sb.toString()); + } + } + + + //负责人名称 + if (workTicketInfo.getPrincipalName() == null && workTicketInfo.getPrincipal() != null) { + User user = UserCache.getUser(workTicketInfo.getPrincipal()); + workTicketInfo.setPrincipalName(user == null ? "" : user.getName()); + } + + + workTicketVo.setWorkTicket(workTicketInfo); + + //2. 安全措施数组 + List workTicketSafetyMeasureEntity = workTicketSafetyMeasureService.selectByTicketId(ticketId); + if (CollectionUtils.isNotEmpty(workTicketSafetyMeasureEntity)) { + workTicketVo.setSafetyMeasuresList(workTicketSafetyMeasureEntity); + } + + //3. 工作票工作任务组 + List workTicketContentEntities = workTicketContentService.selectByTicketId(ticketId); + if (CollectionUtils.isNotEmpty(workTicketContentEntities)) { + workTicketVo.setWorkTicketContentDtoList(workTicketContentEntities); + } + + //4. 工作票延期 + WorkTicketDelayEntity workTicketDelayEntity = delayService.selectByTicketId(ticketId); + if (ObjectUtils.isNotEmpty(workTicketDelayEntity)) { + workTicketVo.setWorkTicketDelay(workTicketDelayEntity); + } + + + //5.工作结束 + WorkTicketFinish workTicketFinish = workTicketFinishService.selectByTicketId(ticketId); + if (ObjectUtils.isNotEmpty(workTicketFinish)) { + workTicketVo.setWorkTicketFinish(workTicketFinish); + } + + + //6.工作开始时间和结束时间 + List workTicketOperateTimeEntities = + workTicketOperateTimeService.selectByTicketId(ticketId); + if (CollectionUtils.isNotEmpty(workTicketOperateTimeEntities)) { + workTicketVo.setWorkTicketOperateTimeEntities(workTicketOperateTimeEntities); + } + + + //7. 工作票负责人变更 + WorkTicketPrincipalChangeEntity workTicketPrincipalChangeEntity = + workTicketPrincipalChangeService.selectByTicketId(ticketId); + if (ObjectUtils.isNotEmpty(workTicketPrincipalChangeEntity)) { + //原负责人 + if (workTicketPrincipalChangeEntity.getInitialPrincipal() != null) { + workTicketPrincipalChangeEntity.setInitialPrincipalName( + UserCache.getUser(workTicketPrincipalChangeEntity.getInitialPrincipal()).getName() + ); + } + //变更负责人 + if (workTicketPrincipalChangeEntity.getChangePrincipal() != null) { + workTicketPrincipalChangeEntity.setChangePrincipalName( + UserCache.getUser(workTicketPrincipalChangeEntity.getChangePrincipal()).getName() + ); + } + + workTicketVo.setWorkTicketPrincipalChange(workTicketPrincipalChangeEntity); + } + + + //7. 根据工作票Id查询工作票危险点分析及控制措施票 + List list = ticketInfoDangerService.selectAllByTicket(workTicketInfo.getId()); + if (CollectionUtils.isNotEmpty(list)) { + workTicketVo.setTicketInfoDangers(list); + } + return workTicketVo; + } +} diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/equipment/PlanMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/equipment/PlanMapper.xml new file mode 100644 index 0000000..4cb6c9b --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/equipment/PlanMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/AccessMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/AccessMapper.xml new file mode 100644 index 0000000..41e93fb --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/AccessMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/DefectMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/DefectMapper.xml new file mode 100644 index 0000000..5e93d41 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/DefectMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/MaintenanceMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/MaintenanceMapper.xml new file mode 100644 index 0000000..2cfd506 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/MaintenanceMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/OtherMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/OtherMapper.xml new file mode 100644 index 0000000..af9c98d --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/OtherMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + ID, START_DATE, END_DATE , FA_QUANTITY , ONLINE_RATE ,TENANT_ID, STATUS, CREATE_TIME, + UPDATE_TIME, CREATE_USER, UPDATE_USER, IS_DELETED, CREATE_DEPT + + + diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/OverDetailsMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/OverDetailsMapper.xml new file mode 100644 index 0000000..4f13622 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/OverDetailsMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + ID, OVER_ID , OVER_CONFIG_ID , PRICE , QUANTITY , TOTAL_PRICE, TENANT_ID, STATUS, CREATE_TIME, UPDATE_TIME, + CREATE_USER, UPDATE_USER, IS_DELETED, CREATE_DEPT + + + diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/OverMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/OverMapper.xml new file mode 100644 index 0000000..c8d9cf8 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/OverMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + ID, START_DATE , END_DATE , TOTAL_PRICE , ENCL_PATH , ENCL_NAME ,TENANT_ID, STATUS, + CREATE_TIME, UPDATE_TIME, CREATE_USER, UPDATE_USER, IS_DELETED, CREATE_DEPT + + + diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/SolveMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/SolveMapper.xml new file mode 100644 index 0000000..3e900d4 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/SolveMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + ID, SOLVE_DATE , SOLVE_QUANTITY , SOLVE_SUC_QUANTITY ,TENANT_ID, STATUS, CREATE_TIME, + UPDATE_TIME, CREATE_USER, UPDATE_USER, IS_DELETED, CREATE_DEPT + + + diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/ticket/TicketEvaluateMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/ticket/TicketEvaluateMapper.xml new file mode 100644 index 0000000..d378bac --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/ticket/TicketEvaluateMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/ticket/TicketMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/ticket/TicketMapper.xml new file mode 100644 index 0000000..24b9def --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/ticket/TicketMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/ticket/WorkTicketMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/ticket/WorkTicketMapper.xml new file mode 100644 index 0000000..3eb5e81 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/ticket/WorkTicketMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperDefectService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperDefectService.java index f1e652b..30ab90c 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperDefectService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperDefectService.java @@ -1,101 +1,13 @@ package com.hnac.hzims.operational.defect.service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hnac.hzims.operational.defect.entity.OperDefectEntity; -import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity; -import com.hnac.hzims.operational.defect.vo.OperDefectVO; -import com.hnac.hzims.operational.report.vo.DefectReportsVO; -import com.hnac.hzims.vo.SafeCheckStatisticVO; import org.springblade.core.mp.base.BaseService; -import org.springblade.core.tool.api.R; -import org.springblade.flow.core.entity.BladeFlow; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.time.LocalDate; -import java.util.List; -import java.util.Map; /** - * 服务类 - * - * @author Chill + * @author ysj */ public interface IOperDefectService extends BaseService { - /** - * 开始问题处理流程 - * 问题处理流程的第一个处理节点人key 必须是 problemUser - * @param - */ - void startFlow(OperPhenomenonEntity entity, OperDefectEntity defectEntity); - /** - * 处理问题 - * @param flow - * @return - */ - boolean handleProcess(BladeFlow flow); - - /** - * 获取缺陷的统计月报 - * @param month 格式："2021-01" - */ - Map getDefectStatistics(String month); - - /** - * 导出缺陷统计月报报表 - * @param response - * @param month 格式 "2021-01" - * @throws IOException - */ - void exportFualtMonthExcel(HttpServletResponse response, String month) throws IOException; - - - List getDefectList(String emCode,List list); - - List getDefectByEmCodeList(String emCode); - - /** - * 站点月报统计 - 消缺 - * @param startDate - * @param endDate - * @param deptIdList - * @return - */ - List getFaultByFaultCode(LocalDate startDate,LocalDate endDate,List deptIdList); - - List getFaultByFaultCode(Map params); - - List> getDefectConclusion(Map params); - - /** - * 缺陷详情 - * @param defect - * @return - */ - R detail(OperDefectEntity defect); - - /** - * 获取安全检查消缺项统计 - * @param startDate 开始时间 - * @param endDate 结束时间 - * @param dept 机构ID - * @param defectType 缺陷类型;1： 重大缺陷 2：一般缺陷 - * @return SafeCheckStatisticVO 对象 - */ - SafeCheckStatisticVO getDefectCheck(String startDate,String endDate,Long dept,String defectType); - - boolean updateDefectInfo(OperDefectEntity entity); - - boolean updateDefectHanderState(OperDefectEntity entity); - - /** - * 分页查询 - * @param operDefectEntityPage - * @param defect - * @return - */ - IPage selectPage(Page operDefectEntityPage, OperDefectEntity defect); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/mapper/OtherMapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/mapper/OtherMapper.java deleted file mode 100644 index 5d0b450..0000000 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/mapper/OtherMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.hnac.hzims.operational.fill.mapper; - -import com.hnac.hzims.operational.fill.entity.OtherEntity; -import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; - -public interface OtherMapper extends UserDataScopeBaseMapper { - -} diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/mapper/OtherMapper.xml b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/mapper/OtherMapper.xml deleted file mode 100644 index 44e22e4..0000000 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/mapper/OtherMapper.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - ID, START_DATE, END_DATE , FA_QUANTITY , ONLINE_RATE ,TENANT_ID, STATUS, CREATE_TIME, - UPDATE_TIME, CREATE_USER, UPDATE_USER, IS_DELETED, CREATE_DEPT - - - From 9d5840091834ab10868bc43bad55a4a8434227e7 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Wed, 7 Jun 2023 11:01:08 +0800 Subject: [PATCH 11/14] =?UTF-8?q?#=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=8A=BD=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ticket/WorkTicketService.java | 3 + .../service/ticket/impl/TicketServiceImpl.java | 1 + .../service/ticket/impl/WorkTicketServiceImpl.java | 1086 +------------------- 3 files changed, 10 insertions(+), 1080 deletions(-) diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/WorkTicketService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/WorkTicketService.java index 536b410..0117669 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/WorkTicketService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/WorkTicketService.java @@ -3,5 +3,8 @@ package com.hnac.hzims.scheduled.service.ticket; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity; import org.springblade.core.mp.base.BaseService; +/** + * @author ysj + */ public interface WorkTicketService extends BaseService { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java index 204a17b..1ef4c4d 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java @@ -31,6 +31,7 @@ import java.util.stream.Collectors; public class TicketServiceImpl extends BaseServiceImpl implements TicketService { private final WorkTicketService workTicketService; + private final TicketEvaluateService ticketEvaluateService; /** diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkTicketServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkTicketServiceImpl.java index 13dbc45..8c13e28 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkTicketServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkTicketServiceImpl.java @@ -1,1093 +1,19 @@ package com.hnac.hzims.scheduled.service.ticket.impl; -import cn.afterturn.easypoi.excel.entity.TemplateExportParams; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.google.common.collect.Lists; -import com.hnac.hzims.common.logs.utils.StringUtils; -import com.hnac.hzims.operational.access.constants.AccessConstants; -import com.hnac.hzims.operational.access.entity.OperAccessTaskEntity; -import com.hnac.hzims.operational.access.feign.IOperAccessTaskClient; -import com.hnac.hzims.operational.maintenance.dto.OperMaintenanceTaskDTO; -import com.hnac.hzims.operational.maintenance.feign.ITaskClient; -import com.hnac.hzims.ticket.allTicket.entity.TicketInfoEvaluateEntity; -import com.hnac.hzims.ticket.allTicket.service.TicketInfoEvaluateService; -import com.hnac.hzims.ticket.areamonthly.vo.StandardTicketWithAreaVo; -import com.hnac.hzims.ticket.areamonthly.vo.StandardWorkVo; -import com.hnac.hzims.ticket.aspect.AroundFlow; -import com.hnac.hzims.ticket.constants.TicketConstants; -import com.hnac.hzims.ticket.twoTicket.entity.TicketInfoDanger; -import com.hnac.hzims.ticket.twoTicket.entity.WorkTicketFinish; -import com.hnac.hzims.ticket.twoTicket.service.TicketInfoDangerService; -import com.hnac.hzims.ticket.twoTicket.service.impl.WorkTicketFinishServiceImpl; -import com.hnac.hzims.ticket.twoTicket.vo.process.WorkTicketVo; -import com.hnac.hzims.ticket.utils.ExcelUtil; -import com.hnac.hzims.ticket.utils.PdfUtils; -import com.hnac.hzims.ticket.workTicket.entity.*; -import com.hnac.hzims.ticket.workTicket.mapper.WorkDelayNoScopeMapper; -import com.hnac.hzims.ticket.workTicket.mapper.WorkTicketInfoMapper; -import com.hnac.hzims.ticket.workTicket.wrapper.WorkTicketDelayWrapper; -import com.hnac.hzims.ticket.workTicket.wrapper.WorkTicketInfoWrapper; -import com.hnac.hzims.vo.SafeCheckStatisticVO; +import com.hnac.hzims.scheduled.mapper.ticket.WorkTicketMapper; +import com.hnac.hzims.scheduled.service.ticket.WorkTicketService; +import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.map.HashedMap; -import org.apache.poi.ss.usermodel.Workbook; -import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.core.mp.support.BladePage; -import org.springblade.core.mp.support.Condition; -import org.springblade.core.mp.support.Query; -import org.springblade.core.secure.utils.AuthUtil; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.CollectionUtil; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.tool.utils.Func; -import org.springblade.core.tool.utils.ObjectUtil; -import org.springblade.flow.core.entity.BladeFlow; -import org.springblade.flow.core.feign.IFlowClient; -import org.springblade.flow.core.vo.ComleteTask; -import org.springblade.system.user.cache.UserCache; -import org.springblade.system.user.entity.User; -import org.springblade.system.user.feign.IUserClient; -import org.springframework.beans.BeanUtils; -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 org.springframework.util.Assert; - -import javax.servlet.http.HttpServletResponse; -import java.time.LocalDateTime; -import java.time.YearMonth; -import java.time.format.DateTimeFormatter; -import java.time.temporal.TemporalAdjusters; -import java.util.*; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; -import java.util.stream.Collectors; /** - *

- * 工作票 服务实现类 - *

- * - * @author hx - * @since 2021-10-22 + * @author ysj */ @Service @Slf4j @RequiredArgsConstructor -public class WorkTicketServiceImpl extends BaseServiceImpl implements IWorkTicketInfoService { - - private final IWorkTicketSafetyMeasureService workTicketSafetyMeasureService; - private final IWorkTicketPrincipalChangeService workTicketPrincipalChangeService; - private final IWorkTicketDelayService delayService; - private final IWorkTicketMembersChangeService workTicketMembersChangeService; - private final IWorkTicketOperateTimeService workTicketOperateTimeService; - private final IWorkTicketFlowService workTicketFlowService; - private final IFlowClient flowClient; - private final IUserClient userClient; - private final WorkDelayNoScopeMapper workDelayNoScopeMapper; - private final IOperAccessTaskClient operAccessTaskClient; - private final ITaskClient taskClient; - private final TicketInfoEvaluateService ticketInfoEvaluateService; - private final IWorkTicketContentService workTicketContentService; - private final WorkTicketFinishServiceImpl workTicketFinishService; - private final TicketInfoDangerService ticketInfoDangerService; - - /** 生成两票编号锁 **/ - private Lock lock = new ReentrantLock(); - - /** word模板预览导出保存路径 **/ - @Value("${hzims.ticket.path.xlsx.savePath}") - private String xlsSavePath; - - @Value("${hzims.ticket.first-work-flow-key}") - private String firstWorkTicketFlowKey; - - @Value("${hzims.tenantId}") - private String tenantId; - - @Value("${hzims.ticket.path.pdf.savePath}") - private String pdfSavePath; - - @Override - @Transactional - @AroundFlow - public R doSave(WorkTicketInfoDto req) { - req.setCode(this.getWorkTicketCode()); - req.setStatus(Func.isEmpty(req.getPrincipal()) || Func.isEmpty(req.getClassGroupMembers()) ? TicketConstants.FirstWorkTicketFlowStatusEnum.OFFLINE.getStatus() : TicketConstants.FirstWorkTicketFlowStatusEnum.SIGN.getStatus()); - boolean flag = this.save(req); - /**保存安全措施**/ - if (flag && CollectionUtil.isNotEmpty(req.getWorkTicketSafetyMeasureDtoList())) { - req.getWorkTicketSafetyMeasureDtoList().forEach(workTicketSafetyMeasureDto -> { - workTicketSafetyMeasureDto.setTicketId(req.getId()); - workTicketSafetyMeasureService.save(workTicketSafetyMeasureDto); - }); - } - if (Func.isEmpty(req.getPrincipal()) || Func.isEmpty(req.getClassGroupMembers())) { - //将票据ID会传至计划/任务内 - returnTicket(req); - return R.success("开票成功！该票走线下未开启流程"); - } - /**开启工作流**/ - BladeFlow bladeFlow = this.startProcessInstance(firstWorkTicketFlowKey, req); - this.update(Wrappers.lambdaUpdate().set(WorkTicketInfoEntity::getProcessInstanceId, bladeFlow.getProcessInstanceId()).eq(WorkTicketInfoEntity::getId, req.getId())); - //将票据ID会传至计划/任务内 - returnTicket(req); - return R.success("保存成功"); - } - - /** - * 工作票延期 进入许可人确认工作票延期 - * - * @param ticketId 工作票ID - * @param status 状态 - * @param completeTask 工作流进行 - */ - @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED) - public void delay(Long ticketId, Integer status, ComleteTask completeTask) { - //新增延期信息 - Assert.notNull(completeTask.getVariables().get("delay"), "延期信息不能为空"); - WorkTicketDelayEntity delayEntity = (WorkTicketDelayEntity) completeTask.getVariables().get("delay"); - delayService.save(delayEntity); - //更新负责人确认执行情况流程 填充信息 - WorkTicketFlowEntity workTicketFlowEntity = workTicketFlowService.getOne(Wrappers.lambdaQuery().eq(WorkTicketFlowEntity::getTicketId, ticketId).eq(WorkTicketFlowEntity::getFlowCode, TicketConstants.FirstWorkTicketFlowStatusEnum.CONFIRM_WORK_FINISH.getStatus()).orderByDesc(WorkTicketFlowEntity::getCreateTime).last("limit 1;")); - workTicketFlowService.update(Wrappers.lambdaUpdate().set(WorkTicketFlowEntity::getExecutor, AuthUtil.getUserId().toString()).set(WorkTicketFlowEntity::getExecuteTime, LocalDateTime.now()).eq(WorkTicketFlowEntity::getId, workTicketFlowEntity.getId())); - //更新工作票状态 - this.update(Wrappers.lambdaUpdate().set(WorkTicketInfoEntity::getStatus, status).eq(WorkTicketInfoEntity::getId, ticketId)); - //创建延期流程 - WorkTicketInfoEntity infoEntity = this.getById(ticketId); - WorkTicketFlowEntity currentFlowEntity = new WorkTicketFlowEntity(); - currentFlowEntity.setTicketId(ticketId); - currentFlowEntity.setFlowCode(status.toString()); - currentFlowEntity.setExecutor(infoEntity.getLicensor().toString()); - currentFlowEntity.setProcTaskId((String) completeTask.getVariables().get("procTaskId")); - workTicketFlowService.save(workTicketFlowEntity); - //进入工作流下一步 - R result = flowClient.completeTask(completeTask); - if (!result.isSuccess()) { - throw new ServiceException("执行工作流失败"); - } - } - - @Override - public R detail(Long id) { - WorkTicketInfoEntity workTicketInfoEntity = this.getById(id); - if (ObjectUtil.isEmpty(workTicketInfoEntity)) { - return R.fail("未查询到该ID对应的记录"); - } else { - WorkTicketInfoVO workTicketInfoVO = WorkTicketInfoWrapper.build().entityVO(workTicketInfoEntity); - - /**获取工作票安全措施列表**/ - WorkTicketSafetyMeasureDto workTicketSafetyMeasureDto = new WorkTicketSafetyMeasureDto(); - workTicketSafetyMeasureDto.setTicketId(id); - List workTicketSafetyMeasureVOList = workTicketSafetyMeasureService.list(workTicketSafetyMeasureDto); - workTicketInfoVO.setWorkTicketSafetyMeasureVOList(workTicketSafetyMeasureVOList); - - /**获取工作票负责人变更**/ - WorkTicketPrincipalChangeDto workTicketPrincipalChangeDto = new WorkTicketPrincipalChangeDto(); - workTicketPrincipalChangeDto.setTicketId(id); - List workTicketPrincipalChangeVOList = workTicketPrincipalChangeService.list(workTicketPrincipalChangeDto); - workTicketInfoVO.setWorkTicketPrincipalChangeVOList(workTicketPrincipalChangeVOList); - - /**获取工作票工作组员变更**/ - WorkTicketMembersChangeDto workTicketMembersChangeDto = new WorkTicketMembersChangeDto(); - workTicketMembersChangeDto.setTicketId(id); - List workTicketMembersChangeVOList = workTicketMembersChangeService.list(workTicketMembersChangeDto); - workTicketInfoVO.setWorkTicketMembersChangeVOList(workTicketMembersChangeVOList); - - /**获取工作票跨日运行时间列表**/ - WorkTicketOperateTimeDto workTicketOperateTimeDto = new WorkTicketOperateTimeDto(); - workTicketOperateTimeDto.setTicketId(id); - List workTicketOperateTimeVOList = workTicketOperateTimeService.list(workTicketOperateTimeDto); - workTicketInfoVO.setWorkTicketOperateTimeVOList(workTicketOperateTimeVOList); - - /**获取工作票处理流程列表**/ - WorkTicketFlowDto workTicketFlowDto = new WorkTicketFlowDto(); - workTicketFlowDto.setTicketId(id); - List workTicketFlowVOList = workTicketFlowService.list(workTicketFlowDto); - workTicketInfoVO.setWorkTicketFlowVOList(workTicketFlowVOList); - - /**获取工作票延期列表**/ - WorkTicketDelayDto workTicketDelayDto = new WorkTicketDelayDto(); - workTicketDelayDto.setTicketId(id); - List workTicketDelayList = workDelayNoScopeMapper.selectList(new LambdaQueryWrapper() {{ - eq(WorkTicketDelayEntity::getTicketId, id); - eq(WorkTicketDelayEntity::getIsDeleted, 0L); - }}); - if (CollectionUtil.isNotEmpty(workTicketDelayList)) { - workTicketInfoVO.setWorkTicketDelayVOList(WorkTicketDelayWrapper.build().listVO(workTicketDelayList)); - } - - return R.data(workTicketInfoVO); - } - } - - @Override - public R> queryList(WorkTicketInfoDto req, Query query) { - LambdaQueryWrapper lqw = this.getQueryWrapper(req); - if (ObjectUtil.isNotEmpty(req.getCreateDept())) { - lqw.eq(WorkTicketInfoEntity::getCreateDept, req.getCreateDept()); - } - - lqw.orderByDesc(WorkTicketInfoEntity::getCreateTime).orderByDesc(WorkTicketInfoEntity::getUpdateTime); - IPage pages = this.page(Condition.getPage(query), lqw); - //数据转换 - IPage workTicketInfoVOIPage = new Page<>(pages.getCurrent(), pages.getSize()); - workTicketInfoVOIPage.setRecords(WorkTicketInfoWrapper.build().listVO(pages.getRecords())); - workTicketInfoVOIPage.setPages(pages.getPages()); - workTicketInfoVOIPage.setTotal(pages.getTotal()); - //获取创建人 - workTicketInfoVOIPage.getRecords().forEach(item -> { - User user = UserCache.getUser(item.getCreateUser()); - if (user != null) { - item.setCreateUserName(user.getName()); - } - }); - - - return R.data(workTicketInfoVOIPage); - } - - @Override - public List list(WorkTicketInfoDto req) { - LambdaQueryWrapper lqw = this.getQueryWrapper(req); - List workTicketInfoEntityList = this.list(lqw); - return CollectionUtil.isNotEmpty(workTicketInfoEntityList) ? WorkTicketInfoWrapper.build().listVO(workTicketInfoEntityList) : null; - } - - @Override - @Transactional - public R remove(Long id, String comment) { - WorkTicketInfoEntity entity = this.getById(id); - if (ObjectUtil.isEmpty(entity)) { - return R.fail(400, "删除失败！未查询到相关记录"); - } - - boolean flag = this.update(Wrappers.lambdaUpdate().set(WorkTicketInfoEntity::getStatus, TicketConstants.FirstWorkTicketFlowStatusEnum.TERMINATION.getStatus()).eq(WorkTicketInfoEntity::getId, id)); - - /**线下单独删除**/ - if (TicketConstants.FirstWorkTicketFlowStatusEnum.OFFLINE.getStatus().equals(entity.getStatus())) { - return R.status(flag); - } - /**终止工作流**/ - R r = flowClient.delProcessInstanceById(entity.getProcessInstanceId(), comment); - if (!r.isSuccess()) { - throw new ServiceException("终止工作流失败!"); - } - return R.success("删除成功！"); - } - - @Override - public void exportWorkTicketTemplate(Long id, HttpServletResponse response) { - exportWorkTicketInfoPdf(id, response); - } - - @Override - @SuppressWarnings("unchecked") - public void exportWorkTicketInfoPdf(Long id, HttpServletResponse response) { - R workTicketInfoVOR = this.detail(id); - if (!workTicketInfoVOR.isSuccess()) { - log.error("未查询到相关工作票记录！"); - return; - } - WorkTicketInfoVO workTicketInfoVO = workTicketInfoVOR.getData(); - //将workTicketInfoVO封装进Map,以便pdf导出 - Map workTicketInfoMap = new HashMap<>(); - try { - workTicketInfoMap = PdfUtils.objectToMap(workTicketInfoVO); - } catch (Exception e) { - log.info("转换对象失败！"); - } - //安全措施 - if (CollectionUtil.isNotEmpty(workTicketInfoVO.getWorkTicketSafetyMeasureVOList())) { - Map> measureMap = workTicketInfoVO.getWorkTicketSafetyMeasureVOList().stream().collect(Collectors.groupingBy(WorkTicketSafetyMeasureVO::getType)); - if (ObjectUtil.isNotEmpty(measureMap.get(TicketConstants.MEASURE_TYPE_ONE))) { - workTicketInfoMap.put("matterLibraryListOne", measureMap.get(TicketConstants.MEASURE_TYPE_ONE).stream().map(measure -> { - Map map = PdfUtils.objectToMap(measure); - map.put("safetyMeasure", ObjectUtil.isNotEmpty(map.get("measure")) ? map.get("measure") : null); - String status = TicketConstants.SafetyMeasureStatusEnum.FINISH.getStatus().equals(measure.getStatus()) ? TicketConstants.SafetyMeasureStatusEnum.FINISH.getDescribe() : " "; - map.put("status", status); - return map; - }).collect(Collectors.toList())); - } else { - workTicketInfoMap.put("matterLibraryListOne", new ArrayList>(1)); - } - if (ObjectUtil.isNotEmpty(measureMap.get(TicketConstants.MEASURE_TYPE_TWO))) { - workTicketInfoMap.put("matterLibraryListTwo", measureMap.get(TicketConstants.MEASURE_TYPE_TWO).stream().map(measure -> { - Map map = PdfUtils.objectToMap(measure); - map.put("safetyMeasure", ObjectUtil.isNotEmpty(map.get("measure")) ? map.get("measure") : null); - String status = TicketConstants.SafetyMeasureStatusEnum.FINISH.getStatus().equals(measure.getStatus()) ? TicketConstants.SafetyMeasureStatusEnum.FINISH.getDescribe() : " "; - map.put("status", status); - return map; - }).collect(Collectors.toList())); - } else { - workTicketInfoMap.put("matterLibraryListTwo", new ArrayList>(1)); - } - if (ObjectUtil.isNotEmpty(measureMap.get(TicketConstants.MEASURE_TYPE_THREE))) { - workTicketInfoMap.put("matterLibraryListThree", measureMap.get(TicketConstants.MEASURE_TYPE_THREE).stream().map(measure -> { - Map map = PdfUtils.objectToMap(measure); - map.put("safetyMeasure", ObjectUtil.isNotEmpty(map.get("measure")) ? map.get("measure") : null); - String status = TicketConstants.SafetyMeasureStatusEnum.FINISH.getStatus().equals(measure.getStatus()) ? TicketConstants.SafetyMeasureStatusEnum.FINISH.getDescribe() : " "; - map.put("status", status); - return map; - }).collect(Collectors.toList())); - } else { - workTicketInfoMap.put("matterLibraryListThree", new ArrayList>(1)); - } - } - //线下开票确认人为空 - workTicketInfoMap.put("membersConfirm", TicketConstants.FirstWorkTicketFlowStatusEnum.OFFLINE.getStatus().equals(workTicketInfoVO.getStatus()) ? "" : workTicketInfoVO.getMembersName()); - //获取工作票工作流处理信息 - List workTicketFlowVOList = workTicketInfoVO.getWorkTicketFlowVOList(); - //签发 - List signFlow = workTicketFlowVOList.stream().filter(f -> TicketConstants.FirstWorkTicketFlowStatusEnum.LICENSE.getStatus().equals(Integer.parseInt(f.getFlowCode()))).collect(Collectors.toList()); - if (CollectionUtil.isNotEmpty(signFlow)) { - workTicketInfoMap.put("signer", signFlow.get(0).getCreateUserName()); - workTicketInfoMap.put("signTime", DateUtil.format(signFlow.get(0).getCreateTime(), TicketConstants.TICKET_DATE_PATTERN)); - } else { - workTicketInfoMap.put("signer", ""); - workTicketInfoMap.put("signTime", ""); - } - //许可人许可 - if (Func.isNotEmpty(workTicketInfoVO.getLicenseTime())) { - workTicketInfoMap.put("licensorConfirm", workTicketInfoVO.getLicensorName()); - workTicketInfoMap.put("licenseTime", DateUtil.format(workTicketInfoVO.getLicenseTime(), TicketConstants.TICKET_DATE_PATTERN)); - } else { - workTicketInfoMap.put("licensorConfirm", ""); - workTicketInfoMap.put("licenseTime", ""); - } - - /**负责人收到工作票**/ - List receiveFlow = workTicketFlowVOList.stream().filter(f -> TicketConstants.FirstWorkTicketFlowStatusEnum.CONFIRM_MEASURE_PRINCIPAL.getStatus().equals(Integer.parseInt(f.getFlowCode()))).collect(Collectors.toList()); - if (CollectionUtil.isNotEmpty(receiveFlow)) { - workTicketInfoMap.put("receivePrincipal", receiveFlow.get(0).getCreateUserName()); - workTicketInfoMap.put("receiveTime", DateUtil.format(receiveFlow.get(0).getCreateTime(), TicketConstants.TICKET_DATE_PATTERN)); - workTicketInfoMap.put("principalConfirm", workTicketInfoVO.getPrincipalName()); - } else { - workTicketInfoMap.put("receivePrincipal", ""); - workTicketInfoMap.put("receiveTime", ""); - workTicketInfoMap.put("principalConfirm", ""); - } - /**负责人确认安全事项**/ - List confirmFlow = workTicketFlowVOList.stream().filter(f -> TicketConstants.FirstWorkTicketFlowStatusEnum.CONFIRM_MEASURE_MEMBERS.getStatus().equals(Integer.parseInt(f.getFlowCode()))).collect(Collectors.toList()); - if (CollectionUtil.isNotEmpty(confirmFlow)) { - workTicketInfoMap.put("confirmPrincipal", confirmFlow.get(0).getCreateUserName()); - workTicketInfoMap.put("confirmTime", DateUtil.format(confirmFlow.get(0).getCreateTime(), TicketConstants.TICKET_DATE_PATTERN)); - } else { - workTicketInfoMap.put("confirmPrincipal", ""); - workTicketInfoMap.put("confirmTime", ""); - } - /**工作结束**/ - List finishFlow = workTicketFlowVOList.stream().filter(f -> TicketConstants.FirstWorkTicketFlowStatusEnum.END.getStatus().equals(Integer.parseInt(f.getFlowCode()))).collect(Collectors.toList()); - if (CollectionUtil.isNotEmpty(finishFlow)) { - workTicketInfoMap.put("finisher", finishFlow.get(0).getCreateUserName()); - workTicketInfoMap.put("finishTime", DateUtil.format(finishFlow.get(0).getCreateTime(), TicketConstants.TICKET_DATE_PATTERN)); - workTicketInfoMap.put("principalFinish", workTicketInfoVO.getPrincipalName()); - } else { - workTicketInfoMap.put("finisher", ""); - workTicketInfoMap.put("finishTime", ""); - workTicketInfoMap.put("principalFinish", ""); - } - /**工作终结**/ - List endFlow = workTicketFlowVOList.stream().filter(f -> TicketConstants.FirstWorkTicketFlowStatusEnum.FINISH.getStatus().intValue() == Integer.parseInt(f.getFlowCode())).collect(Collectors.toList()); - if (CollectionUtil.isNotEmpty(endFlow)) { - workTicketInfoMap.put("endLicensor", endFlow.get(0).getCreateUserName()); - workTicketInfoMap.put("endTime", DateUtil.format(endFlow.get(0).getCreateTime(), TicketConstants.TICKET_DATE_PATTERN)); - workTicketInfoMap.put("groundSwitchCount", ObjectUtil.isNotEmpty(endFlow.get(0).getGroundSwitchCount()) ? endFlow.get(0).getGroundSwitchCount() : ""); - workTicketInfoMap.put("groundWireCode", ObjectUtil.isNotEmpty(endFlow.get(0).getGroundWireCode()) ? endFlow.get(0).getGroundWireCode() : ""); - workTicketInfoMap.put("groundWireCount", ObjectUtil.isNotEmpty(endFlow.get(0).getGroundWireCount()) ? endFlow.get(0).getGroundWireCount() : ""); - } else { - workTicketInfoMap.put("endLicensor", ""); - workTicketInfoMap.put("endTime", ""); - workTicketInfoMap.put("groundSwitchCount", ""); - workTicketInfoMap.put("groundWireCode", ""); - workTicketInfoMap.put("groundWireCount", ""); - } - /**负责人变更**/ - List workTicketPrincipalChangeVOList = workTicketInfoVO.getWorkTicketPrincipalChangeVOList(); - if (CollectionUtil.isNotEmpty(workTicketPrincipalChangeVOList)) { - workTicketInfoMap.put("initPrincipal", workTicketPrincipalChangeVOList.get(0).getInitialPrincipalName()); - workTicketInfoMap.put("changePrincipal", workTicketPrincipalChangeVOList.get(0).getChangePrincipalName()); - workTicketInfoMap.put("principalChangeSigner", workTicketPrincipalChangeVOList.get(0).getCreateUserName()); - workTicketInfoMap.put("principalChangeTime", DateUtil.format(workTicketPrincipalChangeVOList.get(0).getCreateTime(), TicketConstants.TICKET_DATE_PATTERN)); - } else { - workTicketInfoMap.put("initPrincipal", ""); - workTicketInfoMap.put("changePrincipal", ""); - workTicketInfoMap.put("principalChangeSigner", ""); - workTicketInfoMap.put("principalChangeTime", ""); - } - /**工作成员变更**/ - List membersChangeList = workTicketInfoVO.getWorkTicketMembersChangeVOList(); - if (CollectionUtil.isNotEmpty(membersChangeList)) { - /**工作成员变更详情**/ - String membersChangeSituation = membersChangeList.stream().map(mc -> DateUtil.format(mc.getCreateTime(), TicketConstants.TICKET_DATE_PATTERN).concat(":").concat(mc.getChangeMembersName())).collect(Collectors.joining(";")); - workTicketInfoMap.put("membersChangeSituation", membersChangeSituation); - workTicketInfoMap.put("memberChangePrincipal", membersChangeList.get(0).getCreateUserName()); - } else { - workTicketInfoMap.put("membersChangeSituation", ""); - workTicketInfoMap.put("memberChangePrincipal", ""); - } - /**工作票延期**/ - List workTicketDelayVOList = workTicketInfoVO.getWorkTicketDelayVOList(); - if (CollectionUtil.isNotEmpty(workTicketDelayVOList)) { - WorkTicketDelayVO workTicketDelayVO = workTicketDelayVOList.get(0); - workTicketInfoMap.put("delayTime", DateUtil.format(workTicketDelayVO.getChangeTime(), TicketConstants.TICKET_DATE_PATTERN)); - workTicketInfoMap.put("delayPrincipal", workTicketDelayVO.getCreateUserName()); - workTicketInfoMap.put("delayPrincipalTime", DateUtil.format(workTicketDelayVO.getCreateTime(), TicketConstants.TICKET_DATE_PATTERN)); - workTicketInfoMap.put("delayLicensor", workTicketDelayVO.getLicensorName()); - workTicketInfoMap.put("delayLicenseTime", DateUtil.format(workTicketDelayVO.getLicenseTime(), TicketConstants.TICKET_DATE_PATTERN)); - } else { - workTicketInfoMap.put("delayTime", ""); - workTicketInfoMap.put("delayPrincipal", ""); - workTicketInfoMap.put("delayPrincipalTime", ""); - workTicketInfoMap.put("delayLicensor", ""); - workTicketInfoMap.put("delayLicenseTime", ""); - } - - /**跨日工作时间**/ - List operateList = workTicketInfoVO.getWorkTicketOperateTimeVOList(); - if (CollectionUtil.isNotEmpty(operateList)) { - List> operateMapList = operateList.stream().map(operate -> { - Map map = new HashMap<>(4); - map.put("startTime", DateUtil.format(operate.getStartTime(), TicketConstants.TICKET_DATE_PATTERN)); - map.put("endTime", DateUtil.format(operate.getEndTime(), TicketConstants.TICKET_DATE_PATTERN)); - map.put("principal", operate.getPrincipalName()); - map.put("licensor", operate.getLicensorName()); - return map; - }).collect(Collectors.toList()); - workTicketInfoMap.put("operateMapList", operateMapList); - } else { - List> operateMapList = new ArrayList<>(); - Map map = new HashMap<>(4); - map.put("startTime", ""); - map.put("endTime", ""); - map.put("principal", ""); - map.put("licensor", ""); - operateMapList.add(map); - workTicketInfoMap.put("operateMapList", operateMapList); - } - - /**运行值班人员暂为空**/ - workTicketInfoMap.put("dutyPersonName", "/"); - - String fileName = TicketConstants.WordFileNameEnum.getFileNameByType(workTicketInfoVO.getType()) + PdfUtils.XLSX_SUFFIX; - log.info("工作票模板为：{}", fileName); - TemplateExportParams templateExportParams = new TemplateExportParams("template/" + fileName, true); - Workbook workbook = null; - try { - workbook = ExcelUtil.getWorkbook(templateExportParams, workTicketInfoMap); - } catch (Exception e) { - e.printStackTrace(); - } - //上传xlsx至服务器 - try { - ExcelUtil.upload(workbook, xlsSavePath, workTicketInfoVO.getWorkContent() + PdfUtils.XLSX_SUFFIX); - } catch (Exception e) { - e.printStackTrace(); - } - //将xlsx文件转换为pdf并保存 - String pdfFileName = workTicketInfoVO.getWorkContent() + PdfUtils.PDF_SUFFIX; - String xlsFileName = workTicketInfoVO.getWorkContent() + PdfUtils.XLSX_SUFFIX; - PdfUtils.convertPdf(xlsSavePath, xlsFileName, pdfSavePath, pdfFileName); - String savePath = pdfSavePath + pdfFileName; - // 设置response参数，可以打开下载页面 - PdfUtils.readPdf(response, savePath); - } - - @Override - @Transactional - public R completeTask(WorkTicketInfoDto req, BladeFlow flow) { - ComleteTask task = new ComleteTask(); - task.setTaskId(flow.getTaskId()); - task.setComment(flow.getComment()); - task.setAttachments(flow.getAttachments()); - task.setFlag(flow.getFlag()); - task.setProcessInstanceId(flow.getProcessInstanceId()); - task.setVariables(flow.getVariables()); - - //待许可时获取许可人角色下用户开启工作流 - if (TicketConstants.FirstWorkTicketFlowStatusEnum.LICENSE.getStatus().equals(req.getStatus())) { - R> userListR = userClient.relationUserListByRoleAlias(AuthUtil.getTenantId(), req.getCreateDept(), TicketConstants.LICENSOR_ROLE); - if (!userListR.isSuccess()) { - throw new ServiceException(userListR.getMsg()); - } - Map variables = CollectionUtil.isEmpty(flow.getVariables()) ? new HashMap<>() : flow.getVariables(); - String taskUser = userListR.getData().stream().map(u -> "taskUser_".concat(u.getId().toString())).collect(Collectors.joining(",")); - variables.put("licenseUserIds", taskUser); - task.setVariables(variables); - } - log.info("工作流对象为：{}", JSONObject.toJSONString(flow)); - - if (TicketConstants.FirstWorkTicketFlowStatusEnum.LICENSE.getStatus().equals(req.getStatus())) { - req.setSigner(AuthUtil.getUserId()); - } else if (TicketConstants.FirstWorkTicketFlowStatusEnum.CONFIRM_MEASURE_PRINCIPAL.getStatus().equals(req.getStatus())) { - req.setLicensor(AuthUtil.getUserId()); - } else if (TicketConstants.FirstWorkTicketFlowStatusEnum.INVALID.getStatus().equals(req.getStatus())) { - this.invalidTicket(req); - } - - //更新状态 - boolean flag = this.update(Wrappers.lambdaUpdate().set(WorkTicketInfoEntity::getStatus, req.getStatus()).set(WorkTicketInfoEntity::getPrincipal, req.getPrincipal()).set(WorkTicketInfoEntity::getLicensor, req.getLicensor()).set(WorkTicketInfoEntity::getLicenseTime, req.getLicenseTime()).set(WorkTicketInfoEntity::getLicenseEndTime, req.getLicenseEndTime()).eq(WorkTicketInfoEntity::getId, req.getId())); - - //新增流程信息 - WorkTicketFlowEntity workTicketFlowEntity = new WorkTicketFlowEntity(); - workTicketFlowEntity.setTicketId(req.getId()); - workTicketFlowEntity.setFlowCode(req.getStatus().toString()); - workTicketFlowEntity.setExecutor(AuthUtil.getUserId().toString()); - workTicketFlowEntity.setExecuteTime(LocalDateTime.now()); - workTicketFlowEntity.setRemark(Optional.ofNullable(flow.getVariables()).map(v -> v.get("remark")).map(s -> s.toString()).orElse("")); - workTicketFlowEntity.setSignImgPath(Optional.ofNullable(flow.getVariables()).map(v -> v.get("signImgPath")).map(s -> s.toString()).orElse("")); - workTicketFlowEntity.setGroundWireCount(Optional.ofNullable(flow.getVariables()).map(v -> v.get("groundWireCount")).map(s -> Integer.parseInt(s.toString())).orElse(null)); - workTicketFlowEntity.setGroundSwitchCount(Optional.ofNullable(flow.getVariables()).map(v -> v.get("groundSwitchCount")).map(s -> Integer.parseInt(s.toString())).orElse(null)); - workTicketFlowEntity.setStatus(req.getStatus()); - workTicketFlowService.save(workTicketFlowEntity); - //执行流程 - R flowResult = flowClient.completeTask(task); - //更新任务状态 - updateAccessStatus(req); - - if (!flowResult.isSuccess()) { - throw new ServiceException("执行工作流失败！"); - } - - return R.success("操作成功！"); - } - - @Transactional(rollbackFor = Exception.class) - public void updateAccessStatus(WorkTicketInfoDto req) { - if (TicketConstants.TaskTypeEnum.JXRW.getType().equals(req.getTaskType()) || TicketConstants.TaskTypeEnum.JXJH.getType().equals(req.getTaskType())) { - log.info("许可通过：{}", JSONObject.toJSONString(req)); - //许可人通过将检修任务状态设为执行中 - if (TicketConstants.FirstWorkTicketFlowStatusEnum.CONFIRM_MEASURE_PRINCIPAL.getStatus().equals(req.getStatus())) { - OperAccessTaskEntity taskEntity = new OperAccessTaskEntity(); - taskEntity.setId(req.getTaskId()); - taskEntity.setStatus(AccessConstants.ACCESS_TASK_STATUS_1); - //设置开始时间 - taskEntity.setActStartTime(DateUtil.now()); - operAccessTaskClient.updateById(taskEntity); - } - } - } - - /*** - * 票据作废时 对应任务ID应该置空 - * @param req - */ - public void invalidTicket(WorkTicketInfoDto req) { - if (TicketConstants.TaskTypeEnum.JXRW.getType().equals(req.getTaskType()) || TicketConstants.TaskTypeEnum.JXJH.getType().equals(req.getTaskType())) { - OperAccessTaskEntity taskEntity = new OperAccessTaskEntity(); - taskEntity.setId(req.getTaskId()); - taskEntity.setInvalid(true); - taskEntity.setTicketId(null); - operAccessTaskClient.updateById(taskEntity); - } - if (TicketConstants.TaskTypeEnum.RCWH.getType().equals(req.getTaskType())) { - OperMaintenanceTaskDTO dto = new OperMaintenanceTaskDTO(); - dto.setId(req.getTaskId()); - dto.setInvalid(true); - //dto.setTicketId(null); - taskClient.doUpdateTaskById(dto); - } - } - - /*** - * 回传票据ID - * @param req - */ - @Transactional(rollbackFor = Exception.class) - public void returnTicket(WorkTicketInfoDto req) { - if (TicketConstants.TaskTypeEnum.JXRW.getType().equals(req.getTaskType())) { - OperAccessTaskEntity taskEntity = new OperAccessTaskEntity(); - taskEntity.setId(req.getTaskId()); - taskEntity.setTicketId(req.getId()); - operAccessTaskClient.updateById(taskEntity); - } - if (TicketConstants.TaskTypeEnum.RCWH.getType().equals(req.getTaskType())) { - OperMaintenanceTaskDTO dto = new OperMaintenanceTaskDTO(); - dto.setId(req.getTaskId()); - dto.setTicketId(req.getId()); - taskClient.doUpdateTaskById(dto); - } - } - - /** - * 获取queryWrapper - * - * @param req - * @return - */ - private LambdaQueryWrapper getQueryWrapper(WorkTicketInfoDto req) { - LambdaQueryWrapper lqw = new LambdaQueryWrapper(); - if (Func.isNotBlank(req.getProcessInstanceId())) { - lqw.eq(WorkTicketInfoEntity::getProcessInstanceId, req.getProcessInstanceId()); - } - if (Func.isNotEmpty(req.getType())) { - lqw.eq(WorkTicketInfoEntity::getType, req.getType()); - } - if (Func.isNotEmpty(req.getTaskType())) { - lqw.eq(WorkTicketInfoEntity::getTaskType, req.getTaskType()); - } - if (Func.isNotEmpty(req.getCode())) { - lqw.like(WorkTicketInfoEntity::getCode, req.getCode()); - } - if (Func.isNotEmpty(req.getStatus())) { - lqw.eq(WorkTicketInfoEntity::getStatus, req.getStatus()); - } - if (Func.isNotEmpty(req.getCompany())) { - lqw.like(WorkTicketInfoEntity::getType, "%".concat(req.getCompany()).concat("%")); - } - if (Func.isNotEmpty(req.getClassGroup())) { - lqw.eq(WorkTicketInfoEntity::getClassGroup, req.getClassGroup()); - } - if (Func.isNotEmpty(req.getTaskId())) { - lqw.eq(WorkTicketInfoEntity::getTaskId, req.getTaskId()); - } - if (Func.isNotEmpty(req.getClassGroup())) { - lqw.eq(WorkTicketInfoEntity::getClassGroup, req.getClassGroup()); - } - if (Func.isNotEmpty(req.getClassGroupMembers())) { - lqw.like(WorkTicketInfoEntity::getClassGroupMembers, "%".concat(req.getClassGroupMembers()).concat("%")); - } - if (Func.isNotEmpty(req.getWorkContent())) { - lqw.like(WorkTicketInfoEntity::getWorkContent, "%".concat(req.getWorkContent()).concat("%")); - } - if (Func.isNotEmpty(req.getSigner())) { - lqw.eq(WorkTicketInfoEntity::getSigner, req.getSigner()); - } - if (Func.isNotEmpty(req.getLicensor())) { - lqw.eq(WorkTicketInfoEntity::getLicensor, req.getLicensor()); - } - if (Func.isNotEmpty(req.getStartTime())) { - lqw.ge(WorkTicketInfoEntity::getCreateTime, req.getStartTime()); - } - if (Func.isNotEmpty(req.getEndTime())) { - lqw.le(WorkTicketInfoEntity::getCreateTime, req.getEndTime()); - } - if (!CollectionUtil.isEmpty(req.getDeptIds())) { - lqw.in(WorkTicketInfoEntity::getCreateDept, req.getDeptIds()); - } - return lqw; - } - - /** - * 开启一个流程实例 - * - * @author hx - **/ - @Override - public BladeFlow startProcessInstance(String processDefinitionKey, WorkTicketInfoEntity workTicketInfoEntity) { - /**获取签发人角色下的人员**/ - R> listR = userClient.relationUserListByRoleAlias(tenantId, Long.parseLong(AuthUtil.getUser().getDeptId()), TicketConstants.SIGNER_ROLE); - if (!listR.isSuccess() || CollectionUtil.isEmpty(listR.getData())) { - throw new ServiceException("工作票签发人角色下未查询到相关人员"); - } - String signUserIds = listR.getData().stream().map(user -> "taskUser_".concat(user.getId().toString())).collect(Collectors.joining(",")); - - Map params = new HashMap(2) {{ - put("taskId", workTicketInfoEntity.getId()); - put("signUserIds", signUserIds); - }}; - - R r = flowClient.startProcessInstanceContainNameByKey(processDefinitionKey, "workTicket:task:" + workTicketInfoEntity.getId(), workTicketInfoEntity.getWorkContent(), params); - if (!r.isSuccess()) { - throw new ServiceException(r.getMsg()); - } - return r.getData(); - } - - /** - * 许可人通过线下工作票 - * - * @param req - * @return - */ - @Override - public R licenseOfflineTicket(WorkTicketInfoDto req) { - Long ticketId = req.getId(); - WorkTicketInfoEntity infoEntity = getById(ticketId); - //获取许可人角色下的人员 - R> listR = userClient.relationUserListByRoleAlias(tenantId, infoEntity.getCreateDept(), TicketConstants.LICENSOR_ROLE); - if (!listR.isSuccess() || CollectionUtil.isEmpty(listR.getData())) { - throw new ServiceException("工作票许可人角色下未查询到相关人员"); - } - List userId = listR.getData().stream().map(User::getId).distinct().collect(Collectors.toList()); - if (!userId.contains(AuthUtil.getUserId())) { - throw new ServiceException("当前操作人没有许可人角色，无法执行该操作"); - } - update(Wrappers.lambdaUpdate().set(WorkTicketInfoEntity::getStatus, TicketConstants.FirstWorkTicketFlowStatusEnum.OFFLINE_LICENSE.getStatus()).set(WorkTicketInfoEntity::getLicensor, AuthUtil.getUserId()).set(WorkTicketInfoEntity::getLicenseTime, LocalDateTime.now()).set(WorkTicketInfoEntity::getLicenseEndTime, req.getLicenseEndTime()).eq(WorkTicketInfoEntity::getId, ticketId)); - return R.success("操作成功"); - } - - /** - * 完成线下工作票 - * - * @param ticketAccessTaskDto - * @return - */ - @Override - public R finishOfflineTicket(TicketAccessTaskDto ticketAccessTaskDto) { - //更新工作票 - WorkTicketInfoDto infoDto = ticketAccessTaskDto.getWorkTicketInfoDto(); - update(Wrappers.lambdaUpdate().set(WorkTicketInfoEntity::getStatus, TicketConstants.FirstWorkTicketFlowStatusEnum.OFFLINE_END.getStatus()).eq(WorkTicketInfoEntity::getId, infoDto.getId())); - //获取工作票实体类 - WorkTicketInfoEntity infoEntity = getById(infoDto.getId()); - //根据任务类型执行任务 - if (ObjectUtil.isEmpty(infoEntity.getTaskType())) { - return R.success("操作成功"); - } - //FIXME 日常维护、检修任务暂时不形成闭环（因许可人无需填入任务结束完成所需参数，故选择由执行人手动闭环） ~2022--05-06 -// if(TicketConstants.TaskTypeEnum.JXRW.getType().equals(infoEntity.getTaskType()) -// || TicketConstants.TaskTypeEnum.JXJH.getType().equals(infoEntity.getTaskType())) { -// //执行检修任务 -// OperAccessTaskDTO accessTaskDTO = ticketAccessTaskDto.getAccessTaskDTO(); -// accessTaskDTO.setId(infoEntity.getTaskId()); -// if(ObjectUtil.isNotEmpty(accessTaskDTO) && ObjectUtil.isNotEmpty(accessTaskDTO.getId())){ -// log.info("线下检修任务执行调用传参为：{}",JSONObject.toJSONString(accessTaskDTO)); -// //operAccessTaskClient.finishAccessTask(accessTaskDTO); -// } -// } -// else if(TicketConstants.TaskTypeEnum.RCWH.getType().equals(infoEntity.getTaskType())) { -// //执行日常维护任务 -// OperMaintenanceTaskDTO operMaintenanceTaskDTO = new OperMaintenanceTaskDTO(); -// operMaintenanceTaskDTO.setId(infoEntity.getTaskId()); -// operMaintenanceTaskDTO.setStatus(MaintenanceConstant.TASK_STATUS_3); -// if(ObjectUtil.isNotEmpty(operMaintenanceTaskDTO) && ObjectUtil.isNotEmpty(operMaintenanceTaskDTO.getId()) ){ -// ComleteTask comleteTask = new ComleteTask(); -// comleteTask.setProcessInstanceId(operMaintenanceTaskDTO.getProcessInstanceId()); -// comleteTask.setFlag("ok"); -// comleteTask.setPass(true); -// comleteTask.setComment("执行完成"); -// TaskFlowDTO taskFlowDTO = TaskFlowDTO.builder().taskDTO(operMaintenanceTaskDTO).comleteTask(comleteTask).build(); -// log.info("线下日常维护任务执行调用传参为：{}",JSONObject.toJSONString(taskFlowDTO)); -// //R result = taskClient.updateTaskStatus(taskFlowDTO); -// } -// } - return R.success("操作成功"); - } - - /*** - * 获取工作票编号 - * @return - */ - @Override - public String getWorkTicketCode() { - String code = ""; - lock.lock(); - try { - /**获取当前时间**/ - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyMM"); - YearMonth yearMonth = YearMonth.now(); - String tym = yearMonth.format(formatter); - LocalDateTime date = LocalDateTime.now(); - LocalDateTime firstDay = date.with(TemporalAdjusters.firstDayOfMonth()).withHour(0).withMinute(0).withSecond(0); - LocalDateTime lastDay = date.with(TemporalAdjusters.lastDayOfMonth()).withHour(23).withMinute(59).withSecond(59); - log.info("当月第一天：{}；当月最后一天{}", firstDay, lastDay); - /**获取当月工作票总条数**/ - List infoEntityList = this.list(new LambdaQueryWrapper() {{ - ge(WorkTicketInfoEntity::getCreateTime, firstDay); - le(WorkTicketInfoEntity::getCreateTime, lastDay); - }}); - if (CollectionUtil.isEmpty(infoEntityList)) { - code = TicketConstants.TicketCodePreEnum.DQ_WORK.getPrefix().concat("-").concat(tym).concat("-001"); - } else { - code = TicketConstants.TicketCodePreEnum.DQ_WORK.getPrefix().concat("-").concat(tym).concat("-").concat(String.format("%03d", infoEntityList.size() + 1)); - } - } catch (Exception e) { - e.printStackTrace(); - } finally { - lock.unlock(); - } - return code; - } - - /** - * 获取安全检查工作票项统计 - * - * @param startDate 开始时间 - * @param endDate 结束时间 - * @param dept 机构ID - * @return WorkTicketStatisticVO统计对象 - */ - @Override - public SafeCheckStatisticVO getWorkTicketStatistic(String startDate, String endDate, Long dept) { - return this.baseMapper.getWorkTicketStatistic(startDate, endDate, dept); - } - - /** - * 验证角色是否能查询到相关人员 - * - * @param deptId 机构ID - * @param roleAliasArray 角色 按逗号分隔 - * @return - */ - @Override - public R> verificationRole(Long deptId, String roleAliasArray) { - Map result = new HashedMap(2); - List failRoleAliasList = Lists.newArrayList(); - AtomicBoolean flag = new AtomicBoolean(true); - Arrays.stream(roleAliasArray.split(",")).forEach(roleAlias -> { - //查询机构下角色是否有对应人员列表 - R> listR = userClient.relationUserListByRoleAlias(tenantId, deptId, roleAlias); - if (!listR.isSuccess() || ObjectUtil.isEmpty(listR.getData())) { - failRoleAliasList.add(roleAlias); - flag.set(false); - } - }); - result.put("flag", flag.get()); - if (CollectionUtil.isNotEmpty(failRoleAliasList)) { - result.put("message", "验证失败，获取" + JSON.toJSONString(failRoleAliasList) + "角色下的人员失败"); - } - - return R.data(result); - } - - /** - * 根据月份和区域查询工作票列表详情 - * - * @param pageEntity - * @param areaVo - * @return - */ - @Override - public BladePage workTicketListByMonthAndArea(Page pageEntity, StandardTicketWithAreaVo areaVo) { - //1.查询 - QueryWrapper queryWrapper = new QueryWrapper<>(); - - //开票来源 - queryWrapper.eq(Func.isNotEmpty(areaVo.getTaskType()), "sti.task_type", areaVo.getTaskType()); - //编号 - queryWrapper.like(Func.isNotEmpty(areaVo.getCode()), "sti.code", areaVo.getCode()); - - //状态 - queryWrapper.eq(Func.isNotEmpty(areaVo.getStatus()), "sti.status", areaVo.getStatus()); - - //开始时间 - queryWrapper.lt(Func.isNotEmpty(areaVo.getStartTime()), "sti.create_time", areaVo.getStartTime()); - - //结束时间 - queryWrapper.le(Func.isNotEmpty(areaVo.getEndTime()), "sti.create_time", areaVo.getEndTime()); - - - queryWrapper.eq("sti.create_dept", areaVo.getAreaId()); - queryWrapper.eq(areaVo.getYearMonth() != null, "date_format(sti.create_time,'%Y-%m')", areaVo.getYearMonth()); - //如果为1为合格 - // queryWrapper.eq("tie.status",1); - Page workTicketInfoEntityPage = baseMapper.selectPages(pageEntity, queryWrapper); - //数据转换 - List standardWorkList = new ArrayList<>(); - if (CollectionUtil.isNotEmpty(workTicketInfoEntityPage.getRecords())) { - standardWorkList = workTicketInfoEntityPage.getRecords().stream().map(workTicketInfoEntity -> { - StandardWorkVo standardWorkVo = new StandardWorkVo(); - BeanUtils.copyProperties(workTicketInfoEntity, standardWorkVo); - return standardWorkVo; - }).collect(Collectors.toList()); - } - - IPage page = new Page<>(); - page.setRecords(standardWorkList); - page.setTotal(workTicketInfoEntityPage.getTotal()); - page.setCurrent(workTicketInfoEntityPage.getCurrent()); - page.setSize(workTicketInfoEntityPage.getSize()); - BladePage bladePage = BladePage.of(page); - return bladePage; - } - - - /** - * 判断是否存在合格率 如果存在返回true 否则为false - * - * @param item - * @return - */ - private boolean isTicketPercentById(WorkTicketInfoEntity item) { - LambdaQueryWrapper ticketInfoEvaluateEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); - ticketInfoEvaluateEntityLambdaQueryWrapper.eq(TicketInfoEvaluateEntity::getTicketId, item.getId()); - ticketInfoEvaluateEntityLambdaQueryWrapper.eq(TicketInfoEvaluateEntity::getStatus, TicketConstants.TicketQualifiedEnum.Qualified.getCode()); - // 查询合格评价 - int count = ticketInfoEvaluateService.count(ticketInfoEvaluateEntityLambdaQueryWrapper); - return count > 0; - } - - - /** - * 更新状态值 - * - * @param status - * @param description - * @param id - */ - @Override - public void updateFlowStatusById(Integer status, String description, Long id) { - LambdaUpdateWrapper queryWrapper = new LambdaUpdateWrapper<>(); - queryWrapper.set(WorkTicketInfoEntity::getFlowStatus, status); - queryWrapper.set(WorkTicketInfoEntity::getFlowDescription, description); - queryWrapper.eq(WorkTicketInfoEntity::getId, id); - } - - /** - * 获取工作详情 - * - * @param ticketId - * @return - */ - @Override - public WorkTicketVo selectDetailsById(Long ticketId) { - WorkTicketVo workTicketVo = new WorkTicketVo(); - - //1. 获取工作票详情数据 - WorkTicketInfoEntity workTicketInfo = this.getById(ticketId); - if (ObjectUtils.isEmpty(workTicketInfo)) { - throw new ServiceException("未查询到ticketId对应的信息"); - } - - //赋值签发人 - if (workTicketInfo.getSigner() != null) { - User user = UserCache.getUser(workTicketInfo.getSigner()); - workTicketInfo.setSignerName(user == null ? null : user.getName()); - } - - if (workTicketInfo.getSigner() != null && workTicketInfo.getSignerName() == null) { - User user = UserCache.getUser(workTicketInfo.getSigner()); - workTicketInfo.setSignerName(user == null ? null : user.getName()); - } - - //赋值许可人名称 - if (workTicketInfo.getLicensor() != null) { - User user = UserCache.getUser(workTicketInfo.getLicensor()); - workTicketInfo.setLicensorName(user == null ? null : user.getName()); - } - - if (workTicketInfo.getLicensor() != null && workTicketInfo.getLicensorName() == null) { - User user = UserCache.getUser(workTicketInfo.getLicensor()); - workTicketInfo.setLicensorName(user == null ? null : user.getName()); - } - - // 负责值班负责人 - if (workTicketInfo.getWatchPrincipal() != null) { - User user = UserCache.getUser(workTicketInfo.getWatchPrincipal()); - workTicketInfo.setWatchPrincipalName(user == null ? null : user.getName()); - } - - if (workTicketInfo.getWatchPrincipal() != null && workTicketInfo.getWatchPrincipalName() == null) { - User user = UserCache.getUser(workTicketInfo.getWatchPrincipal()); - workTicketInfo.setWatchPrincipalName(user == null ? null : user.getName()); - } - - - StringBuilder sb = new StringBuilder(); - String classGroupMembers = workTicketInfo.getClassGroupMembers(); - if (StringUtils.isNoneBlank(classGroupMembers)) { - // System.out.println("获取classGroupMembers ==> " + classGroupMembers); - String[] split = classGroupMembers.split(","); - for (String classGroupMember : split) { - System.out.println(classGroupMember); - if (StringUtils.isNoneBlank(classGroupMember)) { - boolean matches = classGroupMember.matches("[0-9]+"); - if (matches) { - User user = UserCache.getUser(Long.valueOf(classGroupMember)); - String name = user == null ? null : user.getName(); - if (StringUtils.isNotBlank(name)) { - sb.append(name).append(","); - } - } - } - } - - //统计人数 - if (workTicketInfo.getTotalPerson() == null) { - workTicketInfo.setTotalPerson(sb.toString().trim().split(",").length); - } - - //成员信息 - if (workTicketInfo.getClassGroupMembersName() == null) { - workTicketInfo.setClassGroupMembersName(sb.toString().endsWith(",") ? - sb.toString().substring(0, sb.length() - 1) : sb.toString()); - } - } - - - //负责人名称 - if (workTicketInfo.getPrincipalName() == null && workTicketInfo.getPrincipal() != null) { - User user = UserCache.getUser(workTicketInfo.getPrincipal()); - workTicketInfo.setPrincipalName(user == null ? "" : user.getName()); - } - - - workTicketVo.setWorkTicket(workTicketInfo); - - //2. 安全措施数组 - List workTicketSafetyMeasureEntity = workTicketSafetyMeasureService.selectByTicketId(ticketId); - if (CollectionUtils.isNotEmpty(workTicketSafetyMeasureEntity)) { - workTicketVo.setSafetyMeasuresList(workTicketSafetyMeasureEntity); - } - - //3. 工作票工作任务组 - List workTicketContentEntities = workTicketContentService.selectByTicketId(ticketId); - if (CollectionUtils.isNotEmpty(workTicketContentEntities)) { - workTicketVo.setWorkTicketContentDtoList(workTicketContentEntities); - } - - //4. 工作票延期 - WorkTicketDelayEntity workTicketDelayEntity = delayService.selectByTicketId(ticketId); - if (ObjectUtils.isNotEmpty(workTicketDelayEntity)) { - workTicketVo.setWorkTicketDelay(workTicketDelayEntity); - } - - - //5.工作结束 - WorkTicketFinish workTicketFinish = workTicketFinishService.selectByTicketId(ticketId); - if (ObjectUtils.isNotEmpty(workTicketFinish)) { - workTicketVo.setWorkTicketFinish(workTicketFinish); - } - - - //6.工作开始时间和结束时间 - List workTicketOperateTimeEntities = - workTicketOperateTimeService.selectByTicketId(ticketId); - if (CollectionUtils.isNotEmpty(workTicketOperateTimeEntities)) { - workTicketVo.setWorkTicketOperateTimeEntities(workTicketOperateTimeEntities); - } - - - //7. 工作票负责人变更 - WorkTicketPrincipalChangeEntity workTicketPrincipalChangeEntity = - workTicketPrincipalChangeService.selectByTicketId(ticketId); - if (ObjectUtils.isNotEmpty(workTicketPrincipalChangeEntity)) { - //原负责人 - if (workTicketPrincipalChangeEntity.getInitialPrincipal() != null) { - workTicketPrincipalChangeEntity.setInitialPrincipalName( - UserCache.getUser(workTicketPrincipalChangeEntity.getInitialPrincipal()).getName() - ); - } - //变更负责人 - if (workTicketPrincipalChangeEntity.getChangePrincipal() != null) { - workTicketPrincipalChangeEntity.setChangePrincipalName( - UserCache.getUser(workTicketPrincipalChangeEntity.getChangePrincipal()).getName() - ); - } - - workTicketVo.setWorkTicketPrincipalChange(workTicketPrincipalChangeEntity); - } - - - //7. 根据工作票Id查询工作票危险点分析及控制措施票 - List list = ticketInfoDangerService.selectAllByTicket(workTicketInfo.getId()); - if (CollectionUtils.isNotEmpty(list)) { - workTicketVo.setTicketInfoDangers(list); - } - return workTicketVo; - } -} +public class WorkTicketServiceImpl extends BaseServiceImpl implements WorkTicketService { +} \ No newline at end of file From be85aa59e8d6361d87ffc0b4e7c5fb55ebcf290d Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Wed, 7 Jun 2023 11:03:43 +0800 Subject: [PATCH 12/14] =?UTF-8?q?#=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=8A=BD=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hnac/hzims/scheduled/service/equipment/impl/PlanServiceImpl.java | 2 ++ .../scheduled/service/equipment/impl/WorkshopInfoServiceImpl.java | 3 ++- .../hzims/scheduled/service/ticket/impl/TicketEvaluateServiceImpl.java | 2 ++ .../hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java | 2 ++ .../hzims/scheduled/service/ticket/impl/WorkTicketServiceImpl.java | 2 ++ 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/PlanServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/PlanServiceImpl.java index 1091c99..56cc7ca 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/PlanServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/PlanServiceImpl.java @@ -1,5 +1,6 @@ package com.hnac.hzims.scheduled.service.equipment.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.hnac.hzims.equipment.entity.PlanGenerationEntity; import com.hnac.hzims.scheduled.mapper.equipment.PlanMapper; import com.hnac.hzims.scheduled.service.equipment.PlanService; @@ -16,6 +17,7 @@ import java.util.List; @Service @Slf4j @AllArgsConstructor +@DS("equipment") public class PlanServiceImpl extends BaseServiceImpl implements PlanService { diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/WorkshopInfoServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/WorkshopInfoServiceImpl.java index 20aed9a..d7ae08f 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/WorkshopInfoServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/WorkshopInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.hnac.hzims.scheduled.service.equipment.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.hnac.hzims.equipment.entity.WorkshopInfoEntity; import com.hnac.hzims.scheduled.mapper.equipment.WorkshopInfoMapper; import com.hnac.hzims.scheduled.service.equipment.WorkshopInfoService; @@ -14,7 +15,7 @@ import org.springframework.stereotype.Service; @Service @AllArgsConstructor @Slf4j +@DS("equipment") public class WorkshopInfoServiceImpl extends BaseServiceImpl implements WorkshopInfoService { - } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketEvaluateServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketEvaluateServiceImpl.java index 1bd217e..253f645 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketEvaluateServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketEvaluateServiceImpl.java @@ -1,5 +1,6 @@ package com.hnac.hzims.scheduled.service.ticket.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.hnac.hzims.scheduled.mapper.ticket.TicketEvaluateMapper; import com.hnac.hzims.scheduled.service.ticket.TicketEvaluateService; import com.hnac.hzims.ticket.allTicket.entity.TicketInfoEvaluateEntity; @@ -14,6 +15,7 @@ import org.springframework.stereotype.Service; @Service @RequiredArgsConstructor @Slf4j +@DS("ticket") public class TicketEvaluateServiceImpl extends BaseServiceImpl implements TicketEvaluateService { diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java index 1ef4c4d..5e3bab9 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java @@ -1,5 +1,6 @@ package com.hnac.hzims.scheduled.service.ticket.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.hnac.hzims.scheduled.mapper.ticket.TicketMapper; import com.hnac.hzims.scheduled.service.ticket.TicketEvaluateService; @@ -28,6 +29,7 @@ import java.util.stream.Collectors; @Service @RequiredArgsConstructor @Slf4j +@DS("ticket") public class TicketServiceImpl extends BaseServiceImpl implements TicketService { private final WorkTicketService workTicketService; diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkTicketServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkTicketServiceImpl.java index 8c13e28..d859eeb 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkTicketServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkTicketServiceImpl.java @@ -1,5 +1,6 @@ package com.hnac.hzims.scheduled.service.ticket.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.hnac.hzims.scheduled.mapper.ticket.WorkTicketMapper; import com.hnac.hzims.scheduled.service.ticket.WorkTicketService; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity; @@ -15,5 +16,6 @@ import org.springframework.stereotype.Service; @Service @Slf4j @RequiredArgsConstructor +@DS("ticket") public class WorkTicketServiceImpl extends BaseServiceImpl implements WorkTicketService { } \ No newline at end of file From b904a9fb7ca37af5abe1fe69bca3e8b0418c410a Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Wed, 7 Jun 2023 14:32:28 +0800 Subject: [PATCH 13/14] =?UTF-8?q?#=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=8A=BD=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzims/operational/report/vo/DutyDefectVO.java | 20 + .../hzims/scheduled/mapper/inspect/TaskMapper.java | 13 + .../mapper/operation/PhenomenonMapper.java | 11 + .../mapper/safeproduct/CompanyMapper.java | 10 + .../mapper/safeproduct/InstanceMapper.java | 16 + .../scheduled/mapper/safeproduct/MonthMapper.java | 11 + .../scheduled/mapper/safeproduct/TrialMapper.java | 11 + .../scheduled/scheduled/MonitorScheduledTask.java | 4 +- .../scheduled/scheduled/ReportScheduledTask.java | 26 + .../scheduled/service/inspect/TaskService.java | 15 + .../service/inspect/impl/TaskServiceImpl.java | 64 +++ .../scheduled/service/operation/AccessService.java | 3 + .../service/operation/MaintenanceService.java | 3 + .../service/operation/MonitorService.java | 4 + .../service/operation/PhenomenonService.java | 15 + .../scheduled/service/operation/ReportService.java | 9 + .../service/operation/impl/AccessServiceImpl.java | 37 +- .../operation/impl/MaintenanceServiceImpl.java | 38 ++ .../operation/impl/PhenomenonServiceImpl.java | 60 +++ .../operation/impl/RealTargetServiceImpl.java | 1 - .../service/operation/impl/ReportServiceImpl.java | 527 +++++++++++++++++++++ .../service/safeproduct/CompanyService.java | 11 + .../service/safeproduct/InstanceService.java | 12 + .../service/safeproduct/MonthService.java | 14 + .../service/safeproduct/TrialService.java | 13 + .../safeproduct/impl/CompanyServiceImpl.java | 19 + .../safeproduct/impl/InstanceServiceImpl.java | 19 + .../service/safeproduct/impl/MonthServiceImpl.java | 96 ++++ .../service/safeproduct/impl/TrialServiceImpl.java | 50 ++ .../scheduled/service/ticket/TicketService.java | 4 + .../service/ticket/impl/TicketServiceImpl.java | 62 +++ .../main/resources/mapper/inspect/TaskMapper.xml | 4 + .../mapper/operation/PhenomenonMapper.xml | 5 + .../resources/mapper/safeproduct/CompanyMapper.xml | 6 + .../mapper/safeproduct/InstanceMapper.xml | 5 + .../resources/mapper/safeproduct/MonthMapper.xml | 5 + .../resources/mapper/safeproduct/TrialMapper.xml | 20 + .../hzims/operational/report/vo/DutyDefectVO.java | 17 - .../mapper/CheckItemInstanceMapper.java | 16 - .../safeproduct/mapper/CheckItemInstanceMapper.xml | 20 - .../service/impl/CheckItemServiceImpl.java | 3 - 41 files changed, 1239 insertions(+), 60 deletions(-) create mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/DutyDefectVO.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskMapper.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/PhenomenonMapper.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/safeproduct/CompanyMapper.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/safeproduct/InstanceMapper.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/safeproduct/MonthMapper.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/safeproduct/TrialMapper.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/PhenomenonService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/ReportService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/PhenomenonServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/ReportServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/CompanyService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/InstanceService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/MonthService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/TrialService.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/CompanyServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/InstanceServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/MonthServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/TrialServiceImpl.java create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskMapper.xml create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/operation/PhenomenonMapper.xml create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/safeproduct/CompanyMapper.xml create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/safeproduct/InstanceMapper.xml create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/safeproduct/MonthMapper.xml create mode 100644 hzims-service/hzims-scheduled/src/main/resources/mapper/safeproduct/TrialMapper.xml delete mode 100644 hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/vo/DutyDefectVO.java delete mode 100644 hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CheckItemInstanceMapper.java delete mode 100644 hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CheckItemInstanceMapper.xml diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/DutyDefectVO.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/DutyDefectVO.java new file mode 100644 index 0000000..177185d --- /dev/null +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/DutyDefectVO.java @@ -0,0 +1,20 @@ +package com.hnac.hzims.operational.report.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author ysj + */ +@Data +public class DutyDefectVO{ + + @ApiModelProperty("缺陷总数") + private Integer defectSum; + + @ApiModelProperty("缺陷数") + private Integer defect; + + @ApiModelProperty("缺陷总数ID 按逗号分隔") + private String totalIds; +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskMapper.java new file mode 100644 index 0000000..1a4a34b --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskMapper.java @@ -0,0 +1,13 @@ +package com.hnac.hzims.scheduled.mapper.inspect; + +import com.hnac.hzinfo.inspect.task.entity.TaskEntity; +import org.apache.ibatis.annotations.Mapper; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + +/** + * @author ysj + */ +@Mapper +public interface TaskMapper extends UserDataScopeBaseMapper { + +} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/PhenomenonMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/PhenomenonMapper.java new file mode 100644 index 0000000..58eebab --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/PhenomenonMapper.java @@ -0,0 +1,11 @@ +package com.hnac.hzims.scheduled.mapper.operation; + +import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + +/** + * @author ysj + */ +public interface PhenomenonMapper extends UserDataScopeBaseMapper { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/safeproduct/CompanyMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/safeproduct/CompanyMapper.java new file mode 100644 index 0000000..00aa8a5 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/safeproduct/CompanyMapper.java @@ -0,0 +1,10 @@ +package com.hnac.hzims.scheduled.mapper.safeproduct; + +import com.hnac.hzims.safeproduct.entity.CheckCompanyEntity; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + +/** + * @author ysj + */ +public interface CompanyMapper extends UserDataScopeBaseMapper { +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/safeproduct/InstanceMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/safeproduct/InstanceMapper.java new file mode 100644 index 0000000..1dedec0 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/safeproduct/InstanceMapper.java @@ -0,0 +1,16 @@ +package com.hnac.hzims.scheduled.mapper.safeproduct; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hnac.hzims.safeproduct.entity.CheckItemInstanceEntity; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * Created by Sam Huang 2022/5/6 8:23 + */ +public interface InstanceMapper extends BaseMapper { + + List getCheckItemInstanceByMonth(@Param("months") List months, @Param("deptId") Long deptId); + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/safeproduct/MonthMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/safeproduct/MonthMapper.java new file mode 100644 index 0000000..4454508 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/safeproduct/MonthMapper.java @@ -0,0 +1,11 @@ +package com.hnac.hzims.scheduled.mapper.safeproduct; + +import com.hnac.hzims.safeproduct.entity.CheckMonthEntity; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + +/** + * @author ysj + */ +public interface MonthMapper extends UserDataScopeBaseMapper { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/safeproduct/TrialMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/safeproduct/TrialMapper.java new file mode 100644 index 0000000..04496f0 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/safeproduct/TrialMapper.java @@ -0,0 +1,11 @@ +package com.hnac.hzims.scheduled.mapper.safeproduct; + +import com.hnac.hzims.safeproduct.entity.SafeEquipmentTrialEntity; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + +/** + * 设备试验mapper接口 + */ +public interface TrialMapper extends UserDataScopeBaseMapper { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/MonitorScheduledTask.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/MonitorScheduledTask.java index ed0af83..6e5a0e9 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/MonitorScheduledTask.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/MonitorScheduledTask.java @@ -42,7 +42,7 @@ public class MonitorScheduledTask { */ @XxlJob(REAL_TIME_DATA) //@Scheduled(cron = "0/40 * * * * ? ") - public ReturnT loadRealData(String param) throws Exception { + public ReturnT loadRealData(String param) { if (Func.isBlank(param)) { param = DateUtil.format(new Date(), "yyyy-MM"); } @@ -55,7 +55,7 @@ public class MonitorScheduledTask { * @return ReturnT */ @XxlJob(CENTRALIZED_MONITORING) - public ReturnT loadMonitoring(String param) throws Exception { + public ReturnT loadMonitoring(String param) { if (Func.isBlank(param)) { param = DateUtil.format(new Date(), "yyyy-MM"); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ReportScheduledTask.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ReportScheduledTask.java index b5d19a6..7f59697 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ReportScheduledTask.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ReportScheduledTask.java @@ -1,8 +1,18 @@ package com.hnac.hzims.scheduled.scheduled; +import com.hnac.hzims.scheduled.service.operation.ReportService; +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.Date; + +import static com.hnac.hzims.operational.main.constant.MainConstants.AREA_MONTH_REPORT; + /** * @author ysj @@ -11,4 +21,20 @@ import org.springframework.stereotype.Component; @Component public class ReportScheduledTask { + @Autowired + private ReportService service; + + /** + * 首页-生产月报表 + * @return ReturnT + */ + @XxlJob(AREA_MONTH_REPORT) + public ReturnT loadMonthReport(String param) { + if (Func.isBlank(param)) { + param = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"); + } + service.loadMonthReport(param,1); + return new ReturnT<>("SUCCESS"); + } + } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskService.java new file mode 100644 index 0000000..6d25531 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskService.java @@ -0,0 +1,15 @@ +package com.hnac.hzims.scheduled.service.inspect; + +import com.hnac.hzinfo.inspect.task.entity.TaskEntity; +import com.hnac.hzinfo.inspect.task.vo.DutyInspectTaskVO; +import org.springblade.core.mp.base.BaseService; + +import java.util.List; + +/** + * @author ysj + */ +public interface TaskService extends BaseService { + + DutyInspectTaskVO task(String start, String end, List areas); +} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskServiceImpl.java new file mode 100644 index 0000000..6fcc206 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskServiceImpl.java @@ -0,0 +1,64 @@ +package com.hnac.hzims.scheduled.service.inspect.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.hnac.hzims.scheduled.mapper.inspect.TaskMapper; +import com.hnac.hzims.scheduled.service.inspect.TaskService; +import com.hnac.hzinfo.inspect.task.entity.TaskEntity; +import com.hnac.hzinfo.inspect.task.vo.DutyInspectTaskVO; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.CollectionUtil; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author ysj + */ +@Service +@Slf4j +@AllArgsConstructor +public class TaskServiceImpl extends BaseServiceImpl implements TaskService { + + /** + * 时间区间机构的巡检任务数据查询 + * @param start + * @param end + * @param areas + * @return + */ + @Override + public DutyInspectTaskVO task(String start, String end, List areas) { + DutyInspectTaskVO task = new DutyInspectTaskVO(); + task.setInspectTaskSum(0); + task.setInspectTaskFinish(0); + task.setNotExecuteTaskCount(0); + // 查询所有巡检任务 + List tasks = this.list(new LambdaQueryWrapper() {{ + ge(TaskEntity::getPlanStartTime, start) + .le(TaskEntity::getPlanStartTime, end) + .in(TaskEntity::getCreateDept, areas); + }}); + if(CollectionUtil.isEmpty(tasks)){ + return task; + } + task.setInspectTaskIds(tasks.stream().map(TaskEntity::getId).map(Object::toString).collect(Collectors.joining(","))); + task.setInspectTaskSum(tasks.size()); + // 所有处理完成巡检任务 + List finshList = tasks.stream().filter(o-> null != o.getStatus() && o.getStatus().equals(3)).collect(Collectors.toList()); + if(CollectionUtil.isEmpty(finshList)){ + return task; + } + task.setInspectTaskFinish(finshList.size()); + // 未执行任务数 + List notExecuteList = tasks.stream().filter(o-> null != o.getStatus() && o.getStatus().equals(0)).collect(Collectors.toList()); + if(CollectionUtil.isEmpty(notExecuteList)){ + return task; + } + task.setNotExecuteTaskCount(notExecuteList.size()); + return task; + } +} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/AccessService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/AccessService.java index f42d943..9a2d858 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/AccessService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/AccessService.java @@ -1,6 +1,7 @@ package com.hnac.hzims.scheduled.service.operation; import com.hnac.hzims.operational.access.entity.OperAccessTaskEntity; +import com.hnac.hzims.operational.main.vo.OverhaulVo; import org.springblade.core.mp.base.BaseService; import java.util.List; @@ -11,4 +12,6 @@ import java.util.List; public interface AccessService extends BaseService { double accessCount(List areas); + + OverhaulVo overhaul(String start, String end, List areas); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/MaintenanceService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/MaintenanceService.java index 49b4012..31d2be0 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/MaintenanceService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/MaintenanceService.java @@ -1,5 +1,6 @@ package com.hnac.hzims.scheduled.service.operation; +import com.hnac.hzims.operational.main.vo.MaintainVo; import com.hnac.hzims.operational.maintenance.entity.OperMaintenanceTaskEntity; import org.springblade.core.mp.base.BaseService; @@ -12,4 +13,6 @@ public interface MaintenanceService extends BaseService departList); + + MaintainVo maintain(String start, String end, List areas); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/MonitorService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/MonitorService.java index d9bfd85..5df3786 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/MonitorService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/MonitorService.java @@ -1,5 +1,9 @@ package com.hnac.hzims.scheduled.service.operation; +import org.springblade.core.tool.api.R; + +import java.util.Map; + /** * WEB水电站首页接口 * @author ysj diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/PhenomenonService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/PhenomenonService.java new file mode 100644 index 0000000..fe294d8 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/PhenomenonService.java @@ -0,0 +1,15 @@ +package com.hnac.hzims.scheduled.service.operation; + +import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity; +import com.hnac.hzims.operational.report.vo.DutyDefectVO; +import org.springblade.core.mp.base.BaseService; + +import java.util.List; + +/** + * @author ysj + */ +public interface PhenomenonService extends BaseService { + + DutyDefectVO defect(String start, String end, List areas); +} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/ReportService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/ReportService.java new file mode 100644 index 0000000..2fe62ac --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/ReportService.java @@ -0,0 +1,9 @@ +package com.hnac.hzims.scheduled.service.operation; + +/** + * @author ysj + */ +public interface ReportService { + + void loadMonthReport(String param, int i); +} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/AccessServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/AccessServiceImpl.java index 1a1fb7c..da01d8e 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/AccessServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/AccessServiceImpl.java @@ -1,20 +1,23 @@ package com.hnac.hzims.scheduled.service.operation.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.hnac.hzims.operational.access.constants.AccessConstants; import com.hnac.hzims.operational.access.entity.OperAccessTaskEntity; +import com.hnac.hzims.operational.main.vo.OverhaulVo; import com.hnac.hzims.scheduled.mapper.operation.AccessMapper; import com.hnac.hzims.scheduled.service.operation.AccessService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.utils.CollectionUtil; +import org.springblade.core.tool.utils.Func; import org.springframework.stereotype.Service; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; import java.util.List; - +import java.util.stream.Collectors; /** * @author ysj @@ -48,4 +51,36 @@ public class AccessServiceImpl extends BaseServiceImpl areas) { + OverhaulVo overhaulVo = new OverhaulVo(); + // 检修总数 + List overhaulList = this.list(new LambdaQueryWrapper(){{ + ge(OperAccessTaskEntity::getPlanStartTime,start); + le(OperAccessTaskEntity::getPlanStartTime,end); + in(OperAccessTaskEntity::getCreateDept,areas); + }}); + if(CollectionUtil.isEmpty(overhaulList)){ + overhaulVo.setOverhaul(0); + overhaulVo.setOverhaulFinish(0); + return overhaulVo; + } + overhaulVo.setOverhaul(overhaulList.size()); + // 检修完成数量 + List overhaulFinishTask = overhaulList.stream().filter(task-> Func.isNotEmpty(task.getStatus()) && AccessConstants.ACCESS_TASK_STATUS_4 == task.getStatus()) + .map(OperAccessTaskEntity::getId).collect(Collectors.toList()); + if(CollectionUtil.isEmpty(overhaulFinishTask)){ + overhaulVo.setOverhaulFinish(0); + } + overhaulVo.setOverhaulFinish(overhaulFinishTask.size()); + return overhaulVo; + } } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/MaintenanceServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/MaintenanceServiceImpl.java index 6ec8d3e..7152ace 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/MaintenanceServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/MaintenanceServiceImpl.java @@ -1,6 +1,8 @@ package com.hnac.hzims.scheduled.service.operation.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.hnac.hzims.operational.main.vo.MaintainVo; +import com.hnac.hzims.operational.maintenance.constants.MaintenanceConstant; import com.hnac.hzims.operational.maintenance.entity.OperMaintenanceTaskEntity; import com.hnac.hzims.scheduled.mapper.operation.MaintenanceMapper; import com.hnac.hzims.scheduled.service.operation.MaintenanceService; @@ -8,12 +10,14 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.utils.CollectionUtil; +import org.springblade.core.tool.utils.Func; import org.springframework.stereotype.Service; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; import java.util.List; +import java.util.stream.Collectors; /** * @author ysj @@ -47,4 +51,38 @@ public class MaintenanceServiceImpl extends BaseServiceImpl areas) { + MaintainVo maintainVo = new MaintainVo(); + //日常维护 + List maintainList = this.list(new LambdaQueryWrapper(){{ + ge(OperMaintenanceTaskEntity::getDisposeTime,start); + le(OperMaintenanceTaskEntity::getDisposeTime,end); + in(OperMaintenanceTaskEntity::getCreateDept,areas); + }}); + if(CollectionUtil.isEmpty(maintainList)){ + maintainVo.setMaintain(0); + maintainVo.setMaintainFinish(0); + return maintainVo; + } + // 日常维护完成数 + maintainVo.setMaintain(maintainList.size()); + List maintainFinish = maintainList.stream().filter(o-> Func.isNotEmpty(o.getStatus()) && MaintenanceConstant.TASK_STATUS_5 == o.getStatus()) + .map(OperMaintenanceTaskEntity::getId).collect(Collectors.toList()); + if(CollectionUtil.isEmpty(maintainFinish)){ + maintainVo.setMaintainFinish(0); + } + maintainVo.setMaintainFinish(maintainFinish.size()); + return maintainVo; + } + + } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/PhenomenonServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/PhenomenonServiceImpl.java new file mode 100644 index 0000000..4afdf08 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/PhenomenonServiceImpl.java @@ -0,0 +1,60 @@ +package com.hnac.hzims.scheduled.service.operation.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity; +import com.hnac.hzims.operational.report.vo.DutyDefectVO; +import com.hnac.hzims.scheduled.mapper.operation.PhenomenonMapper; +import com.hnac.hzims.scheduled.service.operation.PhenomenonService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.utils.CollectionUtil; +import org.springblade.core.tool.utils.Func; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author ysj + */ +@Service +@Slf4j +@AllArgsConstructor +public class PhenomenonServiceImpl extends BaseServiceImpl implements PhenomenonService { + + /** + * 时间范围内机构缺陷数据查询 + * @param start + * @param end + * @param areas + * @return + */ + @Override + public DutyDefectVO defect(String start, String end, List areas) { + DutyDefectVO defectVO = new DutyDefectVO(); + // 查询缺陷现象总数 + List operPhenomenonList = this.list(new LambdaQueryWrapper(){{ + ge(OperPhenomenonEntity::getCreateTime,start); + le(OperPhenomenonEntity::getCreateTime,end); + in(OperPhenomenonEntity::getCreateDept,areas); + }}); + if(CollectionUtil.isEmpty(operPhenomenonList)){ + defectVO.setDefectSum(0); + defectVO.setDefect(0); + return defectVO; + } + defectVO.setTotalIds(operPhenomenonList.stream().map(o->String.valueOf(o.getId())).collect(Collectors.joining(","))); + defectVO.setDefectSum(operPhenomenonList.size()); + // 消缺数 + List defectList = operPhenomenonList.stream().filter(o -> (Func.isNotEmpty(o.getIsDefect()) && o.getIsDefect() == 0) || "1".equals(o.getConclusionStatus())). + map(OperPhenomenonEntity::getId).collect(Collectors.toList()); + if(CollectionUtil.isEmpty(defectList)){ + defectVO.setDefect(0); + return defectVO; + } + // 缺陷总数 + defectVO.setDefect(defectList.size()); + return defectVO; + } +} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/RealTargetServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/RealTargetServiceImpl.java index c34da3f..6e08365 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/RealTargetServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/RealTargetServiceImpl.java @@ -82,7 +82,6 @@ public class RealTargetServiceImpl implements RealTargetService { private final static String loadwaterpump_target_key = "hzims:operation:loadwaterpump:target:key"; private final static String loadwaterpump_real_key = "hzims:operation:loadwaterpump:real:key"; private final static String loadwater_level_key = "hzims:operation:loadwater:level:key"; - private final static String loadwater_group_key = "hzims:operation:group:key"; private final static String load_photovoltaic_real_key = "hzims:operation:photovoltaic:real:key"; private final static String load_photovoltaic_target_key = "hzims:operation:photovoltaic:target:key"; diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/ReportServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/ReportServiceImpl.java new file mode 100644 index 0000000..df04ec4 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/ReportServiceImpl.java @@ -0,0 +1,527 @@ +package com.hnac.hzims.scheduled.service.operation.impl; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.google.common.util.concurrent.ThreadFactoryBuilder; +import com.hnac.hzims.equipment.entity.PlanGenerationEntity; +import com.hnac.hzims.message.dto.MailPushDto; +import com.hnac.hzims.message.fegin.IPushMsgClient; +import com.hnac.hzims.operational.main.constant.HomePageConstant; +import com.hnac.hzims.operational.main.vo.AreaMonthReportVo; +import com.hnac.hzims.operational.main.vo.MaintainVo; +import com.hnac.hzims.operational.main.vo.OverhaulVo; +import com.hnac.hzims.operational.report.vo.DutyDefectVO; +import com.hnac.hzims.operational.station.entity.StationEntity; +import com.hnac.hzims.safeproduct.dto.SafeEquipmentTrialDTO; +import com.hnac.hzims.scheduled.service.equipment.PlanService; +import com.hnac.hzims.scheduled.service.inspect.TaskService; +import com.hnac.hzims.scheduled.service.operation.*; +import com.hnac.hzims.scheduled.service.safeproduct.MonthService; +import com.hnac.hzims.scheduled.service.safeproduct.TrialService; +import com.hnac.hzims.scheduled.service.ticket.TicketService; +import com.hnac.hzims.ticket.workTicket.vo.TicketMonthVO; +import com.hnac.hzinfo.inspect.task.vo.DutyInspectTaskVO; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.MapUtils; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.CollectionUtil; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.ObjectUtil; +import org.springblade.core.tool.utils.StringUtil; +import org.springblade.system.entity.Dept; +import org.springblade.system.feign.ISysClient; +import org.springblade.system.user.entity.User; +import org.springblade.system.user.feign.IUserClient; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.*; +import java.util.concurrent.*; +import java.util.stream.Collectors; + +/** + * @author ysj + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class ReportServiceImpl implements ReportService { + + private final PlanService planService; + private final TaskService taskService; + private final TrialService trialService; + private final AccessService accessService; + private final TicketService ticketService; + private final StationService stationService; + private final MonthService monthService; + private final PhenomenonService phenomenonService; + private final MaintenanceService maintenanceService; + private final RedisTemplate redisTemplate; + private final ISysClient sysClient; + private final IUserClient userClient; + private final IPushMsgClient pushMsgClient; + + private final static String recent_year_cache_final = "hzims:operation:key:power:data"; + + @Value("${hzims.operation.area.report}") + private String report_month_cache_final; + + + /** + * 区域-月报 + * @param param + * @param year + */ + @Override + public void loadMonthReport(String param, int year) { + // 获取所有机构 + R> R = sysClient.getDeptList(); + if (!R.isSuccess() || CollectionUtil.isEmpty(R.getData())) { + return; + } + // 查询所有服务类型——"运维服务"、站点类型——"水电站" + List stations = stationService.list(Wrappers.lambdaQuery() + .eq(StationEntity::getServeType,HomePageConstant.HYDROPOWER_SERVETYPE) + .eq(StationEntity::getType,HomePageConstant.HYDROPOWER) + ); + if (CollectionUtil.isEmpty(stations)) { + return; + } + // 站点近年发电数据 + Map> powerMap = (Map>) redisTemplate.opsForValue().get(recent_year_cache_final); + // 存储数据节点 key - 月份 value - 区域数据集合 + Map> map = new HashMap<>(); + // 月份集合 + List monthList = getMonthList(year, Calendar.getInstance().get(Calendar.MONTH)); + monthList.forEach(mon -> { + List list = this.getAreaReportByMon(R.getData(), powerMap, stations, mon); + if (CollectionUtil.isEmpty(list)) { + return; + } + map.put(mon, list); + }); + // 推送当月报表邮件 + this.sendMonthReport(map, R.getData()); + redisTemplate.opsForValue().set(report_month_cache_final, map); + } + + /** + * 获取近年月份集合 + * + * @param year + * @return + */ + public static List getMonthList(int year, int endMoth) { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM"); + // 开始日期 + Calendar endCal = Calendar.getInstance(); + endCal.setTime(new Date()); + endCal.add(Calendar.MONTH, -endCal.get(Calendar.MONTH) + endMoth); + endCal.add(Calendar.DATE, -endCal.get(Calendar.DATE) + 1); + + // 结束日期 + Calendar startCal = Calendar.getInstance(); + startCal.setTime(new Date()); + startCal.set(Calendar.YEAR, startCal.get(Calendar.YEAR) - year); + startCal.add(Calendar.MONTH, -startCal.get(Calendar.MONTH)); + startCal.add(Calendar.DATE, -startCal.get(Calendar.DATE) + 1); + // 获取日期之间的月份 + List list = new ArrayList<>(); + while (endCal.after(startCal)) { + list.add(format.format(startCal.getTime())); + startCal.add(Calendar.MONTH, 1); + } + list.add(format.format(endCal.getTime())); + return list; + } + + /** + * 区域月报数据加载 + * @param deptList + * @param powerMap + * @param stationList + * @param mon + * @return + */ + private List getAreaReportByMon(List deptList, Map> powerMap, List stationList, String mon) { + LocalDateTime startTime = LocalDateTime.parse(mon + "-01 00:00:00", DateUtil.DATETIME_FORMATTER); + LocalDateTime endTime = getEndTime(mon); + // 查询所有站点的计划发电量 + List planList = this.planPower(stationList, mon); + // 站点实际发电量 + Map actualMap = this.actualPower(powerMap, stationList, mon + "-01"); + // 站点去年发电量 + Map oldActualMap = this.actualPower(powerMap, stationList, lastyear(1,mon)); + // 站点前发电量 + Map oldOldActualMap = this.actualPower(powerMap, stationList, lastyear(2,mon)); + // 取机构中区域部分 + List areaList = deptList.stream().filter(o -> o.getDeptCategory().equals(3)).collect(Collectors.toList()); + if (CollectionUtil.isEmpty(areaList)) { + return null; + } + List areaMonthReportVoList = new ArrayList<>(); + areaList.forEach(area -> { + AreaMonthReportVo areaMonthReport = new AreaMonthReportVo(); + areaMonthReport.setAreaId(area.getId()); + areaMonthReport.setAreaName(area.getDeptName()); + // 获取区域下的站点 + List stationIdList = deptList.stream().filter(o -> o.getParentId().equals(area.getId()) && o.getDeptCategory().equals(4)).map(Dept::getId).collect(Collectors.toList()); + List areaStationList = stationList.stream().filter(o -> stationIdList.contains(o.getRefDept())).collect(Collectors.toList()); + if (CollectionUtil.isEmpty(areaStationList)) { + return; + } + // 计划发电量、实际发电量、发电完成率 + this.powerMonth(planList, actualMap, oldActualMap, areaStationList, areaMonthReport); + // 操作票、操作票合格率/ 工作票、工作票合格率 + this.doubleMonth(area, areaMonthReport, mon + "-01 00:00:00", this.strEndTime(mon)); + // 日常维护、巡检任务、缺陷数、消缺率、检修任务 + this.taskMonth(Collections.singletonList(area.getId()), areaMonthReport, mon + "-01 00:00:00", strEndTime(mon)); + // 预测 + this.predictPlanPower(oldActualMap,oldOldActualMap,areaStationList,areaMonthReport); + // 安全生产会议次数、月度检查报告、技能培训、安全大检查 + this.securityCheck(Collections.singletonList(area.getId()),areaMonthReport,mon + "-01 00:00:00", strEndTime(mon)); + // 设备试验 + this.getDeviceTry(mon + "-01 00:00:00", strEndTime(mon), Collections.singletonList(area.getId()),areaMonthReport); + areaMonthReportVoList.add(areaMonthReport); + }); + return areaMonthReportVoList; + } + + /** + * 获取结束时间 + */ + private LocalDateTime getEndTime(String mon) { + Date date = DateUtil.parse(mon + "-01 00:00:00",DateUtil.DATETIME_FORMAT); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.add(Calendar.MONTH, 1); + return calendar.getTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(); + } + + /** + * 获取站点计划发电量 + */ + private List planPower(List stationList, String mon) { + List list = stationList.stream().map(StationEntity::getCode).collect(Collectors.toList()); + return planService.planGeneration(list, null, mon); + } + + /** + * 获取站点月份实际发电量 + */ + private Map actualPower(Map> powerMap, List stationList, String month) { + if (MapUtils.isEmpty(powerMap)) { + return null; + } + // 站点Id集合 + List stationIdList = stationList.stream().map(StationEntity::getId).collect(Collectors.toList()); + // 存储站点实际发电量 + Map actualPowerMap = new HashMap<>(); + stationIdList.forEach(key -> { + Map monthMap = powerMap.get(key); + if (MapUtils.isEmpty(monthMap)) { + return; + } + float actualPower = 0f; + if(ObjectUtil.isNotEmpty(monthMap.get(month))){ + actualPower = monthMap.get(month); + } + actualPowerMap.put(key, actualPower); + }); + return actualPowerMap; + } + + /** + * 获取去年时间 + */ + private String lastyear(int year,String mon) { + Date date = DateUtil.parse(mon + "-01 00:00:00",DateUtil.DATETIME_FORMAT); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR) - year); + calendar.add(Calendar.DATE, -calendar.get(Calendar.DATE) + 1); + return DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATE); + } + + /** + * 获取结束时间 + */ + private String strEndTime(String mon) { + Date date = DateUtil.parse(mon + "-01 00:00:00",DateUtil.DATETIME_FORMAT); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.add(Calendar.MONTH, 1); + return DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATE); + } + + /** + * 区域-月计划发电量、月实际发电量、月发电完成率、同比 + * + * @param planList + * @param actualMap + * @param oldActualMap + * @param areaStationList + * @param areaMonthReport + */ + private void powerMonth(List planList, Map actualMap, Map oldActualMap, List areaStationList, AreaMonthReportVo areaMonthReport) { + // 计划发电量 + List codeList = areaStationList.stream().map(StationEntity::getCode).collect(Collectors.toList()); + double planPower = planList.stream().filter(o -> codeList.contains(o.getStationId())).mapToDouble(PlanGenerationEntity::getPlanGeneration).sum(); + areaMonthReport.setPlanPower(Float.parseFloat(String.valueOf(planPower))); + if (MapUtils.isEmpty(actualMap)) { + areaMonthReport.setActualPower(0f); + areaMonthReport.setPowerFinishRate(0.0); + return; + } + // 实际发电量 + List ids = areaStationList.stream().map(StationEntity::getId).collect(Collectors.toList()); + double actualPower = actualMap.entrySet().stream().filter(e -> ids.contains(e.getKey())).mapToDouble(Map.Entry::getValue).sum(); + areaMonthReport.setActualPower(Float.parseFloat(String.valueOf(actualPower))); + if (Math.abs(planPower) <= 0) { + areaMonthReport.setPowerFinishRate(0.0); + } else { + // 发电完成率 + double powerFinishRate = BigDecimal.valueOf(actualPower / planPower * 100).setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue(); + areaMonthReport.setPowerFinishRate(powerFinishRate); + } + // 同比 + double oldActualPower = oldActualMap.entrySet().stream().filter(e -> ids.contains(e.getKey())).mapToDouble(Map.Entry::getValue).sum(); + if (Math.abs(actualPower) <= 0 || Math.abs(oldActualPower) <= 0) { + areaMonthReport.setComparePowerRate(0.0); + return; + } + double comparePowerRate = BigDecimal.valueOf(actualPower / oldActualPower).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + areaMonthReport.setComparePowerRate(comparePowerRate); + } + + /** + * 区域-操作票、操作票合格率/ 工作票、工作票合格率 + * + * @param area + * @param areaMonthReport + */ + private void doubleMonth(Dept area, AreaMonthReportVo areaMonthReport, String startTime, String endTime) { + // 站点归属机构集合 + TicketMonthVO ticket = ticketService.operateWork(startTime,endTime,Collections.singletonList(area.getId())); + if (ObjectUtil.isEmpty(ticket)) { + areaMonthReport.setOperate(0); + areaMonthReport.setOperaQualifyRate(0.0); + areaMonthReport.setWork(0); + areaMonthReport.setWorkQualifyRate(0.0); + return; + } + // 操作票 + int operate = ticket.getOperate(); + int operateQualify = ticket.getOperateQualify(); + areaMonthReport.setOperate(operate); + if (operateQualify <= 0) { + areaMonthReport.setOperaQualifyRate(0.0); + } else { + double operateQualifyRate = BigDecimal.valueOf(operateQualify / (double) operate * 100L).setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue(); + areaMonthReport.setOperaQualifyRate(operateQualifyRate); + } + //工作票 + int work = ticket.getWork(); + int workQualify = ticket.getWorkQualify(); + areaMonthReport.setWork(work); + if (workQualify <= 0) { + areaMonthReport.setWorkQualifyRate(0.0); + } else { + double workQualifyRate = BigDecimal.valueOf(workQualify / (double) work * 100L).setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue(); + areaMonthReport.setWorkQualifyRate(workQualifyRate); + } + } + + /** + * 任务月报-日常维护、巡检任务、缺陷数、消缺率、检修任务 + * + * @param areas + * @param areaMonthReport + */ + private void taskMonth(List areas, AreaMonthReportVo areaMonthReport, String startTime, String endTime) { + //通过线程池异步获取月报各模块内容 主要分为五块内容 + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder().setNameFormat("area_month_report-pool-%d").build(); + ExecutorService exe = new ThreadPoolExecutor(4, 4, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + //监控线程执行完后返回结果 + CountDownLatch countDownLatch = new CountDownLatch(4); + // 日常维护 + exe.execute(() -> { + MaintainVo maintainVo = maintenanceService.maintain(startTime, endTime, areas); + int maintainSum = maintainVo.getMaintain(); + areaMonthReport.setRoutineMaintenance(maintainSum); + countDownLatch.countDown(); + }); + + // 巡检任务 + exe.execute(() -> { + DutyInspectTaskVO task = taskService.task(startTime,endTime,areas); + if (ObjectUtil.isEmpty(task)) { + areaMonthReport.setInspect(0); + } else { + int inspect = task.getInspectTaskSum(); + areaMonthReport.setInspect(inspect); + } + countDownLatch.countDown(); + }); + + // 消缺 + exe.execute(() -> { + DutyDefectVO defectVO = phenomenonService.defect(startTime, endTime, areas); + int defectSum = defectVO.getDefectSum(); + int defect = defectVO.getDefect(); + areaMonthReport.setDefect(defectSum); + if (defectSum <= 0) { + areaMonthReport.setDefectRate(0.0); + } else { + double deletionRate = BigDecimal.valueOf(defect / defectSum * 100L).setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue(); + areaMonthReport.setDefectRate(deletionRate); + } + countDownLatch.countDown(); + }); + + // 检修 + exe.execute(() -> { + OverhaulVo overhaulVo = accessService.overhaul(startTime, endTime, areas); + int overhaul = overhaulVo.getOverhaul(); + areaMonthReport.setMaintenanceTasks(overhaul); + countDownLatch.countDown(); + }); + + //所有模板数据获取完成后释放锁 + try { + countDownLatch.await(); + } catch (InterruptedException e) { + e.printStackTrace(); + Thread.currentThread().interrupt(); + } + exe.shutdown(); + } + + /** + * 预测发电量 + * @param oldActualMap + * @param oldOldActualMap + * @param areaStationList + * @param areaMonthReport + */ + private void predictPlanPower(Map oldActualMap, Map oldOldActualMap, List areaStationList, AreaMonthReportVo areaMonthReport) { + areaMonthReport.setPredictPlanPower(0.0); + // 实际发电量 + List ids = areaStationList.stream().map(StationEntity::getId).collect(Collectors.toList()); + if(CollectionUtil.isEmpty(ids)){ + return; + } + double oldActualPower = oldActualMap.entrySet().stream().filter(e -> ids.contains(e.getKey())).mapToDouble(Map.Entry::getValue).sum(); + double oldOldActualPower = oldOldActualMap.entrySet().stream().filter(e -> ids.contains(e.getKey())).mapToDouble(Map.Entry::getValue).sum(); + if(Math.abs(oldActualPower) <= 0 && Math.abs(oldOldActualPower) <= 0 ){ + return; + } + double predictPlanPower = BigDecimal.valueOf((oldActualPower + oldOldActualPower) / 2).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + areaMonthReport.setPredictPlanPower(predictPlanPower); + } + + /** + * 安全检查 + * @param areas + * @param areaMonthReport + * @param startTime + * @param endTime + */ + private void securityCheck(List areas, AreaMonthReportVo areaMonthReport,String startTime,String endTime) { + areaMonthReport.setSafetyMeeting(0); + areaMonthReport.setSelfReport(0); + areaMonthReport.setSkillTrainy(0); + areaMonthReport.setSecurityCheck(0); + // 站点归属机构集合 + Map map = new HashMap<>(); + map.put("startDate", startTime); + map.put("endDate", endTime); + map.put("deptList", areas); + // 调用安全大检查fegin接口 + Map count = monthService.check(map); + if(MapUtils.isEmpty(count)){ + return; + } + // 安全生产会议 + areaMonthReport.setSafetyMeeting((Integer) count.get("safetyMeetingNum")); + // 月度自查报告 + areaMonthReport.setSelfReport((Integer) count.get("monthCheckNum")); + // 技能培训 + areaMonthReport.setSkillTrainy((Integer) count.get("skillsTrainingNum")); + // 安全大检查 + areaMonthReport.setSecurityCheck((Integer) count.get("bigCheckNum")); + } + + /** + * 获取设备试验数据 + * @param startTime + * @param endTime + * @param areas + * @param areaMonthReport + */ + private void getDeviceTry(String startTime,String endTime,List areas,AreaMonthReportVo areaMonthReport) { + areaMonthReport.setDeviceTry(0); + SafeEquipmentTrialDTO request = new SafeEquipmentTrialDTO(); + request.setDeptList(areas); + request.setStartTime(startTime); + request.setEndTime(endTime); + areaMonthReport.setDeviceTry(trialService.count(request)); + } + + /** + * 推送当月月报 + * + * @param map + * @param list + */ + private void sendMonthReport(Map> map, List list) { + if (MapUtils.isEmpty(map) || CollectionUtil.isEmpty(list)) { + return; + } + // 获取邮件接收人 + Dept dept = list.stream().min(Comparator.comparing(Dept::getDeptCategory)).get(); + if(ObjectUtil.isEmpty(dept)){ + return; + } + R> userR = userClient.userListByDeptId(dept.getId()); + if(!userR.isSuccess() && CollectionUtil.isEmpty(userR.getData())){ + return; + } + List userList = userR.getData().stream().filter(o->dept.getId().equals(o.getCreateDept())).collect(Collectors.toList()); + if(CollectionUtil.isEmpty(userList)){ + return; + } + List mailList = userList.stream().map(User::getEmail).filter(StringUtil::isNotBlank).collect(Collectors.toList()); + if(CollectionUtil.isEmpty(mailList)){ + return; + } + // 获取月报数据 + List entityList = map.get(DateUtil.format(new Date(),"yyyy-MM")); + if (CollectionUtil.isEmpty(entityList)) { + return; + } + // 发送邮件 + MailPushDto pushDto = new MailPushDto(); + pushDto.setBusinessClassify("system"); + pushDto.setBusinessKey("Month_Report"); + pushDto.setSubject("水电站生产运行"); + Map param = new HashMap<>(); + param.put("templatePath", "/data/hzims/message/mail/template/stationRunMonthReport.html"); + Map parameters = new HashMap<>(); + parameters.put("data",entityList); + param.put("parameters", parameters); + pushDto.setExtras(param); + pushDto.setText("水电站生产运行月报内容"); + pushDto.setToAccount(mailList.toArray(new String[0])); + pushDto.setHtml(true); + pushDto.setCreateUser(userR.getData().get(0).getCreateUser()); + pushDto.setTenantId(dept.getTenantId()); + pushDto.setCreateDept(dept.getId()); + pushMsgClient.sendMail(pushDto); + } +} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/CompanyService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/CompanyService.java new file mode 100644 index 0000000..ecdb769 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/CompanyService.java @@ -0,0 +1,11 @@ +package com.hnac.hzims.scheduled.service.safeproduct; + +import com.hnac.hzims.safeproduct.entity.CheckCompanyEntity; +import org.springblade.core.mp.base.BaseService; + +/** + * @author ysj + */ +public interface CompanyService extends BaseService { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/InstanceService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/InstanceService.java new file mode 100644 index 0000000..0581c6f --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/InstanceService.java @@ -0,0 +1,12 @@ +package com.hnac.hzims.scheduled.service.safeproduct; + +import com.hnac.hzims.safeproduct.entity.CheckItemInstanceEntity; +import org.springblade.core.mp.base.BaseService; + +/** + * Created by Sam Huang 2022/5/6 8:28 + */ +public interface InstanceService extends BaseService { + + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/MonthService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/MonthService.java new file mode 100644 index 0000000..5582515 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/MonthService.java @@ -0,0 +1,14 @@ +package com.hnac.hzims.scheduled.service.safeproduct; + +import com.hnac.hzims.safeproduct.entity.CheckMonthEntity; +import org.springblade.core.mp.base.BaseService; + +import java.util.Map; + +/** + * @author ysj + */ +public interface MonthService extends BaseService { + + Map check(Map map); +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/TrialService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/TrialService.java new file mode 100644 index 0000000..c472c89 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/TrialService.java @@ -0,0 +1,13 @@ +package com.hnac.hzims.scheduled.service.safeproduct; + +import com.hnac.hzims.safeproduct.dto.SafeEquipmentTrialDTO; +import com.hnac.hzims.safeproduct.entity.SafeEquipmentTrialEntity; +import org.springblade.core.mp.base.BaseService; + +/** + * @author ysj + */ +public interface TrialService extends BaseService { + + int count(SafeEquipmentTrialDTO trial); +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/CompanyServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/CompanyServiceImpl.java new file mode 100644 index 0000000..7004ad3 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/CompanyServiceImpl.java @@ -0,0 +1,19 @@ +package com.hnac.hzims.scheduled.service.safeproduct.impl; + +import com.hnac.hzims.safeproduct.entity.CheckCompanyEntity; +import com.hnac.hzims.scheduled.mapper.safeproduct.CompanyMapper; +import com.hnac.hzims.scheduled.service.safeproduct.CompanyService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * @author ysj + */ +@Service +@AllArgsConstructor +@Slf4j +public class CompanyServiceImpl extends BaseServiceImpl implements CompanyService { + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/InstanceServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/InstanceServiceImpl.java new file mode 100644 index 0000000..1b44fa8 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/InstanceServiceImpl.java @@ -0,0 +1,19 @@ +package com.hnac.hzims.scheduled.service.safeproduct.impl; + +import com.hnac.hzims.safeproduct.entity.CheckItemInstanceEntity; +import com.hnac.hzims.scheduled.mapper.safeproduct.InstanceMapper; +import com.hnac.hzims.scheduled.service.safeproduct.InstanceService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * @author ysj + */ +@Service +@AllArgsConstructor +@Slf4j +public class InstanceServiceImpl extends BaseServiceImpl implements InstanceService { + +} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/MonthServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/MonthServiceImpl.java new file mode 100644 index 0000000..697e6c0 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/MonthServiceImpl.java @@ -0,0 +1,96 @@ +package com.hnac.hzims.scheduled.service.safeproduct.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.hnac.hzims.safeproduct.entity.CheckCompanyEntity; +import com.hnac.hzims.safeproduct.entity.CheckItemInstanceEntity; +import com.hnac.hzims.safeproduct.entity.CheckMonthEntity; +import com.hnac.hzims.scheduled.mapper.safeproduct.MonthMapper; +import com.hnac.hzims.scheduled.service.safeproduct.CompanyService; +import com.hnac.hzims.scheduled.service.safeproduct.InstanceService; +import com.hnac.hzims.scheduled.service.safeproduct.MonthService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.CollectionUtil; +import org.springblade.core.tool.utils.ObjectUtil; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; + +/** + * @author ysj + */ +@Service +@AllArgsConstructor +@Slf4j +public class MonthServiceImpl extends BaseServiceImpl implements MonthService { + + private final CompanyService companyService; + private final InstanceService instanceService; + + @Override + public Map check(Map map) { + if (ObjectUtil.isEmpty(map)) { + return null; + } + Map result = new HashMap<>(); + String startDate = (String) map.get("startDate"); + String endDate = (String) map.get("endDate"); + List deptList = (List) map.get("deptList"); + String startMonth = startDate.substring(0, 7); + String endMonth = endDate.substring(0, 7); + //月度自查次数 + Wrapper wrapper = new LambdaQueryWrapper() {{ + in(CheckMonthEntity::getCreateDept, deptList); + between(CheckMonthEntity::getMonth, startMonth, endMonth); + }}; + List monthList = this.list(wrapper); + result.put("monthCheckNum", monthList != null ? monthList.size() : 0); + //公司大检查次数 + Wrapper wrapper1 = new LambdaQueryWrapper() {{ + in(CheckCompanyEntity::getCreateDept, deptList); + ge(CheckCompanyEntity::getStartTime, startDate); + le(CheckCompanyEntity::getEndTime, endDate); + }}; + List companyList = companyService.list(wrapper1); + result.put("bigCheckNum", companyList != null ? companyList.size() : 0); + + AtomicInteger safetyMeetingNum = new AtomicInteger(0); + AtomicInteger skillsTrainingNum = new AtomicInteger(0); + + if (CollectionUtil.isNotEmpty(monthList)) { + monthList.forEach(checkMonthEntity -> { + Long checkId = checkMonthEntity.getId(); + Wrapper wrapper2 = new LambdaQueryWrapper() {{ + eq(CheckItemInstanceEntity::getCheckId, checkId); + }}; + List list = instanceService.list(wrapper2); + if (CollectionUtil.isNotEmpty(list)) { + list.forEach(instanceEntity -> { + //安全生产会议检查项，系统统计情况不为空纳入统计次数 + if ("现场每月1次安全生产会议".equals(instanceEntity.getItem())) { + if (StringUtils.isNotEmpty(instanceEntity.getSystemSituation())) { + safetyMeetingNum.addAndGet(1); + } + } + //技能培训检查项，系统统计情况不为空纳入统计次数 + if ("每月开展1次技能培训".equals(instanceEntity.getItem())) { + if (StringUtils.isNotEmpty(instanceEntity.getSystemSituation())) { + skillsTrainingNum.addAndGet(1); + } + } + }); + } + }); + } + result.put("safetyMeetingNum", safetyMeetingNum.get()); + result.put("skillsTrainingNum", skillsTrainingNum.get()); + return result; + } +} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/TrialServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/TrialServiceImpl.java new file mode 100644 index 0000000..37a2050 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/TrialServiceImpl.java @@ -0,0 +1,50 @@ +package com.hnac.hzims.scheduled.service.safeproduct.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.hnac.hzims.safeproduct.dto.SafeEquipmentTrialDTO; +import com.hnac.hzims.safeproduct.entity.SafeEquipmentTrialEntity; +import com.hnac.hzims.scheduled.mapper.safeproduct.TrialMapper; +import com.hnac.hzims.scheduled.service.safeproduct.TrialService; +import lombok.RequiredArgsConstructor; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.utils.CollectionUtil; +import org.springblade.core.tool.utils.ObjectUtil; +import org.springframework.stereotype.Service; + +import java.util.Optional; + +/** + * @author ysj + */ +@Service +@RequiredArgsConstructor +public class TrialServiceImpl extends BaseServiceImpl implements TrialService { + + /** + * 时间区间机构的设备实验数据查询 + * @param trial + * @return + */ + @Override + public int count(SafeEquipmentTrialDTO trial) { + if (ObjectUtil.isEmpty(trial)) { + return 0; + } + QueryWrapper queryWrapper = new QueryWrapper() {{ + if (CollectionUtil.isEmpty(trial.getDeptList())) { + if (Optional.ofNullable(trial.getCreateDept()).isPresent()) { + eq("create_dept", trial.getCreateDept()); + } + } else { + in("create_dept", trial.getDeptList()); + } + if (Optional.ofNullable(trial.getStartTime()).isPresent()) { + gt("create_time", trial.getStartTime()); + } + if (Optional.ofNullable(trial.getEndTime()).isPresent()) { + lt("create_time", trial.getEndTime()); + } + }}; + return this.baseMapper.selectCount(queryWrapper); + } +} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/TicketService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/TicketService.java index 5716e58..ff5e1ad 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/TicketService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/TicketService.java @@ -2,7 +2,9 @@ package com.hnac.hzims.scheduled.service.ticket; import com.hnac.hzims.ticket.allTicket.vo.DoublePassRateVO; import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity; +import com.hnac.hzims.ticket.workTicket.vo.TicketMonthVO; import org.springblade.core.mp.base.BaseService; +import org.springblade.core.tool.api.R; import java.time.LocalDateTime; import java.util.List; @@ -13,4 +15,6 @@ import java.util.List; public interface TicketService extends BaseService { DoublePassRateVO doublePassRate(List areas, LocalDateTime firstDateTime, LocalDateTime now); + + TicketMonthVO operateWork(String start, String end, List list); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java index 5e3bab9..62ef9a0 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java @@ -11,9 +11,11 @@ import com.hnac.hzims.ticket.allTicket.vo.DoublePassRateVO; import com.hnac.hzims.ticket.constants.TicketConstants; import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity; +import com.hnac.hzims.ticket.workTicket.vo.TicketMonthVO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.CollectionUtil; import org.springframework.stereotype.Service; @@ -85,4 +87,64 @@ public class TicketServiceImpl extends BaseServiceImpl list) { + TicketMonthVO ticket = new TicketMonthVO(); + // 操作票 + List operateList = this.list(new LambdaQueryWrapper() {{ + ge(StandardTicketInfoEntity::getCreateTime, start); + le(StandardTicketInfoEntity::getCreateTime, end); + in(StandardTicketInfoEntity::getCreateDept, list); + }}); + if (CollectionUtil.isEmpty(operateList)) { + ticket.setOperate(0); + ticket.setOperateQualify(0); + }else{ + ticket.setOperate(operateList.size()); + List operateIdList = operateList.stream().map(StandardTicketInfoEntity::getId).collect(Collectors.toList()); + // 查询合格评价 + List operateQualifyList = ticketEvaluateService.list(new LambdaQueryWrapper() {{ + in(TicketInfoEvaluateEntity::getTicketId, operateIdList); + eq(TicketInfoEvaluateEntity::getStatus, TicketConstants.TicketQualifiedEnum.Qualified.getCode()); + }}); + if (CollectionUtil.isEmpty(operateQualifyList)) { + ticket.setOperateQualify(0); + }else{ + ticket.setOperateQualify(operateQualifyList.size()); + } + } + // 工作票 + List works = workTicketService.list(new LambdaQueryWrapper() {{ + ge(WorkTicketInfoEntity::getCreateTime, start); + le(WorkTicketInfoEntity::getCreateTime, end); + in(WorkTicketInfoEntity::getCreateDept, list); + }}); + if (CollectionUtil.isEmpty(works)) { + ticket.setWork(0); + ticket.setWorkQualify(0); + }else{ + ticket.setWork(works.size()); + List workIds = works.stream().map(WorkTicketInfoEntity::getId).collect(Collectors.toList()); + // 查询合格评价 + List operateQualifyList = ticketEvaluateService.list(new LambdaQueryWrapper() {{ + in(TicketInfoEvaluateEntity::getTicketId, workIds); + eq(TicketInfoEvaluateEntity::getStatus, TicketConstants.TicketQualifiedEnum.Qualified.getCode()); + }}); + if (CollectionUtil.isEmpty(operateQualifyList)) { + ticket.setOperateQualify(0); + }else{ + ticket.setWorkQualify(operateQualifyList.size()); + } + } + return ticket; + } + } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskMapper.xml new file mode 100644 index 0000000..9acf610 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/PhenomenonMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/PhenomenonMapper.xml new file mode 100644 index 0000000..e12c289 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/PhenomenonMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/safeproduct/CompanyMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/safeproduct/CompanyMapper.xml new file mode 100644 index 0000000..63605a2 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/safeproduct/CompanyMapper.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/safeproduct/InstanceMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/safeproduct/InstanceMapper.xml new file mode 100644 index 0000000..1e19e05 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/safeproduct/InstanceMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/safeproduct/MonthMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/safeproduct/MonthMapper.xml new file mode 100644 index 0000000..38f7539 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/safeproduct/MonthMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/safeproduct/TrialMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/safeproduct/TrialMapper.xml new file mode 100644 index 0000000..6fec5d0 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/safeproduct/TrialMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/vo/DutyDefectVO.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/vo/DutyDefectVO.java deleted file mode 100644 index 3e95f23..0000000 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/vo/DutyDefectVO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hnac.hzims.operational.report.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class DutyDefectVO{ - - @ApiModelProperty("缺陷总数") - private Integer defectSum; - - @ApiModelProperty("缺陷数") - private Integer defect; - - @ApiModelProperty("缺陷总数ID 按逗号分隔") - private String totalIds; -} diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CheckItemInstanceMapper.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CheckItemInstanceMapper.java deleted file mode 100644 index b7c4ba8..0000000 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CheckItemInstanceMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hnac.hzims.safeproduct.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzims.safeproduct.entity.CheckItemInstanceEntity; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * Created by Sam Huang 2022/5/6 8:23 - */ -public interface CheckItemInstanceMapper extends BaseMapper { - - List getCheckItemInstanceByMonth(@Param("months") List months, @Param("deptId") Long deptId); - -} diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CheckItemInstanceMapper.xml b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CheckItemInstanceMapper.xml deleted file mode 100644 index 4e2231b..0000000 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CheckItemInstanceMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CheckItemServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CheckItemServiceImpl.java index 0a8eed5..b80c3d7 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CheckItemServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CheckItemServiceImpl.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.hnac.hzims.operational.duty.dto.ChangeShiftsReqDTO; import com.hnac.hzims.operational.duty.dto.ChangeShiftsRspDTO; -import com.hnac.hzims.operational.duty.entity.ImsDutyGroupEntity; import com.hnac.hzims.operational.duty.feign.IDutyRecClient; import com.hnac.hzims.operational.feign.IOperTaskClient; import com.hnac.hzims.safeproduct.dto.CheckItemDTO; @@ -27,7 +26,6 @@ import com.hnac.hzims.ticket.workTicket.feign.IOperateTicketClient; import com.hnac.hzims.ticket.workTicket.feign.ITicketInfoClient; import com.hnac.hzims.vo.SafeCheckStatisticVO; import com.hnac.hzinfo.inspect.task.feign.IInspectTaskClient; -import jodd.util.ArraysUtil; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; @@ -43,7 +41,6 @@ import org.springblade.system.feign.ISysClient; import org.springblade.system.user.cache.UserCache; import org.springblade.system.user.entity.User; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.lang.reflect.Field; import java.time.LocalDateTime; From 24cafe06c04f5bb26ded32525f3d2771fcb404f1 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Wed, 7 Jun 2023 14:36:36 +0800 Subject: [PATCH 14/14] =?UTF-8?q?#=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=8A=BD=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scheduled/mapper/safeproduct/InstanceMapper.java | 7 +------ .../safeproduct/mapper/CheckItemInstanceMapper.java | 16 ++++++++++++++++ .../safeproduct/mapper/CheckItemInstanceMapper.xml | 20 ++++++++++++++++++++ 3 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CheckItemInstanceMapper.java create mode 100644 hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CheckItemInstanceMapper.xml diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/safeproduct/InstanceMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/safeproduct/InstanceMapper.java index 1dedec0..3e3d781 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/safeproduct/InstanceMapper.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/safeproduct/InstanceMapper.java @@ -2,15 +2,10 @@ package com.hnac.hzims.scheduled.mapper.safeproduct; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hnac.hzims.safeproduct.entity.CheckItemInstanceEntity; -import org.apache.ibatis.annotations.Param; - -import java.util.List; /** - * Created by Sam Huang 2022/5/6 8:23 + * @author Lch */ public interface InstanceMapper extends BaseMapper { - List getCheckItemInstanceByMonth(@Param("months") List months, @Param("deptId") Long deptId); - } diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CheckItemInstanceMapper.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CheckItemInstanceMapper.java new file mode 100644 index 0000000..b7c4ba8 --- /dev/null +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CheckItemInstanceMapper.java @@ -0,0 +1,16 @@ +package com.hnac.hzims.safeproduct.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hnac.hzims.safeproduct.entity.CheckItemInstanceEntity; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * Created by Sam Huang 2022/5/6 8:23 + */ +public interface CheckItemInstanceMapper extends BaseMapper { + + List getCheckItemInstanceByMonth(@Param("months") List months, @Param("deptId") Long deptId); + +} diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CheckItemInstanceMapper.xml b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CheckItemInstanceMapper.xml new file mode 100644 index 0000000..4e2231b --- /dev/null +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CheckItemInstanceMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + +