生成代码是，使用自定义ID

PHM-admin/phm-common/src/main/java/com/phm/common/core/domain/BaseEntity.java

@@ -11,12 +11,15 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.phm.common.core.domain.model.LoginUser;
 import com.phm.common.utils.DateUtils;
 import com.phm.common.utils.SecurityUtils;
+import lombok.Data;
+import org.apache.commons.lang3.ObjectUtils;
 
 /**
  * Entity基类
  *
  * @author phm
  */
+@Data
 public class BaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -64,62 +67,6 @@ public class BaseEntity implements Serializable {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private Map<String, Object> params;
 
-    public String getSearchValue() {
-        return searchValue;
-    }
-
-    public void setSearchValue(String searchValue) {
-        this.searchValue = searchValue;
-    }
-
-    public String getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(String updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public void setIsDelete(Integer isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Integer getIsDelete() {
-        return isDelete;
-    }
-
     public Map<String, Object> getParams() {
         if (params == null) {
             params = new HashMap<>();
@@ -127,20 +74,21 @@ public class BaseEntity implements Serializable {
         return params;
     }
 
-    public void setParams(Map<String, Object> params) {
-        this.params = params;
-    }
-
     /**
      * 新增数据SET创建和更新信息
      */
     public void initCreatInfo() {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         Date nowDate = DateUtils.getNowDate();
-        this.createBy = loginUser.getUsername();
         this.createTime =nowDate;
-        this.updateBy = loginUser.getUsername();
         this.updateTime =nowDate;
+        if (ObjectUtils.isNotEmpty(loginUser)) {
+            this.createBy = loginUser.getUsername();
+            this.updateBy = loginUser.getUsername();
+        } else {
+            this.createBy = "ANONYMITY";
+            this.updateBy = "ANONYMITY";
+        }
     }
 
     /**
@@ -148,8 +96,7 @@ public class BaseEntity implements Serializable {
      */
     public void initUpdateInfo() {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        Date nowDate = DateUtils.getNowDate();
-        this.updateBy = loginUser.getUsername();
-        this.updateTime =nowDate;
+        this.updateTime = DateUtils.getNowDate();
+        this.updateBy = ObjectUtils.isNotEmpty(loginUser) ? loginUser.getUsername() : "ANONYMITY";
     }
 }

PHM-admin/phm-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -18,46 +18,47 @@ import ${packageName}.domain.${subClassName};
 import ${packageName}.mapper.${ClassName}Mapper;
 import ${packageName}.domain.${ClassName};
 import ${packageName}.service.I${ClassName}Service;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 
 /**
  * ${functionName}Service业务层处理
- * 
+ *
  * @author ${author}
  * @date ${datetime}
  */
 @Service
-public class ${ClassName}ServiceImpl implements I${ClassName}Service 
-{
+public class ${ClassName}ServiceImpl implements I${ClassName}Service {
     @Autowired
     private ${ClassName}Mapper ${className}Mapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询${functionName}
-     * 
+     *
      * @param ${pkColumn.javaField} ${functionName}主键
      * @return ${functionName}
      */
     @Override
-    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
-    {
+    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) {
         return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
     }
 
     /**
      * 查询${functionName}列表
-     * 
+     *
      * @param ${className} ${functionName}
      * @return ${functionName}
      */
     @Override
-    public List<${ClassName}> select${ClassName}List(${ClassName} ${className})
-    {
+    public List<${ClassName}> select${ClassName}List(${ClassName} ${className}) {
         return ${className}Mapper.select${ClassName}List(${className});
     }
 
     /**
      * 新增${functionName}
-     * 
+     *
      * @param ${className} ${functionName}
      * @return 结果
      */
@@ -65,12 +66,14 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     @Transactional
 #end
     @Override
-    public int insert${ClassName}(${ClassName} ${className})
-    {
+    public int insert${ClassName}(${ClassName} ${className}) {
 #foreach ($column in $columns)
 #if($column.javaField == 'createTime')
         ${className}.setCreateTime(DateUtils.getNowDate());
 #end
+    #if($column.javaField == 'id')
+        ${className}.setId(snowFlakeIdGenerator.nextId());
+    #end
 #end
 #if($table.sub)
         int rows = ${className}Mapper.insert${ClassName}(${className});
@@ -83,7 +86,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
 
     /**
      * 修改${functionName}
-     * 
+     *
      * @param ${className} ${functionName}
      * @return 结果
      */
@@ -91,8 +94,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     @Transactional
 #end
     @Override
-    public int update${ClassName}(${ClassName} ${className})
-    {
+    public int update${ClassName}(${ClassName} ${className}) {
 #foreach ($column in $columns)
 #if($column.javaField == 'updateTime')
         ${className}.setUpdateTime(DateUtils.getNowDate());
@@ -107,7 +109,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
 
     /**
      * 批量删除${functionName}
-     * 
+     *
      * @param ${pkColumn.javaField}s 需要删除的${functionName}主键
      * @return 结果
      */
@@ -115,8 +117,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     @Transactional
 #end
     @Override
-    public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s)
-    {
+    public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s) {
 #if($table.sub)
         ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
 #end
@@ -125,7 +126,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
 
     /**
      * 删除${functionName}信息
-     * 
+     *
      * @param ${pkColumn.javaField} ${functionName}主键
      * @return 结果
      */
@@ -133,8 +134,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     @Transactional
 #end
     @Override
-    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
-    {
+    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) {
 #if($table.sub)
         ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
 #end
@@ -144,11 +144,10 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
 
     /**
      * 新增${subTable.functionName}信息
-     * 
+     *
      * @param ${className} ${functionName}对象
      */
-    public void insert${subClassName}(${ClassName} ${className})
-    {
+    public void insert${subClassName}(${ClassName} ${className}) {
         List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List();
         ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
         if (StringUtils.isNotNull(${subclassName}List))

PHM-admin/phm-manage/src/main/java/com/phm/manage/controller/SortieController.java

@@ -52,7 +52,7 @@ public class SortieController extends BaseController {
         util.exportExcel(response, list, "架次信息数据");
     }
     @Log(title = "架次信息", businessType = BusinessType.IMPORT)
-//    @PreAuthorize("@ss.hasPermi('manage:sortie:import')")
+    @PreAuthorize("@ss.hasPermi('manage:sortie:import')")
     @PostMapping("/import")
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
         ExcelUtil<Sortie> util = new ExcelUtil<Sortie>(Sortie.class);

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/Sortie.java

@@ -3,8 +3,8 @@ package com.phm.manage.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 
@@ -14,6 +14,8 @@ import java.util.Date;
  * @author phm
  * @date 2023-08-25
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class Sortie extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -53,69 +55,4 @@ public class Sortie extends BaseEntity {
      */
     @Excel(name = "飞行时长")
     private String duration;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setAircraftNumber(String aircraftNumber) {
-        this.aircraftNumber = aircraftNumber;
-    }
-
-    public String getAircraftNumber() {
-        return aircraftNumber;
-    }
-
-    public void setSortieNumber(String sortieNumber) {
-        this.sortieNumber = sortieNumber;
-    }
-
-    public String getSortieNumber() {
-        return sortieNumber;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-
-    public Date getEndTime() {
-        return endTime;
-    }
-
-    public void setDuration(String duration) {
-        this.duration = duration;
-    }
-
-    public String getDuration() {
-        return duration;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("aircraftNumber", getAircraftNumber())
-                .append("sortieNumber", getSortieNumber())
-                .append("startTime", getStartTime())
-                .append("endTime", getEndTime())
-                .append("duration", getDuration())
-                .append("isDelete", getIsDelete())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/SortieServiceImpl.java

@@ -1,13 +1,12 @@
 package com.phm.manage.service.impl;
 
-import com.phm.common.core.domain.entity.SysUser;
 import com.phm.common.exception.ServiceException;
-import com.phm.common.utils.SecurityUtils;
 import com.phm.common.utils.StringUtils;
 import com.phm.common.utils.bean.BeanValidators;
 import com.phm.manage.domain.Sortie;
 import com.phm.manage.mapper.SortieMapper;
 import com.phm.manage.service.ISortieService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +31,9 @@ public class SortieServiceImpl implements ISortieService {
     @Autowired
     protected Validator validator;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询架次信息
      *
@@ -63,6 +65,7 @@ public class SortieServiceImpl implements ISortieService {
     @Override
     public int insertSortie(Sortie sortie) {
         sortie.initCreatInfo();
+        sortie.setId(snowFlakeIdGenerator.nextId());
         return sortieMapper.insertSortie(sortie);
     }
 

PHM-admin/phm-manage/src/main/resources/mapper/manage/SortieMapper.xml

@@ -3,33 +3,53 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.phm.manage.mapper.SortieMapper">
-
     <resultMap type="Sortie" id="SortieResult">
-        <result property="id"    column="id"    />
-        <result property="aircraftNumber"    column="aircraft_number"    />
-        <result property="sortieNumber"    column="sortie_number"    />
-        <result property="startTime"    column="start_time"    />
-        <result property="endTime"    column="end_time"    />
-        <result property="duration"    column="duration"    />
-        <result property="isDelete"    column="is_delete"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
+        <result property="id" column="id"/>
+        <result property="aircraftNumber" column="aircraft_number"/>
+        <result property="sortieNumber" column="sortie_number"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="duration" column="duration"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectSortieVo">
-        select id, aircraft_number, sortie_number, start_time, end_time, duration, is_delete, create_by, create_time, update_by, update_time from phm_sortie
+        select id,
+               aircraft_number,
+               sortie_number,
+               start_time,
+               end_time,
+               duration,
+               is_delete,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from phm_sortie
     </sql>
 
     <select id="selectSortieList" parameterType="Sortie" resultMap="SortieResult">
         <include refid="selectSortieVo"/>
         <where>
-            <if test="aircraftNumber != null  and aircraftNumber != ''"> and aircraft_number = #{aircraftNumber}</if>
-            <if test="sortieNumber != null  and sortieNumber != ''"> and sortie_number = #{sortieNumber}</if>
-            <if test="startTime != null  and startTime != ''"> and start_time = #{startTime}</if>
-            <if test="endTime != null  and endTime != ''"> and end_time = #{endTime}</if>
-            <if test="duration != null  and duration != ''"> and duration = #{duration}</if>
+            <if test="aircraftNumber != null  and aircraftNumber != ''">
+                and aircraft_number = #{aircraftNumber}
+            </if>
+            <if test="sortieNumber != null  and sortieNumber != ''">
+                and sortie_number = #{sortieNumber}
+            </if>
+            <if test="startTime != null  and startTime != ''">
+                and start_time = #{startTime}
+            </if>
+            <if test="endTime != null  and endTime != ''">
+                and end_time = #{endTime}
+            </if>
+            <if test="duration != null  and duration != ''">
+                and duration = #{duration}
+            </if>
         </where>
     </select>
 
@@ -43,53 +63,121 @@
         where sortie_number = #{sortieNumber}
     </select>
 
-    <insert id="insertSortie" parameterType="Sortie" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertSortie" parameterType="Sortie">
         insert into phm_sortie
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="aircraftNumber != null">aircraft_number,</if>
-            <if test="sortieNumber != null">sortie_number,</if>
-            <if test="startTime != null">start_time,</if>
-            <if test="endTime != null">end_time,</if>
-            <if test="duration != null">duration,</if>
-            <if test="isDelete != null">is_delete,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
+            <if test="id != null">
+                id,
+            </if>
+            <if test="aircraftNumber != null">
+                aircraft_number,
+            </if>
+            <if test="sortieNumber != null">
+                sortie_number,
+            </if>
+            <if test="startTime != null">
+                start_time,
+            </if>
+            <if test="endTime != null">
+                end_time,
+            </if>
+            <if test="duration != null">
+                duration,
+            </if>
+            <if test="isDelete != null">
+                is_delete,
+            </if>
+            <if test="createBy != null">
+                create_by,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="updateBy != null">
+                update_by,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="aircraftNumber != null">#{aircraftNumber},</if>
-            <if test="sortieNumber != null">#{sortieNumber},</if>
-            <if test="startTime != null">#{startTime},</if>
-            <if test="endTime != null">#{endTime},</if>
-            <if test="duration != null">#{duration},</if>
-            <if test="isDelete != null">#{isDelete},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
+            <if test="id != null">
+                #{id},
+            </if>
+            <if test="aircraftNumber != null">
+                #{aircraftNumber},
+            </if>
+            <if test="sortieNumber != null">
+                #{sortieNumber},
+            </if>
+            <if test="startTime != null">
+                #{startTime},
+            </if>
+            <if test="endTime != null">
+                #{endTime},
+            </if>
+            <if test="duration != null">
+                #{duration},
+            </if>
+            <if test="isDelete != null">
+                #{isDelete},
+            </if>
+            <if test="createBy != null">
+                #{createBy},
+            </if>
+            <if test="createTime != null">
+                #{createTime},
+            </if>
+            <if test="updateBy != null">
+                #{updateBy},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime},
+            </if>
         </trim>
     </insert>
 
     <update id="updateSortie" parameterType="Sortie">
         update phm_sortie
         <trim prefix="SET" suffixOverrides=",">
-            <if test="aircraftNumber != null">aircraft_number = #{aircraftNumber},</if>
-            <if test="sortieNumber != null">sortie_number = #{sortieNumber},</if>
-            <if test="startTime != null">start_time = #{startTime},</if>
-            <if test="endTime != null">end_time = #{endTime},</if>
-            <if test="duration != null">duration = #{duration},</if>
-            <if test="isDelete != null">is_delete = #{isDelete},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="aircraftNumber != null">
+                aircraft_number = #{aircraftNumber},
+            </if>
+            <if test="sortieNumber != null">
+                sortie_number = #{sortieNumber},
+            </if>
+            <if test="startTime != null">
+                start_time = #{startTime},
+            </if>
+            <if test="endTime != null">
+                end_time = #{endTime},
+            </if>
+            <if test="duration != null">
+                duration = #{duration},
+            </if>
+            <if test="isDelete != null">
+                is_delete = #{isDelete},
+            </if>
+            <if test="createBy != null">
+                create_by = #{createBy},
+            </if>
+            <if test="createTime != null">
+                create_time = #{createTime},
+            </if>
+            <if test="updateBy != null">
+                update_by = #{updateBy},
+            </if>
+            <if test="updateTime != null">
+                update_time = #{updateTime},
+            </if>
         </trim>
         where id = #{id}
     </update>
 
     <delete id="deleteSortieById" parameterType="Long">
-        delete from phm_sortie where id = #{id}
+        delete
+        from phm_sortie
+        where id = #{id}
     </delete>
 
     <delete id="deleteSortieByIds" parameterType="String">