feat(人力资源微服务,代码生成微服务): 修改代码模板，生成代码

luoyb

2021-01-28 d50c285e5f21eefc62b7848ea96d186e1e64475b

feat(人力资源微服务,代码生成微服务): 修改代码模板，生成代码

1.修改了代码模板，以和实际的项目配套
2.重新生成并调整了工作经历的代码，增、删、改接口完成

 febs-server/febs-server-generator/src/main/resources/generator/templates/controller.ftl

@@ -53,7 +53,7 @@
try {
this.${className?uncap_first}Service.create${className}(${className?uncap_first});
} catch (Exception e) {
String message = "新增${className}失败";
String message = "新增${tableComment}失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -65,7 +65,19 @@
try {
this.${className?uncap_first}Service.delete${className}(${className?uncap_first});
} catch (Exception e) {
String message = "删除${className}失败";
String message = "删除${tableComment}失败";
log.error(message, e);
throw new FebsException(message);
}
}

@DeleteMapping("{ids}")
@PreAuthorize("hasAuthority('${className?uncap_first}:delete')")
public void logicDelete${className}(@PathVariable("ids") String ids) throws FebsException {
try {
this.${className?uncap_first}Service.logicDel${className}(ids);
} catch (Exception e) {
String message = "逻辑删除${tableComment}失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -77,7 +89,7 @@
try {
this.${className?uncap_first}Service.update${className}(${className?uncap_first});
} catch (Exception e) {
String message = "修改${className}失败";
String message = "修改${tableComment}失败";
log.error(message, e);
throw new FebsException(message);
}

 febs-server/febs-server-generator/src/main/resources/generator/templates/entity.ftl

@@ -1,16 +1,24 @@
package ${basePackage}.${entityPackage};

import java.io.Serializable;
<#if hasDate = true>
    import java.util.Date;
import java.util.Date;
    import cc.mrbird.febs.common.core.annotation.FieldInfo;
    import cc.mrbird.febs.common.core.utils.DateDeSerializer;
    import cc.mrbird.febs.common.core.utils.DateSerializer;
    import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
    import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
    import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
    import com.fasterxml.jackson.databind.annotation.JsonSerialize;
</#if>
<#if hasBigDecimal = true>
    import java.math.BigDecimal;
import java.math.BigDecimal;
</#if>
import lombok.Data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;

/**
*
@@ -24,15 +32,13 @@
*/
@Data
@TableName("${tableName}")
public class ${className} {
public class ${className} implements Serializable{

<#if columns??>
    <#list columns as column>
        /**
        * ${column.remark}
        */
            @FieldInfo(name = "${column.name}",type = "${column.type}",explain = "${column.remark}")
        <#if column.isKey = true>
            @TableId(value = "${column.name}", type = IdType.AUTO)
            @TableId(value = "${column.name}")
        <#else>
            @TableField("${column.name}")
        </#if>
@@ -42,11 +48,24 @@
            private String ${column.field?uncap_first};

        </#if>
        <#if column.type = 'timestamp' || column.type = 'date' || column.type = 'datetime'||column.type = 'TIMESTAMP' || column.type = 'DATE' || column.type = 'DATETIME'>
        <#if column.type = 'timestamp' || column.type = 'datetime'||column.type = 'TIMESTAMP' || column.type = 'DATETIME'>
            @JsonSerialize(using = DateTimeSerializer.class)
            @JsonDeserialize(using = DateTimeDeserializer.class)
            @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
            private Date ${column.field?uncap_first};

        </#if>
        <#if column.type = 'int' || column.type = 'smallint'|| column.type = 'bit'>
        <#if column.type = 'date' ||column.type = 'DATE'>
            @JsonSerialize(using = DateSerializer.class)
            @JsonDeserialize(using = DateDeSerializer.class)
            @DateTimeFormat(pattern="yyyy-MM-dd")
            private Date ${column.field?uncap_first};

        </#if>
        <#if column.type = 'int' || column.type = 'smallint'|| column.type = 'bit'||column.type = 'tinyint'>
            <#if column.name = 'version'>
            @Version
            </#if>
            private Integer ${column.field?uncap_first};

        </#if>
@@ -58,12 +77,9 @@
            private Long ${column.field?uncap_first};

        </#if>
        <#if column.type = 'tinyint'>
            private Byte ${column.field?uncap_first};

        </#if>
        <#if column.type = 'decimal' || column.type = 'numeric'>
            private BigDecimal ${column.field?uncap_first};

        </#if>
    </#list>
</#if>

 febs-server/febs-server-generator/src/main/resources/generator/templates/mapper.ftl

@@ -2,7 +2,8 @@

import ${basePackage}.${entityPackage}.${className};
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
/**
*
* name:${className}
@@ -14,5 +15,25 @@
* @since JDK1.8
*/
public interface ${className}Mapper extends BaseMapper<${className}> {

}
/**
*
* 根据Id批量逻辑删除记录
*
* date ${author}
* @author: ${date}
* @param list 待删除Id
* @param operatorId 操作员Id
* @return void
*/
@Update("<script> " +
    " UPDATE ${tableName} SET delFlag = 1,\n" +
    " modifyTime = NOW(),\n" +
    " modifier = #{operatorId}, \n" +
    " version = version+1 \n" +
    " WHERE badId IN \n" +
    "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
    "            #{delId}\n" +
    "        </foreach>\n" +
    "</script>")
void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
}

 febs-server/febs-server-generator/src/main/resources/generator/templates/service.ftl

@@ -56,4 +56,15 @@
* @param ${className?uncap_first} ${className?uncap_first}
*/
void delete${className}(${className} ${className?uncap_first});

/**
*
* 根据Id批量逻辑删除记录
*
* date 2021-01-28 10:48
* @author: luoyibo
* @param ids 待删除Id
* @return void
*/
void logicDel${className}(String ids);
}

 febs-server/febs-server-generator/src/main/resources/generator/templates/serviceImpl.ftl

@@ -12,8 +12,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;

import java.util.List;
import java.util.Date;

/**
*
@@ -28,15 +31,16 @@
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
public class ${className}ServiceImpl extends ServiceImpl
<${className}Mapper, ${className}> implements I${className}Service {
class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${className}> implements I${className}Service {

private final ${className}Mapper ${className?uncap_first}Mapper;

private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
@Override
public IPage<${className}> find${className}s(QueryRequest request, ${className} ${className?uncap_first}) {
LambdaQueryWrapper<${className}> queryWrapper = new LambdaQueryWrapper<>();
// TODO 设置查询条件
queryWrapper.eq(${className}::getDelFlag, 0);
Page<${className}> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@@ -44,19 +48,28 @@
@Override
public List<${className}> find${className}s(${className} ${className?uncap_first}) {
LambdaQueryWrapper<${className}> queryWrapper = new LambdaQueryWrapper<>();
// TODO 设置查询条件
queryWrapper.eq(${className}::getDelFlag, 0);
return this.baseMapper.selectList(queryWrapper);
}

@Override
@Transactional(rollbackFor = Exception.class)
public void create${className}(${className} ${className?uncap_first}) {
${className?uncap_first}.setBadId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
${className?uncap_first}.setCreator(operatorId);
${className?uncap_first}.setModifier(operatorId);
this.save(${className?uncap_first});
}

@Override
@Transactional(rollbackFor = Exception.class)
public void update${className}(${className} ${className?uncap_first}) {
${className} dbData = this.getById(${className?uncap_first}.getBadId());
${className?uncap_first}.setCreateTime(dbData.getCreateTime());
${className?uncap_first}.setCreator(dbData.getCreator());
${className?uncap_first}.setDelFlag(dbData.getDelFlag());
${className?uncap_first}.setModifyTime(new Date());
${className?uncap_first}.setModifier(operatorId);
this.saveOrUpdate(${className?uncap_first});
}

@@ -67,4 +80,21 @@
// TODO 设置删除条件
this.remove(wapper);
}
}
/**
*
* 根据Id批量逻辑删除记录
*
* date 2021-01-28 10:48
* @author: luoyibo
* @param ids 待删除Id
* @return void
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void logicDel${className}(String ids) {
List<String> list = new ArrayList<>();
    String[] str = ids.split(",");
    list.addAll(Arrays.asList(str));
    ${className?uncap_first}Mapper.logicDeleteByIds(list, operatorId);
    }
}

 febs-server/febs-server-generator/src/main/resources/mapper/GeneratorMapper.xml

@@ -36,6 +36,7 @@
        COLUMN_COMMENT remark
        FROM information_schema.COLUMNS
        WHERE TABLE_SCHEMA = #{schemaName} AND TABLE_NAME = #{tableName}
        ORDER BY ORDINAL_POSITION
    </select>

</mapper>

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java

File was deleted

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java

@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.entity;

import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
@@ -13,6 +14,8 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

/**
@@ -25,87 +28,82 @@
 * @since JDK1.8
 */
@Data
@TableName("t_emp_badrecord")
public class EmpBadRecord {
@TableName("t_emp_badRecord")
public class EmpBadRecord implements Serializable {

    /**
     * 不良记录Id
     */
    private static final long serialVersionUID = 4876027855128737152L;

    @FieldInfo(name = "badId", type = "bigint", explain = "不良记录Id")
    @TableId(value = "badId")
    private Long badId;

    /**
     * 员工Id
     */
    @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
    @TableField("empId")
    private Long empId;

    /**
     * 不良记录日期
     */
    @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
    @TableField("empName")
    private String empName;

    @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
    @TableField("empNumb")
    private String empNumb;

    @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
    @TableField("certificateNumb")
    private String certificateNumb;

    @FieldInfo(name = "department", type = "varchar", explain = "所属部门")
    @TableField("department")
    private String department;

    @FieldInfo(name = "badDate", type = "date", explain = "不良记录日期")
    @TableField("badDate")
    @JsonSerialize(using = DateSerializer.class)
    @JsonDeserialize(using = DateDeSerializer.class)
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @TableField("badDate")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date badDate;

    /**
     * 报备人
     */
    @FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
    @TableField("reporter")
    private String reporter;

    /**
     * 不良记录描述
     */
    @FieldInfo(name = "badContent", type = "varchar", explain = "不良记录描述")
    @TableField("badContent")
    private String badContent;

    /**
     * 记录创建时间
     */
    @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
    @TableField("createTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @TableField("createTime")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    /**
     * 记录创建人
     */
    @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
    @TableField("creator")
    private String creator;

    /**
     * 记录最后更新时间
     */
    @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
    @TableField("modifyTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @TableField("modifyTime")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date modifyTime;

    /**
     * 记录最后更新人
     */
    @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
    @TableField("modifier")
    private String modifier;

    /**
     * 记录删除标志。0-未删除 1-已删除，默认0
     */
    @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
    @TableField("delFlag")
    private Integer delFlag;

    /**
     * 记录版本号，用来进行乐观锁控制
     */
    @Version
    @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
    @TableField("version")
    @Version
    private Integer version;

    /**
     * 备注
     */
    @FieldInfo(name = "remark", type = "varchar", explain = "备注")
    @TableField("remark")
    private String remark;

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java

File was deleted

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBadRecordMapper.java

@@ -17,15 +17,25 @@
 * @since JDK1.8
 */
public interface EmpBadRecordMapper extends BaseMapper<EmpBadRecord> {
    /**
     *
     * 根据Id批量逻辑删除记录
     *
     * date 2021-01-28 10:32
     * @author: luoyibo
     * @param list 待删除Id
     * @param operatorId 操作员Id
     * @return void
     */
    @Update("<script>        " +
            " UPDATE t_emp_badrecord SET delFlag = 1,\n" +
            " UPDATE t_emp_badRecord SET delFlag = 1,\n" +
            " modifyTime = NOW(),\n" +
            "  modifier = #{operatorId}, \n" +
            "  version = version+1 \n" +
            "  WHERE badId IN \n" +
            "         <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
            "             #{delId}\n" +
            "         </foreach>\n" +
            " modifier = #{operatorId}, \n" +
            " version = version+1 \n" +
            " WHERE badId IN \n" +
            "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
            "            #{delId}\n" +
            "        </foreach>\n" +
            "</script>")
    void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.java

File was deleted

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBadRecordService.java

@@ -9,53 +9,60 @@
import java.util.List;

/**
*
* name:EmpBadrecord
* package:cc.mrbird.febs.server.hr.controller
* description:员工不良记录信息服务接口
*
* @author luoyibo
* @date 2021-01-24 20:35:55
* @since JDK1.8
*/
 * name:EmpBadrecord
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工不良记录信息服务接口
 *
 * @author luoyibo
 * @date 2021-01-24 20:35:55
 * @since JDK1.8
 */
public interface IEmpBadRecordService extends IService<EmpBadRecord> {
/**
* 查询（分页）
*
* @param request QueryRequest
* @param empBadrecord empBadrecord
* @return IPage<EmpBadrecord>
*/
IPage<EmpBadRecord> findEmpBadRecords(QueryRequest request, EmpBadRecord empBadrecord);
    /**
     * 查询（分页）
     *
     * @param request      QueryRequest
     * @param empBadrecord empBadrecord
     * @return IPage<EmpBadrecord>
     */
    IPage<EmpBadRecord> findEmpBadRecords(QueryRequest request, EmpBadRecord empBadrecord);

/**
* 查询（所有）
*
* @param empBadrecord empBadrecord
* @return List<EmpBadrecord>
*/
List<EmpBadRecord> findEmpBadRecords(EmpBadRecord empBadrecord);
    /**
     * 查询（所有）
     *
     * @param empBadrecord empBadrecord
     * @return List<EmpBadrecord>
     */
    List<EmpBadRecord> findEmpBadRecords(EmpBadRecord empBadrecord);

/**
* 新增
*
* @param empBadrecord empBadrecord
*/
void createEmpBadRecord(EmpBadRecord empBadrecord);
    /**
     * 新增
     *
     * @param empBadrecord empBadrecord
     */
    void createEmpBadRecord(EmpBadRecord empBadrecord);

/**
* 修改
*
* @param empBadrecord empBadrecord
*/
void updateEmpBadRecord(EmpBadRecord empBadrecord);
    /**
     * 修改
     *
     * @param empBadrecord empBadrecord
     */
    void updateEmpBadRecord(EmpBadRecord empBadrecord);

/**
* 删除
*
* @param empBadrecord empBadrecord
*/
void deleteEmpBadRecord(EmpBadRecord empBadrecord);

void logicDelEmpBadRecord(String ids);
    /**
     * 删除
     *
     * @param empBadrecord empBadrecord
     */
    void deleteEmpBadRecord(EmpBadRecord empBadrecord);
    /**
     *
     * 根据Id批量逻辑删除记录
     *
     * date 2021-01-28 10:48
     * @author: luoyibo
     * @param ids 待删除Id
     * @return void
     */
    void logicDelEmpBadRecord(String ids);
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpWorkExperienceService.java

File was deleted

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java

@@ -31,8 +31,7 @@
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
public class EmpBadRecordServiceImpl extends ServiceImpl
        <EmpBadRecordMapper, EmpBadRecord> implements IEmpBadRecordService {
public class EmpBadRecordServiceImpl extends ServiceImpl<EmpBadRecordMapper, EmpBadRecord> implements IEmpBadRecordService {

    private final EmpBadRecordMapper empBadrecordMapper;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java

File was deleted