diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/vo/OperMaintenanceTaskEntityVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/vo/OperMaintenanceTaskEntityVo.java similarity index 100% rename from hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/vo/OperMaintenanceTaskEntityVo.java rename to hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/vo/OperMaintenanceTaskEntityVo.java diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/TaskContants.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/TaskContants.java index 3d1e0b2..8dbc67e 100644 --- a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/TaskContants.java +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/TaskContants.java @@ -5,18 +5,18 @@ package com.hnac.hzinfo.inspect.task; import lombok.Getter; -import java.util.HashSet; -import java.util.Set; - /** * @author ninglong * */ public interface TaskContants { - // 巡检任务派发 定时任务 + // 巡检任务派发 String INSPECT_TASK_DISTRIBUTE = "taskJobDistribute"; + // 日常维护任务派发 + String MAINTENANCE_TASK_DISTRIBUTE = "maintenanceTaskDistribute"; + /** * 处理同时开启几个任务的 */ diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/MaintenancePlanMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/MaintenancePlanMapper.java new file mode 100644 index 0000000..58f1b12 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/MaintenancePlanMapper.java @@ -0,0 +1,11 @@ +package com.hnac.hzims.scheduled.mapper.operation; + +import com.hnac.hzims.operational.maintenance.entity.OperMaintenancePlanEntity; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + +/** + * @author ysj + */ +public interface MaintenancePlanMapper extends UserDataScopeBaseMapper { + +} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/BusinessScheduledTask.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/BusinessScheduledTask.java index 1c353d9..f908b36 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/BusinessScheduledTask.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/BusinessScheduledTask.java @@ -1,6 +1,7 @@ package com.hnac.hzims.scheduled.scheduled; import com.hnac.hzims.scheduled.service.inspect.TaskService; +import com.hnac.hzims.scheduled.service.operation.business.MaintenanceService; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; @@ -9,8 +10,7 @@ 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.hzinfo.inspect.task.TaskContants.INSPECT_TASK_DISTRIBUTE; +import static com.hnac.hzinfo.inspect.task.TaskContants.*; /** @@ -24,8 +24,10 @@ public class BusinessScheduledTask { @Autowired private TaskService service; + private MaintenanceService maintenanceService; + /** - * 首页-指标数据加载 + * 巡检任务派发 : 一分钟执行一次 */ @XxlJob(INSPECT_TASK_DISTRIBUTE) //@Scheduled(cron = "0/40 * * * * ? ") @@ -37,4 +39,17 @@ public class BusinessScheduledTask { return new ReturnT<>("SUCCESS"); } + /** + * 巡检任务派发 : 一天执行一次 凌晨0时执行 + */ + @XxlJob(MAINTENANCE_TASK_DISTRIBUTE) + //@Scheduled(cron = "0/40 * * * * ? ") + public ReturnT maintenanceTaskDistribute(String param) { + if (Func.isBlank(param)) { + param = DateUtil.format(new Date(), "yyyy-MM"); + } + maintenanceService.maintenanceTaskDistribute(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/MonitorScheduledTask.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/MonitorScheduledTask.java index 78cb8d8..3000218 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 @@ -1,6 +1,6 @@ package com.hnac.hzims.scheduled.scheduled; -import com.hnac.hzims.scheduled.service.operation.MonitorService; +import com.hnac.hzims.scheduled.service.operation.monitor.MonitorService; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; 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 index 6a55529..878486f 100644 --- 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 @@ -1,14 +1,13 @@ package com.hnac.hzims.scheduled.scheduled; import com.hnac.hzims.operational.main.constant.HomePageConstant; -import com.hnac.hzims.scheduled.service.operation.RealTargetService; +import com.hnac.hzims.scheduled.service.operation.home.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.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.util.Arrays; 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 5146c24..7010e3b 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,6 +1,6 @@ package com.hnac.hzims.scheduled.scheduled; -import com.hnac.hzims.scheduled.service.operation.ReportService; +import com.hnac.hzims.scheduled.service.operation.report.ReportService; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; 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 e10c021..6c0a431 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,13 +1,12 @@ package com.hnac.hzims.scheduled.scheduled; -import com.hnac.hzims.scheduled.service.operation.ShowService; +import com.hnac.hzims.scheduled.service.operation.home.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.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.util.Date; 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 index bbebe02..0aea939 100644 --- 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 @@ -12,7 +12,7 @@ import com.google.common.collect.Lists; import com.hnac.hzims.operational.duty.vo.ImsDutyMainFeignVO; import com.hnac.hzims.scheduled.mapper.inspect.TaskMapper; import com.hnac.hzims.scheduled.service.inspect.*; -import com.hnac.hzims.scheduled.service.operation.DutyMainService; +import com.hnac.hzims.scheduled.service.operation.business.DutyMainService; import com.hnac.hzinfo.inspect.obj.entity.*; import com.hnac.hzinfo.inspect.plan.PlanContants; import com.hnac.hzinfo.inspect.plan.entity.*; 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/alarm/AbnormalAlarmService.java similarity index 84% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/AbnormalAlarmService.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/alarm/AbnormalAlarmService.java index 53997ff..3151c43 100644 --- 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/alarm/AbnormalAlarmService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation; +package com.hnac.hzims.scheduled.service.operation.alarm; import com.hnac.hzims.operational.alert.entity.AbnormalAlarmEntity; import org.springblade.core.mp.base.BaseService; 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/alarm/RecordService.java similarity index 82% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/RecordService.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/alarm/RecordService.java index 00da41d..6710773 100644 --- 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/alarm/RecordService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation; +package com.hnac.hzims.scheduled.service.operation.alarm; import com.hnac.hzims.operational.config.entity.StAlarmRecordEntity; 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/alarm/impl/AbnormalAlarmServiceImpl.java similarity index 86% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/AbnormalAlarmServiceImpl.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/alarm/impl/AbnormalAlarmServiceImpl.java index fa8ef8a..4fe12b2 100644 --- 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/alarm/impl/AbnormalAlarmServiceImpl.java @@ -1,8 +1,8 @@ -package com.hnac.hzims.scheduled.service.operation.impl; +package com.hnac.hzims.scheduled.service.operation.alarm.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 com.hnac.hzims.scheduled.service.operation.alarm.AbnormalAlarmService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; 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/alarm/impl/RecordServiceImpl.java similarity index 87% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/RecordServiceImpl.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/alarm/impl/RecordServiceImpl.java index d5489b8..b6e6f67 100644 --- 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/alarm/impl/RecordServiceImpl.java @@ -1,8 +1,8 @@ -package com.hnac.hzims.scheduled.service.operation.impl; +package com.hnac.hzims.scheduled.service.operation.alarm.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 com.hnac.hzims.scheduled.service.operation.alarm.RecordService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; 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/business/AccessService.java similarity index 87% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/AccessService.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/AccessService.java index 9a2d858..f3a92cf 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/business/AccessService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation; +package com.hnac.hzims.scheduled.service.operation.business; import com.hnac.hzims.operational.access.entity.OperAccessTaskEntity; import com.hnac.hzims.operational.main.vo.OverhaulVo; 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/business/DefectService.java similarity index 82% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/DefectService.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DefectService.java index 929732f..8b58712 100644 --- 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/business/DefectService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation; +package com.hnac.hzims.scheduled.service.operation.business; import com.hnac.hzims.operational.defect.entity.OperDefectEntity; import org.springblade.core.mp.base.BaseService; diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/DutyMainService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DutyMainService.java similarity index 84% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/DutyMainService.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DutyMainService.java index 1fe0e7e..192ed9a 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/DutyMainService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DutyMainService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation; +package com.hnac.hzims.scheduled.service.operation.business; import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity; import com.hnac.hzims.operational.duty.vo.ImsDutyMainFeignVO; diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/DutyService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DutyService.java similarity index 84% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/DutyService.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DutyService.java index 08efdcd..a0b20b1 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/DutyService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DutyService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation; +package com.hnac.hzims.scheduled.service.operation.business; import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity; import com.hnac.hzims.operational.duty.vo.DutyInfoVo; diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/MaintenancePlanService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/MaintenancePlanService.java new file mode 100644 index 0000000..f8c1181 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/MaintenancePlanService.java @@ -0,0 +1,11 @@ +package com.hnac.hzims.scheduled.service.operation.business; + +import com.hnac.hzims.operational.maintenance.entity.OperMaintenancePlanEntity; +import org.springblade.core.mp.base.BaseService; + +/** + * @author ysj + */ +public interface MaintenancePlanService extends BaseService { + +} \ No newline at end of file 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/business/MaintenanceService.java similarity index 84% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/MaintenanceService.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/MaintenanceService.java index b193f91..2e2de53 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/business/MaintenanceService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation; +package com.hnac.hzims.scheduled.service.operation.business; import com.hnac.hzims.operational.main.vo.MaintainVo; import com.hnac.hzims.operational.main.vo.RegularWorkVO; @@ -13,7 +13,8 @@ import java.util.List; */ public interface MaintenanceService extends BaseService { - // 查询当年日常维护数量 + void maintenanceTaskDistribute(String param); + Integer maintenanceCount(List areas); MaintainVo maintain(String start, String end, List areas); 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/business/PhenomenonService.java similarity index 88% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/PhenomenonService.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/PhenomenonService.java index 362fbe9..26a354e 100644 --- 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/business/PhenomenonService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation; +package com.hnac.hzims.scheduled.service.operation.business; import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity; import com.hnac.hzims.operational.main.vo.ShortagesVo; 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/business/impl/AccessServiceImpl.java similarity index 95% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/AccessServiceImpl.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/AccessServiceImpl.java index da01d8e..9788a7d 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/business/impl/AccessServiceImpl.java @@ -1,11 +1,11 @@ -package com.hnac.hzims.scheduled.service.operation.impl; +package com.hnac.hzims.scheduled.service.operation.business.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 com.hnac.hzims.scheduled.service.operation.business.AccessService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; 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/business/impl/DefectServiceImpl.java similarity index 93% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/DefectServiceImpl.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DefectServiceImpl.java index 84af907..fdf8987 100644 --- 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/business/impl/DefectServiceImpl.java @@ -1,9 +1,9 @@ -package com.hnac.hzims.scheduled.service.operation.impl; +package com.hnac.hzims.scheduled.service.operation.business.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 com.hnac.hzims.scheduled.service.operation.business.DefectService; import lombok.AllArgsConstructor; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.utils.CollectionUtil; diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/DutyMainServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DutyMainServiceImpl.java similarity index 91% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/DutyMainServiceImpl.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DutyMainServiceImpl.java index a49a30d..626bcc0 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/DutyMainServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DutyMainServiceImpl.java @@ -1,10 +1,10 @@ -package com.hnac.hzims.scheduled.service.operation.impl; +package com.hnac.hzims.scheduled.service.operation.business.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity; import com.hnac.hzims.operational.duty.vo.ImsDutyMainFeignVO; import com.hnac.hzims.scheduled.mapper.operation.DutyMainMapper; -import com.hnac.hzims.scheduled.service.operation.DutyMainService; +import com.hnac.hzims.scheduled.service.operation.business.DutyMainService; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.utils.ObjectUtil; diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/DutyServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DutyServiceImpl.java similarity index 98% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/DutyServiceImpl.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DutyServiceImpl.java index cbaf723..7fe1682 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/DutyServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DutyServiceImpl.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation.impl; +package com.hnac.hzims.scheduled.service.operation.business.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.hnac.hzims.operational.duty.entity.ImsDutyGroupEntity; @@ -10,7 +10,7 @@ import com.hnac.hzims.operational.duty.vo.NextDutyInfoVo; import com.hnac.hzims.scheduled.mapper.operation.DutyGroupMapper; import com.hnac.hzims.scheduled.mapper.operation.DutyMapper; import com.hnac.hzims.scheduled.mapper.operation.DutyPersonMapper; -import com.hnac.hzims.scheduled.service.operation.DutyService; +import com.hnac.hzims.scheduled.service.operation.business.DutyService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenancePlanServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenancePlanServiceImpl.java new file mode 100644 index 0000000..3de2980 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenancePlanServiceImpl.java @@ -0,0 +1,19 @@ +package com.hnac.hzims.scheduled.service.operation.business.impl; + +import com.hnac.hzims.operational.maintenance.entity.OperMaintenancePlanEntity; +import com.hnac.hzims.scheduled.mapper.operation.MaintenancePlanMapper; +import com.hnac.hzims.scheduled.service.operation.business.MaintenancePlanService; +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 MaintenancePlanServiceImpl extends BaseServiceImpl implements MaintenancePlanService { + +} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenanceServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenanceServiceImpl.java new file mode 100644 index 0000000..ba446b0 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenanceServiceImpl.java @@ -0,0 +1,294 @@ +package com.hnac.hzims.scheduled.service.operation.business.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hnac.hzims.message.dto.PlanMsgRecordDto; +import com.hnac.hzims.message.entity.config.MessageTemplateEntity; +import com.hnac.hzims.message.fegin.IMessageClient; +import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity; +import com.hnac.hzims.operational.main.vo.MaintainVo; +import com.hnac.hzims.operational.main.vo.RegularWorkVO; +import com.hnac.hzims.operational.maintenance.constants.MaintenanceConstant; +import com.hnac.hzims.operational.maintenance.entity.OperMaintenancePlanEntity; +import com.hnac.hzims.operational.maintenance.entity.OperMaintenanceTaskEntity; +import com.hnac.hzims.operational.maintenance.vo.OperMaintenanceTaskEntityVo; +import com.hnac.hzims.scheduled.mapper.operation.MaintenanceMapper; +import com.hnac.hzims.scheduled.service.operation.business.MaintenancePlanService; +import com.hnac.hzims.scheduled.service.operation.business.MaintenanceService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.*; +import org.springblade.flow.core.feign.IFlowClient; +import org.springframework.beans.BeanUtils; +import org.springframework.jdbc.datasource.DataSourceTransactionManager; +import org.springframework.stereotype.Service; +import org.springframework.transaction.TransactionDefinition; +import org.springframework.transaction.TransactionStatus; +import org.springframework.transaction.support.DefaultTransactionDefinition; + +import java.beans.Transient; +import java.time.*; +import java.time.format.DateTimeFormatter; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static org.springblade.core.tool.utils.DateUtil.PATTERN_DATE; + +/** + * @author ysj + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class MaintenanceServiceImpl extends BaseServiceImpl implements MaintenanceService { + + private final MaintenancePlanService planService; + + private final DutyMainServiceImpl dutyMainService; + + private final IFlowClient flowClient; + + private final IMessageClient messageClient; + + private final DataSourceTransactionManager manager; + + private final ThreadPoolExecutor executor; + + /** + * 日常维护任务派发 + * @param param + */ + @Override + @Transient + public void maintenanceTaskDistribute(String param) { + // 开始时间 + Date start = DateUtil.parse(DateUtil.formatDate(DateUtil.now()), DateUtil.PATTERN_DATE); + // 结束时间 + Date end = DateUtil.parse(DateUtil.formatDate(DateUtil.plusDays(start, 1)), DateUtil.PATTERN_DATE); + // 查询日常维护计划 + List plans = planService.list(Wrappers.lambdaQuery() + .ge(OperMaintenancePlanEntity::getDisposeTime,start) + .lt(OperMaintenancePlanEntity::getDisposeTime,end) + .isNotNull(OperMaintenancePlanEntity::getCreateTaskTime) + ); + // 遍历计划列表生成相应任务 + if(CollectionUtil.isEmpty(plans)){ + return; + } + plans.forEach(plan -> { + // 生成日常任务对象 + OperMaintenanceTaskEntity task = BeanUtil.copy(plan,OperMaintenanceTaskEntity.class); + if(StringUtil.isEmpty(task.getEmCode())){ + this.taskDistribute(task,plan); + }else{ + for (String code : plan.getEmCode().split(",")) { + task.setEmCode(code); + this.taskDistribute(task,plan); + } + } + }); + } + + /** + * 日常维护任务派发 + * @param task + * @param plan + */ + private void taskDistribute(OperMaintenanceTaskEntity task, OperMaintenancePlanEntity plan) { + DefaultTransactionDefinition defaultTransactionDefinition = new DefaultTransactionDefinition(); + defaultTransactionDefinition.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); + TransactionStatus transaction = manager.getTransaction(defaultTransactionDefinition); + task.setId(null); + task.setCreateTime(new Date()); + task.setUpdateTime(new Date()); + task.setPlanId(plan.getId()); + task.setTaskCode(UUID.randomUUID().toString()); + if (task.getRefLibraryId() != 0) { + task.setCreateTime(DateUtil.now()); + } + if(ObjectUtil.isNotEmpty(plan.getDisposer())){ + task.setDisposer(plan.getDisposer().toString()); + } + //补充计划结束时间 + Instant instant = task.getDisposeTime().toInstant(); + ZoneId zoneId = ZoneId.systemDefault(); + LocalDateTime disposeTime = instant.atZone(zoneId).toLocalDateTime(); + task.setPlanEndTime(disposeTime.plusHours(task.getHours())); + //获取值班人员 + if (ObjectUtil.isNotEmpty(plan.getMaintenanceModel()) && plan.getMaintenanceModel() == 2) { + //查询值班信息 + LambdaQueryWrapper dutyWrapper = new LambdaQueryWrapper<>(); + dutyWrapper.eq(ImsDutyMainEntity::getDutyDate, DateTimeFormatter.ofPattern(PATTERN_DATE).format(disposeTime)); + dutyWrapper.eq(ImsDutyMainEntity::getClassId, plan.getImsDutyClassId()); + ImsDutyMainEntity entity = dutyMainService.getOne(dutyWrapper); + if (ObjectUtil.isEmpty(entity) || StringUtils.isEmpty(entity.getDutyPersonIds())) { + log.error("计划ID为：{}未查询到排班记录", plan.getId()); + return; + } + String userId = entity.getDutyPersonIds(); + task.setDisposer(userId.replaceAll("\\^", ",")); + } + this.save(task); + // 事务提交 + manager.commit(transaction); + //启动流程 + String processInstanceId = this.startProcess(plan.getProcDefId(), task); + //推送消息 + CompletableFuture operMaintenanceTaskEntityCompletableFuture = + CompletableFuture.runAsync(() -> { + task.setProcessInstanceId(processInstanceId); + this.updateById(task); + plan.setCreateTaskTime(new Date()); + planService.updateById(plan); + //推送消息 + this.pushTaskMessage(task.getId()); + }, executor); + //启动队列 + try { + CompletableFuture.allOf(operMaintenanceTaskEntityCompletableFuture).get(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 开启一个流程实例 + **/ + private String startProcess(String processDefinitionKey, OperMaintenanceTaskEntity taskEntity) { + OperMaintenanceTaskEntityVo operMaintenanceTaskEntityVo = new OperMaintenanceTaskEntityVo(); + BeanUtils.copyProperties(taskEntity, operMaintenanceTaskEntityVo); + Map params = new HashMap<>(); + params.put("taskId", taskEntity.getId()); + List userIdList = Stream.of(taskEntity.getDisposer().split(",")).collect(Collectors.toList()); + String taskUsers = userIdList.stream().filter(StringUtils::isNotBlank).map("taskUser_"::concat).collect(Collectors.joining(",")); + params.put("initUserIds", taskUsers); + params.put("operMaintenanceTaskEntityVo", operMaintenanceTaskEntityVo); + return flowClient.startProcessInstanceContainNameByKey(processDefinitionKey, String.valueOf(taskEntity.getId()), taskEntity.getTitle(), params).getData().getProcessInstanceId(); + } + + /** + * 推送消息 + */ + private void pushTaskMessage(Long taskId) { + OperMaintenanceTaskEntity task = this.getById(taskId); + if(ObjectUtil.isEmpty(task)){ + return; + } + // 根据消息模板Id查询模板 + R result = messageClient.getMsgTemplateById(task.getMessageTemplateId()); + if (result.isSuccess() && ObjectUtil.isNotEmpty(result.getData())) { + Func.toLongList(",", task.getDisposer()).forEach(userId -> { + //推送消息 + ZoneId zoneId = ZoneId.systemDefault(); + PlanMsgRecordDto msg = new PlanMsgRecordDto(); + msg.setTemplateId(task.getMessageTemplateId()); + msg.setCreateUser(task.getCreateUser()); + msg.setPlanTime(LocalDateTime.ofInstant(task.getDisposeTime().toInstant(), zoneId)); + msg.setTaskId(task.getId()); + msg.setDeptId(task.getCreateDept()); + msg.setReceiver(userId); + msg.setContent("距离任务执行时间已不满一小时，请及时处理"); + messageClient.planSendMessage(msg); + }); + } + } + + /** + * 获取日常维护数量 + * @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(); + } + + /** + * 时间区间机构的日常维护数据查询 + * @param start + * @param end + * @param areas + * @return + */ + @Override + public MaintainVo maintain(String start, String end, List 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; + } + + /** + * 查询日常维护-定期工作类型数据 + * @param start + * @param end + * @param areas + * @return + */ + @Override + public RegularWorkVO regularWork(Date start, Date end, List areas) { + RegularWorkVO regularWorkVO = new RegularWorkVO(); + // 查询定期工作任务 + List regularWorkList = this.list(new LambdaQueryWrapper() {{ + ge(OperMaintenanceTaskEntity::getDisposeTime, start) + .le(OperMaintenanceTaskEntity::getDisposeTime, end) + .eq(OperMaintenanceTaskEntity::getTypeCode, "05") + .in(OperMaintenanceTaskEntity::getCreateDept, areas); + }}); + if (CollectionUtil.isEmpty(regularWorkList)) { + regularWorkVO.setRegularWorkSum(0); + regularWorkVO.setRegularWork(0); + return regularWorkVO; + } + regularWorkVO.setMainTaskIds(regularWorkList.stream().map(OperMaintenanceTaskEntity::getId).map(Object::toString).collect(Collectors.joining(","))); + regularWorkVO.setRegularWorkSum(regularWorkList.size()); + // 定期工作任务完成数量 + List regularWorkFinishList = regularWorkList.stream().filter(o -> MaintenanceConstant.TASK_STATUS_5 == o.getStatus()).collect(Collectors.toList()); + if (CollectionUtil.isEmpty(regularWorkFinishList)) { + regularWorkVO.setRegularWork(0); + return regularWorkVO; + } + regularWorkVO.setRegularWork(regularWorkFinishList.size()); + return regularWorkVO; + } + + +} 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/business/impl/PhenomenonServiceImpl.java similarity index 95% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/PhenomenonServiceImpl.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/PhenomenonServiceImpl.java index d993192..1dc8019 100644 --- 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/business/impl/PhenomenonServiceImpl.java @@ -1,11 +1,11 @@ -package com.hnac.hzims.scheduled.service.operation.impl; +package com.hnac.hzims.scheduled.service.operation.business.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity; import com.hnac.hzims.operational.main.vo.ShortagesVo; 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 com.hnac.hzims.scheduled.service.operation.business.PhenomenonService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; 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/fill/GenerateService.java similarity index 92% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/GenerateService.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/GenerateService.java index 8f9e1b1..440ce60 100644 --- 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/fill/GenerateService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation; +package com.hnac.hzims.scheduled.service.operation.fill; import com.hnac.hzims.operational.fill.entity.GenerateEntity; import com.hnac.hzims.operational.main.vo.GenerationPowerVo; 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/fill/OtherService.java similarity index 77% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/OtherService.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/OtherService.java index 50451a4..13ee8ab 100644 --- 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/fill/OtherService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation; +package com.hnac.hzims.scheduled.service.operation.fill; import com.hnac.hzims.operational.fill.entity.OtherEntity; import org.springblade.core.mp.base.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/fill/OverDetailsService.java similarity index 79% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/OverDetailsService.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/OverDetailsService.java index 13e6eab..efa4b86 100644 --- 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/fill/OverDetailsService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation; +package com.hnac.hzims.scheduled.service.operation.fill; import com.hnac.hzims.operational.fill.entity.OverDetailsEntity; 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/fill/OverService.java similarity index 77% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/OverService.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/OverService.java index 3412374..d83b731 100644 --- 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/fill/OverService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation; +package com.hnac.hzims.scheduled.service.operation.fill; import com.hnac.hzims.operational.fill.entity.OverEntity; import org.springblade.core.mp.base.BaseService; 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/fill/PowerService.java similarity index 87% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/PowerService.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/PowerService.java index d6d3007..c26957a 100644 --- 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/fill/PowerService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation; +package com.hnac.hzims.scheduled.service.operation.fill; import com.hnac.hzims.operational.fill.entity.PowerEntity; import com.hnac.hzims.operational.main.vo.PowerMonthVo; 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/fill/SolveService.java similarity index 77% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/SolveService.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/SolveService.java index 5888433..c3b8ee2 100644 --- 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/fill/SolveService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation; +package com.hnac.hzims.scheduled.service.operation.fill; import com.hnac.hzims.operational.fill.entity.SolveEntity; import org.springblade.core.mp.base.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/fill/UseService.java similarity index 93% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/UseService.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/UseService.java index 72dc927..11be788 100644 --- 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/fill/UseService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation; +package com.hnac.hzims.scheduled.service.operation.fill; import com.baomidou.mybatisplus.core.metadata.IPage; import com.hnac.hzims.operational.fill.entity.UseEntity; 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/fill/impl/GenerateServiceImpl.java similarity index 96% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/GenerateServiceImpl.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/GenerateServiceImpl.java index 470f95e..6f5ee6f 100644 --- 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/fill/impl/GenerateServiceImpl.java @@ -1,11 +1,11 @@ -package com.hnac.hzims.scheduled.service.operation.impl; +package com.hnac.hzims.scheduled.service.operation.fill.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 com.hnac.hzims.scheduled.service.operation.fill.GenerateService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; 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/fill/impl/OtherServiceImpl.java similarity index 77% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/OtherServiceImpl.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/OtherServiceImpl.java index 202c396..11da8ed 100644 --- 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/fill/impl/OtherServiceImpl.java @@ -1,8 +1,8 @@ -package com.hnac.hzims.scheduled.service.operation.impl; +package com.hnac.hzims.scheduled.service.operation.fill.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 com.hnac.hzims.scheduled.service.operation.fill.OtherService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; 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/fill/impl/OverDetailsServiceImpl.java similarity index 78% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/OverDetailsServiceImpl.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/OverDetailsServiceImpl.java index dc69ec3..18d3513 100644 --- 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/fill/impl/OverDetailsServiceImpl.java @@ -1,8 +1,8 @@ -package com.hnac.hzims.scheduled.service.operation.impl; +package com.hnac.hzims.scheduled.service.operation.fill.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 com.hnac.hzims.scheduled.service.operation.fill.OverDetailsService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; 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/fill/impl/OverServiceImpl.java similarity index 77% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/OverServiceImpl.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/OverServiceImpl.java index f629fc7..c009008 100644 --- 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/fill/impl/OverServiceImpl.java @@ -1,8 +1,8 @@ -package com.hnac.hzims.scheduled.service.operation.impl; +package com.hnac.hzims.scheduled.service.operation.fill.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 com.hnac.hzims.scheduled.service.operation.fill.OverService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; 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/fill/impl/PowerServiceImpl.java similarity index 94% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/PowerServiceImpl.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/PowerServiceImpl.java index 265a8b7..b0028ca 100644 --- 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/fill/impl/PowerServiceImpl.java @@ -1,10 +1,10 @@ -package com.hnac.hzims.scheduled.service.operation.impl; +package com.hnac.hzims.scheduled.service.operation.fill.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 com.hnac.hzims.scheduled.service.operation.fill.PowerService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; 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/fill/impl/SolveServiceImpl.java similarity index 77% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/SolveServiceImpl.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/SolveServiceImpl.java index 6d5238a..22f0b10 100644 --- 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/fill/impl/SolveServiceImpl.java @@ -1,8 +1,8 @@ -package com.hnac.hzims.scheduled.service.operation.impl; +package com.hnac.hzims.scheduled.service.operation.fill.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 com.hnac.hzims.scheduled.service.operation.fill.SolveService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; 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/fill/impl/UseServiceImpl.java similarity index 96% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/UseServiceImpl.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/UseServiceImpl.java index 82ba5b1..58ba3dc 100644 --- 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/fill/impl/UseServiceImpl.java @@ -1,10 +1,10 @@ -package com.hnac.hzims.scheduled.service.operation.impl; +package com.hnac.hzims.scheduled.service.operation.fill.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 com.hnac.hzims.scheduled.service.operation.fill.UseService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; 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/home/ModelStationService.java similarity index 81% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/ModelStationService.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/ModelStationService.java index e8e4560..9d626b0 100644 --- 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/home/ModelStationService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation; +package com.hnac.hzims.scheduled.service.operation.home; import com.hnac.hzims.operational.station.entity.HzimsAnalyzeModelStationEntity; 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/home/RealTargetService.java similarity index 93% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/RealTargetService.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/RealTargetService.java index 042f5d2..a675773 100644 --- 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/home/RealTargetService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation; +package com.hnac.hzims.scheduled.service.operation.home; import java.util.List; 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/home/ShowService.java similarity index 76% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/ShowService.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/ShowService.java index 8bef00c..0c07de4 100644 --- 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/home/ShowService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation; +package com.hnac.hzims.scheduled.service.operation.home; /** * @author ysj 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/home/impl/ModelStationServiceImpl.java similarity index 75% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/ModelStationServiceImpl.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/ModelStationServiceImpl.java index 946fdab..19215c1 100644 --- 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/home/impl/ModelStationServiceImpl.java @@ -1,9 +1,9 @@ -package com.hnac.hzims.scheduled.service.operation.impl; +package com.hnac.hzims.scheduled.service.operation.home.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 com.hnac.hzims.scheduled.service.operation.home.ModelStationService; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; 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/home/impl/RealTargetServiceImpl.java similarity index 98% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/RealTargetServiceImpl.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java index a008be8..5c8fc01 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/home/impl/RealTargetServiceImpl.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation.impl; +package com.hnac.hzims.scheduled.service.operation.home.impl; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; @@ -14,7 +14,14 @@ import com.hnac.hzims.operational.station.entity.HzimsAnalyzeModelStationEntity; import com.hnac.hzims.operational.station.entity.StationEntity; import com.hnac.hzims.scheduled.service.equipment.DeviceParamService; import com.hnac.hzims.scheduled.service.equipment.DeviceService; -import com.hnac.hzims.scheduled.service.operation.*; +import com.hnac.hzims.scheduled.service.operation.home.ModelStationService; +import com.hnac.hzims.scheduled.service.operation.home.RealTargetService; +import com.hnac.hzims.scheduled.service.operation.fill.GenerateService; +import com.hnac.hzims.scheduled.service.operation.fill.PowerService; +import com.hnac.hzims.scheduled.service.operation.fill.UseService; +import com.hnac.hzims.scheduled.service.operation.station.StationAttributeService; +import com.hnac.hzims.scheduled.service.operation.station.StationService; +import com.hnac.hzims.scheduled.service.operation.plate.DataService; import com.hnac.hzinfo.datasearch.PointData; import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData; import com.hnac.hzinfo.datasearch.analyse.po.AnalyseCodeByAnalyseDataPO; 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/home/impl/ShowServiceImpl.java similarity index 99% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/ShowServiceImpl.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/ShowServiceImpl.java index 9d2f707..43539bd 100644 --- 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/home/impl/ShowServiceImpl.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation.impl; +package com.hnac.hzims.scheduled.service.operation.home.impl; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; @@ -23,7 +23,11 @@ import com.hnac.hzims.operational.report.vo.DutyDefectVO; import com.hnac.hzims.operational.station.entity.StationEntity; 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.operation.business.*; +import com.hnac.hzims.scheduled.service.operation.home.ShowService; +import com.hnac.hzims.scheduled.service.operation.fill.*; +import com.hnac.hzims.scheduled.service.operation.station.StationService; +import com.hnac.hzims.scheduled.service.operation.plate.DataService; import com.hnac.hzims.scheduled.service.ticket.TicketService; import com.hnac.hzims.scheduled.service.ticket.WorkTicketService; import com.hnac.hzims.ticket.allTicket.vo.DoublePassRateVO; 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 deleted file mode 100644 index 47abb2b..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/MaintenanceServiceImpl.java +++ /dev/null @@ -1,124 +0,0 @@ -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.main.vo.RegularWorkVO; -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; -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.Date; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @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(); - } - - /** - * 时间区间机构的日常维护数据查询 - * @param start - * @param end - * @param areas - * @return - */ - @Override - public MaintainVo maintain(String start, String end, List 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; - } - - /** - * 查询日常维护-定期工作类型数据 - * @param start - * @param end - * @param areas - * @return - */ - @Override - public RegularWorkVO regularWork(Date start, Date end, List areas) { - RegularWorkVO regularWorkVO = new RegularWorkVO(); - // 查询定期工作任务 - List regularWorkList = this.list(new LambdaQueryWrapper() {{ - ge(OperMaintenanceTaskEntity::getDisposeTime, start) - .le(OperMaintenanceTaskEntity::getDisposeTime, end) - .eq(OperMaintenanceTaskEntity::getTypeCode, "05") - .in(OperMaintenanceTaskEntity::getCreateDept, areas); - }}); - if (CollectionUtil.isEmpty(regularWorkList)) { - regularWorkVO.setRegularWorkSum(0); - regularWorkVO.setRegularWork(0); - return regularWorkVO; - } - regularWorkVO.setMainTaskIds(regularWorkList.stream().map(OperMaintenanceTaskEntity::getId).map(Object::toString).collect(Collectors.joining(","))); - regularWorkVO.setRegularWorkSum(regularWorkList.size()); - // 定期工作任务完成数量 - List regularWorkFinishList = regularWorkList.stream().filter(o -> MaintenanceConstant.TASK_STATUS_5 == o.getStatus()).collect(Collectors.toList()); - if (CollectionUtil.isEmpty(regularWorkFinishList)) { - regularWorkVO.setRegularWork(0); - return regularWorkVO; - } - regularWorkVO.setRegularWork(regularWorkFinishList.size()); - return regularWorkVO; - } - - -} 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/monitor/MonitorService.java similarity index 85% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/MonitorService.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/monitor/MonitorService.java index 5df3786..f99ee9e 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/monitor/MonitorService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation; +package com.hnac.hzims.scheduled.service.operation.monitor; import org.springblade.core.tool.api.R; 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/monitor/impl/MonitorServiceImpl.java similarity index 98% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/MonitorServiceImpl.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/monitor/impl/MonitorServiceImpl.java index 07df760..f50b250 100644 --- 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/monitor/impl/MonitorServiceImpl.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation.impl; +package com.hnac.hzims.scheduled.service.operation.monitor.impl; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; @@ -19,7 +19,12 @@ 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.hzims.scheduled.service.operation.alarm.AbnormalAlarmService; +import com.hnac.hzims.scheduled.service.operation.alarm.RecordService; +import com.hnac.hzims.scheduled.service.operation.monitor.MonitorService; +import com.hnac.hzims.scheduled.service.operation.station.StationAttrConfigService; +import com.hnac.hzims.scheduled.service.operation.station.StationAttributeService; +import com.hnac.hzims.scheduled.service.operation.station.StationService; import com.hnac.hzinfo.datasearch.analyse.IAnalyseDataSearchClient; import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeCodeBySignagesVO; import com.hnac.hzinfo.sdk.analyse.po.MultiAnalyzeCodePO; diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/DataService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/plate/DataService.java similarity index 94% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/DataService.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/plate/DataService.java index 166658f..b92f9b8 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/DataService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/plate/DataService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation; +package com.hnac.hzims.scheduled.service.operation.plate; import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData; import com.hnac.hzinfo.datasearch.analyse.vo.AnalyseDataTaosVO; diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/DataServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/plate/impl/DataServiceImpl.java similarity index 98% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/DataServiceImpl.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/plate/impl/DataServiceImpl.java index 6d42bb3..8deff01 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/DataServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/plate/impl/DataServiceImpl.java @@ -1,7 +1,7 @@ -package com.hnac.hzims.scheduled.service.operation.impl; +package com.hnac.hzims.scheduled.service.operation.plate.impl; import com.google.common.collect.Lists; -import com.hnac.hzims.scheduled.service.operation.DataService; +import com.hnac.hzims.scheduled.service.operation.plate.DataService; import com.hnac.hzinfo.datasearch.analyse.IAnalyseDataSearchClient; import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData; import com.hnac.hzinfo.datasearch.analyse.po.AnalyseCodeByAnalyseDataPO; 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/report/ReportService.java similarity index 62% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/ReportService.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/report/ReportService.java index 2fe62ac..2612f12 100644 --- 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/report/ReportService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation; +package com.hnac.hzims.scheduled.service.operation.report; /** * @author ysj 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/report/impl/ReportServiceImpl.java similarity index 98% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/ReportServiceImpl.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/report/impl/ReportServiceImpl.java index 67695dd..c257cbf 100644 --- 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/report/impl/ReportServiceImpl.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation.impl; +package com.hnac.hzims.scheduled.service.operation.report.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.google.common.util.concurrent.ThreadFactoryBuilder; @@ -14,7 +14,11 @@ 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.operation.business.AccessService; +import com.hnac.hzims.scheduled.service.operation.business.MaintenanceService; +import com.hnac.hzims.scheduled.service.operation.business.PhenomenonService; +import com.hnac.hzims.scheduled.service.operation.station.StationService; +import com.hnac.hzims.scheduled.service.operation.report.ReportService; import com.hnac.hzims.scheduled.service.safeproduct.MonthService; import com.hnac.hzims.scheduled.service.safeproduct.TrialService; import com.hnac.hzims.scheduled.service.ticket.TicketService; 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/station/StationAttrConfigService.java similarity index 83% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/StationAttrConfigService.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/StationAttrConfigService.java index 47dce3f..88e090d 100644 --- 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/station/StationAttrConfigService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation; +package com.hnac.hzims.scheduled.service.operation.station; import com.hnac.hzims.operational.station.entity.StationAttrConfigEntity; import org.springblade.core.mp.base.BaseService; 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/station/StationAttributeService.java similarity index 83% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/StationAttributeService.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/StationAttributeService.java index 53479ba..ea2bd01 100644 --- 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/station/StationAttributeService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation; +package com.hnac.hzims.scheduled.service.operation.station; import com.hnac.hzims.operational.station.entity.StationAttributeEntity; import org.springblade.core.mp.base.BaseService; 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/station/StationService.java similarity index 77% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/StationService.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/StationService.java index 2757282..2ff95b0 100644 --- 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/station/StationService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.scheduled.service.operation; +package com.hnac.hzims.scheduled.service.operation.station; import com.hnac.hzims.operational.station.entity.StationEntity; import org.springblade.core.mp.base.BaseService; 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/station/impl/StationAttrConfigServiceImpl.java similarity index 88% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/StationAttrConfigServiceImpl.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/impl/StationAttrConfigServiceImpl.java index d928365..ccb7340 100644 --- 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/station/impl/StationAttrConfigServiceImpl.java @@ -1,9 +1,9 @@ -package com.hnac.hzims.scheduled.service.operation.impl; +package com.hnac.hzims.scheduled.service.operation.station.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 com.hnac.hzims.scheduled.service.operation.station.StationAttrConfigService; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.utils.CollectionUtil; 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/station/impl/StationAttributeServiceImpl.java similarity index 87% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/StationAttributeServiceImpl.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/impl/StationAttributeServiceImpl.java index 122278e..629e2c6 100644 --- 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/station/impl/StationAttributeServiceImpl.java @@ -1,8 +1,8 @@ -package com.hnac.hzims.scheduled.service.operation.impl; +package com.hnac.hzims.scheduled.service.operation.station.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 com.hnac.hzims.scheduled.service.operation.station.StationAttributeService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; 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/station/impl/StationServiceImpl.java similarity index 77% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/StationServiceImpl.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/impl/StationServiceImpl.java index 8735909..e93135d 100644 --- 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/station/impl/StationServiceImpl.java @@ -1,8 +1,8 @@ -package com.hnac.hzims.scheduled.service.operation.impl; +package com.hnac.hzims.scheduled.service.operation.station.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 com.hnac.hzims.scheduled.service.operation.station.StationService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/MaintenancePlanMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/MaintenancePlanMapper.xml new file mode 100644 index 0000000..55abbd2 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/operation/MaintenancePlanMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WindHomeServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WindHomeServiceImpl.java index a7143b1..b286fdb 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WindHomeServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WindHomeServiceImpl.java @@ -43,7 +43,6 @@ 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.entity.Region; import org.springblade.system.feign.ISysClient; import org.springblade.system.user.cache.UserCache; import org.springblade.system.user.entity.User; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java index a85c2f0..f721f5c 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java @@ -59,7 +59,7 @@ public class MaintenanceTaskCreateTask { private final IOperMaintenanceTaskService taskService; private final IImsDutyMainService mainService; private final RedisTemplate redisTemplate; - private final IMessageClient messageClient; + 1 private final BladeLogger logger;