优化DTO

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-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,9 +17,8 @@ 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")

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

@@ -2,25 +2,20 @@ package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 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 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;
 
 /**
  * @author fengwang
  * @date 2021-06-18.
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_org_usr")
 @ApiModel(value="OrgUsr对象", description="部门信息")
-public class OrgDepartmentDto extends BaseEntity {
+public class OrgDepartmentDto extends BaseDto {
 
 
     @ApiModelProperty(value = "部门名称")

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

@@ -2,25 +2,20 @@ package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 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 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;
 
 /**
  * @author fengwang
  * @date 2021-06-18.
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_org_usr")
 @ApiModel(value="OrgUsr对象", description="人员信息")
-public class OrgPersonDto extends BaseEntity {
+public class OrgPersonDto extends BaseDto {
 
 
     @ApiModelProperty(value = "人员名称")

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

@@ -2,13 +2,11 @@ package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 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.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;
 
 /**
 * 机构/部门/人员表
@@ -17,11 +15,8 @@ import lombok.experimental.Accessors;
 * @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;
 
 

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

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

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;
 
 /**
@@ -7,7 +9,12 @@ import lombok.Data;
  * @author DELL
  */
 @Data
-public class SubmitTargetPersonDto {
+public class SubmitTargetPersonDto extends BaseDto{
+
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
 	/**
      * 人员id

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;
 
 /**
  * 模板表
@@ -20,11 +13,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
  * @date 2021-06-17
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("jc_template")
 @ApiModel(value = "TemplateDto", description = "模板表")
-public class TemplateDto extends BaseEntity {
+public class TemplateDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "模板类型code")

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 saveAlertCalled(HttpServletRequest request, @RequestBody AlertCalledVo alertCalledVo) {