Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DutyFirstAidDto.java

@@ -10,37 +10,43 @@ import lombok.Data;
 @ApiModel(value = "DutyFirstAidDto", description = "120急救站值班")
 public class DutyFirstAidDto implements Serializable {
 	 private static final long serialVersionUID = 1L;
-		
+
 	    @ApiModelProperty(value = "用户id")
 	    private String userId;
-		
+
 	    @ApiModelProperty(value = "用户名称")
 	    private String userName;
-	    
+
 	    @ApiModelProperty(value = "单位ID")
 	    private String teamId;
-	   
+
 	    @ApiModelProperty(value = "单位名称")
 	    private String teamName;
-	    
+
 	    @ApiModelProperty(value = "岗位id")
 	    private String postType;
-	    
+
 	    @ApiModelProperty(value = "岗位名称")
 	    private String postTypeName;
-	    
+
 	    @ApiModelProperty(value = "值班信息")
 	    private List<DutyPersonShiftDto> dutyShift;
-	    
+
 	    @ApiModelProperty(value = "值班开始时间")
 	    private String startTime;
-	    
+
 	    @ApiModelProperty(value = "值班结束时间")
 	    private String endTime;
-	    
+
 	    @ApiModelProperty(value = "120急救站")
 	    private String firstAid;
-	    
+
 	    @ApiModelProperty(value = "120急救站Id")
 	    private String firstAidId;
+
+	    @ApiModelProperty(value = "值班区域")
+        private String dutyArea;
+
+	    @ApiModelProperty(value = "值班区域Id")
+        private String dutyAreaId;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/rule/action/MessageAction.java

+package com.yeejoin.amos.boot.module.common.api.rule.action;//package com.yeejoin.amos.latentdanger.business.rule.action;
+
+import com.alibaba.fastjson.JSON;
+import com.yeejoin.amos.boot.module.common.api.util.RuleUtils;
+import com.yeejoin.amos.component.rule.RuleActionBean;
+import com.yeejoin.amos.component.rule.RuleMethod;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.MessageModel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+
+/**
+ * @Author: xl
+ * @Description: 消息规则动作
+ * @Date: 2021/11/10 11:49
+ */
+@Component
+@RuleActionBean(beanLabel = "消息发送")
+public class MessageAction {
+
+    public static final Logger log = LoggerFactory.getLogger(MessageAction.class);
+
+    @RuleMethod(methodLabel = "消息发送", project = "消息")
+    public void sendMessage(Object msgObj, String title, String content) {
+        MessageModel messageModel = JSON.parseObject(JSON.toJSONString(msgObj), MessageModel.class);
+        messageModel.setTitle(title);
+        messageModel.setBody(RuleUtils.instedParams(content, msgObj));
+        if (!ValidationUtil.isEmpty(messageModel)) {
+            try {
+                Systemctl.messageClient.create(messageModel);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}
+
+

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/util/RuleUtils.java

+package com.yeejoin.amos.boot.module.common.api.util;
+
+import com.alibaba.fastjson.JSON;
+
+import java.util.Map;
+
+/**
+ * @Author: xl
+ * @Description:
+ * @Date: 2021/11/12 18:37
+ */
+public class RuleUtils {
+
+    public static String instedParams(String content, Object msgObj) {
+        Map<String, Object> strengthMap = JSON.parseObject(JSON.toJSONString(msgObj), Map.class);
+        for (String key : strengthMap.keySet())
+            content = content.replaceAll("\\$\\{" + key + "}", String.valueOf(strengthMap.get(key)));
+        return content;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/common/enums/RuleTypeEnum.java

+package com.yeejoin.amos.latentdanger.common.enums;
+
+/**
+ * 规则请求枚举
+ * @author xl
+ *
+ */
+public enum RuleTypeEnum {
+	// 隐患
+	隐患第一次提交("隐患提交", "addLatentDanger"),
+	隐患审核("隐患审核", "dangerAudit");
+
+	/**
+	 * 名称，描述
+	 */
+	private String name;
+	/**
+	 * 编码
+	 */
+	private String code;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	private RuleTypeEnum(String name, String code){
+		this.name = name;
+		this.code = code;
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/dto/LatentDangerRo.java

+package com.yeejoin.amos.latentdanger.business.dto;
+
+import com.yeejoin.amos.component.rule.Label;
+import com.yeejoin.amos.component.rule.RuleFact;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: xl
+ * @Description: 隐患规则实体
+ * @Date: 2021/11/12 14:44
+ */
+@Data
+@RuleFact(value = "隐患",project = "消息规则")
+public class LatentDangerRo implements Serializable {
+
+    private static final long serialVersionUID = -2985122485796921797L;
+
+    @Label("隐患名称")
+    private String dangerName;
+
+    @Label(value = "隐患等级名称")
+    private String dangerLevelName;
+
+    @Label(value = "执行方法")
+    private String ruleType;
+
+    @Label(value = "整改类型名称")
+    private String reformTypeName;
+
+    @Label(value = "隐患状态名称")
+    private String dangerStateName;
+
+    @Label(value = "执行状态")
+    private String excuteStateName;
+
+    @Label(value = "推送时间")
+    private String sendTime;
+
+    @Label(value = "接收人")
+    private List<String> recivers;
+
+    @Label(value = "发送到web标识")
+    private Boolean isSendWeb;
+
+    @Label(value = "发送到app标识")
+    private Boolean isSendApp;
+
+    @Label("关联id")
+    private String relationId;
+
+    @Label("消息类型")
+    private String msgType;
+
+    @Label(value = "终端标识")
+    private String terminal;
+
+    @Label(value = "扩展参数")
+    private Map<String, String> extras;
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java

@@ -49,20 +49,7 @@ import com.yeejoin.amos.latentdanger.business.vo.DangerTimeAxisVo;
 import com.yeejoin.amos.latentdanger.business.vo.LatentDangerDetailRiskVo;
 import com.yeejoin.amos.latentdanger.business.vo.LatentDangerDetailVo;
 import com.yeejoin.amos.latentdanger.business.vo.LatentDangerListVo;
-import com.yeejoin.amos.latentdanger.common.enums.DangerHandleStateEnum;
-import com.yeejoin.amos.latentdanger.common.enums.DictTypeEnum;
-import com.yeejoin.amos.latentdanger.common.enums.ExecuteStateEnum;
-import com.yeejoin.amos.latentdanger.common.enums.ExecuteTypeEnum;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerBizTypeEnum;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerExecuteTypeEnum;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerLevelEnum;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerOvertimeStateEnum;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerProcessStateEnum;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerReformTypeEnum;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerState;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerStateEnum;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerTypeEnum;
-import com.yeejoin.amos.latentdanger.common.enums.OwerEnum;
+import com.yeejoin.amos.latentdanger.common.enums.*;
 import com.yeejoin.amos.latentdanger.common.remote.RemoteSpcService;
 import com.yeejoin.amos.latentdanger.common.remote.RemoteWebSocketServer;
 import com.yeejoin.amos.latentdanger.common.remote.RemoteWorkFlowService;
@@ -144,6 +131,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
     private RemoteSpcService remoteSpcService;
     @Autowired
     private AsyncTask asyncTask;
+    @Autowired
+    private RuleDangerService ruleDangerService;
     //    @Autowired
 //    private Business business;
     @Autowired
@@ -288,7 +277,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
                 latentDanger.setCurrentFlowRecordId(inputRecord.getId());
                 latentDanger.setInstanceId(instance.getString("id"));
                 latentDangerMapper.updateById(latentDanger);
-                asyncTask.sendDangerMsg(RequestContext.cloneRequestContext(), latentDanger, onSiteConfirmRole);
+                ruleDangerService.addLatentDangerRule(latentDanger, RuleTypeEnum.隐患第一次提交.getCode(), onSiteConfirmRole);
             }
 
             // TODO 使用远程调用替换
@@ -2110,7 +2099,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             throw new Exception(executeSubmitDto.getMsg());
         }
         List<String> userIds = workflowExecuteService.getUserIdsByWorkflow(latentDanger.getInstanceId(), executeSubmitDto.getCheckLeaderId());
-        asyncTask.sendDangerSubmitMsg(RequestContext.cloneRequestContext(), latentDanger, userIds, ExecuteTypeEnum.getNameByCode(executeType));
+        ruleDangerService.addDangerSubmitRule(latentDanger, userIds, RuleTypeEnum.隐患审核.getCode(), ExecuteTypeEnum.getNameByCode(executeType));
         return executeSubmitDto;
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/RuleDangerService.java

+package com.yeejoin.amos.latentdanger.business.service.impl;
+
+import com.yeejoin.amos.component.rule.RuleTrigger;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.RoleModel;
+import com.yeejoin.amos.latentdanger.business.dto.LatentDangerRo;
+import com.yeejoin.amos.latentdanger.business.util.DateUtil;
+import com.yeejoin.amos.latentdanger.common.enums.LatentDangerState;
+import com.yeejoin.amos.latentdanger.dao.entity.LatentDanger;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @Author: xl
+ * @Description: 隐患触发规则
+ * @Date: 2021/11/12 14:55
+ */
+@Service
+public class RuleDangerService {
+
+    private final String packageId = "消息/addDangerRule";
+    private final String msgType = "danger";
+
+    private final String APP = "APP";
+    private final String WEB = "WEB";
+    private final String APP_WEB = "APP/WEB";
+
+    @Autowired
+    private RuleTrigger ruleTrigger;
+
+    public Boolean addLatentDangerRule(LatentDanger latentDanger, String ruleType, String roleName) throws Exception {
+        LatentDangerRo latentDangerRo = buildLatentDangerRo(latentDanger, ruleType);
+        List<RoleModel> result = Privilege.roleClient.queryRoleList(roleName, null).getResult();
+        if (result.size() > 0) {
+            List<AgencyUserModel> userModels = Privilege.agencyUserClient.queryByRoleId(String.valueOf(result.get(0).getSequenceNbr()), null).getResult();
+            List<String> userIds = userModels.stream().map(AgencyUserModel::getUserId).collect(Collectors.toList());
+            latentDangerRo.setRecivers(userIds);
+        }
+        //触发规则
+        ruleTrigger.publish(latentDangerRo, packageId, new String[0]);
+        return true;
+    }
+
+    public Boolean addDangerSubmitRule(LatentDanger latentDanger, List<String> userIds, String ruleType, String excuteStateName) throws Exception {
+        LatentDangerRo latentDangerRo = buildLatentDangerRo(latentDanger, ruleType);
+        latentDangerRo.setExcuteStateName(excuteStateName);
+        latentDangerRo.setIsSendWeb(true);
+        latentDangerRo.setRecivers(userIds);
+
+        //触发规则
+        ruleTrigger.publish(latentDangerRo, packageId, new String[0]);
+        return true;
+    }
+
+    private LatentDangerRo buildLatentDangerRo (LatentDanger latentDanger, String ruleType){
+        LatentDangerRo latentDangerRo = new LatentDangerRo();
+        BeanUtils.copyProperties(latentDanger, latentDangerRo);
+        latentDangerRo.setMsgType(msgType);
+        latentDangerRo.setIsSendApp(true);
+        latentDangerRo.setRuleType(ruleType);
+        latentDangerRo.setRelationId(String.valueOf(latentDanger.getId()));
+        latentDangerRo.setSendTime(DateUtil.date2LongStr(new Date()));
+
+        String type = null;
+        latentDanger.getDangerState();
+        LatentDangerState.SupervisionDangerStateEnum stateEnum =
+                LatentDangerState.SupervisionDangerStateEnum.getEnumByCode(latentDanger.getDangerState());
+        if (!ValidationUtil.isEmpty(stateEnum)) {
+            if (stateEnum.getProcessState().equals("1")) {
+                type = "1";
+            } else if (stateEnum.getProcessState().equals("4")) {
+                type = "2";
+            }
+        }
+
+        if (!ValidationUtil.isEmpty(type)){
+            Map<String, String> map = new HashMap<>();
+            map.put("type", type);
+            latentDangerRo.setExtras(map);
+        }
+        return latentDangerRo;
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/LatentDangerController.java

 package com.yeejoin.amos.patrol.business.controller;
 
-import java.util.Date;
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
@@ -38,10 +17,28 @@ import com.yeejoin.amos.patrol.business.util.FileHelper;
 import com.yeejoin.amos.patrol.business.vo.DangerTimeAxisVo;
 import com.yeejoin.amos.patrol.common.enums.DictTypeEnum;
 import com.yeejoin.amos.patrol.core.common.response.DangerListResponse;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
 
 @RestController
 @RequestMapping(value = "/api/latent/danger")
@@ -139,7 +136,6 @@ public class LatentDangerController extends AbstractBaseController {
             }
             return iLatentDangerService.detail(id, user.getUserId(),isFinish);
         } catch (Exception e) {
-            logger.error("隐患详情异常", e.getMessage());
             return CommonResponseUtil.failure("系统繁忙，请稍后再试");
         }
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/feign/FeignBasicAuthRequestInterceptor.java

@@ -23,7 +23,11 @@ public class FeignBasicAuthRequestInterceptor implements RequestInterceptor {
         HttpServletRequest request = attributes.getRequest();
   
         //设置header
-        String token = request.getHeader("X-Access-Token");
+        String token = request.getHeader("token");
+        if (null == token) {
+            token = request.getHeader("X-Access-Token");
+        }
+
         String product = request.getHeader("product");
         String appKey = request.getHeader("appKey");
         template.header("token", token);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/feign/FeignConfiguration.java

 package com.yeejoin.amos.patrol.business.feign;
 
+import feign.codec.Encoder;
+import feign.form.spring.SpringFormEncoder;
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.cloud.openfeign.support.SpringEncoder;
 import org.springframework.context.annotation.Bean;
 
-import feign.codec.Encoder;
-import feign.form.spring.SpringFormEncoder;
-
 public class FeignConfiguration {
 
-	   @Autowired
-		private ObjectFactory<HttpMessageConverters> messageConverters;
-		@Bean
-		public Encoder feignFormEncoder() {
-			return new SpringFormEncoder(new SpringEncoder(messageConverters));
-		}
-		 @Bean
-		    public FeignBasicAuthRequestInterceptor basicAuthRequestInterceptor() {
-		        return new FeignBasicAuthRequestInterceptor();
-		    }
+    @Autowired
+    private ObjectFactory<HttpMessageConverters> messageConverters;
+
+    @Bean
+    public Encoder feignFormEncoder() {
+        return new SpringFormEncoder(new SpringEncoder(messageConverters));
+    }
+
+    @Bean
+    public FeignBasicAuthRequestInterceptor basicAuthRequestInterceptor() {
+        return new FeignBasicAuthRequestInterceptor();
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/feign/JcsFeignClient.java

+package com.yeejoin.amos.patrol.business.feign;
+
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+// 机场服务
+@FeignClient(name = "${jcs.fegin.name}", path = "jcs", configuration = FeignConfiguration.class)
+public interface JcsFeignClient {
+
+    /**
+     * 根据机场人员id获取amos平台人员id
+     *
+     * @param orgUserId 机场单位人员id
+     * @return AgencyUserModel 平台人员信息
+     **/
+    @RequestMapping(value = "/org-usr/amos/{orgUserId}", method = RequestMethod.GET)
+    ResponseModel<AgencyUserModel> getAmosIdByUserId(@PathVariable String orgUserId);
+}
+

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/param/LatentDangerExcuteParam.java

@@ -49,5 +49,9 @@ public class LatentDangerExcuteParam {
 
     private  Integer dangerLevel;
 
+    /**
+     * 治理人员id
+     */
+    public String governUserId;
 }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/LatentDangerServiceImpl.java

@@ -9,6 +9,7 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
 import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
+import com.yeejoin.amos.boot.biz.common.service.impl.WorkflowExcuteServiceImpl;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
@@ -35,6 +36,7 @@ import com.yeejoin.amos.patrol.business.entity.mybatis.extend.LatentDangerNotice
 import com.yeejoin.amos.patrol.business.entity.mybatis.extend.LatentDangerPatrolBo;
 import com.yeejoin.amos.patrol.business.feign.Business;
 import com.yeejoin.amos.patrol.business.feign.EquipFeign;
+import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
 import com.yeejoin.amos.patrol.business.param.LatentDangerExcuteParam;
 import com.yeejoin.amos.patrol.business.param.LatentDangerListParam;
 import com.yeejoin.amos.patrol.business.param.LatentDangerNormalParam;
@@ -169,6 +171,12 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
     @Autowired
     EquipFeign equipFeign;
 
+    @Autowired
+    JcsFeignClient jcsFeignClient;
+
+    @Autowired
+    private WorkflowExcuteServiceImpl workflowExecuteService;
+
     private static final String permissionType = "SUBMENU";
 
     private static final String acctivePermissionType = "activitiItem";
@@ -731,12 +739,16 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
     @Override
     public CommonResponse detail(String id, String userId, boolean isFinish) {
         JSONObject jsonObject;
-        if(isFinish){
+        if (isFinish) {
             jsonObject = remoteWorkFlowService.queryFinishTaskDetail(id);
-        }else{
+        } else {
             jsonObject = remoteWorkFlowService.queryTaskDetail(id);
         }
 
+        if (ValidationUtil.isEmpty(jsonObject)) {
+            return null;
+        }
+
         JSONObject task = jsonObject.getJSONObject("data");
         LatentDangerBo latentDangerBo = latentDangerMapper.getbyBusinessKey(task.getString("businessKey"));
 
@@ -1184,6 +1196,18 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                                                 String departmentName,
                                                 DangerExecuteSubmitDto executeSubmitDto,
                                                 RoleBo role) {
+        String governUserId = null;
+        if (executeTypeEnum.equals(LatentDangerExcuteTypeEnum.隐患评审通过)) {
+            // 消防巡查需求:评审通过后指定治理人
+            // 1.获取治理人员对应的amos平台人员
+            AgencyUserModel userModel = jcsFeignClient.getAmosIdByUserId(param.getGovernUserId()).getResult();
+            governUserId = userModel.getUserName();
+            if (ValidationUtil.isEmpty(userModel)) {
+                executeSubmitDto.setIsOk(false);
+                executeSubmitDto.setMsg("治理人员指定失败");
+                return executeSubmitDto;
+            }
+        }
         JSONObject executeJson = remoteWorkFlowService.execute(param.getTaskId(), executeTypeEnum.getRequestBody());
         if (executeJson == null) {
             executeSubmitDto.setIsOk(false);
@@ -1225,6 +1249,10 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
             if (executeTypeEnum.equals(LatentDangerExcuteTypeEnum.隐患评审通过)) {
                 latentDangerBo.setReformLimitDate(DateUtil.str2Date(param.getReformLimitDate(), DateUtil.DATETIME_DEFAULT_FORMAT));
                 latentDangerBo.setDangerLevel(param.getDangerLevel().toString());
+
+                // 消防巡查需求:评审通过后制定治理人
+                // 2.指定治理执行人
+                workflowExecuteService.setTaskAssign(latentDangerBo.getInstanceId(), governUserId);
             }
         }
         if (executeTypeEnum.equals(LatentDangerExcuteTypeEnum.隐患延期治理车间部门审核通过)) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/RulePlanService.java

@@ -15,7 +15,7 @@ import java.util.List;
 
 /**
  * @Author: xl
- * @Description: 巡检计划触发规则
+ * @Description: 防火监督触发规则
  * @Date: 2021/11/10 9:50
  */
 @Service
@@ -50,19 +50,19 @@ public class RulePlanService {
         return true;
     }
 
-    private PlanRo buildPlanRo (Plan plan, List<String> userIds, String ruleType){
+    private PlanRo buildPlanRo(Plan plan, List<String> userIds, String ruleType) {
         PlanRo planRo = new PlanRo();
         BeanUtils.copyProperties(plan, planRo);
         planRo.setMsgType(msgType);
         planRo.setRuleType(ruleType);
         planRo.setRelationId(String.valueOf(plan.getId()));
 
-        if (ValidationUtil.isEmpty(userIds)){
+        if (ValidationUtil.isEmpty(userIds)) {
             String leadPeopleIds = plan.getLeadPeopleIds();
-            if (!ValidationUtil.isEmpty(plan.getUserId()) && !leadPeopleIds.contains(plan.getUserId())){
+            if (!ValidationUtil.isEmpty(plan.getUserId()) && !leadPeopleIds.contains(plan.getUserId())) {
                 leadPeopleIds += "," + plan.getUserId();
             }
-            userIds = (List<String>)jcsFeignClient.getAmosIdListByUserIds(leadPeopleIds).getResult();
+            userIds = (List<String>) jcsFeignClient.getAmosIdListByUserIds(leadPeopleIds).getResult();
             planRo.setIsSendApp(true);
             planRo.setTerminal(WEB);
         } else {

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -2139,7 +2139,17 @@
         </sql>
     </changeSet>
 
-
+    <changeSet author="chenzhao" id="2021-11-15-1">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="cb_dynamic_form_column"/>
+            <primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_dynamic_form_column"/>
+        </preConditions>
+        <comment>update data cb_data_dictionary</comment>
+        <sql>
+            INSERT INTO `cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (132828674812085, 'dutyArea', '值班区域', 'input', 132828674816, 'like', b'0', b'0', 'dutyFirstAid', NULL, NULL, NULL, '2021-11-15 10:33:18', b'0', NULL, NULL, NULL);
+            INSERT INTO `cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (132828674812086, 'dutyAreaId', '值班区域Id', 'input', 132828674816, 'eq', b'0', b'0', 'dutyFirstAid', NULL, NULL, NULL, '2021-11-15 10:33:18', b'0', NULL, NULL, NULL);
+        </sql>
+    </changeSet>
 
 
 

amos-boot-system-maintenance/src/main/resources/db/mapper/msgMapper.xml

@@ -98,7 +98,7 @@
 				<![CDATA[
 				CONCAT(
 					'巡检地点：',
-					'address',
+					pp.address,
 					'<br />点编号：',
 					pp.point_no,
 					'<br />当前状态：',
@@ -121,7 +121,7 @@
 				)  ]]> saveMsg,
 				CONCAT(
 					'巡检地点：',
-					'address',
+					pp.address,
 					'；点编号：',
 					pp.point_no,
 					'；当前状态：',

amos-boot-system-patrol/src/main/resources/application.properties

@@ -53,4 +53,6 @@ redis.cache.failure.time=10800
 
 rule.definition.load=false
 rule.definition.model-package=com.yeejoin.amos.patrol.business.entity.mybatis
-rule.definition.default-agency=STATE_GRID
\ No newline at end of file
+rule.definition.default-agency=STATE_GRID
+
+jcs.fegin.name=JCS-tb
\ No newline at end of file

amos-boot-system-patrol/src/main/resources/db/mapper/msgMapper.xml

@@ -98,7 +98,7 @@
 				<![CDATA[
 				CONCAT(
 					'巡检地点：',
-					'address',
+					pp.address,
 					'<br />点编号：',
 					pp.point_no,
 					'<br />当前状态：',
@@ -121,7 +121,7 @@
 				)  ]]> saveMsg,
 				CONCAT(
 					'巡检地点：',
-					'address',
+					pp.address,
 					'；点编号：',
 					pp.point_no,
 					'；当前状态：',

amos-boot-system-supervision/src/main/resources/db/mapper/msgMapper.xml

@@ -98,7 +98,7 @@
 				<![CDATA[
 				CONCAT(
 					'巡检地点：',
-					'address',
+					pp.address,
 					'<br />点编号：',
 					pp.point_no,
 					'<br />当前状态：',
@@ -121,7 +121,7 @@
 				)  ]]> saveMsg,
 				CONCAT(
 					'巡检地点：',
-					'address',
+					pp.address,
 					'；点编号：',
 					pp.point_no,
 					'；当前状态：',

pom.xml

@@ -27,7 +27,7 @@
 		<springcloud.version>Hoxton.SR8</springcloud.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 		<tyboot-version>1.1.20</tyboot-version>
-		<amos.version>1.6.3-SNAPSHOT</amos.version>
+		<amos.version>1.6.5-SNAPSHOT</amos.version>
 		<itext.version>7.1.1</itext.version>
 	</properties>