1、整理代码模板

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

@@ -7,25 +7,28 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 /**
  * 基础DTO
  * @author kinky
  *
  */
-
 @Data
 public class BaseDto implements Serializable{
-	 /**
+	/**
 	 * 
 	 */
 	@ExcelIgnore
 	private static final long serialVersionUID = 1L;
+
 	@ExcelIgnore
 	@ApiModelProperty(value = "主键ID")
     protected Long sequenceNbr;
+
 	@ExcelIgnore
 	@ApiModelProperty(value = "更新时间")
     protected Date recDate;
+
 	@ExcelIgnore
 	@ApiModelProperty(value = "更新人")
     protected String recUserId;

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

@@ -19,7 +19,7 @@ public class BaseEntity implements Serializable{
 	
 	private static final long serialVersionUID = 1L;
 
-	@TableId(value = "sequence_nbr" , type = IdType.ID_WORKER)
+	@TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
 	protected Long sequenceNbr;
 
 	@TableField(value = "rec_date", fill = FieldFill.INSERT_UPDATE)
@@ -28,6 +28,9 @@ public class BaseEntity implements Serializable{
 	@TableField(value = "rec_user_id", fill = FieldFill.INSERT_UPDATE)
 	protected String recUserId;
 
+	@TableField(value = "rec_user_name", fill = FieldFill.INSERT_UPDATE)
+	protected String recUserName;
+
 	/**
 	 * 是否删除
 	 */

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

@@ -285,7 +285,8 @@ public class MyBatisPlusCodeGenerator {
         // 公共父类-开启将导致swagger无效化
         //strategy.setSuperControllerClass("com.test.base.BaseController");
         // 写于父类中的公共字段
-        strategy.setSuperEntityColumns(new String[]{"sequence_nbr", "rec_date", "rec_user_id", "is_delete"});
+        strategy.setSuperEntityColumns("sequence_nbr", "rec_date", "rec_user_id", "rec_user_name",
+                "is_delete");
         // 建议以后开启
         strategy.setInclude(scanner("表名，多个英文逗号分割").split(","));
         strategy.setControllerMappingHyphenStyle(true);

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/MetaHandler.java

@@ -19,14 +19,12 @@ import java.util.Date;
  * @author Dell
  */
 @Component
-public class MetaHandler  implements MetaObjectHandler {
-
+public class MetaHandler implements MetaObjectHandler {
 
 	@Autowired
     private RedisUtils redisUtils;
 	
 	protected String getToken() {
-
 		String authToken = RequestContext.getToken();
 //		if (authToken == null) {
 //			authToken = request.getHeader("X-Access-Token");
@@ -54,7 +52,7 @@ public class MetaHandler  implements MetaObjectHandler {
 		}
 		AgencyUserModel agencyUserModel = reginParams.getUserModel();
 
-		if(ObjectUtils.isEmpty(reginParams)||ObjectUtils.isEmpty(agencyUserModel)){
+		if(ObjectUtils.isEmpty(reginParams) || ObjectUtils.isEmpty(agencyUserModel)){
 			return;
 		}	
 		Object entity = metaObject.getOriginalObject();

amos-boot-biz-common/src/main/resources/template/bean.java.ftl

@@ -9,11 +9,11 @@ import lombok.experimental.Accessors;
 import java.util.Date;
 
 /**
-* ${table.comment!}
-*
-* @author ${author}
-* @date ${date}
-*/
+ * ${table.comment!}
+ *
+ * @author ${author}
+ * @date ${date}
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
@@ -29,5 +29,6 @@ public class ${entity} extends BaseEntity {
      */
 	@TableField("${field.name}")
     private ${field.propertyType} ${field.propertyName};
+
 </#list>
 }

amos-boot-biz-common/src/main/resources/template/controller.java.ftl

 package ${package.Controller};
+
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -22,7 +23,6 @@ import ${package.Xml}.${entity}Dto;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 
-
 /**
  * ${table.comment!}
  *

amos-boot-biz-common/src/main/resources/template/mapper.java.ftl

@@ -4,11 +4,11 @@ import ${package.Entity}.${entity};
 import ${superMapperClassPackage};
 
 /**
-* ${table.comment!} Mapper 接口
-*
-* @author ${author}
-* @date ${date}
-*/
+ * ${table.comment!} Mapper 接口
+ *
+ * @author ${author}
+ * @date ${date}
+ */
 <#if kotlin>
     interface ${table.mapperName} : ${superMapperClass}<${entity}>
 <#else>

amos-boot-biz-common/src/main/resources/template/service.java.ftl

@@ -2,11 +2,11 @@ package com.yeejoin.amos.boot.module.${package.ModuleName}.api.service;
 
 
 /**
-* ${table.comment!}接口类
-*
-* @author ${author}
-* @date ${date}
-*/
+ * ${table.comment!}接口类
+ *
+ * @author ${author}
+ * @date ${date}
+ */
 <#if kotlin>
     interface ${table.serviceName} : ${superServiceClass}<${entity}>
 <#else>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/SourceFileDto.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 公共附件
+ *
+ * @author system_generator
+ * @date 2021-07-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="SourceFileDto", description="公共附件")
+public class SourceFileDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "文件地址")
+    private String filePath;
+
+    @ApiModelProperty(value = "文件名称")
+    private String fileName;
+
+    @ApiModelProperty(value = "文件类型")
+    private String fileCategory;
+
+    @ApiModelProperty(value = "所属者id")
+    private Long sourceId;
+
+    @ApiModelProperty(value = "更新人名称")
+    private String recUserName;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/Contract.java

@@ -73,11 +73,6 @@ public class Contract extends BaseEntity {
 	@TableField("company_id")
     private Long companyId;
     /**
-     * 更新人名称
-     */
-	@TableField("rec_user_name")
-    private String recUserName;
-    /**
      * 单位类型（1维保单位，0联动单位）
      */
 	@TableField("company_type")

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/DataDictionary.java

@@ -36,8 +36,6 @@ public class DataDictionary extends BaseEntity {
     @ApiModelProperty(value = "父级")
     private Long parent;
 
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
     //新加排序字段
     @ApiModelProperty(value = "排序字段")
     private int sortNum;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/DutyPersonShift.java

@@ -38,11 +38,6 @@ public class DutyPersonShift extends BaseEntity {
      */
     @TableField("instance_id")
     private Long instanceId;
-    /**
-     * 更新人员
-     */
-    @TableField("rec_user_name")
-    private String recUserName;
 
     /**
      * 应用标识（数据隔离使用）

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/DutyShift.java

@@ -42,11 +42,6 @@ public class DutyShift extends BaseEntity {
 	@TableField("color")
     private String color;
     /**
-	  * 更新人员
-     */
-	@TableField("rec_user_name")
-    private String recUserName;
-    /**
 	  * 系统标识（数据隔离使用）
      */
 	@TableField("app_key")

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/DynamicFormColumn.java

@@ -70,11 +70,6 @@ public class DynamicFormColumn extends BaseEntity {
     @TableField(value = "column_config", typeHandler = JacksonTypeHandler.class)
     private JSONObject columnConfig;
     /**
-     * 操作人名称
-     */
-    @TableField("rec_user_name")
-    private String recUserName;
-    /**
      * 提示信息
      */
     @TableField("remark")

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/DynamicFormGroup.java

@@ -52,9 +52,4 @@ public class DynamicFormGroup extends BaseEntity {
      */
     @TableField("sort")
     private Integer sort;
-    /**
-     * 操作人名称
-     */
-    @TableField("rec_user_name")
-    private String recUserName;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/DynamicFormInstance.java

@@ -75,11 +75,6 @@ public class DynamicFormInstance extends BaseEntity {
     @TableField("query_strategy")
     private String queryStrategy;
     /**
-     * 操作人名称
-     */
-    @TableField("rec_user_name")
-    private String recUserName;
-    /**
      * 应用标识（数据隔离使用）
      */
     @TableField("app_key")

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FireChemical.java

@@ -78,8 +78,4 @@ public class FireChemical extends BaseEntity {
 
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
-
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
-
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FireExperts.java

@@ -99,10 +99,6 @@ public class FireExperts extends BaseEntity {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
-
     @ApiModelProperty(value = "出生日期")
     private Date birthdayTime;
-
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FireStation.java

 package com.yeejoin.amos.boot.module.common.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.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -26,7 +28,6 @@ public class FireStation extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-
     @ApiModelProperty(value = "微型消防站名称")
     private String name;
 
@@ -84,9 +85,6 @@ public class FireStation extends BaseEntity {
     private String img;
 
     @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.UPDATE)
     private Date updateTime;
-
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
-
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FireTeam.java

@@ -71,15 +71,10 @@ public class FireTeam extends BaseEntity {
     @ApiModelProperty(value = "队伍code")
     private String typeCode;
    
-    
     @ApiModelProperty(value = "更新时间")
-    @TableField(fill=FieldFill.UPDATE)
+    @TableField(fill = FieldFill.UPDATE)
     private Date updateTime;
 
-    @ApiModelProperty(value = "操作人名称")
-    @TableField(fill=FieldFill.INSERT_UPDATE)
-    private String recUserName;
-
     @ApiModelProperty(value = "树结构层级code")
     private String treeCode;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/Firefighters.java

@@ -117,11 +117,6 @@ public class Firefighters extends BaseEntity {
     @TableField(fill=FieldFill.UPDATE)
     private Date updateTime;
 
-    @ApiModelProperty(value = "操作人名称")
-    @TableField(fill=FieldFill.INSERT_UPDATE)
-    private String recUserName;
-
     @ApiModelProperty(value = "机构名称")
     private String companyName;
-
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FirefightersContacts.java

@@ -43,9 +43,4 @@ public class FirefightersContacts extends BaseEntity {
     @ApiModelProperty(value = "更新时间")
     @TableField(fill=FieldFill.UPDATE)
     private Date updateTime;
-
-    @ApiModelProperty(value = "操作人名称")
-    @TableField(fill=FieldFill.INSERT_UPDATE)
-    private String recUserName;
-
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FirefightersContract.java

@@ -61,9 +61,4 @@ public class FirefightersContract extends BaseEntity {
     @ApiModelProperty(value = "更新时间")
     @TableField(fill=FieldFill.UPDATE)
     private Date updateTime;
-
-    @ApiModelProperty(value = "操作人名称")
-    @TableField(fill=FieldFill.INSERT_UPDATE)
-    private String recUserName;
-
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FirefightersEducation.java

@@ -50,13 +50,6 @@ public class FirefightersEducation extends BaseEntity {
     @TableField(fill=FieldFill.UPDATE)
     private Date updateTime;
 
-    @ApiModelProperty(value = "操作人名称")
-    @TableField(fill=FieldFill.INSERT_UPDATE)
-    private String recUserName;
-    
     @ApiModelProperty(value = "学历资质文件")
-    @TableField(fill=FieldFill.INSERT_UPDATE)
     private String qualifications;
-    
-
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FirefightersJacket.java

@@ -59,9 +59,4 @@ public class FirefightersJacket extends BaseEntity {
     @ApiModelProperty(value = "更新时间")
     @TableField(fill=FieldFill.UPDATE)
     private Date updateTime;
-
-    @ApiModelProperty(value = "操作人名称")
-    @TableField(fill=FieldFill.INSERT_UPDATE)
-    private String recUserName;
-
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FirefightersPost.java

@@ -86,9 +86,4 @@ public class FirefightersPost extends BaseEntity {
     @ApiModelProperty(value = "更新时间")
     @TableField(fill=FieldFill.UPDATE)
     private Date updateTime;
-
-    @ApiModelProperty(value = "操作人名称")
-    @TableField(fill=FieldFill.INSERT_UPDATE)
-    private String recUserName;
-
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FirefightersThought.java

@@ -28,13 +28,17 @@ public class FirefightersThought extends BaseEntity {
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
+
 	@ApiModelProperty(value = "消防救援人员")
     private Long firefightersId;
+
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "谈话时间")
     private Date talkingTime;
+
     @ApiModelProperty(value = "谈话人")
     private String speaker;
+
     @ApiModelProperty(value = "思想和现实表现情况")
     private String thoughtMorality;
 
@@ -46,15 +50,8 @@ public class FirefightersThought extends BaseEntity {
 
     @ApiModelProperty(value = "附件")
     private String enclosure;
-  
-    
 
     @ApiModelProperty(value = "更新时间")
     @TableField(fill=FieldFill.UPDATE)
     private Date updateTime;
-
-    @ApiModelProperty(value = "操作人名称")
-    @TableField(fill=FieldFill.INSERT_UPDATE)
-    private String recUserName;
-
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FirefightersWorkexperience.java

@@ -40,9 +40,4 @@ public class FirefightersWorkexperience extends BaseEntity {
     @ApiModelProperty(value = "更新时间")
     @TableField(fill=FieldFill.UPDATE)
     private Date updateTime;
-
-    @ApiModelProperty(value = "操作人名称")
-    @TableField(fill=FieldFill.INSERT_UPDATE)
-    private String recUserName;
-
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/LinkageUnit.java

@@ -27,94 +27,106 @@ public class LinkageUnit extends BaseEntity {
      */
 	@TableField("unit_name")
     private String unitName;
+
     /**
      * 单位id
      */
 	@TableField("unit_id")
     private String unitId;
+
     /**
      * 父级单位id
      */
 	@TableField("parent_id")
     private String parentId;
+
     /**
      * 联动单位类别
      */
 	@TableField("linkage_unit_type")
     private String linkageUnitType;
+
     /**
      * 联动单位类别code
      */
 	@TableField("linkage_unit_type_code")
     private String linkageUnitTypeCode;
+
     /**
      * 行政区划
      */
 	@TableField("administrative_divisions")
     private String administrativeDivisions;
+
     /**
      * 行政区划代码
      */
 	@TableField("administrative_divisions_code")
     private String administrativeDivisionsCode;
+
     /**
      * 地址
      */
 	@TableField("address")
     private String address;
+
     /**
      * 经度
      */
 	@TableField("longitude")
     private Double longitude;
+
     /**
      * 纬度
      */
 	@TableField("latitude")
     private Double latitude;
+
     /**
      * 协议开始日期
      */
 	@TableField("agreement_start_date")
     private Date agreementStartDate;
+
     /**
      * 协议结束日期
      */
 	@TableField("agreement_end_date")
     private Date agreementEndDate;
+
     /**
      * 应急联动单位类别
      */
 	@TableField("emergency_linkage_unit")
     private String emergencyLinkageUnit;
+
     /**
      * 应急联动单位类别code
      */
 	@TableField("emergency_linkage_unit_code")
     private String emergencyLinkageUnitCode;
+
     /**
      * 联系人 
      */
 	@TableField("contact_user")
     private String contactUser;
+
     /**
      * 联系人电话
      */
 	@TableField("contact_phone")
     private String contactPhone;
+
     /**
      * 实例id
      */
 	@TableField("instance_id")
     private Long instanceId;
+
     /**
      * 组织机构代码
      */
 	@TableField("org_code")
     private String orgCode;
-    /**
-     * 操作人名称
-     */
-	@TableField("rec_user_name")
-    private String recUserName;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/MaintenanceCompany.java

@@ -27,49 +27,52 @@ public class MaintenanceCompany extends BaseEntity {
      */
 	@TableField("name")
     private String name;
+
     /**
      * 单位编码
      */
 	@TableField("code")
     private String code;
+
     /**
      * 类型（COMPANY单位，PERSON人员）
      */
 	@TableField("type")
     private String type;
+
     /**
      * 上级单位
      */
 	@TableField("parent_id")
     private Long parentId;
+
     /**
      * 业务编码
      */
 	@TableField("biz_code")
     private String bizCode;
+
     /**
      * 组织机构代码用于权限过滤
      */
 	@TableField("org_code")
     private String orgCode;
+
     /**
      * 纬度
      */
 	@TableField("latitude")
     private String latitude;
+
     /**
      * 经度
      */
 	@TableField("longitude")
     private String longitude;
+
     /**
      * 动态表单实例id
      */
 	@TableField("instance_id")
     private Long instanceId;
-    /**
-     * 更新人
-     */
-	@TableField("rec_user_name")
-    private String recUserName;
 }

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

@@ -70,10 +70,4 @@ public class OrgUsr extends BaseEntity {
     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-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/OrgUsrAuth.java

@@ -23,8 +23,6 @@ public class OrgUsrAuth extends BaseEntity {
 	 */
 	private static final long serialVersionUID = 1L;
 
-	private String recUserName;
-
     private String sourceId;
 
     private String sourceCode;
@@ -32,5 +30,4 @@ public class OrgUsrAuth extends BaseEntity {
     private String targetCode;
 
     private String targetId;
-
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/SourceFile.java

+package com.yeejoin.amos.boot.module.common.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 公共附件
+ *
+ * @author system_generator
+ * @date 2021-07-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("cb_source_file")
+public class SourceFile extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 文件地址
+     */
+    @TableField("file_path")
+    private String filePath;
+
+    /**
+     * 文件名称
+     */
+    @TableField("file_name")
+    private String fileName;
+
+    /**
+     * 文件类型
+     */
+    @TableField("file_category")
+    private String fileCategory;
+
+    /**
+     * 所属者id
+     */
+    @TableField("source_id")
+    private Long sourceId;
+}

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

+package com.yeejoin.amos.boot.module.common.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
+
+/**
+ * 公共附件 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-07-16
+ */
+public interface SourceFileMapper extends BaseMapper<SourceFile> {
+
+}

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

+package com.yeejoin.amos.boot.module.common.api.service;
+
+
+/**
+* 公共附件接口类
+*
+* @author system_generator
+* @date 2021-07-16
+*/
+public interface ISourceFileService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/SourceFileMapper.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.common.api.mapper.SourceFileMapper">
+
+</mapper>

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

@@ -2,7 +2,7 @@ package com.yeejoin.amos.boot.module.jcs.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -20,7 +20,6 @@ public class Aircraft extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-
     /**
 	  * 飞机型号
      */
@@ -171,10 +170,4 @@ public class Aircraft extends BaseEntity {
      */
 	@TableField("remark")
     private String remark;
-	
-    /**
-     * 是否删除
-     */
-    @TableField("is_delete")
-    private Boolean isDelete;
 }

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

@@ -101,12 +101,10 @@ public class AlertCalled extends BaseEntity {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
-    @ApiModelProperty(value = "发送人名称")
-    private String recUserName;
-
     @ApiModelProperty(value = "接警时间开始---用于列表过滤")
     @TableField(exist=false)
     private Date callTimeStart ;
+
     @ApiModelProperty(value = "接警时间结束---用于列表过滤")
     @TableField(exist=false)
     private Date callTimeEnd ;

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

@@ -37,17 +37,16 @@ public class AlertForm extends BaseEntity {
     @ApiModelProperty(value = "字段类型")
     private String fieldType;
 
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
-    
     @ApiModelProperty(value = "字段值字典code")
     private String fieldValueCode;
 
     @ApiModelProperty(value = "是否一行显示")
     private Boolean block;
+
     //新加排序字段
     @ApiModelProperty(value = "排序字段")
     private int sortNum;
+
     @ApiModelProperty(value = "接口地址")
     private String url;
     

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

@@ -29,8 +29,4 @@ public class AlertFormType extends BaseEntity {
 
     @ApiModelProperty(value = "类型名称")
     private String alertTypeName;
-
-    @ApiModelProperty(value = "操作人名称")
-    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/AlertFormValue.java

@@ -44,9 +44,6 @@ public class AlertFormValue extends BaseEntity {
     @ApiModelProperty(value = "字段值字典code")
     private String fieldValueCode;
 
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
-
     @ApiModelProperty(value = "是否一行显示")
     private Boolean block;
 

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

@@ -63,9 +63,4 @@ public class AlertSubmitted extends BaseEntity {
 
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
-
-    @ApiModelProperty(value = "操作人名称")
-    @TableField(value = "rec_user_name",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/AlertSubmittedObject.java

@@ -46,9 +46,4 @@ public class AlertSubmittedObject extends BaseEntity {
 
     @ApiModelProperty(value = "人员电话")
     private String userPhone;
-
-    @ApiModelProperty(value = "操作人名称")
-    @TableField(value = "rec_user_name",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/PowerTransfer.java

@@ -62,9 +62,4 @@ public class PowerTransfer extends BaseEntity {
 
     @ApiModelProperty(value = "车坐标y")
     private String carCoordinateY;
-
-    @TableField(value = "REC_USER_NAME", fill = FieldFill.INSERT_UPDATE)
-    @ApiModelProperty(value = "操作人名称")
-    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/PowerTransferCompany.java

@@ -40,9 +40,4 @@ public class PowerTransferCompany extends BaseEntity {
 
     @ApiModelProperty(value = "任务信息")
     private String taskInformation;
-
-    @TableField(value = "REC_USER_NAME", fill = FieldFill.INSERT_UPDATE)
-    @ApiModelProperty(value = "操作人名称")
-    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/PowerTransferCompanyResources.java

@@ -39,9 +39,4 @@ public class PowerTransferCompanyResources extends BaseEntity {
 
     @ApiModelProperty(value = "资源编号（如车牌号）")
     private String resourcesNum;
-
-    @TableField(value = "REC_USER_NAME", fill = FieldFill.INSERT_UPDATE)
-    @ApiModelProperty(value = "操作人名称")
-    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/ShiftChange.java

@@ -23,7 +23,6 @@ public class ShiftChange extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-
     /**
      * 基本信息id（来源动态表单）
      */
@@ -44,9 +43,4 @@ public class ShiftChange extends BaseEntity {
      */
     @TableField("remark")
     private String remark;
-    /**
-     * 操作人名称
-     */
-    @TableField("rec_user_name")
-    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

@@ -35,8 +35,4 @@ public class Template extends BaseEntity {
 
     @ApiModelProperty(value = "格式(0--json      1: 富文本)")
     private Boolean format;
-
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
-
 }

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

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.SourceFileDto;
+import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 公共附件
+ *
+ * @author system_generator
+ * @date 2021-07-16
+ */
+@RestController
+@Api(tags = "公共附件Api")
+@RequestMapping(value = "/common/source-file")
+public class SourceFileController extends BaseController {
+
+    @Autowired
+    SourceFileServiceImpl sourceFileServiceImpl;
+
+    /**
+     * 新增公共附件
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增公共附件", notes = "新增公共附件")
+    public ResponseModel<SourceFileDto> save(@RequestBody SourceFileDto model) {
+        model = sourceFileServiceImpl.createWithModel(model);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新公共附件", notes = "根据sequenceNbr更新公共附件")
+    public ResponseModel<SourceFileDto> updateBySequenceNbrSourceFile(@RequestBody SourceFileDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(sourceFileServiceImpl.updateWithModel(model));
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除公共附件", notes = "根据sequenceNbr删除公共附件")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(sourceFileServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个公共附件", notes = "根据sequenceNbr查询单个公共附件")
+    public ResponseModel<SourceFileDto> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(sourceFileServiceImpl.queryBySeq(sequenceNbr));
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "公共附件分页查询", notes = "公共附件分页查询")
+    public ResponseModel<Page<SourceFileDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
+            (value = "size") int size) {
+        Page<SourceFileDto> page = new Page<SourceFileDto>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(sourceFileServiceImpl.queryForSourceFilePage(page));
+    }
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "公共附件列表全部数据查询", notes = "公共附件列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<SourceFileDto>> selectForList() {
+        return ResponseHelper.buildResponse(sourceFileServiceImpl.queryForSourceFileList());
+    }
+
+    /**
+     * 附件批量保存
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "附件批量保存", notes = "附件批量保存")
+    @PostMapping(value = "/saveBatch")
+    public ResponseModel<List<SourceFile>> saveSourceFile(@RequestBody List<SourceFile> sourceFiles,
+                                                          @RequestParam Long sourceId) {
+        return ResponseHelper.buildResponse(sourceFileServiceImpl.saveSourceFile(sourceId, sourceFiles));
+    }
+
+    /**
+     * 根据sourceId查询
+     *
+     * @param sourceId 附件所属者id
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sourceId}/list")
+    @ApiOperation(httpMethod = "GET", value = "根据sourceId查询公共附件列表", notes = "根据sourceId查询公共附件列表")
+    public ResponseModel<List<SourceFile>> queryBySourceId(@PathVariable Long sourceId) {
+        return ResponseHelper.buildResponse(sourceFileServiceImpl.findBySourceId(sourceId));
+    }
+}

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

+package com.yeejoin.amos.boot.module.common.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.SourceFileDto;
+import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
+import com.yeejoin.amos.boot.module.common.api.mapper.SourceFileMapper;
+import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * 公共附件服务实现类
+ *
+ * @author system_generator
+ * @date 2021-07-16
+ */
+@Service
+public class SourceFileServiceImpl extends BaseService<SourceFileDto, SourceFile, SourceFileMapper> implements ISourceFileService {
+
+    @Autowired
+    private Sequence sequence;
+
+    /**
+     * 分页查询
+     */
+    public Page<SourceFileDto> queryForSourceFilePage(Page<SourceFileDto> page) {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<SourceFileDto> queryForSourceFileList() {
+        return this.queryForList("", false);
+    }
+
+    /**
+     * @param sourceId 所属者ID
+     * @Description 根据所属者ID查询所属文件
+     * @Return Map<String, List < SourceFile>>
+     * @Date 2020/12/18 14:12
+     */
+    public List<SourceFile> findBySourceId(Long sourceId) {
+        List<SourceFile> sourceFiles = this.list(new LambdaQueryWrapper<SourceFile>().eq(SourceFile::getSourceId, sourceId));
+        Optional.ofNullable(sourceFiles).orElseThrow(() -> new BadRequest("所属文件为空"));
+        return sourceFiles;
+    }
+
+    /**
+     * @param sourceFiles
+     * @Description 批量保存文件
+     * @Return List<SourceFile>
+     * @Date 2020/12/18 14:27
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public List<SourceFile> saveSourceFile(Long sourceId, List<SourceFile> sourceFiles) {
+        if (CollectionUtils.isEmpty(sourceFiles)) {
+            return new ArrayList<>();
+        }
+        this.baseMapper.delete(new LambdaQueryWrapper<SourceFile>().eq(SourceFile::getSourceId, sourceId));
+        sourceFiles.forEach(s -> {
+            s.setSourceId(sourceId);
+        });
+        boolean flag = this.saveOrUpdateBatch(sourceFiles);
+        return flag ? sourceFiles : Collections.EMPTY_LIST;
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/aop/ControllerAop.java

 package com.yeejoin.amos.boot.module.jcs.biz.aop;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
@@ -30,6 +12,22 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 /**
  * controller层切面 用于用户数据缓存 供 sql自动填充使用