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/feign/SupervisionFeign.java

+package com.yeejoin.amos.boot.module.common.api.feign;
+
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+// 消防监督调用
+@FeignClient(name = "${supervision.feign.name}", path = "supervision", configuration = {MultipartSupportConfig.class})
+public interface SupervisionFeign {
+
+    @RequestMapping(value = "/api/point/teamInput", method = RequestMethod.POST, consumes = "application/json")
+    ResponseModel asyncOwner(@RequestBody OrgUsrFormDto orgUsrFormDto);
+
+    @RequestMapping(value = "/api/point/delete", method = RequestMethod.POST, consumes = "application/json")
+    ResponseModel deleteOwner(@RequestBody Long id);
+}
+

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

@@ -3,10 +3,8 @@
 <mapper
 	namespace="com.yeejoin.amos.boot.module.common.api.mapper.KeySiteMapper">
 
-
-
 	<select id="getPageList" resultType="com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto">
-SELECT
+		SELECT
 		c.`name` as name,
 		c.belong_id as belongId,
 		cou.biz_org_name as belongName,
@@ -33,35 +31,33 @@ SELECT
 		c.rec_date AS recDate,
 		c.fire_endurance_rate_name as fireEnduranceRateName,
 		c.use_nature_name as useNatureName
-FROM
+		FROM
 		cb_key_site c
-left join  cb_org_usr cou on c.belong_id =cou.sequence_nbr
-where c.is_delete=FALSE
-<if test="name != null and name != ''">
+		left join cb_org_usr cou on c.belong_id =cou.sequence_nbr
+		where c.is_delete=FALSE
+		<if test="name != null and name != ''">
 			AND c.`name` like concat(#{name}, '%')
-</if>
-<if test="buildingId != null and buildingId != -1">
+		</if>
+		<if test="buildingId != null and buildingId != -1">
 			AND c.`building_id`= #{buildingId}
-</if>
-<if test="fireEnduranceRate != null and fireEnduranceRate != ''">
+		</if>
+		<if test="fireEnduranceRate != null and fireEnduranceRate != ''">
 			AND c.`fire_endurance_rate`= #{fireEnduranceRate}
-</if>
-<if test="useNature != null and useNature != ''">
+		</if>
+		<if test="useNature != null and useNature != ''">
 			AND c.`use_nature`= #{useNature}
-</if>
-<if test="fireFacilitiesInfo != null and fireFacilitiesInfo != ''">
+		</if>
+		<if test="fireFacilitiesInfo != null and fireFacilitiesInfo != ''">
 			AND c.`fire_facilities_info`= #{fireFacilitiesInfo}
-</if>
-<if test="belongId != null and belongId!='-1' and belongId != -1">
+		</if>
+		<if test="belongId != null and belongId!='-1' and belongId != -1">
 			AND c.`belong_id`= #{belongId}
-</if>
+		</if>
+		order by c.rec_date desc
 	</select>
 	
-	
 	<select id="getSequenceNbr" resultType="com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto">
-	
-	SELECT
-	c.`name` as name,
+		SELECT c.`name`                     as name,
 			   c.belong_id                  as belongId,
 			   cou.biz_org_name             as belongName,
 			   c.building_id                as buildingId,
@@ -87,16 +83,14 @@ where c.is_delete=FALSE
 			   c.rec_date                   AS recDate,
 			   c.fire_endurance_rate_name   as fireEnduranceRateName,
 			   c.use_nature_name            as useNatureName
-FROM
-	cb_key_site c
-left join  cb_org_usr cou on c.belong_id =cou.sequence_nbr
-where c.sequence_nbr=#{sequenceNbr} and c.is_delete=FALSE;
-</select>
+		FROM cb_key_site c
+				 left join cb_org_usr cou on c.belong_id = cou.sequence_nbr
+		where c.sequence_nbr = #{sequenceNbr}
+		  and c.is_delete = FALSE;
+	</select>
 		
 	<select id="getKeySiteList" resultType="com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto">
-	
-	SELECT
-	c.`name` as name,
+		SELECT c.`name`                     as name,
 			   c.belong_id                  as belongId,
 			   cou.biz_org_name             as belongName,
 			   c.building_id                as buildingId,
@@ -122,10 +116,9 @@ where c.sequence_nbr=#{sequenceNbr} and c.is_delete=FALSE;
 			   c.rec_date                   AS recDate,
 			   c.fire_endurance_rate_name   as fireEnduranceRateName,
 			   c.use_nature_name            as useNatureName
-FROM
-	cb_key_site c
-left join  cb_org_usr cou on c.belong_id =cou.sequence_nbr
-where c.is_delete=FALSE;
-</select>
+		FROM cb_key_site c
+				 left join cb_org_usr cou on c.belong_id = cou.sequence_nbr
+		where c.is_delete = FALSE;
+	</select>
 		
 </mapper>

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

-package com.yeejoin.amos.maintenance.dao.entity;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-
-import org.hibernate.annotations.Where;
-
-@Entity
-@Table(name="p_app_version")
-@NamedQuery(name="AppVersion.findAll", query="SELECT c FROM AppVersion c")
-@Where(clause="is_latest_version=1")//表示未删除的数据
-public class AppVersion extends BasicEntity {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -3207180951171522450L;
-
-	/**
-	 * app版本
-	 */
-	@Column(name="version")
-	private String version;
-	
-	/**
-	 * 版本说明
-	 */
-	@Column(name="remark")
-	private String remark;
-	
-	/**
-	 * app发布人id
-	 */
-	@Column(name="publisher")
-	private int publisher;
-	
-	/**
-	 * app发布人名称
-	 */
-	@Column(name="publisher_name")
-	private String publisherName;
-	
-	/**
-	 * 是否需要强制更新
-	 */
-	@Column(name="update_type")
-	private int updateType;
-	
-	/**
-	 * 是否为最新版本
-	 */
-	@Column(name="is_latest_version")
-	private Boolean isLatestVersion;
-	
-	/**
-	 * app保存路径
-	 */
-	@Column(name="url")
-	private String url;
-
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public int getPublisher() {
-		return publisher;
-	}
-
-	public void setPublisher(int publisher) {
-		this.publisher = publisher;
-	}
-
-	public String getPublisherName() {
-		return publisherName;
-	}
-
-	public void setPublisherName(String publisherName) {
-		this.publisherName = publisherName;
-	}
-
-	public int getUpdateType() {
-		return updateType;
-	}
-
-	public void setUpdateType(int updateType) {
-		this.updateType = updateType;
-	}
-
-	public Boolean getIsLatestVersion() {
-		return isLatestVersion;
-	}
-
-	public void setIsLatestVersion(Boolean isLatestVersion) {
-		this.isLatestVersion = isLatestVersion;
-	}
-
-	public String getUrl() {
-		return url;
-	}
-
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
-	
-
-}

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

-package com.yeejoin.amos.maintenance.dao.entity;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-
-@Entity
-@Table(name="p_config")
-@NamedQuery(name="Config.findAll", query="SELECT c FROM Config c")
-public class Config extends BasicEntity {
-	private static final long serialVersionUID = 1L;
-	
-	/**
-	 * 描述
-	 */
-	@Column(name="des")
-	private String des;
-	
-	/**
-	 * 名称
-	 */
-	@Column(name="name")
-	private String name;
-	
-	/**
-	 * 属性
-	 */
-	@Column(name="attribute")
-	private String attribute;
-
-	public String getDes() {
-		return des;
-	}
-
-	public void setDes(String des) {
-		this.des = des;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getAttribute() {
-		return attribute;
-	}
-
-	public void setAttribute(String attribute) {
-		this.attribute = attribute;
-	}
-	
-	
-	
-
-}

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

@@ -17,7 +17,11 @@ public enum DictTypeEnum {
     EQUIPTYPE("设备类型","EQUIP_TYPE"),
     DANGERLEVEL("隐患等级", "DANGER_LEVEL"),
     OUTERPOINTTYPE("导入外部安全检查表分类", "OUTER_POINT_TYPE"),
-    MAINTENANCE_CLASSIFY("维保项分类","MAINTENANCE_CLASSIFY");
+    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");
 
     /**
      * 名称，描述

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/InputItem.java

@@ -182,6 +182,90 @@ public class InputItem extends BasicEntity {
     @Column(name = "test_requirement")
     private String testRequirement;
 
+    /**
+     * 检查类型
+     */
+    @Column(name="check_type")
+    private String checkType;
+
+    /**
+     * 父类检查项id
+     */
+    @Column(name="item_parent")
+    private String itemParent;
+
+    /**
+     * 检查项分类
+     */
+    @Column(name="item_classify")
+    private String itemClassify;
+
+    /**
+     * 适用检查类别
+     */
+    @Column(name="item_type_classify")
+    private String itemTypeClassify;
+
+    /**
+     * 检查项等级
+     */
+    @Column(name="item_level")
+    private String itemLevel;
+
+    /**
+     * 检查项启用
+     */
+    @Column(name="item_start")
+    private String itemStart;
+
+    public String getItemStart() {
+        return itemStart;
+    }
+
+    public void setItemStart(String itemStart) {
+        this.itemStart = itemStart;
+    }
+
+    public String getItemParent() {
+        return itemParent;
+    }
+
+    public void setItemParent(String itemParent) {
+        this.itemParent = itemParent;
+    }
+
+    public String getItemClassify() {
+        return itemClassify;
+    }
+
+    public void setItemClassify(String itemClassify) {
+        this.itemClassify = itemClassify;
+    }
+
+    public String getItemTypeClassify() {
+        return itemTypeClassify;
+    }
+
+    public void setItemTypeClassify(String itemTypeClassify) {
+        this.itemTypeClassify = itemTypeClassify;
+    }
+
+    public String getItemLevel() {
+        return itemLevel;
+    }
+
+    public void setItemLevel(String itemLevel) {
+        this.itemLevel = itemLevel;
+    }
+
+    public String getCheckType() {
+        return checkType;
+    }
+
+    public void setCheckType(String checkType) {
+        this.checkType = checkType;
+    }
+
     public void setMaintenanceContent(String maintenanceContent) {
         this.maintenanceContent = maintenanceContent;
     }

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/Point.java

@@ -268,6 +268,34 @@ public class Point extends BasicEntity {
 	private String riskSourceId;
 
 	/**
+	 * 所在建筑名称
+	 */
+	@Column(name="building_name")
+	private String buildingName;
+
+	public String getBuildingName() {
+		return buildingName;
+	}
+
+	public void setBuildingName(String buildingName) {
+		this.buildingName = buildingName;
+	}
+
+	public String getBuildingId() {
+		return buildingId;
+	}
+
+	public void setBuildingId(String buildingId) {
+		this.buildingId = buildingId;
+	}
+
+	/**
+	 * 所在建筑Id
+	 */
+	@Column(name="building_id")
+	private String buildingId;
+
+	/**
 	 * ue4位置
 	 */
 

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/AlertCalled.java

@@ -192,8 +192,6 @@ public class AlertCalled extends BaseEntity {
     @ApiModelProperty(value = "使用单位")
     private String useUnit;
 
-
-    @TableField(exist=false)
     @ApiModelProperty(value = "地址")
     private String address;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -26,16 +26,16 @@
 
     <select id="queryNearlyCount" resultType="java.util.Map">
         SELECT
-        DATE_ADD(#{beginDate},INTERVAL -1 DAY)  dateTime,
+        DATE_ADD(#{beginDate},INTERVAL -7 DAY)  dateTime,
         sum( CASE WHEN father_alert is null THEN 1 ELSE 0 END ) majorAlertCount
         FROM
         tz_alert_called
         WHERE 1 = 1
         <if test="beginDate != null and beginDate != ''">
-            and call_time >= DATE_ADD(#{beginDate},INTERVAL -1 DAY)
+            and call_time >= DATE_ADD(#{beginDate},INTERVAL -7 DAY)
         </if>
         <if test="endDate != null and endDate != ''">
-            and call_time <![CDATA[ <= ]]> DATE_ADD(#{endDate},INTERVAL -1 DAY)
+            and call_time <![CDATA[ <= ]]> DATE_ADD(#{endDate},INTERVAL -7 DAY)
         </if>
         <if test="orgCode != null and orgCode != ''  and  recUserId != null and   recUserId != ''" >
             and org_code= #{orgCode}
@@ -43,16 +43,16 @@
         </if>
         UNION ALL
         SELECT
-        DATE_ADD(#{beginDate},INTERVAL -2 DAY) dateTime,
+        DATE_ADD(#{beginDate},INTERVAL -6 DAY) dateTime,
         sum( CASE WHEN father_alert is null THEN 1 ELSE 0 END ) majorAlertCount
         FROM
         tz_alert_called
         WHERE 1 = 1
         <if test="beginDate != null and beginDate != ''">
-            and call_time >= DATE_ADD(#{beginDate},INTERVAL -2 DAY)
+            and call_time >= DATE_ADD(#{beginDate},INTERVAL -6 DAY)
         </if>
         <if test="endDate != null and endDate != ''">
-            and call_time <![CDATA[ <= ]]> DATE_ADD(#{endDate},INTERVAL -2 DAY)
+            and call_time <![CDATA[ <= ]]> DATE_ADD(#{endDate},INTERVAL -6 DAY)
         </if>
         <if test="orgCode != null and orgCode != ''  and  recUserId != null and   recUserId != ''" >
             and org_code= #{orgCode}
@@ -60,16 +60,16 @@
         </if>
         UNION ALL
         SELECT
-        DATE_ADD(#{beginDate},INTERVAL -3 DAY) dateTime,
+        DATE_ADD(#{beginDate},INTERVAL -5 DAY) dateTime,
         sum( CASE WHEN father_alert is null THEN 1 ELSE 0 END ) majorAlertCount
         FROM
         tz_alert_called
         WHERE 1 = 1
         <if test="beginDate != null and beginDate != ''">
-            and call_time >= DATE_ADD(#{beginDate},INTERVAL -3 DAY)
+            and call_time >= DATE_ADD(#{beginDate},INTERVAL -5 DAY)
         </if>
         <if test="endDate != null and endDate != ''">
-            and call_time <![CDATA[ <= ]]> DATE_ADD(#{endDate},INTERVAL -3 DAY)
+            and call_time <![CDATA[ <= ]]> DATE_ADD(#{endDate},INTERVAL -5 DAY)
         </if>
         <if test="orgCode != null and orgCode != ''  and  recUserId != null and   recUserId != ''" >
             and org_code= #{orgCode}
@@ -94,16 +94,16 @@
         </if>
         UNION ALL
         SELECT
-        DATE_ADD(#{beginDate},INTERVAL -5 DAY) dateTime,
+        DATE_ADD(#{beginDate},INTERVAL -3 DAY) dateTime,
         sum( CASE WHEN father_alert is null THEN 1 ELSE 0 END ) majorAlertCount
         FROM
         tz_alert_called
         WHERE 1 = 1
         <if test="beginDate != null and beginDate != ''">
-            and call_time >= DATE_ADD(#{beginDate},INTERVAL -5 DAY)
+            and call_time >= DATE_ADD(#{beginDate},INTERVAL -3 DAY)
         </if>
         <if test="endDate != null and endDate != ''">
-            and call_time <![CDATA[ <= ]]> DATE_ADD(#{endDate},INTERVAL -5 DAY)
+            and call_time <![CDATA[ <= ]]> DATE_ADD(#{endDate},INTERVAL -3 DAY)
         </if>
         <if test="orgCode != null and orgCode != ''  and  recUserId != null and   recUserId != ''" >
             and org_code= #{orgCode}
@@ -111,16 +111,16 @@
         </if>
         UNION ALL
         SELECT
-        DATE_ADD(#{beginDate},INTERVAL -6 DAY) dateTime,
+        DATE_ADD(#{beginDate},INTERVAL -2 DAY) dateTime,
         sum( CASE WHEN father_alert is null THEN 1 ELSE 0 END ) majorAlertCount
         FROM
         tz_alert_called
         WHERE 1 = 1
         <if test="beginDate != null and beginDate != ''">
-            and call_time >= DATE_ADD(#{beginDate},INTERVAL -6 DAY)
+            and call_time >= DATE_ADD(#{beginDate},INTERVAL -2 DAY)
         </if>
         <if test="endDate != null and endDate != ''">
-            and call_time <![CDATA[ <= ]]> DATE_ADD(#{endDate},INTERVAL -6 DAY)
+            and call_time <![CDATA[ <= ]]> DATE_ADD(#{endDate},INTERVAL -2 DAY)
         </if>
         <if test="orgCode != null and orgCode != ''  and  recUserId != null and   recUserId != ''" >
             and org_code= #{orgCode}
@@ -128,16 +128,16 @@
         </if>
         UNION ALL
         SELECT
-        DATE_ADD(#{beginDate},INTERVAL -7 DAY) dateTime,
+        DATE_ADD(#{beginDate},INTERVAL -1 DAY) dateTime,
         sum( CASE WHEN father_alert is null THEN 1 ELSE 0 END ) majorAlertCount
         FROM
         tz_alert_called
         WHERE 1 = 1
         <if test="beginDate != null and beginDate != ''">
-            and call_time >= DATE_ADD(#{beginDate},INTERVAL -7 DAY)
+            and call_time >= DATE_ADD(#{beginDate},INTERVAL -1 DAY)
         </if>
         <if test="endDate != null and endDate != ''">
-            and call_time <![CDATA[ <= ]]> DATE_ADD(#{endDate},INTERVAL -7 DAY)
+            and call_time <![CDATA[ <= ]]> DATE_ADD(#{endDate},INTERVAL -1 DAY)
         </if>
         <if test="orgCode != null and orgCode != ''  and  recUserId != null and   recUserId != ''" >
             and org_code= #{orgCode}

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

@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
+import com.yeejoin.amos.boot.module.common.api.feign.SupervisionFeign;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,6 +35,8 @@ import java.util.Map;
 public class OrgPersonController {
     @Autowired
     OrgUsrServiceImpl iOrgUsrService;
+    @Autowired
+    SupervisionFeign supervisionFeign;
   
 
     /**
@@ -63,6 +66,7 @@ public class OrgPersonController {
         // 删除时，只作逻辑删除
         iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete",
                 CommonConstant.IS_DELETE_01));
+        supervisionFeign.deleteOwner(id);
         return ResponseHelper.buildResponse(null);
     }
 

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

@@ -67,6 +67,7 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 			String useNature, String fireFacilitiesInfo, Long belongId){
 		return keySiteMapper.getPageList(page,name,buildingId,fireEnduranceRate,useNature,fireFacilitiesInfo,belongId);
 	}
+
 	@Override
 	public List<Object> getBuildTree() {
 		ResponseModel<Object> response = equipFeignClient.getBuildingTree();

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

@@ -11,6 +11,7 @@ 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.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
+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.IOrgUsrService;
 import com.yeejoin.amos.feign.privilege.Privilege;
@@ -50,7 +51,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	DynamicFormColumnServiceImpl alertFormServiceImpl;
 	@Resource
 	OrgUsrMapper orgUsrMapper;
-
+	@Autowired
+	SupervisionFeign supervisionFeign;
 	@Autowired
 	ESOrgUsrService eSOrgUsrService;
 	@Override
@@ -399,7 +401,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	@Override
-	public void saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist) {
+	public void saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist) throws Exception {
 		orgUsr.setRecDate(new Date());
 		AgencyUserModel user = Privilege.agencyUserClient.getme().getResult();
 		orgUsr.setRecUserName(user.getRealName());
@@ -417,6 +419,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		});
 		// 保存动态表单数据
 		alertFormValueServiceImpl.saveBatch(alertFromValuelist);
+		OrgUsrFormDto formDto = this.selectCompanyById(orgUsr.getSequenceNbr());
+		if (OrgPersonEnum.公司.getKey().equals(orgUsr.getBizOrgType())) {
+			supervisionFeign.asyncOwner(formDto);
+		}
 	}
 
 	@Override

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

-package com.yeejoin.amos.maintenance.business.controller;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-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.yeejoin.amos.maintenance.business.service.intfc.IAppService;
-import com.yeejoin.amos.maintenance.business.util.CommonResponse;
-import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
-import com.yeejoin.amos.maintenance.common.enums.CheckStatisticsTypeEnum;
-import com.yeejoin.amos.maintenance.common.enums.PlanTaskExecution;
-import com.yeejoin.amos.maintenance.common.enums.PlanTaskFinishStatusEnum;
-import com.yeejoin.amos.maintenance.common.enums.TaskStatisticsTypeEnum;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-
-@RestController
-@RequestMapping(value = "/api/common")
-@Api(tags="公共接口api")
-public class CommonController  extends AbstractBaseController{
-	
-	/*@Autowired
-	IUserService userService;*/
-	@Autowired
-	private IAppService iAppService;
-	
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(value = "任务统计口径类型", notes = "任务统计口径类型")
-	@RequestMapping(value = "/taskgetStatisticsType", method = RequestMethod.GET)
-	public CommonResponse getTaskStatisticsType() {
-		return CommonResponseUtil.success(TaskStatisticsTypeEnum.getEnumList());
-	}
-	
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(value = "巡检统计口径类型", notes = "巡检统计口径类型")
-	@RequestMapping(value = "/checkStatisticsType", method = RequestMethod.GET)
-	public CommonResponse getCheckStatisticsType() {
-		return CommonResponseUtil.success(CheckStatisticsTypeEnum.getEnumList());
-	}
-	
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET", value = "计划任务完成种类", notes = "计划任务完成种类")
-	@RequestMapping(value = "/planTaskFinishStatus", method = RequestMethod.GET)
-	public CommonResponse getPlanTaskFinishStatus() {
-		return CommonResponseUtil.success(PlanTaskFinishStatusEnum.getEnumList());
-	}
-	
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(value = "计划任务执行情况种类", notes = "计划任务执行情况种类")
-	@RequestMapping(value = "/planTaskExecution", method = RequestMethod.GET)
-	public CommonResponse getPlanTaskExecution() {
-		return CommonResponseUtil.success(PlanTaskExecution.getEnumList());
-	}
-	
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(value = "获取app最新版本信息", notes = "获取app最新版本信息")
-	@RequestMapping(value = "/queryAppVersion", method = RequestMethod.GET)
-	//@Authorization(ingore=true)
-	public CommonResponse getAppLastVersion() {
-		return CommonResponseUtil.success(iAppService.queryAppLastVersion());
-	}
-	
-}

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

-package com.yeejoin.amos.maintenance.business.controller;
-
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-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.yeejoin.amos.maintenance.business.dao.repository.IConfigDao;
-import com.yeejoin.amos.maintenance.business.util.CommonResponse;
-import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
-import com.yeejoin.amos.maintenance.dao.entity.Config;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-
-/**
- * 获取主题信息
- * 
- * @author 
- *
- */
-@RestController
-@RequestMapping(value = "/api/config")
-@Api(tags="配置接口api")
-public class ConfigController extends AbstractBaseController{
-	private final Logger log = LoggerFactory.getLogger(ConfigController.class);
-	
-	
-	@Autowired
-	private IConfigDao configDao ;
-	/**
-	 * <pre>
-	 * 获取配置接口信息
-	 * </pre>
-	 * 
-	 * 
-	 * @return
-	 */
-	//@Authorization(ingore = true)
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(value = "获取配置接口信息", notes = " 获取配置接口信息")
-	@RequestMapping(value = "/getConfigsInfo", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
-	public CommonResponse getConfigsInfo() {
-		List<Config> configs = configDao.findAll();
-		return CommonResponseUtil.success(configs);
-	}
-	
-
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/dao/repository/AppVersionDao.java

-package com.yeejoin.amos.maintenance.business.dao.repository;
-
-import org.springframework.data.jpa.repository.Query;
-
-import com.yeejoin.amos.maintenance.dao.entity.AppVersion;
-
-public interface AppVersionDao extends BaseDao<AppVersion, Long>{
-
-	@Query(value="SELECT * FROM p_app_version v ORDER BY v.id DESC LIMIT 0,1", nativeQuery = true)
-	AppVersion findLastVersion();
-
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/dao/repository/IConfigDao.java

-package com.yeejoin.amos.maintenance.business.dao.repository;
-
-import java.util.List;
-
-import org.springframework.stereotype.Repository;
-
-import com.yeejoin.amos.maintenance.dao.entity.Config;
-
-@Repository("configDao")
-public interface IConfigDao extends BaseDao<Config, Long>{
-		List<Config> findAll();
-}

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

 package com.yeejoin.amos.maintenance.business.entity.mybatis;
 
+import lombok.Data;
+
 import java.util.Date;
 
+/**
+ * @author DELL
+ */
+@Data
 public class PlanTaskPointInputItemBo {
 
 	/**
@@ -66,152 +72,31 @@ public class PlanTaskPointInputItemBo {
 
 	private Long classifyId;
 
-   //新增执行部门	
+	/**
+	 * 执行部门
+	 */
 	private String depId;
-	//执行人名称
+	/**
+	 * 执行人名称
+	 */
 	private String userName;
-	//执行部门名称
-	private String depName;
-	
-	
-	
-	
-	
-	
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-
-	public String getDepName() {
-		return depName;
-	}
-
-	public void setDepName(String depName) {
-		this.depName = depName;
-	}
-
-	public Long getInputItemId() {
-		return inputItemId;
-	}
-
-	public void setInputItemId(Long inputItemId) {
-		this.inputItemId = inputItemId;
-	}
-
-	public int getOrderNo() {
-		return orderNo;
-	}
-
-	public void setOrderNo(int orderNo) {
-		this.orderNo = orderNo;
-	}
-
-	public long getPointId() {
-		return pointId;
-	}
-
-	public void setPointId(long pointId) {
-		this.pointId = pointId;
-	}
-
-	public long getPlanTaskId() {
-		return planTaskId;
-	}
-
-	public void setPlanTaskId(long planTaskId) {
-		this.planTaskId = planTaskId;
-	}
-
-	public long getRouteId() {
-		return routeId;
-	}
-
-	public void setRouteId(long routeId) {
-		this.routeId = routeId;
-	}
-
-	public long getPlanId() {
-		return planId;
-	}
 
-	public void setPlanId(long planId) {
-		this.planId = planId;
-	}
-
-	public String getUserId() {
-		return userId;
-	}
-
-	public void setUserId(String userId) {
-		this.userId = userId;
-	}
-
-	public String getOrgCode() {
-		return orgCode;
-	}
-
-	public void setOrgCode(String orgCode) {
-		this.orgCode = orgCode;
-	}
-
-	public Date getEndTime() {
-		return endTime;
-	}
-
-	public void setEndTime(Date endTime) {
-		this.endTime = endTime;
-	}
-	
-	public long getRoutePointItemId() {
-		return routePointItemId;
-	}
-
-	public void setRoutePointItemId(long routePointItemId) {
-		this.routePointItemId = routePointItemId;
-	}
-
-	public long getPlanTaskDetailId() {
-		return planTaskDetailId;
-	}
-
-	public void setPlanTaskDetailId(long planTaskDetailId) {
-		this.planTaskDetailId = planTaskDetailId;
-	}
-	
-	public String getClassifyName() {
-		return classifyName;
-	}
-
-	public void setClassifyName(String classifyName) {
-		this.classifyName = classifyName;
-	}
-
-	public Long getClassifyId() {
-		return classifyId;
-	}
-
-	public void setClassifyId(Long classifyId) {
-		this.classifyId = classifyId;
-	}
-
-	public String getInputName() {
-		return inputName;
-	}
-
-	public void setInputName(String inputName) {
-		this.inputName = inputName;
-	}
-
-	public String getDepId() {
-		return depId;
-	}
+	/**
+	 * 执行部门名称
+	 */
+	private String depName;
 
-	public void setDepId(String depId) {
-		this.depId = depId;
-	}
+	/**
+	 * 冗余字段：点名称
+	 */
+	private String pointName;
+	/**
+	 * 冗余字段：路线名称
+	 */
+	private String routeName;
+	/**
+	 * 冗余字段：计划名称
+	 */
+	private String planName;
 	
 }

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

-package com.yeejoin.amos.maintenance.business.service.impl;
-
-
-import com.yeejoin.amos.maintenance.business.dao.mapper.PlanTaskMapper;
-import com.yeejoin.amos.maintenance.business.dao.repository.AppVersionDao;
-import com.yeejoin.amos.maintenance.business.dao.repository.IMsgSubscribeDao;
-import com.yeejoin.amos.maintenance.business.param.UserMsgInitParam;
-import com.yeejoin.amos.maintenance.business.service.intfc.IAppService;
-import com.yeejoin.amos.maintenance.business.service.intfc.IMsgSubscribeService;
-import com.yeejoin.amos.maintenance.common.enums.MsgSubscribeTypeEnum;
-import com.yeejoin.amos.maintenance.dao.entity.AppVersion;
-import com.yeejoin.amos.maintenance.dao.entity.MsgSubscribe;
-import org.assertj.core.util.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service("iAppService")
-public class AppServiceImpl implements IAppService {
-
-    @Autowired
-    private IMsgSubscribeDao msgSubscribeDao;
-    @Autowired
-    private AppVersionDao appVersionDao;
-    @Autowired
-    private IMsgSubscribeService msgSubscribeService;
-    @Autowired
-    private PlanTaskMapper planTaskMapper;
-
-
-    @Override
-    public AppVersion queryAppLastVersion() {
-        // TODO Auto-generated method stub
-        return appVersionDao.findLastVersion();
-    }
-
-
-    /**
-     * 新增用户时初始化消息订阅(p_msg_subscribe)表
-     *
-     * @param userDTO
-     */
-    @Override
-    public List<MsgSubscribe> saveUserMsgInit(UserMsgInitParam userInitParam) {
-        Long count = msgSubscribeDao.countByUserId(userInitParam.getUserId());
-        if (count > 0) {    //	已存在用户订阅，直接返回
-            return msgSubscribeService.queryMsgSubscribes(userInitParam.getUserId());
-        }
-        List<MsgSubscribe> msgConfigs = new ArrayList<MsgSubscribe>();
-        for (MsgSubscribeTypeEnum type : MsgSubscribeTypeEnum.values()) {
-            MsgSubscribe msgSub = new MsgSubscribe();
-            msgSub.setOrgCode(userInitParam.getOrgCode());
-            msgSub.setUserId(userInitParam.getUserId());
-            if (type.equals(MsgSubscribeTypeEnum.PLANBEGIN)
-                    || type.equals(MsgSubscribeTypeEnum.PLANWARN)
-                    || type.equals(MsgSubscribeTypeEnum.PLANEND)) {
-                msgSub.setAttribute1("False");
-                msgSub.setAttribute2(10 + "");
-            } else if (type.equals(MsgSubscribeTypeEnum.CHECKTYPE)
-                    || type.equals(MsgSubscribeTypeEnum.CHECKEMAIL)) {
-                msgSub.setAttribute1("error");
-            }
-            msgSub.setMsgType(type.getName());
-            msgSubscribeDao.saveAndFlush(msgSub);
-            msgConfigs.add(msgSub);
-
-        }
-        return msgConfigs;
-    }
-
-
-    @Override
-    public List<String> getHaveToDoList(String userId) {
-        int taskCount = planTaskMapper.getCurrentPlanTaskCount(userId);
-        List<String> havetoDoList = Lists.newArrayList();
-        if (taskCount > 0) {
-            havetoDoList.add("planPatrol");
-        }
-        return havetoDoList;
-    }
-
-}
\ No newline at end of file

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

-package com.yeejoin.amos.maintenance.business.service.intfc;
-
-
-
-import java.util.List;
-
-import com.yeejoin.amos.maintenance.business.param.UserMsgInitParam;
-import com.yeejoin.amos.maintenance.dao.entity.AppVersion;
-import com.yeejoin.amos.maintenance.dao.entity.MsgSubscribe;
-
-
-public interface IAppService {
-
-    AppVersion queryAppLastVersion();
-    List<MsgSubscribe> saveUserMsgInit(UserMsgInitParam userInitParam);
-    List<String> getHaveToDoList(String userId);
-
-}
-

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

 package com.yeejoin.amos.maintenance.business.service.intfc;
 
-import java.text.ParseException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.yeejoin.amos.maintenance.business.entity.mybatis.CheckChkExListBo;
-import com.yeejoin.amos.maintenance.business.vo.CodeOrderVo;
-import com.yeejoin.amos.maintenance.business.vo.LeavePlanTaskVo;
+import com.yeejoin.amos.maintenance.business.param.CheckPtListPageParam;
+import com.yeejoin.amos.maintenance.business.param.PlanTaskPageParam;
 import com.yeejoin.amos.maintenance.business.vo.PlanTaskVo;
 import com.yeejoin.amos.maintenance.core.common.request.CommonPageable;
+import com.yeejoin.amos.maintenance.dao.entity.PlanTask;
 import org.springframework.data.domain.Page;
 
-import com.yeejoin.amos.maintenance.business.param.CheckPtListPageParam;
-import com.yeejoin.amos.maintenance.business.param.PlanTaskPageParam;
-import com.yeejoin.amos.maintenance.core.common.response.AppPointCheckRespone;
-import com.yeejoin.amos.maintenance.dao.entity.PlanTask;
+import java.text.ParseException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public interface IPlanTaskService {
 
@@ -39,8 +35,10 @@ public interface IPlanTaskService {
      * 执行计划导出
      */
     List<PlanTaskVo> planTaskReport(String toke, String product, String appKey, PlanTaskPageParam params);
+
     /**
      * 自动任务执行
+     *
      * @param runDate
      */
     void taskExecution(String runDate);
@@ -61,10 +59,9 @@ public interface IPlanTaskService {
     void disablePlanTask(Long[] routeIds);
 
 
-
-
     /**
      * 计划任务列表
+     *
      * @param params
      * @param page
      * @return
@@ -74,19 +71,15 @@ public interface IPlanTaskService {
 
     /**
      * 根据计划ID获取所有的 任务计划巡检点
+     *
      * @param param
      * @return
      */
     List getPlanTaskPoints(Map<String, Object> param);
 
     /**
-	 * 	获取用户当前所有有的计划任务
-	 * @param userId
-	 * @return
-	 */
-	int getCurrentPlanTaskCount(String userId);
-    /**
      * 今日执行情况
+     *
      * @param params
      * @return
      */
@@ -94,43 +87,26 @@ public interface IPlanTaskService {
 
     /**
      * 根据id获取执行计划
+     *
      * @param ids
      * @return
      */
-	List<PlanTaskVo> getPlanTaskListByIds(String toke,String product,String appKey,Long[] ids);
-
-	/**
-	 * 根据任务id点id 获取点详情
-	 * @param planTaskId
-	 * @param pointId
-	 * @return
-	 */
-	AppPointCheckRespone queryPointPlanTaskDetail(String toke,String product,String appKey,Long planTaskId,Long pointId);
-
-	AppPointCheckRespone queryPointPlanTaskDetailInVersion2(String toke,String product,String appKey,Long planTaskId,Long pointId);
-
-	Map<String, Object> getPlanTaskStatisticsForApp(HashMap<String, Object> params);
+    List<PlanTaskVo> getPlanTaskListByIds(String toke, String product, String appKey, Long[] ids);
 
     /**
      * 获取公司计划累计情况
+     *
      * @param loginOrgCode
      * @return
      */
     String getCumulativePlanCountByOrgCode(String loginOrgCode);
 
-	List<LeavePlanTaskVo> queryLeavePlanTask(HashMap<String, Object> params);
-
 
     PlanTask selectPlanTaskStatus(Long id);
 
-	void reformStatisticsPlanTask(String strBginDate, String strEndDate, String userId, String orgCode) throws ParseException;
 
     void initPlanStatusOrGenDate();
 
-	List<Map<String,Object>> queryPlanTaskTimeAxis(Long userId,Integer createDate);
-
-	List<Map<String,Object>> queryTimeAxis(Long userId,Integer createDate);
-
     /**
      * 任务点详情
      *

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

@@ -38,8 +38,6 @@ public class JobService implements IJobService {
     @Autowired
     private IPlanTaskDao iPlanTaskDao;
 
-    @Autowired
-    private IPlanDao iPlanDao;
 
     @Autowired
     private IPlanTaskDetailDao iPlanTaskDetailDao;
@@ -51,9 +49,6 @@ public class JobService implements IJobService {
     private PlanTaskMapper planTaskMapper;
 
     @Autowired
-    private MsgMapper msgMapper;
-
-    @Autowired
     private ICheckDao iCheckDao;
 
     @Autowired
@@ -69,14 +64,10 @@ public class JobService implements IJobService {
     private ITaskFeedbackDao taskFeedbackDao;
 
     @Autowired
-    private CheckMapper checkMapper;
-    @Autowired
     private RemoteSecurityService remoteSecurityService;
 
     @Value("${amosRefresh.patrol.topic}")
     private String patrolTopic;
-    @Autowired
-    private MqttGateway webMqttComponent;
 
     @Override
     @Transactional
@@ -204,12 +195,15 @@ public class JobService implements IJobService {
                 check.setUserId(planTask.getUserId());
                 check.setUserName(planTask.getUserName());
                 check.setDepName("");
+                check.setPointName(arg.getPointName());
                 check.setPointId(arg.getPointId());
                 check.setUploadTime(new Date());
                 check.setPlanId(arg.getPlanId());
+                check.setPlanName(arg.getPlanName());
                 check.setPlanTaskId(arg.getPlanTaskId());
                 check.setPlanTaskDetailId(arg.getPlanTaskDetailId());
                 check.setRouteId(arg.getRouteId());
+                check.setRouteName(arg.getRouteName());
                 check.setCheckTime(arg.getEndTime());
                 check.setIsOk(CheckStatusEnum.OMISSION.getCode());
                 check = iCheckDao.saveAndFlush(check);
@@ -301,7 +295,6 @@ public class JobService implements IJobService {
 
     @Override
     public void planTaskAddJob(PlanTask planTask) {
-        // TODO Auto-generated method stub
         try {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date endTime = sdf.parse(planTask.getEndTime());
@@ -316,30 +309,6 @@ public class JobService implements IJobService {
                         || PlanTaskFinishStatusEnum.UNDERWAY.getValue() == status) {
                     addJob("planTask", XJConstant.STATUS_MONITOR_END, planTask.getId(), endTime);// 添加监控任务开始结束定时任务
                 }
-
-                // 查询需要推送消息提醒
-                List<MsgConfigParam> configParam = msgMapper.getPlanTaskMsgConfigByUserIdAndStatus(planTask.getUserId().split(","),
-                        "True");
-                if (!configParam.isEmpty()) {
-                    configParam.forEach(config -> {
-                        String jobType = "";
-                        Date time = new Date();
-                        int minute = Integer.valueOf(config.getValue());
-                        long tempTime = minute * 60 * 1000;
-                        if (MsgSubscribeTypeEnum.PLANWARN.getName().equals(config.getMsgType())) {
-                            time = new Date(beginTime.getTime() - tempTime);
-                            jobType = XJConstant.PLAN_TASK_WARN_MSG_PUSH + "-" + config.getUserId();
-                        } else if (MsgSubscribeTypeEnum.PLANBEGIN.getName().equals(config.getMsgType())) {
-                            time = new Date(beginTime.getTime() + tempTime);
-                            jobType = XJConstant.PLAN_TASK_BEGIN_MSG_PUSH + "-" + config.getUserId();
-                        } else if (MsgSubscribeTypeEnum.PLANEND.getName().equals(config.getMsgType())) {
-                            time = new Date(endTime.getTime() + tempTime);
-                            jobType = XJConstant.PLAN_TASK_END_MSG_PUSH + "-" + config.getUserId();
-                        }
-                        addJob("planTask", jobType, planTask.getId(), time);
-                    });
-                }
-
             } else {
                 updatePlanTaskStatus(planTask, PlanTaskFinishStatusEnum.OVERTIME.getValue());
             }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/InputItemController.java

@@ -402,4 +402,18 @@ public class InputItemController extends AbstractBaseController {
         List<InputItemTemplateVo> itemTemplateVoList = ExcelUtils.importExcel(file, 1, 1, InputItemTemplateVo.class);
         return CommonResponseUtil.success(inputItemService.uploadListByTemplate(itemTemplateVoList, orgCode, userId));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "获取字典值", notes = "获取字典值")
+    @GetMapping(value = "/diction")
+    public CommonResponse getCheckItemClassify() {
+        return CommonResponseUtil.success(inputItemService.generateDictionaryValue());
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "获取上一级", notes = "获取上一级")
+    @GetMapping(value = "/parent/item")
+    public CommonResponse getItemParent(@ApiParam(value = "检查项id") @RequestParam(required = false) String id) {
+        return CommonResponseUtil.success(inputItemService.getItemParent(id));
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/PointController.java

@@ -11,6 +11,7 @@ import java.util.Set;
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.yeejoin.amos.supervision.business.dto.OrgUsrFormDto;
 import com.yeejoin.amos.supervision.business.vo.MaintenanceResourceData;
 import com.yeejoin.amos.supervision.business.vo.PointClassifyVo;
 import com.yeejoin.amos.supervision.business.vo.PointInputItemVo;
@@ -216,7 +217,7 @@ public class PointController extends AbstractBaseController {
     /**
      * 查询巡检点信息
      *
-     * @param point
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -270,7 +271,7 @@ public class PointController extends AbstractBaseController {
     /**
      * 查询巡检点信息
      *
-     * @param point
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -499,7 +500,7 @@ public class PointController extends AbstractBaseController {
     /**
      * 查询巡检点的巡检项
      *
-     * @param id
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -518,7 +519,7 @@ public class PointController extends AbstractBaseController {
     /**
      * 查询巡检点的巡检项
      *
-     * @param id
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -537,7 +538,7 @@ public class PointController extends AbstractBaseController {
     /**
      * 查询巡检点的分类
      *
-     * @param id
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -556,7 +557,7 @@ public class PointController extends AbstractBaseController {
     /**
      * 根据分类id查询对应项
      *
-     * @param id
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -576,7 +577,7 @@ public class PointController extends AbstractBaseController {
     /**
      * 根据点id查询点的分类及对应项
      *
-     * @param id
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -672,7 +673,7 @@ public class PointController extends AbstractBaseController {
     /**
      * 查询巡检点信息
      *
-     * @param point
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -808,15 +809,34 @@ public class PointController extends AbstractBaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "装备维保项", notes = "装备维保项")
-    @RequestMapping(value = "/equipmentInput", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
+    @ApiOperation(value = "机场单位同步", notes = "机场单位同步")
+    @RequestMapping(value = "/teamInput", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse syncSavePoint(
-            @ApiParam(value = "同步请求参数") @RequestBody() List<MaintenanceResourceData> list) {
+            @ApiParam(value = "同步请求参数") @RequestBody OrgUsrFormDto orgUsrFormDto) {
         ReginParams reginParams = getSelectedOrgInfo();
         AgencyUserModel model = getUserInfo();
         String orgCode = getOrgCode(reginParams);
-        iPointService.syncSavePoint(list, orgCode, model.getUserId());
+        iPointService.syncSavePoint(orgUsrFormDto, orgCode, model.getUserId());
         return CommonResponseUtil.success();
     }
 
+    /**
+     * 删除巡检点
+     *
+     * @param id
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "同步删除机场单位", notes = "同步删除机场单位")
+    @PostMapping(value = "/delete", produces = "application/json;charset=UTF-8")
+    public CommonResponse deleteOwner(@ApiParam(value = "巡检点ID", required = true) @RequestBody Long id) {
+        try {
+            iPointService.delPointByPointNo(id);
+            return CommonResponseUtil.success();
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return CommonResponseUtil.failure("删除检查点失败");
+        }
+    }
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/InputItemMapper.java

@@ -32,4 +32,6 @@ public interface InputItemMapper {
     List<PointInputItemVo> queryCustomInputItemByPointId(@Param("pointId") Long pointId, @Param("equipmentId") String equipmentName);
 
     Integer insertList(List<InputItem> list);
+
+    List<InputItemVo> getInputItemParent(@Param("id") String id);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/IPointDao.java

@@ -36,4 +36,12 @@ public interface IPointDao extends BaseDao<Point, Long> {
     void delPointBIds(Long id);
 
     List<Point> findAllByOriginalId(String relationId);
+
+    @Modifying
+    @Transactional
+    @Query(value = "UPDATE p_point SET is_delete = 1 WHERE point_no IN (?1)", nativeQuery = true)
+    void delPointByPointNo(Long id);
+
+    @Query(value = "SELECT id FROM p_point p WHERE is_delete = 0 AND p.point_no = (?1)", nativeQuery = true)
+    List<Long> findPointByPointNo(String pointNo);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dto/FormValue.java

+package com.yeejoin.amos.supervision.business.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * @return
+ * <PRE>
+ * author tw
+ * date 2021/6/21
+ * </PRE>
+ * 动态表单值
+ */
+@Data
+@ApiModel(value="FormValue", description="动态表单值")
+public class FormValue implements Serializable{
+
+	private static final long serialVersionUID = 1L;
+	@ApiModelProperty(value = "key")
+    private String  key;
+    @ApiModelProperty(value = "label")
+    private String label;
+    @ApiModelProperty(value = "type")
+    private String type;
+    @ApiModelProperty(value = "value")
+    private String value;
+    @ApiModelProperty(value = "是否一行显示")
+    private boolean block;
+  
+    public FormValue() {
+    }
+
+	public FormValue(String key, String label, String type, String value, boolean block) {
+		super();
+		this.key = key;
+		this.label = label;
+		this.type = type;
+		this.value = value;
+		this.block = block;
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dto/OrgPersonFormDto.java

+package com.yeejoin.amos.supervision.business.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+* 机构/部门/人员表
+*
+* @author tb
+* @date 2021-06-18
+*/
+@Data
+@Accessors(chain = true)
+@TableName("cb_org_usr")
+@ApiModel(value="OrgUsrVo", description="人员信息")
+public class OrgPersonFormDto extends BaseEntity{
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "机构/部门id")
+    private Long id;
+    @ApiModelProperty(value = "机构/部门名称")
+    private String bizOrgName;
+
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
+
+    @ApiModelProperty(value = "amos中公司/部门ID")
+    private String amosOrgId;
+
+    @ApiModelProperty(value = "amos中公司/部门编码")
+    private String amosOrgCode;
+
+    @ApiModelProperty(value = "机构类型`")
+    private String bizOrgType;
+
+    @ApiModelProperty(value = "所属建筑名称")
+    private String buildName;
+
+    @ApiModelProperty(value = "所属建筑ID")
+    private String buildId;
+
+    @ApiModelProperty(value = "归属机构/部门/人员")
+    private String parentId;
+    @ApiModelProperty(value = "归属机构/部门/人员")
+    private String parentName;
+
+    @ApiModelProperty(value = "动态表单值")
+    private List<FormValue> dynamicFormAlert;
+
+    public OrgPersonFormDto() {
+    }
+
+    public OrgPersonFormDto(List<FormValue> dynamicFormAlert) {
+        this.dynamicFormAlert = dynamicFormAlert;
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dto/OrgUsrFormDto.java

+package com.yeejoin.amos.supervision.business.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+* 机构/部门/人员表
+*
+* @author tb
+* @date 2021-06-18
+*/
+@Data
+@Accessors(chain = true)
+@TableName("cb_org_usr")
+@ApiModel(value="OrgUsrVo", description="机构/部门/人员表")
+public class OrgUsrFormDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位id")
+    private Long id;
+    @ApiModelProperty(value = "单位id")
+    protected Long sequenceNbr;
+
+    @ApiModelProperty(value = "单位名称")
+    private String currentUnit;
+
+    @ApiModelProperty(value = "归属机构/部门")
+    private String parentId;
+    
+    @ApiModelProperty(value = "机构/部门名称")
+    private String bizOrgName;
+
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
+
+    @ApiModelProperty(value = "amos中公司/部门ID")
+    private String amosOrgId;
+
+    @ApiModelProperty(value = "amos中公司/部门编码")
+    private String amosOrgCode;
+
+    @ApiModelProperty(value = "机构类型`")
+    private String bizOrgType;
+
+    @ApiModelProperty(value = "所属建筑名称")
+    private String buildName;
+
+    @ApiModelProperty(value = "所属建筑ID")
+    private String buildId;
+
+    private Integer personNum;
+
+    @ApiModelProperty(value = "动态表单值")
+    private List<FormValue> dynamicFormAlert;
+
+    @ApiModelProperty(value = "单位人员信息值")
+    private List<OrgPersonFormDto> children;
+
+    public List<FormValue> getDynamicFormAlert() {
+		return dynamicFormAlert;
+	}
+
+    @ApiModelProperty(value = "转换动态表单")
+    private Map<String,Object> map=new HashMap<>();;
+
+	public void setDynamicFormAlert(List<FormValue> dynamicFormAlert) {
+		  if(dynamicFormAlert!=null) {
+			  dynamicFormAlert.forEach(formValue->{
+					this.map.put(formValue.getKey(), formValue.getValue());
+				});
+		  }
+		  this.dynamicFormAlert=dynamicFormAlert;
+	}
+
+	public OrgUsrFormDto() {
+    }
+}

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

@@ -10,9 +10,11 @@ import com.yeejoin.amos.supervision.business.param.InputItemPageParam;
 import com.yeejoin.amos.supervision.business.service.intfc.ICatalogTreeService;
 import com.yeejoin.amos.supervision.business.service.intfc.IInputItemService;
 import com.yeejoin.amos.supervision.business.util.DaoCriteria;
+import com.yeejoin.amos.supervision.business.util.StringUtil;
 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.core.util.query.BaseQuerySpecification;
 import com.yeejoin.amos.supervision.dao.entity.InputItem;
 import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
@@ -25,6 +27,7 @@ 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 java.util.*;
 
@@ -93,6 +96,46 @@ 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()) {
+            JSONArray jsonArray = remoteSecurityService.listDictionaryByDictCode(RequestContext.getToken(),
+                    RequestContext.getProduct(), RequestContext.getAppKey(), map.get("code"));
+            Map<String, Object> map1 = new HashMap<>();
+            List lists = new LinkedList();
+            for (int i = 0, size = jsonArray.size(); i < size; i++) {
+                Map<String, String> m = new HashMap<>();
+                JSONObject jsonObject = jsonArray.getJSONObject(i);
+                m.put("id", jsonObject.get("dictDataKey").toString());
+                m.put("name", jsonObject.get("dictDataValue").toString());
+                lists.add(m);
+            }
+            if ("itemClassify".equals(map.get("code"))) {
+                map1.put("CHECK_ITEM_CLASSIFY", lists);
+                list.add(map1);
+            }
+            if ("itemType".equals(map.get("code"))) {
+                map1.put("CHECK_ITEM_TYPE", lists);
+                list.add(map1);
+            }
+            if ("itemLevel".equals(map.get("code"))) {
+                map1.put("CHECK_ITEM_LEVEL", lists);
+                list.add(map1);
+            }
+            if ("checkType".equals(map.get("code"))) {
+                map1.put("CHECK_ITEM_CONTENT", lists);
+                list.add(map1);
+            }
+        }
+        return list;
+    }
+
+    @Override
+    public List getItemParent(String id) {
+        return inputItemMapper.getInputItemParent(id);
+    }
+
+    @Override
     public List<InputItem> queryInputItemByCondition(List<DaoCriteria> criterias) {
         BaseQuerySpecification<InputItem> specification = new BaseQuerySpecification<>(criterias);
         return inputItemDao.findAll(specification);

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

 package com.yeejoin.amos.supervision.business.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
@@ -20,6 +21,8 @@ import com.yeejoin.amos.supervision.business.dao.repository.IPointInputItemDao;
 import com.yeejoin.amos.supervision.business.dao.repository.IPointPhotoDao;
 import com.yeejoin.amos.supervision.business.dao.repository.IRoutePointDao;
 import com.yeejoin.amos.supervision.business.dao.repository.IRoutePointItemDao;
+import com.yeejoin.amos.supervision.business.dto.FormValue;
+import com.yeejoin.amos.supervision.business.dto.OrgUsrFormDto;
 import com.yeejoin.amos.supervision.business.dto.PointDto;
 import com.yeejoin.amos.supervision.business.entity.mybatis.CheckPtListBo;
 import com.yeejoin.amos.supervision.business.feign.EquipFeign;
@@ -1118,35 +1121,44 @@ public class PointServiceImpl implements IPointService {
     }
 
     @Override
-    public void syncSavePoint(List<MaintenanceResourceData> list, String orgCode, String userId) {
+    public void syncSavePoint(OrgUsrFormDto orgUsrFormDto, String orgCode, String userId) {
         List<Point> points = new ArrayList<>();
         List<PointInputItem> inputItems = new ArrayList<>();
         List<Long> ids = new ArrayList<Long>();
-        for (MaintenanceResourceData x : list) {
         Point point = new Point();
-            String pointNo = StringUtil.isNotEmpty(x.getFireFacilityCode()) ? x.getFireFacilityCode() : String.valueOf(sequence.nextId());
-            String originalId = String.valueOf(x.getFireFacilityId());
-            point.setOriginalId(originalId);
-            point.setName(x.getFireFacilityName());
+        String pointNo = StringUtil.isNotEmpty(orgUsrFormDto.getSequenceNbr()) ? String.valueOf(orgUsrFormDto.getSequenceNbr()) : String.valueOf(sequence.nextId());
+        point.setName(orgUsrFormDto.getBizOrgName());
         point.setPointNo(pointNo);
-            point.setEquipmentId(x.getClassifyId() == null ? "" : x.getClassifyId().toString());
-            point.setEquipmentName(x.getClassifyName());
-            point.setBelongSystemId(x.getFireFightSysId() == null ? "" : x.getFireFightSysId().toString());
-            point.setBelongSystemName(x.getFireFightSysName());
-            point.setOwnerId(String.valueOf(x.getOwnerUnitId()));
-            point.setOwnerName(x.getOwnerUnitName());
-            point.setAddress(x.getLocation());
-            point.setLevel("");
-            point.setCreatorId(userId);
-            point.setOrgCode(orgCode);
+        point.setOrgCode(orgUsrFormDto.getBizOrgCode());
+        point.setBuildingId(orgUsrFormDto.getBuildId());
+        point.setBuildingName(orgUsrFormDto.getBuildName());
+        point.setOriginalId(orgUsrFormDto.getParentId());
+        String data = JSON.toJSONString(orgUsrFormDto.getMap());
+        point.setExtendJson(data);
+        point.setOwnerId(pointNo);
+        point.setOwnerName(orgUsrFormDto.getBizOrgName());
+        if (0 < orgUsrFormDto.getDynamicFormAlert().size()) {
+            for (FormValue formValue : orgUsrFormDto.getDynamicFormAlert()) {
+                if ("longitude".equals(formValue.getKey())) {
+                    point.setLongitude(formValue.getValue());
+                }
+                if ("latitude".equals(formValue.getKey())) {
+                    point.setLatitude(formValue.getValue());
+                }
+                if ("companyLocation".equals(formValue.getKey())) {
+                    point.setAddress(formValue.getValue());
+                }
+            }
+        }
+        point.setOrgCode(orgUsrFormDto.getAmosOrgCode());
         points.add(point);
-            Long id = iPointDao.findPointByEquipmentIdAndFireFacilityId(pointNo, originalId);
+        Long id = iPointDao.findPointByEquipmentIdAndFireFacilityId(pointNo, point.getOriginalId());
         if (null != id) {
             ids.add(id);
             iPointDao.delPointBIds(id);
         }
         iPointDao.save(point);
-            List<InputItem> inputItemVos = inputItemMapper.getInputItemByEquipmentName(x.getClassifyName(), orgCode);
+        List<InputItem> inputItemVos = inputItemMapper.getInputItemByEquipmentName(point.getName(), orgCode);
         if (0 < inputItemVos.size()) {
             inputItemVos.forEach(y -> {
                 PointInputItem inputItem = new PointInputItem();
@@ -1156,7 +1168,6 @@ public class PointServiceImpl implements IPointService {
                 inputItems.add(inputItem);
             });
         }
-        }
         if (0 < ids.size()) {
             iPointInputItemDao.deleteByPointId(ids);
         }
@@ -1183,4 +1194,12 @@ public class PointServiceImpl implements IPointService {
         Pageable pageable = new CommonPageable(pointPage.getNumber(), pointPage.getSize(), pointPage.getSort());
         return new PageImpl<>(pointDtos, pageable, pointPage.getTotalElements());
     }
+
+    @Override
+    public void delPointByPointNo(Long id) {
+        List<Long> idLists = new ArrayList<>();
+        idLists = iPointDao.findPointByPointNo(String.valueOf(id));
+        iPointInputItemDao.deleteByPointId(idLists);
+        iPointDao.delPointByPointNo(id);
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/IInputItemService.java

@@ -112,4 +112,8 @@ public interface IInputItemService {
     Boolean uploadListByTemplate(List<InputItemTemplateVo> itemTemplateVoList, String orgCode, String userId) throws Exception;
 
     Integer insertList(List<InputItem> list);
+
+    List generateDictionaryValue();
+
+    List getItemParent(String id);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/IPointService.java

 package com.yeejoin.amos.supervision.business.service.intfc;
 
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.supervision.business.dto.OrgUsrFormDto;
 import com.yeejoin.amos.supervision.business.dto.PointDto;
 import com.yeejoin.amos.supervision.business.param.*;
 import com.yeejoin.amos.supervision.business.param.CheckPtListPageParam;
@@ -309,7 +310,7 @@ public interface IPointService {
 
     LinkedHashMap<String,Object> getRegionTress ();
 
-    void syncSavePoint(List<MaintenanceResourceData> list, String orgCode, String userId);
+    void syncSavePoint(OrgUsrFormDto orgUsrFormDto, String orgCode, String userId);
     /**
      * 查询巡检点及点及点的项
      * @param queryRequests 请求参数
@@ -319,4 +320,11 @@ public interface IPointService {
      */
     Page<PointDto> queryPointInfoWithItem(List<DaoCriteria> queryRequests, CommonPageable commonPageable, Long ownerId);
 
+    /**
+     * 删除巡检点
+     *
+     * @param ids
+     */
+    void delPointByPointNo(Long id);
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/AlertCalledController.java

 package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -20,9 +19,6 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledQueryDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ESAlertCalledDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ESAlertCalledRequestDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.AlertCalled;
-import com.yeejoin.amos.boot.module.tzs.api.entity.AlertFormValue;
-import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchPaper;
-import com.yeejoin.amos.boot.module.tzs.api.enums.DispatchPaperEnums;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.AlertCalledServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.AlertFormValueServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.DispatchPaperServiceImpl;
@@ -32,7 +28,6 @@ import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -54,7 +49,6 @@ import java.lang.reflect.Field;
 import java.text.ParseException;
 import java.util.Arrays;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -264,7 +258,7 @@ public class AlertCalledController extends BaseController {
 		page = iAlertCalledService.page(pageBean, alertCalledQueryWrapper);
 	    IPage<AlertCalledDto> calledVoIPage = AlertBeanDtoVoUtils.alertCalledIPageDto(page);
 		calledVoIPage.getRecords().stream().forEach(e->{
-			getResponseLevel(e.getSequenceNbr(), e,null);
+			//e.setAlertAddress(e.getAddress());
 		});
 		return ResponseHelper.buildResponse(calledVoIPage);
 	}
@@ -324,28 +318,7 @@ public class AlertCalledController extends BaseController {
 		return queryWrapper;
 	}
 
-	void getResponseLevel(Long alertId, AlertCalledDto alertCalledDto, ESAlertCalledDto esAlertCalledDto) {
-		LambdaQueryWrapper<DispatchPaper> dispatchPaperQueryWrapper = new LambdaQueryWrapper<>();
-		dispatchPaperQueryWrapper.eq(DispatchPaper::getAlertId,alertId);
-		DispatchPaper dispatchPaper = dispatchPaperServiceImpl.getOne(dispatchPaperQueryWrapper);
-		if(null != dispatchPaper) {
-			LambdaQueryWrapper<AlertFormValue> queryWrapper = new LambdaQueryWrapper<>();
-			queryWrapper.eq(AlertFormValue::getAlertCalledId, dispatchPaper.getSequenceNbr()).eq(AlertFormValue::getAlertTypeCode, DispatchPaperEnums.getEnumById(dispatchPaper.getAlertCode()).getDynamicCode());
-			// 派遣单动态表单数据
-			List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);
-			// map 存取数据
-			Map<String,String> dynamicParms = new HashMap<String,String>();
-			list.stream().forEach(paperFormValue -> {
-				dynamicParms.put(paperFormValue.getFieldCode(),paperFormValue.getFieldValue());
-			});
-			String responseLevel = dynamicParms.get("response_level");
-			if(null != alertCalledDto) {
-				alertCalledDto.setResponseLevel(responseLevel);
-			} else {
-				esAlertCalledDto.setResponseLevel(responseLevel);
-			}
-		}
-	}
+
 
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -31,8 +31,8 @@ spring.liquibase.enabled=true
 
 mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 
-equip.fegin.name=AMOS-EQUIPMANAGE
-equip.fegin.prefix=/equip
+equip.feign.name=AMOS-EQUIPMANAGE-SHG
+equip.feign.prefix=/equip
 input.custom.prefix = QYZD
 input.statute.prefix = FG
 
@@ -54,7 +54,7 @@ management.endpoints.web.exposure.exclude=*
 ## redis失效时间
 redis.cache.failure.time=10800
 ## eureka properties:
-eureka.client.registry-fetch-interval-seconds=5
+eureka.client.registry-fetch-interval-seconds=50
 eureka.instance.prefer-ip-address=true
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=*

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

@@ -378,13 +378,14 @@
 	</select>
 
 	<select id="getPlanTaskPointInputItemByPlanTaskId" resultType="com.yeejoin.amos.maintenance.business.entity.mybatis.PlanTaskPointInputItemBo">
-
 		SELECT
 			ppi.input_item_id inputItemId,
 			temp1.order_no orderNo,
 			temp1.routePointItemId,
 			temp1.classifyId,
 			temp1.classifyName,
+			temp1.routeName,
+			temp1.pointName,
 			pii.`name` inputName,
 			temp2.*
 		FROM
@@ -399,11 +400,15 @@
 					prp.route_id,
 					prpi.id routePointItemId,
 					ppc.id classifyId,
-					ppc.`name` classifyName
+					ppc.`name` classifyName,
+				    r.name as routeName,
+					p.name as pointName
 				FROM
 					p_route_point_item prpi
 					LEFT JOIN p_route_point prp ON prp.id = prpi.route_point_id
 					LEFT JOIN p_point_classify ppc ON prpi.point_classify_id = ppc.id
+					LEFT JOIN p_route r ON r.id = prp.route_id
+					LEFT JOIN p_point p ON p.id = prp.point_id
 			) temp1 ON(ppi.id = temp1.point_input_item_id)
 		RIGHT JOIN
 
@@ -417,16 +422,15 @@
 					ptd.org_code AS orgCode,
 					ptd.end_time AS endTime,
 					pptd.id as planTaskDetailId,
-					(select p_plan.dept_id from  p_plan where p_plan.id=ptd.plan_id) depId
+					(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
 				FROM
 					p_plan_task_detail pptd,
 					p_plan_task ptd
 				WHERE
 					pptd.task_no = ptd.id
 				AND ptd.id = #{planTaskId} and pptd.`status` = #{planTaskDetailStatus}
-			) temp2 on(temp1.point_id = temp2.pointId
-		AND temp1.route_id = temp2.routeId)
-
+			) temp2 on temp1.point_id = temp2.pointId AND temp1.route_id = temp2.routeId
 	</select>
 	<!-- 巡检执行情况统计分页用 -->
 	<select id="countChkExListData" resultType="long">

amos-boot-system-supervision/src/main/resources/db/changelog/mt-1.0.0.xml

@@ -16,4 +16,76 @@
              ALTER TABLE p_point ADD COLUMN `last_check_id` varchar(32) DEFAULT NULL COMMENT '最近检查记录（漏检不算）' AFTER `original_id`;
         </sql>
     </changeSet>
+
+    <changeSet author="keyong" id="1629261435-1" runOnChange="true">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_input_item" columnName="check_type"/>
+            </not>
+        </preConditions>
+        <comment>p_input_item ADD COLUMN check_type</comment>
+        <sql>
+            ALTER TABLE p_input_item ADD COLUMN `check_type` varchar(32) DEFAULT NULL COMMENT '检查类别' AFTER `test_requirement`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629261435-2" runOnChange="true">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_input_item" columnName="item_parent"/>
+            </not>
+        </preConditions>
+        <comment>p_input_item ADD COLUMN item_parent</comment>
+        <sql>
+            ALTER TABLE p_input_item ADD COLUMN `item_parent` varchar(50) DEFAULT NULL COMMENT '父类检查项id' AFTER `check_type`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629261435-3" runOnChange="true">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_input_item" columnName="item_classify"/>
+            </not>
+        </preConditions>
+        <comment>p_input_item ADD COLUMN item_classify</comment>
+        <sql>
+            ALTER TABLE p_input_item ADD COLUMN `item_classify` varchar(50) DEFAULT NULL COMMENT '检查项分类' AFTER `item_parent`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629261435-4" runOnChange="true">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_input_item" columnName="item_type_classify"/>
+            </not>
+        </preConditions>
+        <comment>p_input_item ADD COLUMN item_type_classify</comment>
+        <sql>
+            ALTER TABLE p_input_item ADD COLUMN `item_type_classify` varchar(50) DEFAULT NULL COMMENT '适用检查类别' AFTER `item_classify`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629261435-5" runOnChange="true">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_input_item" columnName="item_level"/>
+            </not>
+        </preConditions>
+        <comment>p_input_item ADD COLUMN item_level</comment>
+        <sql>
+            ALTER TABLE p_input_item ADD COLUMN `item_level` varchar(50) DEFAULT NULL COMMENT '检查项等级' AFTER `item_type_classify`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629261435-6" runOnChange="true">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_input_item" columnName="item_start"/>
+            </not>
+        </preConditions>
+        <comment>p_input_item ADD COLUMN item_start</comment>
+        <sql>
+            ALTER TABLE p_input_item ADD COLUMN `item_start` bit(1) DEFAULT b'0' COMMENT '检查项状态' AFTER `item_level`;
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

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

@@ -94,7 +94,8 @@
 		a.test_requirement,
 		a.check_method,
 		a.create_date,
-		a.input_classify
+		a.input_classify,
+		a.check_type
 		from
 		p_input_item a left join p_catalog_tree b on a.catalog_id = b.id
 		where a.is_delete = '0'
@@ -226,9 +227,9 @@
         from
         p_input_item pii
         where is_delete = '0' and input_type = 1 and equipment_name=#{equipmentName}
-        <if test="orgCode!=null and orgCode !=''">
-            and org_Code = #{orgCode}
-        </if>
+<!--        <if test="orgCode!=null and orgCode !=''">-->
+<!--            and org_Code = #{orgCode}-->
+<!--        </if>-->
     </select>
     <insert id="insertList" parameterType="java.util.List">
         INSERT INTO p_input_item (
@@ -260,4 +261,18 @@
             )
         </foreach>
     </insert>
+
+	<select id="getInputItemParent" resultType="com.yeejoin.amos.supervision.business.vo.InputItemVo">
+		SELECT
+			pii.id AS id,
+			pii.name AS name
+		FROM
+			p_input_item pii
+		WHERE
+		1=1
+		<if test="id !=null and id !=''">
+			AND pii.id != #{id}
+		</if>
+		ORDER BY create_date DESC;
+	</select>
 </mapper>
\ No newline at end of file