Merge remote-tracking branch 'origin/developer' into developer

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/bo/ReginParams.java

 package com.yeejoin.amos.boot.biz.common.bo;
 
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import lombok.Builder;
+import lombok.Data;
 
 import java.io.Serializable;
 
@@ -17,51 +19,13 @@ public class ReginParams implements Serializable {
     private AgencyUserModel userModel;
     private PersonIdentity personIdentity;
     
+    @Data
     public static class PersonIdentity implements Serializable {
-
         private String identityType;
         private String personSeq;
         private String personName;
         private String companyId;
-
-        public PersonIdentity(String identityType, String personSeq, String personName,String companyId){
-            this.identityType = identityType;
-            this.personSeq = personSeq;
-            this.personName = personName;
-            this.companyId = companyId;
-        }
-
-        public String getPersonSeq() {
-            return personSeq;
-        }
-
-        public void setPersonSeq(String personSeq) {
-            this.personSeq = personSeq;
-        }
-
-        public String getIdentityType() {
-            return identityType;
-        }
-
-        public void setIdentityType(String identityType) {
-            this.identityType = identityType;
-        }
-
-        public String getPersonName() {
-            return personName;
-        }
-
-        public void setPersonName(String personName) {
-            this.personName = personName;
-        }
-
-        public String getCompanyId() {
-            return companyId;
-        }
-
-        public void setCompanyId(String companyId) {
-            this.companyId = companyId;
-        }
+        private String companyName;
     }
 
     public PersonIdentity getPersonIdentity() {

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

 package com.yeejoin.amos.boot.module.common.api.dto;
 
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 救援装备
  *
@@ -32,7 +31,7 @@ public class RescueEquipmentDto extends BaseDto {
     private Long vehicleNumber;
 
     @ApiModelProperty(value = "费用")
-    private Integer fee;
+    private Double fee;
 
     @ApiModelProperty(value = "单位名称")
     private String company;

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

@@ -26,4 +26,7 @@ public class UserUnitDto {
     @ApiModelProperty(value = "公司id")
     private String companyId;
 
+    @ApiModelProperty(value = "公司名称")
+    private String companyName;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/RescueEquipment.java

@@ -3,12 +3,11 @@ package com.yeejoin.amos.boot.module.common.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.util.Date;
-
 /**
  * 救援装备
  *
@@ -45,7 +44,7 @@ public class RescueEquipment extends BaseEntity {
      * 费用
      */
     @TableField("fee")
-    private Integer fee;
+    private Double fee;
 
     /**
      * 单位名称

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/IotFeignClient.java

@@ -29,4 +29,6 @@ public interface IotFeignClient {
     @RequestMapping(value = "/v1/iot/DynamicFlightInfo/list", method = RequestMethod.GET)
     ResponseModel<List<Map<String, Object>>> findImgByFileCategory();
     
+    @RequestMapping(value = "/v1/iot/DynamicFlightInfo/detail/{dynamicFlightId}", method = RequestMethod.GET)
+    ResponseModel<Map<String, Object>> findImgByDynamicFlightId(@PathVariable String dynamicFlightId);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/DynamicFormInstanceMapper.java

@@ -84,4 +84,6 @@ public interface DynamicFormInstanceMapper extends BaseMapper<DynamicFormInstanc
             @Param("shiftId") String shiftIds,
             @Param("fieldCodes") Map<String, Object> fieldCodes,
             @Param("groupCode") String groupCode);
+
+    List<DynamicFormInstance> getInstanceByCodeAndValue(String code, String value);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FailureDetailsMapper.java

@@ -21,26 +21,45 @@ import java.util.Map;
 public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
 
     /**
-     *查询全部 分页
+     * 查询全部 分页
+     *
      * @param page
      * @return
      */
     IPage<FailureDetails> selectAllPage(Page page);
 
     /**
-     *查询我发起的 分页
+     * 查询我发起的 分页
      * current 当前页
      * size 条数
+     *
      * @return
      */
     IPage<FailureDetails> selectISubPage(Page page, String submissionPid);
 
     /**
-     *查询待处理 分页
+     * 查询待处理 分页
+     *
      * @param page
      * @return
      */
     IPage<FailureDetails> selectInProcessing(Page page);
 
+
+    IPage<FailureDetails> selectStatusWaitTj(Page page);
+
+    IPage<FailureDetails> selectStatusWaitWx();
+
+
     List<StatusDto> selectStatusCount();
+
+    List<StatusDto> selectStatusWx();
+
+    List<StatusDto> selectStatusFq();
+
+    List<StatusDto> selectStatusFqp(Integer submissionPid);
+
+    List<StatusDto> selectStatusLeader();
+
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/MaintenanceCompanyMapper.java

@@ -29,4 +29,8 @@ public interface MaintenanceCompanyMapper extends BaseMapper<MaintenanceCompany>
      * @return
      */
     public Page<OrgUsrDto> selectOrgUsrPageList(Page page, @Param("seq") Long seq);
+
+    List<MaintenanceCompany> findByCodeAndType(String code, String type);
+
+    List<MaintenanceCompany> findByInstanceIdAndType(Long instanceId, String type);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IDynamicFormInstanceService.java

@@ -4,13 +4,13 @@ package com.yeejoin.amos.boot.module.common.api.service;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 
 import java.util.List;
-import java.util.Map;
 
 /**
-* 动态表单实例表接口类
-*
-* @author system_generator
-* @date 2021-07-06
-*/
+ * 动态表单实例表接口类
+ *
+ * @author system_generator
+ * @date 2021-07-06
+ */
 public interface IDynamicFormInstanceService {
+    List<DynamicFormInstance> getInstanceByCodeAndValue(String code, String value);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IMaintenanceCompanyService.java

@@ -161,4 +161,8 @@ public interface IMaintenanceCompanyService {
 	 * @return
 	 */
 	public List<MaintenancePersonExcleDto> exportToMaintenancePersonExcel();
+
+    List<MaintenanceCompany> findByInstanceIdAndType(Long instanceId, String type);
+
+	List<MaintenanceCompany> findByCodeAndType(String code, String type);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DynamicFormInstanceMapper.xml

@@ -184,4 +184,18 @@
         </if>
         order by instanceId desc
     </select>
+    <select id="getInstanceByCodeAndValue" resultType="com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance">
+        SELECT
+            f.instance_id
+        FROM
+            `cb_dynamic_form_instance` f
+        <where>
+            <if test="code != null and code != ''">
+                f.field_code = #{code}
+            </if>
+            <if test="value != null and value != ''">
+                AND f.field_value = #{value}
+            </if>
+        </where>
+    </select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FailureDetailsMapper.xml

@@ -58,7 +58,53 @@
         FROM
             cb_failure_details
         WHERE
-            is_delete = 0
+            cb_failure_details.current_status = 3
+           OR
+            cb_failure_details.current_status = 0
+    </select>
+
+    <select id="selectStatusWaitTj" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
+        SELECT
+            sequence_nbr,
+            current_status,
+            failure_equipment_id,
+            failure_equipment,
+            fault_time,
+            fault_phenomenon,
+            submission_name,
+            submission_pid,
+            biz_code,
+            submission_time,
+            submission_branch,
+            submission_branch_id
+        FROM
+            cb_failure_details
+        WHERE
+            cb_failure_details.current_status = 1
+
+    </select>
+
+    <select id="selectStatusWaitWx" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
+        SELECT
+            sequence_nbr,
+            current_status,
+            failure_equipment_id,
+            failure_equipment,
+            fault_time,
+            fault_phenomenon,
+            submission_name,
+            submission_pid,
+            biz_code,
+            submission_time,
+            submission_branch,
+            submission_branch_id
+        FROM
+            cb_failure_details
+        WHERE
+            cb_failure_details.current_status = 6
+           OR
+            cb_failure_details.current_status = 2
+
     </select>
 
     <select id="selectStatusCount" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto">
@@ -71,4 +117,64 @@
         GROUP BY
             cb_failure_details.current_status
     </select>
+
+    <select id="selectStatusWx" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto">
+        SELECT
+            cb_failure_details.current_status  ,
+            count(cb_failure_details.current_status)
+                AS currentStatusCount
+        FROM
+            cb_failure_details
+        WHERE
+            cb_failure_details.current_status = 6
+        OR
+            cb_failure_details.current_status = 2
+        GROUP BY
+            cb_failure_details.current_status
+    </select>
+
+    <select id="selectStatusFq" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto">
+        SELECT
+            cb_failure_details.current_status  ,
+            count(cb_failure_details.current_status)
+                AS currentStatusCount
+        FROM
+            cb_failure_details
+        WHERE
+            cb_failure_details.current_status = 1
+
+        GROUP BY
+            cb_failure_details.current_status
+    </select>
+
+    <select id="selectStatusLeader" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto">
+        SELECT
+            cb_failure_details.current_status  ,
+            count(cb_failure_details.current_status)
+                AS currentStatusCount
+        FROM
+            cb_failure_details
+        WHERE
+            cb_failure_details.current_status = 0
+        or
+             cb_failure_details.current_status = 3
+        GROUP BY
+            cb_failure_details.current_status
+    </select>
+
+    <select id="selectStatusFqp" parameterType="integer" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto">
+        SELECT
+            cb_failure_details.current_status  ,
+            count(cb_failure_details.current_status)
+                AS currentStatusCount
+        FROM
+            cb_failure_details
+        WHERE
+            submission_pid = #{submissionPid}
+        GROUP BY
+            cb_failure_details.current_status
+    </select>
+
+
+
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/MaintenanceCompanyMapper.xml

@@ -37,4 +37,42 @@ WHERE
 	AND biz_org_type = "COMPANY"
 	AND is_delete = 0
     </select>
+	<select id="findByInstanceIdAndType" resultType="com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany">
+		SELECT
+			m.sequence_nbr,
+			m.`name`,
+			m.`code`,
+			m.type,
+			m.instance_id
+		FROM
+			cb_maintenance_company m
+		<where>
+			<if test="instanceId != null">
+				m.instance_id = #{instanceId}
+			</if>
+			<if test="type != null and type != ''">
+				AND m.type = #{type}
+			</if>
+		</where>
+	</select>
+	<select id="findByCodeAndType" resultType="com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany">
+		SELECT
+			m.sequence_nbr,
+			m.`name`,
+			m.`code`,
+			m.type,
+			m.instance_id
+		FROM
+			cb_maintenance_company m
+		<where>
+			<if test="code != null and code != ''">
+				m.code LIKE CONCAT(#{code}, '%')
+			</if>
+			<if test="type != null and type != ''">
+				AND m.type = #{type}
+			</if>
+		</where>
+		ORDER BY
+			m.sequence_nbr DESC
+	</select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -312,7 +312,7 @@ LEFT JOIN (
             u.sequence_nbr AS personSeq,
             u.biz_org_name AS personName,
             '2' AS identityType,
-            IFNULL( LEFT ( u.biz_org_code, 6 ), '' ) AS companyId
+            IFNULL( u.biz_org_code, '' ) AS companyId
         FROM
             `cb_org_usr` u
         <where>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/ControllerDto.java

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 
+ * <pre>
+ * 联动控制器
+ * </pre>
+ *
+ * @author gwb
+ * @version $Id: ControllerDto.java, v 0.1 2021年8月20日 上午10:52:52 gwb Exp $
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "ControllerDto", description = "联动控制器")
+public class ControllerDto extends BaseDto {
+
+    @ExcelIgnore
+    private static final long serialVersionUID = 1L;
+
+    
+    /**
+	 * 控制站
+	 */
+    @ApiModelProperty(value = "控制站")
+    private String station;
+	/**
+	 * ip
+	 */
+    @ApiModelProperty(value = "ip")
+    private String ip;
+	/**
+	 * 端口
+	 */
+    @ApiModelProperty(value = "端口")
+    private Integer port;
+	/**
+	 * 控制器名称
+	 */
+    @ApiModelProperty(value = "控制器名称")
+    private String name;
+	/**
+	 * 控制器类别
+	 */
+    @ApiModelProperty(value = "控制器类别")
+    private String type;
+	/**
+	 * 状态
+	 */
+    @ApiModelProperty(value = "状态")
+    private String state;
+	
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/ControllerEquipDto.java

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 
+ * <pre>
+ * 控制器设备
+ * </pre>
+ *
+ * @author gwb
+ * @version $Id: ControllerEquipDto.java, v 0.1 2021年8月20日 上午9:29:18 gwb Exp $
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "ControllerEquipDto", description = "控制器设备")
+public class ControllerEquipDto extends BaseDto {
+
+    @ExcelIgnore
+    private static final long serialVersionUID = 1L;
+
+    
+    /**
+	 * 控制器
+	 */
+    @ApiModelProperty(value = "控制器")
+    private Long controllerSeq;
+	/**
+	 * 编号
+	 */
+    @ApiModelProperty(value = "编号")
+    private String num;
+	/**
+	 * 名称
+	 */
+    @ApiModelProperty(value = "名称")
+    private String name;
+	/**
+	 * 状态
+	 */
+    @ApiModelProperty(value = "状态")
+    private String state;
+	
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/Controller.java

+package com.yeejoin.amos.boot.module.jcs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 
+ * <pre>
+ * 联动控制器
+ * </pre>
+ *
+ * @author gwb
+ * @version $Id: Controller.java, v 0.1 2021年8月20日 上午9:22:28 gwb Exp $
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("jc_controller")
+public class Controller extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 控制站
+	 */
+	@TableField("station")
+    private String station;
+	/**
+	 * ip
+	 */
+	@TableField("c_ip")
+    private String ip;
+	/**
+	 * 端口
+	 */
+	@TableField("c_port")
+    private Integer port;
+	/**
+	 * 控制器名称
+	 */
+	@TableField("c_name")
+    private String name;
+	/**
+	 * 控制器类别
+	 */
+	@TableField("type")
+    private String type;
+	/**
+	 * 状态
+	 */
+	@TableField("c_state")
+    private String state;
+    
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/ControllerEquip.java

+package com.yeejoin.amos.boot.module.jcs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 
+ * <pre>
+ * 控制器设备
+ * </pre>
+ *
+ * @author gwb
+ * @version $Id: ControllerEquip.java, v 0.1 2021年8月20日 上午9:29:34 gwb Exp $
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("jc_controller_equip")
+public class ControllerEquip extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 控制器
+	 */
+	@TableField("controller_seq")
+    private Long controllerSeq;
+	/**
+	 * 编号
+	 */
+	@TableField("e_num")
+    private String num;
+	/**
+	 * 名称
+	 */
+	@TableField("e_name")
+    private String name;
+	/**
+	 * 状态
+	 */
+	@TableField("e_state")
+    private String state;
+    
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/ControllerTypeEnum.java

+package com.yeejoin.amos.boot.module.jcs.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 
+ * <pre>
+ * 联动控制器类型枚举
+ * </pre>
+ *
+ * @author gwb
+ * @version $Id: ControllerTypeEnum.java, v 0.1 2021年8月20日 上午10:21:44 gwb Exp $
+ */
+@Getter
+@AllArgsConstructor
+public enum ControllerTypeEnum {
+
+	BELL("1", "警铃"),
+	BROADCAST("2", "广播"),
+	DOOR("3", "车库门");
+
+    private String code;
+    private String name;
+
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    
+	public static ControllerTypeEnum getEnum(String code)
+	{
+		for (ControllerTypeEnum status : ControllerTypeEnum.values())
+		{
+			if (status.getCode().equals(code))
+			{
+				return status;
+			}
+		}
+		return null;
+	}
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/ControllerEquipMapper.java

+package com.yeejoin.amos.boot.module.jcs.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.ControllerEquip;
+
+/**
+ * 
+ * <pre>
+ * 控制器设备 Mapper 接口
+ * </pre>
+ *
+ * @author gwb
+ * @version $Id: ControllerMapper.java, v 0.1 2021年8月20日 上午10:14:24 gwb Exp $
+ */
+public interface ControllerEquipMapper extends BaseMapper<ControllerEquip> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/ControllerMapper.java

+package com.yeejoin.amos.boot.module.jcs.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.Controller;
+
+/**
+ * 
+ * <pre>
+ * 联动控制器 Mapper 接口
+ * </pre>
+ *
+ * @author gwb
+ * @version $Id: ControllerMapper.java, v 0.1 2021年8月20日 上午10:14:24 gwb Exp $
+ */
+public interface ControllerMapper extends BaseMapper<Controller> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/dao/entity/Check.java

@@ -25,9 +25,6 @@ public class Check extends BasicEntity {
 
 	private static final long serialVersionUID = 1L;
 
-
-	
-
 	/**
 	 * 参考地址
 	 */
@@ -119,6 +116,19 @@ public class Check extends BasicEntity {
 	private String pointName;
 
 	/**
+	 * 设备编号
+	 */
+	private String pointNo;
+
+	public String getPointNo() {
+		return pointNo;
+	}
+
+	public void setPointNo(String pointNo) {
+		this.pointNo = pointNo;
+	}
+
+	/**
 	 * 巡检备注说明
 	 */
 	private String remark;
@@ -179,6 +189,86 @@ public class Check extends BasicEntity {
 	@Column(name="error_classify")
 	private String errorClassify;
 
+	/**
+	 * 业主单位id
+	 */
+	private String ownerId;
+
+	/**
+	 * 维保公司id
+	 */
+	private String companyId;
+
+	/**
+	 * 维保公司名称
+	 */
+	private String companyName;
+
+	/**
+	 * 安装位置：buildingName
+	 */
+	private String buildingName;
+
+	/**
+	 * 设备分类
+	 */
+	private String equipmentName;
+
+	/**
+	 * 计划类型
+	 */
+	private String planType;
+
+	public String getBuildingName() {
+		return buildingName;
+	}
+
+	public void setBuildingName(String buildingName) {
+		this.buildingName = buildingName;
+	}
+
+	public String getEquipmentName() {
+		return equipmentName;
+	}
+
+	public void setEquipmentName(String equipmentName) {
+		this.equipmentName = equipmentName;
+	}
+
+	public String getPlanType() {
+		return planType;
+	}
+
+	public void setPlanType(String planType) {
+		this.planType = planType;
+	}
+
+	public String getCompanyId() {
+		return companyId;
+	}
+
+	public void setCompanyId(String companyId) {
+		this.companyId = companyId;
+	}
+
+	public String getCompanyName() {
+		return companyName;
+	}
+
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+
+
+	public String getOwnerId() {
+		return ownerId;
+	}
+
+	public void setOwnerId(String ownerId) {
+		this.ownerId = ownerId;
+	}
+
 	private List<CheckShot> checkShot;
 
 	public Check() {

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/DictTypeEnum.java

@@ -17,11 +17,7 @@ public enum DictTypeEnum {
     EQUIPTYPE("设备类型","EQUIP_TYPE"),
     DANGERLEVEL("隐患等级", "DANGER_LEVEL"),
     OUTERPOINTTYPE("导入外部安全检查表分类", "OUTER_POINT_TYPE"),
-    MAINTENANCE_CLASSIFY("维保项分类","MAINTENANCE_CLASSIFY"),
-    CHECK_ITEM_CLASSIFY("消防监督检查项分类","CHECK_ITEM_CLASSIFY"),
-    CHECK_ITEM_TYPE("消防监督检查类别","CHECK_ITEM_TYPE"),
-    CHECK_ITEM_LEVEL("消防监督检查项等级","CHECK_ITEM_LEVEL"),
-    CHECK_ITEM_CONTENT("消防监督检查类型","CHECK_ITEM_CONTENT");
+    MAINTENANCE_CLASSIFY("维保项分类","MAINTENANCE_CLASSIFY");
 
     /**
      * 名称，描述

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/SupervisionDictEnum.java

+package com.yeejoin.amos.supervision.common.enums;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 消防监督枚举对象
+ * @author maoying
+ *
+ */
+public enum SupervisionDictEnum {
+
+    CHECK_ITEM_CLASSIFY("消防监督检查项分类","CHECK_ITEM_CLASSIFY"),
+    CHECK_ITEM_TYPE("消防监督检查类别","CHECK_ITEM_TYPE"),
+    CHECK_ITEM_LEVEL("消防监督检查项等级","CHECK_ITEM_LEVEL"),
+    CHECK_ITEM_CONTENT("消防监督检查类型","CHECK_ITEM_CONTENT");
+
+    /**
+     * 名称，描述
+     */
+    private String name;
+    /**
+     * 编码
+     */
+    private String code;
+
+    private SupervisionDictEnum(String name, String code){
+        this.name = name;
+        this.code = code;
+    }
+
+    public static SupervisionDictEnum getEnum(String code) {
+        SupervisionDictEnum instance = null;
+        for(SupervisionDictEnum type: SupervisionDictEnum.values()) {
+            if (type.getCode().equals(code)) {
+                instance = type;
+                break;
+            }
+        }
+
+        return instance;
+    }
+
+    public static List<Map<String,String>> getEnumList() {
+        List<Map<String,String>> list = new ArrayList<>();
+        for(SupervisionDictEnum e : SupervisionDictEnum.values()) {
+            Map<String, String> map = new HashMap<String, String>();
+            map.put("code", e.getCode());
+            map.put("name", e.getName());
+            list.add(map);
+        }
+        return list;
+    }
+
+    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;
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureDetailsController.java

@@ -6,6 +6,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.common.api.dto.CurrentStatusDto;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -181,8 +182,8 @@ public class FailureDetailsController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "查询当前状态任务数量",   notes = "查询当前状态任务数量")
 	@GetMapping(value = "/list/count")
-	public ResponseModel<Object> selectStatusCount() {
-		return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryStatusCount());
+	public ResponseModel<List<CurrentStatusDto> >selectStatusCount(Integer type ) {
+		return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryStatusCount(getSelectedOrgInfo(),type));
 	}
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FirefightersThoughtController.java

@@ -29,6 +29,7 @@ import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.entity.FirefightersThought;
+import com.yeejoin.amos.boot.module.common.api.service.IFailureAuditService;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersThoughtServiceImpl;
 
 import io.swagger.annotations.Api;
@@ -155,7 +156,11 @@ public class FirefightersThoughtController extends BaseController {
                         firefightersThoughtQueryWrapper.eq(name, fileValue);
                     } else if (type.equals(String.class)) {
                         String fileValue = (String) field.get(firefightersThought);
+                        if("SPEAKER".equals(name)) {
+                        	 firefightersThoughtQueryWrapper.like(name,fileValue);
+                        }else {
                         	firefightersThoughtQueryWrapper.eq(name, fileValue);
+                        }
                     }else if (type.equals(Date.class)) {
                     	Date fileValue = (Date) field.get(firefightersThought);
                     	firefightersThoughtQueryWrapper.eq(name, fileValue);

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -366,7 +366,7 @@ public class OrgUsrController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getUserUnit", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取用户单位归属", notes = "获取用户单位归属")
-    public ResponseModel<UserUnitDto> getUserUnit(@RequestParam String id, @RequestParam String type, @RequestParam String code) throws Exception {
+    public ResponseModel<UserUnitDto> getUserUnit(@RequestParam String id, @RequestParam String type, @RequestParam String code) {
         return ResponseHelper.buildResponse(iOrgUsrService.getUserUnit(id, type, code));
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DynamicFormInstanceServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInstanceDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
@@ -40,6 +40,9 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
     DynamicFormColumnServiceImpl dynamicFormColumnService;
 
     @Autowired
+    DynamicFormInstanceMapper dynamicFormInstanceMapper;
+
+    @Autowired
     HttpServletRequest request;
 
     /**
@@ -65,7 +68,7 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
         return this.baseMapper.selectListByCalledId(instanceId);
     }
 
-    public Long commonSave(String groupCode, Map<String,Object> model){
+    public Long commonSave(String groupCode, Map<String, Object> model) {
         Long instanceId = sequence.nextId();
         List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
         List<DynamicFormInstance> instances = columns.stream().map(column -> {
@@ -76,8 +79,8 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
         if (!instances.isEmpty()) {
             this.saveBatch(instances);
         }
-        model.put("instanceId",instanceId);
-        model.put("groupCode",groupCode);
+        model.put("instanceId", instanceId);
+        model.put("groupCode", groupCode);
         return instanceId;
     }
 
@@ -94,7 +97,7 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
         formInstance.setFieldValue(map.get(column.getFieldCode()) != null ? map.get(column.getFieldCode()).toString() : "");
     }
 
-    public Map<String, Object> getOneMap(Long instanceId,String groupCode) {
+    public Map<String, Object> getOneMap(Long instanceId, String groupCode) {
         Map<String, Object> optionListMap = new HashMap<>();
         List<DynamicFormInstance> list = this.queryByInstanceId(instanceId);
         if (!CollectionUtils.isEmpty(list)) {
@@ -122,20 +125,22 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
         return this.baseMapper.selectList(wrapper);
     }
 
-    public IPage<Map<String, Object>> pageList(int current, int size ,String groupCode){
+    public IPage<Map<String, Object>> pageList(int current, int size, String groupCode) {
         Map<String, String> params = this.getRequestParamMap();
         List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
         Map<String, Object> fieldCodes = Bean.listToMap(columns, "fieldCode", "queryStrategy", DynamicFormColumn.class);
         Page page = new Page(current, size);
         return this.getBaseMapper().pageList(page, RequestContext.getAppKey(), fieldCodes, groupCode, params);
     }
-    public IPage<Map<String, Object>> pageList(int current, int size ,String groupCode,Map<String, String> params ){
+
+    public IPage<Map<String, Object>> pageList(int current, int size, String groupCode, Map<String, String> params) {
         List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
         Map<String, Object> fieldCodes = Bean.listToMap(columns, "fieldCode", "queryStrategy", DynamicFormColumn.class);
         Page page = new Page(current, size);
         return this.getBaseMapper().pageList(page, RequestContext.getAppKey(), fieldCodes, groupCode, params);
     }
-    public List<Map<String, Object>> listAll(String groupCode){
+
+    public List<Map<String, Object>> listAll(String groupCode) {
         Map<String, String> params = this.getRequestParamMap();
         List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
         Map<String, Object> fieldCodes = Bean.listToMap(columns, "fieldCode", "queryStrategy", DynamicFormColumn.class);
@@ -159,5 +164,14 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
         }
         return params;
     }
+
+    @Override
+    public List<DynamicFormInstance> getInstanceByCodeAndValue(String code, String value) {
+        List<DynamicFormInstance> list = dynamicFormInstanceMapper.getInstanceByCodeAndValue(code, value);
+        if (!CollectionUtils.isEmpty(list)) {
+            return list;
+        }
+        return Lists.newArrayList();
+    }
 }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureDetailsServiceImpl.java

@@ -71,7 +71,8 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
     public static Integer SELECY_ALL = 6;
     public static Integer SELECY_STATUS = 7;
     public static Integer SELECY_ISUBMIT = 8;
-    public String[] roleName = {"", ""};
+    public String[] roleName = {"maintenance_department_maintenance_personnel", "emergency_command_staff"};
+
 
     /**
      * 分页查询
@@ -113,15 +114,12 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
      * 待处理分页查询
      */
     public IPage<FailureDetails> queryForWaitManage(Page<FailureDetails> page, ReginParams userInfo) {
-        /* if (userInfo.getRole().getRoleName().equals())*/
-    /*    if (submissionPid == null) {
-            return null;
+
+        if (userInfo.getRole().getRoleName().equals(roleName[0])) {
+            return baseMapper.selectStatusWaitWx();
+        } else if (userInfo.getRole().getRoleName().equals(roleName[1])) {
+            return baseMapper.selectStatusWaitTj(page);
         }
-        LambdaQueryWrapper<FailureDetails> lambdaQueryWrapper = new LambdaQueryWrapper();
-        lambdaQueryWrapper.notIn(FailureDetails::getCurrentStatus, FailureStatuEnum.REFUSE.getCode(), FailureStatuEnum.FINISH.getCode()
-        ).orderByDesc(FailureDetails::getSubmissionTime);
-        IPage<FailureDetails> failureDetailsPage = new Page<>(page.getCurrent(), page.getSize());
-        return baseMapper.selectPage(failureDetailsPage, lambdaQueryWrapper);*/
         return baseMapper.selectInProcessing(page);
     }
 
@@ -150,7 +148,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
      * 根据状态查询
      */
     public List<FailureDetails> queryForFailureStatus(Long currentStatus) {
-        String status = new String();
+        String status = "";
         List<FailureStatuEnum> list = new ArrayList<>();
         list.add(FailureStatuEnum.WAITING_AUDIT);
         list.add(FailureStatuEnum.WAITING_SUBMIT);
@@ -171,10 +169,21 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
     /**
      * 查询任务状态数量
      */
-    public List<CurrentStatusDto> queryStatusCount() {
-        List<StatusDto> statusDtos = baseMapper.selectStatusCount();
+    public List<CurrentStatusDto> queryStatusCount(ReginParams userInfo, Integer type) {
+        List<StatusDto> statusDtos = null;
+        if (type.equals(SELECY_STATUS) &&userInfo.getRole().getRoleName().equals(roleName[0])) {
+            statusDtos = baseMapper.selectStatusWx();
+        } else if (type.equals(SELECY_STATUS) && userInfo.getRole().getRoleName().equals(roleName[1])) {
+            statusDtos = baseMapper.selectStatusFq();
+        } else if (type.equals(SELECY_ISUBMIT)) {
+            statusDtos = baseMapper.selectStatusFqp(Integer.parseInt(userInfo.getUserModel().getUserId()));
+        } else if (type.equals(SELECY_ALL)){
+            statusDtos = baseMapper.selectStatusCount();
+        }else {
+            statusDtos = baseMapper.selectStatusLeader();
+        }
         List<CurrentStatusDto> currentStatusDtoList = new ArrayList<>();
-        statusDtos.forEach(e->{
+        statusDtos.forEach(e -> {
             CurrentStatusDto currentStatusDto = new CurrentStatusDto();
             currentStatusDto.setCutrentStatusCount(e.getCurrentStatusCount());
             currentStatusDto.setCutrentStatusName(Constants.currentStatusNameMap.get(e.getCurrentStatus()));

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/MaintenanceCompanyServiceImpl.java

@@ -25,6 +25,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
@@ -286,6 +287,24 @@ public class MaintenanceCompanyServiceImpl
 		return JSONArray.parseArray(JSONArray.toJSONString(list), MaintenancePersonExcleDto.class);
 	}
 
+	@Override
+	public List<MaintenanceCompany> findByInstanceIdAndType(Long instanceId, String type) {
+		List<MaintenanceCompany> list = maintenanceCompanyMapper.findByInstanceIdAndType(instanceId, type);
+		if (!CollectionUtils.isEmpty(list)) {
+			return list;
+		}
+		return Lists.newArrayList();
+	}
+
+	@Override
+	public List<MaintenanceCompany> findByCodeAndType(String code, String type) {
+		List<MaintenanceCompany> list = maintenanceCompanyMapper.findByCodeAndType(code, type);
+		if (!CollectionUtils.isEmpty(list)) {
+			return list;
+		}
+		return Lists.newArrayList();
+	}
+
 	/**
 	 * 维保单位人员信息分頁信息显示时的字段过滤
 	 * 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -9,11 +9,14 @@ import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
+import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.UserRolesEnum;
+import com.yeejoin.amos.boot.module.common.api.enums.UserUnitTypeEnum;
 import com.yeejoin.amos.boot.module.common.api.feign.SupervisionFeign;
 import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService;
 import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -52,6 +55,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     SupervisionFeign supervisionFeign;
     @Autowired
     ESOrgUsrService eSOrgUsrService;
+    @Autowired
+    IMaintenanceCompanyService maintenanceCompanyService;
 
     @Override
     public String selectUpUnitByParam(String id) {
@@ -992,25 +997,66 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
     @Override
     public UserUnitDto getUserUnit(String id, String type, String code) {
+        if (StringUtils.isNotBlank(id) && StringUtils.isNotBlank(type) && StringUtils.isNotBlank(code)) {
+            String[] typeArr = type.split(",");
             //	业主单位
-        List<UserUnitDto> list = orgUsrMapper.getUserUnit(id, type, null);
+            List<UserUnitDto> list = orgUsrMapper.getUserUnit(id, typeArr[0], null);
+            //     维保单位
+            List<DynamicFormInstance> instanceList = alertFormValueServiceImpl.getInstanceByCodeAndValue(code, id);
+            if (!CollectionUtils.isEmpty(list) && !CollectionUtils.isEmpty(instanceList)) {
+                throw new RuntimeException("人员绑定单位重复！");
+            } else {
                 if (!CollectionUtils.isEmpty(list)) {
                     if (list.size() == 1) {
                         UserUnitDto userUnitDto = list.get(0);
-                String companyId = userUnitDto.getCompanyId();
-                if (StringUtils.isNotBlank(companyId) && StringUtils.isNotBlank(code)) {
-                    List<UserUnitDto> dtoList = orgUsrMapper.getUserUnit(null, code, companyId);
+                        String codeVal = userUnitDto.getCompanyId().substring(0, 5);
+                        if (StringUtils.isNotBlank(codeVal)) {
+                            List<UserUnitDto> dtoList = orgUsrMapper.getUserUnit(null, typeArr[1], codeVal);
                             if (!CollectionUtils.isEmpty(dtoList)) {
-                        userUnitDto.setCompanyId(dtoList.get(0).getPersonSeq());
+                                UserUnitDto dto = dtoList.get(0);
+                                userUnitDto.setCompanyId(dto.getPersonSeq());
+                                userUnitDto.setCompanyName(dto.getPersonName());
                                 return userUnitDto;
                             }
-                    throw new RuntimeException("未获取人员业主单位！");
                         }
+                        throw new RuntimeException("未获取人员业主单位！");
                     }
                     throw new RuntimeException("人员绑定业主单位不唯一！");
+                } else {
+                    if (!CollectionUtils.isEmpty(instanceList)) {
+                        if (instanceList.size() == 1) {
+                            Long instanceId = instanceList.get(0).getInstanceId();
+                            List<MaintenanceCompany> maintenanceCompanyList = maintenanceCompanyService.findByInstanceIdAndType(instanceId, typeArr[0]);
+                            if (!CollectionUtils.isEmpty(maintenanceCompanyList)) {
+                                if (maintenanceCompanyList.size() == 1) {
+                                    MaintenanceCompany person = maintenanceCompanyList.get(0);
+                                    UserUnitDto unitDto = new UserUnitDto();
+                                    unitDto.setIdentityType(UserUnitTypeEnum.MAINTENANCE_COMPANY.getValue());
+                                    unitDto.setPersonSeq(String.valueOf(person.getSequenceNbr()));
+                                    unitDto.setPersonName(person.getName());
+                                    String codeVal = person.getCode().substring(0, 5);
+                                    if (StringUtils.isNotBlank(codeVal)) {
+                                        List<MaintenanceCompany> companyList = maintenanceCompanyService.findByCodeAndType(codeVal, typeArr[1]);
+                                        if (!CollectionUtils.isEmpty(companyList)) {
+                                            MaintenanceCompany company = companyList.get(0);
+                                            unitDto.setCompanyId(String.valueOf(company.getSequenceNbr()));
+                                            unitDto.setCompanyName(company.getName());
+                                            return unitDto;
+                                        }
+                                    }
+                                    throw new RuntimeException("未获取人员维保单位！");
+                                }
+                                throw new RuntimeException("人员绑定维保单位不唯一！");
+                            }
+                        }
+                        throw new RuntimeException("人员绑定维保单位不唯一！");
+                    }
+                }
             }
             throw new RuntimeException("人员未绑定任何单位！");
         }
+        throw new RuntimeException("参数必传且不为空！");
+    }
 
     public List<OrgUsr> getCompanyDetailTree() {
         LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AircraftController.java

@@ -194,6 +194,7 @@ public class AircraftController extends BaseController {
     		Map<String, Object> map= dataModel.getResult();
     		if(map!=null) {
     			  map1.put("aircraftModel", map.get("aircraftType"));
+    			  map1.put("dynamicFlightId", map.get("dynamicFlightId"));
     	          map1.put("landingTime", map.get("sta"));
 //    	          map1.put("fuelQuantity", map.get(""));
     	          map1.put("passengerCapacity", map.get("psgNumTotal"));  
@@ -227,7 +228,7 @@ public class AircraftController extends BaseController {
             }
         }
         Map<String, Object> map=new HashedMap();
-        ResponseModel<Map<String, Object>>  dataModel=   iotFeignClient.getDynamicFlightInfo(num);
+        ResponseModel<Map<String, Object>>  dataModel=   iotFeignClient.findImgByDynamicFlightId(num);
         if(dataModel!=null) {
            map= dataModel.getResult();
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

@@ -21,12 +21,15 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledFormDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledObjsDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledTodyDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledZhDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.ControllerDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.ControllerEquipDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.KeyValueLabel;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerData;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStageEnums;
+import com.yeejoin.amos.boot.module.jcs.api.enums.ControllerTypeEnum;
 import com.yeejoin.amos.boot.module.jcs.api.enums.DutyInfoEnum;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertCalledMapper;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertSubmittedMapper;
@@ -80,6 +83,10 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
     @Autowired
     private ESAlertCalledService eSAlertCalledService;
     @Autowired
+    private ControllerServiceImpl controllerService;
+    @Autowired
+    private ControllerEquipServiceImpl controllerEquipService;
+    @Autowired
     private EmqKeeper emqKeeper;
     @Value("${mqtt.topic.command.alert.notice}")
     private String topic;
@@ -359,7 +366,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
         // 警情基本信息
         AlertCalled alertCalled = this.getById(id);
         QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
-        Map<String, Object> map = new HashMap();
+        Map<String, Object> map = new HashMap<String, Object>();
         map.put("title", "【" + alertCalled.getAlertType() + "】" + alertCalled.getAddress());
         queryWrapper.eq("alert_called_id", id);
         // 警情动态表单数据
@@ -376,7 +383,11 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
         listdate.add(new KeyValueLabel("联系电话", "contactPhone", alertCalled.getContactPhone()));
         listdate.add(new KeyValueLabel("联系人电话", "contactPhone", alertCalled.getContactPhone()));
         list.stream().forEach(AlertFormValue -> {
-            listdate.add(new KeyValueLabel(AlertFormValue.getFieldName(), AlertFormValue.getFieldCode(), AlertFormValue.getFieldValue()));
+        	String valueCode = AlertFormValue.getFieldValueCode();
+        	if(null == valueCode) {
+        		valueCode = AlertFormValue.getFieldValue();
+        	}
+            listdate.add(new KeyValueLabel(AlertFormValue.getFieldName(), AlertFormValue.getFieldCode(),valueCode));
         });
         map.put("data", listdate);
         return map;
@@ -434,18 +445,96 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
     @Transactional(rollbackFor = RuntimeException.class)
     public Boolean controlEquip() throws Exception
     {
-    	//打开消防警铃
-    	jcsControlServerClient.sendBellAction("204,205,206", "1");
-    	//播放广播
-    	jcsControlServerClient.sendFileAction("201,202,203", "1490075199246.mp3");
+    	/**
+    	 * 获取控制器设备
+    	 */
+    	List<ControllerEquipDto> controllerEquipDtoList = controllerEquipService.queryAllForList();
+    	Map<Long, List<String>> controllerEquipMap = new HashMap<>();
+    	for (ControllerEquipDto controllerEquipDto : controllerEquipDtoList)
+		{
+    		List<String> numList = controllerEquipMap.get(controllerEquipDto.getControllerSeq());
+    		if (ValidationUtil.isEmpty(numList))
+			{
+    			numList = new ArrayList<>();
+			}
+    		numList.add(controllerEquipDto.getNum());
+    		controllerEquipMap.put(controllerEquipDto.getControllerSeq(), numList);
+		}
+    	/**
+    	 * 获取联动控制器
+    	 */
+    	List<ControllerDto> controllerDtoList = controllerService.queryAllForList();
+    	StringBuilder bellNumSb =new StringBuilder();
+    	StringBuilder broadcastNumSb =new StringBuilder();	
+    	for (ControllerDto controllerDto : controllerDtoList)
+		{
+    		//消防警铃
+			if (controllerDto.getType().equals(ControllerTypeEnum.BELL.getCode()))
+			{
+				List<String> bellNumList = controllerEquipMap.get(controllerDto.getSequenceNbr());
+				if (!ValidationUtil.isEmpty(bellNumList))
+				{
+					for (String num : bellNumList)
+					{
+						bellNumSb.append(num).append(",");
+					}
+				}
+			}
+			//广播
+			if (controllerDto.getType().equals(ControllerTypeEnum.BROADCAST.getCode()))
+			{
+				List<String> broadcastList = controllerEquipMap.get(controllerDto.getSequenceNbr());
+				if (!ValidationUtil.isEmpty(broadcastList))
+				{
+					for (String num : broadcastList)
+					{
+						broadcastNumSb.append(num).append(",");
+					}
+				}
+			}
+		}
+    	/**
+    	 * 打开消防警铃
+    	 */
+    	if (!ValidationUtil.isEmpty(bellNumSb.toString()))
+		{
+    		String bellNum = bellNumSb.toString();
+    		bellNum = bellNum.substring(0, bellNum.length() -1);
+    		jcsControlServerClient.sendBellAction(bellNum, "1");
+		}
+    	/**
+    	 * 播放广播
+    	 */
+    	if (!ValidationUtil.isEmpty(broadcastNumSb.toString()))
+		{
+    		String broadcastNum = broadcastNumSb.toString();
+    		broadcastNum = broadcastNum.substring(0, broadcastNum.length() -1);
+    		jcsControlServerClient.sendFileAction(broadcastNum, "1490075199246.mp3");
+		}
+    	/**
+    	 * 打开北站车库门
+    	 */
+    	List<ControllerDto> northDoor = controllerService.queryForList("3", ControllerTypeEnum.DOOR.getCode());
+    	if (!ValidationUtil.isEmpty(northDoor))
+		{
+    		ControllerDto controllerDto = northDoor.get(0);
     		//打开北站车库门
-    	jcsControlServerClient.writeStateAction("172.19.111.153", 502, 100, "1,1,1,1");
+    		jcsControlServerClient.writeStateAction(controllerDto.getIp(), controllerDto.getPort(), 100, "1,1,1,1");
     		//打开北站车库门弱电警铃
-    	jcsControlServerClient.writeStateAction("172.19.111.153", 502, 107, "1");
+    		jcsControlServerClient.writeStateAction(controllerDto.getIp(), controllerDto.getPort(), 107, "1");
+		}
+    	/**
+    	 * 打开南站车库门
+    	 */
+    	List<ControllerDto> southDoor = controllerService.queryForList("2", ControllerTypeEnum.DOOR.getCode());
+    	if (!ValidationUtil.isEmpty(southDoor))
+		{
+    		ControllerDto controllerDto = southDoor.get(0);
     		//打开南站车库门
-    	jcsControlServerClient.writeStateAction("172.19.111.163", 502, 100, "1");
+    		jcsControlServerClient.writeStateAction(controllerDto.getIp(), controllerDto.getPort(), 100, "1");
     		//打开南站车库门弱电警铃
-    	jcsControlServerClient.writeStateAction("172.19.111.163", 502, 107, "1");
+    		jcsControlServerClient.writeStateAction(controllerDto.getIp(), controllerDto.getPort(), 107, "1");
+		}
     	
 		return true;
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ControllerEquipServiceImpl.java

+package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import com.yeejoin.amos.boot.module.jcs.api.dto.ControllerEquipDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.ControllerEquip;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.ControllerEquipMapper;
+
+/**
+ * 
+ * <pre>
+ * 控制器设备 服务实现类
+ * </pre>
+ *
+ * @author gwb
+ * @version $Id: ControllerEquipServiceImpl.java, v 0.1 2021年8月20日 上午10:16:33 gwb Exp $
+ */
+@Service
+public class ControllerEquipServiceImpl extends BaseService<ControllerEquipDto, ControllerEquip, ControllerEquipMapper> 
+{
+	
+	public List<ControllerEquipDto> queryAllForList() {
+        return this.queryForList("", false);
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ControllerServiceImpl.java

+package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import com.yeejoin.amos.boot.module.jcs.api.dto.ControllerDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.Controller;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.ControllerMapper;
+
+/**
+ * 
+ * <pre>
+ * 联动控制器 服务实现类
+ * </pre>
+ *
+ * @author gwb
+ * @version $Id: ControllerServiceImpl.java, v 0.1 2021年8月20日 上午10:15:49 gwb Exp $
+ */
+@Service
+public class ControllerServiceImpl extends BaseService<ControllerDto, Controller, ControllerMapper> 
+{
+	
+	public List<ControllerDto> queryAllForList() {
+        return this.queryForList("", false);
+    }
+	
+	public List<ControllerDto> queryForList(String station, String type) {
+        return this.queryForList("", false, station, type);
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/CheckController.java

@@ -19,6 +19,7 @@ import com.yeejoin.amos.maintenance.core.common.response.AppPointCheckRespone;
 import com.yeejoin.amos.maintenance.core.common.response.GraphInitDataResponse;
 import com.yeejoin.amos.maintenance.core.framework.PersonIdentify;
 import com.yeejoin.amos.maintenance.core.util.StringUtil;
+import com.yeejoin.amos.maintenance.dao.entity.Check;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -305,7 +306,7 @@ public class CheckController extends AbstractBaseController {
     @GetMapping(value = "/{date}/checkCalendar", produces = "application/json;charset=UTF-8")
     public CommonResponse checkCalendar(
             @ApiParam(value = "date,格式YYYY-MM-DD",required = true)@PathVariable String date) {
-        HashMap<String, Object> params = new HashMap<>();
+        Map<String, Object> params = new HashMap<>();
         ReginParams reginParams = getSelectedOrgInfo();
         String loginOrgCode = getOrgCode(reginParams);
         Map<String, Object> authMap = Bean.BeantoMap(reginParams.getPersonIdentity());
@@ -529,4 +530,14 @@ public class CheckController extends AbstractBaseController {
         return CommonResponseUtil.success(CheckRecordOrderByEnum.getEnumList());
     }
 
+    @ApiOperation(value = "/设备设施维保记录分页列表",notes = "外部接口装备和者水源使用")
+    @GetMapping(value = "page/{originalId}/list")
+    public CommonResponse getCheckListByOriginalId(
+            @PathVariable String originalId,
+            @RequestParam(value = "current") int pageNum,
+            @RequestParam(value = "size") int pageSize
+            ){
+        CommonPageable pageable = new CommonPageable(pageNum,pageSize);
+        return CommonResponseUtil.success(checkService.getCheckListByOriginalId(originalId,pageable));
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/entity/mybatis/PlanTaskPointInputItemBo.java

@@ -32,11 +32,46 @@ public class PlanTaskPointInputItemBo {
 	private long pointId;
 
 	/**
+	 * 编号
+	 */
+	private String pointNo;
+	
+	/**
 	 * 巡检任务id
 	 */
 	private long planTaskId;
 
 	/**
+	 * 业主单位id
+	 */
+	private String ownerId;
+
+	/**
+	 * 单位id
+	 */
+	private String companyId;
+
+	/**
+	 * 安装位置：buildingName
+	 */
+	private String buildingName;
+
+	/**
+	 * 设备分类
+	 */
+	private String equipmentName;
+
+	/**
+	 * 计划类型
+	 */
+	private String planType;
+
+	/**
+	 * 单位名称
+	 */
+	private String companyName;
+	
+	/**
 	 * 巡检任务详情id
 	 */
 	private long planTaskDetailId;

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/CheckServiceImpl.java

@@ -28,6 +28,7 @@ import com.yeejoin.amos.maintenance.business.service.intfc.IEquipmentHandlerServ
 import com.yeejoin.amos.maintenance.business.service.intfc.IPlanTaskService;
 import com.yeejoin.amos.maintenance.business.service.intfc.IPointService;
 import com.yeejoin.amos.maintenance.business.util.CheckDetailInputPageParam;
+import com.yeejoin.amos.maintenance.business.util.DaoCriteria;
 import com.yeejoin.amos.maintenance.business.util.ToolUtils;
 import com.yeejoin.amos.maintenance.business.vo.CheckAnalysisVo;
 import com.yeejoin.amos.maintenance.business.vo.CheckInfoVo;
@@ -37,8 +38,10 @@ import com.yeejoin.amos.maintenance.common.enums.PointLevelEnum;
 import com.yeejoin.amos.maintenance.common.enums.PointStatusEnum;
 import com.yeejoin.amos.maintenance.core.common.request.CommonPageable;
 import com.yeejoin.amos.maintenance.core.common.response.*;
+import com.yeejoin.amos.maintenance.core.enums.QueryOperatorEnum;
 import com.yeejoin.amos.maintenance.core.util.DateUtil;
 import com.yeejoin.amos.maintenance.core.util.StringUtil;
+import com.yeejoin.amos.maintenance.core.util.query.BaseQuerySpecification;
 import com.yeejoin.amos.maintenance.dao.entity.*;
 import com.yeejoin.amos.maintenance.feign.RemoteSecurityService;
 import com.yeejoin.amos.maintenance.mqtt.MqttGateway;
@@ -50,6 +53,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cglib.beans.BeanMap;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.utils.Bean;
@@ -148,12 +152,19 @@ public class CheckServiceImpl implements ICheckService {
             check.setPlanName(detail.get("planName").toString());
             check.setPointName(point.getName());
             check.setPointId(point.getId());
+            check.setPointNo(point.getPointNo());
             check.setRemark(recordParam.getRemark());
             check.setCheckTime(new Date());
             check.setUploadTime(new Date());
             check.setOrgCode(recordParam.getOrgCode());
             check.setUserId(mtUserSeq);
+            check.setOwnerId(point.getOwnerId());
+            check.setBuildingName(point.getBuildingName());
+            check.setEquipmentName(point.getEquipmentName());
+            check.setPlanType(detail.get("planType").toString());
             check.setUserName(personIdentity.getPersonName());
+            check.setCompanyId(personIdentity.getCompanyId());
+            check.setCompanyName(personIdentity.getCompanyName());
             List<CheckInputParam> list = recordParam.getCheckItems();
             List<CheckInput> checkItemList = new ArrayList<>();
             List<Map<String, Object>> unqualifiedCheckItemList = Lists.newArrayList();
@@ -401,6 +412,27 @@ public class CheckServiceImpl implements ICheckService {
     }
 
     @Override
+    public Page<Check> getCheckListByOriginalId(String originalId, CommonPageable pageable) {
+        Point point = iPointDao.findByOriginalId(originalId);
+        if(point == null){
+            throw new RuntimeException("不存在该设备设施");
+        }
+        List<DaoCriteria> criterias = new ArrayList<>();
+        DaoCriteria daoCriteria = new DaoCriteria();
+        daoCriteria.setOperator(QueryOperatorEnum.EQUAL.getName());
+        daoCriteria.setPropertyName("originalId");
+        daoCriteria.setValue(originalId);
+        criterias.add(daoCriteria);
+        BaseQuerySpecification<Check> spec = new BaseQuerySpecification<>(criterias);
+        Sort.Order idOrder = new Sort.Order(Sort.Direction.DESC, "id");
+        List<Sort.Order> orders = new ArrayList<Sort.Order>();
+        orders.add(idOrder);
+        Sort sort = Sort.by(orders);
+        pageable.setSort(sort);
+        return checkDao.findAll(spec,pageable);
+    }
+
+    @Override
     public AppPointCheckRespone queryCheckPointDetail(String toke, String product, String appKey, long checkId) {
 //		List list = checkMapper.queryCheckPointInputItem(planTaskId, pointId);
         List<PointCheckDetailBo> list = checkMapper.findCheckPointInputItem(checkId);

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/intfc/ICheckService.java

@@ -13,6 +13,7 @@ import com.yeejoin.amos.maintenance.core.common.response.AppPointCheckRespone;
 import com.yeejoin.amos.maintenance.core.common.response.CommonPage;
 import com.yeejoin.amos.maintenance.core.common.response.GraphInitDataResponse;
 import com.yeejoin.amos.maintenance.core.common.response.QueryCriteriaRespone;
+import com.yeejoin.amos.maintenance.dao.entity.Check;
 import com.yeejoin.amos.maintenance.exception.YeeException;
 import org.springframework.data.domain.Page;
 import org.springframework.transaction.annotation.Transactional;
@@ -266,4 +267,6 @@ public interface ICheckService {
      * @return
      */
     int checkHasRecord(Long planTaskId, Long pointId);
+
+    Page<Check> getCheckListByOriginalId(String originalId, CommonPageable pageable);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/core/framework/PersonIdentifyAspect.java

@@ -37,11 +37,19 @@ public class PersonIdentifyAspect {
 //            String personSeq = result.get("personSeq").toString();
 //            String personName = result.get("personName").toString();
 //            String companyId = result.get("companyId").toString();
+//            String companyName = result.get("companyName").toString();
             String identityType = "1";
             String personSeq = "1421016571081420802";
             String personName = "SHG";
             String companyId = "1420727427956502529";
-            reginParam.setPersonIdentity(new ReginParams.PersonIdentity(identityType, personSeq, personName, companyId));
+            String companyName ="机电公司";
+            ReginParams.PersonIdentity personIdentity  = new ReginParams.PersonIdentity();
+            personIdentity.setIdentityType(identityType);
+            personIdentity.setPersonSeq(personSeq);
+            personIdentity.setPersonName(personName);
+            personIdentity.setCompanyId(companyId);
+            personIdentity.setCompanyName(companyName);
+            reginParam.setPersonIdentity(new ReginParams.PersonIdentity());
             redisUtils.set(buildKey(RequestContext.getToken()), JSONObject.toJSONString(reginParam));
         }
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/quartz/JobService.java

@@ -197,14 +197,21 @@ public class JobService implements IJobService {
                 check.setDepName("");
                 check.setPointName(arg.getPointName());
                 check.setPointId(arg.getPointId());
+                check.setPointNo(arg.getPointNo());
+                check.setBuildingName(arg.getBuildingName());
                 check.setUploadTime(new Date());
                 check.setPlanId(arg.getPlanId());
                 check.setPlanName(arg.getPlanName());
+                check.setPlanType(arg.getPlanType());
                 check.setPlanTaskId(arg.getPlanTaskId());
                 check.setPlanTaskDetailId(arg.getPlanTaskDetailId());
                 check.setRouteId(arg.getRouteId());
                 check.setRouteName(arg.getRouteName());
                 check.setCheckTime(arg.getEndTime());
+                check.setOwnerId(arg.getOwnerId());
+                check.setCompanyId(arg.getCompanyId());
+                check.setCompanyName(arg.getCompanyName());
+                check.setEquipmentName(arg.getEquipmentName());
                 check.setIsOk(CheckStatusEnum.OMISSION.getCode());
                 check = iCheckDao.saveAndFlush(check);
                 checkMap.put(arg.getPointId(), check);

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

@@ -15,6 +15,7 @@ import com.yeejoin.amos.supervision.business.vo.InputItemTemplateVo;
 import com.yeejoin.amos.supervision.business.vo.InputItemVo;
 import com.yeejoin.amos.supervision.business.vo.PointInputItemVo;
 import com.yeejoin.amos.supervision.common.enums.DictTypeEnum;
+import com.yeejoin.amos.supervision.common.enums.SupervisionDictEnum;
 import com.yeejoin.amos.supervision.core.util.query.BaseQuerySpecification;
 import com.yeejoin.amos.supervision.dao.entity.InputItem;
 import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
@@ -98,7 +99,7 @@ public class InputItemServiceImpl implements IInputItemService {
     @Override
     public List<Map<String, Object>> generateDictionaryValue() {
         List<Map<String, Object>> list = new ArrayList<>();
-        for (Map<String, String> map : DictTypeEnum.getEnumList()) {
+        for (Map<String, String> map : SupervisionDictEnum.getEnumList()) {
             JSONArray jsonArray = remoteSecurityService.listDictionaryByDictCode(RequestContext.getToken(),
                     RequestContext.getProduct(), RequestContext.getAppKey(), map.get("code"));
             Map<String, Object> map1 = new HashMap<>();
@@ -110,20 +111,20 @@ public class InputItemServiceImpl implements IInputItemService {
                 m.put("name", jsonObject.get("dictDataValue").toString());
                 lists.add(m);
             }
-            if ("itemClassify".equals(map.get("code"))) {
-                map1.put("CHECK_ITEM_CLASSIFY", lists);
+            if ("CHECK_ITEM_CLASSIFY".equals(map.get("code"))) {
+                map1.put("itemClassify", lists);
                 list.add(map1);
             }
-            if ("itemType".equals(map.get("code"))) {
-                map1.put("CHECK_ITEM_TYPE", lists);
+            if ("CHECK_ITEM_TYPE".equals(map.get("code"))) {
+                map1.put("itemType", lists);
                 list.add(map1);
             }
-            if ("itemLevel".equals(map.get("code"))) {
-                map1.put("CHECK_ITEM_LEVEL", lists);
+            if ("CHECK_ITEM_LEVEL".equals(map.get("code"))) {
+                map1.put("itemLevel", lists);
                 list.add(map1);
             }
-            if ("checkType".equals(map.get("code"))) {
-                map1.put("CHECK_ITEM_CONTENT", lists);
+            if ("CHECK_ITEM_CONTENT".equals(map.get("code"))) {
+                map1.put("checkType", lists);
                 list.add(map1);
             }
         }

amos-boot-system-jcs/src/main/resources/application-dev.properties

@@ -39,4 +39,3 @@ file.url=http://39.98.45.134:9000/
 
 video.url=https://11.11.16.4:443/
 
-failure.work.flow.processDefinitionKey=malfunction_repair
\ No newline at end of file

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

-spring.application.name=JCS_cz
+spring.application.name=JCS
+server.servlet.context-path=/jcs
 server.port=11100
 spring.profiles.active=dev
 
@@ -27,6 +28,10 @@ spring.datasource.hikari.max-lifetime=120000
 spring.datasource.hikari.connection-timeout=30000
 spring.datasource.hikari.connection-test-query=SELECT 1
 
+##liquibase
+spring.liquibase.change-log = classpath:/db/changelog/changelog-master.xml
+spring.liquibase.enabled= true
+
 ## eureka properties:
 eureka.client.registry-fetch-interval-seconds=5
 eureka.instance.prefer-ip-address=true
@@ -67,3 +72,6 @@ equip.fegin.name=AMOS-EQUIPMANAGE
 
 ## 设备联动服务（车库门、广播、警铃）
 control.fegin.name=JCS-API-CONTROL
+
+## 故障报修流程
+failure.work.flow.processDefinitionKey=malfunction_repair
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+
+<databaseChangeLog     
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog 
+        http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
+        
+    <include file="jcs-1.0.0.0.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>

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

+<?xml version="1.0" encoding="utf-8"?>
+
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+        http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
+   
+   
+   <changeSet author="guowubin" id="1629430730658-1">
+    	<comment>alter table jc_controller</comment>
+    	<sql>
+		    DROP TABLE IF EXISTS `jc_controller`;
+			CREATE TABLE `jc_controller`  (
+				  `sequence_nbr` bigint(22) NOT NULL COMMENT 'id',
+				  `station` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '控制站',
+				  `c_ip` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'ip',
+				  `c_port` int(11) NULL DEFAULT NULL COMMENT '端口',
+				  `c_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '控制器名称',
+				  `type` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '控制器类别',
+				  `c_state` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态',
+				  `rec_date` datetime(0) NULL DEFAULT NULL,
+				  `rec_user_id` int(11) NULL DEFAULT NULL,
+				  `rec_user_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+				  `is_delete` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+				  PRIMARY KEY (`sequence_nbr`) USING BTREE
+			) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+    	</sql>
+	</changeSet>
+	
+	<changeSet author="guowubin" id="1629430730658-2">
+	 	<preConditions onFail="MARK_RAN">
+			<tableExists tableName="jc_controller" />
+    	</preConditions>
+    	<comment>add data table jc_controller</comment>
+    	<sql>
+		    INSERT INTO `jc_controller` VALUES (1245230062463119361, '2', NULL, NULL, '南站广播', '2', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
+			INSERT INTO `jc_controller` VALUES (1308575795966443521, '1', NULL, NULL, '主站警铃', '1', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
+			INSERT INTO `jc_controller` VALUES (1428303671921250305, '3', NULL, NULL, '北站广播', '2', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
+			INSERT INTO `jc_controller` VALUES (1428306948020801538, '3', NULL, NULL, '北站警铃', '1', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
+			INSERT INTO `jc_controller` VALUES (1428323093599784962, '2', '172.19.111.163', 502, '南站电门控制', '3', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
+			INSERT INTO `jc_controller` VALUES (1428325245344845826, '2', NULL, NULL, '南站警铃', '1', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
+			INSERT INTO `jc_controller` VALUES (1428325285853433857, '3', '172.19.111.153', 502, '北站电门控制', '3', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
+			INSERT INTO `jc_controller` VALUES (1428325336898113537, '1', NULL, NULL, '主站广播', '2', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
+    	</sql>
+	</changeSet>
+	
+	<changeSet author="guowubin" id="1629430730658-3">
+    	<comment>alter table jc_controller_equip</comment>
+    	<sql>
+		    DROP TABLE IF EXISTS `jc_controller_equip`;
+			CREATE TABLE `jc_controller_equip`  (
+				  `sequence_nbr` bigint(20) NOT NULL COMMENT 'id',
+				  `controller_seq` bigint(20) NULL DEFAULT NULL COMMENT '控制站',
+				  `e_num` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'ip',
+				  `e_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '端口',
+				  `e_state` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态',
+				  `rec_date` datetime(0) NULL DEFAULT NULL,
+				  `rec_user_id` int(11) NULL DEFAULT NULL,
+				  `rec_user_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+				  `is_delete` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+				  PRIMARY KEY (`sequence_nbr`) USING BTREE
+			) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+    	</sql>
+	</changeSet>
+	
+	<changeSet author="guowubin" id="1629430730658-4">
+		<preConditions onFail="MARK_RAN">
+			<tableExists tableName="jc_controller_equip" />
+    	</preConditions>
+    	<comment>add data table jc_controller_equip</comment>
+    	<sql>
+		    INSERT INTO `jc_controller_equip` VALUES (1192346783527378946, 1428325245344845826, '206', '警铃终端', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
+			INSERT INTO `jc_controller_equip` VALUES (1245230052539396097, 1245230062463119361, '202', '广播终端', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
+			INSERT INTO `jc_controller_equip` VALUES (1272442241152421890, 1428325285853433857, '100', '1号门', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
+			INSERT INTO `jc_controller_equip` VALUES (1274947632054542338, 1428325285853433857, '101', '2号门', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
+			INSERT INTO `jc_controller_equip` VALUES (1302793235940249602, 1428306948020801538, '205', '警铃终端', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
+			INSERT INTO `jc_controller_equip` VALUES (1315854437968797697, 1428323093599784962, '100', '4个电门', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
+			INSERT INTO `jc_controller_equip` VALUES (1320637765980856322, 1428325285853433857, '102', '3号门', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
+			INSERT INTO `jc_controller_equip` VALUES (1332610043605946369, 1308575795966443521, '204', '警铃终端', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
+			INSERT INTO `jc_controller_equip` VALUES (1343765647514955778, 1428325336898113537, '201', '广播终端', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
+			INSERT INTO `jc_controller_equip` VALUES (1397143491787747330, 1428303671921250305, '203', '广播终端', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
+			INSERT INTO `jc_controller_equip` VALUES (1397145718640209921, 1428325285853433857, '103', '4号门', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
+    	</sql>
+	</changeSet>
+	
+</databaseChangeLog>

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

@@ -2037,7 +2037,7 @@
             pp.equipment_name equipmentName,
             pp.belong_system_id systemId,
             pp.belong_system_name systemName,
-            CONCAT(pp.address, pp.building_name) address,
+            CONCAT_WS(',',pp.building_name,pp.address) address,
             CONCAT(date_format(
                 ppl.plan_begin,
                 '%Y-%m-%d %H:%i:%s'

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

@@ -388,6 +388,10 @@
 			temp1.classifyName,
 			temp1.routeName,
 			temp1.pointName,
+			temp1.ownerId,
+			temp1.pointNo,
+			temp1.buildingName,
+			temp1.equipmentName,
 			pii.`name` inputName,
 			temp2.*
 		FROM
@@ -404,7 +408,11 @@
 					ppc.id classifyId,
 					ppc.`name` classifyName,
 				    r.name as routeName,
-					p.name as pointName
+					p.name as pointName,
+				    p.owner_id as ownerId,
+				    p.point_no as pointNo,
+				    p.building_name as buildingName,
+					p.equipment_name as equipmentName
 				FROM
 					p_route_point_item prpi
 					LEFT JOIN p_route_point prp ON prp.id = prpi.route_point_id
@@ -423,9 +431,13 @@
 					ptd.user_id AS userId,
 					ptd.org_code AS orgCode,
 					ptd.end_time AS endTime,
+					ptd.end_time AS endTime,
+					ptd.company_id as companyId,
+					ptd.company_name as companyName,
 					pptd.id as planTaskDetailId,
 					(select p_plan.dept_id from  p_plan where p_plan.id=ptd.plan_id) depId,
-					(select p_plan.name from  p_plan where p_plan.id=ptd.plan_id) planName
+					(select p_plan.name from  p_plan where p_plan.id=ptd.plan_id) planName,
+					(select p_plan.plan_type from  p_plan where p_plan.id=ptd.plan_id) planType
 				FROM
 					p_plan_task_detail pptd,
 					p_plan_task ptd

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

@@ -13,7 +13,15 @@
 	</delete>
     <select id="findPlanTaskByTaskIdAndPointId" resultType="Map">
 		SELECT
-			p.name planName, pt.begin_time beginTime, pt.end_time endTime, pp.name pointName, pp.point_no pointNo, ptd.id planTaskDetailId, pt.route_id routeId, pr.name routeName
+			p.name planName,
+		    pt.begin_time beginTime,
+		    pt.end_time endTime,
+		    pp.name pointName,
+		    pp.point_no pointNo,
+		    ptd.id planTaskDetailId,
+		    pt.route_id routeId,
+		    pr.name routeName,
+		    p.plan_type as planType
 		FROM
 			p_plan_task pt
 		LEFT JOIN p_plan p ON pt.plan_id = p.id

amos-boot-system-supervision/src/main/resources/application-dev.properties

 #DB properties:
-spring.datasource.url = jdbc:mysql://172.16.6.60:3306/amos-maintenance?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+spring.datasource.url = jdbc:mysql://172.16.11.20:3306/amos-supervision_v1.0?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
 spring.datasource.username= root
 spring.datasource.password= root_123
 ## eureka properties: