feat:1.检查数据-设备检查记录数据-钢轨伤损情况检查表

jeecg-module-system/src/main/java/org/jeecg/codegenerate/CodeGenerate.java

@@ -29,7 +29,7 @@ public class CodeGenerate {
 
         // 表名
         String[] tables = {
-                "t_ek_use_turnout_record_check",
+                "t_ek_rail_wear_record",
 
         };
 

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/controller/RailWearRecordController.java

+package org.jeecg.modules.checkData.equipmentCheckData.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.checkData.equipmentCheckData.dto.RailWearRecordDTO;
+import org.jeecg.modules.checkData.equipmentCheckData.entity.RailWearRecord;
+import org.jeecg.modules.checkData.equipmentCheckData.service.IRailWearRecordService;
+import org.jeecg.modules.checkData.equipmentCheckData.vo.RailWearRecordVO;
+import org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckDetailVO;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 检查数据-设备检查记录数据-钢轨伤损情况检查表 前端控制器
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-09
+ */
+@RestController
+@RequestMapping("/checkData/equipmentCheckData/railWearRecord")
+@Api(tags = "检查数据-设备检查记录数据-钢轨伤损情况检查表")
+public class RailWearRecordController extends JeecgController<RailWearRecord, IRailWearRecordService> {
+
+    @AutoLog(value = "检查数据-设备检查记录数据-钢轨伤损情况检查表-分页列表查询")
+    @ApiOperation(value = "检查数据-设备检查记录数据-钢轨伤损情况检查表-分页列表查询", notes = "检查数据-设备检查记录数据-钢轨伤损情况检查表-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<RailWearRecordVO>> queryPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                         RailWearRecordDTO dto) {
+        Page<RailWearRecordVO> pageData = new Page<>(pageNo, pageSize);
+        pageData = this.service.queryPageList(pageData, dto);
+        return Result.OK(pageData);
+    }
+
+
+    @AutoLog(value = "检查数据-设备检查记录数据-钢轨伤损情况检查详情页面")
+    @ApiOperation(value = "检查数据-设备检查记录数据-钢轨伤损情况检查详情页面", notes = "检查数据-设备检查记录数据-钢轨伤损情况检查详情页面")
+    @GetMapping(value = "/getDetail")
+    public Result<UseTurnoutRecordCheckDetailVO> getDetail(@ApiParam("id") String id) {
+        UseTurnoutRecordCheckDetailVO data = this.service.getDetail(id);
+        return Result.OK(data);
+    }
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/dto/RailWearRecordDTO.java

+package org.jeecg.modules.checkData.equipmentCheckData.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+* <p>
+    * 检查数据-设备检查记录数据-钢轨伤损情况检查表
+    * </p>
+*
+* @author hkl
+* @since 2023-07-09
+*/
+    @Getter
+    @Setter
+    @ApiModel(value = "RailWearRecord对象", description = "检查数据-设备检查记录数据-钢轨伤损情况检查表")
+
+public class RailWearRecordDTO {
+
+
+    private static final long serialVersionUID = 1L;
+
+            @ApiModelProperty("主键")
+    private String id;
+
+            @ApiModelProperty("创建人")
+    private String createBy;
+
+            @ApiModelProperty("创建日期")
+    private Date createTime;
+
+            @ApiModelProperty("更新人")
+    private String updateBy;
+
+            @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+            @ApiModelProperty("设备检查记录主表id")
+    private String recordsMasterCheckId;
+
+            @ApiModelProperty("钢轨轨型")
+    private String railType;
+
+            @ApiModelProperty("线别Id")
+    private String lineAliasId;
+
+            @ApiModelProperty("线别名称")
+    private String lineAliasName;
+
+            @ApiModelProperty("左股仪器编码")
+    private String leftFemoralApparatusCode;
+
+            @ApiModelProperty("左股仪器")
+    private String leftFemoralApparatus;
+
+            @ApiModelProperty("右股仪器编码")
+    private String rightFemoralApparatusCode;
+
+            @ApiModelProperty("右股仪器")
+    private String rightFemoralApparatus;
+
+            @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/entity/RailWearRecord.java

+package org.jeecg.modules.checkData.equipmentCheckData.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 检查数据-设备检查记录数据-钢轨伤损情况检查表
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-09
+ */
+@Getter
+@Setter
+@TableName("t_ek_rail_wear_record")
+@ApiModel(value = "RailWearRecord对象", description = "检查数据-设备检查记录数据-钢轨伤损情况检查表")
+public class RailWearRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("设备检查记录主表id")
+    @TableField("records_master_check_id")
+    private String recordsMasterCheckId;
+
+    @ApiModelProperty("钢轨轨型")
+    @TableField("rail_type")
+    private String railType;
+
+    @ApiModelProperty("线别Id")
+    @TableField("line_alias_id")
+    private String lineAliasId;
+
+    @ApiModelProperty("线别名称")
+    @TableField("line_alias_name")
+    private String lineAliasName;
+
+    @ApiModelProperty("左股仪器编码")
+    @TableField("left_femoral_apparatus_code")
+    private String leftFemoralApparatusCode;
+
+    @ApiModelProperty("左股仪器")
+    @TableField("left_femoral_apparatus")
+    private String leftFemoralApparatus;
+
+    @ApiModelProperty("右股仪器编码")
+    @TableField("right_femoral_apparatus_code")
+    private String rightFemoralApparatusCode;
+
+    @ApiModelProperty("右股仪器")
+    @TableField("right_femoral_apparatus")
+    private String rightFemoralApparatus;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    @TableField("del_flag")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/entity/RecordsMasterCheck.java

@@ -65,10 +65,6 @@ public class RecordsMasterCheck implements Serializable {
     @Excel(name = "工单编号", width = 15, orderNum = "2")
     private String workCode;
 
-    @ApiModelProperty("轨距水平尺编号")
-    @TableField("gauge_code")
-    private String gaugeCode;
-
     @ApiModelProperty("检查区间id")
     @TableField("subway_section_id")
     private String subwaySectionId;

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/mapper/RailWearRecordMapper.java

+package org.jeecg.modules.checkData.equipmentCheckData.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.checkData.equipmentCheckData.dto.RailWearRecordDTO;
+import org.jeecg.modules.checkData.equipmentCheckData.entity.RailWearRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.checkData.equipmentCheckData.vo.RailWearRecordVO;
+import org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckDetailVO;
+
+/**
+ * <p>
+ * 检查数据-设备检查记录数据-钢轨伤损情况检查表 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-09
+ */
+public interface RailWearRecordMapper extends BaseMapper<RailWearRecord> {
+
+    Page<RailWearRecordVO> queryPageList(Page<RailWearRecordVO> pageData, RailWearRecordDTO dto);
+
+    UseTurnoutRecordCheckDetailVO getDetail(String id);
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/mapper/xml/RailWearRecordMapper.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="org.jeecg.modules.checkData.equipmentCheckData.mapper.RailWearRecordMapper">
+
+    <select id="queryPageList" resultType="org.jeecg.modules.checkData.equipmentCheckData.vo.RailWearRecordVO">
+        SELECT
+            t1.id,
+            t2.id recordsMasterCheckId,
+            t2.ek_code,
+            t2.work_code,
+            t2.check_time,
+            t2.check_by,
+            t2.verify_by,
+            t2.verify_time,
+            t2.subway_section_id,
+            t2.subway_section_name,
+            t2.light_rail_id,
+            t2.light_rail_name,
+            t2.line_alias_id,
+            t2.line_alias_name,
+            t2.starting_mileage,
+            t2.end_mileage,
+            t1.rail_type,
+            t2.remark
+        FROM
+            t_ek_rail_wear_record t1
+        LEFT JOIN t_ek_records_master_check t2 ON t1.records_master_check_id = t2.id and t2.del_flag = '0'
+        WHERE t1.del_flag = '0'
+    </select>
+    <select id="getDetail"
+            resultType="org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckDetailVO">
+        SELECT
+            t1.id,
+            t1.left_femoral_apparatus_code,
+            t1.left_femoral_apparatus,
+            t1.right_femoral_apparatus_code,
+            t1.right_femoral_apparatus
+        FROM
+            t_ek_rail_wear_record t1
+        where t1.id = #{id}
+    </select>
+</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/service/IRailWearRecordService.java

+package org.jeecg.modules.checkData.equipmentCheckData.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.checkData.equipmentCheckData.dto.RailWearRecordDTO;
+import org.jeecg.modules.checkData.equipmentCheckData.entity.RailWearRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.checkData.equipmentCheckData.vo.RailWearRecordVO;
+import org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckDetailVO;
+
+/**
+ * <p>
+ * 检查数据-设备检查记录数据-钢轨伤损情况检查表 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-09
+ */
+public interface IRailWearRecordService extends IService<RailWearRecord> {
+
+    Page<RailWearRecordVO> queryPageList(Page<RailWearRecordVO> pageData, RailWearRecordDTO dto);
+
+    UseTurnoutRecordCheckDetailVO getDetail(String id);
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/service/impl/RailWearRecordServiceImpl.java

+package org.jeecg.modules.checkData.equipmentCheckData.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.checkData.equipmentCheckData.dto.RailWearRecordDTO;
+import org.jeecg.modules.checkData.equipmentCheckData.entity.RailWearRecord;
+import org.jeecg.modules.checkData.equipmentCheckData.mapper.RailWearRecordMapper;
+import org.jeecg.modules.checkData.equipmentCheckData.service.IRailWearRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.checkData.equipmentCheckData.vo.RailWearRecordVO;
+import org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckDetailVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 检查数据-设备检查记录数据-钢轨伤损情况检查表 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-09
+ */
+@Service
+public class RailWearRecordServiceImpl extends ServiceImpl<RailWearRecordMapper, RailWearRecord> implements IRailWearRecordService {
+
+    @Override
+    public Page<RailWearRecordVO> queryPageList(Page<RailWearRecordVO> pageData, RailWearRecordDTO dto) {
+        return this.baseMapper.queryPageList(pageData, dto);
+    }
+
+    @Override
+    public UseTurnoutRecordCheckDetailVO getDetail(String id) {
+        return this.baseMapper.getDetail(id);
+    }
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/template/钢轨伤损情况-右股仪器.json

+{
+  "name": "右股仪器编号",
+  "probeCombination": {
+    "checkName": "探头组合",
+    "value1": "37℃",
+    "value2": "70℃",
+    "value3": "70℃",
+    "value4": "70℃",
+    "value5": "70℃",
+    "value6": "70℃",
+    "value7": "70℃",
+    "value8": "37℃",
+    "value9": "0℃"
+  },
+  "instrumentSensitivity": {
+    "checkName": "仪器灵敏度",
+    "value1": "1通道",
+    "value2": "2通道",
+    "value3": "3通道",
+    "value4": "4通道",
+    "value5": "5通道",
+    "value6": "6通道",
+    "value7": "6A通道",
+    "value8": "7通道",
+    "value9": "8通道"
+  },
+  "upTrack": {
+    "checkName": "上道(dB)值",
+    "value1": "48",
+    "value2": "48",
+    "value3": "50",
+    "value4": "50",
+    "value5": "50",
+    "value6": "51",
+    "value7": "51",
+    "value8": "50",
+    "value9": "50"
+  },
+  "downTrack": {
+    "checkName": "下道(dB)值",
+    "value1": "",
+    "value2": "",
+    "value3": "",
+    "value4": "",
+    "value5": "",
+    "value6": "",
+    "value7": "",
+    "value8": "",
+    "value9": ""
+  },
+  "workTime": {
+    "checkName": "工作时间",
+    "value1": "",
+    "value2": "",
+    "value3": "",
+    "value4": "",
+    "value5": "",
+    "value6": "",
+    "value7": "",
+    "value8": "",
+    "value9": ""
+  },
+  "hearingAid": {
+    "checkName": "助听",
+    "value1": "",
+    "value2": "",
+    "value3": "",
+    "value4": "",
+    "value5": "",
+    "value6": "",
+    "value7": "",
+    "value8": "",
+    "value9": ""
+  },
+  "rightThigh": {
+    "checkName": "右股",
+    "value1": "",
+    "value2": "",
+    "value3": "",
+    "value4": "",
+    "value5": "",
+    "value6": "",
+    "value7": "",
+    "value8": "",
+    "value9": ""
+  }
+}
\ No newline at end of file

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/template/钢轨伤损情况-左股仪器.json

+{
+  "name": "左股仪器编号",
+  "probeCombination": {
+    "checkName": "探头组合",
+    "value1": "37℃",
+    "value2": "70℃",
+    "value3": "70℃",
+    "value4": "70℃",
+    "value5": "70℃",
+    "value6": "70℃",
+    "value7": "70℃",
+    "value8": "37℃",
+    "value9": "0℃"
+  },
+  "instrumentSensitivity": {
+    "checkName": "仪器灵敏度",
+    "value1": "1通道",
+    "value2": "2通道",
+    "value3": "3通道",
+    "value4": "4通道",
+    "value5": "5通道",
+    "value6": "6通道",
+    "value7": "6A通道",
+    "value8": "7通道",
+    "value9": "8通道"
+  },
+  "upTrack": {
+    "checkName": "上道(dB)值",
+    "value1": "48",
+    "value2": "48",
+    "value3": "50",
+    "value4": "50",
+    "value5": "50",
+    "value6": "51",
+    "value7": "51",
+    "value8": "50",
+    "value9": "50"
+  },
+  "downTrack": {
+    "checkName": "下道(dB)值",
+    "value1": "",
+    "value2": "",
+    "value3": "",
+    "value4": "",
+    "value5": "",
+    "value6": "",
+    "value7": "",
+    "value8": "",
+    "value9": ""
+  },
+  "workTime": {
+    "checkName": "工作时间",
+    "value1": "",
+    "value2": "",
+    "value3": "",
+    "value4": "",
+    "value5": "",
+    "value6": "",
+    "value7": "",
+    "value8": "",
+    "value9": ""
+  },
+  "hearingAid": {
+    "checkName": "助听",
+    "value1": "",
+    "value2": "",
+    "value3": "",
+    "value4": "",
+    "value5": "",
+    "value6": "",
+    "value7": "",
+    "value8": "",
+    "value9": ""
+  },
+  "leftThigh": {
+    "checkName": "左股",
+    "value1": "",
+    "value2": "",
+    "value3": "",
+    "value4": "",
+    "value5": "",
+    "value6": "",
+    "value7": "",
+    "value8": "",
+    "value9": ""
+  }
+}
\ No newline at end of file

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/RailWearRecordDetailVO.java

+package org.jeecg.modules.checkData.equipmentCheckData.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 检查数据-设备检查记录数据-钢轨伤损情况检查表
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-09
+ */
+@Data
+@ApiModel(value = "RailWearRecordDetailVO对象", description = "钢轨伤损情况检查详情")
+public class RailWearRecordDetailVO {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+//    @ApiModelProperty("线别Id")
+//    private String lineAliasId;
+//
+//    @ApiModelProperty("线别名称")
+//    private String lineAliasName;
+
+    @ApiModelProperty("左股仪器编码")
+    private String leftFemoralApparatusCode;
+
+    @ApiModelProperty("左股仪器")
+    private String leftFemoralApparatus;
+
+    @ApiModelProperty("右股仪器编码")
+    private String rightFemoralApparatusCode;
+
+    @ApiModelProperty("右股仪器")
+    private String rightFemoralApparatus;
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/RailWearRecordVO.java

+package org.jeecg.modules.checkData.equipmentCheckData.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 检查数据-设备检查记录数据-钢轨伤损情况检查表
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-09
+ */
+@Data
+@ApiModel(value = "RailWearRecord对象", description = "检查数据-设备检查记录数据-钢轨伤损情况检查表")
+public class RailWearRecordVO {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("id")
+    private String id;
+
+    @ApiModelProperty("设备检查记录主表id")
+    private String recordsMasterCheckId;
+
+    @ApiModelProperty("检查批次号")
+    private String ekCode;
+
+    @ApiModelProperty("工单编号")
+    private String workCode;
+
+    @ApiModelProperty("检查区间id")
+    private String subwaySectionId;
+
+    @ApiModelProperty("检查区间名称")
+    private String subwaySectionName;
+
+    @ApiModelProperty("所属线路id")
+    private String lightRailId;
+
+    @ApiModelProperty("所属线路名称")
+    private String lightRailName;
+
+    @ApiModelProperty("所属线别id")
+    private String lineAliasId;
+
+    @ApiModelProperty("所属线别名称")
+    private String lineAliasName;
+
+    @ApiModelProperty("车站id")
+    private String stationId;
+
+    @ApiModelProperty("车站名称")
+    private String stationName;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("检查日期")
+    private Date checkTime;
+
+    @ApiModelProperty("检查人")
+    private String checkBy;
+
+    @ApiModelProperty("审核人姓名")
+    private String verifyBy;
+
+    @ApiModelProperty("审核时间")
+    private Date verifyTime;
+
+    @ApiModelProperty("起点里程")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("终点里程")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("钢轨轨型")
+    private String railType;
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/RecordsMasterCheckVO.java

@@ -59,10 +59,6 @@ public class RecordsMasterCheckVO {
     @TableField("work_code")
     private String workCode;
 
-    @ApiModelProperty("轨距水平尺编号")
-    @TableField("gauge_code")
-    private String gaugeCode;
-
     @ApiModelProperty("检查区间id")
     @TableField("subway_section_id")
     private String subwaySectionId;

jeecg-module-system/src/main/resources/generator/dto.java.ftl

@@ -3,6 +3,7 @@ package ${package.Entity};
 <#list table.importPackages as pkg>
     import ${pkg};
 </#list>
+import lombok.Data;
 <#if swagger>
     import io.swagger.annotations.ApiModel;
     import io.swagger.annotations.ApiModelProperty;
@@ -24,11 +25,7 @@ package ${package.Entity};
 * @since ${date}
 */
 <#if entityLombokModel>
-    @Getter
-    @Setter
-    <#if chainModel>
-        @Accessors(chain = true)
-    </#if>
+    @Data
 </#if>
 <#if swagger>
     @ApiModel(value = "${entity}对象", description = "${table.comment!}")

jeecg-module-system/src/main/resources/generator/vo.java.ftl

@@ -3,6 +3,7 @@ package ${package.Entity};
 <#list table.importPackages as pkg>
     import ${pkg};
 </#list>
+import lombok.Data;
 <#if swagger>
     import io.swagger.annotations.ApiModel;
     import io.swagger.annotations.ApiModelProperty;
@@ -24,14 +25,10 @@ package ${package.Entity};
 * @since ${date}
 */
 <#if entityLombokModel>
-    @Getter
-    @Setter
-    <#if chainModel>
-        @Accessors(chain = true)
-    </#if>
+@Data
 </#if>
 <#if swagger>
-    @ApiModel(value = "${entity}对象", description = "${table.comment!}")
+    @ApiModel(value = "${entity}VO对象", description = "${table.comment!}")
 </#if>
 
 public class ${entity}VO {
@@ -55,26 +52,6 @@ public class ${entity}VO {
             */
         </#if>
     </#if>
-    <#if field.keyFlag>
-    <#-- 主键 -->
-        <#if field.keyIdentityFlag>
-            @TableId(value = "${field.annotationColumnName}", type = IdType.AUTO)
-        <#elseif idType??>
-            @TableId(value = "${field.annotationColumnName}", type = IdType.${idType})
-        <#elseif field.convert>
-            @TableId("${field.annotationColumnName}")
-        </#if>
-    <#-- 普通字段 -->
-    <#elseif field.fill??>
-    <#-- -----   存在字段填充设置   ----->
-        <#if field.convert>
-            @TableField(value = "${field.annotationColumnName}", fill = FieldFill.${field.fill})
-        <#else>
-            @TableField(fill = FieldFill.${field.fill})
-        </#if>
-    <#elseif field.convert>
-        @TableField("${field.annotationColumnName}")
-    </#if>
 <#-- 乐观锁注解 -->
     <#if field.versionField>
         @Version