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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/constants/TerminalConstant.java

+package com.yeejoin.amos.boot.biz.common.constants;
+
+/**
+ * @Author: xl
+ * @Description: 终端标识
+ * @Date: 2021/11/17 11:40
+ */
+public class TerminalConstant {
+    public final static String APP = "APP";
+    public final static String WEB = "WEB";
+    public final static String APP_WEB = "APP/WEB";
+}

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/enums/RuleTypeEnum.java

 package com.yeejoin.amos.boot.biz.common.enums;
 
+import com.yeejoin.amos.boot.biz.common.constants.TerminalConstant;
+
 /**
  * 规则请求枚举
  * @author xl
  *
  */
 public enum RuleTypeEnum {
+
 	// 防火监督
-	计划提交("计划提交", "addPlan","auditPage"),
-	计划审核("计划审核", "planAudit", "auditPage"),
-	计划审核完成("计划审核完成", "planAuditAll", "formulatePage"),
-	计划生成("计划生成", "addPlanTask", null),
-	计划完成("计划完成", "planCompleted", null),
+	计划提交("计划提交", "addPlan","auditPage", TerminalConstant.WEB),
+	计划审核("计划审核", "planAudit", "auditPage", TerminalConstant.APP_WEB),
+	计划审核完成("计划审核完成", "planAuditAll", "formulatePage", TerminalConstant.APP_WEB),
+	计划生成("计划生成", "addPlanTask", null, TerminalConstant.APP),
+	计划完成("计划完成", "planCompleted", null, TerminalConstant.APP_WEB),
 
 	// 隐患
-	隐患第一次提交("隐患提交", "addLatentDanger", null),
-	隐患审核("隐患审核", "dangerAudit", null);
+	隐患第一次提交("隐患提交", "addLatentDanger", null, null),
+	隐患审核("隐患审核", "dangerAudit", null, null);
 
 	/**
 	 * 名称，描述
@@ -29,6 +32,10 @@ public enum RuleTypeEnum {
 	 * 跳转地址
 	 */
 	private String url;
+	/**
+	 * 终端标识
+	 */
+	private String terminal;
 
 	public String getName() {
 		return name;
@@ -54,10 +61,19 @@ public enum RuleTypeEnum {
 		this.url = url;
 	}
 
-	RuleTypeEnum(String name, String code, String url) {
+	public String getTerminal() {
+		return terminal;
+	}
+
+	public void setTerminal(String terminal) {
+		this.terminal = terminal;
+	}
+
+	RuleTypeEnum(String name, String code, String url, String terminal) {
 		this.name = name;
 		this.code = code;
 		this.url = url;
+		this.terminal = terminal;
 	}
 
 	public static RuleTypeEnum getEnumByCode(String field){

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

@@ -134,7 +134,7 @@ public interface DutyPersonShiftMapper extends BaseMapper<DutyPersonShift> {
     
     List<Map<String, Object>>   getFirstAidForTypeCodeAndCompanyId(long company);
 
-    List<Map<String, Object>> queryByCompanyId();
+    List<Map<String, Object>> queryByCompanyId(@Param(value="bizNames") List<String> bizNames);
 
     List<Map<String, Object>>  queryByCompanyNew(String bizOrgName);
 }

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

@@ -106,13 +106,39 @@ public interface DynamicFormInstanceMapper extends BaseMapper<DynamicFormInstanc
             @Param("endTime") String endTime
     );
     
+   /**
+    * 值班表中 【值班排班】中特定部门的特定日期值班员；
+    * @param dutyDate
+    * @param departmentName eg：急救科、消救部
+    * @return
+    */
     
     List<Map<String, Object>>  getDutyPersonByTeamIdAndCarId(
-    		String carIdName,
-    		String teamIdName,
-    		String userIdName,
     		String dutyDate,
-    		String groupCode,
-    		String carId,
-    		String teamId);
+    		String departmentName);
+    /**
+     * 值班表中 【120急救排班】该急救站的当日值班员
+     * @param dutyDate
+     * @param firstAidId
+     * @return
+     */
+    List<Map<String, Object>>  getDutyPersonByTeamIdAndAirId(
+    		String dutyDate,
+    		String firstAidId);
+/**
+ *   机场单位的人员中，部门 ”人员职务“ 不为空的人员，不包括下级部门的人员
+ * @param departmentName eg: 急救科、 消救部
+ * @param PositionType : eg 岗位为：支队长、副支队长、党支部副书记、支队长助理、指挥员、；
+ * @return
+ */
+    List<Map<String, Object>> getFireRescueDepartmentStaff(String departmentName,List<String> positionType);
+    
+    
+    List<Map<String, Object>>   getDutyFirePerson(String dutyDate,String groupCode);
+    
+    Map<String, Object>  getCurentCarIsUserPhone(long carId);
+    
+    List<Map<String, Object>>    getOrgPersonTelphone(List<Map<String, Object>> companyIds);
 }
+
+

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

@@ -92,7 +92,7 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
 
     List<Map<String, Long>> countDeptByCompanyId(@Param("companyIdList") List<String> companyIdList);
 
-    List<Map<String,Object>> queryCompanyId(String bizOrgName);
+    List<Map<String,Object>> queryCompanyId(String bizOrgName,@Param("codes")List<String> codes);
 
     List<Map<String,Object>> queryCompanyIdNew(String bizOrgName);
 

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

@@ -34,7 +34,7 @@ public interface IDutyPersonService extends IDutyCommonService {
      */
     List<DutyPersonDto> findByDutyAreaId(Long dutyAreaId);
 
-    List<Map<String, Object>> queryByCompanyId();
+    List<Map<String, Object>> queryByCompanyId(List<String> bizNames);
 
     List<Map<String, Object>> queryByCompanyNew(String bizOrgName);
 }

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

@@ -119,7 +119,7 @@ public interface IOrgUsrService {
 
     OrgUsrDto updateByIdOrgUsr(OrgUsrDto OrgUsrDto, Long id) throws Exception;
 
-    void updateByIdOrgPerson(OrgPersonDto OrgPersonDto, Long id) throws Exception;
+    OrgPersonDto updateByIdOrgPerson(OrgPersonDto OrgPersonDto, Long id) throws Exception;
 
     OrgUsrFormDto selectCompanyById(Long id) throws Exception;
 
@@ -139,7 +139,7 @@ public interface IOrgUsrService {
 
     OrgUsrDto saveOrgDepartment(OrgDepartmentDto OrgDepartmentDto) throws Exception;
 
-    void updateByIdOrgDepartment(OrgDepartmentDto OrgDepartmentDto, Long id) throws Exception;
+    OrgDepartmentDto updateByIdOrgDepartment(OrgDepartmentDto OrgDepartmentDto, Long id) throws Exception;
 
     OrgDepartmentFormDto selectDepartmentById(Long id) throws Exception;
 

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

@@ -358,8 +358,11 @@ AND cft.type_code = (
 			where i.field_code  = 'userId' and i.field_value  is not null) c
 			on cb.instance_id  = c.id3
 			where to_days(cb.duty_date) = to_days(now()) and
-			a.deptId in ( select sequence_nbr from cb_org_usr cou where biz_org_name = '消防救援保障部' or
-biz_org_name = '综合办公室' or biz_org_name  = '消防支队' or biz_org_name  = '应急指挥科' )) r )
+			a.deptId in ( select sequence_nbr from cb_org_usr cou where biz_org_name in
+			<foreach item="item" index="index"  collection="bizNames" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		)) r )
     </select>
 
 

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

@@ -260,42 +260,315 @@
         order by instanceId desc
     </select>
   <select id="getDutyPersonByTeamIdAndCarId" resultType="java.util.Map">
-       SELECT
-	userId
+     SELECT
+	cfir.telephone AS mobilePhone,
+	hh.userId AS userId,
+	cou.biz_org_name AS userName,
+	cou.amos_org_id AS amosId
 FROM
 	(
 		SELECT
-			MAX(
+			userId,
+			instance_id
+		FROM
+			(
+				SELECT
+					MAX(
+						CASE
+						WHEN cbd.field_code = 'deptName' THEN
+							cbd.field_value
+						END
+					) AS deptName,
+					MAX(
+						CASE
+						WHEN cbd.field_code = 'userId' THEN
+							cbd.field_value
+						END
+					) AS userId,
+					cbd.instance_id
+				FROM
+					cb_dynamic_form_instance cbd
+				LEFT JOIN cb_duty_person_shift cps ON cbd.instance_id = cps.instance_id
+				WHERE
+					cps.duty_date =  #{dutyDate}
+				AND cps.is_delete = FALSE
+				AND cbd.group_code = 'dutyPerson'
+				GROUP BY
+					cbd.instance_id
+			) ss
+		WHERE
+			ss.deptName = #{departmentName}
+	) hh
+LEFT JOIN cb_org_usr cou ON hh.userId = cou.sequence_nbr
+LEFT JOIN (
+	SELECT
+		MAX(
+			CASE
+			WHEN cfi.field_code = 'telephone' THEN
+				cfi.field_value
+			END
+		) AS telephone,
+		cfi.instance_id
+	FROM
+		cb_dynamic_form_instance cfi
+) cfir ON cfir.instance_id = hh.userId
+    </select>
+      <select id="getDutyPersonByTeamIdAndAirId" resultType="java.util.Map">
+     SELECT
+	cfir.telephone AS mobilePhone,
+	hh.userId AS userId,
+	cou.biz_org_name AS userName,
+	cou.amos_org_id AS amosId
+FROM
+	(
+		SELECT
+			userId
+		FROM
+			(
+				SELECT
+					MAX(
+						CASE
+						WHEN cbd.field_code = 'userId' THEN
+							cbd.field_value
+						END
+					) AS userId,
+					MAX(
+						CASE
+						WHEN cbd.field_code = 'firstAidId' THEN
+							cbd.field_value
+						END
+					) AS firstAidId,
+					cbd.instance_id
+				FROM
+					cb_dynamic_form_instance cbd
+				LEFT JOIN cb_duty_person_shift cps ON cbd.instance_id = cps.instance_id
+				WHERE
+					cps.duty_date = #{dutyDate}
+				AND cps.is_delete = FALSE
+				AND cbd.group_code = 'dutyFirstAid'
+				GROUP BY
+					cbd.instance_id
+			) ss
+		WHERE
+			ss.firstAidId = #{firstAidId}
+	) hh
+LEFT JOIN cb_org_usr cou ON hh.userId = cou.sequence_nbr
+LEFT JOIN (
+	SELECT
+		MAX(
+			CASE
+			WHEN cfi.field_code = 'telephone' THEN
+				cfi.field_value
+			END
+		) AS telephone,
+		cfi.instance_id
+	FROM
+		cb_dynamic_form_instance cfi
+) cfir ON cfir.instance_id = hh.userId
+    </select>
+    <select id ="getFireRescueDepartmentStaff" resultType="java.util.Map">
+SELECT
+	dd.telephone AS mobilePhone,
+	cour.sequence_nbr AS userId,
+	cour.biz_org_name AS userName,
+	cour.amos_org_id AS amosId
+FROM
+	(
+		SELECT
+			Max(
 				CASE
-				WHEN cbd.field_code = #{carIdName} THEN
+				WHEN cbd.field_code = 'administrativePositionCode' THEN
 					cbd.field_value
 				END
-			) AS #{carIdName},
-			MAX(
+			) AS administrativePositionCode,
+			Max(
 				CASE
-				WHEN cbd.field_code = #{teamIdName} THEN
+				WHEN cbd.field_code = 'telephone' THEN
 					cbd.field_value
 				END
-			) AS #{teamIdName},
-			MAX(
+			) AS telephone,
+			Max(
 				CASE
-				WHEN cbd.field_code = #{userIdName} THEN
-					cbd.field_value
+				WHEN cbd.field_code = 'stateCode' THEN
+					cbd.field_value_label
 				END
-			) AS #{userIdName},
+			) AS stateCode,
 			cbd.instance_id
 		FROM
 			cb_dynamic_form_instance cbd
-		LEFT JOIN cb_duty_person_shift cps ON cbd.instance_id = cps.instance_id
 		WHERE
-			cps.duty_date = #{dutyDate}
-		AND cps.is_delete = FALSE
-		AND cbd.group_code = #{groupCode}
-		GROUP BY
+			cbd.instance_id IN (
+				SELECT
+					cou.sequence_nbr
+				FROM
+					cb_org_usr cou
+				WHERE
+					cou.parent_id = (
+						SELECT
+							sequence_nbr
+						FROM
+							cb_org_usr
+						WHERE
+							biz_org_name = #{departmentName}
+						
+					)
+				AND cou.biz_org_type = 'PERSON'
+			) group by  cbd.instance_id
+	) dd
+LEFT JOIN cb_org_usr cour ON dd.instance_id = cour.sequence_nbr
+WHERE
+ 		    <if test="positionType == null ">
+                 dd.administrativePositionCode IS NOT NULL
+            </if>
+            <if test="positionType != null">
+                 dd.administrativePositionCode in  
+					<foreach collection="positionType"  item="item" separator="," open="(" close=")" index="">
+      					 #{item, jdbcType=NUMERIC}
+   				  </foreach> 
+            </if>
+	</select>
+    <select id ="getDutyFirePerson" resultType="java.util.Map">
+  SELECT
+	dd.telephone AS mobilePhone
+FROM
+	(
+		SELECT
+			Max(
+				CASE
+				WHEN cbd.field_code = 'telephone' THEN
+					cbd.field_value
+				END
+			) AS telephone,
 			cbd.instance_id
+		FROM
+			cb_dynamic_form_instance cbd
+		WHERE
+			cbd.instance_id IN (
+				SELECT
+					userId
+				FROM
+					(
+						SELECT
+							MAX(
+								CASE
+								WHEN cbd.field_code = 'deptId' THEN
+									cbd.field_value
+								END
+							) AS deptId,
+							MAX(
+								CASE
+								WHEN cbd.field_code = 'userId' THEN
+									cbd.field_value
+								END
+							) AS userId,
+							cbd.instance_id
+						FROM
+							cb_dynamic_form_instance cbd
+						LEFT JOIN cb_duty_person_shift cps ON cbd.instance_id = cps.instance_id
+						WHERE
+							cps.duty_date =  #{dutyDate}
+						AND cps.is_delete = FALSE
+						AND cbd.group_code = #{groupCode}
+						GROUP BY
+							cbd.instance_id
+					) ss
+				WHERE
+					ss.deptId IN (
+						SELECT
+							sequence_nbr
+						FROM
+							cb_org_usr
+						WHERE
+							biz_org_name = '消防救援保障部'
+						AND biz_org_type = 'COMPANY'
+					)
+			)
+	) dd
+    
+    </select>
+    
+    
+    
+    
+    <select id='getCurentCarIsUserPhone'  resultType="java.util.Map">
+   
+   SELECT
+	ss.telephone AS mobilePhone,
+	cou.sequence_nbr AS userId,
+	cou.biz_org_name AS userName,
+	cou.amos_org_id AS amosId
+FROM
+	(
+    SELECT
+	field_value as telephone
+	,instance_id
+FROM
+	cb_dynamic_form_instance
+WHERE
+	group_code = '246'
+AND instance_id = (
+	SELECT
+		sequence_nbr
+	FROM
+		cb_org_usr
+	WHERE
+		amos_org_id = (
+			SELECT
+				amos_user_id
+			FROM
+				jc_user_car
+			WHERE
+				car_id = #{carId}
+		)
+) and field_code='telephone'
 	) ss
+LEFT JOIN cb_org_usr cou ON ss.instance_id = cou.sequence_nbr
+    </select>
+    
+    <select id='getOrgPersonTelphone' resultType="java.util.Map">
+    
+ SELECT
+	dd.telephone AS mobilePhone
+FROM
+	(
+		SELECT
+			Max(
+				CASE
+				WHEN cbd.field_code = 'administrativePositionCode' THEN
+					cbd.field_value_label
+				END
+			) AS administrativePositionCode,
+			Max(
+				CASE
+				WHEN cbd.field_code = 'telephone' THEN
+					cbd.field_value
+				END
+			) AS telephone,
+			Max(
+				CASE
+				WHEN cbd.field_code = 'stateCode' THEN
+					cbd.field_value_label
+				END
+			) AS stateCode,
+			cbd.instance_id
+		FROM
+			cb_dynamic_form_instance cbd
+		WHERE
+			cbd.instance_id IN (
+				SELECT
+					cou.sequence_nbr
+				FROM
+					cb_org_usr cou
+				WHERE
+					cou.parent_id in  
+					<foreach item="item" collection="companyIds" separator="," open="(" close=")" index="">
+      					 #{item.departmentId, jdbcType=NUMERIC}
+   				  </foreach> 
+				AND cou.biz_org_type = 'PERSON'
+			)group by  cbd.instance_id
+	) dd
 WHERE
-	ss.carId = #{carId}
-AND ss.teamId = #{teamId}
+	dd.administrativePositionCode IS NOT NULL    
     </select>
+    
 </mapper>

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

@@ -691,13 +691,17 @@ LEFT JOIN (
         select cou.biz_org_name bizOrgName,cou.sequence_nbr sequenceNbr ,cou .parent_id parentId,
         a.fireManagementPostCode, b.telephone from cb_org_usr cou
         left join (select i.instance_id id1 ,if(i.field_code = 'fireManagementPostCode',
-        i.field_value_label, null) as 'fireManagementPostCode' from cb_dynamic_form_instance i where i.field_code  = 'fireManagementPostCode'
+        i.field_value, null) as 'fireManagementPostCode' from cb_dynamic_form_instance i where i.field_code  = 'fireManagementPostCode'
         and i.field_value_label  is not null) a on cou .sequence_nbr = a.id1
         left join (select i.instance_id id2,if(i.field_code = 'telephone',
         i.field_value, null) as 'telephone' from cb_dynamic_form_instance i where i.field_code  = 'telephone'
         and i.field_value  is not null) b on cou .sequence_nbr = b.id2
         ) d where d.parentId in  (select sequence_nbr from cb_org_usr cou where biz_org_name = #{bizOrgName})
-        and (d.fireManagementPostCode = '消防安全管理人' or d.fireManagementPostCode = '消防安全责任人')
+        and (d.fireManagementPostCode in
+        <foreach item="item" index="index"  collection="codes" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        )
     </select>
 
     <select id="queryCompanyIdNew" resultType="map">

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
+import java.io.Serializable;
+
 import com.yeejoin.amos.component.rule.Label;
 import com.yeejoin.amos.component.rule.RuleFact;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.io.Serializable;
-import java.util.List;
-
 /**
  * 
  * <pre>
@@ -20,16 +20,12 @@ import java.util.List;
 @Data
 @RuleFact(value = "调派信息",project = "西咸机场119调派规则")
 public class AlertCallePowerTransferRo implements Serializable{
-
-
-
-
 	/**
 	 * <pre>
 	 * 
 	 * </pre>
 	 */
-	private static final long serialVersionUID = 4735920511849348360L;
+	private static final long serialVersionUID = 9053208791780047768L;
 
 	/**
 	 * 通用属性
@@ -86,7 +82,7 @@ public class AlertCallePowerTransferRo implements Serializable{
     private String contactPhone;
 
     @ApiModelProperty(value = "调派单位资源列表")
-    private List< PowerTransferCompanyDto> company;
+    private String company;
 
     @ApiModelProperty(value = "调派类型队伍")
     private String powerTransType;

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

@@ -26,7 +26,7 @@ public class AlertCalledRo implements Serializable{
 	 * 
 	 * </pre>
 	 */
-	private static final long serialVersionUID = 529623529216238088L;
+	private static final long serialVersionUID = -8755622977733065123L;
 
 	/**
 	 * 通用属性
@@ -73,9 +73,12 @@ public class AlertCalledRo implements Serializable{
     @Label(value = "警情报送类型(0，警情报送，1，警情续报，2，非警情确认，3，警情结案)")
     private String alertWay;
 
-    @Label(value = "警情续报，非警情确认，警情结案，选择人员ids")
+    @Label(value = "警情续报，非警情确认，警情结案，选择人员电话号码")
     private String ids;
 
+    @Label(value = "警情续报，非警情确认，警情结案，选择人员AmousIds")
+    private String usIds;
+
     @Label(value = "警情续报自定义内容")
     private String feedback;
 

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

@@ -30,6 +30,9 @@ public class AlertSubmittedSMSDto {
     @ApiModelProperty(value = "联系电话")
     private String userPhone;
 
+    @ApiModelProperty(value = "警情Id")
+    private String alertCallId;
+
     @ApiModelProperty(value = "协调单位")
     private String companyName;
 

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

@@ -52,4 +52,16 @@ public class PowerrTransferLog extends BaseEntity {
 	@TableField("send_content")
     private String sendContent;
 
+    /**
+     * 调派关联单位id
+     */
+    @TableField("power_transfer_company_id")
+    private Long powerTransferCompany;
+
+    /**
+     * 调派关联资源id
+     */
+    @TableField("power_transfer_company_resources_id")
+    private Long powerTransferCompanyResource;
+
 }

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

@@ -23,6 +23,7 @@ public enum AlertBusinessTypeEnum {
     警情初报("reportAlert", "297", "297","", "警情初报"),
     警情续报("followReportAlert", "313", "313","SMS_JCS_0006", "警情续报"),
     非警情确认("notAlert", "314", "314","SMS_JCS_0008", "非警情确认"),
+    力量调派("powerTransfer", "316", "316","SMS_JCS_DP", "力量调派"),
     警情结案("endAlert", "315", "315","SMS_JCS_0009", "警情结案");
 
     private String key;

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

@@ -28,7 +28,7 @@ public  enum  AlertStageEnums {
 	
 	RG("226",  "人工上报"),
 	DJ("228",  "对讲呼入"),
-	JK("388",  "监控中心报警"),
+	JK("388",  "监控中心报警"),//也是监控大队
 	DH("389",  "电话报警"),
 
 
@@ -41,7 +41,18 @@ public  enum  AlertStageEnums {
 	ZZZD("116", "企（事）业单位专职消防救援支队"),
 	YWDD("117", "企（事）业单位义务消防救援大队"),
 	YLJY("830", "企（事）业单位医疗救援队（站）"),
-	JKDD("118", "企（事）业单位监控大队");
+	DD("DD", "所属大队"),
+	JJZ("JJZ", "急救站"),
+	ZD("ZD", "消防支队"),
+	XJ("XJ", "消救部"),
+	ZH("ZH", "应急指挥科"),
+	BD("BD", "调派车辆指定人"),
+	监控大队("JK","监控大队"),
+	onDuty("onDuty", "值班单位"),
+	fireBrigade("fireBrigade", "岗位名称，规则配置"),
+	airportUnit("airportUnit", "人员职务规则配置"),
+	flag("flag", "值班单位"),
+	JKDD("6", "企（事）业单位监控大队");
 
 
 	

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

@@ -15,12 +15,12 @@
         jas.submission_method,
         jas.submission_method_code,
         jas.update_time,
-        jaso.sequence_nbr,
+        jaso.sequence_nbr sequenceNbr,
         jaso.company_name,
         jaso.user_name,
         jaso.user_phone
         from jc_alert_submitted jas
-        left join jc_alert_submitted_object jaso on jas.sequence_nbr = jaso.alert_submitted_id
+        right join jc_alert_submitted_object jaso on jas.sequence_nbr = jaso.alert_submitted_id
         where 1=1
         <if test="alertSubmittedDto.alertCalledId != null and alertSubmittedDto.alertCalledId != ''">
             and jas.alert_called_id = #{alertSubmittedDto.alertCalledId}
@@ -68,6 +68,7 @@
     <select id="getSchedulingContent" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedSMSDto">
         SELECT
             s.sequence_nbr,
+            s.alert_called_id alertCallId,
             s.submission_time,
             o.user_phone,
             o.company_name,

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

@@ -2,7 +2,9 @@ package com.yeejoin.amos.latentdanger.common.enums;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -47,7 +49,7 @@ public interface LatentDangerState {
         /**
          * 隐患二次审核确认
          */
-        隐患二次审核确认("隐患二次审核确认", "secondConfirm", "taskDispatch","onSiteConfirm", "1", ""),
+        隐患二次审核确认("隐患二次审核确认", "secondConfirm", "taskDispatch","onSiteConfirm", "1", "auditRecordPage"),
         /**
          * 整改任务分配
          */
@@ -187,15 +189,14 @@ public interface LatentDangerState {
             return enumName;
         }
 
-        public static String getEnumUrlByCode(String code) {
-            String enumUrl = "";
-            for(SupervisionDangerStateEnum type: SupervisionDangerStateEnum.values()) {
-                if (type.getCode().equals(code)) {
-                    enumUrl = type.getUrl();
-                    break;
-                }
+        public static Map<String, String> getEnumMapByCode(String code) {
+            Map<String, String> map = new HashMap<>();
+            SupervisionDangerStateEnum dangerEnum = getEnumByCode(code);
+            if (!ValidationUtil.isEmpty(dangerEnum)){
+                map.put("processState", dangerEnum.getProcessState());
+                map.put("url", dangerEnum.getUrl());
             }
-            return enumUrl;
+            return map;
         }
 
         public static List<Map<String, String>> getEnumList() {

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

@@ -36,4 +36,10 @@ public class UnitInfoApproveDto extends BaseDto {
     @ApiModelProperty(value = "0 注册审批 1 变更审批")
     private Integer approveType;
 
+    @ApiModelProperty(value = "企业入驻时间")
+    private Date approvedTime;
+
+    @ApiModelProperty(value = "提交时间")
+    private Date submitTime;
+
 }

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

@@ -142,10 +142,10 @@ public class UnitInfoDto extends BaseDto {
    private Boolean isChange;
 
   @ApiModelProperty(value = "提交时间开始")
-  private Date submitTimeStart ;
+  private String submitTimeStart ;
 
-  @ApiModelProperty(value = "接警时间结束")
-  private Date submitTimeEnd ;
+  @ApiModelProperty(value = "提交时间结束")
+  private String submitTimeEnd ;
 
  @ApiModelProperty(value = "分类名称")
   private String typeStr;
@@ -156,6 +156,13 @@ public class UnitInfoDto extends BaseDto {
  @ApiModelProperty(value = "企业二维码")
   private List<AttachmentDto> qrcode;
 
+ @ApiModelProperty(value = "详细地址全部")
+ private String fullAddress;
 
+ @ApiModelProperty(value = "企业入驻时间")
+ private Date approvedTime;
+
+ @ApiModelProperty(value = "提交时间")
+ private Date submitTime;
 
 }

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

@@ -245,4 +245,16 @@ public class UnitInfo extends BaseEntity {
     @TableField(value = "is_change")
     private Boolean isChange;
 
+
+    /**
+     * 企业入驻时间
+     */
+    @TableField("approved_time")
+    private Date approvedTime;
+    /**
+     * 提交时间
+     */
+    @TableField("submit_time")
+    private Date submitTime;
+
 }

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

@@ -214,4 +214,17 @@ public class UnitInfoChange extends BaseEntity {
 	@TableField("unit_status")
     private Integer unitStatus;
 
+
+    /**
+     * 企业入驻时间
+     */
+    @TableField("approved_time")
+    private Date approvedTime;
+
+    /**
+     * 提交时间
+     */
+    @TableField("submit_time")
+    private Date submitTime;
+
 }

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

@@ -20,4 +20,6 @@ public interface IUnitInfoService {
     UnitInfoDto approve(UnitInfoApproveDto approveDto);
 
     UnitInfoDto getDtoById(Long sequenceNbr);
+
+    UnitInfoDto getDtoByOrgId(Long sequenceNbr);
 }

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

@@ -82,8 +82,8 @@ public class OrgDepartmentController {
     @ApiOperation(httpMethod = "PUT", value = "更新部门数据", notes = "更新部门数据")
     public ResponseModel<Object> updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgDepartmentDto OrgDepartmentVo, @PathVariable Long id) throws Exception {
     	OrgDepartmentVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_DEPARTMENT);
-    	iOrgUsrService.updateByIdOrgDepartment(OrgDepartmentVo, id);
-        return ResponseHelper.buildResponse(null);
+
+        return ResponseHelper.buildResponse(iOrgUsrService.updateByIdOrgDepartment(OrgDepartmentVo, id));
     }
 
 

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

@@ -97,8 +97,8 @@ public class OrgPersonController {
         /*同步修改关联账号用户名 chenzhao*/
         AgencyUserModel amosUser = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
         OrgPersonVo.setAmosOrgCode(amosUser.getRealName());
-        iOrgUsrService.updateByIdOrgPerson(OrgPersonVo, id);
-        return ResponseHelper.buildResponse(null);
+
+        return ResponseHelper.buildResponse(  iOrgUsrService.updateByIdOrgPerson(OrgPersonVo, id));
     }
 
 

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

@@ -286,26 +286,16 @@ public Object BuildScheduleDetails(String dutyDay, Long shiftId, String postType
 	 if(!map20.containsKey(i.get("shiftName").toString())) {
 		 map20.put(ssString, ssString);
 	 }
-		
-		
-		
-		
+
 		System.out.println("ssssssssss");
 	});
 
 
-
-
-		
-		
-		
-		
-		
 	}
 
 	@Override
-    public   List<Map<String, Object>> queryByCompanyId(){
-        return   dutyPersonShiftMapper.queryByCompanyId();
+    public   List<Map<String, Object>> queryByCompanyId(List<String> bizNames){
+        return   dutyPersonShiftMapper.queryByCompanyId(bizNames);
     }
 
     @Override

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

@@ -12,7 +12,6 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
@@ -146,7 +145,9 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
      */
 	public List<Map<String, Object>> getDetailByTeamIdAndJobTitle(Long teamId,List<String> jobTitleArray) {
 		LambdaQueryWrapper<Firefighters> wrapper = new LambdaQueryWrapper<Firefighters>();
-		wrapper.in(Firefighters::getJobTitle, jobTitleArray);
+		if(jobTitleArray!=null && jobTitleArray.size()>0) {
+			wrapper.in(Firefighters::getJobTitleCode, jobTitleArray);
+		}
 		wrapper.eq(Firefighters::getIsDelete, false);
 		wrapper.eq(Firefighters::getFireTeamId, teamId);
 		wrapper.select(Firefighters::getMobilePhone);

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

@@ -66,6 +66,7 @@ import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.UserRolesEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.UserUnitTypeEnum;
+import com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper;
 import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService;
 import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
@@ -74,6 +75,8 @@ import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 
+import ch.qos.logback.core.joran.conditional.IfAction;
+
 /**
  * 机构/部门/人员表 服务实现类
  *
@@ -112,6 +115,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	FireStationServiceImpl fireStationServiceImpl;
 	@Value("${jcs.company.topic.add}")
 	private String airportAddTopic;
+	
+	@Autowired
+	DynamicFormInstanceMapper dynamicFormInstanceMapper;
 
 	public static List<OrgMenuDto> buildTreeParallel(List<OrgUsr> list) {
 
@@ -779,7 +785,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	@Override
-	public void updateByIdOrgPerson(OrgPersonDto OrgPersonVo, Long id) throws Exception {
+	public OrgPersonDto updateByIdOrgPerson(OrgPersonDto OrgPersonVo, Long id) throws Exception {
 		// 修改人员信息
 		OrgUsr orgUsr = new OrgUsr();
 		OrgUsr oriOrgUsr = getById(id);
@@ -805,10 +811,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			// orgUsr.setAmosOrgCode(user.getRealName()); 去掉AmosOrgCode by litw 2021年9月10日
 			orgUsr.setAmosOrgId(user.getUserId());
 		}
-
 		saveOrgUsr(orgUsr, oriOrgUsr);
 		// 保存动态表单数据
 		updateDynamicFormInstance(orgUsr.getSequenceNbr(), OrgPersonVo.getDynamicFormValue());
+		if (orgUsr.getBizOrgCode() != null){
+			OrgPersonVo.setBizOrgCode(orgUsr.getBizOrgCode());
+		}
+		return OrgPersonVo;
 	}
 
 	@Override
@@ -950,7 +959,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	@Override
-	public void updateByIdOrgDepartment(OrgDepartmentDto OrgDepartmentVo, Long id) throws Exception {
+	public OrgDepartmentDto updateByIdOrgDepartment(OrgDepartmentDto OrgDepartmentVo, Long id) throws Exception {
 		// 修改部门信息
 		OrgUsr orgUsr = new OrgUsr();
 		OrgUsr oriOrgUsr = getById(id);
@@ -966,6 +975,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		saveOrgUsr(orgUsr, oriOrgUsr);
 		// 保存动态表单数据
 		updateDynamicFormInstance(orgUsr.getSequenceNbr(), OrgDepartmentVo.getDynamicFormValue());
+		OrgDepartmentVo.setBizOrgCode(orgUsr.getBizOrgCode());
+		return OrgDepartmentVo ;
 	}
 
 	@Override
@@ -1861,16 +1872,29 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return resultMap;
 	}
 
-	public  List<Map<String,Object>> queryCompanyId(String bizOrgName) {
+	public  List<Map<String,Object>> queryCompanyId(String bizOrgName,List<String> codes) {
 
-		return orgUsrMapper.queryCompanyId(bizOrgName);
+		return orgUsrMapper.queryCompanyId(bizOrgName,codes);
 	}
 
 	public  List<Map<String,Object>> queryCompanyIdNew(String bizOrgName) {
 
 		return orgUsrMapper.queryCompanyIdNew(bizOrgName);
 	}
-
+	
+	
+	public List<Map<String,Object>> getuserDetail(Long departmentId,List<Map<String, Object>> resulLists){
+		OrgUsr resulList =this.baseMapper.selectById(departmentId);
+		if(resulList.getParentId()!=null) {
+			Map<String, Object> resultMap =new HashMap<String, Object>();
+			resultMap.put("departmentId", resulList.getSequenceNbr());
+			resulLists.add(resultMap);
+			return	getuserDetail(Long.parseLong(resulList.getParentId()),resulLists);
+		}else {
+			return resulLists;
+		}
+	}
+	
 
 	public List<AgencyUserModel> getAmosUserByOrgUser(String orgUserIds) throws Exception {
 		if (ValidationUtil.isEmpty(orgUserIds)) {

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

@@ -14,8 +14,11 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 特岗人员服务实现类
@@ -68,12 +71,30 @@ public class SpecialPositionStaffServiceImpl extends BaseService<SpecialPosition
         // 查询已有数据的岗位类型
         List<Long> positionStaffCodeList = this.baseMapper.getPositionStaffCodeList(false,companyId);
         // 排除已有数据的，返回
+        /*bug 3483 陈召 2021-11-18 开始*/
         for (int i = 0; i < menuList.size(); i++) {
+            //排除父岗位是否已有 有就删除
             if (positionStaffCodeList.contains(Long.valueOf(menuList.get(i).getKey()))) {
                 menuList.remove(i);
                 i--;
             }
+            //排除子岗位是否已有 有就删除
+            if (null != menuList.get(i).getChildren() && menuList.get(i).getChildren().size() > 0){
+                List<MenuFrom> children = menuList.get(i).getChildren();
+                for (int j= 0; j < children.size(); j++) {
+                    if (positionStaffCodeList.contains(Long.valueOf(children.get(j).getKey()))) {
+                        menuList.get(i).getChildren().remove(j);
+                        j--;
+                    }
+                    //当子岗位全部删除时 父岗位也删除
+                    if (children.size() == 0){
+                        menuList.remove(i);
+                        i--;
+                    }
+                }
+            }
         }
+        /*bug 3483 陈召 2021-11-18 结束*/
         HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
         objectObjectHashMap.put("GWMC", menuList);
         return objectObjectHashMap;

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/controller/PlanClassifyTreeController.java

@@ -19,6 +19,8 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
 @RestController
 @RequestMapping("/api/planClassifyTree")
@@ -29,6 +31,7 @@ public class PlanClassifyTreeController extends AbstractBaseController {
 	private IPlanClassifyTreeService planClassifyTreeService;
 
 	@ApiOperation(value = "创建分类")
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/save", method = RequestMethod.POST)
 	public ResponseModel create(@RequestBody PlanClassifyTree model) {
 		AgencyUserModel user = getUserInfo();
@@ -40,6 +43,7 @@ public class PlanClassifyTreeController extends AbstractBaseController {
 	}
 
 	@ApiOperation(value = "修改分类")
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/update", method = RequestMethod.PUT)
 	public ResponseModel update(@RequestBody PlanClassifyTree model) {
 		AgencyUserModel user = getUserInfo();
@@ -51,11 +55,13 @@ public class PlanClassifyTreeController extends AbstractBaseController {
 	}
 
 	@ApiOperation(value = "删除分类")
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/{ids}", method = RequestMethod.DELETE)
 	public ResponseModel delete(@PathVariable("ids") String ids) {
 		return CommonResponseUtil2.success(planClassifyTreeService.delete(ids));
 	}
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "查询分类树")
     @RequestMapping(value = "/tree", method = RequestMethod.GET)
 	public ResponseModel getTree() {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/config/StartLoader.java

@@ -50,10 +50,10 @@ public class StartLoader implements ApplicationRunner {
                     if (!ValidationUtil.isEmpty(obj)) {
                         JSONObject json = JSON.parseObject(obj);
                         AlertNewsDto alertNewsDto = new AlertNewsDto( "物联警情",
-                                  "物联设备发生警情，发生位置:"+json.get("address")!=null?json.get("address").toString():""+
-                                        ",事发单位:"+json.get("unitInvolvedName")!=null?json.get("unitInvolvedName").toString():""
-                                        +",联系人:"+json.get("contactUser")!=null?json.get("contactUser").toString():""
-                                        +",联系电话:"+json.get("contactPhone")!=null?json.get("contactPhone").toString():""+".请尽快处理！",
+                                  "物联设备发生警情，发生位置:"+(json.get("address")!=null?json.get("address").toString():"")+
+                                        ",事发单位:"+(json.get("unitInvolvedName")!=null?json.get("unitInvolvedName").toString():"")
+                                        +",联系人:"+(json.get("contactUser")!=null?json.get("contactUser").toString():"")
+                                        +",联系电话:"+(json.get("contactPhone")!=null?json.get("contactPhone").toString():"")+".请尽快处理！",
                                    json.get("id").toString(),  json);
                         emqKeeper.getMqttClient().publish(topicweb, JSONObject.toJSON(alertNewsDto).toString().getBytes("UTF-8"), 1, false);
                  }

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

@@ -7,17 +7,22 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledObjsDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledRo;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedSMSDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.SchedulingReportingDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
 import com.yeejoin.amos.boot.module.jcs.api.enums.SubmissionMethodEnum;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertCalledServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertSubmittedObjectServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertSubmittedServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.PowerTransferServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.RuleAlertCalledService;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.TemplateServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,8 +39,11 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -203,6 +211,8 @@ public class AlertSubmittedController extends BaseController {
             alertSubmittedService.getAlertSubmittedContent(alertCalledId, templateVos, companyName);
         } catch (IllegalAccessException e) {
             throw  new RuntimeException("系统异常");
+        } catch (ParseException e) {
+            e.printStackTrace();
         }
         return ResponseHelper.buildResponse(templateVos);
     }
@@ -216,10 +226,26 @@ public class AlertSubmittedController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}/scheduling_content", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取融合调度短信内容", notes = "获取融合调度短信内容")
-    public ResponseModel<AlertSubmittedSMSDto> getSchedulingContent(@PathVariable Long id) {
+    public ResponseModel<AlertSubmittedSMSDto> getSchedulingContent(@PathVariable Long id) throws ParseException {
         // 获取报送内容
         // 任务 4174  日常值班---融合调度----短信模版中的内容用户可以全部删除掉，按照自定义内容重新录入发送内容 by litw 2021年10月27日
         AlertSubmittedSMSDto schedulingContent = alertSubmittedService.getSchedulingContent(id);
+        AlertCalledObjsDto alertCalledVo  = (AlertCalledObjsDto) alertCalledService.selectAlertCalledByIdNoRedisNew(Long.valueOf(schedulingContent.getAlertCallId()));
+        /**
+         * 构建警情报送规则对象
+         */
+        AlertCalledRo alertCalledRo = new AlertCalledRo();
+        AlertCalled alertCalled = alertCalledVo.getAlertCalled();
+
+        String replaceContent = RuleAlertCalledService.init(alertCalledRo,alertCalledVo);
+
+        Map<String, String> definitions = new HashMap<>();
+        definitions.put("$type",alertCalled.getAlertType());
+        definitions.put("$callTime", DateUtils.dateTimeToDateString(alertCalled.getCallTime()));
+        definitions.put("$replaceContent",replaceContent);
+        definitions.put("$address",alertCalled.getAddress());
+        String content = getTaskInformation( schedulingContent.getSubmissionTemplate(),definitions);
+        schedulingContent.setSubmissionTemplate(content);
         if(!ValidationUtil.isEmpty(schedulingContent.getSubmissionContent())) {
             try {
                 JSON.parseObject(schedulingContent.getSubmissionContent());
@@ -230,5 +256,12 @@ public class AlertSubmittedController extends BaseController {
         }
         return ResponseHelper.buildResponse(schedulingContent);
     }
+
+    private String getTaskInformation(String content, Map<String, String> definitions) {
+        int size = definitions.size();
+        String[] keys = definitions.keySet().toArray(new String[size]);
+        String[] values = definitions.values().toArray(new String[size]);
+        return StringUtils.replaceEach(content, keys, values);
+    }
 }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/rule/action/PowerTransferAction.java

@@ -3,11 +3,14 @@ package com.yeejoin.amos.boot.module.jcs.biz.rule.action;
 
 import java.util.List;
 
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.PowerrTransferLogServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCallePowerTransferRo;
+import com.yeejoin.amos.boot.module.jcs.api.enums.FireBrigadeTypeEnum;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertSubmittedServiceImpl;
 import com.yeejoin.amos.component.rule.RuleActionBean;
 import com.yeejoin.amos.component.rule.RuleMethod;
@@ -34,6 +37,10 @@ public class PowerTransferAction {
     private AlertSubmittedServiceImpl alertSubmittedService;
 
 
+	@Autowired
+	PowerrTransferLogServiceImpl powerrTransferLogServiceImpl;
+
+
 
     /**
      * 短信报送
@@ -44,14 +51,22 @@ public class PowerTransferAction {
      * @param object   模板内容对象
      * @throws Exception 异常
      */
-    @RuleMethod(methodLabel = "短信报送", project = "西咸机场119接处警规则")
+    @SuppressWarnings("rawtypes")
+	@RuleMethod(methodLabel = "短信报送", project = "西咸机场119接处警规则")
     public void sendcmd(String smsCode, String sendType, List sendIds, Object object) throws Exception {
-
-     //   alertSubmittedService.ruleCallbackAction(smsCode, sendIds, object);
-    	System.out.println("8796w39879873298798");
-
+    	if (object instanceof AlertCallePowerTransferRo) {
+
+			AlertCallePowerTransferRo calledRo = (AlertCallePowerTransferRo) object;
+			powerrTransferLogServiceImpl.savePowerTransferLog(calledRo);
+
+			calledRo.getPowerTransType();
+			if (FireBrigadeTypeEnum.专职消防队.getKey().equals(calledRo.getPowerTransType())) {
+				 alertSubmittedService.ruleCallbackActionForPowerTransferForCar(smsCode, sendIds, object);//消防车辆
+			} else if (FireBrigadeTypeEnum.医疗救援队.getKey().equals(calledRo.getPowerTransType())) {
+			    alertSubmittedService.ruleCallbackActionForPowerTransferForAid(smsCode, sendIds, object);//120急救站
+			} else if (FireBrigadeTypeEnum.监控大队.getKey().equals(calledRo.getPowerTransType())) {
+				 alertSubmittedService.ruleCallbackActionForPowerTransferForSurvBrigade(smsCode, sendIds, object);//监控大队
+			}
+    	}
     }
-
-
-
 }

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

@@ -369,7 +369,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 				alertCalledObjsDto.setAlertFormValue(alertFormValuelist);
 				// 警情报送
 				// 调用规则  警情初报
-				ruleAlertCalledService.fireAlertCalledRule(alertCalledObjsDto, AlertBusinessTypeEnum.警情初报.getCode(), null);
+				ruleAlertCalledService.fireAlertCalledRule(alertCalledObjsDto, AlertBusinessTypeEnum.警情初报.getCode(), null,null,null);
 				// 通知实战指挥页面发送mqtt 默认发送 String 类型 0, 新警情 1 警情状态变化
 				emqKeeper.getMqttClient().publish(topic, "0".getBytes(), RuleConfig.DEFAULT_QOS, true);
 				/**
@@ -377,9 +377,6 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 				 */
 				eSAlertCalledService.saveAlertCalledToES(alertCalled);
 			}
-
-
-
 			return alertCalledObjsDto;
 		} catch (Exception e) {
 			e.printStackTrace();

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 import java.lang.reflect.Field;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -13,19 +14,27 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
+import com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IFireTeamService;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCallePowerTransferRo;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto;
 import org.apache.commons.lang3.ObjectUtils;
 import org.eclipse.paho.client.mqttv3.MqttException;
+import org.eclipse.paho.client.mqttv3.MqttPersistenceException;
 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.typroject.tyboot.component.emq.EmqKeeper;
-import org.typroject.tyboot.core.foundation.utils.StringUtil;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -56,7 +65,6 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.SchedulingReportingDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateExtendDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmittedObject;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
@@ -72,32 +80,14 @@ import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedObjectService
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedService;
 import com.yeejoin.amos.boot.module.jcs.biz.rule.action.AlertCalledAction;
 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.typroject.tyboot.component.emq.EmqKeeper;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-import java.lang.reflect.Field;
-import java.util.ArrayList;
+
+
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
+
 import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
+
 
 /**
  * 警情报送记录 服务实现类
@@ -146,6 +136,14 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
 
     @Autowired
     EquipFeignClient equipFeignClient;
+
+    @Autowired
+    FireTeamServiceImpl fireTeamServiceImpl;
+
+    @Autowired
+    IFireTeamService fireTeamService;
+
+
     @Autowired
     PowerTransferCompanyResourcesServiceImpl powerTransferCompanyResourcesService;
     @Autowired
@@ -154,6 +152,9 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
     @Autowired
     PowerTransferCompanyMapper powerTransferCompanyMapper;
 
+    @Autowired
+    DynamicFormInstanceMapper dynamicFormInstanceMapper;
+
     @Override
     public SchedulingReportingDto listSchedulingByParam(AlertSubmittedDto queryParam) {
         SchedulingReportingDto schedulingReportingDto = new SchedulingReportingDto();
@@ -186,11 +187,29 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                     alertSubmittedExtDto.setExtraInfo(String.format(_extraInfo, alertSubmittedExtDto.getCompanyName(),
                             alertSubmittedExtDto.getUserName()));
                     TemplateExtendDto template = templateService.getByType(alertSubmittedExtDto.getBusinessTypeCode());
-                    String richContent = template.getRichContent();
+
+                    AlertCalledObjsDto alertCalledVo  = (AlertCalledObjsDto) alertCalledService.selectAlertCalledByIdNoRedisNew(queryParam.getAlertCalledId());
+                    AlertCalled alertCalled = alertCalledVo.getAlertCalled();
+                    /**
+                     * 构建警情报送规则对象
+                     */
+                    AlertCalledRo alertCalledRo = new AlertCalledRo();
+
+                    String replaceContent = RuleAlertCalledService.init(alertCalledRo,alertCalledVo);
+
+                    Map<String, String> definitions = new HashMap<>();
+                    definitions.put("$type",alertCalled.getAlertType());
+                    definitions.put("$callTime",DateUtils.dateTimeToDateString(alertCalled.getCallTime()));
+                    definitions.put("$replaceContent",replaceContent);
+                    definitions.put("$address",alertCalled.getAddress());
+                    String content = getTaskInformation( template.getRichContent(),definitions);
+
                     alertSubmittedExtDto.setSubmissionContentValue(JSONObject.parseObject(alertSubmittedExtDto.getSubmissionContent()));
-                    alertSubmittedExtDto.setSubmissionContent(richContent);
+                    alertSubmittedExtDto.setSubmissionContent(content);
                 } catch (JSONException e) {
                     alertSubmittedExtDto.setSubmissionContentValue(alertSubmittedExtDto.getSubmitContent());
+                } catch (ParseException e) {
+                    e.printStackTrace();
                 }
             });
             schedulingReportingDto.setSchedulingReportingList(alertSubmittedExtDtoList);
@@ -211,7 +230,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
             alertCalledVo.setAlertCalled(alertCalled);
 
             // 调用规则
-            ruleAlertCalledService.fireAlertCalledRule(alertCalledVo, map.get("alertWay"),map.get("mobiles"));
+            ruleAlertCalledService.fireAlertCalledRule(alertCalledVo, map.get("alertWay"),map.get("mobiles"), map.get("usIds"), map.get("feedBack"));
             //通知实战指挥页面发送mqtt 默认发送 String 类型 0, 新警情 1 警情状态变化
             emqKeeper.getMqttClient().publish(powertopic, "0".getBytes(), RuleConfig.DEFAULT_QOS, true);
         } catch (MqttException e) {
@@ -256,7 +275,10 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                     if(alertTypeCode.equals(AlertStageEnums.YBHZ.getCode()) || alertTypeCode.equals(AlertStageEnums.HKJY.getCode())) {
                         if(e.containsKey("onDuty")) {
                             // 当日值班人员：获值班表中包括消救部、综合办公室、消防支队、应急指挥科的值班人员。
-                            List<Map<String, Object>> mapList = iDutyPersonService.queryByCompanyId();
+                            String [] arr = e.get("onDuty").toString().split(",");
+                            List<String> list = Arrays.asList(arr);
+
+                            List<Map<String, Object>> mapList = iDutyPersonService.queryByCompanyId(list);
                             orgUsers.addAll(mapList);
                         }
                         if(e.containsKey("fireBrigade")) {
@@ -271,16 +293,20 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                             });
 
                         }
-                        if(e.containsKey("airportUnit")) {
-                            //  根据人员职务：干部&领导  机场单位 模块 消防急救保障部中，“人员职务”不为空的人员
-                            List<Map<String, Object>> mapList = iOrgUsrService.queryCompanyIdNew("消防救援保障部");
+
+                        if(e.containsKey("name")) {
+                            //  消防救援保障部
+                            List<Map<String, Object>> mapList = iOrgUsrService.queryCompanyIdNew(e.get("name").toString());
                             orgUsers.addAll(mapList);
                         }
 
                         // 安运部
                         if(e.get("type").toString().equals("AY")) {
-                                if(e.containsKey("airportPost")) {
-                                    List<Map<String, Object>> mapList = iOrgUsrService.queryCompanyId("安运部");
+                                if(e.containsKey("name")) {
+                                    String [] arr = e.get("airportPost").toString().split(",");
+                                    List<String> list = Arrays.asList(arr);
+
+                                    List<Map<String, Object>> mapList = iOrgUsrService.queryCompanyId(e.get("name").toString(),list);
                                     orgUsers.addAll(mapList);
                                 }
                         }
@@ -288,7 +314,9 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                         // 事发单位
                         if(e.get("type").toString().equals("SF")) {
                             if(e.containsKey("airportPost")) {
-                                List<Map<String, Object>> mapList = iOrgUsrService.queryCompanyId(unitInvolved);
+                                String [] arr = e.get("airportPost").toString().split(",");
+                                List<String> list = Arrays.asList(arr);
+                                List<Map<String, Object>> mapList = iOrgUsrService.queryCompanyId(unitInvolved,list);
                                 orgUsers.addAll(mapList);
                             }
                         }
@@ -298,20 +326,19 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                     if(alertTypeCode.equals(AlertStageEnums.HKJY.getCode())  || alertTypeCode.equals(AlertStageEnums.LYXC.getCode())
                             || alertTypeCode.equals(AlertStageEnums.ZJBZ.getCode()) || alertTypeCode.equals(AlertStageEnums.QTJQ.getCode())) {
                         if(e.containsKey("onDuty")) {
-                            List<Map<String, Object>> mapList = iDutyPersonService.queryByCompanyNew("消防支队");
+                            List<Map<String, Object>> mapList = iDutyPersonService.queryByCompanyNew(e.get("name").toString());
                             orgUsers.addAll(mapList);
                         }
                     }
 
                     // 120急救
                     if(alertTypeCode.equals(AlertStageEnums.JJJQ.getCode())) {
-                        if (e.containsKey("onDuty")) {
-                            List<Map<String, Object>> mapList = iDutyPersonService.queryByCompanyNew("急救科");
-                            orgUsers.addAll(mapList);
-                        }
-                        if (e.containsKey("airportUnit")) {
-                            List<Map<String, Object>> mapList = iOrgUsrService.queryCompanyId("急救科");
+                        if (e.containsKey("name")) {
+                            List<Map<String, Object>> mapList = iDutyPersonService.queryByCompanyNew(e.get("name").toString());
                             orgUsers.addAll(mapList);
+
+                            List<Map<String, Object>> mapList1 = iOrgUsrService.queryCompanyIdNew(e.get("name").toString());
+                            orgUsers.addAll(mapList1);
                         }
                     }
             });
@@ -325,6 +352,21 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                 // 警情初报 --- 续报 结案
                 if(alertWay.equals(AlertBusinessTypeEnum.警情初报.getCode())) {
                     alertSubmitted.setBusinessType(AlertBusinessTypeEnum.警情初报.getName());
+
+                    Optional<SubmissionMethodEnum> submissionMethodEnum = Optional.of(SubmissionMethodEnum.SMS);
+                    alertSubmitted.setSubmissionMethodCode(submissionMethodEnum.get().getCode());
+                    alertSubmitted.setSubmissionMethod(submissionMethodEnum.get().getName());
+                    Optional<AlertSchedulingTypeEnum> alertSchedulingTypeEnum = Optional.of(AlertSchedulingTypeEnum.融合调度);
+                    alertSubmitted.setSchedulingTypeCode(alertSchedulingTypeEnum.get().getCode());
+                    alertSubmitted.setSchedulingType(alertSchedulingTypeEnum.get().getName());
+                    alertSubmitted.setSubmissionContent(JSONObject.toJSONString(objectToMap(calledRo)));
+
+                    alertSubmitted.setUpdateTime(new Date());
+                    alertSubmitted.setSubmissionTime(new Date());
+
+                    this.baseMapper.insert(alertSubmitted);
+                    alertSubmittedId = alertSubmitted.getSequenceNbr().toString();
+
                 } else if(alertWay.equals(AlertBusinessTypeEnum.警情续报.getCode())) {
                     alertSubmitted.setBusinessType(AlertBusinessTypeEnum.警情续报.getName());
                     sCode = "SMS_JCS_XB";
@@ -336,35 +378,33 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                     sCode = "SMS_JCS_QR";
                 }
 
-                Optional<SubmissionMethodEnum> submissionMethodEnum = Optional.of(SubmissionMethodEnum.SMS);
-                alertSubmitted.setSubmissionMethodCode(submissionMethodEnum.get().getCode());
-                alertSubmitted.setSubmissionMethod(submissionMethodEnum.get().getName());
-                Optional<AlertSchedulingTypeEnum> alertSchedulingTypeEnum = Optional.of(AlertSchedulingTypeEnum.融合调度);
-                alertSubmitted.setSchedulingTypeCode(alertSchedulingTypeEnum.get().getCode());
-                alertSubmitted.setSchedulingType(alertSchedulingTypeEnum.get().getName());
-                alertSubmitted.setSubmissionContent(JSONObject.toJSONString(objectToMap(calledRo)));
-//                String token = RequestContext.getToken();
-//                ReginParams reginParams = JSONObject.parseObject(.get(RedisredisUtilsKey.buildReginKey(RequestContext.getExeUserId(),token)).toString(),
-//                        ReginParams.class);
-//                alertSubmitted.setRecUserName(reginParams.getUserModel().getUserName());
-//                alertSubmitted.setSender(reginParams.getUserModel().getUserName());
-                alertSubmitted.setUpdateTime(new Date());
-                alertSubmitted.setSubmissionTime(new Date());
-
-                this.baseMapper.insert(alertSubmitted);
-                alertSubmittedId = alertSubmitted.getSequenceNbr().toString();
-                Optional<AlertBusinessTypeEnum> alertBusinessTypeEnum =
-                        EnumsUtils.getEnumObject(AlertBusinessTypeEnum.class,
-                                e -> e.getCode().equals(calledRo.getAlertTypeCode()));
-                smsCode = alertBusinessTypeEnum.get().getSms_code();
-            // 组装人员信息
+            AlertSubmitted alertSubmittedNew = null;
+            Optional<AlertBusinessTypeEnum> alertBusinessTypeEnum =
+                    EnumsUtils.getEnumObject(AlertBusinessTypeEnum.class,
+                            e -> e.getCode().equals(calledRo.getAlertTypeCode()));
+            smsCode = alertBusinessTypeEnum.get().getSms_code();
+
+
+            if(!alertWay.equals(AlertBusinessTypeEnum.警情初报.getCode())) {
+                LambdaQueryWrapper<AlertSubmitted> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(AlertSubmitted::getAlertCalledId,alertCalledId);
+                queryWrapper.orderByDesc(AlertSubmitted::getSequenceNbr);
+                List<AlertSubmitted> alertSubmitteds = alertSubmittedMapper.selectList(queryWrapper);
+                alertSubmittedNew = alertSubmitteds.get(0);
+
+            }
 
+            // 组装人员信息
             for (Map<String, Object> orgUser : orgUsers) {
                 AlertSubmittedObject alertSubmittedObject = new AlertSubmittedObject();
-                alertSubmittedObject.setAlertSubmittedId(Long.parseLong(alertSubmittedId));
+                if(!alertWay.equals(AlertBusinessTypeEnum.警情初报.getCode())) {
+                    alertSubmittedObject.setAlertSubmittedId(alertSubmittedNew.getSequenceNbr());
+                } else {
+                    alertSubmittedObject.setAlertSubmittedId(Long.parseLong(alertSubmittedId));
+                }
+
                 alertSubmittedObject.setType(false);
-//                alertSubmittedObject.setCompanyId(Long.valueOf((String) orgUser.get("parentId")));
-//                alertSubmittedObject.setCompanyName((String) orgUser.get("parenName"));
+
                 alertSubmittedObject.setUserId(Long.valueOf(String.valueOf(orgUser.get("sequenceNbr"))));
                 alertSubmittedObject.setUserName((String) orgUser.get("bizOrgName"));
 
@@ -374,6 +414,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                 }
                 alertSubmittedObjectList.add(alertSubmittedObject);
             }
+
             // 组装报送内容
             smsParams.put("callTimeStr", calledRo.getCallTimeStr());
             smsParams.put("address", calledRo.getAddress());
@@ -416,20 +457,15 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
         String alertWay = "";
         Map<String,String> map = new HashMap<>();
         Set<String> mobiles = new HashSet<>();
+        List<Long> userIds = new ArrayList<>();
         if (alertSubmittedId == null) {
-
             // 1.保存警情记录主表
             AlertSubmitted alertSubmitted = new AlertSubmitted();
             String bussTypeCode;
             alertSubmitted.setAlertCalledId(alertSubmittedDto.getAlertCalledId());
             // 任务 4174  日常值班---融合调度----短信模版中的内容用户可以全部删除掉，按照自定义内容重新录入发送内容 by litw 2021年10月27日
-            if("316".equals(alertSubmittedDto.getBusinessTypeCode())) {
-                alertSubmitted.setBusinessTypeCode(AlertBusinessTypeEnum.警情续报.getCode());
-                bussTypeCode = AlertBusinessTypeEnum.警情续报.getCode();
-            } else {
-                alertSubmitted.setBusinessTypeCode(alertSubmittedDto.getBusinessTypeCode());
-                bussTypeCode = alertSubmittedDto.getBusinessTypeCode();
-            }
+            alertSubmitted.setBusinessTypeCode(alertSubmittedDto.getBusinessTypeCode());
+            bussTypeCode = alertSubmittedDto.getBusinessTypeCode();
 
             Optional<AlertBusinessTypeEnum> businessTypeEnum = EnumsUtils.getEnumObject(AlertBusinessTypeEnum.class,
                     e -> e.getCode().equals(bussTypeCode));
@@ -446,13 +482,8 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
             alertSubmitted.setSchedulingType(alertSchedulingTypeEnum.get().getName());
 
             // 任务 4174  日常值班---融合调度----短信模版中的内容用户可以全部删除掉，按照自定义内容重新录入发送内容 by litw 2021年10月27日
-            if("316".equals(alertSubmittedDto.getBusinessTypeCode())) {
-                JSONObject jsonObject = JSON.parseObject(alertSubmittedDto.getSubmitContent().toJSONString());
-                alertSubmitted.setSubmissionContent(jsonObject.get("custom").toString());
-            } else {
-                alertSubmitted.setBusinessTypeCode(alertSubmittedDto.getBusinessTypeCode());
-                alertSubmitted.setSubmissionContent(alertSubmittedDto.getSubmitContent().toJSONString());
-            }
+            alertSubmitted.setBusinessTypeCode(alertSubmittedDto.getBusinessTypeCode());
+            alertSubmitted.setSubmissionContent(alertSubmittedDto.getSubmitContent().toJSONString());
 
             alertSubmitted.setSender(userName);
             alertSubmitted.setRecUserName(userName);
@@ -489,6 +520,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                     alertSubmittedObject.setCompanyId(company.getCompanyId());
                     alertSubmittedObject.setCompanyName(company.getCompanyName());
                     alertSubmittedObject.setUserId(person.getPersonId());
+                    userIds.add(person.getPersonId());
                     alertSubmittedObject.setUserName(person.getPersonName());
                     alertSubmittedObject.setUserPhone(person.getPersonPhone());
                     alertSubmittedObject.setRecUserName(userName);
@@ -499,6 +531,24 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                 });
             });
         }
+
+        // 查询AmousUserId
+        LambdaQueryWrapper<OrgUsr> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(true, OrgUsr::getSequenceNbr, userIds);
+        List<String> usIds = new ArrayList<>();
+        List<OrgUsr> list = orgUsrService.getBaseMapper().selectList(queryWrapper);
+        if(null != list && list.size() > 0) {
+            list.stream().forEach(e->{
+                if(!ValidationUtil.isEmpty(e.getAmosOrgId())) {
+                    usIds.add(e.getAmosOrgId());
+                }
+            });
+
+            map.put("usIds",  StringUtils.join(usIds.toArray(new String[userIds.size()]),","));
+        } else {
+            map.put("usIds",  "");
+        }
+
         alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
 
         // 3.更新警情状态
@@ -544,18 +594,17 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
         }
 
         // 4.发送任务消息
-        // 4.1组织短信内容
-//        HashMap<String, String> smsParams = new HashMap<>();
-//        JSONObject submitContent = alertSubmittedDto.getSubmitContent();
-//        if(!"316".equals(alertSubmittedDto.getBusinessTypeCode())) {
-//            smsParams.put("alertType", submitContent.get("alertType").toString());
-//            smsParams.put("trappedNum", submitContent.get("trappedNum").toString());
-//            smsParams.put("companyName", submitContent.get("companyName").toString());
-//        }
-
-        // 4.2调用短信发送接口
-        //  alertCalledAction.sendAlertCalleCmd(smsCode, mobiles, smsParams);
+        // 4.1组织短信内容  废弃
+
+        JSONObject submitContent = alertSubmittedDto.getSubmitContent();
+
+        String feedBack = submitContent.get("editContent") != null ?  submitContent.get("editContent").toString(): "";
 
+
+        // 4.2调用短信发送接口 废弃
+        //  alertCalledAction.sendAlertCalleCmd(smsCode, mobiles, smsParams);\
+
+        map.put("feedBack",feedBack);
         map.put("alertWay",alertWay);
         map.put("mobiles", StringUtils.join(mobiles,","));
         return map;
@@ -580,10 +629,20 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
         alertCalledAction.sendAlertCalleCmd(smsCode, mobiles, smsParams);
     }
 
-    public void getAlertSubmittedContent(Long alertCalledId, ArrayList<TemplateDto> templateDtos, String companyName) throws IllegalAccessException {
+    public void getAlertSubmittedContent(Long alertCalledId, ArrayList<TemplateDto> templateDtos, String companyName) throws IllegalAccessException, ParseException {
         AlertCalled alertCalled = alertCalledService.getById(alertCalledId);
         Map<String, Object> map = objectToMap(alertCalled);
         map.put("companyName", companyName);
+        map.put("editContent", "可自编辑续报内容");
+
+        AlertCalledObjsDto alertCalledVo  = (AlertCalledObjsDto) alertCalledService.selectAlertCalledByIdNoRedisNew(alertCalled.getSequenceNbr());
+
+        /**
+         * 构建警情报送规则对象
+         */
+        AlertCalledRo alertCalledRo = new AlertCalledRo();
+
+        String replaceContent = RuleAlertCalledService.init(alertCalledRo,alertCalledVo);
 
         // 获取模板内容
         List<DataDictionary> dataDictionaries =
@@ -592,21 +651,13 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
         for (DataDictionary dataDictionary : dataDictionaries) {
             Template template = templateService.getOne(new QueryWrapper<Template>().eq("type_code",
                     dataDictionary.getCode()).eq("format", true));
-            List<PowerTransferCompanyDto> lastPowerTransferCompany;
-            if ("警情续报".equals(template.getType()) && (lastPowerTransferCompany =
-                    powerTransferService.getLastPowerTransferCompany(alertCalledId)).size() > 0) {
-                map.put("businessType", template.getType());
-                // 获取力量调派内容
-                StringBuilder companyNames = new StringBuilder();
-                StringBuilder resourcesInfo = new StringBuilder();
-                for (PowerTransferCompanyDto powerTransferCompanyDto : lastPowerTransferCompany) {
-                    companyNames.append(powerTransferCompanyDto.getCompanyName()).append("、");
-                    resourcesInfo.append(powerTransferCompanyDto.getType()).append(powerTransferCompanyDto.getResourcesCount()).append("辆、");
-                }
-                map.put("companyNames", companyNames.deleteCharAt(companyNames.length() - 1).toString());
-                map.put("resourcesInfo", resourcesInfo.deleteCharAt(resourcesInfo.length() - 1).toString());
-                map.put("transferTime", lastPowerTransferCompany.get(0).getRecDate());
-            }
+            Map<String, String> definitions = new HashMap<>();
+            definitions.put("$type",alertCalled.getAlertType());
+            definitions.put("$callTime",DateUtils.dateTimeToDateString(alertCalled.getCallTime()));
+            definitions.put("$replaceContent",replaceContent);
+            definitions.put("$address",alertCalled.getAddress());
+            String content = getTaskInformation( template.getContent(),definitions);
+            template.setContent(content);
             TemplateDto templateDto = new TemplateDto();
             BeanUtils.copyProperties(template, templateDto);
             templateDto.setData(map);
@@ -614,6 +665,13 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
         }
     }
 
+    private String getTaskInformation(String content, Map<String, String> definitions) {
+        int size = definitions.size();
+        String[] keys = definitions.keySet().toArray(new String[size]);
+        String[] values = definitions.values().toArray(new String[size]);
+        return StringUtils.replaceEach(content, keys, values);
+    }
+
     @Override
     public AlertSubmittedSMSDto getSchedulingContent(Long id) {
         return this.baseMapper.getSchedulingContent(id);
@@ -738,4 +796,404 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
         }
         return map;
     }
+
+
+
+    @SuppressWarnings("unchecked")
+    public void ruleCallbackActionForPowerTransferForCar(String smsCode, List sendIds, Object object)
+            throws IllegalAccessException, MqttPersistenceException, MqttException {
+        List<AlertSubmittedObject> alertSubmittedObjectList = Lists.newArrayList();
+
+        Set<String> mobiles = new HashSet<>();
+        HashMap<String, String> smsParams = new HashMap<>();
+        String alertCalledId = null;
+        Set<Map<String, Object>> userIdList = new HashSet<Map<String, Object>>();
+        // 判断当前的规则中是否指定了给当前的车辆驾驶员
+        boolean designatedDriver = false;
+
+        for (Object id : sendIds) {
+            JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(id));
+            if (jsonObject.containsKey("type") && jsonObject.getString("type").equals(AlertStageEnums.BD.getCode())) {
+                designatedDriver = true;
+            }
+        }
+
+        List<Map<String, Object>> orgUsers = new LinkedList<>();
+        String sCode = "";
+        if (object instanceof AlertCallePowerTransferRo) {
+            AlertCallePowerTransferRo calledRo = (AlertCallePowerTransferRo) object;
+            String alertSubmittedId = calledRo.getAlertSubmittedId();
+            alertCalledId = calledRo.getSequenceNbr();
+            //先获取消救部领导、消救部值班人员信息
+            sendIds.stream().forEach(e -> {
+                JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(e));
+                // 消救部
+                if (jsonObject.containsKey("airportUnit")) {
+                    String departmentName=	jsonObject.getString("name");
+                    if (jsonObject.containsKey("airportUnit")) { {
+                        List<Map<String, Object>> mapList = dynamicFormInstanceMapper.getFireRescueDepartmentStaff(departmentName,null);
+                        userIdList.addAll(mapList);
+                    }
+
+                        if(jsonObject.containsKey("onDuty")) {
+                            List<Map<String, Object>> mapList = dynamicFormInstanceMapper.getDutyPersonByTeamIdAndCarId(DateUtils.getDateNowShortStr(),departmentName);
+                            userIdList.addAll(mapList);
+                        }
+                    }
+                }
+            });
+            List<Object> companyDetail = JSONArray.parseArray(JSON.toJSON(calledRo.getCompany()).toString(),Object.class);
+            for (Object powerTransferCompanyDto : companyDetail) {
+                PowerTransferCompanyDto 	powerDto =	JSONObject.parseObject(JSON.toJSON(powerTransferCompanyDto).toString(), PowerTransferCompanyDto.class);
+                Long companyId = powerDto.getCompanyId();
+                String companyName = powerDto.getCompanyName();
+                StringBuffer resourcesNum = new StringBuffer();
+                Set<Map<String, Object>> sendUserIds = new HashSet<Map<String, Object>>();
+                //FireTeam fireTeam= fireTeamServiceImpl.getById(companyId);
+                String alertTypeCode = calledRo.getAlertTypeCode();
+                FireTeam fireTeam= fireTeamServiceImpl.getById(companyId);
+                sendIds.stream().forEach(e -> {
+                    JSONObject jsonObject1 = JSONObject.parseObject(JSONObject.toJSONString(e));
+                    if (jsonObject1.containsKey("type") && (jsonObject1.getString("type").equals(AlertStageEnums.DD.getCode()))) {
+                        String [] groupCode = jsonObject1.getString("fireBrigade").split(",");
+                        List<String> positionType= Arrays.asList(groupCode);
+                        if (jsonObject1.containsKey("fireBrigade")) { {
+
+                            List<Map<String, Object>> mapList = dynamicFormInstanceMapper.getFireRescueDepartmentStaff(fireTeam.getCompanyName(),positionType);
+                            sendUserIds.addAll(mapList);
+                        }
+                            if(jsonObject1.containsKey("onDuty")) {
+                                List<Map<String, Object>> mapList = dynamicFormInstanceMapper.getDutyPersonByTeamIdAndCarId(DateUtils.getDateNowShortStr(),fireTeam.getCompanyName());
+                                sendUserIds.addAll(mapList);
+                            }
+                        }
+                    }else if (jsonObject1.containsKey("type") && (jsonObject1.getString("type").equals(AlertStageEnums.ZD.getCode()))) {
+                        String [] groupCode = jsonObject1.get("fireBrigade").toString().split(",");
+                        List<String> positionType= Arrays.asList(groupCode);
+                        String departmentName=	jsonObject1.getString("name");
+                        if (jsonObject1.containsKey("fireBrigade")) { {
+                            List<Map<String, Object>> mapList = dynamicFormInstanceMapper.getFireRescueDepartmentStaff(departmentName,positionType);
+                            sendUserIds.addAll(mapList);
+                        }
+                            if(jsonObject1.containsKey("onDuty")) {
+                                List<Map<String, Object>> mapList = dynamicFormInstanceMapper.getDutyPersonByTeamIdAndCarId(DateUtils.getDateNowShortStr(),departmentName);
+                                sendUserIds.addAll(mapList);
+                            }
+                        }
+                    }
+                });
+                sendUserIds.addAll(userIdList);
+                smsCode = AlertBusinessTypeEnum.力量调派.getSms_code();
+                // 组装人员信息
+
+                for (Map<String, Object> orgUser : sendUserIds) {
+                    AlertSubmittedObject alertSubmittedObject = new AlertSubmittedObject();
+                    alertSubmittedObject.setAlertSubmittedId(Long.parseLong(alertSubmittedId));
+                    alertSubmittedObject.setType(false);
+                    alertSubmittedObject.setCompanyId(companyId);
+                    alertSubmittedObject.setCompanyName(companyName);
+                    alertSubmittedObject.setType(false);
+                    alertSubmittedObject.setUserId(Long.parseLong(orgUser.get("userId").toString()));
+                    alertSubmittedObject.setUserName(orgUser.get("userName").toString());
+
+                    if (!ValidationUtil.isEmpty(orgUser.get("telephone"))) {
+                        mobiles.add((String) orgUser.get("telephone"));
+                        alertSubmittedObject.setUserPhone((String) orgUser.get("telephone"));
+                    }
+                    alertSubmittedObjectList.add(alertSubmittedObject);
+                }
+                smsParams.put("callTimeStr", calledRo.getCallTimeStr());
+                smsParams.put("address", calledRo.getAddress());
+                smsParams.put("content", calledRo.getContent());
+                smsParams.put("trappedNum", calledRo.getTrappedNum());
+                smsParams.put("casualtiesNum", calledRo.getCasualtiesNum());
+                smsParams.put("companyName", calledRo.getCompanyName());
+                smsParams.put("contactUser", calledRo.getContactUser());
+                smsParams.put("contactPhone", calledRo.getContactPhone());
+                smsParams.put("alertType", calledRo.getAlertType());
+                List<PowerTransferCompanyResourcesDto> list = powerDto
+                        .getPowerTransferCompanyResourcesDtoList();
+                if (list != null && list.size() > 0) {
+                    for (PowerTransferCompanyResourcesDto i : list) {
+                        String carName = i.getResourcesName();
+                        String resourceName = i.getResourcesNum();
+                        String type = i.getType();
+                        resourcesNum.append("车辆" + type);
+                        resourcesNum.append("车牌号" + carName + " " + resourceName);
+                        resourcesNum.append("、");
+                        if (designatedDriver) {
+                            // 发送单个车辆的信息数据到客户
+                            smsParams.put("resourcesNum",
+                                    resourcesNum.toString().substring(resourcesNum.toString().length() - 2));
+                            List<AlertSubmittedObject> alertSubmittedObjectListSub = Lists.newArrayList();
+                            Map<String, Object> map = dynamicFormInstanceMapper
+                                    .getCurentCarIsUserPhone(Long.parseLong(i.getResourcesId()));
+                            AlertSubmittedObject alertSubmittedObjectSub = new AlertSubmittedObject();
+                            alertSubmittedObjectSub.setAlertSubmittedId(Long.parseLong(alertSubmittedId));
+                            alertSubmittedObjectSub.setType(false);
+                            alertSubmittedObjectSub.setCompanyId(companyId);
+                            alertSubmittedObjectSub.setCompanyName(companyName);
+                            alertSubmittedObjectSub.setType(false);
+                            if(map==null || !map.containsKey("userId")) {
+                                continue;
+                            }
+                            alertSubmittedObjectSub.setUserId(Long.parseLong(map.get("userId").toString()));
+                            alertSubmittedObjectSub.setUserName(map.get("userName").toString());
+                            Set<String> mobile =null;
+                            if (!ValidationUtil.isEmpty(map.get("mobilePhone"))) {
+                                mobile = new HashSet<String>() {
+                                    {
+                                        add(map.get("mobilePhone").toString());
+                                    }
+                                };
+                                alertSubmittedObjectSub.setUserPhone(map.get("mobilePhone").toString());
+                            }
+                            alertSubmittedObjectListSub.add(alertSubmittedObjectSub);
+                            alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectListSub);
+                            // 调用短信发送接口
+                            alertCalledAction.sendAlertCalleCmd(sCode, mobile, smsParams);
+                            emqKeeper.getMqttClient().publish(topic, alertCalledId.getBytes(), RuleConfig.DEFAULT_QOS,
+                                    false);
+                        }
+                    }
+                }
+                String resourcesNumStr = resourcesNum.toString();
+                sendUserIds.stream().forEach(i -> {
+                    if (i.containsKey("mobilePhone")) {
+                        mobiles.add(i.get("mobilePhone").toString());
+                    }
+                });
+                smsParams.put("resourcesNum", resourcesNumStr.substring(resourcesNumStr.length() - 2));
+                // 短信报送对象
+                alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
+                // 发送任务消息
+                // 组织短信内容
+                // 调用短信发送接口
+                try {
+                    alertCalledAction.sendAlertCalleCmd(smsCode, mobiles, smsParams);
+                } catch (Exception e) {
+                }
+
+                emqKeeper.getMqttClient().publish(topic, alertCalledId.getBytes(), RuleConfig.DEFAULT_QOS, false);
+            }
+        }
+
+    }
+
+    @SuppressWarnings("unchecked")
+    public void ruleCallbackActionForPowerTransferForSurvBrigade(String smsCode, List sendIds, Object object) throws MqttPersistenceException, MqttException {
+
+        List<AlertSubmittedObject> alertSubmittedObjectList = Lists.newArrayList();
+
+        Set<String> mobiles = new HashSet<>();
+        HashMap<String, String> smsParams = new HashMap<>();
+        String alertCalledId = null;
+        if (object instanceof AlertCallePowerTransferRo) {
+            AlertCallePowerTransferRo calledRo = (AlertCallePowerTransferRo) object;
+            String alertSubmittedId = calledRo.getAlertSubmittedId();
+            alertCalledId = calledRo.getSequenceNbr();
+            Set<Map<String, Object>> userIds = new HashSet<Map<String, Object>>();
+            List<Object> companyDetail =JSONArray.parseArray(JSON.toJSON(calledRo.getCompany()).toString(),Object.class);
+            for(Object e:sendIds) {
+                JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(e));
+                if(jsonObject.containsKey("type") &&( (jsonObject.getString("type").equals(AlertStageEnums.ZH.getCode())) || jsonObject.getString("type").equals(AlertStageEnums.XJ.getCode()))) {
+                    String departmentName=	jsonObject.getString("name");
+                    if (jsonObject.containsKey("airportUnit")) { {
+                        List<Map<String, Object>> mapList = dynamicFormInstanceMapper.getFireRescueDepartmentStaff(departmentName,null);
+                        userIds.addAll(mapList);
+                    }
+                        if(jsonObject.containsKey("onDuty")) {
+                            List<Map<String, Object>> mapList = dynamicFormInstanceMapper.getDutyPersonByTeamIdAndCarId(DateUtils.getDateNowShortStr(),departmentName);
+                            userIds.addAll(mapList);
+                        }
+                    }
+                }
+            }
+            for (Object powerTransferCompanyDto : companyDetail) {
+                Set<Map<String, Object>> sendUserIds = new HashSet<Map<String, Object>>();
+                PowerTransferCompanyDto 	powerDto =	JSONObject.parseObject(JSON.toJSON(powerTransferCompanyDto).toString(), PowerTransferCompanyDto.class);
+                Long companyId = powerDto.getCompanyId();
+                String companyName = powerDto.getCompanyName();
+                FireTeam fireTeam= fireTeamServiceImpl.getById(companyId);
+
+                for(Object sendObject:sendIds) {
+                    JSONObject jsonObject1 = JSONObject.parseObject(JSONObject.toJSONString(sendObject));
+                    if (jsonObject1.containsKey("type") && (jsonObject1.getString("type").equals(AlertStageEnums.监控大队.getCode()))) {
+                        if(jsonObject1.containsKey("onDuty")) {
+                            List<Map<String, Object>> dutyList = dynamicFormInstanceMapper.getDutyPersonByTeamIdAndCarId(
+                                    DateUtils.getDateNowShortStr(), fireTeam.getCompanyName());
+                            sendUserIds.addAll(dutyList);
+                        }
+                        if (jsonObject1.containsKey("airportUnit")) { {
+                            List<Map<String, Object>> mapList = dynamicFormInstanceMapper.getFireRescueDepartmentStaff( fireTeam.getCompanyName(),null);
+                            sendUserIds.addAll(mapList);
+                        }
+                        }
+                    }
+                }
+                sendUserIds.addAll(userIds);
+                smsCode = AlertBusinessTypeEnum.力量调派.getSms_code();
+                // 组装人员信息
+
+                for (Map<String, Object> orgUser : sendUserIds) {
+                    AlertSubmittedObject alertSubmittedObject = new AlertSubmittedObject();
+                    alertSubmittedObject.setAlertSubmittedId(Long.parseLong(alertSubmittedId));
+                    alertSubmittedObject.setType(false);
+                    alertSubmittedObject.setCompanyId(companyId);
+                    alertSubmittedObject.setCompanyName(companyName);
+                    alertSubmittedObject.setType(false);
+                    alertSubmittedObject.setUserId(Long.parseLong(orgUser.get("userId").toString()));
+                    alertSubmittedObject.setUserName(orgUser.get("userName").toString());
+
+                    if (!ValidationUtil.isEmpty(orgUser.get("telephone"))) {
+                        mobiles.add((String) orgUser.get("telephone"));
+                        alertSubmittedObject.setUserPhone((String) orgUser.get("telephone"));
+                    }
+                    alertSubmittedObjectList.add(alertSubmittedObject);
+                }
+                smsParams.put("callTimeStr", calledRo.getCallTimeStr());
+                smsParams.put("address", calledRo.getAddress());
+                smsParams.put("content", calledRo.getContent());
+                smsParams.put("trappedNum", calledRo.getTrappedNum());
+                smsParams.put("casualtiesNum", calledRo.getCasualtiesNum());
+                smsParams.put("companyName", calledRo.getCompanyName());
+                smsParams.put("contactUser", calledRo.getContactUser());
+                smsParams.put("contactPhone", calledRo.getContactPhone());
+                smsParams.put("alertType", calledRo.getAlertType());
+
+                sendUserIds.stream().forEach(i-> {
+                    if (i.containsKey("mobilePhone")) {
+                        mobiles.add(i.get("mobilePhone").toString());
+                    }
+                });
+                smsParams.put("resourcesNum", companyName);
+                // 短信报送对象
+                alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
+                // 发送任务消息
+                // 组织短信内容
+                // 调用短信发送接口
+                try {
+                    alertCalledAction.sendAlertCalleCmd(smsCode, mobiles, smsParams);
+                }catch(Exception e){
+
+                }
+
+                emqKeeper.getMqttClient().publish(topic, alertCalledId.getBytes(), RuleConfig.DEFAULT_QOS, false);
+            }
+        }
+    }
+
+
+
+
+
+    public void ruleCallbackActionForPowerTransferForAid(String smsCode, List sendIds, Object object) throws MqttPersistenceException, MqttException {
+
+        List<AlertSubmittedObject> alertSubmittedObjectList = Lists.newArrayList();
+
+        Set<String> mobiles = new HashSet<>();
+
+        Set<Map<String, Object>> userIds = new HashSet<Map<String, Object>>();
+
+        HashMap<String, String> smsParams = new HashMap<>();
+        String alertCalledId = null;
+        if (object instanceof AlertCallePowerTransferRo) {
+            AlertCallePowerTransferRo calledRo = (AlertCallePowerTransferRo) object;
+            String alertSubmittedId = calledRo.getAlertSubmittedId();
+            alertCalledId = calledRo.getSequenceNbr();
+            //List<FireTeam> fireTeamList= new ArrayList<FireTeam>();
+            List<Object> companyDetail =JSONArray.parseArray(JSON.toJSON(calledRo.getCompany()).toString(),Object.class);
+            //获取急救科、消救部人员信息
+            for(Object e:sendIds) {
+                JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(e));
+                if(jsonObject.containsKey("type") &&( (jsonObject.getString("type").equals(AlertStageEnums.ZH.getCode())) || jsonObject.getString("type").equals(AlertStageEnums.XJ.getCode()))) {
+                    String departmentName=	jsonObject.getString("name");
+                    if (jsonObject.containsKey("airportUnit")) { {
+                        List<Map<String, Object>> mapList = dynamicFormInstanceMapper.getFireRescueDepartmentStaff(departmentName,null);
+                        userIds.addAll(mapList);
+                    }
+
+                        if(jsonObject.containsKey("onDuty")) {
+                            List<Map<String, Object>> mapList = dynamicFormInstanceMapper.getDutyPersonByTeamIdAndCarId(DateUtils.getDateNowShortStr(),departmentName);
+                            userIds.addAll(mapList);
+                        }
+                    }
+                }
+            }
+            //获取对应急救站的当日值班员信息
+            for (Object powerTransferCompanyDto : companyDetail) {
+                Set<Map<String, Object>> sendUserIds = new HashSet<Map<String, Object>>();
+                PowerTransferCompanyDto 	powerDto =	JSONObject.parseObject(JSON.toJSON(powerTransferCompanyDto).toString(), PowerTransferCompanyDto.class);
+                Long companyId = powerDto.getCompanyId();
+                String companyName = powerDto.getCompanyName();
+                FireTeam fireTeam= fireTeamServiceImpl.getById(companyId);//这个公司ID实际上是120急救站的id值
+                //fireTeamList.add(fireTeam);
+                for(Object e:sendIds) {
+                    JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(e));
+                    //获取120急救站的规则
+                    if (jsonObject.containsKey("type") && (jsonObject.getString("type").equals(AlertStageEnums.JJZ.getCode()))) {
+                        if(!jsonObject.containsKey("onDuty")) {
+                            continue;
+                        }
+                        //fireTeamList.stream().forEach(i->{
+                        //获取120急救排版值班的人员信息
+                        List<Map<String, Object>> dutyList = dynamicFormInstanceMapper.getDutyPersonByTeamIdAndAirId(
+                                DateUtils.getDateNowShortStr(), fireTeam.getCompanyName());
+                        sendUserIds.addAll(dutyList);
+                        //});
+
+                    }
+                }
+                sendUserIds.addAll(userIds);
+                smsCode = AlertBusinessTypeEnum.力量调派.getSms_code();
+                // 组装人员信息
+
+                for (Map<String, Object> orgUser : sendUserIds) {
+                    AlertSubmittedObject alertSubmittedObject = new AlertSubmittedObject();
+                    alertSubmittedObject.setAlertSubmittedId(Long.parseLong(alertSubmittedId));
+                    alertSubmittedObject.setCompanyId(companyId);
+                    alertSubmittedObject.setCompanyName(companyName);
+                    alertSubmittedObject.setType(false);
+                    alertSubmittedObject.setUserId(Long.parseLong(orgUser.get("userId").toString()));
+                    alertSubmittedObject.setUserName(orgUser.get("userName").toString());
+
+                    if (!ValidationUtil.isEmpty(orgUser.get("mobilePhone"))) {
+                        mobiles.add((String) orgUser.get("mobilePhone"));
+                        alertSubmittedObject.setUserPhone(orgUser.get("mobilePhone").toString());
+                    }
+                    alertSubmittedObjectList.add(alertSubmittedObject);
+                }
+                smsParams.put("callTimeStr", calledRo.getCallTimeStr());
+                smsParams.put("address", calledRo.getAddress());
+                smsParams.put("content", calledRo.getContent());
+                smsParams.put("trappedNum", calledRo.getTrappedNum());
+                smsParams.put("casualtiesNum", calledRo.getCasualtiesNum());
+                smsParams.put("companyName", calledRo.getCompanyName());
+                smsParams.put("contactUser", calledRo.getContactUser());
+                smsParams.put("contactPhone", calledRo.getContactPhone());
+                smsParams.put("alertType", calledRo.getAlertType());
+
+                sendUserIds.stream().forEach(i -> {
+                    if (i.containsKey("mobilePhone")) {
+                        mobiles.add(i.get("mobilePhone").toString());
+                    }
+                });
+                smsParams.put("resourcesNum", companyName);
+                // 短信报送对象
+                alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
+                // 发送任务消息
+                // 组织短信内容
+                // 调用短信发送接口
+                try {
+                    alertCalledAction.sendAlertCalleCmd(smsCode, mobiles, smsParams);
+                }catch (Exception e) {// TODO: handle exception
+
+                }
+
+                emqKeeper.getMqttClient().publish(topic, alertCalledId.getBytes(), RuleConfig.DEFAULT_QOS, false);
+            }
+        }
+    }
+
+
 }

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

@@ -442,4 +442,5 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
 		queryWrapper.eq(FireTeam::getCompany, companyId);
 		return	this.baseMapper.selectList(queryWrapper);
 	}
+	
 }

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

@@ -8,6 +8,9 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledObjsDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledRo;
+import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStageEnums;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.paho.client.mqttv3.MqttException;
@@ -66,121 +69,120 @@ import com.yeejoin.amos.component.rule.config.RuleConfig;
  * @date 2021-06-17
  */
 @Service
-public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, PowerTransfer, PowerTransferMapper> implements IPowerTransferService {
+public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, PowerTransfer, PowerTransferMapper>
+		implements IPowerTransferService {
 
-    @Autowired
-    AlertCalledServiceImpl alertCalledService;
+	@Autowired
+	AlertCalledServiceImpl alertCalledService;
 
-    @Autowired
-    PowerTransferCompanyServiceImpl powerTransferCompanyService;
+	@Autowired
+	PowerTransferCompanyServiceImpl powerTransferCompanyService;
 
-    @Autowired
-    PowerTransferCompanyResourcesServiceImpl powerTransferCompanyResourcesService;
+	@Autowired
+	PowerTransferCompanyResourcesServiceImpl powerTransferCompanyResourcesService;
 
-    @Autowired
-    TemplateServiceImpl templateService;
+	@Autowired
+	TemplateServiceImpl templateService;
 
-    @Autowired
-    AlertFormValueServiceImpl alertFormValueService;
+	@Autowired
+	AlertFormValueServiceImpl alertFormValueService;
 
-    @Autowired
-    EquipFeignClient equipFeignService;
+	@Autowired
+	EquipFeignClient equipFeignService;
 
-    @Autowired
-    FireTeamServiceImpl fireTeamService;
+	@Autowired
+	FireTeamServiceImpl fireTeamService;
 
-    @Autowired
-    PowerTransferMapper powerTransferMapper;
+	@Autowired
+	PowerTransferMapper powerTransferMapper;
 
-    @Autowired
-    EquipFeignClient equipFeignClient;
+	@Autowired
+	EquipFeignClient equipFeignClient;
 
-    @Autowired
-    private EmqKeeper emqKeeper;
+	@Autowired
+	private EmqKeeper emqKeeper;
 
-    @Value("${mqtt.topic.command.power.deployment}")
-    private String topic;
+	@Value("${mqtt.topic.command.power.deployment}")
+	private String topic;
 
-    @Autowired
-    private DutyCarServiceImpl dutyCarService;
+	@Autowired
+	private DutyCarServiceImpl dutyCarService;
 
-    @Autowired
-    FireTeamServiceImpl iFireTeamService;
-    
-    @Autowired
-    DynamicFormInstanceMapper dynamicFormInstanceMapper;
-    
-    @Autowired
+	@Autowired
+	FireTeamServiceImpl iFireTeamService;
+
+	@Autowired
+	DynamicFormInstanceMapper dynamicFormInstanceMapper;
+
+	@Autowired
 	RuleAlertCalledService ruleAlertCalledService;
-    
-    @Override
-    public PowerTransferSimpleDto getPowerTransferList(Long alertCalledId) {
-        List<PowerTransferCompanyResourcesDto> powerTransferList =
-                this.baseMapper.getPowerTransferList(alertCalledId);
-        PowerTransferSimpleDto powerTransferSimpleDto = new PowerTransferSimpleDto();
-        int resourcesCount = powerTransferList.size();
-        powerTransferSimpleDto.setResourcesCount(resourcesCount);
-        powerTransferSimpleDto.setResourcesList(powerTransferList);
-        return powerTransferSimpleDto;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public boolean createPowerTransfer(PowerTransferDto powerTransferDto) {
-        try {
-            // 获取调派ID
-            Long alertCalledId = powerTransferDto.getAlertCalledId();
-            int count = count(new QueryWrapper<PowerTransfer>().eq("alert_called_id", alertCalledId));
-            String dispatch_num = alertCalledId.toString() + (count + 1);
-
-            // 获取警情详情
-            AlertCalled alertCalled = alertCalledService.getById(alertCalledId);
-
-            // 创建力量调派
-            PowerTransfer powerTransfer = new PowerTransfer();
-            BeanUtils.copyProperties(powerTransferDto, powerTransfer);
-            BeanUtils.copyProperties(alertCalled, powerTransfer);
-            powerTransfer.setDispatchNum(dispatch_num);
-            powerTransfer.setSequenceNbr(null);
-
-            save(powerTransfer);
-            Long powerTransferSequenceNbr = powerTransfer.getSequenceNbr();
-
-            // 获取任务派发模板
-            Template template = templateService.getOne(new QueryWrapper<Template>().eq("type",
-                    alertCalled.getAlertType()).eq("format", false));
-            String content = template.getContent();
-            Map<String, String> definitions = new HashMap<>();
-            initDefinitions(definitions, alertCalled, powerTransferDto);
-
-            // 创建力量调派单位
-           createPowerTransferCompany(powerTransferDto, powerTransferSequenceNbr, definitions, content);
-            
-            //封装调派任务的集合，以便于实现任务规则校验
-            try {
-				//packagePowerTransferDetail(powerTransferDto);
+
+	@Override
+	public PowerTransferSimpleDto getPowerTransferList(Long alertCalledId) {
+		List<PowerTransferCompanyResourcesDto> powerTransferList = this.baseMapper.getPowerTransferList(alertCalledId);
+		PowerTransferSimpleDto powerTransferSimpleDto = new PowerTransferSimpleDto();
+		int resourcesCount = powerTransferList.size();
+		powerTransferSimpleDto.setResourcesCount(resourcesCount);
+		powerTransferSimpleDto.setResourcesList(powerTransferList);
+		return powerTransferSimpleDto;
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public boolean createPowerTransfer(PowerTransferDto powerTransferDto) {
+		try {
+			// 获取调派ID
+			Long alertCalledId = powerTransferDto.getAlertCalledId();
+			int count = count(new QueryWrapper<PowerTransfer>().eq("alert_called_id", alertCalledId));
+			String dispatch_num = alertCalledId.toString() + (count + 1);
+
+			// 获取警情详情
+			AlertCalledObjsDto alertCalled = (AlertCalledObjsDto) alertCalledService
+					.selectAlertCalledByIdNoRedisNew(alertCalledId);
+
+			// 创建力量调派
+			PowerTransfer powerTransfer = new PowerTransfer();
+			BeanUtils.copyProperties(powerTransferDto, powerTransfer);
+			BeanUtils.copyProperties(alertCalled.getAlertCalled(), powerTransfer);
+			powerTransfer.setDispatchNum(dispatch_num);
+			powerTransfer.setSequenceNbr(null);
+
+			save(powerTransfer);
+			Long powerTransferSequenceNbr = powerTransfer.getSequenceNbr();
+
+			// 获取任务派发模板
+			Template template = templateService
+					.getOne(new QueryWrapper<Template>().eq("type_code", "LLDP").eq("format", false));
+			String content = template.getContent();
+			Map<String, String> definitions = new HashMap<>();
+			// initDefinitions(definitions, alertCalled, powerTransferDto);
+
+			// 创建力量调派单位
+			createPowerTransferCompany(powerTransferDto, powerTransferSequenceNbr, definitions, content, alertCalled);
+
+			// 封装调派任务的集合，以便于实现任务规则校验
+			try {
+				packagePowerTransferDetail(powerTransferDto);
 			} catch (Exception e) {
 				log.error("调用规则失败：PowerTransferServiceImpl。createPowerTransfer（）");
 			}
-            
-            
-            //发送调派通知
-            //通知实战指挥页面发送mqtt 默认发送 String 类型 0, 新警情 1 警情状态变化
-            emqKeeper.getMqttClient().publish(topic, "0".getBytes(), RuleConfig.DEFAULT_QOS, true);
-        } catch (MqttException e) {
-            throw new RuntimeException();
-        }
-
-        return true;
-    }
-    
-  
-    private void packagePowerTransferDetail(PowerTransferDto powerTransferDto) throws Exception {
-    	List<PowerTransferCompanyDto> powerTransferCompanyDtoList = powerTransferDto.getPowerTransferCompanyDotList();
+
+			// 发送调派通知
+			// 通知实战指挥页面发送mqtt 默认发送 String 类型 0, 新警情 1 警情状态变化
+			emqKeeper.getMqttClient().publish(topic, "0".getBytes(), RuleConfig.DEFAULT_QOS, true);
+		} catch (MqttException e) {
+			throw new RuntimeException();
+		}
+
+		return true;
+	}
+
+	private void packagePowerTransferDetail(PowerTransferDto powerTransferDto) throws Exception {
+		List<PowerTransferCompanyDto> powerTransferCompanyDtoList = powerTransferDto.getPowerTransferCompanyDotList();
 		Set<PowerTransferCompanyDto> fullTimeList = new HashSet<PowerTransferCompanyDto>();
 		Set<PowerTransferCompanyDto> medicalTeamList = new HashSet<PowerTransferCompanyDto>();
 		Set<PowerTransferCompanyDto> monitorTeamList = new HashSet<PowerTransferCompanyDto>();
-		
+
 		for (PowerTransferCompanyDto powerTransferCompanyDto : powerTransferCompanyDtoList) {
 			if (FireBrigadeTypeEnum.专职消防队.getKey().equals(powerTransferCompanyDto.getPowerTransType())) {
 				fullTimeList.add(powerTransferCompanyDto);
@@ -190,31 +192,43 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 				monitorTeamList.add(powerTransferCompanyDto);
 			}
 		}
-			//ruleAlertCalledService.powerTransferCalledRule(fullTimeList,powerTransferDto.getAlertCalledId(),FireBrigadeTypeEnum.专职消防队.getKey());
-			//ruleAlertCalledService.powerTransferCalledRule(medicalTeamList,powerTransferDto.getAlertCalledId(),FireBrigadeTypeEnum.医疗救援队.getKey());
-			ruleAlertCalledService.powerTransferCalledRule(monitorTeamList,powerTransferDto.getAlertCalledId(),FireBrigadeTypeEnum.监控大队.getKey());
+		if (fullTimeList.size() > 0) {
+			ruleAlertCalledService.powerTransferCalledRule(fullTimeList, powerTransferDto.getAlertCalledId(),
+					FireBrigadeTypeEnum.专职消防队.getKey());
+		}
+		if (medicalTeamList.size() > 0) {
+			ruleAlertCalledService.powerTransferCalledRule(medicalTeamList, powerTransferDto.getAlertCalledId(),
+					FireBrigadeTypeEnum.医疗救援队.getKey());
+
+		}
+		if (monitorTeamList.size() > 0) {
+			ruleAlertCalledService.powerTransferCalledRule(monitorTeamList, powerTransferDto.getAlertCalledId(),
+					FireBrigadeTypeEnum.监控大队.getKey());
+
+		}
 	}
 
 	@Override
-    public List<FireBrigadeResourceDto> getPowerTree(String type) {
-        List<FireBrigadeResourceDto> fireBrigadeResourceList = Lists.newArrayList();
-
-        if(type!=null&&!"".equals(type)&&"1214".equals(type)){
-            // 3.消防队伍-监控大队
-            List<FireBrigadeResourceDto> monitorFireBrigadeList1 = fireTeamService.listMonitorFireBrigade(FireBrigadeTypeEnum.医疗救援队.getCode());
-            FireBrigadeResourceDto monitorResourceDto1 = new FireBrigadeResourceDto();
-            monitorResourceDto1.setId("-1");
-            monitorResourceDto1.setName(FireBrigadeTypeEnum.医疗救援队.getName());
-            monitorResourceDto1.setType(FireBrigadeTypeEnum.医疗救援队.getKey());
-            monitorResourceDto1.setChildren(monitorFireBrigadeList1);
-            if (!CollectionUtils.isEmpty(monitorFireBrigadeList1)) {
-                fireBrigadeResourceList.add(monitorResourceDto1);
-            }
-        }
-
-        // 1.调用装备服务接口查询车辆列表
-        List<FireBrigadeResourceDto> fireCarDtoList = Lists.newArrayList();
-        ResponseModel<Object> result = equipFeignService.getFireCarListAll();
+	public List<FireBrigadeResourceDto> getPowerTree(String type) {
+		List<FireBrigadeResourceDto> fireBrigadeResourceList = Lists.newArrayList();
+
+		if (type != null && !"".equals(type) && "1214".equals(type)) {
+			// 3.消防队伍-监控大队
+			List<FireBrigadeResourceDto> monitorFireBrigadeList1 = fireTeamService
+					.listMonitorFireBrigade(FireBrigadeTypeEnum.医疗救援队.getCode());
+			FireBrigadeResourceDto monitorResourceDto1 = new FireBrigadeResourceDto();
+			monitorResourceDto1.setId("-1");
+			monitorResourceDto1.setName(FireBrigadeTypeEnum.医疗救援队.getName());
+			monitorResourceDto1.setType(FireBrigadeTypeEnum.医疗救援队.getKey());
+			monitorResourceDto1.setChildren(monitorFireBrigadeList1);
+			if (!CollectionUtils.isEmpty(monitorFireBrigadeList1)) {
+				fireBrigadeResourceList.add(monitorResourceDto1);
+			}
+		}
+
+		// 1.调用装备服务接口查询车辆列表
+		List<FireBrigadeResourceDto> fireCarDtoList = Lists.newArrayList();
+		ResponseModel<Object> result = equipFeignService.getFireCarListAll();
 //        if (!ObjectUtils.isEmpty(result)) {
 //            List<Map<String, Object>> fireCarListMapList = (List<Map<String, Object>>) result.getResult();
 //            if (!ValidationUtil.isEmpty(fireCarListMapList)) {
@@ -365,12 +379,12 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 			PowerTransferDto powerTransferDto) {
 		List<AlertFormValue> alertFormValue = alertFormValueService
 				.list(new QueryWrapper<AlertFormValue>().eq("alert_called_id", alertCalled.getSequenceNbr()));
-		definitions.put("rescueGrid", alertCalled.getRescueGrid());
-		definitions.put("alertType", alertCalled.getAlertType());
-		definitions.put("address", alertCalled.getAddress());
-		definitions.put("trappedNum", alertCalled.getTrappedNum().toString());
-		definitions.put("casualtiesNum", alertCalled.getCasualtiesNum().toString());
-		definitions.put("companyName", powerTransferDto.getCompanyName());
+//		definitions.put("rescueGrid", alertCalled.getRescueGrid());
+//		definitions.put("alertType", alertCalled.getAlertType());
+//		definitions.put("address", alertCalled.getAddress());
+//		definitions.put("trappedNum", alertCalled.getTrappedNum().toString());
+//		definitions.put("casualtiesNum", alertCalled.getCasualtiesNum().toString());
+//		definitions.put("companyName", powerTransferDto.getCompanyName());
 
 		for (AlertFormValue formValue : alertFormValue) {
 			definitions.put(formValue.getFieldCode(), formValue.getFieldValue());
@@ -385,12 +399,31 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 	}
 
 	private void createPowerTransferCompany(PowerTransferDto powerTransferDto, Long powerTransferSequenceNbr,
-			Map<String, String> definitions, String content) {
+			Map<String, String> definitions, String content, AlertCalledObjsDto alertCalledObjsDto) {
 		List<PowerTransferCompanyDto> powerTransferCompanyDotList = powerTransferDto.getPowerTransferCompanyDotList();
 		PowerTransferCompany powerTransferCompany;
 
 		List<Object> carStatusInfoDtoList = Lists.newArrayList();
 
+		AlertCalled alertCalled = alertCalledObjsDto.getAlertCalled();
+
+		// 初始化警情 信息
+		/**
+		 * 构建警情报送规则对象
+		 */
+		AlertCalledRo alertCalledRo = new AlertCalledRo();
+		String replaceContent = RuleAlertCalledService.init(alertCalledRo, alertCalledObjsDto);
+
+		definitions.put("rescueGrid", alertCalled.getAddress());
+		definitions.put("type", alertCalled.getAlertType());
+		definitions.put("contactUser", alertCalled.getContactUser());
+		definitions.put("contactPhone", alertCalled.getContactPhone());
+		definitions.put("type", alertCalled.getAlertType());
+		definitions.put("replaceContent", replaceContent);
+		definitions.put("callTime",
+				DateUtils.convertDateToString(alertCalled.getCallTime(), DateUtils.DATE_TIME_PATTERN));
+
+
 		for (PowerTransferCompanyDto powerTransferCompanyDto : powerTransferCompanyDotList) {
 			powerTransferCompany = new PowerTransferCompany();
 			BeanUtils.copyProperties(powerTransferCompanyDto, powerTransferCompany);
@@ -399,30 +432,46 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 					.getPowerTransferCompanyResourcesDtoList();
 			if (powerTransferCompanyResourcesDtoList.size() == 0) {
 				powerTransferCompany.setIsDistributionAgencies(true);
-				definitions.put("type", "");
-				definitions.put("resourcesNum", "");
+				definitions.put("departmentName", powerTransferCompanyDto.getCompanyName());
+
+				definitions.put("content", "");
 				powerTransferCompany.setTaskInformation(getTaskInformation(content, definitions));
 				powerTransferCompanyService.save(powerTransferCompany);
+				powerTransferCompanyDto.setSequenceNbr(powerTransferCompany.getSequenceNbr());
 			} else {
 				powerTransferCompany.setIsDistributionAgencies(false);
 				StringBuilder taskInformation = new StringBuilder();
 				for (PowerTransferCompanyResourcesDto powerTransferCompanyResourcesDto : powerTransferCompanyResourcesDtoList) {
-					definitions.put("type", powerTransferCompanyResourcesDto.getType());
-					definitions.put("resourcesNum", powerTransferCompanyResourcesDto.getResourcesNum());
-					String information = getTaskInformation(content, definitions);
-					taskInformation.append(information).append(";");
+//					definitions.put("type", powerTransferCompanyResourcesDto.getType());
+//					definitions.put("resourcesNum", powerTransferCompanyResourcesDto.getResourcesNum());
+					String information = powerTransferCompanyResourcesDto.getType().concat("车牌号")
+							.concat(powerTransferCompanyResourcesDto.getResourcesNum());
+					taskInformation.append(information).append("丶");
 
 					CarStatusInfoDto carStatusInfoDto = new CarStatusInfoDto();
 					carStatusInfoDto.setSequenceNbr(powerTransferCompanyResourcesDto.getResourcesId());
 					carStatusInfoDto.setStatus(FireCarStatusEnum.出动.getCode());
 					carStatusInfoDtoList.add(carStatusInfoDto);
 				}
-				powerTransferCompany.setTaskInformation(taskInformation.toString());
+
+				definitions.put("departmentName", powerTransferCompanyDto.getCompanyName());
+				definitions.put("content", taskInformation.toString());
+
+				powerTransferCompany.setTaskInformation(getTaskInformation(content, definitions));
 				powerTransferCompanyService.save(powerTransferCompany);
+				powerTransferCompanyDto.setSequenceNbr(powerTransferCompany.getSequenceNbr());
 				Long powerTransferCompanySequenceNbr = powerTransferCompany.getSequenceNbr();
 				List<PowerTransferCompanyResources> powerTransferCompanyResourcesList = DtoEntityBatchConvert(
 						powerTransferCompanyResourcesDtoList, powerTransferCompanySequenceNbr);
 				powerTransferCompanyResourcesService.saveBatch(powerTransferCompanyResourcesList);
+				List<PowerTransferCompanyResourcesDto> resourcesDtoList = new ArrayList<>();
+				powerTransferCompanyResourcesList.stream().forEach(e->{
+					PowerTransferCompanyResourcesDto dto = new PowerTransferCompanyResourcesDto();
+					Bean.toPo(e,dto);
+					resourcesDtoList.add(dto);
+				});
+
+				powerTransferCompanyDto.setPowerTransferCompanyResourcesDtoList(resourcesDtoList);
 
 				// 更新车辆状态
 				equipFeignService.updateCarStatus(carStatusInfoDtoList);

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCallePowerTransferRo;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompany;
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerrTransferLog;
+import com.yeejoin.amos.boot.module.jcs.api.enums.FireBrigadeTypeEnum;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerrTransferLogMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IPowerrTransferLogService;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerrTransferLogDto;
+import org.springframework.beans.factory.annotation.Autowired;
 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.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -19,6 +35,13 @@ import java.util.List;
  */
 @Service
 public class PowerrTransferLogServiceImpl extends BaseService<PowerrTransferLogDto,PowerrTransferLog,PowerrTransferLogMapper> implements IPowerrTransferLogService {
+
+    @Autowired
+    PowerTransferCompanyServiceImpl powerTransferCompanyService;
+
+    @Autowired
+    PowerTransferCompanyResourcesServiceImpl powerTransferCompanyResourcesService;
+
     /**
      * 分页查询
      */
@@ -41,11 +64,19 @@ public class PowerrTransferLogServiceImpl extends BaseService<PowerrTransferLogD
             PowerrTransferLogDto dto = new PowerrTransferLogDto();
             queryWrapper.eq(PowerrTransferLog::getTeamId,id);
             List<PowerrTransferLog> list = this.list(queryWrapper);
+
+            PowerTransferCompany company = powerTransferCompanyService.getById(id);
+
             list.stream().forEach(e->{
                 dto.setReceiveName(dto.getRecUserName() == null ? "".concat(e.getReceiveName()) : dto.getReceiveName().concat("/").concat(e.getReceiveName()) );
                 dto.setSendTime(e.getSendTime());
                 dto.setSendContent(e.getSendContent());
                 dto.setRecUserName(e.getReceiveName());
+
+                if(!ValidationUtil.isEmpty(company)) {
+                    dto.setSendContent(company.getTaskInformation());
+                }
+
             });
             return dto;
         }
@@ -54,12 +85,59 @@ public class PowerrTransferLogServiceImpl extends BaseService<PowerrTransferLogD
         if("1".equals(type)) {
             LambdaQueryWrapper<PowerrTransferLog> queryWrapper = new LambdaQueryWrapper<>();
             PowerrTransferLogDto dto = new PowerrTransferLogDto();
-            queryWrapper.eq(PowerrTransferLog::getTeamId,id);
+            queryWrapper.eq(PowerrTransferLog::getResourceId,id);
             PowerrTransferLog powerrTransferLog = this.getOne(queryWrapper);
+            PowerTransferCompanyResources resources = powerTransferCompanyResourcesService.getById(id);
+            PowerTransferCompany byId = powerTransferCompanyService.getById(resources.getPowerTransferCompanyId());
+            powerrTransferLog.setSendContent(byId.getTaskInformation());
             Bean.toPo(powerrTransferLog,dto);
             return dto;
         }
 
         return new PowerrTransferLogDto();
     }
+
+
+   public void savePowerTransferLog( AlertCallePowerTransferRo alertCallePowerTransferRo) {
+        String powerTransType = alertCallePowerTransferRo.getPowerTransType();
+        List<PowerrTransferLog> list = new ArrayList<>();
+        if (FireBrigadeTypeEnum.专职消防队.getKey().equals(powerTransType)) {
+
+            List<Object> companyDetail = JSONArray.parseArray(JSON.toJSON(alertCallePowerTransferRo.getCompany()).toString(),Object.class);
+            for (Object powerTransferCompanyDto : companyDetail) {
+                PowerTransferCompanyDto powerDto = JSONObject.parseObject(JSON.toJSON(powerTransferCompanyDto).toString(), PowerTransferCompanyDto.class);
+                List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesDtoList = powerDto.getPowerTransferCompanyResourcesDtoList();
+                powerTransferCompanyResourcesDtoList.stream().forEach(f-> {
+                    PowerrTransferLog pw = new PowerrTransferLog();
+                    pw.setResourceId(f.getSequenceNbr());
+                    pw.setReceiveName(f.getRecUserName());
+                    try {
+                        pw.setSendTime(DateUtils.dateTimeToDateString(new Date(System.currentTimeMillis())));
+                    } catch (ParseException ex) {
+                        ex.printStackTrace();
+                    }
+                    pw.setPowerTransferCompanyResource(f.getSequenceNbr());
+                    pw.setPowerTransferCompany(f.getPowerTransferCompanyId());
+                    list.add(pw);
+                });
+            }
+        } else if (FireBrigadeTypeEnum.医疗救援队.getKey().equals(powerTransType) || FireBrigadeTypeEnum.监控大队.getKey().equals(powerTransType)) {
+                List<Object> companyDetail = JSONArray.parseArray(JSON.toJSON(alertCallePowerTransferRo.getCompany()).toString(),Object.class);
+                for (Object powerTransferCompanyDto : companyDetail) {
+                    PowerTransferCompanyDto powerDto = JSONObject.parseObject(JSON.toJSON(powerTransferCompanyDto).toString(), PowerTransferCompanyDto.class);
+                    PowerrTransferLog pw = new PowerrTransferLog();
+                    pw.setTeamId(powerDto.getSequenceNbr());
+                    pw.setReceiveName(powerDto.getRecUserName());
+                    try {
+                        pw.setSendTime(DateUtils.dateTimeToDateString(new Date(System.currentTimeMillis())));
+                    } catch (ParseException ex) {
+                        ex.printStackTrace();
+                    }
+                    pw.setPowerTransferCompany(powerDto.getCompanyId());
+                    list.add(pw);
+                }
+        }
+        this.saveBatch(list);
+    }
+
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import com.yeejoin.amos.boot.module.jcs.api.enums.AlertBusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStageEnums;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
+import com.alibaba.fastjson.JSONArray;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCallePowerTransferRo;
@@ -20,6 +18,7 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledRo;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStageEnums;
 import com.yeejoin.amos.boot.module.jcs.api.enums.FireBrigadeTypeEnum;
 import com.yeejoin.amos.component.rule.RuleTrigger;
 
@@ -51,7 +50,7 @@ public class RuleAlertCalledService {
 	 * @return
 	 * @throws Exception
 	 */
-	public Boolean fireAlertCalledRule(AlertCalledObjsDto alertCalledVo,String alertWay, String mobiles) throws Exception {
+	public Boolean fireAlertCalledRule(AlertCalledObjsDto alertCalledVo,String alertWay, String mobiles,String usIds,String feedBack) throws Exception {
 		AlertCalled alertCalled = alertCalledVo.getAlertCalled();
 		if (ValidationUtil.isEmpty(alertCalled)) {
 			throw new BadRequest("参数校验失败.");
@@ -60,136 +59,154 @@ public class RuleAlertCalledService {
     	 * 构建警情报送规则对象
     	 */
     	AlertCalledRo alertCalledRo = new AlertCalledRo();
+		alertCalledRo.setFeedback(feedBack);
+
+    	String replaceContent = init(alertCalledRo,alertCalledVo);
+
+		// 警情 报送类型
+		alertCalledRo.setAlertWay(alertWay);
+		alertCalledRo.setReplaceContent(replaceContent);
+		alertCalledRo.setUsIds(usIds);
+
+		if(!ValidationUtil.isEmpty(mobiles)) {
+			alertCalledRo.setIds(mobiles);
+		}
+    	//触发规则
+    	ruleTrigger.publish(alertCalledRo, "西咸机场119接处警规则/alertCalledRule", new String[0]);
+
+		return true;
+	}
 
 
-    	//通用属性
-    	alertCalledRo.setSequenceNbr(String.valueOf(alertCalled.getSequenceNbr()));
-    	alertCalledRo.setAddress(alertCalled.getAddress());
+	public static String init(AlertCalledRo alertCalledRo , AlertCalledObjsDto alertCalledVo ) {
+		AlertCalled alertCalled = alertCalledVo.getAlertCalled();
+		//通用属性
+		alertCalledRo.setSequenceNbr(String.valueOf(alertCalled.getSequenceNbr()));
+		alertCalledRo.setAddress(alertCalled.getAddress());
 		alertCalledRo.setUnitInvolved(alertCalled.getUnitInvolved());
 		alertCalledRo.setContactUser(alertCalled.getContactUser());
 		alertCalledRo.setContactPhone(alertCalled.getContactPhone());
-    	alertCalledRo.setAlertType(alertCalled.getAlertType());
-    	alertCalledRo.setAlertTypeCode(alertCalled.getAlertTypeCode());
-    	alertCalledRo.setCasualtiesNum(alertCalled.getCasualtiesNum() != null ? String.valueOf(alertCalled.getCasualtiesNum()) : "无");
-    	alertCalledRo.setTrappedNum(alertCalled.getTrappedNum() != null ? String.valueOf(alertCalled.getTrappedNum()) : "无");
-    	alertCalledRo.setCompanyName(alertCalled.getCompanyName());
+		alertCalledRo.setAlertType(alertCalled.getAlertType());
+		alertCalledRo.setAlertTypeCode(alertCalled.getAlertTypeCode());
+		alertCalledRo.setCasualtiesNum(alertCalled.getCasualtiesNum() != null ? String.valueOf(alertCalled.getCasualtiesNum()) : "无");
+		alertCalledRo.setTrappedNum(alertCalled.getTrappedNum() != null ? String.valueOf(alertCalled.getTrappedNum()) : "无");
+		alertCalledRo.setCompanyName(alertCalled.getCompanyName());
 
-    	List<AlertFormValue> alertFormValues = alertCalledVo.getAlertFormValue();
+		List<AlertFormValue> alertFormValues = alertCalledVo.getAlertFormValue();
 
-			if (!ValidationUtil.isEmpty(alertFormValues))
+		if (!ValidationUtil.isEmpty(alertFormValues))
+		{
+			for (AlertFormValue alertFormValue : alertFormValues)
 			{
-				for (AlertFormValue alertFormValue : alertFormValues)
+				if (alertFormValue.getFieldCode().equals("alertSubmittedId"))
+				{
+					alertCalledRo.setAlertSubmittedId(alertFormValue.getFieldValue());
+				}
+				//一般火灾
+				if (alertFormValue.getFieldCode().equals("fireLocation"))
+				{
+					alertCalledRo.setFireLocation(alertFormValue.getFieldValue());
+				}
+				if (alertFormValue.getFieldCode().equals("burningMaterial"))
+				{
+					alertCalledRo.setBurningMaterial(alertFormValue.getFieldValue());
+				}
+				if (alertFormValue.getFieldCode().equals("fireSituation"))
+				{
+					alertCalledRo.setFireSituation(alertFormValue.getFieldValue());
+				}
+				if (alertFormValue.getFieldCode().equals("dangerousExplosives"))
+				{
+					alertCalledRo.setDangerousExplosives(alertFormValue.getFieldValue());
+				}
+				if (alertFormValue.getFieldCode().equals("fireTime"))
 				{
-					if (alertFormValue.getFieldCode().equals("alertSubmittedId"))
-					{
-						alertCalledRo.setAlertSubmittedId(alertFormValue.getFieldValue());
-					}
-					//一般火灾
-					if (alertFormValue.getFieldCode().equals("fireLocation"))
-					{
-						alertCalledRo.setFireLocation(alertFormValue.getFieldValue());
-					}
-					if (alertFormValue.getFieldCode().equals("burningMaterial"))
-					{
-						alertCalledRo.setBurningMaterial(alertFormValue.getFieldValue());
-					}
-					if (alertFormValue.getFieldCode().equals("fireSituation"))
-					{
-						alertCalledRo.setFireSituation(alertFormValue.getFieldValue());
-					}
-					if (alertFormValue.getFieldCode().equals("dangerousExplosives"))
-					{
-						alertCalledRo.setDangerousExplosives(alertFormValue.getFieldValue());
-					}
-					if (alertFormValue.getFieldCode().equals("fireTime"))
-					{
-						alertCalledRo.setCallTimeStr(alertFormValue.getFieldValue());
-					}
-					//航空器救援
-					if (alertFormValue.getFieldCode().equals("flightNumber")) {
-						alertCalledRo.setFlightNumber(alertFormValue.getFieldValue());
-					}
-					if (alertFormValue.getFieldCode().equals("aircraftModel")) {
-						alertCalledRo.setAircraftModel(alertFormValue.getFieldValue());
-					}
-					if (alertFormValue.getFieldCode().equals("landingTime")) {
-						alertCalledRo.setLandingTime(alertFormValue.getFieldValue());
-					}
-					if (alertFormValue.getFieldCode().equals("developmentTrend")) {
-						alertCalledRo.setDevelopmentTrend(alertFormValue.getFieldValue());
-					}
-					if (alertFormValue.getFieldCode().equals("fuelQuantity")) {
-						alertCalledRo.setFuelQuantity(alertFormValue.getFieldValue());
-					}
-					if (alertFormValue.getFieldCode().equals("passengerCapacity")) {
-						alertCalledRo.setPassengerCapacity(alertFormValue.getFieldValue());
-					}
-					if (alertFormValue.getFieldCode().equals("damageLocation")) {
-						alertCalledRo.setDamageLocation(alertFormValue.getFieldValue());
-					}
-					if (alertFormValue.getFieldCode().equals("forcedLandingTrack")) {
-						alertCalledRo.setForcedLandingTrack(alertFormValue.getFieldValue());
-					}
-					if (alertFormValue.getFieldCode().equals("accidentSituation")) {
-						alertCalledRo.setAccidentSituationHkq(alertFormValue.getFieldValue());
-					}
-
-					//突发事件救援
-					if (alertFormValue.getFieldCode().equals("accidentSituation")) {
-						alertCalledRo.setAccidentSituation(alertFormValue.getFieldValue());
-					}
-
-					//漏油现场安全保障
-					if (alertFormValue.getFieldCode().equals("flightNumber")) {
-						alertCalledRo.setFlightNumberLy(alertFormValue.getFieldValue());
-					}
-					if (alertFormValue.getFieldCode().equals("seat")) {
-						alertCalledRo.setSeat(alertFormValue.getFieldValue());
-					}
-					if (alertFormValue.getFieldCode().equals("oilLeakageArea")) {
-						alertCalledRo.setOilLeakageArea(alertFormValue.getFieldValue());
-					}
-
-					//专机保障
-					if (alertFormValue.getFieldCode().equals("securityLevel")) {
-						alertCalledRo.setSecurityLevel(alertFormValue.getFieldValue());
-					}
-					if (alertFormValue.getFieldCode().equals("seat")) {
-						alertCalledRo.setSeatBz(alertFormValue.getFieldValue());
-					}
-
-					//120 急救
-					if (alertFormValue.getFieldCode().equals("patientStatus")) {
-						alertCalledRo.setPatientStatus(alertFormValue.getFieldValue());
-					}
-					if (alertFormValue.getFieldCode().equals("gender")) {
-						alertCalledRo.setGender(alertFormValue.getFieldValue());
-					}
-					if (alertFormValue.getFieldCode().equals("ageGroup")) {
-						alertCalledRo.setAgeGroup(alertFormValue.getFieldValue());
-					}
+					alertCalledRo.setCallTimeStr(alertFormValue.getFieldValue());
+				}
+				//航空器救援
+				if (alertFormValue.getFieldCode().equals("flightNumber")) {
+					alertCalledRo.setFlightNumber(alertFormValue.getFieldValue());
+				}
+				if (alertFormValue.getFieldCode().equals("aircraftModel")) {
+					alertCalledRo.setAircraftModel(alertFormValue.getFieldValue());
+				}
+				if (alertFormValue.getFieldCode().equals("landingTime")) {
+					alertCalledRo.setLandingTime(alertFormValue.getFieldValue());
+				}
+				if (alertFormValue.getFieldCode().equals("developmentTrend")) {
+					alertCalledRo.setDevelopmentTrend(alertFormValue.getFieldValue());
+				}
+				if (alertFormValue.getFieldCode().equals("fuelQuantity")) {
+					alertCalledRo.setFuelQuantity(alertFormValue.getFieldValue());
+				}
+				if (alertFormValue.getFieldCode().equals("passengerCapacity")) {
+					alertCalledRo.setPassengerCapacity(alertFormValue.getFieldValue());
+				}
+				if (alertFormValue.getFieldCode().equals("damageLocation")) {
+					alertCalledRo.setDamageLocation(alertFormValue.getFieldValue());
+				}
+				if (alertFormValue.getFieldCode().equals("forcedLandingTrack")) {
+					alertCalledRo.setForcedLandingTrack(alertFormValue.getFieldValue());
+				}
+				if (alertFormValue.getFieldCode().equals("accidentSituation")) {
+					alertCalledRo.setAccidentSituationHkq(alertFormValue.getFieldValue());
+				}
+
+				//突发事件救援
+				if (alertFormValue.getFieldCode().equals("accidentSituation")) {
+					alertCalledRo.setAccidentSituation(alertFormValue.getFieldValue());
+				}
+
+				//漏油现场安全保障
+				if (alertFormValue.getFieldCode().equals("flightNumber")) {
+					alertCalledRo.setFlightNumberLy(alertFormValue.getFieldValue());
+				}
+				if (alertFormValue.getFieldCode().equals("seat")) {
+					alertCalledRo.setSeat(alertFormValue.getFieldValue());
+				}
+				if (alertFormValue.getFieldCode().equals("oilLeakageArea")) {
+					alertCalledRo.setOilLeakageArea(alertFormValue.getFieldValue());
+				}
+
+				//专机保障
+				if (alertFormValue.getFieldCode().equals("securityLevel")) {
+					alertCalledRo.setSecurityLevel(alertFormValue.getFieldValue());
+				}
+				if (alertFormValue.getFieldCode().equals("seat")) {
+					alertCalledRo.setSeatBz(alertFormValue.getFieldValue());
+				}
 
+				//120 急救
+				if (alertFormValue.getFieldCode().equals("patientStatus")) {
+					alertCalledRo.setPatientStatus(alertFormValue.getFieldValue());
+				}
+				if (alertFormValue.getFieldCode().equals("gender")) {
+					alertCalledRo.setGender(alertFormValue.getFieldValue());
+				}
+				if (alertFormValue.getFieldCode().equals("ageGroup")) {
+					alertCalledRo.setAgeGroup(alertFormValue.getFieldValue());
 				}
 			}
+		}
 
 		// 警情初报模板替换规则
 		String replaceContent = "";
 		if(alertCalled.getAlertTypeCode().equals(AlertStageEnums.YBHZ.getCode())) {
 			replaceContent  =  "失火位置：".concat(ValidationUtil.isEmpty(alertCalled.getAddress()) ? "无": alertCalled.getAddress()).concat(
 					"；燃烧物质：").concat(ValidationUtil.isEmpty(alertCalledRo.getFireLocation() )?  "无": alertCalledRo.getFireLocation()).concat(
-							"；火势情况：").concat(ValidationUtil.isEmpty(alertCalledRo.getFireLocation() ) ? "无" : alertCalledRo.getFireSituation());
+					"；火势情况：").concat(ValidationUtil.isEmpty(alertCalledRo.getFireLocation() ) ? "无" : alertCalledRo.getFireSituation());
 		}
 
 		if(alertCalled.getAlertTypeCode().equals(AlertStageEnums.HKJY.getCode())) {
 			replaceContent  =  "航班号：".concat(ValidationUtil.isEmpty(alertCalledRo.getFlightNumber()) ? "无": alertCalledRo.getFlightNumber()).concat(
 					"；飞机型号：").concat(ValidationUtil.isEmpty(alertCalledRo.getAircraftModel() )?  "无": alertCalledRo.getAircraftModel()).concat(
 					"；落地时间：").concat(ValidationUtil.isEmpty(alertCalledRo.getLandingTime() ) ? "无" : alertCalledRo.getLandingTime()).concat(
-							"发生".concat(ValidationUtil.isEmpty(alertCalledRo.getAccidentSituationHkq()) ? "无": alertCalledRo.getAccidentSituationHkq()).concat(
-					"；飞机受损位置：").concat(ValidationUtil.isEmpty(alertCalledRo.getDamageLocation() )?  "无": alertCalledRo.getDamageLocation()).concat(
-					"；燃油量：").concat(ValidationUtil.isEmpty(alertCalledRo.getFuelQuantity() ) ? "无" : alertCalledRo.getFuelQuantity()).concat(
-					"载客量：".concat(ValidationUtil.isEmpty(alertCalledRo.getPassengerCapacity()) ? "无": alertCalledRo.getPassengerCapacity()).concat(
-							"；迫降跑道：").concat(ValidationUtil.isEmpty(alertCalledRo.getForcedLandingTrack() )?  "无": alertCalledRo.getForcedLandingTrack()).concat(
-							"；发展态势：").concat(ValidationUtil.isEmpty(alertCalledRo.getDevelopmentTrend() ) ? "无" : alertCalledRo.getDevelopmentTrend())
+					"发生".concat(ValidationUtil.isEmpty(alertCalledRo.getAccidentSituationHkq()) ? "无": alertCalledRo.getAccidentSituationHkq()).concat(
+							"；飞机受损位置：").concat(ValidationUtil.isEmpty(alertCalledRo.getDamageLocation() )?  "无": alertCalledRo.getDamageLocation()).concat(
+							"；燃油量：").concat(ValidationUtil.isEmpty(alertCalledRo.getFuelQuantity() ) ? "无" : alertCalledRo.getFuelQuantity()).concat(
+							"载客量：".concat(ValidationUtil.isEmpty(alertCalledRo.getPassengerCapacity()) ? "无": alertCalledRo.getPassengerCapacity()).concat(
+									"；迫降跑道：").concat(ValidationUtil.isEmpty(alertCalledRo.getForcedLandingTrack() )?  "无": alertCalledRo.getForcedLandingTrack()).concat(
+									"；发展态势：").concat(ValidationUtil.isEmpty(alertCalledRo.getDevelopmentTrend() ) ? "无" : alertCalledRo.getDevelopmentTrend())
 					));
 		}
 
@@ -214,18 +231,7 @@ public class RuleAlertCalledService {
 					"；年龄段：").concat(ValidationUtil.isEmpty(alertCalledRo.getAgeGroup() ) ? "无" : alertCalledRo.getAgeGroup());
 		}
 
-		// 警情 报送类型
-		alertCalledRo.setAlertWay(alertWay);
-		alertCalledRo.setReplaceContent(replaceContent);
-
-		if(!ValidationUtil.isEmpty(mobiles)) {
-			alertCalledRo.setIds(mobiles);
-		}
-
-    	//触发规则
-    	ruleTrigger.publish(alertCalledRo, "西咸机场119接处警规则/alertCalledRule", new String[0]);
-
-		return true;
+		return replaceContent;
 	}
 
 	public boolean powerTransferCalledRule(Set<PowerTransferCompanyDto> i, Long alertCalledId, String type) throws Exception {
@@ -236,13 +242,15 @@ public class RuleAlertCalledService {
 
 		AlertCalledFormDto alertCalledFormDto = (AlertCalledFormDto) alertCalledServiceImpl
 				.selectAlertCalledByIdNoRedis(alertCalledId);
+		
+		alertCallePowerTransferRo.setAlertSubmittedId(Long.toString(alertCalledId));
 		if (alertCalledFormDto == null) {
 			return false;
 		}
 		AlertCalled alertCalled = alertCalledFormDto.getAlertCalled();
 		alertCallePowerTransferRo
 				.setCallTimeStr(DateUtils.convertDateToString(alertCalled.getCallTime(), DateUtils.DATE_TIME_PATTERN));
-
+		alertCallePowerTransferRo.setSequenceNbr(String.valueOf(alertCalled.getSequenceNbr()));
 		alertCallePowerTransferRo.setAddress(alertCalled.getAddress());
 		alertCallePowerTransferRo.setAlertType(alertCalled.getAlertType());
 		alertCallePowerTransferRo.setAlertTypeCode(alertCalled.getAlertTypeCode());
@@ -258,9 +266,6 @@ public class RuleAlertCalledService {
 		List<FormValue> alertFormValues = alertCalledFormDto.getDynamicFormAlert();
 		if (!ValidationUtil.isEmpty(alertFormValues)) {
 			for (FormValue alertFormValue : alertFormValues) {
-				if (alertFormValue.getKey().equals("alertSubmittedId")) {
-					alertCallePowerTransferRo.setAlertSubmittedId(alertFormValue.getValue());
-				}
 				// 一般火灾
 				if (alertFormValue.getKey().equals("fireLocation")) {
 					alertCallePowerTransferRo.setFireLocation(alertFormValue.getValue());
@@ -292,7 +297,7 @@ public class RuleAlertCalledService {
 			}
 		}
 		if (FireBrigadeTypeEnum.专职消防队.getKey().equals(type)) {
-			alertCallePowerTransferRo.setCompany(new ArrayList<>(i));
+			alertCallePowerTransferRo.setCompany(JSONArray.toJSONString(i));
 			alertCallePowerTransferRo.setPowerTransType(type);
 			StringBuffer stringBuffer = new StringBuffer();
 			stringBuffer.append(" 失火位置："+alertCallePowerTransferRo.getFireLocation());
@@ -302,7 +307,7 @@ public class RuleAlertCalledService {
 			alertCallePowerTransferRo.setContent(stringBuffer.toString());
 
 		} else if (FireBrigadeTypeEnum.监控大队.getKey().equals(type)) {
-			alertCallePowerTransferRo.setCompany(new ArrayList<>(i));
+			alertCallePowerTransferRo.setCompany(JSONArray.toJSONString(i));
 			alertCallePowerTransferRo.setPowerTransType(type);
 			StringBuffer stringBuffer = new StringBuffer();
 			stringBuffer.append(" 失火位置："+alertCallePowerTransferRo.getFireLocation());
@@ -312,7 +317,7 @@ public class RuleAlertCalledService {
 			alertCallePowerTransferRo.setContent(stringBuffer.toString());
 
 		} else if (FireBrigadeTypeEnum.医疗救援队.getKey().equals(type)) {
-			alertCallePowerTransferRo.setCompany(new ArrayList<>(i));
+			alertCallePowerTransferRo.setCompany(JSONArray.toJSONString(i));
 			alertCallePowerTransferRo.setPowerTransType(type);
 			StringBuffer stringBuffer = new StringBuffer();
 			stringBuffer.append(" 患者现状："+ageGroup==null?"无":ageGroup);

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

@@ -55,8 +55,8 @@ public class RuleDangerService {
         LatentDangerRo latentDangerRo = buildLatentDangerRo(latentDanger, ruleType);
         Map<String, String> extras = !ValidationUtil.isEmpty(latentDangerRo.getExtras()) ? latentDangerRo.getExtras() : new HashMap<>();
         // 跳转url
-        String url = LatentDangerState.SupervisionDangerStateEnum.getEnumUrlByCode(latentDanger.getDangerState());
-        extras.put("url", url);
+        Map<String, String> enumMapByCode = LatentDangerState.SupervisionDangerStateEnum.getEnumMapByCode(latentDanger.getDangerState());
+        extras.putAll(enumMapByCode);
         latentDangerRo.setExtras(extras);
         latentDangerRo.setExcuteStateName(excuteStateName);
         latentDangerRo.setIsSendWeb(true);
@@ -91,6 +91,7 @@ public class RuleDangerService {
         if (!ValidationUtil.isEmpty(type)){
             Map<String, String> map = new HashMap<>();
             map.put("type", type);
+            map.put("id", String.valueOf(latentDanger.getId()));
             latentDangerRo.setExtras(map);
         }
         return latentDangerRo;

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.yeejoin.amos.boot.biz.common.constants.TerminalConstant;
 import com.yeejoin.amos.boot.biz.common.enums.RuleTypeEnum;
 import com.yeejoin.amos.component.rule.RuleTrigger;
 import com.yeejoin.amos.supervision.business.dto.PlanRo;
@@ -27,10 +28,6 @@ public class RulePlanService {
     private final String packageId = "消息/addPlanRule";
     private final String msgType = "supervision";
 
-    private final String APP = "APP";
-    private final String WEB = "WEB";
-    private final String APP_WEB = "APP/WEB";
-
     @Autowired
     private RuleTrigger ruleTrigger;
 
@@ -47,7 +44,6 @@ public class RulePlanService {
     public Boolean addPlanAuditRule(Plan plan, List<String> userIds, RuleTypeEnum ruleType, String excuteStateName) throws Exception {
         PlanRo planRo = buildPlanRo(plan, userIds, ruleType);
         planRo.setExcuteStateName(excuteStateName);
-
         //触发规则
         ruleTrigger.publish(planRo, packageId, new String[0]);
         return true;
@@ -59,11 +55,21 @@ public class RulePlanService {
         planRo.setMsgType(msgType);
         planRo.setRuleType(ruleType.getCode());
         planRo.setRelationId(String.valueOf(plan.getId()));
+        planRo.setTerminal(ruleType.getTerminal());
+        Map<String, String> map = new HashMap<>();
+        map.put("planId", String.valueOf(plan.getId()));
 
         if (!ValidationUtil.isEmpty(ruleType.getUrl())){
-            Map<String, String> map = new HashMap<>();
             map.put("url", ruleType.getUrl());
-            planRo.setExtras(map);
+        }
+
+        if (TerminalConstant.WEB.equals(ruleType.getTerminal())){
+            planRo.setIsSendWeb(true);
+        } else if (TerminalConstant.APP.equals(ruleType.getTerminal())){
+            planRo.setIsSendApp(true);
+        } else if (TerminalConstant.APP_WEB.equals(ruleType.getTerminal())){
+            planRo.setIsSendWeb(true);
+            planRo.setIsSendApp(true);
         }
 
         if (ValidationUtil.isEmpty(userIds)) {
@@ -72,15 +78,10 @@ public class RulePlanService {
                 leadPeopleIds += "," + plan.getUserId();
             }
             userIds = (List<String>) jcsFeignClient.getAmosIdListByUserIds(leadPeopleIds).getResult();
-            planRo.setIsSendApp(true);
-            planRo.setTerminal(WEB);
-        } else {
-            planRo.setIsSendWeb(true);
-            planRo.setIsSendApp(false);
-            planRo.setTerminal(APP_WEB);
         }
         planRo.setSendTime(DateUtil.date2LongStr(new Date()));
         planRo.setRecivers(userIds);
+        planRo.setExtras(map);
         return planRo;
     }
 }

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

@@ -393,8 +393,18 @@ public class ElevatorController extends BaseController {
     public void init(Integer num) {
         IPage<Elevator> elevatorPage = new Page<>();
         Integer count =  elevatorService.count();
+        Integer times = 0;
+        if(ValidationUtil.isEmpty(num) && count != 0) {
+            times = count/500;
+            int last = count%500;
+            if(last > 0 ) {
+                times ++;
+            }
+        } else if(count != 0) {
+            times = num;
+        }
 
-        for(int i = 0; i <= (ValidationUtil.isEmpty(num) ? count%500 : num); ++i  ) {
+        for(int i = 0; i <= times ;  i ++  ) {
             elevatorPage.setCurrent(i);
             elevatorPage.setSize(500);
             elevatorPage =  elevatorService.page(elevatorPage);

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/utils/BeanDtoVoUtils.java

@@ -265,6 +265,8 @@ public class BeanDtoVoUtils {
                 } else if(2 == item.getUnitStatus()) {
                     target.setStatusStr("已驳回");
                 }
+
+                target.setFullAddress(item.getProvince() + item.getCity() + item.getDistrict() + item.getStree() + item.getCommunity() + item.getAddress());
                 return target;
             } catch (Exception e) {
                 return null;

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

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.TzsAuthServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.UnitInfoApproveDto;
@@ -43,6 +45,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
@@ -75,6 +78,9 @@ public class UnitInfoController extends BaseController {
 	@Autowired
 	private TzsAuthServiceImpl tzsAuthServiceImpl;
 
+    @Autowired
+    OrgUsrServiceImpl iOrgUsrService;
+
 	/**
 	 * 获取组织机构树
 	 *
@@ -295,7 +301,7 @@ public class UnitInfoController extends BaseController {
 				queryWrapper.orderByDesc(RedisKey.humpToLine(date[0]));
 			}
 		}else {
-			queryWrapper.orderByDesc("rec_date");
+			queryWrapper.orderByDesc("submit_time");
 		}
 
 		if (!ValidationUtil.isEmpty(unitInfoDto.getIsChange())) { // 分类 注册 /  信息变更 0 注册 1 变更
@@ -304,11 +310,11 @@ public class UnitInfoController extends BaseController {
 		}
 
 		if(!ValidationUtil.isEmpty(unitInfoDto.getSubmitTimeStart())) { // 提交时间
-			queryWrapper.ge("rec_date",unitInfoDto.getSubmitTimeStart());
+			queryWrapper.ge("submit_time",unitInfoDto.getSubmitTimeStart());
 		}
 
 		if(!ValidationUtil.isEmpty(unitInfoDto.getSubmitTimeEnd())) {  // 提交时间
-			queryWrapper.le("rec_date",unitInfoDto.getSubmitTimeEnd());
+			queryWrapper.le("submit_time",unitInfoDto.getSubmitTimeEnd());
 		}
 
 		if(!ValidationUtil.isEmpty(unitInfoDto.getUnitTypeCode())) {  // 单位类型
@@ -330,6 +336,16 @@ public class UnitInfoController extends BaseController {
 		if(!ValidationUtil.isEmpty(unitInfoDto.getUnitStatus())) {  // 审核状态
 			queryWrapper.like("unit_status",unitInfoDto.getUnitStatus());
 		}
+
+		if(!ValidationUtil.isEmpty(unitInfoDto.getLegalPerson())) {  // 法人
+			queryWrapper.like("legal_person",unitInfoDto.getLegalPerson());
+		}
+
+
+		if(!ValidationUtil.isEmpty(unitInfoDto.getLegalPersonTel())) {  // 法人电话
+			queryWrapper.like("legal_person_tel",unitInfoDto.getLegalPersonTel());
+		}
+
 		return queryWrapper;
 	}
 
@@ -365,6 +381,25 @@ public class UnitInfoController extends BaseController {
 	}
 
 
+    /**
+     * 根据当前登录人获取企业信息
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getUserUnit")
+    @ApiOperation(httpMethod = "GET",value = "根据当前登录人获取企业信息",  notes = "根据当前登录人获取企业信息")
+    public ResponseModel<UnitInfoDto> getUserUnit() {
+        AgencyUserModel user = Privilege.agencyUserClient.getme().getResult();
+        List<CompanyModel> companys = user.getCompanys();
+        UnitInfoDto result = new UnitInfoDto();
+        for(CompanyModel c : companys) {
+            OrgUsr temp = iOrgUsrService.getOne(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getIsDelete,false).eq(OrgUsr::getAmosOrgId,c.getSequenceNbr()));
+            if(temp != null) {
+                return ResponseHelper.buildResponse(unitInfoServiceImpl.getDtoByOrgId(temp.getSequenceNbr()));
+            }
+        }
+        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/service/impl/UnitInfoServiceImpl.java

@@ -40,6 +40,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -86,6 +87,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
     public UnitInfoDto saveUnitInfo(UnitInfoDto model) {
         tzsAuthServiceImpl.setRequestContext();
         model.setUnitStatus(0);// 设置为待审核状态
+        model.setSubmitTime(new Date()); // 提交时间
         model.setIsChange(false);// 新增状态不是变更状态
         // 处理单位类型
         String unitTypeCode = model.getUnitTypeCode();
@@ -161,7 +163,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
             } else {     // 如果是审批单 创建用户 创建组织机构 赋权等
 
 
-
+                sourceUnit.setApprovedTime(new Date());
                 // 创建用户  创建组织机构 平台组织机构及 org_user表中  赋权
                 String adminUserName = sourceUnit.getAdminName();
                 String loginName = sourceUnit.getAdminLoginName();
@@ -240,6 +242,11 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
                 org.setBizOrgCode(TreeParser.genTreeCode());
                 org.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
                 org.setBizOrgName(sourceUnit.getOrgName());
+                org.setRecDate(new Date());
+                org.setRecUserId(userResult.getResult().getUserId());
+                org.setRecUserName(userResult.getResult().getUserName());
+                org.setAmosOrgId(companyInfo.getSequenceNbr()+"");
+                org.setAmosOrgCode(companyInfo.getOrgCode());
                 if(!iOrgUsrService.save(org)) {
                     throw new BadRequest("org单位注册失败");
                 }
@@ -314,6 +321,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
             }
 
         }
+        target.setFullAddress(source.getProvince() + source.getCity() + source.getDistrict() + source.getStree() + source.getCommunity() + source.getAddress());
         return target;
     }
 
@@ -342,7 +350,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
             }
 
         }
-
+        target.setFullAddress(source.getProvince() + source.getCity() + source.getDistrict() + source.getStree() + source.getCommunity() + source.getAddress());
         return target;
     }
 
@@ -376,4 +384,14 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
         sourceFileService.saveAttachments(sourceUnit.getSequenceNbr(),attachmentMap);
         return filePath;
     }
+
+    @Override
+    public UnitInfoDto getDtoByOrgId(Long sequenceNbr) {
+
+        UnitInfo unitInfo = this.getOne(new LambdaQueryWrapper<UnitInfo>().eq(UnitInfo::getIsDelete,false).eq(UnitInfo::getOrgUserId,sequenceNbr));
+        if(unitInfo == null) {
+            return new UnitInfoDto();
+        }
+        return unitInfoToDto(unitInfo);
+    }
 }
\ No newline at end of file

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

@@ -2141,8 +2141,9 @@
 
     <changeSet author="chenzhao" id="2021-11-15-1">
         <preConditions onFail="MARK_RAN">
-            <tableExists tableName="cb_dynamic_form_column"/>
-            <primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_dynamic_form_column"/>
+            <not>
+                <primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_dynamic_form_column"/>
+            </not>
         </preConditions>
         <comment>update data cb_data_dictionary</comment>
         <sql>
@@ -2153,8 +2154,9 @@
 
     <changeSet author="chenzhao" id="2021-11-16-1">
         <preConditions onFail="MARK_RAN">
-            <tableExists tableName="cb_dynamic_form_column"/>
-            <primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_dynamic_form_column"/>
+            <not>
+                <primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_dynamic_form_column"/>
+            </not>
         </preConditions>
         <comment>insert data cb_dynamic_form_column</comment>
         <sql>
@@ -2163,7 +2165,96 @@
       </sql>
     </changeSet>
 
+    <changeSet author="litw" id="2021-11-15-1">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="jc_template"/>
+            <primaryKeyExists primaryKeyName="sequence_nbr" tableName="jc_template"/>
+        </preConditions>
+        <comment>insert data jc_template</comment>
+        <sql>
+            INSERT INTO `jc_template` (sequence_nbr, type_code, `type`, content, format, rec_user_name, rec_user_id, rec_date, is_delete) VALUES(26, 'LLDP', '力量调派统一模板', '【力量调派】调派departmentName content 赶往rescueGrid 位置。responseLevel 联系人: contactUser  联系电话: contactPhone  相关警情：【type】时间：callTime replaceContent', 0, NULL, NULL, NULL, 0);
+        </sql>
+    </changeSet>
+
+    <changeSet author="litengwei" id="2021-11-17-litengwei-1">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="jc_template" />
+        </preConditions>
+        <comment>update data jc_template</comment>
+            <sql>
+                update
+                `jc_template` jc
+                set
+                content = '<![CDATA[<p>【警情续报】<span contenteditable="true" data-name="editContent" data-type="input"></span><p>相关警情：时间：$callTime 地点: $address 发生$type 警情 $replaceContent 被困人数：<span contenteditable="true" data-name="trappedNum" data-type="input"></span>；伤亡人数：<span contenteditable="true" data-name="casualtiesNum" data-type="input"></span>；<p>发送单位：<span contentEditable data-name="companyName" data-type="input"></span></p> ]]>'
+                where jc.type_code = '313'
+            </sql>
+    </changeSet>
+
+    <changeSet author="litengwei" id="2021-11-17-litengwei-2">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="jc_template" />
+        </preConditions>
+        <comment>update data jc_template</comment>
+        <sql>
+            update
+            jc_template jc
+            set
+            content = '<![CDATA[<p>【非警情确认】根据现场反馈信息、视频监控信息和消防物联监控信息，判断 【时间：$callTime 地点: $address 发生$type 警情 $replaceContent ；被困人数：<span contenteditable="true" data-name="trappedNum" data-type="input"></span>；伤亡人数：<span contenteditable="true" data-name="casualtiesNum" data-type="input"></span>；  】 为非警情，请个单位、部门尽快 进行恢复到日常执勤状态。</p><p>发送单位：<span contenteditable="true" data-name="companyName" data-type="input"></span></p>]]>'
+            where
+            jc.type_code = '314'
+        </sql>
+    </changeSet>
+
+    <changeSet author="litengwei" id="2021-11-17-litengwei-3">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="jc_template" />
+        </preConditions>
+        <comment>update data jc_template</comment>
+        <sql>
+            update
+            jc_template jc
+            set
+            content = '<![CDATA[<p>【警情结案】当前警情已于<span contenteditable="true" data-name="recDate" data-type="input"></span> 当前警情已经结案。</p>相关警情：时间：$callTime 地点: $address 发生$type 警情 $replaceContent；被困人数：<span contenteditable="true" data-name="trappedNum" data-type="input"></span>；伤亡人数：<span contenteditable="true" data-name="casualtiesNum" data-type="input"></span>；<p>发送单位：<span contentEditable data-name="companyName" data-type="input"></span></p>]]>'
+            where
+            jc.type_code = '315'
+        </sql>
+    </changeSet>
+
+
+<!--  insert 模板
+     <changeSet author="chenzhao" id="2021-11-16-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_dynamic_form_column"/>
+            </not>
+        </preConditions>
+        <comment>insert data cb_dynamic_form_column</comment>
+        <sql>
+            INSERT INTO `cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (132828674812087, 'dutyArea', '值班区域', 'input', 132828674815, 'like', b'0', b'0', 'dutyFireFighting', NULL, NULL, NULL, '2021-11-16 10:33:18', b'0', NULL, NULL, NULL);
+        </sql>
+    </changeSet>-->
+
+<!-- Update 示例
+    <changeSet author="chenzhao" id="2021-11-02-1">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="jc_template"/>
+        </preConditions>
+        <comment>update data jc_template</comment>
+        <sql>
+            UPDATE `jc_template` SET content ='【120急救】时间：callTime；地址：address；被困人数：trappedNum；伤亡人数：casualtiesNum；性别：gender；年龄段(岁)：ageGroup；患者现状：patientStatus；情况说明：situation；警情阶段：alertStage' WHERE sequence_nbr=23;
+        </sql>
+    </changeSet>   -->
 
+<!-- 表字段修改
+    <changeSet author="chenzhao" id="2021-09-27-cz-1">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="cb_fire_experts"/>
+        </preConditions>
+        <comment>BUG 2928 表中新增两个字段用来保存详细地址值 </comment>
+        <sql>
+            ALTER TABLE `cb_fire_experts` add native_place_val varchar(255) COMMENT '户籍所在地详细地址';
+        </sql>
+    </changeSet> -->
 
 
 </databaseChangeLog>

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

@@ -105,10 +105,7 @@
 
 	<changeSet author="kongfm" id="2021-11-17-01">
 		<preConditions onFail="MARK_RAN">
-			<tableExists tableName="cb_data_dictionary"/>
-			<not>
 				<primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
-			</not>
 		</preConditions>
 		<comment>add data_dictionary </comment>
 		<sql>
@@ -143,7 +140,9 @@
 
 	<changeSet author="kongfm" id="2021-11-17-02">
 		<preConditions onFail="MARK_RAN">
-			<tableExists tableName="tz_flc_unit_info"/>
+			<not>
+				<tableExists tableName="tz_flc_unit_info"/>
+			</not>
 		</preConditions>
 		<comment>add tz_flc_unit_info table</comment>
 		<sql>
@@ -190,6 +189,8 @@
 			`rec_date` datetime NULL DEFAULT NULL COMMENT '更新时间',
 			`is_delete` bit(1) NULL DEFAULT b'0' COMMENT '是否删除（0：未删除，1：已删除）',
 			`is_change` bit(1) NULL DEFAULT NULL COMMENT '是否变更（0：未变更，1：变更中）',
+			`approved_time` datetime NULL DEFAULT NULL COMMENT '企业入驻时间',
+			`submit_time` datetime NULL DEFAULT NULL COMMENT '提交时间',
 			PRIMARY KEY (`sequence_nbr`) USING BTREE
 			) ENGINE = InnoDB AUTO_INCREMENT = 1460504125366816771 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '企业信息表' ROW_FORMAT = Dynamic;
 		</sql>
@@ -197,7 +198,9 @@
 
 	<changeSet author="kongfm" id="2021-11-17-03">
 		<preConditions onFail="MARK_RAN">
+			<not>
 			<tableExists tableName="tz_flc_unit_info_approve"/>
+			</not>
 		</preConditions>
 		<comment>add tz_flc_unit_info_approve table</comment>
 		<sql>
@@ -219,7 +222,9 @@
 
 	<changeSet author="kongfm" id="2021-11-17-04">
 		<preConditions onFail="MARK_RAN">
+			<not>
 			<tableExists tableName="tz_flc_unit_info_change"/>
+			</not>
 		</preConditions>
 		<comment>add tz_flc_unit_info_change table</comment>
 		<sql>
@@ -261,11 +266,41 @@
 			`rec_date` datetime NULL DEFAULT NULL COMMENT '更新时间',
 			`is_delete` bit(1) NULL DEFAULT b'0' COMMENT '是否删除（0：未删除，1：已删除）',
 			`organization_code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '组织机构编码',
+			`approved_time` datetime NULL DEFAULT NULL COMMENT '企业入驻时间',
+			`submit_time` datetime NULL DEFAULT NULL COMMENT '提交时间',
 			PRIMARY KEY (`sequence_nbr`) USING BTREE
 			) ENGINE = InnoDB AUTO_INCREMENT = 1458311353490657283 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '企业信息变更表' ROW_FORMAT = Dynamic;
 		</sql>
 	</changeSet>
 
+    <changeSet author="kongfm" id="2021-11-17-05">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
+            </not>
+        </preConditions>
+        <comment>update cb_data_dictionary UNIT_TYPE</comment>
+        <sql>
+            UPDATE `cb_data_dictionary` SET `code` = '1043', `name` = '监管单位', `type` = 'UNIT_TYPE', `type_desc` = 'studio_normalapp_3477687,studio_normalapp_3261162', `parent` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = NULL, `is_delete` = b'0', `sort_num` = 1 WHERE `sequence_nbr` = 1043;
+            UPDATE `cb_data_dictionary` SET `code` = '1044', `name` = '检验单位', `type` = 'UNIT_TYPE', `type_desc` = 'studio_normalapp_3477687,studio_normalapp_3261162', `parent` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = NULL, `is_delete` = b'0', `sort_num` = 1 WHERE `sequence_nbr` = 1044;
+            UPDATE `cb_data_dictionary` SET `code` = '1045', `name` = '检测单位', `type` = 'UNIT_TYPE', `type_desc` = 'studio_normalapp_3477687,studio_normalapp_3261162', `parent` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = NULL, `is_delete` = b'0', `sort_num` = 1 WHERE `sequence_nbr` = 1045;
+            UPDATE `cb_data_dictionary` SET `code` = '1046', `name` = '设计单位', `type` = 'UNIT_TYPE', `type_desc` = 'studio_normalapp_3477687,studio_normalapp_3261162', `parent` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = NULL, `is_delete` = b'0', `sort_num` = 1 WHERE `sequence_nbr` = 1046;
+            UPDATE `cb_data_dictionary` SET `code` = '1047', `name` = '制造单位', `type` = 'UNIT_TYPE', `type_desc` = 'studio_normalapp_3477687,studio_normalapp_3261162', `parent` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = NULL, `is_delete` = b'0', `sort_num` = 1 WHERE `sequence_nbr` = 1047;
+            UPDATE `cb_data_dictionary` SET `code` = '1048', `name` = '安装单位', `type` = 'UNIT_TYPE', `type_desc` = 'studio_normalapp_3477687,studio_normalapp_3261162', `parent` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = NULL, `is_delete` = b'0', `sort_num` = 1 WHERE `sequence_nbr` = 1048;
+            UPDATE `cb_data_dictionary` SET `code` = '1049', `name` = '改造单位', `type` = 'UNIT_TYPE', `type_desc` = 'studio_normalapp_3477687,studio_normalapp_3261162', `parent` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = NULL, `is_delete` = b'0', `sort_num` = 1 WHERE `sequence_nbr` = 1049;
+            UPDATE `cb_data_dictionary` SET `code` = '1050', `name` = '维修单位', `type` = 'UNIT_TYPE', `type_desc` = 'studio_normalapp_3477687,studio_normalapp_3261162', `parent` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = NULL, `is_delete` = b'0', `sort_num` = 1 WHERE `sequence_nbr` = 1050;
+            UPDATE `cb_data_dictionary` SET `code` = '1051', `name` = '使用单位', `type` = 'UNIT_TYPE', `type_desc` = 'studio_normalapp_3477687,studio_normalapp_3261162', `parent` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = NULL, `is_delete` = b'0', `sort_num` = 1 WHERE `sequence_nbr` = 1051;
+            UPDATE `cb_data_dictionary` SET `code` = '1052', `name` = '维保单位', `type` = 'UNIT_TYPE', `type_desc` = 'studio_normalapp_3477687,studio_normalapp_3261162', `parent` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = NULL, `is_delete` = b'0', `sort_num` = 1 WHERE `sequence_nbr` = 1052;
+            UPDATE `cb_data_dictionary` SET `code` = '1053', `name` = '物业单位', `type` = 'UNIT_TYPE', `type_desc` = 'studio_normalapp_3477687,studio_normalapp_3261162', `parent` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = NULL, `is_delete` = b'0', `sort_num` = 1 WHERE `sequence_nbr` = 1053;
+            UPDATE `cb_data_dictionary` SET `code` = '1054', `name` = '保险公司', `type` = 'UNIT_TYPE', `type_desc` = 'studio_normalapp_3477687,studio_normalapp_3261162', `parent` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = NULL, `is_delete` = b'0', `sort_num` = 1 WHERE `sequence_nbr` = 1054;
+            UPDATE `cb_data_dictionary` SET `code` = '1055', `name` = '物联网公司', `type` = 'UNIT_TYPE', `type_desc` = 'studio_normalapp_3477687,studio_normalapp_3261162', `parent` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = NULL, `is_delete` = b'0', `sort_num` = 1 WHERE `sequence_nbr` = 1055;
+            UPDATE `cb_data_dictionary` SET `code` = '1056', `name` = '气瓶充装单位', `type` = 'UNIT_TYPE', `type_desc` = 'studio_normalapp_3477687,studio_normalapp_3261162', `parent` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = NULL, `is_delete` = b'0', `sort_num` = 1 WHERE `sequence_nbr` = 1056;
+            UPDATE `cb_data_dictionary` SET `code` = '1057', `name` = '经营单位', `type` = 'UNIT_TYPE', `type_desc` = 'studio_normalapp_3477687,studio_normalapp_3261162', `parent` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = NULL, `is_delete` = b'0', `sort_num` = 1 WHERE `sequence_nbr` = 1057;
+            UPDATE `cb_data_dictionary` SET `code` = '1058', `name` = '其他', `type` = 'UNIT_TYPE', `type_desc` = 'studio_normalapp_3477687,studio_normalapp_3261162', `parent` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = NULL, `is_delete` = b'0', `sort_num` = 1 WHERE `sequence_nbr` = 1058;
+
+        </sql>
+    </changeSet>
+
 
  </databaseChangeLog>