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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/excel/TemplateCellWriteHandlerDate.java

@@ -67,7 +67,7 @@ public class TemplateCellWriteHandlerDate implements SheetWriteHandler {
 	            // 设置下拉单元格的首行 末行 首列 末列
 	            CellRangeAddressList rangeList = new CellRangeAddressList(1, 65536, k, k);
 	            // 如果下拉值总数大于100，则使用一个新sheet存储，避免生成的导入模板下拉值获取不到
-	            if (v.length > LIMIT_NUMBER) {
+	            if (v.length > 0) {
 	                //定义sheet的名称
 	                //1.创建一个隐藏的sheet 名称为 hidden + k
 	                String sheetName = "hidden" + k;

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/interceptors/PermissionInterceptor.java

@@ -104,7 +104,12 @@ public class PermissionInterceptor implements Interceptor {
         BoundSql boundSql = (BoundSql) metaObject.getValue("delegate.boundSql");
         String sql = boundSql.getSql();
         // 将权限规则拼接到原始sql
-        sql = processSelectSql(sql, dataAuthorization, reginParam, boundSql);
+        try {
+            sql = processSelectSql(sql, dataAuthorization, reginParam, boundSql);
+        } catch (Exception e) {
+            PermissionInterceptorContext.clean();
+            logger.debug(e.getMessage());
+        }
         metaObject.setValue("delegate.boundSql.sql", sql);
         PermissionInterceptorContext.clean();
         return invocation.proceed();

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

@@ -60,8 +60,11 @@ public interface DutyPersonShiftMapper extends BaseMapper<DutyPersonShift> {
             @Param("appKey") String appKey,
             @Param("groupCode") String groupCode
     );
-
-
+    
+    List<Map<String, Object>> newStationViewData(
+            @Param("dutyDate") String dutyDate,
+            @Param("groupCode") String groupCode
+    );
     /**
      * 利用mysql 生成连续时间区间
      *
@@ -137,4 +140,8 @@ public interface DutyPersonShiftMapper extends BaseMapper<DutyPersonShift> {
     List<Map<String, Object>> queryByCompanyId(@Param(value="bizNames") List<String> bizNames);
 
     List<Map<String, Object>>  queryByCompanyNew(String bizOrgName);
+    
+    List<Map<String, Object>> getNewEquipmentForSpecifyDate(String dutyDate,String groupCode,String equipmentId,String equipmentName,String groupByName);
+
+    String getFirstAidCompanyId ();
 }

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

 package com.yeejoin.amos.boot.module.common.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.oracle.webservices.internal.api.databinding.DatabindingMode;
 import com.yeejoin.amos.boot.biz.common.annotations.DataAuth;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;

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

@@ -30,7 +30,14 @@ public interface IDutyCommonService {
      * @return ResponseModel
      */
     List<Map<String, Object>> statisticsDay(String beginDate, String endDate) throws ParseException;
-
+    /**
+     * 新值班月视图
+     * @param beginDate
+     * @param endDate
+     * @return
+     * @throws ParseException
+     */
+     List<Map<String, Object>> newStatisticsDay(String beginDate, String endDate) throws ParseException;
     /**
      * 不分页查询
      *

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

@@ -87,6 +87,21 @@
 		and i.group_code =#{groupCode}
 		GROUP BY i.field_value
 	</select>
+	<select id="newStationViewData" resultType="java.util.Map">
+		select
+		i.field_value as postTypeName,
+		count(1) as total
+		from
+		cb_duty_person_shift s,
+		cb_dynamic_form_instance i
+		where
+		s.instance_id = i.instance_id
+		and i.field_code = 'postTypeName'
+		AND s.duty_date = #{dutyDate}
+		AND s.shift_id is not null
+		and i.group_code =#{groupCode}
+		GROUP BY i.field_value
+	</select>
 	<select id="genRangeDate" resultType="map">
 		SELECT
 		DATE_FORMAT(DATE( DATE_ADD( #{beginDate}, INTERVAL @s DAY )),'%Y-%m-%d') AS date,
@@ -187,6 +202,50 @@ select * from (
 			group by ${groupByName}
 		</if>
 	</select>
+	
+	<select id='getNewEquipmentForSpecifyDate' resultType='map'>
+select * from (
+		SELECT
+			MAX(
+		CASE
+		WHEN cd.FIELD_CODE = #{equipmentId} THEN
+			cd.FIELD_VALUE
+		END
+	) AS #{equipmentId},
+
+		MAX(
+		CASE
+		WHEN cd.FIELD_CODE = 'userName' THEN
+		cd.FIELD_VALUE
+		END
+		) AS 'userName',
+	MAX(
+				CASE
+				WHEN cd.FIELD_CODE = #{equipmentName} THEN
+					cd.FIELD_VALUE
+				END
+			) AS #{equipmentName}
+	FROM
+		cb_dynamic_form_instance cd
+		LEFT JOIN (
+		SELECT
+		dp.instance_id,
+		ds.`name`
+		FROM
+		cb_duty_person_shift dp
+		LEFT JOIN cb_duty_shift ds ON dp.shift_id = ds.sequence_nbr
+		WHERE
+		dp.duty_date = #{dutyDate} and dp.is_delete=0
+		) cds ON cd.instance_id = cds.instance_id
+		where cd.group_code =#{groupCode} and cds.instance_id is not null and
+		cd.is_delete=0
+		group by cd.instance_id
+) result 
+		<if test="groupByName != null and  groupByName!='' ">
+			group by ${groupByName}
+		</if>
+	</select>
+	
 	<select id='getInstanceIdForSpecifyDateAndEquipment'
 		resultType='map'>
 		SELECT
@@ -288,7 +347,7 @@ FROM
 		GROUP BY
 			cd.instance_id
 	) ss
-LEFT JOIN (
+<!-- LEFT JOIN (
 	SELECT
 		dp.instance_id,
 		ds.`name`
@@ -301,7 +360,7 @@ LEFT JOIN (
 	AND NAME IS NOT NULL
 ) cds ON ss.instance_id = cds.instance_id
 WHERE
-	cds.NAME =#{duty}
+	cds.NAME =#{duty} -->
 GROUP BY
 	ss.postTypeName
 	</select>
@@ -331,6 +390,16 @@ WHERE
 
 </select>
 
+	<select id='getFirstAidCompanyId' resultType="string">
+		SELECT
+			sequence_nbr
+		FROM
+			cb_org_usr a
+		WHERE
+			a.is_delete = 0
+		  AND
+			a.biz_org_name = '消防救援保障部'
+	</select>
 
 <select id='getFirstAidForTypeCodeAndCompanyId' resultType="map">
 SELECT

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

@@ -519,7 +519,9 @@ AND instance_id = (
 				jc_user_car
 			WHERE
 				car_id = #{carId}
+				and is_delete = 0
 		)
+		and is_delete = 0
 ) and field_code='telephone'
 	) ss
 LEFT JOIN cb_org_usr cou ON ss.instance_id = cou.sequence_nbr

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/Equipment.java

@@ -101,4 +101,10 @@ public class Equipment extends BaseEntity {
      */
     @TableField(value = "is_iot")
     private String isIot = "0";
+
+    /**
+     * 警情消除策略 【0：收到复位信号自动消除；1：警情处理确认后消除】
+     */
+    @TableField(value = "clean_type")
+    private String cleanType = "0";
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificAlarmLog.java

@@ -180,4 +180,12 @@ public class EquipmentSpecificAlarmLog extends BaseEntity {
     @TableField("build_id")
     @ApiModelProperty(value = "建筑id")
     private String buildId;
+
+    @TableField("clean_time")
+    @ApiModelProperty(value = "消除时间")
+    private Date cleanTime;
+
+    @ApiModelProperty(value = "消除状态")
+    @TableField(exist = false)
+    private String cleanStatus;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/AlamVideoVO.java

@@ -23,4 +23,6 @@ public class AlamVideoVO {
     
     private String presetPosition;
 
+    private String vedioFormat;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/BuildingVideoVO.java

@@ -43,5 +43,6 @@ public class BuildingVideoVO {
     @ApiModelProperty("详细地址")
     private String presetPosition;
 
-
+    @ApiModelProperty("视频转码")
+    private String vedioFormat;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/EquipmentAlarmBySystemIdOrSourceIdVO.java

@@ -28,4 +28,6 @@ public class EquipmentAlarmBySystemIdOrSourceIdVO {
      * 告警类型
      */
     private String type;
+
+    private Integer cleanStatus;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/AlarmCleanTypeEnum.java

+package com.yeejoin.equipmanage.common.enums;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author keyong
+ * @title: AlarmCleanTypeEnum
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2022/01/05 12:04
+ */
+@AllArgsConstructor
+@Getter
+public enum AlarmCleanTypeEnum {
+
+    ZDXC("0", "收到复位信号自动消除"), QRXC("1", "警情处理确认后消除");
+
+    private String code;
+    private String name;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/CommonPageInfoParam.java

@@ -111,6 +111,16 @@ public class CommonPageInfoParam extends CommonPageable {
 
 	private String status;
 
+	public void setCleanStatus(String cleanStatus) {
+		this.cleanStatus = cleanStatus;
+	}
+
+	public String getCleanStatus() {
+		return cleanStatus;
+	}
+
+	private String cleanStatus;
+
 	public void setStatus(String status) {
 		this.status = status;
 	}

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/CommonPageParamUtil.java

@@ -57,6 +57,8 @@ public class CommonPageParamUtil {
 				param.setBuildIds((List<String>)queryRequests.get(i).getValue());
 			} else if("status".equals(name)){
 				param.setStatus(toString(queryRequests.get(i).getValue()));
+			} else if("cleanStatus".equals(name)){
+				param.setCleanStatus(toString(queryRequests.get(i).getValue()));
 			}
 		}
 		if(commonPageable !=null){

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/AlarmListDataVO.java

@@ -23,6 +23,8 @@ public class AlarmListDataVO {
 
     private String alarmEquip;
 
+    private String type;
+
     private String alarmType;
 
     private String alarmInfo;
@@ -32,4 +34,8 @@ public class AlarmListDataVO {
     private Long alarmId;
 
     private String alarmTypeCode;
-}
+
+    private String cleanStatus;
+
+    private String cleanStatusVal;
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/VideoOnEquipmentSpecificVo.java

+package com.yeejoin.equipmanage.common.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ProjectName: amos-biz-boot
+ * @Package: com.yeejoin.equipmanage.common.vo
+ * @ClassName: VideoOnEquipmentSpecificVo
+ * @Author: Jianqiang Gao
+ * @Description: 摄像头绑定设备
+ * @Date: 2022/1/7 17:35
+ * @Version: 1.0
+ */
+@Data
+public class VideoOnEquipmentSpecificVo {
+
+    /**
+     * 设备ID
+     */
+    private Long equipmentSpecificId;
+
+    /**
+     * 摄像头Id集合
+     */
+    private List<Long> videoIdList;
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertSubmittedMapper.xml

@@ -150,7 +150,7 @@
     </select>
 
     <select id="getOther" resultType="Map">
-      SELECT distinct
+       SELECT distinct
         a.rec_date recDate ,
         b.company_name companyName,
         c.resources_name carName,
@@ -161,9 +161,9 @@
         LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
         LEFT JOIN jc_power_transfer_company_resources c ON c.power_transfer_company_id = b.sequence_nbr
 
-        where a.sequence_nbr = (select sequence_nbr from jc_power_transfer where alert_called_id
+        where a.sequence_nbr in (select sequence_nbr  from (select sequence_nbr from jc_power_transfer where alert_called_id
         = #{alertId}
-        order by rec_date asc limit 1,100)
+        order by rec_date asc limit 1,100) as t )
     </select>
 
 

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

+package com.yeejoin.amos.latentdanger.common.enums;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public enum AuditEnum {
+	AUDIT("待审核","audit"),
+	REVIEW("待复核","review");
+
+	/**
+	 * 名称，描述
+	 */
+	private String name;
+
+	/**
+	 * 编码
+	 */
+	private String code;
+
+	AuditEnum(String name, String code){
+		this.name = name;
+		this.code = code;
+	}
+	
+	public static AuditEnum getEnum(String code) {
+		AuditEnum auditEnum = null;
+		for(AuditEnum type: AuditEnum.values()) {
+			if (type.getCode().equals(code)) {
+				auditEnum = type;
+				break;
+			}
+		}
+		
+		return auditEnum;
+	}
+	
+	public static List<Map<String,String>> getEnumList() {
+		List<Map<String,String>> nameList = new ArrayList<>();
+		for (AuditEnum c: AuditEnum.values()) {
+			Map<String, String> map = new HashMap<String, String>();
+			map.put("name", c.getName());
+			map.put("code", c.getCode());
+			nameList.add(map);
+		}
+		return nameList;
+	}
+
+	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-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/dao/entity/LatentDanger.java

@@ -90,7 +90,7 @@ public class LatentDanger extends BasicEntity {
     /**
      * 限制时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date reformLimitDate;
 
     private Integer overtimeState;

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/common/enums/ExecuteStateEnum.java

@@ -5,6 +5,7 @@ public enum ExecuteStateEnum {
 
     未执行("未执行", 1, ""),
     通过("通过", 2, "{\"action\": \"complete\",\"variables\": [{\"name\": \"rejected\",\"value\": false}]}"),
+    完毕("完毕", 2, "{\"action\": \"complete\",\"variables\": [{\"name\": \"rejected\",\"value\": false}]}"),
     驳回("驳回", 3, "{\"action\": \"complete\",\"variables\": [{\"name\": \"rejected\",\"value\": true}]}"),
     已确认("已确认", 4, ""),
     停止执行("停止执行", 5, ""),

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/common/enums/LatentDangerExcuteTypeEnum.java

@@ -7,7 +7,7 @@ public enum LatentDangerExcuteTypeEnum {
             "{\"reviewResult\": \"通过\"}"),
     隐患评审拒绝("隐患评审拒绝", 3, ExecuteStateEnum.驳回, LatentDangerStateEnum.已撤销,
             "{\"reviewResult\": \"不通过\"}"),
-    隐患常规治理("隐患常规治理", 4, ExecuteStateEnum.通过, LatentDangerStateEnum.待验证,
+    隐患常规治理("隐患常规治理", 4, ExecuteStateEnum.完毕, LatentDangerStateEnum.待验证,
             "{\"rectifyResult\": \"常规整改\"}"),
     隐患安措计划("隐患安措计划", 5, ExecuteStateEnum.通过, LatentDangerStateEnum.安措计划中,
             "{\"action\": \"complete\",\"variables\": [{\"name\": \"rectification\",\"value\": \"plan\"}]}"),

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/EquipmentUseInfoDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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;
+
+/**
+ * 设备使用信息表
+ *
+ * @author system_generator
+ * @date 2022-01-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="EquipmentUseInfoDto", description="设备使用信息表")
+public class EquipmentUseInfoDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "使用单位名称")
+    private String useUnitName;
+
+    @ApiModelProperty(value = "使用单位id")
+    private Long useUnitId;
+
+    @ApiModelProperty(value = "使用单位统一信用代码")
+    private String useOrganizationCode;
+
+    @ApiModelProperty(value = "产权单位名称")
+    private String propertyUnitName;
+
+    @ApiModelProperty(value = "产权单位id")
+    private Long propertyUnitId;
+
+    @ApiModelProperty(value = "产权统一信用代码")
+    private String propertyOrganizationCode;
+
+    @ApiModelProperty(value = "使用地址")
+    private String useAddress;
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
+    @ApiModelProperty(value = "使用场所")
+    private String useSite;
+
+    @ApiModelProperty(value = "使用场所编码")
+    private String useSiteCode;
+
+    @ApiModelProperty(value = "特设编码")
+    private String specialCode;
+
+    @ApiModelProperty(value = "设备注册代码")
+    private String registerCode;
+
+    @ApiModelProperty(value = "96333识别码")
+    private String rescueCode;
+
+    @ApiModelProperty(value = "使用登记证编码")
+    private String registerLicenceCode;
+
+    @ApiModelProperty(value = "登记机关")
+    private String registerOrg;
+
+    @ApiModelProperty(value = "登记机关id")
+    private Long registerOrgId;
+
+    @ApiModelProperty(value = "登记日期")
+    private Date registerTime;
+
+    @ApiModelProperty(value = "发证日期")
+    private Date issueLicenceTime;
+
+    @ApiModelProperty(value = "投入使用日期")
+    private Date startUseTime;
+
+    @ApiModelProperty(value = "设备id")
+    private Long equipmentId;
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.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;
+
+/**
+ * 设备使用信息表
+ *
+ * @author system_generator
+ * @date 2022-01-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tcb_equipment_use_info")
+public class EquipmentUseInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 使用单位名称
+     */
+	@TableField("use_unit_name")
+    private String useUnitName;
+
+    /**
+     * 使用单位id
+     */
+	@TableField("use_unit_id")
+    private Long useUnitId;
+
+    /**
+     * 使用单位统一信用代码
+     */
+	@TableField("use_organization_code")
+    private String useOrganizationCode;
+
+    /**
+     * 产权单位名称
+     */
+	@TableField("property_unit_name")
+    private String propertyUnitName;
+
+    /**
+     * 产权单位id
+     */
+	@TableField("property_unit_id")
+    private Long propertyUnitId;
+
+    /**
+     * 产权统一信用代码
+     */
+	@TableField("property_organization_code")
+    private String propertyOrganizationCode;
+
+    /**
+     * 使用地址
+     */
+	@TableField("use_address")
+    private String useAddress;
+
+    /**
+     * 经度
+     */
+	@TableField("longitude")
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+	@TableField("latitude")
+    private String latitude;
+
+    /**
+     * 使用场所
+     */
+	@TableField("use_site")
+    private String useSite;
+
+    /**
+     * 使用场所编码
+     */
+	@TableField("use_site_code")
+    private String useSiteCode;
+
+    /**
+     * 特设编码
+     */
+	@TableField("special_code")
+    private String specialCode;
+
+    /**
+     * 设备注册代码
+     */
+	@TableField("register_code")
+    private String registerCode;
+
+    /**
+     * 96333识别码
+     */
+	@TableField("rescue_code")
+    private String rescueCode;
+
+    /**
+     * 使用登记证编码
+     */
+	@TableField("register_licence_code")
+    private String registerLicenceCode;
+
+    /**
+     * 登记机关
+     */
+	@TableField("register_org")
+    private String registerOrg;
+
+    /**
+     * 登记机关id
+     */
+	@TableField("register_org_id")
+    private Long registerOrgId;
+
+    /**
+     * 登记日期
+     */
+	@TableField("register_time")
+    private Date registerTime;
+
+    /**
+     * 发证日期
+     */
+	@TableField("issue_licence_time")
+    private Date issueLicenceTime;
+
+    /**
+     * 投入使用日期
+     */
+	@TableField("start_use_time")
+    private Date startUseTime;
+
+    /**
+     * 设备id
+     */
+    @TableField("equipment_id")
+	private Long equipmentId;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/EquipmentUseInfoMapper.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.EquipmentUseInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 设备使用信息表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2022-01-05
+ */
+public interface EquipmentUseInfoMapper extends BaseMapper<EquipmentUseInfo> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/IEquipmentAssociatedService.java

 package com.yeejoin.amos.boot.module.tzs.flc.api.service;
 
 
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentAssociatedDto;
+
 /**
  * 配套设备/设施/部件接口类
  *
@@ -9,4 +11,5 @@ package com.yeejoin.amos.boot.module.tzs.flc.api.service;
  */
 public interface IEquipmentAssociatedService {
 
+    EquipmentAssociatedDto updateAssociated(EquipmentAssociatedDto model);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/IEquipmentUseInfoService.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+/**
+ * 设备使用信息表接口类
+ *
+ * @author system_generator
+ * @date 2022-01-05
+ */
+public interface IEquipmentUseInfoService {
+
+}

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.tzs.flc.api.mapper.EquipmentUseInfoMapper">
+
+</mapper>

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

@@ -94,6 +94,20 @@ public class DutyCarController extends BaseController {
     }
 
     /**
+     * 值班月视图
+     *
+     * @return ResponseModel
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping("/new-statistics-day")
+    @ApiOperation(httpMethod = "GET", value = "新值班月视图", notes = "新值班月视图")
+    public ResponseModel<List<Map<String, Object>>> newDutyDetail(
+            @ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
+            @ApiParam(value = "结束日期", required = true) @RequestParam String endDate
+    ) throws ParseException {
+        return ResponseHelper.buildResponse(iDutyCarService.newStatisticsDay(beginDate, endDate));
+    }
+    /**
      * 调班
      *
      * @return ResponseModel

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

@@ -92,7 +92,20 @@ public class DutyFireFightingController extends BaseController{
 	    ) throws ParseException {
 	        return ResponseHelper.buildResponse(iDutyFireFightingService.statisticsDay(beginDate, endDate));
 	    }
-
+	    /**
+	     * 新值班月视图
+	     *
+	     * @return ResponseModel
+	     */
+	    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	    @GetMapping("/new-statistics-day")
+	    @ApiOperation(httpMethod = "GET", value = "新值班月视图", notes = "新值班月视图")
+	    public ResponseModel<List<Map<String, Object>>> newDutyDetail(
+	            @ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
+	            @ApiParam(value = "结束日期", required = true) @RequestParam String endDate
+	    ) throws ParseException {
+	        return ResponseHelper.buildResponse(iDutyFireFightingService.newStatisticsDay(beginDate, endDate));
+	    }
 	    /**
 	     * 调班
 	     *

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

@@ -84,7 +84,15 @@ public class DutyFirstAidController  extends BaseController{
 	    ) throws ParseException {
 	        return ResponseHelper.buildResponse(iDutyFirstAidService.statisticsDay(beginDate, endDate));
 	    }
-
+	    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	    @GetMapping("/new-statistics-day")
+	    @ApiOperation(httpMethod = "GET", value = "新值班月视图", notes = "新值班月视图")
+	    public ResponseModel<List<Map<String, Object>>> newDutyDetail(
+	            @ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
+	            @ApiParam(value = "结束日期", required = true) @RequestParam String endDate
+	    ) throws ParseException {
+	        return ResponseHelper.buildResponse(iDutyFirstAidService.newStatisticsDay(beginDate, endDate));
+	    }
 	    /**
 	     * 调班
 	     *

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

@@ -93,7 +93,20 @@ public class DutyPersonController extends BaseController {
     ) throws ParseException {
         return ResponseHelper.buildResponse(iDutyPersonService.statisticsDay(beginDate, endDate));
     }
-
+    /**
+     * 值班月视图
+     *
+     * @return ResponseModel
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping("/new-duty-detail")
+    @ApiOperation(httpMethod = "GET", value = "新值班月视图", notes = "新值班月视图")
+    public ResponseModel<List<Map<String, Object>>> newDutyDetail(
+            @ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
+            @ApiParam(value = "结束日期", required = true) @RequestParam String endDate
+    ) throws ParseException {
+        return ResponseHelper.buildResponse(iDutyPersonService.newStatisticsDay(beginDate, endDate));
+    }
 
     /**
      * 调班
@@ -168,7 +181,14 @@ public class DutyPersonController extends BaseController {
                                         @ApiParam(value = "岗位") @RequestParam(required = false) String postType) {
         return ResponseHelper.buildResponse(iDutyPersonService.dayDutyPersonList(dutyDay, shiftId, postType));
     }
-
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation("新查询指定日期值班人信息列表")
+    @GetMapping("/new-person/{dutyDay}/list")
+    public ResponseModel newListDutyPerson(@ApiParam(value = "值班日期", required = true) @PathVariable String dutyDay,
+                                        @ApiParam(value = "班次id") @RequestParam(required = false) Long shiftId,
+                                        @ApiParam(value = "岗位") @RequestParam(required = false) String postType) {
+        return ResponseHelper.buildResponse(iDutyPersonService.getSchedulingDutyForSpecifyDate(dutyDay, shiftId, postType));
+    }
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation("查询当前值班人信息列表")
     @GetMapping("/person/on_duty/list")

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

@@ -91,7 +91,7 @@ public class OrgPersonController {
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.PUT)
-    @ApiOperation(httpMethod = "PUT", value = "更新单位数据", notes = "更新单位数据")
+    @ApiOperation(httpMethod = "PUT", value = "更新人员数据", notes = "更新人员数据")
     public ResponseModel<?> updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgPersonDto OrgPersonVo,
                                              @PathVariable Long id) throws Exception {
         OrgPersonVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);

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

@@ -257,6 +257,55 @@ public class OrgUsrController extends BaseController {
         page = iOrgUsrService.page(pageBean, orgUsrQueryWrapper);
         return page;
     }
+    /**
+     * 列表分页查询
+     *
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/new-list", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "新列表分页查询---只查询当前登录人本单位下的对应数据信息", notes = "新列表分页查询---只查询当前登录人本单位下的对应数据信息")
+    public IPage<OrgUsr> newlistPage(String pageNum, String pageSize, OrgUsr orgUsr) {
+    	ReginParams reginParams = getSelectedOrgInfo();
+    	String   companyIdString= reginParams.getPersonIdentity().getCompanyId();
+    	orgUsr.setParentId(companyIdString);
+        Page<OrgUsr> pageBean;
+        QueryWrapper<OrgUsr> orgUsrQueryWrapper = new QueryWrapper<>();
+        Class<? extends OrgUsr> aClass = orgUsr.getClass();
+        Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
+            try {
+                field.setAccessible(true);
+                Object o = field.get(orgUsr);
+                if (o != null) {
+                    Class<?> type = field.getType();
+                    String name = NameUtils.camel2Underline(field.getName());
+                    if (type.equals(Integer.class)) {
+                        Integer fileValue = (Integer) field.get(orgUsr);
+                        orgUsrQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(Long.class)) {
+                        Long fileValue = (Long) field.get(orgUsr);
+                        orgUsrQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(String.class)) {
+                        String fileValue = (String) field.get(orgUsr);
+                        orgUsrQueryWrapper.eq(name, fileValue);
+                    } else {
+                        String fileValue = (String) field.get(orgUsr);
+                        orgUsrQueryWrapper.eq(name, fileValue);
+                    }
+                }
+            } catch (Exception e) {
+            }
+        });
+        orgUsrQueryWrapper.eq("is_delete", 0);
+        IPage<OrgUsr> page;
+        if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
+            pageBean = new Page<>(0, Long.MAX_VALUE);
+        } else {
+            pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        }
+        page = iOrgUsrService.page(pageBean, orgUsrQueryWrapper);
+        return page;
+    }
 
     /**
      * 导入部门信息
@@ -597,6 +646,7 @@ public class OrgUsrController extends BaseController {
         return ResponseHelper.buildResponse(iOrgUsrService.getOrgUserByAmosUserId(amosUserId));
     }
 
+
     /**
      * 根据机构类型和登陆人bizOrgCode获取列表不分页
      *
@@ -645,4 +695,5 @@ public class OrgUsrController extends BaseController {
         return ResponseHelper.buildResponse(menus);
     }
 
+
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.common.api.dto.ContractDto;
-import com.yeejoin.amos.boot.module.common.api.entity.Contract;
-import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
-import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
-import com.yeejoin.amos.boot.module.common.api.mapper.ContractMapper;
-import com.yeejoin.amos.boot.module.common.api.service.IContractService;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.feign.systemctl.Systemctl;
-import com.yeejoin.amos.feign.systemctl.model.FileInfoModel;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -23,10 +16,17 @@ import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.ContractDto;
+import com.yeejoin.amos.boot.module.common.api.entity.Contract;
+import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
+import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
+import com.yeejoin.amos.boot.module.common.api.mapper.ContractMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IContractService;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.FileInfoModel;
 
 /**
  * 维保合同服务实现类
@@ -53,8 +53,6 @@ public class ContractServiceImpl extends BaseService<ContractDto, Contract, Cont
             MaintenanceCompany company = maintenanceCompanyService.getMaintenanceCompany(amosUserId);
             companyId = company.getSequenceNbr();
         }
-        
-        //
         Page<ContractDto>  resultPage= queryForContractPageByParam(page, isDelete, companyId, signedCompanyId, name, typeCode,
                 signedDate);
         List<ContractDto>  resultContractDtos=    resultPage.getRecords();

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

@@ -170,21 +170,23 @@ public class DutyCarServiceImpl extends DutyCommonServiceImpl implements IDutyCa
 			if (StringUtils.isNotBlank(instanceId)) {
 				String[] instanceIds = instanceId.split(",");
 				
-				List<Map<String, Object>>  dutyList = dutyPersonShiftMapper.getDutyForSpecifyDate(dutyDay);
-				if(dutyList!=null && dutyList.size()>0) {
-					for (Map<String, Object> dutyDetail : dutyList) {
-						if(!dutyDetail.containsKey("name")) {
-							continue;
-						}
+			//	List<Map<String, Object>>  dutyList = dutyPersonShiftMapper.getDutyForSpecifyDate(dutyDay);
+//				if(dutyList!=null && dutyList.size()>0) {
+//					for (Map<String, Object> dutyDetail : dutyList) {
+//						if(!dutyDetail.containsKey("name")) {
+//							continue;
+//						}
 						// 获取当前装备ID下的排版数据
 						List<Map<String, Object>> specifyDateList = dutyPersonShiftMapper.getPositionStaffDutyForSpecifyDate(dutyDay,
-								this.getGroupCode(), instanceIds,dutyDetail.get("name").toString());
+								this.getGroupCode(), instanceIds,null);
 						if(specifyDateList==null || specifyDateList.size() < 1 || specifyDateList.get(0)==null) {
 							continue;
 						}
 						LinkedHashMap<String, Object> infoMap_1 =new LinkedHashMap<String, Object>();
-						infoMap_1.put(dutyDetail.get("name").toString(), "");
-						resultList.add(infoMap_1);
+						//取消掉班次的显示---2022-01-16 by chenhao ---start
+						//infoMap_1.put(dutyDetail.get("name").toString(), "");
+						//resultList.add(infoMap_1);
+						//取消掉班次的显示---2022-01-16 by chenhao ---end
 						for (Map<String, Object> specify : specifyDateList) {
 							LinkedHashMap<String, Object> infoMap_2 =new LinkedHashMap<String, Object>();
 //							infoMap_2.put(specify.get("postTypeName").toString(),specify.get("userName").toString());
@@ -194,32 +196,8 @@ public class DutyCarServiceImpl extends DutyCommonServiceImpl implements IDutyCa
 								resultList.add(infoMap_2);
 							}
 						}
-					}
-				}
-				// 获取当前装备ID下的排版数据
-//				List<Map<String, Object>> specifyDateList = dutyPersonShiftMapper.getSpecifyDateList(dutyDay,
-//						this.getGroupCode(), instanceIds,null);
-//				for (Map<String, Object> specify : specifyDateList) {
-//					
-//					if(!specify.containsKey("name") || specify.get("name").toString()==null) {
-//						continue;
-//					}
-//					LinkedHashMap<String, Object> infoMap_1 =new LinkedHashMap<String, Object>();
-//					infoMap_1.put(specify.get("name").toString(), "");
-//					resultList.add(infoMap_1);
-//					Map<String, Object> equipmentOperatorMap = dutyPersonShiftMapper.getEquipmentOperator(dutyDay,
-//							this.getGroupCode(), instanceIds, "消防车驾驶员", specify.get("name").toString());
-//					String operator =null;
-//					if (equipmentOperatorMap!=null && equipmentOperatorMap.containsKey("userName")) {
-//						 operator = equipmentOperatorMap.get("equipmentOperatorMap").toString();
-//					}
-//					LinkedHashMap<String, Object> infoMap_2 =new LinkedHashMap<String, Object>();
-//					infoMap_2.put("驾驶员", operator!=null?operator:"");
-//					resultList.add(infoMap_2);
-//					LinkedHashMap<String, Object> infoMap_3 =new LinkedHashMap<String, Object>();
-//					infoMap_3.put("战斗员",specify.get("value").toString());
-//					resultList.add(infoMap_3);
-//				}
+				//	}
+				//}
 			}
 			detailList.add(resultList);
 		}

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

@@ -46,6 +46,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.DutyViewTypeEnum;
+import com.yeejoin.amos.boot.module.common.api.mapper.DutyPersonShiftMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IDutyCommonService;
 
 /**
@@ -75,6 +76,9 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 
 	@Autowired
 	OrgUsrServiceImpl orgUsrService;
+	
+	@Autowired
+	DutyPersonShiftMapper dutyPersonShiftMapper;
 
 	/**
 	 * 每天单个班次执勤人数全部小于等于3人
@@ -213,7 +217,126 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 		return resultMap;
 		/*bug2468 值班排班，日历视图单班次执勤人数满足≤3且班次≤2时，值班显示方式错误 陈召 结束*/
 	}
+	
+	public List<Map<String, Object>> newStatisticsDay(String beginDate, String endDate) throws ParseException {
+
+		Date dateBegin = DateUtils.dateParse(beginDate, DateUtils.DATE_PATTERN);
+		String timeStart = DateUtils.dateTimeToDateString(dateBegin);
+		Date dateEnd = DateUtils.dateParse(endDate, DateUtils.DATE_PATTERN);
+		String timeEnd = DateUtils.dateTimeToDateString(dateEnd);
+		List<String> betweenDate = getBetweenDate(timeStart, timeEnd);
 
+		//拿到每一天的视图展示
+		String beginTime = null;
+		String endTime = null;
+		List<Map<String, Object>> viewTypeResult = new ArrayList<>();
+		for (String time : betweenDate) {
+			beginTime = time + " 00:00:00";
+			endTime = time + " 23:59:59";
+			Map<String, Object> viewTypeMap = new HashMap<>();
+			viewTypeMap.put("date",time);
+			viewTypeResult.add(viewTypeMap);
+		}
+		List<Map<String, Object>> rangeDate = dutyPersonShiftService.getBaseMapper().genRangeDate(beginDate, endDate);
+		List<Map<String, Object>> resultMap = new ArrayList<>();
+		for (Map<String, Object> stringObjectMap : viewTypeResult) {
+			for (Map<String, Object> objectMap : rangeDate) {
+				if (stringObjectMap.get("date").equals(objectMap.get("date"))){
+					Map<String, Object> result = new LinkedHashMap<>();
+					result.put("key", objectMap.get("date"));
+					String dateString =	 objectMap.get("date").toString();
+					if(this.getGroupCode().equals("dutyPerson")) {
+						result.put("data", getPersonPostTypeNameAndCount(dateString));
+					}else if(this.getGroupCode().equals("dutyCar")) {
+						result.put("data", getCarPostTypeNameAndCount(dateString));
+					}else if(this.getGroupCode().equals("dutyFireFighting")) {
+						result.put("data", getFireFightingPostTypeNameAndCount(dateString));
+					}else if(this.getGroupCode().equals("dutyFirstAid")) {
+						result.put("data", getFirstAidPostTypeNameAndCount(dateString));
+					}
+					resultMap.add(result);
+				}
+			}
+		}
+		return resultMap;
+	}
+	
+	/**
+	 * 排班值班人员的统计类型为：
+	 *  岗位： 岗位人员数量
+	 * @param dutyDate
+	 * @return
+	 */
+	public Object getPersonPostTypeNameAndCount(String dutyDate) {
+		return dutyPersonShiftService.getBaseMapper().newStationViewData(dutyDate, this.getGroupCode());
+	}
+	/**
+	 * 车辆值班人员左侧的统计： 只有几辆车
+	 * @param dutyDate
+	 * @return
+	 */
+	public Object getCarPostTypeNameAndCount(String dutyDate) {
+		Map<String, Object> map = new HashMap<String, Object>();
+		int station =0;
+		int person=0;
+		List<Map<String, Object>> equipmentList = dutyPersonShiftMapper.getEquipmentForSpecifyDate(dutyDate,
+				this.getGroupCode(), "carId", "carName", "teamName","result.carId");
+		if(equipmentList==null || equipmentList.size()<1 || equipmentList.get(0)==null) {
+			station =0;
+		}else {
+			station=equipmentList.size();
+		}
+		map.put("station", station);
+		List<Map<String, Object>>  list = dutyPersonShiftService.getBaseMapper().newStationViewData(dutyDate, this.getGroupCode());
+		for (Map<String, Object> map2 : list) {
+			person = person +Integer.parseInt(map2.get("total").toString());
+		}
+		map.put("person", person);
+		return map;
+	}
+	
+	
+	public Object getFireFightingPostTypeNameAndCount(String dutyDate) {
+		Map<String, Object> map = new HashMap<String, Object>();
+		int station =0;
+		int person=0;
+		List<Map<String, Object>> equipmentList = dutyPersonShiftMapper.getEquipmentForSpecifyDate(dutyDate,
+				this.getGroupCode(), "fireFightingId", "fireFighting", "teamName","result.fireFightingId");
+		if(equipmentList==null || equipmentList.size()<1 || equipmentList.get(0)==null) {
+			station =0;
+		}else {
+			station=equipmentList.size();
+		}
+		map.put("station", station);
+		List<Map<String, Object>>  list = dutyPersonShiftService.getBaseMapper().newStationViewData(dutyDate, this.getGroupCode());
+		for (Map<String, Object> map2 : list) {
+			person = person +Integer.parseInt(map2.get("total").toString());
+		}
+		map.put("person", person);
+		return map;
+	}
+	
+	public Object getFirstAidPostTypeNameAndCount(String dutyDate) {
+		Map<String, Object> map = new HashMap<String, Object>();
+		int station =0;
+		int person=0;
+		List<Map<String, Object>> equipmentList = dutyPersonShiftMapper.getEquipmentForSpecifyDate(dutyDate,
+				this.getGroupCode(), "firstAidId", "firstAid", "teamName", "result.firstAidId");
+		if(equipmentList==null || equipmentList.size()<1 || equipmentList.get(0)==null) {
+			station =0;
+		}else {
+			station=equipmentList.size();
+		}
+		map.put("station", station);
+		List<Map<String, Object>>  list = dutyPersonShiftService.getBaseMapper().newStationViewData(dutyDate, this.getGroupCode());
+		for (Map<String, Object> map2 : list) {
+			person = person +Integer.parseInt(map2.get("total").toString());
+		}
+		map.put("person", person);
+		return map;
+	}
+	
+	
 	private Object buildViewData(DutyViewTypeEnum viewTypeEnum, String dutyDate, String appKey) {
 		List<Map<String, Object>> result = new ArrayList<>();
 		switch (viewTypeEnum) {

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
-import static org.hamcrest.CoreMatchers.nullValue;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -15,7 +13,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 
-import com.itextpdf.text.pdf.PdfStructTreeController.returnType;
 import com.yeejoin.amos.boot.module.common.api.dto.DutyFireFightingDto;
 import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInstanceDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
@@ -85,29 +82,29 @@ public class DutyFireFightingServiceImpl extends DutyCommonServiceImpl implement
 			if (StringUtils.isNotBlank(instanceId)) {
 				String[] instanceIds = instanceId.split(",");
 				
-				List<Map<String, Object>>  dutyList = dutyPersonShiftMapper.getDutyForSpecifyDate(dutyDay);
-				if(dutyList!=null && dutyList.size()>0) {
-					for (Map<String, Object> dutyDetail : dutyList) {
-						if(!dutyDetail.containsKey("name")) {
-							continue;
-						}
+//				List<Map<String, Object>>  dutyList = dutyPersonShiftMapper.getDutyForSpecifyDate(dutyDay);
+//				if(dutyList!=null && dutyList.size()>0) {
+//					for (Map<String, Object> dutyDetail : dutyList) {
+//						if(!dutyDetail.containsKey("name")) {
+//							continue;
+//						}
 						// 获取当前装备ID下的排版数据
 						List<Map<String, Object>> specifyDateList = dutyPersonShiftMapper.getPositionStaffDutyForSpecifyDate(dutyDay,
-								this.getGroupCode(), instanceIds,dutyDetail.get("name").toString());
+								this.getGroupCode(), instanceIds,null);
 						if(specifyDateList==null || specifyDateList.size() < 1 || specifyDateList.get(0)==null) {
 							continue;
 						}
-						LinkedHashMap<String, Object> infoMap_1 =new LinkedHashMap<String, Object>();
-						infoMap_1.put(dutyDetail.get("name").toString(), "");
-						resultList.add(infoMap_1);
+//						LinkedHashMap<String, Object> infoMap_1 =new LinkedHashMap<String, Object>();
+//						infoMap_1.put(dutyDetail.get("name").toString(), "");
+//						resultList.add(infoMap_1);
 						for (Map<String, Object> specify : specifyDateList) {
 							LinkedHashMap<String, Object> infoMap_2 =new LinkedHashMap<String, Object>();
 							if( specify.containsKey("postTypeName")&& specify.get("postTypeName")!=null && specify.containsKey("userName")&& specify.get("userName")!=null ) {
 								infoMap_2.put(specify.get("postTypeName").toString(),specify.get("userName").toString());
 								resultList.add(infoMap_2);
 							}
-						}
-					}
+//						}
+//					}
 				}
 			}
 			detailList.add(resultList);

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

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.velocity.runtime.directive.Break;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.Bean;
@@ -18,8 +19,6 @@ import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.mapper.DutyPersonShiftMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IDutyFirstAidService;
 
-import ch.qos.logback.core.joran.conditional.IfAction;
-
 @Service
 public class DutyFirstAidServiceImpl extends DutyCommonServiceImpl implements IDutyFirstAidService {
 
@@ -67,15 +66,15 @@ public class DutyFirstAidServiceImpl extends DutyCommonServiceImpl implements ID
 		}
 		List<Object> detailList = new ArrayList<Object>();
 		for (Map<String, Object> map : equipmentList) {
-			List<Map<String, Object>> resultList = new ArrayList<Map<String, Object>>();
-			LinkedHashMap<String, Object> titleMap_1 = new LinkedHashMap<String, Object>();
-			titleMap_1.put("120急救站", map.get("firstAid").toString());
-			resultList.add(titleMap_1);
-			LinkedHashMap<String, Object> titleMap_2 = new LinkedHashMap<String, Object>();
-			if(map.containsKey("teamName") && map.get("teamName") != null){
-				titleMap_2.put("单位/部门", map.get("teamName").toString());
-			}
-			resultList.add(titleMap_2);
+			List<Object> resultList = new ArrayList<Object>();
+			//LinkedHashMap<String, Object> titleMap_1 = new LinkedHashMap<String, Object>();
+			//titleMap_1.put("120急救站", map.get("firstAid").toString());
+			resultList.add( map.get("firstAid").toString());
+//			LinkedHashMap<String, Object> titleMap_2 = new LinkedHashMap<String, Object>();
+//			if(map.containsKey("teamName") && map.get("teamName") != null){
+//				titleMap_2.put("单位/部门", map.get("teamName").toString());
+//			}
+//			resultList.add(titleMap_2);
 			String carId = map.get("firstAidId").toString();
 			Map<String, Object> instanceMap = dutyPersonShiftMapper.getInstanceIdForSpecifyDateAndEquipment(dutyDay,
 					this.getGroupCode(), carId);
@@ -86,22 +85,22 @@ public class DutyFirstAidServiceImpl extends DutyCommonServiceImpl implements ID
 			if (StringUtils.isNotBlank(instanceId)) {
 				String[] instanceIds = instanceId.split(",");
 
-				List<Map<String, Object>> dutyList = dutyPersonShiftMapper.getDutyForSpecifyDate(dutyDay);
-				if (dutyList != null && dutyList.size() > 0) {
-					for (Map<String, Object> dutyDetail : dutyList) {
-						if (!dutyDetail.containsKey("name")) {
-							continue;
-						}
+//				List<Map<String, Object>> dutyList = dutyPersonShiftMapper.getDutyForSpecifyDate(dutyDay);
+//				if (dutyList != null && dutyList.size() > 0) {
+//					for (Map<String, Object> dutyDetail : dutyList) {
+//						if (!dutyDetail.containsKey("name")) {
+//							continue;
+//						}
 						// 获取当前装备ID下的排版数据
 						List<Map<String, Object>> specifyDateList = dutyPersonShiftMapper
 								.getPositionStaffDutyForSpecifyDate(dutyDay, this.getGroupCode(), instanceIds,
-										dutyDetail.get("name").toString());
+										null);
 						if (specifyDateList == null || specifyDateList.size() < 1 || specifyDateList.get(0) == null) {
 							continue;
 						}
-						LinkedHashMap<String, Object> infoMap_1 = new LinkedHashMap<String, Object>();
-						infoMap_1.put(dutyDetail.get("name").toString(), "");
-						resultList.add(infoMap_1);
+//						LinkedHashMap<String, Object> infoMap_1 = new LinkedHashMap<String, Object>();
+//						infoMap_1.put(dutyDetail.get("name").toString(), "");
+//						resultList.add(infoMap_1);
 						for (Map<String, Object> specify : specifyDateList) {
 							LinkedHashMap<String, Object> infoMap_2 = new LinkedHashMap<String, Object>();
 //							infoMap_2.put(specify.get("postTypeName").toString(), specify.get("userName").toString());
@@ -110,9 +109,9 @@ public class DutyFirstAidServiceImpl extends DutyCommonServiceImpl implements ID
 								infoMap_2.put(specify.get("postTypeName").toString(),specify.get("userName").toString());
 								resultList.add(infoMap_2);
 							}
-						}
-						
-					}
+//						}
+//						
+//					}
 				}
 			}
 			detailList.add(resultList);
@@ -125,6 +124,11 @@ public class DutyFirstAidServiceImpl extends DutyCommonServiceImpl implements ID
 		List< Map<String, Object>> result = new ArrayList<Map<String, Object>>();
 		List<String> userNameList= new ArrayList<String>();
 
+		String firstAidCompanyId = dutyPersonShiftMapper.getFirstAidCompanyId();
+		if (firstAidCompanyId != "" && firstAidCompanyId != null){
+			ids.add(firstAidCompanyId);
+		}
+		
 		List<String> firstAidSimpleList = new ArrayList<String>();
 		List<String> companyNameList = new ArrayList<String>();
 		String typeString = "JJZ";
@@ -157,10 +161,19 @@ public class DutyFirstAidServiceImpl extends DutyCommonServiceImpl implements ID
 			});
 			if( firstAidSimpleList != null && firstAidSimpleList.size() >= 1 ) {
 				detailMap.put("firstAidName", firstAidSimpleList);
-				resultList.add(detailMap);
 			}
+			resultList.add(detailMap);
 		});
-		result.add(resultList.get(0));
+		for (int i = 0; i < resultList.size(); i++) {
+
+				if (resultList.get(i).size() == 4){
+					result.add(resultList.get(i));
+				}
+				if (result.size()>0){
+					break;
+				}
+		}
+
 		return result;
 	}
 

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

@@ -304,7 +304,48 @@ public Object BuildScheduleDetails(String dutyDay, Long shiftId, String postType
     }
     
     
-    
+    public Object getSchedulingDutyForSpecifyDate(String dutyDay, Long shiftId, String postType) {
+		List<Map<String, Object>> equipmentList = dutyPersonShiftMapper.getNewEquipmentForSpecifyDate(dutyDay,
+				this.getGroupCode(), "deptId", "deptName", "result.deptId");
+		if (equipmentList == null || equipmentList.size() < 1 || equipmentList.get(0) == null) {
+			return null;
+		}
+		List<Object> detailList = new ArrayList<Object>();
+		for (Map<String, Object> map : equipmentList) {
+			List<Object> resultList = new ArrayList<Object>();
+			LinkedHashMap<String, Object> titleMap_2 = new LinkedHashMap<String, Object>();
+			if(map.containsKey("deptName") && map.get("deptName") != null){
+				resultList.add( map.get("deptName").toString());
+			}
+			String carId = map.get("deptId").toString();
+			Map<String, Object> instanceMap = dutyPersonShiftMapper.getInstanceIdForSpecifyDateAndEquipment(dutyDay,
+					this.getGroupCode(), carId);
+			if (instanceMap == null) {
+				continue;
+			}
+			String instanceId = instanceMap.get("instanceIds").toString();
+			if (StringUtils.isNotBlank(instanceId)) {
+				String[] instanceIds = instanceId.split(",");
+
+						// 获取当前装备ID下的排版数据
+						List<Map<String, Object>> specifyDateList = dutyPersonShiftMapper
+								.getPositionStaffDutyForSpecifyDate(dutyDay, this.getGroupCode(), instanceIds,
+										null);
+						if (specifyDateList == null || specifyDateList.size() < 1 || specifyDateList.get(0) == null) {
+							continue;
+						}
+						for (Map<String, Object> specify : specifyDateList) {
+							LinkedHashMap<String, Object> infoMap_2 = new LinkedHashMap<String, Object>();
+							if( specify.containsKey("postTypeName")&& specify.get("postTypeName")!=null && specify.containsKey("userName")&& specify.get("userName")!=null ) {
+								infoMap_2.put(specify.get("postTypeName").toString(),specify.get("userName").toString());
+								resultList.add(infoMap_2);
+						}
+				}
+			}
+			detailList.add(resultList);
+		}
+		return detailList;
+	}
     
     
     

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

@@ -323,6 +323,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 
         // 发起主表流程 并添加至报修日志
         failureDetailsDto.setSubmissionTime(new Date());
+        failureDetailsDto.setCurrentStatus(FailureStatuEnum.WAITING_AUDIT.getCode());
         FailureDetailsDto model = this.updateWithModel(failureDetailsDto);
 
         if (ObjectUtils.isNotEmpty(failureDetailsDto.getAttachment())) {

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

@@ -85,10 +85,15 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail
         FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
         List<FailureVerify> byfaultId = findByfaultId(failureDetailsDto.getSequenceNbr());
 
-        if (byfaultId.size() != 0) {
+        if (byfaultId.size() != 0 && status.getCode().equals(FailureStatuEnum.FINISH.getCode())) {
             failureDetailsDto.setCurrentStatus(status.getCode());
         }
 
+        if (condition ==  AuditResultEnum.REFUSE.getCode()){
+            failureDetailsDto.setCurrentStatus(status.getCode());
+        }
+
+
         failureDetailsDto.setSequenceNbr(model.getFaultId());
         failureDetailsService.updateWithModel(failureDetailsDto);
 

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

@@ -642,7 +642,7 @@ public class MaintenanceCompanyServiceImpl
         MaintenanceCompany maintenanceCompany = new MaintenanceCompany();
         if (ValidationUtil.isEmpty(seq)) {
             maintenanceCompany = getMaintenanceCompany(amosUserId);
-            seq = maintenanceCompany.getParentId();
+            seq = maintenanceCompany.getSequenceNbr();
         }
         // 机场单位列表基本信息
         if (pageNum == -1 || pageSize == -1) {
@@ -674,11 +674,11 @@ public class MaintenanceCompanyServiceImpl
         LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<MaintenanceCompany>();
         wrapper.eq(MaintenanceCompany::getIsDelete, false);
         wrapper.eq(MaintenanceCompany::getAmosId, amosUserId);
-        MaintenanceCompany maintenanceCompany = this.baseMapper.selectOne(wrapper);
+        MaintenanceCompany maintenancePerson = this.baseMapper.selectOne(wrapper);
 //		DynamicFormInstance dyFormInstance = dynamicFormInstanceService.getOne(
 //				new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getFieldCode, "amosAccount")
 //						.eq(DynamicFormInstance::getFieldValue, amosUserId));
-        if (ValidationUtil.isEmpty(maintenanceCompany)) {
+        if (ValidationUtil.isEmpty(maintenancePerson)) {
             throw new BadRequest("维保账号不存在或未关联系统账号.");
         }
 //		MaintenanceCompany person = this.getOne(new LambdaQueryWrapper<MaintenanceCompany>()
@@ -686,11 +686,11 @@ public class MaintenanceCompanyServiceImpl
 //		if (ValidationUtil.isEmpty(person)) {
 //			throw new BadRequest("维保账号不存在或未关联系统账号.");
 //		}
-//		maintenanceCompany = this.getOne(new LambdaQueryWrapper<MaintenanceCompany>()
-//				.eq(MaintenanceCompany::getSequenceNbr, person.getParentId()));
-//		if (ValidationUtil.isEmpty(maintenanceCompany)) {
-//			throw new BadRequest("维保账号不存在或未关联系统账号.");
-//		}
+        MaintenanceCompany	maintenanceCompany = this.getOne(new LambdaQueryWrapper<MaintenanceCompany>()
+				.eq(MaintenanceCompany::getSequenceNbr, maintenancePerson.getParentId()));
+		if (ValidationUtil.isEmpty(maintenanceCompany)) {
+			throw new BadRequest("维保公司不存在或未关联系统账号.");
+		}
         return maintenanceCompany;
     }
 
@@ -817,7 +817,7 @@ public class MaintenanceCompanyServiceImpl
         // 查询公司下人列表
         List<MaintenanceCompany> personList = list(new LambdaQueryWrapper<MaintenanceCompany>()
                 .eq(MaintenanceCompany::getIsDelete, false).eq(MaintenanceCompany::getType, PERSON)
-                .likeRight(MaintenanceCompany::getCode, company.getCode()));
+                .eq(MaintenanceCompany::getParentId,company.getParentId()));
         List<Long> instanceIdList = Lists.transform(personList, MaintenanceCompany::getInstanceId);
         // 查询手机号
         List<DynamicFormInstance> dynamicFormInstanceList = dynamicFormInstanceService
@@ -830,7 +830,7 @@ public class MaintenanceCompanyServiceImpl
             Map<String, Object> map = Maps.newHashMap();
             map.put("sequenceNbr", person.getSequenceNbr());
             map.put("name", person.getName());
-            map.put("tel", dyMap.get(person.getInstanceId()).get(0).getFieldValue());
+            map.put("tel", dyMap.get(person.getInstanceId()) != null ? dyMap.get(person.getInstanceId()).get(0).getFieldValue() : null);
             resultList.add(map);
         });
         return resultList;

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

@@ -41,6 +41,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.component.emq.EmqKeeper;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -51,7 +53,14 @@ import java.lang.reflect.Method;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
-
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * 机构/部门/人员表 服务实现类
@@ -495,8 +504,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
     @Override
-    public OrgUsrDto saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist)
-            throws Exception {
+    public OrgUsrDto saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist) {
         orgUsr.setRecDate(new Date());
         AgencyUserModel user = Privilege.agencyUserClient.getme().getResult();
         orgUsr.setRecUserName(user.getRealName());
@@ -517,19 +525,14 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         });
         // 保存动态表单数据
         alertFormValueServiceImpl.saveBatch(alertFromValuelist);
-        OrgUsrFormDto formDto = this.selectCompanyById(orgUsrDto.getSequenceNbr());
-        if (OrgPersonEnum.公司.getKey().equals(orgUsrDto.getBizOrgType())) {
-            try {
-                emqKeeper.getMqttClient().publish(airportAddTopic, JSON.toJSONString(formDto).getBytes(), 2, false);
-            } catch (Exception e) {
-                e.getMessage();
-            }
-        }
         return model;
     }
 
     @Override
     public void updateDynamicFormInstance(Long instanceId, List<DynamicFormInstance> fromValueList) {
+        if (ValidationUtil.isEmpty(fromValueList)) {
+            return;
+        }
         // 填充主键
         fromValueList.forEach(alertFromValue -> {
             alertFromValue.setInstanceId(instanceId);
@@ -679,6 +682,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
          * 同步保存ES
          */
         eSOrgUsrService.saveAlertCalledToES(orgUsr);
+
+        syncCompany2Supervision(Lists.newArrayList(orgUsrDto.getSequenceNbr()));
         return orgUsrDto;
     }
 
@@ -720,17 +725,18 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         saveOrgUsrDynamicFormInstance(orgUsr, OrgPersonVo.getDynamicFormValue());
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
-    public OrgUsrDto updateByIdOrgUsr(OrgUsrDto OrgUsrVo, Long id) throws Exception {
+    public OrgUsrDto updateByIdOrgUsr(OrgUsrDto orgUsrVo, Long id) throws Exception {
         // 修改单位信息
         OrgUsr orgUsr = new OrgUsr();
         OrgUsr oriOrgUsr = getById(id);
-        BeanUtils.copyProperties(OrgUsrVo, orgUsr);
+        BeanUtils.copyProperties(orgUsrVo, orgUsr);
         // 判断是否修改所属单位
-        if (!(oriOrgUsr.getParentId() != null ? oriOrgUsr.getParentId() : "").equals(OrgUsrVo.getParentId())) {
+        if (!(oriOrgUsr.getParentId() != null ? oriOrgUsr.getParentId() : "").equals(orgUsrVo.getParentId())) {
 
             /* 单位编辑后 code值也应做出修改 2021-09-09 陈召 开始 */
-            OrgUsr parent = getById(OrgUsrVo.getParentId());
+            OrgUsr parent = getById(orgUsrVo.getParentId());
             if (parent != null) {
                 orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
             }
@@ -752,13 +758,15 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         // saveOrgUsr(orgUsr, oriOrgUsr);
 
         // 保存动态表单数据
-        updateDynamicFormInstance(orgUsr.getSequenceNbr(), OrgUsrVo.getDynamicFormValue());
+        updateDynamicFormInstance(orgUsr.getSequenceNbr(), orgUsrVo.getDynamicFormValue());
         /**
          * 同步保存ES
          */
         eSOrgUsrService.saveAlertCalledToES(orgUsr);
-        OrgUsrVo.setBizOrgCode(orgUsr.getBizOrgCode());
-        return OrgUsrVo;
+        orgUsrVo.setBizOrgCode(orgUsr.getBizOrgCode());
+
+        syncCompany2Supervision(Lists.newArrayList(orgUsr.getSequenceNbr()));
+        return orgUsrVo;
     }
 
     @Override
@@ -870,13 +878,16 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
     @Override
-    public void saveCompany(List<OrgUsrDto> OrgUsrVo) throws Exception {
+    public void saveCompany(List<OrgUsrDto> OrgUsrVo) {
+        List<Long> companyIdList  = Lists.newArrayList();
         for (int i = 0; i < OrgUsrVo.size(); i++) {
             OrgUsr orgUsr = new OrgUsr();
             BeanUtils.copyProperties(OrgUsrVo.get(i), orgUsr);
             orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
-            saveOrgUsrDynamicFormInstance(orgUsr, OrgUsrVo.get(i).getDynamicFormValue());
+            OrgUsrDto orgUsrDto = saveOrgUsrDynamicFormInstance(orgUsr, OrgUsrVo.get(i).getDynamicFormValue());
+            companyIdList.add(orgUsrDto.getSequenceNbr());
         }
+        syncCompany2Supervision(companyIdList);
     }
 
     @Override
@@ -2080,6 +2091,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
 
+
     @Override
     public List<OrgUsr> getListByBizOrgTypeCode(String orgTypes, String orgCode) {
         List<String> orgTypeList = new ArrayList<>();
@@ -2098,4 +2110,31 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         List<OrgUsr> list = orgUsrMapper.companyDeptListWithPersonCount(param);
         return buildTreeParallel(list);
     }
+    /**
+     * 同步单位信息到防火监督point表
+     *
+     * @param companyIdList
+     */
+    protected void syncCompany2Supervision(List<Long> companyIdList) {
+        if (ValidationUtil.isEmpty(companyIdList)) {
+            return;
+        }
+        String token = RequestContext.getToken();
+        String appKey = RequestContext.getAppKey();
+        String product = RequestContext.getProduct();
+        new Thread(() -> companyIdList.forEach(id -> {
+            try {
+                RequestContext.setAppKey(appKey);
+                RequestContext.setToken(token);
+                RequestContext.setProduct(product);
+                OrgUsrFormDto formDto = this.selectCompanyById(id);
+                if (!ValidationUtil.isEmpty(formDto) && OrgPersonEnum.公司.getKey().equals(formDto.getBizOrgType())) {
+                    emqKeeper.getMqttClient().publish(airportAddTopic, JSON.toJSONString(formDto).getBytes(), 2, false);
+                }
+            } catch (Exception e) {
+                logger.debug("syncCompany2Supervision error:", e.getMessage());
+                e.printStackTrace();
+            }
+        })).start();
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentAlarmController.java

@@ -94,6 +94,8 @@ public class EquipmentAlarmController extends AbstractBaseController {
                                   @RequestParam(value = "alarmType", required = false) String alarmType,
                                   @RequestParam(value = "type", required = false) String type,
                                   @RequestParam(value = "buildIds", required = false) List<String> buildIds,
+                                  @RequestParam(value = "id", required = false) String id,
+                                  @RequestParam(value = "cleanStatus", required = false) String cleanStatus,
                                   CommonPageable commonPageable) {
         if (commonPageable.getPageNumber() == 0) {
             commonPageable.setPageNumber(1);
@@ -139,6 +141,14 @@ public class EquipmentAlarmController extends AbstractBaseController {
         request9.setName("buildIds");
         request9.setValue(ObjectUtils.isEmpty(buildIds) ? null : buildIds);
         queryRequests.add(request9);
+        CommonRequest request10 = new CommonRequest();
+        request10.setName("id");
+        request10.setValue(StringUtil.isNotEmpty(id) ? StringUtils.trimToNull(id) : null);
+        queryRequests.add(request10);
+        CommonRequest request11 = new CommonRequest();
+        request11.setName("cleanStatus");
+        request11.setValue(StringUtil.isNotEmpty(cleanStatus) ? StringUtils.trimToNull(cleanStatus) : null);
+        queryRequests.add(request11);
         CommonPageInfoParam param = CommonPageParamUtil.fillCommonPageInfoParam(queryRequests, commonPageable);
         Page<Map<String, Object>> list = iEquipmentSpecificAlarmService.listPage(param);
         return CommonResponseUtil.success(list);
@@ -200,6 +210,8 @@ public class EquipmentAlarmController extends AbstractBaseController {
                                         @RequestParam(value = "systemCode", required = false) String systemCode,
                                         @RequestParam(value = "buildId", required = false) String buildId,
 //                                        @RequestParam(value = "equipmentCode", required = false) String equipmentCode,
+                                        @RequestParam(value = "id", required = false) String id,
+                                        @RequestParam(value = "cleanStatus", required = false) String cleanStatus,
                                         CommonPageable commonPageable) {
         List<CommonRequest> queryRequests = new ArrayList<>();
         CommonRequest request = new CommonRequest();
@@ -235,6 +247,14 @@ public class EquipmentAlarmController extends AbstractBaseController {
         request9.setName("buildId");
         request9.setValue(StringUtil.isNotEmpty(buildId) ? StringUtils.trimToNull(buildId) : null);
         queryRequests.add(request9);
+        CommonRequest request10 = new CommonRequest();
+        request10.setName("id");
+        request10.setValue(StringUtil.isNotEmpty(id) ? StringUtils.trimToNull(id) : null);
+        queryRequests.add(request10);
+        CommonRequest request11 = new CommonRequest();
+        request11.setName("cleanStatus");
+        request11.setValue(StringUtil.isNotEmpty(cleanStatus) ? StringUtils.trimToNull(cleanStatus) : null);
+        queryRequests.add(request11);
         CommonPageInfoParam param = CommonPageParamUtil.fillCommonPageInfoParam(queryRequests, commonPageable);
         org.springframework.data.domain.Page<AlarmListDataVO> list = iEquipmentSpecificAlarmService.listAlarmsPage(param);
         return CommonResponseUtil.success(list);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentSpecificController.java

@@ -35,6 +35,7 @@ import com.yeejoin.equipmanage.common.entity.vo.ComplementCodeVO;
 import com.yeejoin.equipmanage.common.entity.vo.SourceNameByEquipSpeIdVO;
 import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
 import com.yeejoin.equipmanage.common.vo.EquipmentOnCarVo;
+import com.yeejoin.equipmanage.common.vo.VideoOnEquipmentSpecificVo;
 import com.yeejoin.equipmanage.mapper.EquipmentSpecificMapper;
 import com.yeejoin.equipmanage.service.IEquipmentDetailService;
 import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
@@ -42,6 +43,19 @@ import com.yeejoin.equipmanage.service.impl.FireFightingSystemServiceImpl;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author ZeHua Li
@@ -159,8 +173,8 @@ public class EquipmentSpecificController extends AbstractBaseController {
     @RequestMapping(value = "/getOneCard", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "组装组态使用装备卡片数据")
-    public Object getOneCard(Long id , String type) {
-        return equipmentSpecificSerivce.getOneCard(id , type);
+    public Object getOneCard(Long id, String type) {
+        return equipmentSpecificSerivce.getOneCard(id, type);
     }
 
     /**
@@ -246,12 +260,13 @@ public class EquipmentSpecificController extends AbstractBaseController {
 
     /**
      * 根据specificId删除装备相关数据
+     *
      * @param specificId id
      * @return ResponseModel
      */
     @DeleteMapping(value = "/delEquipmentBySpecificId")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation( value = "删除装备相关所有数据", notes = "删除装备相关所有数据")
+    @ApiOperation(value = "删除装备相关所有数据", notes = "删除装备相关所有数据")
     public ResponseModel delEquipmentBySpecificId(@RequestParam Long specificId) {
         EquipmentSpecific equipmentSpecific = equipmentSpecificSerivce.getById(specificId);
         Boolean result = equipmentSpecificSerivce.delEquipmentSpecific(specificId);
@@ -268,22 +283,23 @@ public class EquipmentSpecificController extends AbstractBaseController {
             log.error("刷新装备分类树缓存失败" + e.getMessage());
         }
     }
-    
+
     /**
      * 根据specificIds删除装备相关数据
+     *
      * @param specificIds id
      * @return ResponseModel
      */
     @DeleteMapping(value = "/delAllEquipmentBySpecificIds")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation( value = "批量删除装备相关所有数据", notes = "批量删除装备相关所有数据")
+    @ApiOperation(value = "批量删除装备相关所有数据", notes = "批量删除装备相关所有数据")
     public ResponseModel delEquipmentBySpecificId(@RequestBody List<Long> specificIds) {
-    	if(ObjectUtils.isEmpty(specificIds)){
-    		 return CommonResponseUtil.failure("参数为空");
-    	}
-    	specificIds.forEach(specificId->{
-    		equipmentSpecificSerivce.delEquipmentBySpecificId(specificId);
-    	});
+        if (ObjectUtils.isEmpty(specificIds)) {
+            return CommonResponseUtil.failure("参数为空");
+        }
+        specificIds.forEach(specificId -> {
+            equipmentSpecificSerivce.delEquipmentBySpecificId(specificId);
+        });
         return CommonResponseUtil.success();
     }
 
@@ -293,4 +309,11 @@ public class EquipmentSpecificController extends AbstractBaseController {
     public ResponseModel getFessIndexDetails() {
         return CommonResponseUtil.success(equipmentSpecificSerivce.getFessIndexDetails());
     }
+
+    @RequestMapping(value = "/videoOnEquipmentSpecific", method = RequestMethod.POST)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "摄像头绑定设备", notes = "摄像头绑定设备")
+    public ResponseModel videoOnEquipmentSpecific(@RequestBody VideoOnEquipmentSpecificVo videoOnEquipmentSpecificVo) {
+        return CommonResponseUtil.success(equipmentSpecificSerivce.videoOnEquipmentSpecific(videoOnEquipmentSpecificVo));
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java

@@ -629,7 +629,7 @@ public class FireFightingSystemController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "按照组态格式获取系统报警，或者建筑报警列表", notes = "按照组态格式获取系统报警，或者建筑报警列表")
     @GetMapping(value = "/getEquipmentAlarmBySystemIdOrSourceIdVO/{Systemtype}/{id}")
-    public IPage<EquipmentAlarmBySystemIdOrSourceIdVO> getEquipmentAlarmBySystemIdOrSourceIdVO(int pageSize, int current, Integer confirmType, String createDate, String type, @PathVariable String Systemtype, @PathVariable Long id) {
+    public IPage<EquipmentAlarmBySystemIdOrSourceIdVO> getEquipmentAlarmBySystemIdOrSourceIdVO(Integer pageSize, Integer current, Integer confirmType, String createDate, String type, @PathVariable String Systemtype, @PathVariable Long id) {
         Page<EquipmentAlarmBySystemIdOrSourceIdVO> page = new Page();
         page.setCurrent(current);
         page.setSize(pageSize);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/IndustryController.java

@@ -9,9 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import java.util.List;
 
+
 @RestController
 @Api(tags = "行业分类Industry")
 @RequestMapping(value = "/industry")
@@ -19,8 +19,8 @@ public class IndustryController {
     @Autowired
     IIndustryService industryService;
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/list")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     public List<Industry> listAll() {
         return industryService.list();
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificMapper.java

@@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.equipmanage.common.datasync.entity.FireEquipment;
 import com.yeejoin.equipmanage.common.dto.EquipmentSpecificDto;
 import com.yeejoin.equipmanage.common.dto.UserDto;
-import com.yeejoin.equipmanage.common.entity.EquipmentCategory;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
-import com.yeejoin.equipmanage.common.entity.MaintenanceResourceData;
+import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.entity.dto.EquipmentSpecificDTO;
 import com.yeejoin.equipmanage.common.entity.vo.ComplementCodeVO;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentSpecificVo;
@@ -201,9 +198,13 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
      */
     List<Map<String, String>> getBoxTropicsIndexDetails();
 
+
     /**
      * 统计数据
      * @return
      */
     List<Map<String, Object>> queryCompanyStaData();
+
+    String getEquipmentBySpecificId(@Param("specificId") Long specificId);
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/VideoEquipmentSpecificMapper.java

@@ -3,6 +3,9 @@ package com.yeejoin.equipmanage.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.equipmanage.common.entity.VideoEquipmentSpecific;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @author ZeHua Li
@@ -11,4 +14,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface VideoEquipmentSpecificMapper extends BaseMapper<VideoEquipmentSpecific> {
+    List<VideoEquipmentSpecific> findBySpecificIdAndVideoIdIn(@Param("equipmentSpecificId") Long equipmentSpecificId, @Param("list") List<Long> videoIdList);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEquipmentSpecificSerivce.java

 package com.yeejoin.equipmanage.service;
 
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -16,14 +12,13 @@ import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
 import com.yeejoin.equipmanage.common.entity.dto.EquipmentSpecificDTO;
 import com.yeejoin.equipmanage.common.entity.vo.ComplementCodeVO;
-import com.yeejoin.equipmanage.common.entity.vo.DetailPaneVO;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentSpecificVo;
 import com.yeejoin.equipmanage.common.entity.vo.SourceNameByEquipSpeIdVO;
-import com.yeejoin.equipmanage.common.vo.EquipFor3DVO;
-import com.yeejoin.equipmanage.common.vo.EquipmentDate;
-import com.yeejoin.equipmanage.common.vo.EquipmentDetailVo;
-import com.yeejoin.equipmanage.common.vo.EquipmentOnCarVo;
-import com.yeejoin.equipmanage.common.vo.EquipmentSpecific3dVo;
+import com.yeejoin.equipmanage.common.vo.*;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author ZeHua Li
@@ -168,35 +163,47 @@ public interface IEquipmentSpecificSerivce extends IService<EquipmentSpecific> {
 
     /**
      * 根据specificId删除相关数据
+     *
      * @param specificId specificId
      * @return Boolean
      */
     Boolean delEquipmentBySpecificId(Long specificId);
-    
-	  /**
-	  * 集成页面刷新，发送数据时调用
-	  * @param systemTypeCode
-	  */
-      void integrationPageSysDataRefresh(String systemTypeCode);
-      
-      /**
-       * 更新设备表实时指标状态
-       * @param indexs
-       */
-      void updateEquipmentSpecIndexRealtimeData(List<EquipmentSpecificIndex> indexs);
-    
-   
-    
+
+    /**
+     * 集成页面刷新，发送数据时调用
+     *
+     * @param systemTypeCode
+     */
+    void integrationPageSysDataRefresh(String systemTypeCode);
+
+    /**
+     * 更新设备表实时指标状态
+     *
+     * @param indexs
+     */
+    void updateEquipmentSpecIndexRealtimeData(List<EquipmentSpecificIndex> indexs);
+
+
     List<EquipmentSpecificVo> getEquipAndCarIotcodeByIotcode(String iotCode);
 
     /**
      * 获取中州环境监测指标详情
+     *
      * @return
      */
     Map<String, List<Map<String, String>>> getFessIndexDetails();
 
     /**
+
      * 更新redis 统计数据
      */
     void refreshStaData();
+
+    /* 设备绑定摄像头
+     *
+     * @param videoOnEquipmentSpecificVo
+     * @return
+     */
+    Boolean videoOnEquipmentSpecific(VideoOnEquipmentSpecificVo videoOnEquipmentSpecificVo);
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IVideoEquipmentSpecificService.java

@@ -3,10 +3,19 @@ package com.yeejoin.equipmanage.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.equipmanage.common.entity.VideoEquipmentSpecific;
 
+import java.util.List;
+
 /**
  * @author ZeHua Li
  * @date 2020/11/23 15:42
  * @since v2.0
  */
 public interface IVideoEquipmentSpecificService extends IService<VideoEquipmentSpecific> {
+    /**
+     * 获取设备或摄像头ID绑定集合
+     * @param equipmentSpecificId
+     * @param videoIdList
+     * @return
+     */
+    List<VideoEquipmentSpecific> findBySpecificIdAndVideoIdIn(Long equipmentSpecificId, List<Long> videoIdList);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java

@@ -126,6 +126,8 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
 
     @Autowired
     private JCSRemoteService jcsRemoteService;
+    @Value("${window.vedioFormat}")
+    private String vedioFormat;
 
     @Autowired
     private SourceSceneMapper sourceSceneMapper;
@@ -780,6 +782,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
                         x.setLocation(x.getAddress());
                     }
                 }
+                x.setVedioFormat(vedioFormat);
                 x.setUrl(videoService.getVideoUrl(x.getName(), x.getPresetPosition(), x.getUrl(), x.getCode()));
             });
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/CarServiceImpl.java

@@ -1164,7 +1164,11 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
             carInfoVo.setEquipmentName(equipment != null ? equipment.getName() : "");
             carInfoVo.setCategoryId(equipment != null ? equipment.getCategoryId() : null);
             carInfoVo.setCategoryName(categoryMap.get(carInfoVo.getCategoryId()));
-            if (car.getImg() != null) {
+
+
+            carInfoVo.setName(car.getName()+"("+car.getCarNum()+")");
+            if (car.getImg() != null){
+
                 List<String> img = new ArrayList<>();
                 img.add(car.getImg().get(0).getUrl());
                 carInfoVo.setImage(img);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ConfirmAlarmServiceImpl.java

@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.dto.IotSystemAlarmRo;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -11,16 +12,22 @@ import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarm;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog;
 import com.yeejoin.equipmanage.common.entity.vo.AlamVideoVO;
+import com.yeejoin.equipmanage.common.enums.AlarmCleanTypeEnum;
+import com.yeejoin.equipmanage.common.enums.AlarmStatusEnum;
 import com.yeejoin.equipmanage.common.enums.AlarmTypeEnum;
 import com.yeejoin.equipmanage.common.enums.TopicEnum;
+import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.fegin.JcsFeign;
 import com.yeejoin.equipmanage.mapper.ConfirmAlarmMapper;
+import com.yeejoin.equipmanage.mapper.EquipmentSpecificAlarmMapper;
+import com.yeejoin.equipmanage.mapper.EquipmentSpecificMapper;
 import com.yeejoin.equipmanage.mapper.VideoMapper;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
 import com.yeejoin.equipmanage.remote.WebMqttHandler;
 import com.yeejoin.equipmanage.service.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -28,6 +35,7 @@ import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -74,9 +82,20 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
     @Value("${systemctl.jcs.switch}")
     private Boolean jcsSwitch;
 
+    @Value("${window.vedioFormat}")
+    String vedioFormat;
+
     @Autowired
     private RuleConfirmAlarmService ruleConfirmAlamService;
 
+    @Autowired
+    private EquipmentSpecificMapper equipmentSpecificMapper;
+
+    @Autowired
+    private EquipmentSpecificAlarmMapper equipmentSpecificAlarmMapper;
+
+
+
     @Override
     public Map<String, Object> getDetailsById(Long alarmId, Long equipId, String type, String area) {
         final String videoType = "video";
@@ -85,6 +104,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
         if (videoType.equals(type)) {
             List<AlamVideoVO> video = videoMapper.getVideoBySpeId(equipId);
             video.forEach(action -> {
+                action.setVedioFormat(vedioFormat);
                 action.setUrl(videoService.getVideoUrl(action.getName(), action.getPresetPosition(), action.getUrl(), action.getCode()));
             });
             res.put("video", video);
@@ -103,6 +123,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
         }
 
         videoBySpeId.forEach(action -> {
+            action.setVedioFormat(vedioFormat);
             action.setUrl(videoService.getVideoUrl(action.getName(), action.getPresetPosition(), action.getUrl(), action.getCode()));
         });
         res.put("data", specificAlarm);
@@ -122,6 +143,27 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
             if (!ObjectUtils.isEmpty(alarmLog)) {
                 Long equipmentSpecificAlarmId = alarmLog.getEquipmentSpecificAlarmId();
                 ent.setEquipmentSpecificAlarmId(equipmentSpecificAlarmId);
+                String cleanType = equipmentSpecificMapper.getEquipmentBySpecificId(alarmLog.getEquipmentSpecificId());
+                if (StringUtil.isNotEmpty(cleanType) && AlarmCleanTypeEnum.QRXC.getCode().equals(cleanType)) {
+                    EquipmentSpecificAlarm alarm = equipmentSpecificAlarmMapper.selectById(alarmLog.getEquipmentSpecificAlarmId());
+                    alarm.setStatus(AlarmStatusEnum.HF.getCode());
+                    equipmentSpecificAlarmMapper.updateById(alarm);
+                    if (isBatch == 1) {
+                        List<EquipmentSpecificAlarmLog> logs = equipmentSpecificAlarmLogService.getIsConfirmByAlarmId(equipmentSpecificAlarmId, "0");
+                        logs = logs.stream().map(x -> {
+                            BeanUtils.copyProperties(ent, x);
+                            x.setCleanTime(new Date());
+                            x.setStatus(AlarmStatusEnum.HF.getCode());
+                            return x;
+                        }).collect(Collectors.toList());
+                        equipmentSpecificAlarmLogService.updateBatchById(logs);
+                    } else {
+                        ent.setCleanTime(new Date());
+                        ent.setStatus(AlarmStatusEnum.HF.getCode());
+                        equipmentSpecificAlarmLogService.updateById(ent);
+                    }
+                    return;
+                }
                 //  如果是批量确警，先查询，再确警，用于批量消息推送
                 isBatch = ent.getIsBatch();
                 if (isBatch == 1) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentDetailServiceImpl.java

@@ -126,7 +126,7 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
         equipmentDetail.setEquPropertyList(equPropertyList);
         ManufacturerInfo manufacturerInfo = manufacturerInfoMapper.selectById(equipmentDetail.getManufacturerId());
         if (manufacturerInfo != null) {
-            manufacturerInfo.setImg(fileServer + manufacturerInfo.getImg());
+            manufacturerInfo.setImg(manufacturerInfo.getImg());
         }
         equipmentDetail.setManufacturerInfo(manufacturerInfo);
         equipmentDetail.setImg(getEquipFileList(id, FileTypeEnum.image.toString()));

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentServiceImpl.java

@@ -126,8 +126,6 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
 
     @Override
     public boolean addEquipmentDef(Equipment equipment) throws IllegalArgumentException {
-        try {
-
             // 查询装备定义名陈是否重复
             nameDuplicate(equipment);
             // 设置code属性
@@ -138,19 +136,20 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
                 equipment.setCode(code);
             }
             int num = equipmentMapper.insert(equipment);
+
 //            saveEquipmentQRCodes(equipment);
             JSONObject equipRuleParams = new JSONObject();
             equipRuleParams.put("name", equipment.getName());
             equipRuleParams.put("inspectionSpecId", equipment.getInspectionSpec());
-            patrolFeign.getEquipDetail(equipRuleParams.toJSONString());
+            try {
+                patrolFeign.getEquipDetail(equipRuleParams.toJSONString());
+            } catch (Exception e) {
+                log.error("新增装备定义操作中，检测到巡检服务未启动或启动出错！");
+            }
             if (num > 0) {
                 return true;
             }
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new RuntimeException("录入的装备名称重复！");
-        }
-        return false;
+            return false;
     }
 
 //    public void saveEquipmentQRCodes(Equipment equipment) {
@@ -232,7 +231,11 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
             JSONObject equipRuleParams = new JSONObject();
             equipRuleParams.put("name", equipment1.getName());
             equipRuleParams.put("inspectionSpecId", equipment1.getInspectionSpec());
-            patrolFeign.getEquipDetail(equipRuleParams.toJSONString());
+            try {
+                patrolFeign.getEquipDetail(equipRuleParams.toJSONString());
+            } catch (Exception e) {
+                log.error("编辑装备定义操作中，检测到巡检服务未启动或启动出错！");
+            }
             if (savedEquipment > 0) {
                 return true;
             }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmServiceImpl.java

@@ -208,10 +208,13 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
                         || AlarmTypeEnum.PB.getCode().equals(type)) {
                     dataVO.setAlarmType(AlarmTypeEnum.getTypeByCode(String.valueOf(type)));
                 }
+                dataVO.setType(String.valueOf(x.get("type")));
                 dataVO.setAlarmInfo(x.get("fireEquipmentName") + dataVO.getAlarmType());
                 dataVO.setEquipSpeId(Long.valueOf(String.valueOf(x.get("fireEquipmentId"))));
                 dataVO.setAlarmId(Long.valueOf(String.valueOf(x.get("alarmId"))));
                 dataVO.setAlarmTypeCode(String.valueOf(x.get("fireEquipmentSpecificIndexKey")));
+                dataVO.setCleanStatus(String.valueOf(x.get("cleanStatus")));
+                dataVO.setCleanStatusVal(String.valueOf(x.get("cleanStatusVal")));
                 res.add(dataVO);
             });
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -115,6 +115,8 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
 
     @Autowired
     private ICarService carService;
+    @Autowired
+    private IVideoEquipmentSpecificService videoEquipmentSpecificService;
 
     @Value("${systemctl.dict.iot-core-param}")
     private String iotCoreParam;
@@ -1604,4 +1606,33 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
         return SourcesStatisticsImpl.PREFIX_CATEGORY_COUNT + row.get("bizOrgCode").toString() + "_" + SourceTypeEnum.EQUIPMENT.getCode() + "_" + row.get("categoryCode").toString();
     }
 
+    public Boolean videoOnEquipmentSpecific(VideoOnEquipmentSpecificVo videoOnEquipmentSpecificVo) {
+        Long equipmentSpecificId = videoOnEquipmentSpecificVo.getEquipmentSpecificId();
+        List<Long> videoIdList = videoOnEquipmentSpecificVo.getVideoIdList();
+        if (equipmentSpecificId != null) {
+            EquipmentSpecific equipmentSpecific = this.baseMapper.selectById(equipmentSpecificId);
+            if (!ObjectUtils.isEmpty(equipmentSpecific)) {
+                QueryWrapper<VideoEquipmentSpecific> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("equipment_specific_id", equipmentSpecificId);
+                boolean remove = videoEquipmentSpecificService.remove(queryWrapper);
+                if (remove) {
+                    List<VideoEquipmentSpecific> videoSpecificList = new ArrayList<>();
+                    videoIdList.parallelStream().forEach(x -> {
+                        VideoEquipmentSpecific videoEquipmentSpecific = new VideoEquipmentSpecific();
+                        videoEquipmentSpecific.setVideoId(x);
+                        videoEquipmentSpecific.setEquipmentSpecificId(equipmentSpecificId);
+                        videoSpecificList.add(videoEquipmentSpecific);
+                    });
+                    videoEquipmentSpecificService.saveBatch(videoSpecificList);
+                    return Boolean.TRUE;
+                } else {
+                    throw new RuntimeException("移除设备摄像头绑定关系失败！");
+                }
+            } else {
+                throw new RuntimeException("未获取到此设备！");
+            }
+        } else {
+            throw new RuntimeException("设备ID为空！");
+        }
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MaintenanceResourceServiceImpl.java

@@ -179,8 +179,8 @@ public class MaintenanceResourceServiceImpl extends ServiceImpl<MaintenanceResou
     public List<MaintenanceResourceDto> findTreeById(Long id) {
         List<MaintenanceResourceDto> list = maintenanceResourceMapper.findTreeById(id);
         if (!CollectionUtils.isEmpty(list)) {
-            List<MaintenanceResourceDto> dtoList = TreeNodeUtil.assembleTreeNotFilter(list);
-            List<MaintenanceResourceDto> collect = dtoList.stream().filter(x -> !MaintenanceResourceEnum.CLASSIFY.getValue().equals(x.getType())).collect(Collectors.toList());
+            List<MaintenanceResourceDto> dtoList = TreeNodeUtil.assembleTreeNotFilter(list);//&& x.getId().equals(Long.toString(id)) 这一段用于生成树之后并没有把树子节点数据从list列表删除造成的脏数据的问题 by chenhao 2022-01-12
+            List<MaintenanceResourceDto> collect = dtoList.stream().filter(x -> !MaintenanceResourceEnum.CLASSIFY.getValue().equals(x.getType()) && x.getId().equals(Long.toString(id))).collect(Collectors.toList());
             return collect;
         }
         return Lists.newArrayList();

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/VideoEquipmentSpecificImpl.java

@@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.equipmanage.common.entity.VideoEquipmentSpecific;
 import com.yeejoin.equipmanage.mapper.VideoEquipmentSpecificMapper;
 import com.yeejoin.equipmanage.service.IVideoEquipmentSpecificService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author ZeHua Li
  * @date 2020/11/23 15:43
@@ -13,4 +16,11 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class VideoEquipmentSpecificImpl extends ServiceImpl<VideoEquipmentSpecificMapper,VideoEquipmentSpecific> implements IVideoEquipmentSpecificService {
+
+    @Autowired
+    private VideoEquipmentSpecificMapper videoEquipmentSpecificMapper;
+    @Override
+    public List<VideoEquipmentSpecific> findBySpecificIdAndVideoIdIn(Long equipmentSpecificId, List<Long> videoIdList) {
+        return videoEquipmentSpecificMapper.findBySpecificIdAndVideoIdIn(equipmentSpecificId, videoIdList);
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/VideoServiceImpl.java

@@ -67,8 +67,8 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
     @Value("${equip.security.code}")
     String securityMonitorCode;
 
-    @Value("${param.isUseVideoTranscoding}")
-    String isUseVideoTranscoding;
+    @Value("${window.vedioFormat}")
+    String vedioFormat;
 
     @Autowired
     VideoMapper videoMapper;
@@ -501,7 +501,7 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
 
     @Override
     public String getVideoUrl(String videoId, String presetIndex, String defaultUrl, String code) {
-        if ("off".equals(isUseVideoTranscoding)) {
+        if ("hls".equals(vedioFormat)) {
             String url = getVideoUrl(code);
             return ObjectUtils.isEmpty(url) ? defaultUrl : url;
         }

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

@@ -121,7 +121,11 @@ public class AircraftServiceImpl extends BaseService<AircraftDto, Aircraft, Airc
         String aircraft = "";
         List<AlertFormValue> list1 =  list.stream().filter(formValue -> formValue.getFieldCode().equals("aircraft") || formValue.getFieldCode().equals("aircraftModel")).collect(Collectors.toList());
         if(list1.size() > 0) {
-            aircraft = list1.get(0).getFieldValueCode();
+            if(!ValidationUtil.isEmpty(list1.get(0).getFieldValue())) {
+                aircraft = list1.get(0).getFieldValue();
+            } else {
+                aircraft = list1.get(0).getFieldValueCode();
+            }
         }
 
         LambdaQueryWrapper<Aircraft> queryWrapper = new LambdaQueryWrapper<>();

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

@@ -640,11 +640,19 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 			/*
 			 * if(null == valueCode) { valueCode = alertFormValue.getFieldValue(); }
 			 */
-//			if("flightNumber".equals(alertFormValue.getFieldCode()) || "aircraftModel".equals(alertFormValue.getFieldCode())) {
-//				listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(), alertFormValue.getFieldValueCode()));
-//			} else  {
-				listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(), valueCode));
-//			}
+			if("flightNumber".equals(alertFormValue.getFieldCode())) {
+				listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(),  alertFormValue.getFieldValueCode()));
+			} else {
+				if( "aircraftModel".equals(alertFormValue.getFieldCode())) {
+					if(ValidationUtil.isEmpty(valueCode)) {
+						listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(), alertFormValue.getFieldValueCode()));
+					} else {
+						listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(), valueCode));
+					}
+				} else  {
+					listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(), valueCode));
+				}
+			}
 		});
 		map.put("data", listdate);
 

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
+
+import java.util.*;
+import java.util.stream.Collectors;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.common.api.entity.DutyShift;
+import com.yeejoin.amos.boot.module.common.api.mapper.DutyPersonShiftMapper;
+import com.yeejoin.amos.boot.module.common.api.mapper.DutyShiftMapper;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.eclipse.paho.client.mqttv3.MqttException;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.typroject.tyboot.component.emq.EmqKeeper;
+import org.typroject.tyboot.core.foundation.exception.BaseException;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -7,14 +30,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.FireBrigadeResourceDto;
-import com.yeejoin.amos.boot.module.common.api.entity.DutyShift;
 import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
-import com.yeejoin.amos.boot.module.common.api.mapper.DutyPersonShiftMapper;
-import com.yeejoin.amos.boot.module.common.api.mapper.DutyShiftMapper;
 import com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.DutyCarServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FireTeamServiceImpl;
@@ -27,24 +46,7 @@ import com.yeejoin.amos.boot.module.jcs.api.enums.FireCarStatusEnum;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferService;
 import com.yeejoin.amos.component.rule.config.RuleConfig;
-import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.eclipse.paho.client.mqttv3.MqttException;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-import org.typroject.tyboot.component.emq.EmqKeeper;
-import org.typroject.tyboot.core.foundation.exception.BaseException;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 力量调派 服务实现类
@@ -517,10 +519,10 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
             responseLevel = list1.get(0).getFieldValue();
         }
 
-        definitions.put("rescueGrid", alertCalled.getAddress());
+        definitions.put("rescueGrid", ValidationUtil.isEmpty(alertCalled.getAddress() ) ? "" : alertCalled.getAddress());
         definitions.put("type", alertCalled.getAlertType());
-        definitions.put("contactUser", alertCalled.getContactUser());
-        definitions.put("contactPhone", alertCalled.getContactPhone());
+        definitions.put("contactUser", ValidationUtil.isEmpty(alertCalled.getContactUser() ) ? "" : alertCalled.getContactUser());
+        definitions.put("contactPhone", ValidationUtil.isEmpty(alertCalled.getContactPhone() ) ? "" : alertCalled.getContactPhone());
         definitions.put("replaceContent", replaceContent);
         definitions.put("responseLevel", responseLevel);
         definitions.put("callTime",
@@ -839,13 +841,13 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
         double agentCountAll = totalCarList.stream().mapToDouble(
                 car -> car.get("resourceList") != null ? ((List<Map<String, Object>>) car.get("resourceList")).stream()
                         .filter(res -> equipType.equals(res.get("equipType")))
-                        .mapToDouble(c -> (double) c.get("equipCount")).sum() : 0)
+                        .mapToDouble(c -> Double.parseDouble(ValidationUtil.isEmpty(c.get("equipCount") ) ? "0" : c.get("equipCount").toString())).sum() : 0)
                 .sum();
 
         double agentCountArrived = arrivedCarList.stream().mapToDouble(
                 car -> car.get("resourceList") != null ? ((List<Map<String, Object>>) car.get("resourceList")).stream()
                         .filter(res -> equipType.equals(res.get("equipType")))
-                        .mapToDouble(c -> (double) c.get("equipCount")).sum() : 0)
+                        .mapToDouble(c -> Double.parseDouble(ValidationUtil.isEmpty(c.get("equipCount") ) ? "0" : c.get("equipCount").toString())).sum() : 0)
                 .sum();
 
         JSONObject jsonObject = new JSONObject();

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

 package com.yeejoin.amos.latentdanger.business.feign;
 
 import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
+import com.yeejoin.amos.boot.module.common.api.dto.CompanyPerson;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -10,6 +11,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.util.List;
+
 /**
  * 机场服务feign
  *
@@ -28,8 +31,15 @@ public interface JcsFeignClient {
 
     /**
      * 查询用户单位信息
+     *
      * @return ResponseModel<ReginParams.PersonIdentity>
      */
     @GetMapping(value = "/org-usr/getLoginUserDetails")
     FeignClientResult getJcsUser();
+
+    /**
+     * 根据id获取单位人员列表
+     */
+    @GetMapping(value = "/company/{ids}/person")
+    FeignClientResult<List<CompanyPerson>> selectCompanyPerson(@PathVariable List<Long> ids);
 }

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

 package com.yeejoin.amos.latentdanger.business.service.impl;
 
+import com.google.common.collect.Sets;
 import com.yeejoin.amos.boot.biz.common.constants.RuleConstant;
+import com.yeejoin.amos.boot.module.common.api.dto.CompanyPerson;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.rule.RuleTrigger;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import com.yeejoin.amos.latentdanger.business.dto.LatentDangerRo;
+import com.yeejoin.amos.latentdanger.business.feign.JcsFeignClient;
 import com.yeejoin.amos.latentdanger.business.util.DateUtil;
 import com.yeejoin.amos.latentdanger.common.enums.LatentDangerState;
 import com.yeejoin.amos.latentdanger.dao.entity.LatentDanger;
@@ -14,11 +20,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @Author: xl
@@ -33,6 +39,8 @@ public class RuleDangerService {
 
     @Autowired
     private RuleTrigger ruleTrigger;
+    @Autowired
+    private JcsFeignClient jcsFeignClient;
 
     public Boolean addLatentDangerRule(LatentDanger latentDanger, String ruleType, String roleName) throws Exception {
         LatentDangerRo latentDangerRo = buildLatentDangerRo(latentDanger, ruleType);
@@ -40,7 +48,27 @@ public class RuleDangerService {
         List<RoleModel> result = Privilege.roleClient.queryRoleList(roleName, null).getResult();
         if (result.size() > 0) {
             List<AgencyUserModel> userModels = Privilege.agencyUserClient.queryByRoleId(String.valueOf(result.get(0).getSequenceNbr()), null).getResult();
-            List<String> userIds = userModels.stream().map(AgencyUserModel::getUserId).collect(Collectors.toList());
+
+            //只发送给本部门的人员
+            Long pointId = latentDanger.getBizInfo().getLong("pointId");
+            if (pointId == null || pointId == 0) {
+                return false;
+            }
+            FeignClientResult<List<CompanyPerson>> companyPersons = jcsFeignClient.selectCompanyPerson(Collections.singletonList(pointId));
+            if (companyPersons.getStatus() != 200) {
+                return false;
+            }
+            //本部门的人员列表
+            List<CompanyPerson> personList = companyPersons.getResult();
+            List<OrgUsrDto> OrgUsrDtos = new ArrayList<>();
+            personList.forEach(companyPerson -> OrgUsrDtos.addAll(companyPerson.getPersons()));
+            //角色人员列表与本部门的人员列表取交集
+            List<AgencyUserModel> userModelList = userModels.stream().filter(
+                    agencyUserModel -> OrgUsrDtos.stream().anyMatch(
+                            orgUsrDto -> agencyUserModel.getUserId().equals(orgUsrDto.getAmosOrgId())
+                    )
+            ).collect(Collectors.toList());
+            List<String> userIds = userModelList.stream().map(AgencyUserModel::getUserId).collect(Collectors.toList());
             latentDangerRo.setRecivers(userIds);
         }
         //触发规则
@@ -64,7 +92,7 @@ public class RuleDangerService {
         return true;
     }
 
-    private LatentDangerRo buildLatentDangerRo (LatentDanger latentDanger, String ruleType){
+    private LatentDangerRo buildLatentDangerRo(LatentDanger latentDanger, String ruleType) {
         LatentDangerRo latentDangerRo = new LatentDangerRo();
         BeanUtils.copyProperties(latentDanger, latentDangerRo);
         latentDangerRo.setMsgType(msgType);
@@ -86,7 +114,7 @@ public class RuleDangerService {
             }
         }
 
-        if (!ValidationUtil.isEmpty(type)){
+        if (!ValidationUtil.isEmpty(type)) {
             Map<String, String> map = new HashMap<>();
             map.put("type", type);
             map.put("id", String.valueOf(latentDanger.getId()));

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

@@ -586,4 +586,16 @@ public class CheckController extends AbstractBaseController {
         return CommonResponseUtil.success(page);
     }
 
+    /**
+     * 根据检查记录查询照片
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "根据检查记录查询照片", notes = "根据检查记录查询照片")
+    @RequestMapping(value = "/getPictureByCheckId", method = RequestMethod.GET)
+    public CommonResponse getPictureByCheckId(@ApiParam(value = "检查记录ID") @RequestParam String checkId,
+                                              @ApiParam(value = "检查项ID") @RequestParam String id
+    ) {
+        List<String> pictures = checkService.getPictureByCheckId(checkId,id);
+        return CommonResponseUtil.success(pictures);
+    }
 }

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

@@ -8,6 +8,7 @@ import com.yeejoin.amos.supervision.business.vo.CheckInfoVo;
 import com.yeejoin.amos.supervision.business.vo.CheckVo;
 import com.yeejoin.amos.supervision.core.common.response.PointCheckInfoBusinessRespone;
 import com.yeejoin.amos.supervision.core.common.response.PointCheckInfoRespone;
+import com.yeejoin.amos.supervision.dao.entity.Check;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.HashMap;
@@ -295,4 +296,14 @@ public interface CheckMapper extends BaseMapper {
     long queryPageCount(CheckPageParam param);
 
     List<CheckVo> queryPage(CheckPageParam param);
+
+    /**
+     * 根据任务id获取相关检查记录
+     *
+     * @param id
+     * @return
+     */
+    List<Check> getCheckListByTaskId(@Param(value = "planTaskId") long id);
+
+    List<String> getPictureByCheckId(String checkId,String id);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/feign/JCSFeignClient.java

 package com.yeejoin.amos.supervision.business.feign;
 
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.supervision.business.dto.OrgUsrFormDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -54,4 +55,13 @@ public interface JCSFeignClient {
      */
     @RequestMapping(value = "jcs/org-usr/getUnit/{id}", method = RequestMethod.GET)
     FeignClientResult<Map<String, Object>> getCompanyById(@PathVariable("id") String companyId);
+
+    /**
+     * 根据机场单位id获取单位人员列表
+     *
+     * @param companyId 机场单位id
+     * @return
+     */
+    @RequestMapping(value = "jcs/org-usr/{companyId}/person/list", method = RequestMethod.GET)
+    FeignClientResult<List<OrgUsrFormDto>> getPersonListByCompanyId(@PathVariable("companyId") String companyId);
 }

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

@@ -41,17 +41,18 @@ import org.springframework.beans.BeanUtils;
 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.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.text.ParseException;
 import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -160,36 +161,45 @@ public class CheckReportServiceImpl extends BaseService<CheckReportDto, CheckRep
             // 获取隐患信息
             Map<String, String> dangerParamMap = Maps.newHashMap();
             // 本次隐患id
-            List<String> dangerIdList = Arrays.asList(checkReportDto.getDangerIds().split(","));
+            List<String> dangerIdList = Lists.newArrayList();
+            if (!ValidationUtil.isEmpty(checkReportDto.getDangerIds())) {
+                dangerIdList = Arrays.asList(checkReportDto.getDangerIds().split(","));
+            }
             // 复核隐患id
-            List<String> reviewDangerIdList = Arrays.asList(checkReportDto.getReviewDangerIds().split(","));
+            List<String> reviewDangerIdList = Lists.newArrayList();
+            if (!ValidationUtil.isEmpty(checkReportDto.getReviewDangerIds())) {
+                reviewDangerIdList = Arrays.asList(checkReportDto.getReviewDangerIds().split(","));
+            }
             Set<String> allDangerIdSet = Sets.newHashSet();
             allDangerIdSet.addAll(dangerIdList);
             allDangerIdSet.addAll(reviewDangerIdList);
-            dangerParamMap.put("dangerIds", Joiner.on(",").join(allDangerIdSet));
-            List<DangerDto> dangerDtoList = dangerFeignClient.listAll(dangerParamMap).getResult();
-            List<CheckReportDangerDto> dangerList = Lists.newArrayList();
-            List<CheckReportDangerDto> reviewDangerList = Lists.newArrayList();
-            if (!ValidationUtil.isEmpty(dangerDtoList)) {
-                dangerDtoList.forEach(dangerDto -> {
-                    CheckReportDangerDto checkReportDangerDto = new CheckReportDangerDto();
-                    BeanUtils.copyProperties(dangerDto, checkReportDangerDto);
-                    Map<String, String> bizInfo = dangerDto.getBizInfo();
-                    checkReportDangerDto.setCompanyId(bizInfo.get("pointId"));
-                    checkReportDangerDto.setCompanyName(bizInfo.get("pointName"));
-
-                    if (dangerIdList.contains(dangerDto.getId().toString())) {
-                        dangerList.add(checkReportDangerDto);
-                    }
-                    if (reviewDangerIdList.contains(dangerDto.getId().toString())) {
-                        checkReportDangerDto.setReviewUser(dangerDto.getExecuteUserName());
-                        reviewDangerList.add(checkReportDangerDto);
-                    }
-                });
+            if (!ValidationUtil.isEmpty(allDangerIdSet)) {
+                dangerParamMap.put("dangerIds", Joiner.on(",").join(allDangerIdSet));
+                List<DangerDto> dangerDtoList = dangerFeignClient.listAll(dangerParamMap).getResult();
+                List<CheckReportDangerDto> dangerList = Lists.newArrayList();
+                List<CheckReportDangerDto> reviewDangerList = Lists.newArrayList();
+                if (!ValidationUtil.isEmpty(dangerDtoList)) {
+                    List<String> finalDangerIdList = dangerIdList;
+                    List<String> finalReviewDangerIdList = reviewDangerIdList;
+                    dangerDtoList.forEach(dangerDto -> {
+                        CheckReportDangerDto checkReportDangerDto = new CheckReportDangerDto();
+                        BeanUtils.copyProperties(dangerDto, checkReportDangerDto);
+                        Map<String, String> bizInfo = dangerDto.getBizInfo();
+                        checkReportDangerDto.setCompanyId(bizInfo.get("pointId"));
+                        checkReportDangerDto.setCompanyName(bizInfo.get("pointName"));
+
+                        if (finalDangerIdList.contains(dangerDto.getId().toString())) {
+                            dangerList.add(checkReportDangerDto);
+                        }
+                        if (finalReviewDangerIdList.contains(dangerDto.getId().toString())) {
+                            checkReportDangerDto.setReviewUser(dangerDto.getExecuteUserName());
+                            reviewDangerList.add(checkReportDangerDto);
+                        }
+                    });
+                }
+                checkReportDto.setCheckDangerList(dangerList);
+                checkReportDto.setReviewDangerList(reviewDangerList);
             }
-
-            checkReportDto.setCheckDangerList(dangerList);
-            checkReportDto.setReviewDangerList(reviewDangerList);
         }
         return checkReportDto;
     }

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

@@ -1577,8 +1577,8 @@ public class CheckServiceImpl implements ICheckService {
 
             Plan plan = planService.queryPlanById(planTask.getPlanId());
             // 计划完成，规则推送消息
-            if (PlanStatusEnum.COMPLETED.getValue() == plan.getStatus()){
-                rulePlanService.addPlanRule(plan, null, RuleTypeEnum.计划完成);
+            if (PlanStatusEnum.COMPLETED.getValue() == plan.getStatus()) {
+                rulePlanService.addPlanRule(plan, null, RuleTypeEnum.计划完成, null);
             }
 
             // p_plan_task_detail更新隐患个数
@@ -1685,5 +1685,8 @@ public class CheckServiceImpl implements ICheckService {
         return result;
     }
 
-
+    @Override
+    public List<String> getPictureByCheckId(String checkId, String id) {
+        return checkMapper.getPictureByCheckId(checkId,id);
+    }
 }

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

@@ -38,6 +38,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
@@ -207,14 +208,15 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
             //组织业务基本数据 对应bizInfo
             HiddenDangerDto hiddenDangerDto = new HiddenDangerDto();
             hiddenDangerDto.setPlanId(planId);
-            hiddenDangerDto.setPointId(pointArray.length > 1 ? Long.parseLong(pointArray[1]) : null);
+            hiddenDangerDto.setPointId(pointArray.length > 1 ? Long.parseLong(StringUtils.trimAllWhitespace(pointArray[1])) : null);
+            hiddenDangerDto.setPointName(pointArray.length > 1 ? pointArray[0] : null);
             hiddenDangerDto.setCheckInputId(seq);
             hiddenDangerDto.setDangerType(DangerHandleTypeEnum.SELF.getCode());
             try {
                 dangerDto.setBizInfo(this.buildBizInfo(hiddenDangerDto));
             } catch (Exception e) {
-                log.error(e.getMessage(),e);
-                throw new RuntimeException("组织数据失败");
+                log.error(e.getMessage(), e);
+                throw new RuntimeException("组织数据失败!" + e.getMessage());
             }
             return dangerDto;
         }).collect(Collectors.toList());
@@ -273,6 +275,8 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
         Point point = new Point();
         if (!ObjectUtils.isEmpty(hiddenDangerDto.getPointId())) {
             point = iPointDao.findById(hiddenDangerDto.getPointId()).orElseThrow(() -> new RuntimeException("单位不存在"));
+        } else {
+            throw new RuntimeException("单位不存在");
         }
         //检查级别
         DangerCheckTypeLevelEnum dangerCheckTypeLevelEnum = DangerCheckTypeLevelEnum.getEumByCode(plan.getCheckLevel());
@@ -288,10 +292,8 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
         result.put("bizId", hiddenDangerDto.getCheckInputId());
         result.put("bizName", hiddenDangerDto.getInputItemName());
         result.put("routeId", plan.getRouteId());
-        result.put("accompanyingUserId", plan.getLeadPeopleIds()); // 检查陪同人id
-        result.put("accompanyingUserName", plan.getLeadPeopleNames()); // 检查陪同人名称
-        result.put("checkUnitId",plan.getCheckUnitId());
-        result.put("checkUnitName",plan.getCheckUnitName());
+        result.put("checkUnitId", plan.getCheckUnitId()); // 检查人所在单位id逗号隔开
+        result.put("checkUnitName", plan.getCheckUnitName());// 检查人所在单位名称逗号隔开
         result.put("leadPeopleId", plan.getLeadPeopleIds()); // 牵头人id
         result.put("leadPeopleName", plan.getLeadPeopleNames()); // 牵头人名称
         result.put("makerUserId", plan.getMakerUserId()); // 计划制定人id
@@ -313,13 +315,11 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
             return;
         }
         List<CheckShot> shotList = iCheckShotDao.findAllByCheckIdAndCheckInputId(checkInput.getCheckId(), checkInput.getId());
-        result.put("checkUserId", checkInput.getUserId());
-        result.put("checkUserName", checkInput.getUserName());
-        result.put("accompanyUserId", checkInput.getAccompanyUserId());
-        result.put("accompanyUserName", checkInput.getAccompanyUserName());
-        result.put("accompanyingUserId", checkInput.getAccompanyUserId());
-        result.put("accompanyingUserName",checkInput.getAccompanyUserName());
-        result.put("planExecuteTime", checkInput.getCreateDate());
+        result.put("checkUserId", checkInput.getUserId()); // 任务执行人id
+        result.put("checkUserName", checkInput.getUserName()); // 任务执行人名称
+        result.put("accompanyingUserId", checkInput.getAccompanyUserId()); // 检查陪同人id
+        result.put("accompanyingUserName", checkInput.getAccompanyUserName()); // 检查陪同人名称
+        result.put("planExecuteTime", checkInput.getCreateDate()); // 计划任务执行时间
         result.put("checkPhotoUrl", shotList.stream().map(CheckShot::getPhotoData).collect(Collectors.joining(",")));
     }
 }

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

@@ -237,7 +237,7 @@ public class PlanServiceImpl implements IPlanService {
             }
             try {
                 if (ValidationUtil.isEmpty(status)){
-                    rulePlanService.addPlanRule(plan, userIds, RuleTypeEnum.计划提交); // 计划提交
+                    rulePlanService.addPlanRule(plan, userIds, RuleTypeEnum.计划提交, null); // 计划提交
                 } else {
                     if (PlanStatusEnum.EXAMINE_THREE.getValue() != status){
                         rulePlanService.addPlanAuditRule(plan, userIds, RuleTypeEnum.计划审核, ExecuteStateNameEnum.getNameByCode(excuteState)); // 计划审核

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

@@ -536,8 +536,9 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 
                     // 2.保存执行数据明细表
                     planTaskDetail.saveAndFlush(planTaskDetailInstance);
+
                     // 规则推送消息
-                    rulePlanService.addPlanRule(plan, null, RuleTypeEnum.计划生成);
+                    rulePlanService.addPlanRule(plan, null, RuleTypeEnum.计划生成, pointId.longValue());
                 }
                 // 定时任务监控
                 jobService.planTaskAddJob(planTask);

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

 package com.yeejoin.amos.supervision.business.service.impl;
 
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
+import com.google.gson.JsonObject;
 import com.yeejoin.amos.boot.biz.common.constants.RuleConstant;
 import com.yeejoin.amos.boot.biz.common.enums.RuleTypeEnum;
 import com.yeejoin.amos.component.rule.RuleTrigger;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.RoleModel;
+import com.yeejoin.amos.supervision.business.dao.mapper.PointMapper;
+import com.yeejoin.amos.supervision.business.dto.OrgUsrFormDto;
 import com.yeejoin.amos.supervision.business.dto.PlanRo;
 import com.yeejoin.amos.supervision.business.feign.JCSFeignClient;
 import com.yeejoin.amos.supervision.business.util.DateUtil;
+import com.yeejoin.amos.supervision.business.util.Toke;
 import com.yeejoin.amos.supervision.dao.entity.Plan;
+import com.yeejoin.amos.supervision.dao.entity.Point;
+import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
+import org.bouncycastle.cert.ocsp.Req;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.util.Date;
@@ -28,28 +43,47 @@ public class RulePlanService {
     private final String packageId = "消息/addPlanRule";
     private final String msgType = "supervision";
 
+    @Value("${supervision.person.charger.role:Person_charge_unit_fire_protection_supervision_inspection}")
+    private String supervisionPersonChargerRole;
+
     @Autowired
     private RuleTrigger ruleTrigger;
 
     @Autowired
     private JCSFeignClient jcsFeignClient;
 
-    public Boolean addPlanRule(Plan plan, List<String> userIds, RuleTypeEnum ruleType) throws Exception {
-        PlanRo planRo = buildPlanRo(plan, userIds, ruleType);
+    @Autowired
+    private RemoteSecurityService remoteSecurityService;
+
+    @Autowired
+    private PointServiceImpl pointService;
+
+    @Async
+    public Boolean addPlanRule(Plan plan, List<String> userIds, RuleTypeEnum ruleType, Long pointId) throws Exception {
+        PlanRo planRo = buildPlanRo(plan, userIds, ruleType, pointId);
         //触发规则
         ruleTrigger.publish(planRo, packageId, new String[0]);
         return true;
     }
 
+    @Async
     public Boolean addPlanAuditRule(Plan plan, List<String> userIds, RuleTypeEnum ruleType, String excuteStateName) throws Exception {
-        PlanRo planRo = buildPlanRo(plan, userIds, ruleType);
+        PlanRo planRo = buildPlanRo(plan, userIds, ruleType, null);
         planRo.setExcuteStateName(excuteStateName);
         //触发规则
         ruleTrigger.publish(planRo, packageId, new String[0]);
         return true;
     }
 
-    private PlanRo buildPlanRo(Plan plan, List<String> userIds, RuleTypeEnum ruleType) {
+    private PlanRo buildPlanRo(Plan plan, List<String> userIds, RuleTypeEnum ruleType, Long pointId) {
+        // 设置token
+        if (ValidationUtil.isEmpty(RequestContext.getToken())) {
+            Toke tokenObj = remoteSecurityService.getServerToken();
+            RequestContext.setProduct(tokenObj.getProduct());
+            RequestContext.setAppKey(tokenObj.getAppKey());
+            RequestContext.setToken(tokenObj.getToke());
+        }
+
         PlanRo planRo = new PlanRo();
         BeanUtils.copyProperties(plan, planRo);
         planRo.setMsgType(msgType);
@@ -74,11 +108,35 @@ public class RulePlanService {
         }
 
         if (ValidationUtil.isEmpty(userIds)) {
+            // 计划牵头责任人
             String leadPeopleIds = plan.getLeadPeopleIds();
             if (!ValidationUtil.isEmpty(plan.getUserId()) && !leadPeopleIds.contains(plan.getUserId())) {
                 leadPeopleIds += "," + plan.getUserId();
             }
             userIds = (List<String>) jcsFeignClient.getAmosIdListByUserIds(leadPeopleIds).getResult();
+            // pointId是被检查单位id
+            if (!ValidationUtil.isEmpty(pointId)) {
+                List<String> userIdList = Lists.newArrayList();
+                Point point = pointService.queryPointById(pointId);
+                List<OrgUsrFormDto> personList  =
+                        jcsFeignClient.getPersonListByCompanyId(point.getOriginalId()).getResult();
+                List<String> personIdList = Lists.transform(personList, OrgUsrFormDto::getAmosOrgId);
+                List<RoleModel> roleList =
+                        Privilege.roleClient.queryRoleList(supervisionPersonChargerRole, null).getResult();
+                if (!ValidationUtil.isEmpty(roleList)) {
+                    List<AgencyUserModel> agencyUserModelList = Privilege.agencyUserClient.queryByRoleId(
+                            String.valueOf(roleList.get(0).getSequenceNbr()), null).getResult();
+                    if (!ValidationUtil.isEmpty(agencyUserModelList)) {
+                        List<String> finalUserIds = userIds;
+                        agencyUserModelList.forEach(userModel -> {
+                            if (personIdList.contains(userModel.getUserId()) && !finalUserIds.contains(userModel.getUserId())) {
+                                finalUserIds.add(userModel.getUserId());
+                            }
+                        });
+                        userIds = finalUserIds;
+                    }
+                }
+            }
         }
         planRo.setSendTime(DateUtil.date2LongStr(new Date()));
         planRo.setRecivers(userIds);

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

@@ -282,4 +282,6 @@ public interface ICheckService {
     int checkHasRecord(Long planTaskId, Long pointId);
 
     Page<CheckVo> queryPage(CheckPageParam criterias);
+
+    List<String> getPictureByCheckId(String checkId,String id);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/vo/CheckVo.java

@@ -9,7 +9,10 @@ import java.util.Date;
  */
 @Data
 public class CheckVo {
-
+    /**
+     * checkId
+     */
+    private Long checkId;
     /**
      * 主键id
      */

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

@@ -43,10 +43,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service("jobService")
 public class JobService implements IJobService {
@@ -215,7 +217,13 @@ public class JobService implements IJobService {
     private void createOmissionCheckRecord(PlanTask planTask) {
         List<PlanTaskPointInputItemBo> planTaskPointInputItems = planTaskMapper
                 .getPlanTaskPointInputItemByPlanTaskId(planTask.getId(), PlanTaskDetailStatusEnum.OMISSION.getValue());
+        List<Check> checkList = checkMapper.getCheckListByTaskId(planTask.getId());
         Map<Long, Check> checkMap = new HashMap<>();
+        if (!ValidationUtil.isEmpty(checkList)) {
+            checkList.stream().collect(Collectors.groupingBy(Check::getPointId)).forEach((e,v) -> {
+                checkMap.put(e, v.get(0));
+            });
+        }
         Set<Long> checkIds = new HashSet<Long>();
         //查询用户名字
         for (PlanTaskPointInputItemBo arg : planTaskPointInputItems) {

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

@@ -2,19 +2,25 @@ package com.yeejoin.amos.boot.module.tzs.flc.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;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.Equipment;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.EquipmentAssociated;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.ArrayList;
 import java.util.List;
 import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.EquipmentAssociatedServiceImpl;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,10 +54,64 @@ public class EquipmentAssociatedController extends BaseController {
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增配套设备设施部件", notes = "新增配套设备设施部件")
 	public ResponseModel<EquipmentAssociatedDto> save(@RequestBody EquipmentAssociatedDto model) {
+		model.setIsDelete(false);
 	    model = equipmentAssociatedServiceImpl.createWithModel(model);
 	    return ResponseHelper.buildResponse(model);
 	}
 
+	/**
+	 * 根据sequenceNbr删除
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@DeleteMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "DELETE", value = "删除配套设施", notes = "删除配套设施")
+	public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr){
+		Boolean flag = equipmentAssociatedServiceImpl.update(new LambdaUpdateWrapper<EquipmentAssociated>().eq(EquipmentAssociated::getSequenceNbr,sequenceNbr).set(EquipmentAssociated::getIsDelete,true));
+		return ResponseHelper.buildResponse(flag);
+	}
+
+
+	/**
+	 * 根据sequenceNbr更新
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/updateAssociated")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新配套设备设施部件", notes = "根据sequenceNbr配套设备设施部件")
+	public ResponseModel<EquipmentAssociatedDto> updateAssociated(@RequestBody EquipmentAssociatedDto model) {
+		if (ValidationUtil.isEmpty(model)
+				|| ValidationUtil.isEmpty(model.getSequenceNbr())) {
+			throw new BadRequest("参数校验失败.");
+		}
+		model = equipmentAssociatedServiceImpl.updateAssociated(model);
+		return ResponseHelper.buildResponse(model);
+	}
+
+
+
+	/**
+	 * 新增配套设备/设施/部件
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET", value = "根据设备id返回配套设施信息", notes = "根据设备id返回配套设施信息")
+	public ResponseModel<List<EquipmentAssociatedDto>> getAssociatedByEquipmentId(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+		List<EquipmentAssociated> entity = equipmentAssociatedServiceImpl.list(new LambdaQueryWrapper<EquipmentAssociated>().eq(EquipmentAssociated::getIsDelete,false).eq(EquipmentAssociated::getEquipmentId,sequenceNbr));
+		List<EquipmentAssociatedDto> result = new ArrayList<>();
+		entity.stream().forEach(t -> {
+			EquipmentAssociatedDto temp = new EquipmentAssociatedDto();
+			BeanUtils.copyProperties(t,temp);
+			result.add(temp);
+		});
+
+		return ResponseHelper.buildResponse(result);
+	}
+
 
 	/**
 	 *

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

@@ -96,7 +96,7 @@ public class EquipmentController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PutMapping(value = "/updateEquipment")
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新装备信息表", notes = "根据sequenceNbr更新装备信息表")
-    public ResponseModel<EquipmentDto> updateBySequenceNbrEquipment(@RequestBody EquipmentDto model) {
+    public ResponseModel<EquipmentDto> updateEquip20ment(@RequestBody EquipmentDto model) {
         if (ValidationUtil.isEmpty(model)
                 || ValidationUtil.isEmpty(model.getSequenceNbr())) {
             throw new BadRequest("参数校验失败.");

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

+package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.EquipmentUseInfoServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentUseInfoDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 设备使用信息表
+ *
+ * @author system_generator
+ * @date 2022-01-05
+ */
+@RestController
+@Api(tags = "设备使用信息表Api")
+@RequestMapping(value = "/equipment-use-info")
+public class EquipmentUseInfoController extends BaseController {
+
+    @Autowired
+    EquipmentUseInfoServiceImpl equipmentUseInfoServiceImpl;
+
+    /**
+     * 新增设备使用信息表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增设备使用信息表", notes = "新增设备使用信息表")
+	public ResponseModel<EquipmentUseInfoDto> save(@RequestBody EquipmentUseInfoDto model) {
+	    model = equipmentUseInfoServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新设备使用信息表", notes = "根据sequenceNbr更新设备使用信息表")
+	public ResponseModel<EquipmentUseInfoDto> updateBySequenceNbrEquipmentUseInfo(@RequestBody EquipmentUseInfoDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(equipmentUseInfoServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除设备使用信息表", notes = "根据sequenceNbr删除设备使用信息表")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(equipmentUseInfoServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个设备使用信息表",  notes = "根据sequenceNbr查询单个设备使用信息表")
+	public ResponseModel<EquipmentUseInfoDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(equipmentUseInfoServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "设备使用信息表分页查询",  notes = "设备使用信息表分页查询")
+	public ResponseModel<Page<EquipmentUseInfoDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<EquipmentUseInfoDto> page = new Page<EquipmentUseInfoDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(equipmentUseInfoServiceImpl.queryForEquipmentUseInfoPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "设备使用信息表列表全部数据查询",   notes = "设备使用信息表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<EquipmentUseInfoDto>> selectForList() {
+	    return ResponseHelper.buildResponse(equipmentUseInfoServiceImpl.queryForEquipmentUseInfoList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/EquipmentAssociatedServiceImpl.java

@@ -30,4 +30,10 @@ public class EquipmentAssociatedServiceImpl extends BaseService<EquipmentAssocia
     public List<EquipmentAssociatedDto> queryForEquipmentAssociatedList()   {
         return this.queryForList("" , false);
     }
+
+    @Override
+    public EquipmentAssociatedDto updateAssociated(EquipmentAssociatedDto model) {
+        this.updateWithModel(model);
+        return model;
+    }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/EquipmentInformServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
@@ -16,11 +17,14 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledQueryDto;
 import com.yeejoin.amos.boot.module.tzs.api.enums.InformWorkFlowEnum;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentIndexDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentUseInfoDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.InformEquipmentDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.Equipment;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.EquipmentIndex;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.EquipmentIndexInform;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.EquipmentInform;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.EquipmentUseInfo;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.UnitInfo;
 import com.yeejoin.amos.boot.module.tzs.flc.api.enums.EquipmentInformStatusEnum;
 import com.yeejoin.amos.boot.module.tzs.flc.api.enums.EquipmentStatusEnum;
 import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.EquipmentInformMapper;
@@ -51,6 +55,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.UUID;
 
 /**
  * 设备告知单服务实现类
@@ -89,7 +94,11 @@ public class EquipmentInformServiceImpl extends BaseService<EquipmentInformDto,E
     @Autowired
     EquipmentIndexInformServiceImpl iEquipmentIndexInformService;
 
+    @Autowired
+    EquipmentUseInfoServiceImpl equipmentUseInfoServiceImpl;
 
+    @Autowired
+    UnitInfoServiceImpl unitInfoServiceImpl;
 
     /**
      * 分页查询
@@ -199,7 +208,8 @@ public class EquipmentInformServiceImpl extends BaseService<EquipmentInformDto,E
     public Boolean acceptInform(Long sequenceNbr) {
         // 接收告知书 更新告知书状态
         Boolean flag = false;
-        flag = this.update(new LambdaUpdateWrapper<EquipmentInform>().eq(EquipmentInform::getSequenceNbr,sequenceNbr).set(EquipmentInform::getInformStatus,"9"));
+        EquipmentInform inform = this.getById(sequenceNbr);
+        flag = this.updateById(inform);
         if(flag) {
             // 更新设备相关参数
             List<InformEquipmentDto> equipmentList = informEquipmentServiceImpl.getEquipListByInformId(sequenceNbr);
@@ -209,6 +219,44 @@ public class EquipmentInformServiceImpl extends BaseService<EquipmentInformDto,E
                 BeanUtils.copyProperties(t,sourceEquip);
                 sourceEquip.setSequenceNbr(t.getSourceEquipmentId());
                 equipmentServiceImpl.updateById(sourceEquip);
+
+                // 保存设备相关使用信息
+
+
+                EquipmentUseInfo useInfo = equipmentUseInfoServiceImpl.getOne(new LambdaQueryWrapper<EquipmentUseInfo>().eq(EquipmentUseInfo::getEquipmentId,t.getSourceEquipmentId()));
+                if(useInfo == null) {
+                    useInfo = new EquipmentUseInfo();
+                }
+                useInfo.setLatitude(t.getLatitude());
+                useInfo.setLongitude(t.getLongitude());
+                useInfo.setUseAddress(t.getAddress());
+                useInfo.setUseSite(inform.getUseSite());
+                useInfo.setUseSiteCode(inform.getUseSiteCode());
+                //useInfo.setSpecialCode(UUID.randomUUID().toString().replaceAll("-",""));
+                //if(StringUtils.isEmpty(useInfo.getRegisterCode())) {
+                //    useInfo.setRegisterCode(sourceEquip.getTypeId()+inform.getRegionCode()+ DateUtils.getYear(new Date())+"01");
+                //}
+                //useInfo.setRescueCode(UUID.randomUUID().toString().replaceAll("-",""));
+                //useInfo.setRegisterLicenceCode(UUID.randomUUID().toString().replaceAll("-",""));
+                if(useInfo.getRegisterTime() != null) {
+                    useInfo.setRegisterTime(new Date());
+                }
+                useInfo.setStartUseTime(new Date());
+                useInfo.setIssueLicenceTime(new Date());
+
+                useInfo.setEquipmentId(t.getSourceEquipmentId());
+                useInfo.setUseUnitName(inform.getUseUnit());
+                useInfo.setUseUnitId(inform.getUseUnitId());
+                UnitInfo useUnit = unitInfoServiceImpl.getOne(new LambdaQueryWrapper<UnitInfo>().eq(UnitInfo::getIsDelete,false).eq(UnitInfo::getOrgUserId,inform.getUseUnitId()));
+                useInfo.setUseOrganizationCode(useUnit.getOrganizationCode());
+                useInfo.setPropertyUnitName(inform.getPropertyUnit());
+                useInfo.setPropertyUnitId(inform.getPropertyUnitId());
+
+                UnitInfo propertyUnit = unitInfoServiceImpl.getOne(new LambdaQueryWrapper<UnitInfo>().eq(UnitInfo::getIsDelete,false).eq(UnitInfo::getOrgUserId,inform.getPropertyUnitId()));
+                useInfo.setPropertyOrganizationCode(propertyUnit.getOrganizationCode());
+
+                equipmentUseInfoServiceImpl.saveOrUpdate(useInfo);
+
                 // 获取设备附件信息 保存附件信息
                 // 原附件信息
                 Map<String, List<AttachmentDto>> sourceAttach = sourceFileService.getAttachments(t.getSequenceNbr());
@@ -283,6 +331,7 @@ public class EquipmentInformServiceImpl extends BaseService<EquipmentInformDto,E
                 }
             }
         }
+        model.setProcessStatus("0");
         return model;
     }
 
@@ -333,7 +382,6 @@ public class EquipmentInformServiceImpl extends BaseService<EquipmentInformDto,E
     @Transactional
     public Boolean acceptInform(Long sequenceNbr, ReginParams userInfo) throws Exception {
         EquipmentInformDto model = this.queryBySeq(sequenceNbr);
-        model.setInformStatus("9");
         InformWorkFlowEnum submit = InformWorkFlowEnum.接收方接收告知书;
         model.setProcessStatus(submit.getProcessStatus());
         // 流程流转

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/EquipmentUseInfoServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.EquipmentUseInfo;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.EquipmentUseInfoMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.IEquipmentUseInfoService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentUseInfoDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 设备使用信息表服务实现类
+ *
+ * @author system_generator
+ * @date 2022-01-05
+ */
+@Service
+public class EquipmentUseInfoServiceImpl extends BaseService<EquipmentUseInfoDto,EquipmentUseInfo,EquipmentUseInfoMapper> implements IEquipmentUseInfoService {
+    /**
+     * 分页查询
+     */
+    public Page<EquipmentUseInfoDto> queryForEquipmentUseInfoPage(Page<EquipmentUseInfoDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<EquipmentUseInfoDto> queryForEquipmentUseInfoList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

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

@@ -66,8 +66,8 @@ dcs.url.sendalarm=http://198.87.103.158:8001/alarm-service/appalarm/sendalarm
 #系统上线时间
 param.system.online.date = 2019-02-12
 
-# 视频转码服务开关 off/on,默认关闭，数字换流站使用时开启
-param.isUseVideoTranscoding = off
+# 视频转码服务开关 hls(关)/flv(开),默认关闭，数字换流站使用时开启
+window.vedioFormat = hls
 # 航天视频服务地址
 param.htvideo.url="http://192.168.4.174:9001";
 # 南瑞视频转码服务地址

amos-boot-system-equip/src/main/resources/application-docker.properties

+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url = jdbc:mysql://172.16.11.20:3306/autosys_business_v3.0.0.2?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+spring.datasource.username= root
+spring.datasource.password= root_123
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.pool-name=DatebookHikariCP
+spring.datasource.hikari.minimum-idle= 3
+spring.datasource.hikari.maximum-pool-size= 30
+spring.datasource.hikari.auto-commit= true
+spring.datasource.hikari.idle-timeout= 10000
+spring.datasource.hikari.max-lifetime= 1800000
+spring.datasource.hikari.connection-timeout= 30000
+spring.datasource.hikari.connection-test-query= SELECT 1
+
+# 文件服务器地址
+fileserver_domain=http://39.98.246.31:8888/
+
+eureka.instance.hostname= 172.16.11.20
+eureka.instance.prefer-ip-address = true
+eureka.client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:10001/eureka/
+
+#security config
+security.password=a1234560
+security.loginId=fas_system
+security.productApp=STUDIO_APP_MOBILE
+security.productWeb=STUDIO_APP_WEB
+security.appKeyApp=studio_normalapp_3056965
+
+#redis
+spring.redis.database=1
+spring.redis.host=172.16.11.20
+spring.redis.port=6379
+spring.redis.password=1234560
+spring.redis.lettuce.pool.max-active=200
+spring.redis.lettuce.pool.max-wait=-1
+spring.redis.lettuce.pool.max-idle=10
+spring.redis.lettuce.pool.min-idle=0
+spring.redis.expire.time=300
+
+## emqx
+emqx.clean-session=true
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
+emqx.broker=tcp://172.16.11.33:1883
+emqx.user-name=admin
+emqx.password=public
+mqtt.scene.host=mqtt://172.16.11.33:8083/mqtt
+mqtt.client.product.id=mqtt
+mqtt.topic=topic_mqtt
+spring.mqtt.completionTimeout=3000
+
+#数据同步开关
+systemctl.sync.switch=false
+#数据JCS开关
+systemctl.jcs.switch=false
+#平台数据开关
+systemctl.amos.switch=false
+
+#报表数据地址
+equip.report.url=/fire-fighting-system/ureport/preview?_u=file:
+
+#数字化南瑞平台接口
+dcs.url.token=http://198.87.103.158:8001/auth-service/oauth/token
+dcs.url.sendalarm=http://198.87.103.158:8001/alarm-service/appalarm/sendalarm
+
+#系统上线时间
+param.system.online.date = 2019-02-12
+
+# 视频转码服务开关 hls(关)/flv(开),默认关闭，数字换流站使用时开启
+window.vedioFormat = hls
+# 航天视频服务地址
+param.htvideo.url="";
+# 南瑞视频转码服务地址
+param.nrvideo.url="";

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

+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url = jdbc:mysql://172.16.10.66:3306/safety-business-3.0.1?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+spring.datasource.username= root
+spring.datasource.password= root_123
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.pool-name=DatebookHikariCP
+spring.datasource.hikari.minimum-idle= 3
+spring.datasource.hikari.maximum-pool-size= 30
+spring.datasource.hikari.auto-commit= true
+spring.datasource.hikari.idle-timeout= 10000
+spring.datasource.hikari.max-lifetime= 1800000
+spring.datasource.hikari.connection-timeout= 30000
+spring.datasource.hikari.connection-test-query= SELECT 1
+
+fdfs.so-timeout=1501
+fdfs.connect-timeout=601
+fdfs.thumb-image.height=200
+fdfs.thumb-image.width=200
+fdfs.tracker-list[0]=39.98.246.31:22122
+# 文件服务器地址
+fileserver_domain=http://39.98.246.31:8888/
+
+eureka.instance.hostname= 172.16.10.72
+eureka.instance.prefer-ip-address = true
+eureka.client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:10001/eureka/
+
+#security config
+security.password=a1234560
+security.loginId=fas_system
+security.productApp=STUDIO_APP_MOBILE
+security.productWeb=STUDIO_APP_WEB
+security.appKeyApp=studio_normalapp_3157169
+
+#redis
+spring.redis.database=0
+spring.redis.host=172.16.10.85
+spring.redis.port=6379
+spring.redis.password=amos2019Redis
+spring.redis.lettuce.pool.max-active=200
+spring.redis.lettuce.pool.max-wait=-1
+spring.redis.lettuce.pool.max-idle=10
+spring.redis.lettuce.pool.min-idle=0
+spring.redis.expire.time=300
+
+mqtt.scene.host=mqtt://172.16.10.85:8083/mqtt
+mqtt.client.product.id=mqtt
+mqtt.topic=topic_mqtt
+spring.mqtt.completionTimeout=3000
+
+## emqx
+emqx.clean-session=true
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
+emqx.broker=tcp://172.16.10.85:1883
+emqx.user-name=super
+emqx.password=a123456
+
+#数据同步开关
+systemctl.sync.switch=false
+#数据JCS开关
+systemctl.jcs.switch=true
+#平台数据开关
+systemctl.amos.switch=true
+
+#报表数据地址
+equip.report.url=/fire-fighting-system/ureport/preview?_u=file:
+
+#数字化南瑞平台接口
+dcs.url.token=http://198.87.103.158:8001/auth-service/oauth/token
+dcs.url.sendalarm=http://198.87.103.158:8001/alarm-service/appalarm/sendalarm
+
+#系统上线时间
+param.system.online.date = 2019-02-12
+
+# 视频转码服务开关 hls(关)/flv(开),默认关闭，数字换流站使用时开启
+window.vedioFormat = hls
+# 航天视频服务地址
+param.htvideo.url="";
+# 南瑞视频转码服务地址
+param.nrvideo.url="";

amos-boot-system-equip/src/main/resources/application-qa.properties

+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url = jdbc:mysql://172.16.11.20:3306/autosys_business_v3.0.0.2?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+spring.datasource.username= root
+spring.datasource.password= root_123
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.pool-name=DatebookHikariCP
+spring.datasource.hikari.minimum-idle= 3
+spring.datasource.hikari.maximum-pool-size= 30
+spring.datasource.hikari.auto-commit= true
+spring.datasource.hikari.idle-timeout= 10000
+spring.datasource.hikari.max-lifetime= 1800000
+spring.datasource.hikari.connection-timeout= 30000
+spring.datasource.hikari.connection-test-query= SELECT 1
+
+# 文件服务器地址
+fileserver_domain=http://39.98.246.31:8888/
+
+eureka.instance.hostname= 172.16.11.20
+eureka.instance.prefer-ip-address = true
+eureka.client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:10001/eureka/
+
+#security config
+security.password=a1234560
+security.loginId=fas_system
+security.productApp=STUDIO_APP_MOBILE
+security.productWeb=STUDIO_APP_WEB
+security.appKeyApp=studio_normalapp_3056965
+
+#redis
+spring.redis.database=1
+spring.redis.host=172.16.11.20
+spring.redis.port=6379
+spring.redis.password=1234560
+spring.redis.lettuce.pool.max-active=200
+spring.redis.lettuce.pool.max-wait=-1
+spring.redis.lettuce.pool.max-idle=10
+spring.redis.lettuce.pool.min-idle=0
+spring.redis.expire.time=300
+
+## emqx
+emqx.clean-session=true
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
+emqx.broker=tcp://172.16.11.33:1883
+emqx.user-name=admin
+emqx.password=public
+mqtt.scene.host=mqtt://172.16.11.33:8083/mqtt
+mqtt.client.product.id=mqtt
+mqtt.topic=topic_mqtt
+spring.mqtt.completionTimeout=3000
+
+#数据同步开关
+systemctl.sync.switch=false
+#数据JCS开关
+systemctl.jcs.switch=false
+#平台数据开关
+systemctl.amos.switch=false
+
+#报表数据地址
+equip.report.url=/fire-fighting-system/ureport/preview?_u=file:
+
+#数字化南瑞平台接口
+dcs.url.token=http://198.87.103.158:8001/auth-service/oauth/token
+dcs.url.sendalarm=http://198.87.103.158:8001/alarm-service/appalarm/sendalarm
+
+#系统上线时间
+param.system.online.date = 2019-02-12
+
+# 视频转码服务开关 hls(关)/flv(开),默认关闭，数字换流站使用时开启
+window.vedioFormat = hls
+# 航天视频服务地址
+param.htvideo.url="";
+# 南瑞视频转码服务地址
+param.nrvideo.url="";

amos-boot-system-equip/src/main/resources/application-test.properties

+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url = jdbc:mysql://172.16.11.20:3306/autosys_business_v3.0.0.2?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+spring.datasource.username= root
+spring.datasource.password= root_123
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.pool-name=DatebookHikariCP
+spring.datasource.hikari.minimum-idle= 3
+spring.datasource.hikari.maximum-pool-size= 30
+spring.datasource.hikari.auto-commit= true
+spring.datasource.hikari.idle-timeout= 10000
+spring.datasource.hikari.max-lifetime= 1800000
+spring.datasource.hikari.connection-timeout= 30000
+spring.datasource.hikari.connection-test-query= SELECT 1
+
+# 文件服务器地址
+fileserver_domain=http://39.98.246.31:8888/
+
+eureka.instance.hostname= 172.16.11.20
+eureka.instance.prefer-ip-address = true
+eureka.client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:10001/eureka/
+
+#security config
+security.password=a1234560
+security.loginId=fas_system
+security.productApp=STUDIO_APP_MOBILE
+security.productWeb=STUDIO_APP_WEB
+security.appKeyApp=studio_normalapp_3056965
+
+#redis
+spring.redis.database=1
+spring.redis.host=172.16.11.20
+spring.redis.port=6379
+spring.redis.password=1234560
+spring.redis.lettuce.pool.max-active=200
+spring.redis.lettuce.pool.max-wait=-1
+spring.redis.lettuce.pool.max-idle=10
+spring.redis.lettuce.pool.min-idle=0
+spring.redis.expire.time=300
+
+## emqx
+emqx.clean-session=true
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
+emqx.broker=tcp://172.16.11.33:1883
+emqx.user-name=admin
+emqx.password=public
+mqtt.scene.host=mqtt://172.16.11.33:8083/mqtt
+mqtt.client.product.id=mqtt
+mqtt.topic=topic_mqtt
+spring.mqtt.completionTimeout=3000
+
+#报表数据地址
+equip.report.url=/fire-fighting-system/ureport/preview?_u=file:
+
+#数字化南瑞平台接口
+dcs.url.token=http://198.87.103.158:8001/auth-service/oauth/token
+dcs.url.sendalarm=http://198.87.103.158:8001/alarm-service/appalarm/sendalarm
+
+#系统上线时间
+param.system.online.date = 2019-02-12
+
+# 视频转码服务开关 hls(关)/flv(开),默认关闭，数字换流站使用时开启
+window.vedioFormat = hls
+# 航天视频服务地址
+param.htvideo.url="";
+# 南瑞视频转码服务地址
+param.nrvideo.url="";

amos-boot-system-equip/src/main/resources/changelog/wl-3.0.1.xml

@@ -2238,6 +2238,7 @@
         </sql>
     </changeSet>
 
+
     <changeSet author="tw" id="20220104-5">
         <preConditions onFail="MARK_RAN">
             <not>
@@ -2275,4 +2276,26 @@
 
 
 
+    <changeSet author="keyong" id="1641367742-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment_specific_alarm_log" columnName="clean_time"/>
+            </not>
+        </preConditions>
+        <comment>wl_equipment_specific_alarm_log add column clean_time</comment>
+        <sql>
+            alter table `wl_equipment_specific_alarm_log` add column `clean_time` datetime DEFAULT NULL COMMENT '消除时间';
+        </sql>
+    </changeSet>
+    <changeSet author="keyong" id="1641367742-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment" columnName="clean_type"/>
+            </not>
+        </preConditions>
+        <comment>wl_equipment add column clean_type</comment>
+        <sql>
+            ALTER TABLE wl_equipment ADD COLUMN clean_type varchar(50) DEFAULT NULL COMMENT '警情消除方式(0：收到复位信号自动消除；1：警情处理确认后消除)';
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

amos-boot-system-equip/src/main/resources/mapper/ConfirmAlarmMapper.xml

@@ -44,7 +44,9 @@
 			confirm_user,
 			confirm_user_name,
 			confirm_date,
-			(SELECT GROUP_CONCAT(fem.name) FROM `f_fire_fighting_system` fem WHERE find_in_set(fem.id,spe.system_id)) as systemName
+			(SELECT GROUP_CONCAT(fem.name) FROM `f_fire_fighting_system` fem WHERE find_in_set(fem.id,spe.system_id)) as systemName,
+			if(ala.clean_time is null, '未清除', '已清除') AS cleanStatus,
+			ala.clean_time
         from
             wl_equipment_specific_alarm_log as ala
         left join wl_equipment_specific as spe on spe.id = ala.equipment_specific_id

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml

@@ -180,6 +180,11 @@
         fireEquipmentName,
         concat(wlesal.equipment_specific_name,wlesal.equipment_specific_index_name) as alamContent,
         if(confirm_type is null,'未处理','已处理') handleStatus,
+        IF (
+        wlesal.clean_time IS NOT NULL,
+        '已消除',
+        '未消除'
+        ) cleanStatus,
         confirm_type as handleType,
         wlesal.equipment_index_id AS fireEquipmentIndexId,
         wlesal.equipment_specific_index_key AS fireEquipmentSpecificIndexKey,
@@ -237,6 +242,13 @@
                          open="(" close=")" index="">#{item}
                 </foreach>
             </if>
+            <if test="param.id!=null and param.id!=''">AND d.fireEquipmentId = #{param.id}</if>
+            <if test="param.cleanStatus != null and param.cleanStatus != '' and param.cleanStatus == 1">AND
+                d.cleanStatus = '已消除'
+            </if>
+            <if test="param.cleanStatus != null and param.cleanStatus != '' and param.cleanStatus == 2">AND
+                d.cleanStatus = '未消除'
+            </if>
         </where>
         ORDER BY d.createDate DESC
     </select>
@@ -294,6 +306,16 @@
         '已处理',
         '去确认'
         ) handleStatus,
+        IF (
+        wlesal.clean_time IS NOT NULL,
+        '已消除',
+        '未消除'
+        ) cleanStatus,
+        IF (
+        wlesal.clean_time IS NOT NULL,
+        '1',
+        '2'
+        ) cleanStatusVal,
         wlesal.confirm_type AS handleType,
         wlesal.system_codes AS systemCodes,
         wlesal.equipment_index_id AS fireEquipmentIndexId,
@@ -344,10 +366,16 @@
             <when test="param.confirmType != null and param.confirmType != '' and param.confirmType == 0">
                 AND d.handleType IS NULL
             </when>
+            <when test="param.confirmType != null and param.confirmType != '' and param.confirmType == 2">
+                AND d.cleanStatus  = '未消除'
+            </when>
+            <when test="param.confirmType != null and param.confirmType != '' and param.confirmType == 3">
+                AND d.cleanStatus = '已消除'
+            </when>
         </choose>
         <if test="param.beginDate!=null">AND d.createDate <![CDATA[>=]]> #{param.beginDate}</if>
         <if test="param.endDate!=null">AND d.createDate <![CDATA[<=]]> #{param.endDate}</if>
-        <if test="param.alarmType == 'BREAKDOWN' or param.alarmType == 'FIREALARM'">AND d.type = #{param.alarmType}</if>
+        <if test="param.alarmType != null and param.alarmType != ''">AND d.type = #{param.alarmType}</if>
         <if test="param.systemCode != null and param.systemCode != ''">
             AND find_in_set(#{param.systemCode},d.systemCodes)
         </if>
@@ -358,6 +386,12 @@
         </if>
         <if test="param.id!=null and param.id!=''">AND d.fireEquipmentId = #{param.id}</if>
         <if test="param.status!=null and param.status!=3">AND d.status = #{param.status}</if>
+        <if test="param.cleanStatus != null and param.cleanStatus != '' and param.cleanStatus == 1">AND
+            d.cleanStatus = '已消除'
+        </if>
+        <if test="param.cleanStatus != null and param.cleanStatus != '' and param.cleanStatus == 2">AND
+            d.cleanStatus = '未消除'
+        </if>
         ORDER BY d.createDate DESC
     </select>
     <select id="getAlarmList" resultType="java.util.HashMap">

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml

@@ -1453,5 +1453,15 @@
         and e.category_id = c.id
         and s.biz_org_code <![CDATA[<>]]> ''
         GROUP BY s.biz_org_code ,c.code
+
+    <select id="getEquipmentBySpecificId" resultType="String">
+        select
+         we.clean_type
+        from
+         wl_Equipment we
+         LEFT JOIN `wl_equipment_detail` wed ON wed.equipment_id = we.id
+         LEFT JOIN `wl_equipment_specific` wes ON wes.equipment_detail_id = wed.id
+        where
+            wes.id = #{specificId}
     </select>
 </mapper>
\ No newline at end of file

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -489,8 +489,10 @@
             d.fireEquipmentName,
             d.warehouseStructureName,
             d.fireEquipmentSpecificIndexName,
-            d.createDate,d.confirmType,
-            d.type
+            d.createDate,
+            d.confirmType,
+            d.type,
+            d.cleanStatus
         FROM
         (
         SELECT
@@ -501,7 +503,8 @@
             wlesal.equipment_index_id AS fireEquipmentIndexId,
             wlesal.equipment_specific_index_key AS fireEquipmentSpecificIndexKey,
             wlesal.equipment_specific_index_name AS fireEquipmentSpecificIndexName,
-            if(wlesal.confirm_type IS NULL,0,1) AS confirmType,
+            if(wlesal.confirm_type IS NULL, 0, 1) AS confirmType,
+            if(wlesal.clean_time IS NULL, 0, 1) AS cleanStatus,
             CASE
             wlesal.equipment_specific_index_value
             WHEN 'true' THEN
@@ -549,6 +552,12 @@
             <if test='confirmType != null and confirmType == 1'>
                 and wlesal.confirm_type IS NOT NULL
             </if>
+            <if test='confirmType != null and confirmType == 2'>
+                and wlesal.clean_time IS NULL
+            </if>
+            <if test='confirmType != null and confirmType == 3'>
+                and wlesal.clean_time IS NOT NULL
+            </if>
         </where>
         ) d
         <where>

amos-boot-system-equip/src/main/resources/mapper/VideoEquipmentSpecificMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.equipmanage.mapper.VideoEquipmentSpecificMapper">
+    <select id="findBySpecificIdAndVideoIdIn" resultType="com.yeejoin.equipmanage.common.entity.VideoEquipmentSpecific">
+        SELECT
+            v.id,
+            v.equipment_specific_id AS equipmentSpecificId,
+            v.video_id AS videoId
+        FROM
+            `wl_video_equipment_specific` v
+        <where>
+            <if test="equipmentSpecificId != null">
+                v.equipment_specific_id = #{equipmentSpecificId}
+            </if>
+            <if test="list != null and list.size() >0">
+                AND v.video_id IN
+                <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+</mapper>

amos-boot-system-latentdanger/src/main/resources/db/mapper/LatentDangerMapper.xml

@@ -967,10 +967,13 @@
                     and a.biz_type = #{value}
                 </if>
                 <if test="key == 'dangerIds' and value != null">
-                    and a.id IN
+                    and (a.id IN
                     <foreach collection="value" item="id" open="(" separator="," close=")">
                         #{id}
                     </foreach>
+                    <if test="paramMap['my'] == 0">
+                        or a.danger_state = #{paramMap[submitDangerState]}
+                    </if>)
                 </if>
                 <if test="key == 'dangerState' and value != null and !value.isEmpty()">
                     and a.danger_state IN