Merge remote-tracking branch 'origin/master'

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/entity/OperMaintenanceTaskEntity.java

@@ -191,4 +191,7 @@ public class OperMaintenanceTaskEntity extends TenantEntity {
 	 */
 	@ApiModelProperty("当前任务名")
 	private String flowTaskId;
+
+	@ApiModelProperty("是否延期")
+	private Boolean isDelay;
 }

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/vo/MaintenanceTaskQueryVO.java

@@ -0,0 +1,64 @@
+package com.hnac.hzims.operational.maintenance.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode
+@ApiModel("日常维护任务查询导出对象")
+public class MaintenanceTaskQueryVO implements Serializable {
+
+    @ApiModelProperty(value = "序号")
+    @ExcelProperty("序号")
+    private Integer index;
+
+    @ApiModelProperty(value = "创建机构名称")
+    @ExcelProperty("单位")
+    @ColumnWidth(20)
+    private String deptName;
+
+    @ExcelProperty("维护类型")
+    @ApiModelProperty(value = "维护类型名称")
+    @ColumnWidth(15)
+    private String typeName;
+
+    @ApiModelProperty(value = "维护设备")
+    @ExcelProperty("维护设备")
+    @ColumnWidth(25)
+    private String emName;
+
+    @ApiModelProperty(value = "维护内容")
+    @ExcelProperty("维护内容")
+    @ColumnWidth(40)
+    private String content;
+
+    @ApiModelProperty(value = "计划执行时间")
+    @ExcelProperty("计划执行时间")
+    @ColumnWidth(20)
+    private String planDisposeTime;
+
+    @ApiModelProperty(value = "实际执行时间")
+    @ExcelProperty("实际执行时间")
+    @ColumnWidth(20)
+    private String disposeTime;
+
+    @ApiModelProperty(value = "执行人")
+    @ExcelProperty("执行人")
+    @ColumnWidth(20)
+    private String disposerName;
+
+    @ApiModelProperty(value = "逾期状态")
+    @ExcelProperty("逾期状态")
+    private String delayStatus;
+
+    @ApiModelProperty(value = "状态")
+    @ExcelProperty("状态")
+    private String status;
+
+}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/MaintenanceTaskQueryController.java

@@ -0,0 +1,48 @@
+package com.hnac.hzims.operational.maintenance.controller;
+
+import com.hnac.hzims.operational.maintenance.service.IMaintenanceTaskQueryService;
+import com.hnac.hzims.operational.maintenance.vo.MaintenanceTaskQueryVO;
+import io.swagger.annotations.*;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * @ClassName MaintenanceTaskQueryController
+ * @description:
+ * @author: hx
+ * @create: 2024-01-08 14:35
+ * @Version 4.0
+ **/
+@RestController
+@RequestMapping("/maintenance/task/query")
+@Api(value = "日常维护任务导出管理",tags = "日常维护任务导出管理")
+@AllArgsConstructor
+public class MaintenanceTaskQueryController extends BladeController {
+
+    private final IMaintenanceTaskQueryService maintenanceTaskQueryService;
+
+    @GetMapping("/getMaintenanceTaskQuery")
+    @ApiOperation("查询日常维护任务")
+    @ApiOperationSupport(order = 1)
+    public R<List<MaintenanceTaskQueryVO>> getMaintenanceTaskQuery(@RequestParam("month") @ApiParam(value = "查询月份",required = true) String month,
+                                                                   @RequestParam(value = "deptId",required = false)  @ApiParam("查询机构") Long deptId) {
+        return R.data(maintenanceTaskQueryService.getMaintenanceTaskQuery(month, deptId));
+    }
+
+    @GetMapping("/exportMaintenanceTaskQuery")
+    @ApiOperation("导出日常维护任务")
+    @ApiOperationSupport(order = 1)
+    public void exportMaintenanceTaskQuery(@RequestParam("month") @ApiParam(value = "查询月份",required = true) String month,
+                                           @RequestParam(value = "deptId",required = false)  @ApiParam("查询机构") Long deptId, HttpServletResponse response) {
+        maintenanceTaskQueryService.exportMaintenanceTaskQuery(month,deptId,response);
+    }
+
+}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskSchedule.java

@@ -5,12 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hnac.hzims.equipment.feign.IEmInfoClient;
 import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity;
+import com.hnac.hzims.operational.duty.service.IImsDutyMainService;
 import com.hnac.hzims.operational.maintenance.entity.OperMaintenanceLibraryEntity;
 import com.hnac.hzims.operational.maintenance.entity.OperMaintenancePlanEntity;
 import com.hnac.hzims.operational.maintenance.entity.OperMaintenanceTaskEntity;
 import com.hnac.hzims.operational.maintenance.mapper.OperMaintenanceLibraryMapper;
 import com.hnac.hzims.operational.maintenance.service.IOperMaintenancePlanService;
 import com.hnac.hzims.operational.maintenance.service.IOperMaintenanceTaskService;
+import com.hnac.hzims.operational.maintenance.vo.OperMaintenanceTaskEntityVo;
 import com.hnac.hzinfo.inspect.plan.entity.PlanEntity;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
@@ -19,7 +21,9 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springblade.core.log.logger.BladeLogger;
+import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.*;
+import org.springblade.flow.core.entity.BladeFlow;
 import org.springblade.flow.core.feign.IFlowClient;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +35,7 @@ import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static com.hnac.hzims.operational.maintenance.constants.ScheduledConstant.TASK_VALUE_MAINTENANCE_TASK_CREATE;
 import static org.springblade.core.tool.utils.DateUtil.PATTERN_DATE;
@@ -47,6 +52,7 @@ public class MaintenanceTaskSchedule {
     private final IOperMaintenancePlanService planService;
     private final IOperMaintenanceTaskService taskService;
     private final IFlowClient flowClient;
+    private final IImsDutyMainService dutyMainService;
 
     //@XxlJob(TASK_VALUE_MAINTENANCE_TASK_CREATE)
     public ReturnT<String> execute(String param) throws Exception {
@@ -74,18 +80,15 @@ public class MaintenanceTaskSchedule {
             LocalDateTime disposeTime = taskEntity.getDisposeTime().toInstant()
                     .atZone(ZoneId.systemDefault()).toLocalDateTime();
             taskEntity.setPlanEndTime(disposeTime.plusHours(taskEntity.getHours()));
-
-
-
             if(StringUtil.isNotBlank(plan.getEmCode())){
                 List<String> emCodeList = Arrays.asList(plan.getEmCode().split(","));
                 for(String emCode : emCodeList){
                     taskEntity.setEmCode(emCode);
-                    this.createTask(taskEntity);
+                    this.createTask(taskEntity,plan);
                 }
             }
             else {
-                this.createTask(taskEntity);
+                this.createTask(taskEntity,plan);
             }
         }
         catch(Exception e) {
@@ -105,30 +108,61 @@ public class MaintenanceTaskSchedule {
     /**
      * 创建日常维护任务以及生成工作流
      * @param task 日常维护任务
+     * @param plan 日常维护计划
      */
-    private void createTask(OperMaintenanceTaskEntity task) {
+    private void createTask(OperMaintenanceTaskEntity task,OperMaintenancePlanEntity plan) {
         task.setId(null);
-        task.setCreateTime(new Date());
+        task.setCreateTime(null);
-        task.setUpdateTime(new Date());
+        task.setUpdateTime(null);
         task.setTaskCode(UUID.randomUUID().toString());
-//        if (ObjectUtil.isNotEmpty(task.getMaintenanceModel()) && finalPlanEntity.getMaintenanceModel() == 2) {
+        //补充计划结束时间
-//            //查询值班信息
+        Instant instant = task.getDisposeTime().toInstant();
-//            LambdaQueryWrapper<ImsDutyMainEntity> entityLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        ZoneId zoneId = ZoneId.systemDefault();
-//            entityLambdaQueryWrapper.eq(ImsDutyMainEntity::getDutyDate, DateTimeFormatter.ofPattern(PATTERN_DATE).format(disposeTime));
+        LocalDateTime disposeTime = instant.atZone(zoneId).toLocalDateTime();
-//            entityLambdaQueryWrapper.eq(ImsDutyMainEntity::getClassId, finalPlanEntity.getImsDutyClassId());
+        task.setPlanEndTime(disposeTime.plusHours(task.getHours()));
-//            ImsDutyMainEntity entity = mainService.getOne(entityLambdaQueryWrapper);
+        // 当模式为班次时
-//            if (ObjectUtil.isNotEmpty(entity) && StringUtils.isNotEmpty(entity.getDutyPersonIds())) {
+        Integer maintenanceModel = plan.getMaintenanceModel();
-//                String userId = entity.getDutyPersonIds();
+        if(Func.isNotEmpty(maintenanceModel) && maintenanceModel == 2 ) {
-//                taskEntity.setDisposer(userId.replaceAll("\\^", ","));
+            LambdaQueryWrapper<ImsDutyMainEntity> dutyQuery = Wrappers.<ImsDutyMainEntity>lambdaQuery()
-//            } else {
+                    .eq(ImsDutyMainEntity::getDutyDate, DateUtil.formatDate(task.getDisposeTime()))
-//                log.info("计划ID为：{}未查询到排班记录", finalPlanEntity.getId());
+                    .eq(ImsDutyMainEntity::getClassId, plan.getImsDutyClassId());
-//                LambdaUpdateWrapper<OperMaintenancePlanEntity> planQueryWrapper = Wrappers.<OperMaintenancePlanEntity>lambdaUpdate()
+            ImsDutyMainEntity entity = dutyMainService.getOne(dutyQuery);
-//                        .set(OperMaintenancePlanEntity::getCreateTaskTime, new Date())
+            if (ObjectUtil.isNotEmpty(entity) && StringUtils.isNotEmpty(entity.getDutyPersonIds())) {
-//                        .eq(OperMaintenancePlanEntity::getId, finalPlanEntity.getId());
+                String userId = entity.getDutyPersonIds();
-//                maintenancePlanService.update(planQueryWrapper);
+                task.setDisposer(userId.replaceAll("\\^", ","));
-//                return;
+            }
-//            }
+            else {
-//        }
+                XxlJobLogger.log("ID为："+plan.getId()+"的日常维护计划未获取到值班人员，未生成任务。");
+                return;
+            }
+        }
+        // 保存日常维护任务
+        taskService.save(task);
+        this.startProcessInstance(task);
+    }
+
+    /**
+     * 开启日常维护任务工作流
+     * @param task 日常维护任务
+     * @return 工作流实例ID
+     */
+    private String startProcessInstance(OperMaintenanceTaskEntity task) {
+        if(Func.isEmpty(task.getDisposer())) {
+            return null;
+        }
+        OperMaintenanceTaskEntityVo vo = BeanUtil.copy(task,OperMaintenanceTaskEntityVo.class);
+        Map<String,Object> params = new HashMap<String, Object>() {{
+            put("taskId", task.getId());
+            String userId = task.getDisposer();
+            List<String> userIds = Stream.of(userId.split(",")).collect(Collectors.toList());
+            Stream.iterate(0, i -> i + 1).limit(5).forEach(index -> {
+                String key = index == 0 ? "initUserIds" : "initUserIds".concat(String.valueOf(index));
+                put(key,index + 1 > userIds.size() ? "" :  "taskUser_".concat(userIds.get(index)));
+            });
+            put("operMaintenanceTaskEntityVo",vo);
+        }};
+        R<BladeFlow> flowResult = flowClient.startProcessInstanceContainNameByKey("", String.valueOf(task.getId()), task.getTitle(), params);
+        return Optional.ofNullable(flowResult).filter(r -> r.isSuccess()).map(R::getData).map(BladeFlow::getProcessInstanceId).orElse(null);
     }
 
 }

hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/IMaintenanceTaskQueryService.java

@@ -0,0 +1,14 @@
+package com.hnac.hzims.operational.maintenance.service;
+
+import com.hnac.hzims.operational.maintenance.vo.MaintenanceTaskQueryVO;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+public interface IMaintenanceTaskQueryService {
+
+    List<MaintenanceTaskQueryVO> getMaintenanceTaskQuery(String month,Long deptId);
+
+    void exportMaintenanceTaskQuery(String month, Long deptId, HttpServletResponse response);
+
+}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceTaskQueryServiceImpl.java

@@ -0,0 +1,145 @@
+package com.hnac.hzims.operational.maintenance.service.impl;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.converters.longconverter.LongStringConverter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.metadata.style.WriteCellStyle;
+import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
+import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Lists;
+import com.hnac.hzims.equipment.entity.EmInfoEntity;
+import com.hnac.hzims.equipment.feign.IEmInfoClient;
+import com.hnac.hzims.operational.maintenance.entity.OperMaintenanceTaskEntity;
+import com.hnac.hzims.operational.maintenance.service.IMaintenanceTaskQueryService;
+import com.hnac.hzims.operational.maintenance.service.IOperMaintenanceTaskService;
+import com.hnac.hzims.operational.maintenance.vo.MaintenanceTaskQueryVO;
+import com.hnac.hzims.operational.util.ObjectUtils;
+import com.hnac.hzims.spare.entity.WtSpBasicEntity;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.CollectionUtil;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.system.cache.DictCache;
+import org.springblade.system.entity.Dept;
+import org.springblade.system.feign.ISysClient;
+import org.springblade.system.user.cache.UserCache;
+import org.springblade.system.user.entity.User;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.function.IntFunction;
+import java.util.function.IntUnaryOperator;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+@Service
+@AllArgsConstructor
+@Slf4j
+public class MaintenanceTaskQueryServiceImpl implements IMaintenanceTaskQueryService {
+
+    private final IOperMaintenanceTaskService maintenanceTaskService;
+    private final ISysClient sysClient;
+    private final IEmInfoClient emInfoClient;
+
+
+    @Override
+    public List<MaintenanceTaskQueryVO> getMaintenanceTaskQuery(String month,Long deptId) {
+        LambdaQueryWrapper<OperMaintenanceTaskEntity> wq = Wrappers.<OperMaintenanceTaskEntity>lambdaQuery()
+                .like(OperMaintenanceTaskEntity::getDisposeTime, month)
+                .like(Func.isNotEmpty(deptId),OperMaintenanceTaskEntity::getCreateDept,deptId)
+                .orderByAsc(OperMaintenanceTaskEntity::getDisposeTime);
+        List<OperMaintenanceTaskEntity> taskList = maintenanceTaskService.list(wq);
+        if(CollectionUtil.isEmpty(taskList)) {
+            return Lists.newArrayList();
+        }
+        return this.fillTaskQuery(taskList);
+    }
+
+    @Override
+    public void exportMaintenanceTaskQuery(String month, Long deptId, HttpServletResponse response) {
+        List<MaintenanceTaskQueryVO> maintenanceTaskQuery = this.getMaintenanceTaskQuery(month, deptId);
+        // 设置响应头
+        // URLEncoder.encode防止中文乱码
+        String fileName;
+        try {
+            fileName = URLEncoder.encode("日常维护执行情况报表", "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("UTF-8");
+        WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
+        contentWriteCellStyle.setBorderLeft(BorderStyle.THIN);
+        contentWriteCellStyle.setBorderTop(BorderStyle.THIN);
+        contentWriteCellStyle.setBorderRight(BorderStyle.THIN);
+        contentWriteCellStyle.setBorderBottom(BorderStyle.THIN);
+        contentWriteCellStyle.setWrapped(true);
+        try {
+            EasyExcel.write(response.getOutputStream(), MaintenanceTaskQueryVO.class)
+                    .registerWriteHandler(new HorizontalCellStyleStrategy(new WriteCellStyle(), contentWriteCellStyle))
+                    .autoCloseStream(Boolean.FALSE).sheet("日常维护执行情况报表")
+                    .doWrite(maintenanceTaskQuery);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    /**
+     * 填充查询结果
+     * @param taskList 任务列表
+     * @return 填充任务结果
+     */
+    private List<MaintenanceTaskQueryVO> fillTaskQuery(List<OperMaintenanceTaskEntity> taskList) {
+        R<List<Dept>> deptListR = sysClient.getDeptList();
+        List<Dept> deptList = deptListR.isSuccess() ? deptListR.getData() : Lists.newArrayList();
+        List<EmInfoEntity> emList = emInfoClient.list();
+        IntFunction<MaintenanceTaskQueryVO> convert = index -> {
+            OperMaintenanceTaskEntity task = taskList.get(index);
+            MaintenanceTaskQueryVO result = new MaintenanceTaskQueryVO();
+            result.setIndex(index + 1);
+            // 获取机构名称
+            result.setDeptName(deptList.stream().filter(
+                    dept -> dept.getId().equals(task.getCreateDept())
+            ).findFirst().map(Dept::getDeptName).orElse(""));
+            // 获取维护类型
+            result.setTypeName(DictCache.getValue("typeCode",task.getTypeCode()));
+            // 获取维护设备
+            result.setEmName(emList.stream().filter(
+                    em -> em.getNumber().equals(task.getEmCode())
+            ).findFirst().map(EmInfoEntity::getName).orElse(""));
+            // 获取执行时间
+            result.setPlanDisposeTime(DateUtil.formatDateTime(task.getDisposeTime()));
+            result.setDisposeTime(Optional.ofNullable(task.getExecuteTime()).map(DateUtil::formatDateTime).orElse(""));
+            // 获取执行人
+            String disposerName = Optional.ofNullable(task.getDisposer()).map(ObjectUtils::getUserNameByUserIds).orElse("");
+            result.setDisposerName(disposerName);
+            // 获取维护内容
+            result.setContent(task.getContent());
+            // 获取延期状态
+            result.setDelayStatus(task.getIsDelay() ? "逾期" : "未逾期");
+            // 获取状态
+            result.setStatus("结束".equals(task.getFlowTaskName()) ? "已完成" : "进行中");
+            return result;
+        };
+        List<MaintenanceTaskQueryVO> result = IntStream.iterate(0,index -> index+1).limit(taskList.size()).mapToObj(convert).collect(Collectors.toList());
+        return result;
+    }
+}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/ObjectUtils.java

@@ -3,7 +3,12 @@ package com.hnac.hzims.operational.util;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.tool.utils.CollectionUtil;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.system.user.cache.UserCache;
+import org.springblade.system.user.entity.User;
+
 import java.lang.reflect.Field;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -16,6 +21,20 @@ import java.util.stream.Collectors;
 public class ObjectUtils {
 
 	/**
+	 * 根据用户Id获取用户名称
+	 * @param userIds 用户IDs
+	 * @return 用户名称
+	 */
+	public static String getUserNameByUserIds(String userIds) {
+		if(StringUtil.isBlank(userIds)) {
+			return "";
+		}
+		return Arrays.stream(userIds.split(",")).filter(StringUtil::isNotBlank).map(Long::valueOf).filter(Func::isNotEmpty)
+				.map(UserCache::getUser).filter(Func::isNotEmpty).map(User::getName).collect(Collectors.joining(","));
+	}
+
+
+	/**
 	 * 对象转为map
 	 * @param obj
 	 * @return

hzims-service/operational/src/main/resources/db/1.0.1.sql

@@ -1 +1,2 @@
-alter  table  hzims_oper_maintenance_plan add column station_code varchar(60) comment  '站点编码'
+alter  table  hzims_oper_maintenance_plan add column station_code varchar(60) comment  '站点编码';
+alter table `hzims_oper_maintenance_task` add column `is_delay` tinyint(2) DEFAULT 0 COMMENT '是否逾期';

hzims-service/safeproduct/src/main/resources/db/1.0.2.sql

@@ -0,0 +1 @@
+alter table `hzims_oper_maintenance_task` add column `is_delay` tinyint(2) default 0 comment '是否延期';