Merge remote-tracking branch 'origin/master'

hzims-service-api/common-api/src/main/java/com/hnac/hzims/vo/VoteChartVo.java

@@ -37,6 +37,6 @@ public class VoteChartVo {
 	@ExcelIgnore
 	private List<Long> finishIds;
 	@ApiModelProperty(value = "完成率")
-	@ExcelProperty(value = "完成率", index = 3)
+	@ExcelProperty(value = "完成率", index = 4)
 	private Double finishRate;
 }

hzims-service-api/middle-api/src/main/java/com/hnac/hzims/middle/process/constant/TicketProcessConstant.java

@@ -45,6 +45,11 @@ public class TicketProcessConstant {
      * 检修任务
      */
     public static final String OVERHAUL_TASK = "overhaul_task";
+
+    /**
+     * 工作任务
+     */
+    public static final String WORK_TASK = "work_task";
 //    public static final String DEFECT_KEY = "defectCheck";
 
 

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/repair/entity/WorkTaskEntity.java

@@ -0,0 +1,118 @@
+package com.hnac.hzims.ticket.repair.entity;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author ysj
+ */
+@Data
+@TableName("hzims_work_task")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "工作任务表", description = "工作任务表")
+public class WorkTaskEntity extends TenantEntity {
+
+	private static final long serialVersionUID = -3122149146340663132L;
+
+	@ApiModelProperty(value = "设备code")
+	private String emCode;
+
+	@ApiModelProperty(value = "编号")
+	private String number;
+
+	@ApiModelProperty(value = "单位")
+	private String company;
+
+	@ApiModelProperty(value = "处理状态")
+	private Integer handleStatus;
+
+	@ApiModelProperty(value = "应急抢修发起人")
+	private Long originator;
+
+	@ApiModelProperty(value = "应急抢修负责人")
+	private Long charge;
+
+	@ApiModelProperty(value = "应急抢修班组")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	private Long repairTeam;
+
+	@ApiModelProperty(value = "应急抢修人员")
+	private String repairPersonnel;
+
+	@ApiModelProperty(value = "应急抢修任务描述")
+	private String repairTask;
+
+	@ApiModelProperty(value = "安全措施")
+	private String safetyMeasures;
+
+	@ApiModelProperty(value = "注意事项")
+	private String pointsAttention;
+
+	@ApiModelProperty(value = "现场保留安全措施")
+	private String reserveMeasures;
+
+	@ApiModelProperty(value = "许可人")
+	private Long licensor;
+
+	@DateTimeFormat(
+		pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	@JsonFormat(
+		pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	@ApiModelProperty(value = "许可时间")
+	private Date licensorTime;
+
+	@ApiModelProperty(value = "许可人安全措施")
+	private String licensorMeasures;
+
+	@ApiModelProperty(value = "许可人描述")
+	private String licensorMemo;
+
+	@DateTimeFormat(
+		pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	@JsonFormat(
+		pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	@ApiModelProperty(value = "许可完成确认时间")
+	private Date licensorCompleteTime;
+
+	@ApiModelProperty(value = "抢修工时")
+	private String implementHours;
+
+	@DateTimeFormat(
+		pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	@JsonFormat(
+		pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	@ApiModelProperty(value = "抢修开始时间")
+	private Date implementStartTime;
+
+	@DateTimeFormat(
+		pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	@JsonFormat(
+		pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	@ApiModelProperty(value = "抢修结束时间")
+	private Date implementEndTime;
+
+	@ApiModelProperty(value = "抢修描述")
+	private String implementDesc;
+
+	@ApiModelProperty(value = "流程实例ID")
+	private String processInstanceId;
+}

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/repair/fegin/IWorkTaskClient.java

@@ -0,0 +1,26 @@
+package com.hnac.hzims.ticket.repair.fegin;
+
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
+import com.hnac.hzims.ticket.constants.TicketConstants;
+import org.springblade.core.tool.api.R;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author ysj
+ */
+@FeignClient(
+	value = TicketConstants.APP_NAME,
+	fallback = RepairClientFallback.class
+)
+public interface IWorkTaskClient {
+
+	String API_PREFIX = "/feign/workTask";
+
+	String WORK_TASK_PROCESS_LISTENER = API_PREFIX + "/listener";
+
+	@PostMapping(WORK_TASK_PROCESS_LISTENER)
+	R<Boolean> listener(@RequestBody ProcessWorkFlowResponse processWorkFlowResponse);
+}
+

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/repair/fegin/WorkTaskClientFallback.java

@@ -0,0 +1,17 @@
+package com.hnac.hzims.ticket.repair.fegin;
+
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
+import org.springblade.core.tool.api.R;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author ysj
+ */
+@Component
+public class WorkTaskClientFallback implements IWorkTaskClient {
+
+	@Override
+	public R<Boolean> listener(ProcessWorkFlowResponse processWorkFlowResponse) {
+		return R.status(false);
+	}
+}

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/WorkTaskServiceImpl.java

@@ -0,0 +1,44 @@
+package com.hnac.hzims.middle.processflow.strategy.serviceimpl;
+
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
+import com.hnac.hzims.middle.processflow.service.ProcessDictService;
+import com.hnac.hzims.middle.processflow.strategy.abstracts.ProcessAbstractService;
+import com.hnac.hzims.middle.processflow.strategy.entity.WorkflowQueue;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import static com.hnac.hzims.middle.process.constant.TicketProcessConstant.WORK_TASK;
+
+/**
+ * @author ysj
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class WorkTaskServiceImpl extends ProcessAbstractService {
+
+    private final ProcessDictService processDictService;
+
+    /**
+     * 消息确认-工作任务单
+     * @param flowQueue
+     * @return
+     */
+    @Override
+    public Boolean isWorkflowProcess(WorkflowQueue flowQueue) {
+        String dictValue = processDictService.selectDictValueByKey(WORK_TASK);
+        return dictValue.equals(flowQueue.getProcessDefinitionKey());
+    }
+
+    /**
+     * 调用工作任务流程监听
+     * @param response
+     */
+    @Override
+    public void calculate(ProcessWorkFlowResponse response) {
+
+        /*if (!defect.isSuccess()) {
+            throw new ServiceException("检修任务业务执行异常！");
+        }*/
+    }
+}

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/BasicScheduledTask.java

@@ -13,19 +13,22 @@ import com.hnac.hzims.message.fegin.IMessageConfigClient;
 import com.hnac.hzims.scheduled.mapper.basic.PersonManagemetMapper;
 import com.hnac.hzims.scheduled.service.basic.IImsCertificatetNoticeService;
 import com.hnac.hzims.scheduled.service.basic.IImsCertificatetService;
+import com.hnac.hzims.scheduled.service.basic.IImsPresonManagementService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.junit.jupiter.api.Test;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.system.feign.ISysClient;
 import org.springblade.system.user.cache.UserCache;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.text.ParseException;
@@ -33,7 +36,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.hnac.hzims.operational.main.constant.MainConstants.*;
+import static com.hnac.hzims.operational.main.constant.MainConstants.CERTIFICATET_DEAD_LINE_NOTICE;
 
 
 /**
@@ -43,7 +46,7 @@ import static com.hnac.hzims.operational.main.constant.MainConstants.*;
  */
 @Slf4j
 @Component
-public class basicScheduledTask {
+public class BasicScheduledTask {
 
     @Autowired
     private IImsCertificatetService iImsCertificatetService;
@@ -56,7 +59,7 @@ public class basicScheduledTask {
     @Autowired
     private IMessageClient messageClient;
     @Autowired
-    private PersonManagemetMapper personManagemetMapper;
+    private IImsPresonManagementService presonManagementService;
     @Autowired
     private IMessageConfigClient messageConfigClient;
 
@@ -64,10 +67,12 @@ public class basicScheduledTask {
      * realId刷新
      */
     @XxlJob(CERTIFICATET_DEAD_LINE_NOTICE)
-//    @Scheduled(cron = "0 */1 * * * ? ")
+//    @Scheduled(cron = "0/40 * * * * ? ")
     public ReturnT<String> certificatetDeadLineNotice(String param) throws ParseException {
+//    public ReturnT<String> certificatetDeadLineNotice() throws ParseException {
+//        String param="";
         Date endTime = new Date();
-        if (Func.isBlank(param)) {
+        if (StringUtils.isNotBlank(param)) {
             endTime = new SimpleDateFormat("yyyy-MM-dd").parse(param);
         }
         CertificatetNoticeEntity noticeEntity = iImsCertificatetNoticeService.getOne(Wrappers.<CertificatetNoticeEntity>lambdaQuery()
@@ -81,7 +86,7 @@ public class basicScheduledTask {
         List<String> userList = Arrays.asList(noticeUsers.split(","));
         if (CollectionUtil.isNotEmpty(userList) && CollectionUtil.isNotEmpty(list)) {
             List<String> personIds = list.stream().map(CertificatetEntity::getPersonId).collect(Collectors.toList());
-            List<PersonManagemetEntity> personManagemetEntities = personManagemetMapper.selectList(Wrappers.<PersonManagemetEntity>query().lambda().in(PersonManagemetEntity::getId, personIds));
+            List<PersonManagemetEntity> personManagemetEntities = presonManagementService.list(Wrappers.<PersonManagemetEntity>query().lambda().in(PersonManagemetEntity::getId, personIds));
             String personNotice="";
             if (CollectionUtil.isNotEmpty(personManagemetEntities)) {
                 personNotice = personManagemetEntities.stream().map(PersonManagemetEntity::getName).collect(Collectors.joining(","));
@@ -93,7 +98,6 @@ public class basicScheduledTask {
         }
         return new ReturnT<>("SUCCESS");
     }
-
     private void sendSmsByUserList(List<String> userList, Date date,String personNotice) {
         //区分用户
         for (String s : userList) {

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/IImsPresonManagementService.java

@@ -0,0 +1,21 @@
+package com.hnac.hzims.scheduled.service.basic;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hnac.hzims.basic.entity.PersonManagemetEntity;
+import com.hnac.hzims.basic.vo.PersonManagemetExportVo;
+import com.hnac.hzims.basic.vo.PersonManagemetVo;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+
+import java.util.List;
+
+/**
+ *  服务类
+ *
+ * @author Chill
+ */
+public interface IImsPresonManagementService extends IService<PersonManagemetEntity> {
+
+
+}

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/CertificatetNoticeServiceImpl.java

@@ -1,5 +1,6 @@
 package com.hnac.hzims.scheduled.service.basic.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.hnac.hzims.basic.entity.CertificatetNoticeEntity;
 import com.hnac.hzims.scheduled.mapper.basic.CertificatetNoticeMapper;
 import com.hnac.hzims.scheduled.service.basic.IImsCertificatetNoticeService;
@@ -17,5 +18,6 @@ import org.springframework.stereotype.Service;
 @Service
 @Slf4j
 @RequiredArgsConstructor
+@DS("basic")
 public class CertificatetNoticeServiceImpl extends BaseServiceImpl<CertificatetNoticeMapper, CertificatetNoticeEntity> implements IImsCertificatetNoticeService {
 }

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/CertificatetServiceImpl.java

@@ -1,5 +1,6 @@
 package com.hnac.hzims.scheduled.service.basic.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.hnac.hzims.basic.entity.CertificatetEntity;
 import com.hnac.hzims.scheduled.mapper.basic.CertificatetMapper;
 import com.hnac.hzims.scheduled.service.basic.IImsCertificatetService;
@@ -17,5 +18,6 @@ import org.springframework.stereotype.Service;
 @Service
 @Slf4j
 @RequiredArgsConstructor
+@DS("basic")
 public class CertificatetServiceImpl extends BaseServiceImpl<CertificatetMapper, CertificatetEntity> implements IImsCertificatetService {
 }

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/PresonManagementServiceImpl.java

@@ -0,0 +1,27 @@
+package com.hnac.hzims.scheduled.service.basic.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.basic.entity.PersonManagemetEntity;
+import com.hnac.hzims.scheduled.mapper.basic.PersonManagemetMapper;
+import com.hnac.hzims.scheduled.service.basic.IImsPresonManagementService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+
+
+/**
+ * 人员信息实现类
+ *
+ * @author ty
+ */
+@Service
+@Slf4j
+@RequiredArgsConstructor
+@DS("basic")
+public class PresonManagementServiceImpl extends BaseServiceImpl<PersonManagemetMapper, PersonManagemetEntity> implements IImsPresonManagementService {
+
+
+
+}

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java

@@ -1166,7 +1166,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, TaskEntity> imp
         if (CollectionUtil.isEmpty(list)||CollectionUtil.isEmpty(undoneIds)){
             voteChartVo.setFinishRate(0.00d);
         }else {
-            BigDecimal divide = new BigDecimal(list.size()).divide(new BigDecimal(list.size()),2,BigDecimal.ROUND_UP);
+            BigDecimal divide = new BigDecimal(finishIds.size()).divide(new BigDecimal(list.size()),2,BigDecimal.ROUND_UP);
             voteChartVo.setFinishRate(divide.doubleValue());
         }
         return voteChartVo;

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/fegin/WorkTaskClient.java

@@ -0,0 +1,26 @@
+package com.hnac.hzims.ticket.repair.fegin;
+
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
+import com.hnac.hzims.ticket.repair.service.IWorkTaskService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author ysj
+ */
+@RestController
+@Slf4j
+@AllArgsConstructor
+public class WorkTaskClient implements IWorkTaskClient {
+
+	private final IWorkTaskService workTaskService;
+
+	@Override
+	@PostMapping(WORK_TASK_PROCESS_LISTENER)
+	public R<Boolean> listener(ProcessWorkFlowResponse processWorkFlowResponse) {
+		return R.status(workTaskService.listener(processWorkFlowResponse));
+	}
+}

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/mapper/WorkTaskMapper.java

@@ -0,0 +1,11 @@
+package com.hnac.hzims.ticket.repair.mapper;
+
+import com.hnac.hzims.ticket.repair.entity.WorkTaskEntity;
+import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
+
+/**
+ * @author ysj
+ */
+public interface WorkTaskMapper extends UserDataScopeBaseMapper<WorkTaskEntity> {
+
+}

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/mapper/xml/WorkTaskMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hnac.hzims.ticket.repair.mapper.WorkTaskMapper">
+
+
+</mapper>

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/service/IWorkTaskService.java

@@ -0,0 +1,13 @@
+package com.hnac.hzims.ticket.repair.service;
+
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
+import com.hnac.hzims.ticket.repair.entity.WorkTaskEntity;
+import org.springblade.core.mp.base.BaseService;
+
+/**
+ * @author ysj
+ */
+public interface IWorkTaskService extends BaseService<WorkTaskEntity> {
+
+    boolean listener(ProcessWorkFlowResponse processWorkFlowResponse);
+}

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/service/impl/WorkTaskServiceImpl.java

@@ -0,0 +1,27 @@
+package com.hnac.hzims.ticket.repair.service.impl;
+
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
+import com.hnac.hzims.ticket.repair.entity.WorkTaskEntity;
+import com.hnac.hzims.ticket.repair.mapper.WorkTaskMapper;
+import com.hnac.hzims.ticket.repair.service.IWorkTaskService;
+import lombok.RequiredArgsConstructor;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author ysj
+ */
+@Service
+@RequiredArgsConstructor
+public class WorkTaskServiceImpl extends BaseServiceImpl<WorkTaskMapper, WorkTaskEntity> implements IWorkTaskService {
+
+    /**
+     * 工作任务流程监听 ：业务处理
+     * @param processWorkFlowResponse
+     * @return
+     */
+    @Override
+    public boolean listener(ProcessWorkFlowResponse processWorkFlowResponse) {
+        return false;
+    }
+}