解决冲突

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

@@ -16,4 +16,23 @@ public interface CommonConstant {
 	public final static String RESULT_FAILURE = "FAILURE";
     
     public final static String X_ACCESS_TOKEN = "X-Access-Token";
+
+	/**
+	 *  机构/部门/人员表中 机构类型
+	 */
+	public final static String BIZ_ORG_TYPE_DEPARTMENT = "DEPARTMENT";
+
+	public final static String BIZ_ORG_TYPE_COMPANY = "COMPANY";
+
+	public final static String BIZ_ORG_TYPE_PERSON = "PERSON";
+
+	/**
+	 * 未被删除
+	 */
+	public final static String IS_DELETE_00 = "0";
+
+	/**
+	 *  已被删除
+	 */
+	public final static String IS_DELETE_01 = "1";
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dto/BaseDto.java

+package com.yeejoin.amos.boot.biz.common.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+/**
+ * 基础DTO
+ * @author kinky
+ *
+ */
+
+@Data
+public class BaseDto implements Serializable{
+	 /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "主键ID")
+    protected Long sequenceNbr;
+	@ApiModelProperty(value = "更新时间")
+    protected Date recDate;
+	@ApiModelProperty(value = "更新人")
+    protected String recUserId;
+}

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/entity/BaseEntity.java

 package com.yeejoin.amos.boot.biz.common.entity;
 
+import java.io.Serializable;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
@@ -15,7 +16,7 @@ import lombok.Data;
  * @author DELL
  */
 @Data
-public class BaseEntity{
+public class BaseEntity implements Serializable{
 	
 	    @TableId(value = "SEQUENCE_NBR" , type = IdType.ID_WORKER)
 	    protected Long sequenceNbr;

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/EnumsUtils.java

+package com.yeejoin.amos.boot.biz.common.utils;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+
+/**
+ * @Author: songLei
+ * @Description:
+ * @Date: 2020/12/23 20:21
+ * @Version: 1.0
+ */
+@Slf4j
+public class EnumsUtils {
+    private static Map<Class, Object> map = new ConcurrentHashMap<>();
+
+    /**
+     * 根据条件获取枚举对象
+     *
+     * @param className 枚举类
+     * @param predicate 筛选条件
+     * @param <T>
+     * @return
+     */
+    public static <T> Optional<T> getEnumObject(Class<T> className, Predicate<T> predicate) {
+        if (!className.isEnum()) {
+            log.info("Class 不是枚举类");
+            return null;
+        }
+        Object obj = map.get(className);
+        T[] ts = null;
+        if (obj == null) {
+            ts = className.getEnumConstants();
+            map.put(className, ts);
+        } else {
+            ts = (T[]) obj;
+        }
+        return Arrays.stream(ts).filter(predicate).findAny();
+    }
+}

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 警情接警记录
 *
@@ -20,14 +14,10 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * @date 2021-06-17
 */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("jc_alert_called")
 @ApiModel(value="AlertCalledDto", description="警情接警记录")
-public class AlertCalledDto extends BaseEntity {
+public class AlertCalledDto extends BaseDto{
     private static final long serialVersionUID = 1L;
 
-
     @ApiModelProperty(value = "警情状态")
     private Boolean alertStatus;
 

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 警情表单
 *
@@ -19,11 +12,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * @date 2021-06-17
 */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("jc_alert_from")
 @ApiModel(value="AlertFromDto", description="警情表单")
-public class AlertFromDto extends BaseEntity {
+public class AlertFromDto extends BaseDto{
     private static final long serialVersionUID = 1L;
 
 

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 动态表单类型
 *
@@ -19,11 +12,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * @date 2021-06-17
 */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("jc_alert_from_type")
 @ApiModel(value="AlertFromTypeDto", description="动态表单类型")
-public class AlertFromTypeDto extends BaseEntity {
+public class AlertFromTypeDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
 

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 
 *
@@ -19,11 +12,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * @date 2021-06-17
 */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("jc_alert_from_value")
 @ApiModel(value="AlertFromValueDto", description="")
-public class AlertFromValueDto extends BaseEntity {
+public class AlertFromValueDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
 

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
+import java.util.List;
+
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import java.util.List;
-
 /**
 * 警情报送记录
 *
@@ -15,17 +17,25 @@ import java.util.List;
 * @date 2021-06-17
 */
 @Data
-@Accessors(chain = true)
 @ApiModel(value="AlertSubmittedDto", description="警情报送记录")
-public class AlertSubmittedDto {
+public class AlertSubmittedDto extends BaseDto{
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "主键id")
+    private Long sequenceNbr;
+
     @ApiModelProperty(value = "警情id")
     private Long alertCalledId;
 
     @ApiModelProperty(value = "业务类型code(警情续报、非警情确认、警情结案)")
     private String businessTypeCode;
 
+    @ApiModelProperty(value = "通话记录id")
+    private String callLogId;
+
+    @ApiModelProperty(value = "调度类型code(融合调度、外部协调)")
+    private String schedulingTypeCode;
+
     /**
      * 区分是警情报送还是融合调度
      * 电话：融合调度
@@ -38,10 +48,16 @@ public class AlertSubmittedDto {
      * 报送对象
      */
     @ApiModelProperty(value = "报送对象")
-    private List<SubmitTargetCompanyDto> submitTargetList;
+    private List<SubmitTargetCompanyDto> submitCompanyList;
 
     /**
      * 报送内容
      */
     private JSONObject submitContent;
+
+    /**
+     * 发送对象类型（0：人员，1：单位）
+     */
+    @ApiModelProperty(value = "报送对象类型0：人员，1：单位")
+    private String type;
 }

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 报送对象
 *
@@ -19,11 +12,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * @date 2021-06-17
 */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("jc_alert_submitted_object")
 @ApiModel(value="AlertSubmittedObjectDto", description="报送对象")
-public class AlertSubmittedObjectDto extends BaseEntity {
+public class AlertSubmittedObjectDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
 

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 数据字典
 *
@@ -19,11 +12,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * @date 2021-06-07
 */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_data_dictionary")
 @ApiModel(value="DataDictionaryDto", description="数据字典")
-public class DataDictionaryDto extends BaseEntity {
+public class DataDictionaryDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
 

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 
 *
@@ -20,11 +14,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * @date 2021-06-07
 */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_fire_experts")
 @ApiModel(value="FireExpertsDto", description="")
-public class FireExpertsDto extends BaseEntity {
+public class FireExpertsDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
 

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 消防队伍
 *
@@ -20,11 +14,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * @date 2021-06-07
 */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_fire_team")
 @ApiModel(value="FireTeamDto", description="消防队伍")
-public class FireTeamDto extends BaseEntity {
+public class FireTeamDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
 

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * l联系人
 *
@@ -20,11 +14,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * @date 2021-06-07
 */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_firefighters_contacts")
 @ApiModel(value="FirefightersContactsDto", description="l联系人")
-public class FirefightersContactsDto extends BaseEntity {
+public class FirefightersContactsDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
 

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 消防员合同
 *
@@ -20,11 +14,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * @date 2021-06-07
 */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_firefighters_contract")
 @ApiModel(value="FirefightersContractDto", description="消防员合同")
-public class FirefightersContractDto extends BaseEntity {
+public class FirefightersContractDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
 

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 消防队员
 *
@@ -20,11 +14,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * @date 2021-06-07
 */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_firefighters")
 @ApiModel(value="FirefightersDto", description="消防队员")
-public class FirefightersDto extends BaseEntity {
+public class FirefightersDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
 

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 人员学历
 *
@@ -20,11 +14,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * @date 2021-06-07
 */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_firefighters_education")
 @ApiModel(value="FirefightersEducationDto", description="人员学历")
-public class FirefightersEducationDto extends BaseEntity {
+public class FirefightersEducationDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
 

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 消防人员配装记录
 *
@@ -20,11 +14,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * @date 2021-06-07
 */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("jc_firefighters_jacket")
 @ApiModel(value="FirefightersJacketDto", description="消防人员配装记录")
-public class FirefightersJacketDto extends BaseEntity {
+public class FirefightersJacketDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
 

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 岗位信息
 *
@@ -20,11 +14,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * @date 2021-06-07
 */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_firefighters_post")
 @ApiModel(value="FirefightersPostDto", description="岗位信息")
-public class FirefightersPostDto extends BaseEntity {
+public class FirefightersPostDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
 

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 消防员思想谈话记录
 *
@@ -20,11 +14,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * @date 2021-06-07
 */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_firefighters_thought")
 @ApiModel(value="FirefightersThoughtDto", description="消防员思想谈话记录")
-public class FirefightersThoughtDto extends BaseEntity {
+public class FirefightersThoughtDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
 

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 工作经历
 *
@@ -20,11 +14,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * @date 2021-06-07
 */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_firefighters_workexperience")
 @ApiModel(value="FirefightersWorkexperienceDto", description="工作经历")
-public class FirefightersWorkexperienceDto extends BaseEntity {
+public class FirefightersWorkexperienceDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
 

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author fengwang
+ * @date 2021-06-18.
+ */
+@Data
+@ApiModel(value="OrgUsr对象", description="部门信息")
+public class OrgDepartmentDto extends BaseDto {
+
+
+    @ApiModelProperty(value = "部门名称")
+    private String bizOrgName;
+
+    @ApiModelProperty(value = "部门编码")
+    private String bizOrgCode;
+
+    @ApiModelProperty(value = "amos中公司/部门ID")
+    private String amosOrgId;
+
+    @ApiModelProperty(value = "amos中公司/部门编码")
+    private String amosOrgCode;
+
+    @ApiModelProperty(value = "机构类型（部门：DEPARTMENT，单位：COMPANY，人员：PERSON）")
+    private String bizOrgType = CommonConstant.BIZ_ORG_TYPE_DEPARTMENT;
+
+    @ApiModelProperty(value = "所属建筑名称")
+    private String buildName;
+
+    @ApiModelProperty(value = "所属建筑ID")
+    private String buildId;
+
+    @ApiModelProperty(value = "归属机构/部门/人员")
+    private String parentId;
+
+    @ApiModelProperty(value = "扩展属性1")
+    private String orgExpandAttr1;
+
+    @ApiModelProperty(value = "扩展属性2")
+    private String orgExpandAttr2;
+
+    @ApiModelProperty(value = "扩展属性3")
+    private String orgExpandAttr3;
+
+    @ApiModelProperty(value = "扩展属性4")
+    private String orgExpandAttr4;
+
+    private String orgExpandAttr5;
+
+    private String orgExpandAttr6;
+
+    private String orgExpandAttr7;
+
+    private String orgExpandAttr8;
+
+    @ApiModelProperty(value = "更新人")
+    @TableField(fill= FieldFill.INSERT_UPDATE)
+    private String recUserName;
+
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author fengwang
+ * @date 2021-06-18.
+ */
+@Data
+@ApiModel(value="OrgUsr对象", description="人员信息")
+public class OrgPersonDto extends BaseDto {
+
+
+    @ApiModelProperty(value = "人员名称")
+    private String bizOrgName;
+
+    @ApiModelProperty(value = "人员编码")
+    private String bizOrgCode;
+
+    @ApiModelProperty(value = "amos中公司/部门ID")
+    private String amosOrgId;
+
+    @ApiModelProperty(value = "amos中公司/部门编码")
+    private String amosOrgCode;
+
+    @ApiModelProperty(value = "机构类型（部门：DEPARTMENT，单位：COMPANY，人员：PERSON）")
+    private String bizOrgType = CommonConstant.BIZ_ORG_TYPE_PERSON;
+
+    @ApiModelProperty(value = "所属建筑名称")
+    private String buildName;
+
+    @ApiModelProperty(value = "所属建筑ID")
+    private String buildId;
+
+    @ApiModelProperty(value = "归属机构/部门/人员")
+    private String parentId;
+
+    @ApiModelProperty(value = "扩展属性1")
+    private String orgExpandAttr1;
+
+    @ApiModelProperty(value = "扩展属性2")
+    private String orgExpandAttr2;
+
+    @ApiModelProperty(value = "扩展属性3")
+    private String orgExpandAttr3;
+
+    @ApiModelProperty(value = "扩展属性4")
+    private String orgExpandAttr4;
+
+    private String orgExpandAttr5;
+
+    private String orgExpandAttr6;
+
+    private String orgExpandAttr7;
+
+    private String orgExpandAttr8;
+
+    @ApiModelProperty(value = "更新人")
+    @TableField(fill= FieldFill.INSERT_UPDATE)
+    private String recUserName;
+
+}

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 
 *
@@ -19,11 +11,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * @date 2021-06-18
 */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_org_usr_auth")
 @ApiModel(value="OrgUsrAuthDto", description="")
-public class OrgUsrAuthDto extends BaseEntity {
+public class OrgUsrAuthDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
 

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
 /**
 * 机构/部门/人员表
 *
@@ -19,11 +15,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * @date 2021-06-18
 */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_org_usr")
 @ApiModel(value="OrgUsrDto", description="机构/部门/人员表")
-public class OrgUsrDto extends BaseEntity {
+public class OrgUsrDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
 
@@ -72,6 +65,7 @@ public class OrgUsrDto extends BaseEntity {
     private String orgExpandAttr8;
 
     @ApiModelProperty(value = "更新人")
+    @TableField(fill= FieldFill.INSERT_UPDATE)
     private String recUserName;
 
 }

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import java.util.List;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.List;
 
 /**
 * 调派单位
@@ -17,11 +15,8 @@ import java.util.List;
 * @date 2021-06-17
 */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("jc_power_transfer_company")
 @ApiModel(value="PowerTransferCompanyDto", description="调派单位")
-public class PowerTransferCompanyDto extends BaseEntity {
+public class PowerTransferCompanyDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
 

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 /**
 * 调派单位资源
 *
@@ -14,11 +12,8 @@ import lombok.experimental.Accessors;
 * @date 2021-06-17
 */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("jc_power_transfer_company_resources")
 @ApiModel(value="PowerTransferCompanyResourcesDto", description="调派单位资源")
-public class PowerTransferCompanyResourcesDto extends BaseEntity {
+public class PowerTransferCompanyResourcesDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
 

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import java.util.List;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.List;
 
 /**
 * 力量调派
@@ -17,11 +15,8 @@ import java.util.List;
 * @date 2021-06-17
 */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("jc_power_transfer")
 @ApiModel(value="PowerTransferDto", description="力量调派")
-public class PowerTransferDto extends BaseEntity {
+public class PowerTransferDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
 

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
+import lombok.Data;
+
 import java.util.List;
 
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 /**
  * 警情报送公司对象dto
  * @author DELL
  */
-public class SubmitTargetCompanyDto {
+@Data
+public class SubmitTargetCompanyDto extends BaseDto {
 
     /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
      * 单位id
      */
     private Long companyId;

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
+import lombok.Data;
+
 /**
  * 警情报送目标人员dto
  * @author DELL
  */
-public class SubmitTargetPersonDto {
+@Data
+public class SubmitTargetPersonDto extends BaseDto{
 
     /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
      * 人员id
      */
     private Long personId;

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
 /**
-* 模板表
-*
-* @author tb
-* @date 2021-06-17
-*/
+ * 模板表
+ *
+ * @author tb
+ * @date 2021-06-17
+ */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("jc_template")
-@ApiModel(value="TemplateDto", description="模板表")
-public class TemplateDto extends BaseEntity {
+@ApiModel(value = "TemplateDto", description = "模板表")
+public class TemplateDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "模板类型code")
+    private String typeCode;
 
     @ApiModelProperty(value = "模板类型")
     private String type;

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

+package com.yeejoin.amos.boot.module.jcs.api.entity;
+
+import java.util.List;
+
+/**
+ * @author fengwang
+ * @date 2021-06-19.
+ */
+public class OrgMenu{
+    public Long key;
+    public String title;
+    public Long parentId;
+    public boolean isLeaf;
+    public List<OrgMenu> children;
+    public String bizOrgType;
+    public OrgMenu(Long key, String title, Long parentId, String bizOrgType, boolean isLeaf) {
+        super();
+        this.key = key;
+        this.title = title;
+        this.parentId = parentId;
+        this.bizOrgType = bizOrgType;
+        this.isLeaf = isLeaf;
+    }
+
+    public OrgMenu(Long key, String title, Long parentId, boolean isLeaf, List<OrgMenu> children, String bizOrgType) {
+        this.key = key;
+        this.title = title;
+        this.parentId = parentId;
+        this.isLeaf = isLeaf;
+        this.children = children;
+        this.bizOrgType = bizOrgType;
+    }
+
+    public Long getKey() {
+        return key;
+    }
+
+    public void setKey(Long key) {
+        this.key = key;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Long getParentId() {
+        return parentId;
+    }
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+    public List<OrgMenu> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<OrgMenu> children) {
+        this.children = children;
+    }
+
+    public String getBizOrgType() {
+        return bizOrgType;
+    }
+
+    public void setBizOrgType(String bizOrgType) {
+        this.bizOrgType = bizOrgType;
+    }
+
+}

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

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import java.io.Serializable;
+
 /**
 * 机构/部门/人员表
 *
@@ -22,11 +23,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("cb_org_usr")
-@ApiModel(value="OrgUsr对象", description="机构/部门/人员表")
-public class OrgUsr extends BaseEntity {
-
-    
-
+@ApiModel(value="OrgUsr对象", description="部门信息")
+public class OrgUsr extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "机构/部门名称")
     private String bizOrgName;
@@ -40,7 +38,7 @@ public class OrgUsr extends BaseEntity {
     @ApiModelProperty(value = "amos中公司/部门编码")
     private String amosOrgCode;
 
-    @ApiModelProperty(value = "机构类型（部门：DEPARTMENT，单位：COMPANY，人员：PERSON）")
+    @ApiModelProperty(value = "机构类型`")
     private String bizOrgType;
 
     @ApiModelProperty(value = "所属建筑名称")
@@ -73,6 +71,8 @@ public class OrgUsr extends BaseEntity {
     private String orgExpandAttr8;
 
     @ApiModelProperty(value = "更新人")
+    @TableField(fill=FieldFill.INSERT_UPDATE)
     private String recUserName;
 
+
 }

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

@@ -25,9 +25,11 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @ApiModel(value="Template对象", description="模板表")
 public class Template extends BaseEntity {
 
-   
 
 
+    @ApiModelProperty(value = "模板类型code")
+    private String typeCode;
+
     @ApiModelProperty(value = "模板类型")
     private String type;
 

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

 package com.yeejoin.amos.boot.module.jcs.api.enums;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
 /**
  * 警情填报类型枚举
  *
  * @author DELL
  */
-
+@Getter
+@AllArgsConstructor
 public enum AlertBusinessTypeEnum {
 
     /**
@@ -19,9 +23,6 @@ public enum AlertBusinessTypeEnum {
     private String code;
     private String name;
 
-    AlertBusinessTypeEnum(String key, String code, String name) {
-    }
-
     public String getKey() {
         return key;
     }

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

 package com.yeejoin.amos.boot.module.jcs.api.enums;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
 /**
  * 警情调度类型枚举
  *
  * @author DELL
  */
-
+@Getter
+@AllArgsConstructor
 public enum AlertSchedulingTypeEnum {
 
     /**
@@ -18,9 +22,6 @@ public enum AlertSchedulingTypeEnum {
     private String code;
     private String name;
 
-    AlertSchedulingTypeEnum(String key, String code, String name) {
-    }
-
     public String getKey() {
         return key;
     }

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

+package com.yeejoin.amos.boot.module.jcs.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 警情报送类型（0：人员，1：单位）
+ *
+ * @author DELL
+ */
+@Getter
+@AllArgsConstructor
+public enum AlertSubmitTypeEnum {
+
+    //人员
+    Person("0", "人员"),
+    // 单位
+    Org("1", "单位");
+
+    /**
+     * key
+     */
+    private String key;
+
+    /**
+     * 名称
+     */
+    private String name;
+}

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

 package com.yeejoin.amos.boot.module.jcs.api.enums;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
 /**
  * 报送方式枚举
  *
  * @author DELL
  */
-
+@Getter
+@AllArgsConstructor
 public enum SubmissionMethodEnum {
     PHONE("phone", "311", "电话"),
     SMS("sms", "312", "短信");
@@ -14,9 +18,6 @@ public enum SubmissionMethodEnum {
     private String code;
     private String name;
 
-    SubmissionMethodEnum(String key, String code, String name) {
-    }
-
     public String getKey() {
         return key;
     }

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyResourcesVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferVo;
 
 import java.util.List;
@@ -13,5 +14,5 @@ import java.util.List;
  * @date 2021-06-17
  */
 public interface PowerTransferMapper extends BaseMapper<PowerTransfer> {
-    List<PowerTransferVo> getPowerTransferList(Long alertCalledId);
+    List<PowerTransferCompanyResourcesVo> getPowerTransferList(Long alertCalledId);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IAlertSubmittedService.java

@@ -35,5 +35,5 @@ public interface IAlertSubmittedService extends IService<AlertSubmitted> {
      * @param alertSubmittedDto
      * @return
      */
-    Object save(AlertSubmittedDto alertSubmittedDto);
+    Boolean save(AlertSubmittedDto alertSubmittedDto);
 }

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

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
+import com.yeejoin.amos.boot.module.jcs.api.entity.OrgMenu;
 import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Collection;
+import java.util.List;
+
 /**
 * 机构/部门/人员表 服务类
 *
@@ -10,5 +14,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 * @date 2021-06-18
 */
 public interface IOrgUsrService extends IService<OrgUsr> {
-
+    List<OrgMenu> getTree(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy, String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
+    List<OrgMenu> getSub(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy, String NAMEMethodName, String PARENTIDMethodName,String OrgTypeMethodName) throws Exception;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IPowerTransferService.java

@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.jcs.api.service;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
+import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyResourcesVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferVo;
 
 import java.util.List;
@@ -15,7 +17,7 @@ import java.util.List;
  */
 public interface IPowerTransferService extends IService<PowerTransfer> {
 
-    List<PowerTransferVo> getPowerTransferList(Long alertCalledId);
+    PowerTransferVo getPowerTransferList(Long alertCalledId);
 
     boolean createPowerTransfer(PowerTransferDto powerTransferDto);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/ITemplateService.java

@@ -11,4 +11,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface ITemplateService extends IService<Template> {
 
+    /**
+     * 根据模板类型获取模板信息
+     *
+     * @param type
+     * @return
+     */
+    Template getByType(String type);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FireTeamVo.java

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.util.Date;
+
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,23 +15,26 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
 /**
-* 消防队伍
-*
-* @author tb
-* @date 2021-06-07
-*/
+ * 消防队伍
+ *
+ * @author tb
+ * @date 2021-06-07
+ */
 @Data
-@ApiModel(value="FireTeamVo", description="消防队伍")
-public class FireTeamVo{
+@ApiModel(value = "FireTeamVo", description = "消防队伍")
+public class FireTeamVo {
 
     private static final long serialVersionUID = 1L;
 
 
     @ApiModelProperty(value = "消防队伍图片")
     private String img;
-    @ApiModelProperty(value = "单位名称")
+    @ApiModelProperty(value = "队伍名称")
     private String name;
+    @ApiModelProperty(value = "队伍类型")
+    private String type;
     @ApiModelProperty(value = "联系人")
     private String contactUser;
     @ApiModelProperty(value = "联系电话")
@@ -39,9 +44,13 @@ public class FireTeamVo{
     @ApiModelProperty(value = "队伍id")
     private Long sequenceNbr;
     @ApiModelProperty(value = "队伍车数量")
-    private Double carNum=0D;
+    private Double carNum = 0D;
     @ApiModelProperty(value = "队伍装备数量")
-    private Double eqNum=0D;
-    
-    
+    private Double eqNum = 0D;
+    @ApiModelProperty(value = "出动数量")
+    private Integer dispatchNum;
+    @ApiModelProperty(value = "执勤数量")
+    private Integer onDutyNum;
+
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgDepartmentVo.java

+package com.yeejoin.amos.boot.module.jcs.api.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+* 机构/部门/人员表
+*
+* @author tb
+* @date 2021-06-18
+*/
+@Data
+@Accessors(chain = true)
+@TableName("cb_org_usr")
+@ApiModel(value="OrgUsrVo", description="部门信息")
+public class OrgDepartmentVo {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "部门人员信息")
+    private OrgUsr OrgUsr;
+
+    @ApiModelProperty(value = "动态表单值")
+    private List<AlertFormValue> alertFormValue;
+
+    public OrgDepartmentVo(OrgUsr orgUsr, List<AlertFormValue> alertFormValue) {
+        OrgUsr = orgUsr;
+        this.alertFormValue = alertFormValue;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgPersonFormVo.java

+package com.yeejoin.amos.boot.module.jcs.api.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+* 机构/部门/人员表
+*
+* @author tb
+* @date 2021-06-18
+*/
+@Data
+@Accessors(chain = true)
+@TableName("cb_org_usr")
+@ApiModel(value="OrgUsrVo", description="人员信息")
+public class OrgPersonFormVo {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "人员基本信息")
+    private  OrgUsr OrgUsr;
+
+    @ApiModelProperty(value = "动态表单值")
+    private List<FormValue> dynamicFormAlert;
+
+    public OrgPersonFormVo(OrgUsr orgUsr, List<FormValue> dynamicFormAlert) {
+        OrgUsr = orgUsr;
+        this.dynamicFormAlert = dynamicFormAlert;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgPersonVo.java

+package com.yeejoin.amos.boot.module.jcs.api.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+* 机构/部门/人员表
+*
+* @author tb
+* @date 2021-06-18
+*/
+@Data
+@Accessors(chain = true)
+@TableName("cb_org_usr")
+@ApiModel(value="OrgUsrVo", description="人员")
+public class OrgPersonVo {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "人员基本信息")
+    private  OrgUsr OrgUsr;
+
+    @ApiModelProperty(value = "动态表单值")
+    private List<AlertFormValue> alertFormValue;
+
+    public OrgPersonVo(OrgUsr orgUsr, List<AlertFormValue> alertFormValue) {
+        OrgUsr = orgUsr;
+        this.alertFormValue = alertFormValue;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgUsrDownloadTemplateVO.java

+package com.yeejoin.amos.boot.module.jcs.api.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelTarget;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * @author fengwang
+ * @date 2021-06-21.
+ */
+@Data
+@Accessors(chain = true)
+@TableName("cb_org_usr")
+@ApiModel(value="OrgUsrDownloadTemplateVO", description="")
+@ExcelTarget("OrgUsrDownloadTemplateVO")
+public class OrgUsrDownloadTemplateVO {
+
+    @Excel(name = "机构名称",width = 30)
+    @ApiModelProperty(value = "机构/部门名称")
+    private String bizOrgName;
+
+    @Excel(name = "机构编码",width = 30)
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
+
+    @Excel(name = "amos中公司/部门ID",width = 30)
+    @ApiModelProperty(value = "amos中公司/部门ID")
+    private String amosOrgId;
+
+    @Excel(name = "amos中公司/部门ID",width = 30)
+    @ApiModelProperty(value = "amos中公司/部门编码")
+    private String amosOrgCode;
+
+    @Excel(name = "amos中公司/部门ID",width = 30)
+    @ApiModelProperty(value = "机构类型（单位：COMPANY）")
+    private String bizOrgType = CommonConstant.BIZ_ORG_TYPE_COMPANY;
+
+    @Excel(name = "amos中公司/部门ID",width = 30)
+    @ApiModelProperty(value = "所属建筑名称")
+    private String buildName;
+
+    @Excel(name = "amos中公司/部门ID",width = 30)
+    @ApiModelProperty(value = "所属建筑ID")
+    private String buildId;
+
+    @Excel(name = "amos中公司/部门ID",width = 30)
+    @ApiModelProperty(value = "归属机构/部门/人员")
+    private String parentId;
+
+    @Excel(name = "amos中公司/部门ID",width = 30)
+    @ApiModelProperty(value = "扩展属性1")
+    private String orgExpandAttr1;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgUsrFormVo.java

+package com.yeejoin.amos.boot.module.jcs.api.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+* 机构/部门/人员表
+*
+* @author tb
+* @date 2021-06-18
+*/
+@Data
+@Accessors(chain = true)
+@TableName("cb_org_usr")
+@ApiModel(value="OrgUsrVo", description="机构/部门/人员表")
+public class OrgUsrFormVo {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "机构/部门人员基本信息")
+    private OrgUsr OrgUsr;
+
+    @ApiModelProperty(value = "动态表单值")
+    private List<FormValue> dynamicFormAlert;
+
+    @ApiModelProperty(value = "单位人员信息值")
+    private List<OrgPersonFormVo> children;
+
+    public OrgUsrFormVo(OrgUsr orgUsr, List<FormValue> formValue) {
+        OrgUsr = orgUsr;
+        this.dynamicFormAlert = formValue;
+    }
+
+    public OrgUsrFormVo(OrgUsr orgUsr, List<FormValue> dynamicFormAlert, List<OrgPersonFormVo> children) {
+        this.OrgUsr = orgUsr;
+        this.dynamicFormAlert = dynamicFormAlert;
+        this.children = children;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgUsrVo.java

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import java.util.List;
+
 /**
 * 机构/部门/人员表
 *
@@ -21,57 +19,19 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @Data
 @Accessors(chain = true)
 @TableName("cb_org_usr")
-@ApiModel(value="OrgUsrVo", description="机构/部门/人员表")
+@ApiModel(value="OrgUsrVo", description="单位信息")
 public class OrgUsrVo{
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "单位基本信息")
+    private OrgUsr OrgUsr;
 
-    @ApiModelProperty(value = "机构/部门名称")
-    private String bizOrgName;
-
-    @ApiModelProperty(value = "机构编码")
-    private String bizOrgCode;
-
-    @ApiModelProperty(value = "amos中公司/部门ID")
-    private String amosOrgId;
-
-    @ApiModelProperty(value = "amos中公司/部门编码")
-    private String amosOrgCode;
-
-    @ApiModelProperty(value = "机构类型（部门：DEPARTMENT，单位：COMPANY，人员：PERSON）")
-    private String bizOrgType;
-
-    @ApiModelProperty(value = "所属建筑名称")
-    private String buildName;
-
-    @ApiModelProperty(value = "所属建筑ID")
-    private String buildId;
-
-    @ApiModelProperty(value = "归属机构/部门/人员")
-    private String parentId;
-
-    @ApiModelProperty(value = "扩展属性1")
-    private String orgExpandAttr1;
-
-    @ApiModelProperty(value = "扩展属性2")
-    private String orgExpandAttr2;
-
-    @ApiModelProperty(value = "扩展属性3")
-    private String orgExpandAttr3;
-
-    @ApiModelProperty(value = "扩展属性4")
-    private String orgExpandAttr4;
-
-    private String orgExpandAttr5;
-
-    private String orgExpandAttr6;
-
-    private String orgExpandAttr7;
-
-    private String orgExpandAttr8;
-
-    @ApiModelProperty(value = "更新人")
-    private String recUserName;
+    @ApiModelProperty(value = "单位动态表单值")
+    private List<AlertFormValue> alertFormValue;
 
+    public OrgUsrVo(OrgUsr orgUsr, List<AlertFormValue> alertFormValue) {
+        OrgUsr = orgUsr;
+        this.alertFormValue = alertFormValue;
+    }
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/PowerTransferCompanyResourcesVo.java

@@ -5,20 +5,26 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
+
 /**
-* 调派单位资源
-*
-* @author tb
-* @date 2021-06-17
-*/
+ * 调派单位资源
+ *
+ * @author tb
+ * @date 2021-06-17
+ */
 @Data
 @Accessors(chain = true)
 @TableName("jc_power_transfer_company_resources")
-@ApiModel(value="PowerTransferCompanyResourcesVo", description="调派单位资源")
-public class PowerTransferCompanyResourcesVo{
+@ApiModel(value = "PowerTransferCompanyResourcesVo", description = "调派单位资源")
+public class PowerTransferCompanyResourcesVo {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "编号")
+    private Long sequenceNbr;
+
+    @ApiModelProperty(value = "所属队伍")
+    private String companyName;
 
     @ApiModelProperty(value = "资源类型")
     private String type;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/PowerTransferVo.java

@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * 力量调派
  *
@@ -20,13 +22,16 @@ public class PowerTransferVo {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = " 单位名称")
-    private String companyName;
+    @ApiModelProperty(value = "调派资源数量")
+    private Integer resourcesCount;
+
+    @ApiModelProperty(value = "到达资源数量")
+    private Integer arriveCount;
 
-    @ApiModelProperty(value = "资源类型")
-    private String type;
+    @ApiModelProperty(value = "撤离资源数量")
+    private Integer evacuateCount;
 
-    @ApiModelProperty(value = "资源编号（如车牌号）")
-    private String resourcesNum;
+    @ApiModelProperty(value = "调派资源列表")
+    private List<PowerTransferCompanyResourcesVo> resourcesList;
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/TemplateVo.java

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import java.util.Map;
+
 /**
-* 模板表
-*
-* @author tb
-* @date 2021-06-17
-*/
+ * 模板表
+ *
+ * @author tb
+ * @date 2021-06-17
+ */
 @Data
 @Accessors(chain = true)
 @TableName("jc_template")
-@ApiModel(value="TemplateVo", description="模板表")
-public class TemplateVo{
+@ApiModel(value = "TemplateVo", description = "模板表")
+public class TemplateVo {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "模板类型code")
+    private String typeCode;
 
     @ApiModelProperty(value = "模板类型")
     private String type;
@@ -36,7 +34,7 @@ public class TemplateVo{
     @ApiModelProperty(value = "格式(0--json      1: 富文本)")
     private Boolean format;
 
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
+    @ApiModelProperty(value = "模板填充数据")
+    private Map data;
 
 }

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

@@ -46,8 +46,8 @@
         jas.submission_method_code,
         jas.update_time,
         jaso.sequence_nbr,
-        group_concat(jaso.company_name) companyNames,
-        group_concat(jaso.user_name) userNames
+        group_concat(distinct jaso.company_name) companyName,
+        group_concat(distinct jaso.user_name) userName
         from jc_alert_submitted jas
         left join jc_alert_submitted_object jaso on jas.sequence_nbr = jaso.alert_submitted_id
         where 1=1

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferMapper">
-    <select id="getPowerTransferList" resultType="com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferVo">
-        select company_name, type, resources_num
+    <select id="getPowerTransferList"
+            resultType="com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyResourcesVo">
+        select sequence_nbr,company_name, type, resources_num
         from (
-                 select ptc.company_name, ptcr.type, ptcr.resources_num, ptcr.rec_date
+                 select ptcr.sequence_nbr, ptc.company_name, ptcr.type, ptcr.resources_num, ptcr.rec_date
                  from jc_power_transfer_company ptc
                           left join jc_power_transfer pt on ptc.power_transfer_id = pt.sequence_nbr
                           right join jc_power_transfer_company_resources ptcr
@@ -12,7 +13,7 @@
                  where pt.alert_called_id = #{alertCalledId}
                    and ptc.is_distribution_agencies = 0
                  union all
-                 select ptc.company_name, "" type, "" resources_num, ptc.rec_date
+                 select ptc.sequence_nbr, ptc.company_name, "" type, "" resources_num, ptc.rec_date
                  from jc_power_transfer_company ptc
                           left join jc_power_transfer pt on ptc.power_transfer_id = pt.sequence_nbr
                  where pt.alert_called_id = #{alertCalledId}

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

@@ -73,7 +73,7 @@ public class AlertCalledController extends BaseController {
      * @return
      */
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增警情接警记录", notes = "新增警情接警记录")
     @Transactional
     public ResponseModel<AlertCalledVo> saveAlertCalled(HttpServletRequest request, @RequestBody AlertCalledVo alertCalledVo) {

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

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
 import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
+import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyResourcesVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferVo;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -149,11 +151,8 @@ public class PowerTransferController extends BaseController {
     @RequestMapping(value = "/list/{alert_called_id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据警情id获取力量调派列表", notes = "根据警情id获取力量调派列表")
     public ResponseModel<Object> list(@PathVariable String alert_called_id) {
-
-        List<PowerTransferVo> powerTransferList =
-                iPowerTransferService.getPowerTransferList(Long.parseLong(alert_called_id));
-
-        return CommonResponseUtil.success(powerTransferList);
+        PowerTransferVo powerTransferVo = iPowerTransferService.getPowerTransferList(Long.parseLong(alert_called_id));
+        return CommonResponseUtil.success(powerTransferVo);
     }
 
     /**

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import com.yeejoin.amos.boot.module.jcs.api.service.ITemplateService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
+import com.yeejoin.amos.boot.module.jcs.api.service.ITemplateService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
 
 
@@ -39,7 +41,7 @@ public class TemplateController extends BaseController {
     * 新增模板表
     * @return
     */
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增模板表", notes = "新增模板表")
     public boolean saveTemplate(HttpServletRequest request, @RequestBody Template template){
@@ -51,42 +53,47 @@ public class TemplateController extends BaseController {
     * @param id
     * @return
     */
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
     public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
         return iTemplateService.removeById(id);
     }
 
-
-
-
     /**
     * 修改模板表
     * @return
     */
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改模板表", notes = "修改模板表")
     public boolean updateByIdTemplate(HttpServletRequest request, @RequestBody Template template){
         return iTemplateService.updateById(template);
     }
 
-
-
     /**
     * 根据id查询
     * @param id
     * @return
     */
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
     public Template selectById(HttpServletRequest request, @PathVariable Long id){
         return iTemplateService.getById(id);
     }
 
-
+    /**
+     * 根据模板类型查询
+     * @param type
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/info/{type}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据模板类型查询", notes = "根据模板类型查询")
+    public Template getByType(@PathVariable String type){
+        return iTemplateService.getByType(type);
+    }
 
     /**
     * 列表分页查询

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 com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.biz.common.utils.EnumsUtils;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
 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.enums.AlertBusinessTypeEnum;
+import com.yeejoin.amos.boot.module.jcs.api.enums.AlertSchedulingTypeEnum;
+import com.yeejoin.amos.boot.module.jcs.api.enums.AlertSubmitTypeEnum;
+import com.yeejoin.amos.boot.module.jcs.api.enums.SubmissionMethodEnum;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertSubmittedMapper;
+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.api.vo.AlertSubmittedExtVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.SchedulingReportingVo;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
 * 警情报送记录 服务实现类
@@ -20,6 +32,9 @@ import java.util.List;
 @Service
 public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto,AlertSubmitted,AlertSubmittedMapper> implements IAlertSubmittedService {
 
+    @Autowired
+    IAlertSubmittedObjectService iAlertSubmittedObjectService;
+
     @Override
     public SchedulingReportingVo listSchedulingByParam(AlertSubmittedDto queryParam) {
         SchedulingReportingVo schedulingReportingVo = new SchedulingReportingVo();
@@ -41,13 +56,62 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto,Ale
     }
 
     @Override
-    public Object save(AlertSubmittedDto alertSubmittedDto) {
+    public Boolean save(AlertSubmittedDto alertSubmittedDto) {
         // 1.保存警情记录主表
         AlertSubmitted alertSubmitted = new AlertSubmitted();
         alertSubmitted.setAlertCalledId(alertSubmittedDto.getAlertCalledId());
         alertSubmitted.setBusinessTypeCode(alertSubmittedDto.getBusinessTypeCode());
+        Optional<AlertBusinessTypeEnum> businessTypeEnum = EnumsUtils.getEnumObject(AlertBusinessTypeEnum.class,
+                e -> e.getCode().equals(alertSubmittedDto.getBusinessTypeCode()));
+        alertSubmitted.setBusinessType(businessTypeEnum.orElse(AlertBusinessTypeEnum.警情续报).getName());
+        alertSubmitted.setCallLogId(alertSubmittedDto.getCallLogId());
+        alertSubmitted.setSubmissionMethodCode(alertSubmittedDto.getSubmissionMethodCode());
+        Optional<SubmissionMethodEnum> submissionMethodEnum = EnumsUtils.getEnumObject(SubmissionMethodEnum.class,
+                e -> e.getCode().equals(alertSubmittedDto.getBusinessTypeCode()));
+        alertSubmitted.setSubmissionMethod(submissionMethodEnum.orElse(SubmissionMethodEnum.SMS).getName());
+        Optional<AlertSchedulingTypeEnum> alertSchedulingTypeEnum = EnumsUtils.getEnumObject(AlertSchedulingTypeEnum.class,
+                e -> e.getCode().equals(alertSubmittedDto.getBusinessTypeCode()));
+        alertSubmitted.setSchedulingTypeCode(alertSubmittedDto.getSchedulingTypeCode());
+        alertSubmitted.setSchedulingType(alertSchedulingTypeEnum.orElse(AlertSchedulingTypeEnum.融合调度).getName());
+        alertSubmitted.setSubmissionContent(alertSubmittedDto.getSubmitContent().toJSONString());
+
+        this.baseMapper.insert(alertSubmitted);
+
         // 2.保存任务表
+        List<AlertSubmittedObject> alertSubmittedObjectList = Lists.newArrayList();
+        // 报送给单位
+        if (AlertSubmitTypeEnum.Org.getKey().equals(alertSubmittedDto.getType())) {
+            alertSubmittedDto.getSubmitCompanyList().forEach(company -> {
+                AlertSubmittedObject alertSubmittedObject = new AlertSubmittedObject();
+                alertSubmittedObject.setAlertSubmittedId(alertSubmitted.getSequenceNbr());
+                alertSubmittedObject.setType(true);
+                alertSubmittedObject.setCompanyId(company.getCompanyId());
+                alertSubmittedObject.setCompanyName(company.getCompanyName());
+
+                alertSubmittedObjectList.add(alertSubmittedObject);
+            });
+        } else {
+            // 报送给个人
+            alertSubmittedDto.getSubmitCompanyList().forEach(company -> {
+                company.getPersonList().forEach(person -> {
+                    AlertSubmittedObject alertSubmittedObject = new AlertSubmittedObject();
+                    alertSubmittedObject.setAlertSubmittedId(alertSubmitted.getSequenceNbr());
+                    alertSubmittedObject.setType(false);
+                    alertSubmittedObject.setCompanyId(company.getCompanyId());
+                    alertSubmittedObject.setCompanyName(company.getCompanyName());
+                    alertSubmittedObject.setUserId(person.getPersonId());
+                    alertSubmittedObject.setUserName(person.getPersonName());
+                    alertSubmittedObject.setUserPhone(person.getPersonPhone());
+
+                    alertSubmittedObjectList.add(alertSubmittedObject);
+                });
+            });
+        }
+
+        iAlertSubmittedObjectService.saveBatch(alertSubmittedObjectList);
+
         // 3.发送任务消息
-        return null;
+        // 调用平台短信发送接口发送消息
+        return true;
     }
 }

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 import com.yeejoin.amos.boot.module.jcs.api.dto.OrgUsrDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.OrgMenu;
 import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.OrgUsrMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IOrgUsrService;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 
 /**
 * 机构/部门/人员表 服务实现类
@@ -16,4 +21,106 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 @Service
 public class OrgUsrServiceImpl extends  BaseService<OrgUsrDto,OrgUsr,OrgUsrMapper>  implements IOrgUsrService {
 
+    @Override
+    @SuppressWarnings("unchecked")
+    public List<OrgMenu> getTree(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy, String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception{
+        List<OrgMenu> resultList=new ArrayList<>();
+        Class clazz=  Class.forName(packageURL);
+        Method IDMethodNameme = null;
+        switch (IDHierarchy) { case 1:
+            IDMethodNameme = clazz.getDeclaredMethod(IDMethodName);
+            break;
+            case 2:
+                IDMethodNameme = clazz.getSuperclass().getDeclaredMethod(IDMethodName);
+                break;
+            case 3:
+                IDMethodNameme = clazz.getSuperclass().getSuperclass().getDeclaredMethod(IDMethodName);
+                break;
+            default:
+                IDMethodNameme = clazz.getDeclaredMethod(IDMethodName);
+                break;
+        }
+
+        Method NAMEMethodNameme =  clazz.getDeclaredMethod(NAMEMethodName);
+        Method PARENTIDMethodNameme = clazz.getDeclaredMethod(PARENTIDMethodName);
+        Method OrgTypeMethodNameme = clazz.getDeclaredMethod(OrgTypeMethodName);
+        //获取顶层元素集合
+        Long parentId;
+        for (Object ob : entityList) {
+
+            Object entity = clazz.cast(ob);
+
+            parentId=PARENTIDMethodNameme.invoke(entity)!=null? Long.valueOf(String.valueOf(PARENTIDMethodNameme.invoke(entity))):null;
+
+            if(parentId==null||topId==parentId){
+                OrgMenu menu=new OrgMenu(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))), String.valueOf(NAMEMethodNameme.invoke(entity)), parentId,String.valueOf(OrgTypeMethodNameme.invoke(entity)),false);
+                resultList.add(menu);
+            }
+        }
+        //获取每个顶层元素的子数据集合
+        for (OrgMenu entity : resultList) {
+            entity.setChildren(getSub(entity.getKey(), entityList, packageURL, IDMethodName,IDHierarchy, NAMEMethodName, PARENTIDMethodName, OrgTypeMethodName));
+        }
+
+        return resultList;
+    }
+
+    @SuppressWarnings("unchecked")
+	@Override
+    public List<OrgMenu> getSub(Long topId, @SuppressWarnings("rawtypes") Collection entityList, String packageURL, String IDMethodName, int IDHierarchy, String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception{
+        List<OrgMenu> childList=new ArrayList<>();
+        @SuppressWarnings("rawtypes")
+		Class clazz=  Class.forName(packageURL);
+        Method IDMethodNameme = null;
+        switch (IDHierarchy) {
+            case 1:
+                IDMethodNameme = clazz.getDeclaredMethod(IDMethodName);
+                break;
+            case 2:
+                IDMethodNameme = clazz.getSuperclass().getDeclaredMethod(IDMethodName);
+                break;
+            case 3:
+                IDMethodNameme = clazz.getSuperclass().getSuperclass().getDeclaredMethod(IDMethodName);
+                break;
+            default:
+                IDMethodNameme = clazz.getDeclaredMethod(IDMethodName);
+                break;
+        }
+        Method OrgTypeMethodNameme = clazz.getDeclaredMethod(OrgTypeMethodName);
+        Method NAMEMethodNameme =  clazz.getDeclaredMethod(NAMEMethodName);
+        Method PARENTIDMethodNameme = clazz.getDeclaredMethod(PARENTIDMethodName);
+
+        Long parentId;
+        //子集的直接子对象
+        for (Object ob : entityList) {
+            Object entity = clazz.cast(ob);
+
+            parentId=PARENTIDMethodNameme.invoke(entity)!=null? Long.valueOf(String.valueOf(PARENTIDMethodNameme.invoke(entity))):null;
+
+            if(parentId==null) {
+                if(topId==parentId){
+                    OrgMenu menu=new OrgMenu(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))), String.valueOf(NAMEMethodNameme.invoke(entity)), parentId,String.valueOf(OrgTypeMethodNameme.invoke(entity)),false);
+                    childList.add(menu);
+                }
+            }else {
+                if(topId.longValue()==parentId.longValue()){
+                    OrgMenu menu=new OrgMenu(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))), String.valueOf(NAMEMethodNameme.invoke(entity)), parentId,String.valueOf(OrgTypeMethodNameme.invoke(entity)),true);
+                    childList.add(menu);
+                }
+            }
+
+        }
+
+        //子集的间接子对象
+        for (OrgMenu entity  : childList) {
+            entity.setChildren(getSub(entity.getKey(), entityList, packageURL, IDMethodName,IDHierarchy, NAMEMethodName, PARENTIDMethodName,OrgTypeMethodName));
+        }
+
+        //递归退出条件
+        if(childList.size()==0){
+            return null;
+        }
+
+        return childList;
+    }
 }

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

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.*;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.*;
+import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyResourcesVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -45,8 +46,14 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto,Power
     @Autowired
     IAlertFormValueService iAlertFormValueService;
 
-    public List<PowerTransferVo> getPowerTransferList(Long alertCalledId) {
-        return powerTransferMapper.getPowerTransferList(alertCalledId);
+    public PowerTransferVo getPowerTransferList(Long alertCalledId) {
+        List<PowerTransferCompanyResourcesVo> powerTransferList =
+                powerTransferMapper.getPowerTransferList(alertCalledId);
+        PowerTransferVo powerTransferVo = new PowerTransferVo();
+        int resourcesCount = powerTransferList.size();
+        powerTransferVo.setResourcesCount(resourcesCount);
+        powerTransferVo.setResourcesList(powerTransferList);
+        return powerTransferVo;
     }
 
     @Override
@@ -71,7 +78,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto,Power
         Long powerTransferSequenceNbr = powerTransfer.getSequenceNbr();
 
         // 获取任务派发模板
-        Template template = iTemplateService.getOne(new QueryWrapper<Template>().eq("type", "ptransfer"));
+        Template template = iTemplateService.getOne(new QueryWrapper<Template>().eq("type",
+                alertCalled.getAlertType()));
         String content = template.getContent();
         Map<String, String> definitions = new HashMap<>();
         initDefinitions(definitions, alertCalled, powerTransferDto);

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateDto;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.TemplateMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.ITemplateService;
@@ -16,4 +17,8 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 @Service
 public class TemplateServiceImpl extends BaseService<TemplateDto,Template,TemplateMapper> implements ITemplateService {
 
+    @Override
+    public Template getByType(String type) {
+        return this.baseMapper.selectOne(new QueryWrapper<Template>().eq("type_code", type));
+    }
 }