From 2d0e0aef368c6568920d0f07622f1cd82232e459 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, 26 Jul 2023 09:18:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=80=BC=E7=8F=AD=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=B7=A5=E4=BD=9C=E6=B5=81=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=A4=E7=A5=A8=E7=BB=9F=E8=AE=A1=E5=90=88=E6=A0=BC=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/constant/TicketProcessConstant.java | 6 ++ .../serviceimpl/DealDutyRecFlowServiceImpl.java | 65 ++++++++++++++++++++++ .../service/impl/TicketCountServiceImpl.java | 29 ++++++---- .../hnac/hzims/ticket/utils/PercentCountUtils.java | 28 ++++++++++ 4 files changed, 118 insertions(+), 10 deletions(-) create mode 100644 hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/DealDutyRecFlowServiceImpl.java create mode 100644 hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/utils/PercentCountUtils.java diff --git a/hzims-service-api/middle-api/src/main/java/com/hnac/hzims/middle/process/constant/TicketProcessConstant.java b/hzims-service-api/middle-api/src/main/java/com/hnac/hzims/middle/process/constant/TicketProcessConstant.java index 43c409e..83c9aaa 100644 --- a/hzims-service-api/middle-api/src/main/java/com/hnac/hzims/middle/process/constant/TicketProcessConstant.java +++ b/hzims-service-api/middle-api/src/main/java/com/hnac/hzims/middle/process/constant/TicketProcessConstant.java @@ -46,4 +46,10 @@ public class TicketProcessConstant { */ public static final String OVERHAUL_TASK = "overhaul_task"; // public static final String DEFECT_KEY = "defectCheck"; + + + /** + * 值班计划 + */ + public static final String DUTY_REC = "duty_rec"; } diff --git a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/DealDutyRecFlowServiceImpl.java b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/DealDutyRecFlowServiceImpl.java new file mode 100644 index 0000000..a2e5f62 --- /dev/null +++ b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/DealDutyRecFlowServiceImpl.java @@ -0,0 +1,65 @@ +package com.hnac.hzims.middle.processflow.strategy.serviceimpl; + +import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse; +import com.hnac.hzims.middle.processflow.service.ProcessDictService; +import com.hnac.hzims.middle.processflow.strategy.abstracts.ProcessAbstractService; +import com.hnac.hzims.middle.processflow.strategy.entity.WorkflowQueue; +import com.hnac.hzims.operational.duty.feign.IDutyRecClient; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.log.exception.ServiceException; +import org.springblade.core.tool.api.R; +import org.springframework.stereotype.Service; + +import static com.hnac.hzims.middle.process.constant.TicketProcessConstant.DUTY_REC; + +/** + * 日常排班 + * + * @Author WL + * @Version v1.0 + * @Serial 1.0 + * @Date 2023/7/26 9:04 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class DealDutyRecFlowServiceImpl extends ProcessAbstractService { + + + private final ProcessDictService processDictService; + + + private final IDutyRecClient iDutyRecClient; + + /** + * 设置执行那种实现类 + * + * @param flowQueue + * @return + */ + @Override + public Boolean isWorkflowProcess(WorkflowQueue flowQueue) { + String dictValue = processDictService.selectDictValueByKey(DUTY_REC); + if (dictValue.equals(flowQueue.getProcessDefinitionKey())) { + log.info("已执行值班计划程环节操作~~~~"); + return true; + } + log.error("未执行值班计划工作流流程环节操作，请联系管理员~~~~"); + return false; + } + + + /** + * 日常维护业务方法 + * + * @param response + */ + @Override + public void calculate(ProcessWorkFlowResponse response) { + R dealtDutyRecFlow = iDutyRecClient.dealDutyRecFlow(response); + if (!dealtDutyRecFlow.isSuccess()){ + throw new ServiceException("执行值班计划失败"); + } + } +} diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketCountServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketCountServiceImpl.java index e5d1090..1b94fa1 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketCountServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketCountServiceImpl.java @@ -20,6 +20,7 @@ import com.hnac.hzims.ticket.twoTicket.mapper.TicketCountMapper; import com.hnac.hzims.ticket.twoTicket.service.TicketCountService; import com.hnac.hzims.ticket.twoTicket.vo.ticket.TicketCountResponseVo; import com.hnac.hzims.ticket.twoTicket.vo.ticket.TicketCountVo; +import com.hnac.hzims.ticket.utils.PercentCountUtils; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity; import com.hnac.hzims.ticket.workTicket.service.IWorkTicketInfoService; import io.micrometer.core.instrument.binder.BaseUnits; @@ -33,6 +34,7 @@ import org.apache.commons.lang3.math.NumberUtils; import org.apache.poi.ss.usermodel.BorderStyle; import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.usermodel.VerticalAlignment; +import org.aspectj.bridge.MessageWriter; import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.BladeUser; @@ -46,7 +48,9 @@ import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.math.BigDecimal; import java.net.URLEncoder; +import java.text.NumberFormat; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -435,7 +439,9 @@ public class TicketCountServiceImpl extends BaseServiceImpl stationClientOne = stationClient.getOne(stationEntity); if (stationClientOne.isSuccess()) { StationEntity data = stationClientOne.getData(); - ticketCount.setDeptName(data.getName() == null ? "" : data.getName()); + if (data != null) { + ticketCount.setDeptName(data.getName() == null ? "" : data.getName()); + } } } List values = entry.getValue(); @@ -457,10 +463,9 @@ public class TicketCountServiceImpl extends BaseServiceImpl stationClientOne = stationClient.getOne(stationEntity); if (stationClientOne.isSuccess()) { StationEntity data = stationClientOne.getData(); - ticketCount.setDeptName(data.getName() == null ? "" : data.getName()); + if (data != null) { + ticketCount.setDeptName(data.getName() == null ? "" : data.getName()); + } + } } List values = entry.getValue(); @@ -555,10 +563,9 @@ public class TicketCountServiceImpl extends BaseServiceImpl