修改支柱信息字段名称为简拼

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusZzdzxxController.java

@@ -2,28 +2,25 @@ package com.railway.web.controller.business.catenary;
 
 import com.railway.business.catenary.domain.BusZzdzxx;
 import com.railway.business.catenary.service.IBusZzdzxxService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.WebDataBinder;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import javax.validation.Valid;
 import java.util.List;
+
 import javax.validation.Valid;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-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;
 
-@Api(value = "rest/business/bus/zzdzxx", tags = "支柱吊柱信息")
+@Api(value = "rest/catenary/bus/zzdzxx", tags = "支柱吊柱信息 row_format =")
 @RestController
 @Validated
-@RequestMapping(value = "business/business/bus/zzdzxx")
+@RequestMapping(value = "business/catenary/bus/zzdzxx")
 public class BusZzdzxxController extends BaseController {
     @Autowired
     private IBusZzdzxxService busZzdzxxService;
@@ -35,9 +32,9 @@ public class BusZzdzxxController extends BaseController {
     }
 
     @ApiOperation(value = "删除")
-    @DeleteMapping("/zzId")
-    public AjaxResult delete(@RequestParam String zzId) {
-        return toAjax(busZzdzxxService.delete(zzId));
+    @DeleteMapping("/id")
+    public AjaxResult delete(@RequestParam String id) {
+        return toAjax(busZzdzxxService.delete(id));
     }
 
     @ApiOperation(value = "更新")
@@ -47,9 +44,9 @@ public class BusZzdzxxController extends BaseController {
     }
 
     @ApiOperation(value = "单个")
-    @GetMapping(value = {"/", "/{zzId}"})
-    public AjaxResult getInfo(String zzId) {
-        BusZzdzxx info = busZzdzxxService.getInfo(zzId);
+    @GetMapping(value = {"/", "/id"})
+    public AjaxResult getInfo(String id) {
+        BusZzdzxx info = busZzdzxxService.getInfo(id);
         AjaxResult ajax = AjaxResult.success();
         ajax.put("info",info);
         return ajax;

railway-business/src/main/java/com/railway/business/catenary/domain/BusZzdzxx.java

@@ -4,360 +4,379 @@ import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.util.Date;
-import javax.validation.constraints.NotNull;
 import lombok.EqualsAndHashCode;
-import org.hibernate.validator.constraints.Length;
+import java.util.Date;
 
+import org.hibernate.validator.constraints.Length;
+import javax.validation.constraints.NotNull;
 /**
- * 支柱吊柱信息
- * @author wuhonghao 2021-10-11
+ * 支柱吊柱信息 row_format =
+ * @author wuhonghao 2021-10-12
  */
-@EqualsAndHashCode(callSuper = true)
 @Data
-@ApiModel("支柱吊柱信息")
+@ApiModel("支柱吊柱信息 row_format =")
+@EqualsAndHashCode(callSuper = true)
 public class BusZzdzxx extends BaseEntity{
 
     @ApiModelProperty(value = "主键", hidden = true)
-    private String zzId;
+    private String id;
 
     @ApiModelProperty(value = "段别")
     @Length(min = 1, max = 200, message = "【段别】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【段别】不能为空")
-    private String duanbie;
+    private String db;
 
     @ApiModelProperty(value = "所属部门")
     @Length(min = 1, max = 100, message = "【所属部门】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【所属部门】不能为空")
-    private String bumen;
+    private String bm;
 
     @ApiModelProperty(value = "线别")
     @Length(min = 1, max = 100, message = "【线别】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【线别】不能为空")
-    private String xianbie;
+    private String xb;
 
     @ApiModelProperty(value = "站/区间")
     @Length(min = 1, max = 100, message = "【站/区间】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【站/区间】不能为空")
-    private String zhanqujian;
+    private String qj;
 
     @ApiModelProperty(value = "行别")
     @Length(min = 1, max = 50, message = "【行别】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【行别】不能为空")
-    private String xingbie;
+    private String hb;
 
     @ApiModelProperty(value = "支柱号")
     @Length(min = 1, max = 10, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【支柱号】不能为空")
-    private String zhizhuhao;
+    private String zzh;
 
     @ApiModelProperty(value = "股道")
     @Length(min = 1, max = 100, message = "【股道】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【股道】不能为空")
-    private String gudao;
+    private String gd;
 
     @ApiModelProperty(value = "管辖模式")
     @Length(min = 1, max = 20, message = "【管辖模式】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【管辖模式】不能为空")
-    private String guanxiamoshi;
+    private String gxms;
 
     @ApiModelProperty(value = "基本单元代码")
     @Length(min = 1, max = 100, message = "【基本单元代码】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【基本单元代码】不能为空")
-    private String danyuandaima;
+    private String jbdydm;
 
     @ApiModelProperty(value = "隧道")
     @Length(min = 1, max = 50, message = "【隧道】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【隧道】不能为空")
-    private String suidao;
+    private String sd;
 
     @ApiModelProperty(value = "公里标（m）")
     @Length(min = 1, max = 20, message = "【公里标（m）】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【公里标（m）】不能为空")
-    private String gonglibiao;
+    private String glb;
 
     @ApiModelProperty(value = "接触悬挂锚段号")
     @Length(min = 1, max = 100, message = "【接触悬挂锚段号】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【接触悬挂锚段号】不能为空")
-    private String maoduanhao;
+    private String jcxgmdh;
 
     @ApiModelProperty(value = "接触悬挂安装图号")
     @Length(min = 1, max = 200, message = "【接触悬挂安装图号】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【接触悬挂安装图号】不能为空")
-    private String anzhuangtuhao;
+    private String jcxgazth;
 
     @ApiModelProperty(value = "附加悬挂安装图号")
     @Length(min = 1, max = 200, message = "【附加悬挂安装图号】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【附加悬挂安装图号】不能为空")
-    private String fujiaanzhuangtuhao;
+    private String fjxgazth;
 
     @ApiModelProperty(value = "支柱类型")
     @Length(min = 1, max = 50, message = "【支柱类型】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【支柱类型】不能为空")
-    private String zhizhuleixing;
+    private String zzlx;
 
     @ApiModelProperty(value = "支柱型号")
     @Length(min = 1, max = 100, message = "【支柱型号】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【支柱型号】不能为空")
-    private String zhizhuxinghao;
+    private String zzxh;
 
     @ApiModelProperty(value = "支柱用途")
     @Length(min = 1, max = 100, message = "【支柱用途】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【支柱用途】不能为空")
-    private String zhizhuyongtu;
+    private String zzyt;
 
     @ApiModelProperty(value = "材质")
     @Length(min = 1, max = 100, message = "【材质】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【材质】不能为空")
-    private String caizhi;
+    private String cz;
 
     @ApiModelProperty(value = "直线/曲外/曲内")
     @Length(min = 1, max = 50, message = "【直线/曲外/曲内】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【直线/曲外/曲内】不能为空")
-    private String zhixianquxian;
+    private String zxqwqn;
 
     @ApiModelProperty(value = "跨距（m）")
     @Length(min = 1, max = 50, message = "【跨距（m）】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【跨距（m）】不能为空")
-    private String kuaju;
+    private String kj;
 
     @ApiModelProperty(value = "曲线半径（m）")
     @Length(min = 1, max = 50, message = "【曲线半径（m）】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【曲线半径（m）】不能为空")
-    private String quxianbanjing;
+    private String qxbj;
 
     @ApiModelProperty(value = "导高")
     @Length(min = 1, max = 50, message = "【导高】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【导高】不能为空")
-    private String daogao;
+    private String dg;
 
     @ApiModelProperty(value = "拉出值")
     @Length(min = 1, max = 50, message = "【拉出值】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【拉出值】不能为空")
-    private String lachuzhi;
+    private String lcz;
 
     @ApiModelProperty(value = "轨面标高（mm）-实测值（支柱侧轨面红线高度）")
     @Length(min = 1, max = 50, message = "【轨面标高（mm）-实测值（支柱侧轨面红线高度）】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【轨面标高（mm）-实测值（支柱侧轨面红线高度）】不能为空")
-    private String guimianShice;
+    private String gmbgScz;
 
     @ApiModelProperty(value = "轨面标高（mm）-标准值（红横线位置）")
     @Length(min = 1, max = 50, message = "【轨面标高（mm）-标准值（红横线位置）】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【轨面标高（mm）-标准值（红横线位置）】不能为空")
-    private String guimianBiaozhun;
+    private String gmbgBzz;
 
     @ApiModelProperty(value = "侧面限界（mm）-实测值")
     @Length(min = 1, max = 50, message = "【侧面限界（mm）-实测值】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【侧面限界（mm）-实测值】不能为空")
-    private String cemianShice;
+    private String cmxjScz;
 
     @ApiModelProperty(value = "侧面限界（mm）-标准值")
     @Length(min = 1, max = 50, message = "【侧面限界（mm）-标准值】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【侧面限界（mm）-标准值】不能为空")
-    private String cemianBiaozhun;
+    private String cmxjBzz;
 
     @ApiModelProperty(value = "外轨超高（mm）-实测值")
     @Length(min = 1, max = 50, message = "【外轨超高（mm）-实测值】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【外轨超高（mm）-实测值】不能为空")
-    private String waiguiShice;
+    private String wgcgScz;
 
     @ApiModelProperty(value = "外轨超高（mm）-标准值")
     @Length(min = 1, max = 50, message = "【外轨超高（mm）-标准值】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【外轨超高（mm）-标准值】不能为空")
-    private String waiguiBiaozhun;
+    private String wgcgBzz;
 
     @ApiModelProperty(value = "支柱状态")
     @Length(min = 1, max = 50, message = "【支柱状态】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【支柱状态】不能为空")
-    private String zhizhuzhuangtai;
+    private String zzzt;
 
     @ApiModelProperty(value = "生产厂家")
     @Length(min = 1, max = 200, message = "【生产厂家】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【生产厂家】不能为空")
-    private String shengchanchangjia;
+    private String sccj;
 
     @ApiModelProperty(value = "投运日期")
     @NotNull(message = "【投运日期】不能为空")
-    private Date touyunriqi;
+    private Date tyrq;
 
     @ApiModelProperty(value = "出厂日期")
     @NotNull(message = "【出厂日期】不能为空")
-    private Date chuchangriqi;
+    private Date ccrq;
 
     @ApiModelProperty(value = "设计寿命（年）")
     @Length(min = 1, max = 10, message = "【设计寿命（年）】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【设计寿命（年）】不能为空")
-    private String shejishouming;
+    private String sjsm;
 
     @ApiModelProperty(value = "支柱基础状态")
     @Length(min = 1, max = 50, message = "【支柱基础状态】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【支柱基础状态】不能为空")
-    private String zhizhujichuzhuangtai;
+    private String zzjczt;
 
     @ApiModelProperty(value = "基础类型")
     @Length(min = 1, max = 50, message = "【基础类型】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【基础类型】不能为空")
-    private String jichuleixing;
+    private String jclx;
 
     @ApiModelProperty(value = "地线状态")
     @Length(min = 1, max = 50, message = "【地线状态】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【地线状态】不能为空")
-    private String dixianzhuangtai;
+    private String dxzt;
 
     @ApiModelProperty(value = "检修周期")
     @Length(min = 1, max = 10, message = "【检修周期】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【检修周期】不能为空")
-    private String jianxiuzhouqi;
+    private String jxzq;
 
     @ApiModelProperty(value = "af、pw线绝缘子、肩架及对锚是否满足要求")
     @Length(min = 1, max = 10, message = "【af、pw线绝缘子、肩架及对锚是否满足要求】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【af、pw线绝缘子、肩架及对锚是否满足要求】不能为空")
-    private String sfmanzuyaoqiu;
+    private String sfSfpwjjdm;
 
     @ApiModelProperty(value = "是否有补偿装置")
     @Length(min = 1, max = 10, message = "【是否有补偿装置】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【是否有补偿装置】不能为空")
-    private String sfbuchang;
+    private String sfBczz;
 
     @ApiModelProperty(value = "是否有分段绝缘器")
     @Length(min = 1, max = 10, message = "【是否有分段绝缘器】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【是否有分段绝缘器】不能为空")
-    private String sffenduanjueyuan;
+    private String sfFdjyq;
 
     @ApiModelProperty(value = "是否有分相绝缘器")
     @Length(min = 1, max = 10, message = "【是否有分相绝缘器】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【是否有分相绝缘器】不能为空")
-    private String sffenxiangjueyuan;
+    private String sfFxjyq;
 
     @ApiModelProperty(value = "是否处于交叉线岔")
     @Length(min = 1, max = 10, message = "【是否处于交叉线岔】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【是否处于交叉线岔】不能为空")
-    private String sfjiaochaxiancha;
+    private String sfJcxc;
 
     @ApiModelProperty(value = "是否处于两线无交叉线岔")
     @Length(min = 1, max = 10, message = "【是否处于两线无交叉线岔】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【是否处于两线无交叉线岔】不能为空")
-    private String sfliangxianjiaochaxiancha;
+    private String sfLxwjcxc;
 
     @ApiModelProperty(value = "是否处于三线无交叉线岔")
     @Length(min = 1, max = 10, message = "【是否处于三线无交叉线岔】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【是否处于三线无交叉线岔】不能为空")
-    private String sfsanxianjiaochaxiancha;
+    private String sfSxwjcxc;
 
     @ApiModelProperty(value = "是否处于锚段关节式分相")
     @Length(min = 1, max = 10, message = "【是否处于锚段关节式分相】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【是否处于锚段关节式分相】不能为空")
-    private String sfmaoduanfenxiang;
+    private String sfMdgjzfx;
 
     @ApiModelProperty(value = "是否有硬横跨")
     @Length(min = 1, max = 10, message = "【是否有硬横跨】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【是否有硬横跨】不能为空")
-    private String sfyinghengkua;
+    private String sfHkd;
 
     @ApiModelProperty(value = "是否有电连接")
     @Length(min = 1, max = 10, message = "【是否有电连接】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【是否有电连接】不能为空")
-    private String sfdianlianjie;
+    private String sfDlj;
 
     @ApiModelProperty(value = "是否有隔离开关")
     @Length(min = 1, max = 10, message = "【是否有隔离开关】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【是否有隔离开关】不能为空")
-    private String sfgelikaiguan;
+    private String sfGlkg;
 
     @ApiModelProperty(value = "是否有避雷器")
     @Length(min = 1, max = 10, message = "【是否有避雷器】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【是否有避雷器】不能为空")
-    private String sfbileiqi;
+    private String sfBlq;
 
     @ApiModelProperty(value = "是否有地磁感应装置")
     @Length(min = 1, max = 10, message = "【是否有地磁感应装置】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【是否有地磁感应装置】不能为空")
-    private String sfdiciganying;
+    private String sfDcgyzz;
 
     @ApiModelProperty(value = "是否有行车标志牌")
     @Length(min = 1, max = 10, message = "【是否有行车标志牌】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【是否有行车标志牌】不能为空")
-    private String sfxingchebiaozhi;
+    private String sfXcbzp;
 
     @ApiModelProperty(value = "是否有接地装置")
     @Length(min = 1, max = 10, message = "【是否有接地装置】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【是否有接地装置】不能为空")
-    private String sfjiedizhuangzhi;
+    private String sfJdzz;
 
     @ApiModelProperty(value = "是否有吸上线")
     @Length(min = 1, max = 10, message = "【是否有吸上线】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【是否有吸上线】不能为空")
-    private String sfxishangxian;
+    private String sfXsx;
 
     @ApiModelProperty(value = "是否有回流线")
     @Length(min = 1, max = 10, message = "【是否有回流线】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【是否有回流线】不能为空")
-    private String sfhuiliuxian;
+    private String sfHlx;
 
     @ApiModelProperty(value = "是否有gw线")
     @Length(min = 1, max = 10, message = "【是否有gw线】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【是否有gw线】不能为空")
-    private String sfgwxian;
+    private String sfGwx;
 
     @ApiModelProperty(value = "是否有供电线")
     @Length(min = 1, max = 10, message = "【是否有供电线】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【是否有供电线】不能为空")
-    private String sfgongdianxian;
+    private String sfGdx;
 
     @ApiModelProperty(value = "是否有pw线")
     @Length(min = 1, max = 10, message = "【是否有pw线】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【是否有pw线】不能为空")
-    private String sfpwxian;
+    private String sfPwx;
 
     @ApiModelProperty(value = "是否有af线")
     @Length(min = 1, max = 10, message = "【是否有af线】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【是否有af线】不能为空")
-    private String sfafxian;
+    private String sfSfx;
 
     @ApiModelProperty(value = "是否有加强线")
     @Length(min = 1, max = 10, message = "【是否有加强线】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【是否有加强线】不能为空")
-    private String sfjiaqiangxian;
+    private String sfJqx;
 
     @ApiModelProperty(value = "是否有避雷线")
     @Length(min = 1, max = 10, message = "【是否有避雷线】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【是否有避雷线】不能为空")
-    private String sfbileixian;
+    private String sfBlx;
 
     @ApiModelProperty(value = "是否有拉线")
     @Length(min = 1, max = 10, message = "【是否有拉线】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【是否有拉线】不能为空")
-    private String sflaxian;
+    private String sfLx;
 
     @ApiModelProperty(value = "是否有中锚")
     @Length(min = 1, max = 10, message = "【是否有中锚】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【是否有中锚】不能为空")
-    private String sfzhongmao;
+    private String sfZm;
 
     @ApiModelProperty(value = "其它")
     @Length(min = 1, max = 255, message = "【其它】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【其它】不能为空")
-    private String qita;
+    private String qt;
 
     @ApiModelProperty(value = "附件")
     @Length(min = 1, max = 255, message = "【附件】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【附件】不能为空")
-    private String fujian;
+    private String fj;
 
     @ApiModelProperty(value = "数量")
     @Length(min = 1, max = 10, message = "【数量】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【数量】不能为空")
-    private String shuliang;
+    private String sl;
 
     @ApiModelProperty(value = "单位")
     @Length(min = 1, max = 100, message = "【单位】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【单位】不能为空")
-    private String danwei;
+    private String dw;
 
     @ApiModelProperty(value = "数据编号")
     @Length(min = 1, max = 255, message = "【数据编号】长度必须介于 {min} 和 {max} 之间")
     @NotNull(message = "【数据编号】不能为空")
-    private String shujubianhao;
+    private String sjbh;
+
+    @ApiModelProperty(value = "del_flag")
+    @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
+    @NotNull(message = "【del_flag】不能为空")
+    private String delFlag;
+
+    @ApiModelProperty(value = "create_by")
+    @Length(min = 1, max = 64, message = "【create_by】长度必须介于 {min} 和 {max} 之间")
+    @NotNull(message = "【create_by】不能为空")
+    private String createBy;
+
+    @ApiModelProperty(value = "update_by")
+    @Length(min = 1, max = 64, message = "【update_by】长度必须介于 {min} 和 {max} 之间")
+    @NotNull(message = "【update_by】不能为空")
+    private String updateBy;
+
+    @ApiModelProperty(value = "update_time")
+    @NotNull(message = "【update_time】不能为空")
+    private Date updateTime;
 
     public BusZzdzxx() {
     }

railway-business/src/main/java/com/railway/business/catenary/mapper/BusZzdzxxMapper.java

@@ -1,16 +1,15 @@
 package com.railway.business.catenary.mapper;
 
+import com.github.pagehelper.Page;
 import com.railway.business.catenary.domain.BusZzdzxx;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
-
 /**
-* 支柱吊柱信息
+* 支柱吊柱信息 row_format =
 * @author wuhonghao
-* @date 2021/10/11
+* @date 2021/10/12
 */
 @Mapper
 @Repository
@@ -24,7 +23,7 @@ public interface BusZzdzxxMapper {
     /**
     * @Description: 删除
     */
-    int delete(@Param("zzId") String zzId);
+    int delete(@Param("id") String id);
 
     /**
     * @Description: 更新
@@ -34,11 +33,11 @@ public interface BusZzdzxxMapper {
     /**
     * @Description: 获取单个
     */
-    BusZzdzxx getInfo(@Param("zzId") String zzId);
+    BusZzdzxx getInfo(@Param("id") String id);
 
     /**
     * @Description: 查询列表
     */
-    List<BusZzdzxx> getList(BusZzdzxx busZzdzxx);
+    Page<BusZzdzxx> getList(BusZzdzxx busZzdzxx);
 
 }

railway-business/src/main/java/com/railway/business/catenary/service/IBusZzdzxxService.java

@@ -1,13 +1,11 @@
 package com.railway.business.catenary.service;
 
 import com.railway.business.catenary.domain.BusZzdzxx;
-
 import java.util.List;
-
 /**
-* 支柱吊柱信息
+* 支柱吊柱信息 row_format =
 * @author wuhonghao
-* @date 2021/10/11
+* @date 2021/10/12
 */
 public interface IBusZzdzxxService{
 
@@ -19,7 +17,7 @@ public interface IBusZzdzxxService{
     /**
     * @Description: 删除
     */
-    int delete(String zzIds);
+    int delete(String ids);
 
     /**
     * @Description: 更新
@@ -29,7 +27,7 @@ public interface IBusZzdzxxService{
     /**
     * @Description: 获取单个
     */
-    BusZzdzxx getInfo(String zzId);
+    BusZzdzxx getInfo(String id);
 
     /**
     * @Description: 查询列表

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusZzdzxxServiceImpl.java

@@ -1,40 +1,39 @@
 package com.railway.business.catenary.service.impl;
 
-import com.railway.business.catenary.domain.BusZzdzxx;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import com.railway.business.catenary.mapper.BusZzdzxxMapper;
+import com.railway.business.catenary.domain.BusZzdzxx;
 import com.railway.business.catenary.service.IBusZzdzxxService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import java.util.List;
-
 /**
-* 支柱吊柱信息
+* 支柱吊柱信息 row_format =
 * @author wuhonghao
-* @date 2021/10/11
+* @date 2021/10/12
 */
 @Service
 @Transactional(readOnly = true)
-public class BusZzdzxxServiceImpl implements IBusZzdzxxService {
-	@Autowired
-	private BusZzdzxxMapper busZzdzxxMapper;
-
+public class BusZzdzxxServiceImpl implements IBusZzdzxxService{
+@Autowired
+private BusZzdzxxMapper busZzdzxxMapper;
 
 	/**
 	* @Description: 新增
 	*/
 	@Transactional(rollbackFor = Exception.class)
 	public int create(BusZzdzxx busZzdzxx) {
-		return busZzdzxxMapper.insert(busZzdzxx);
+		busZzdzxxMapper.insert(busZzdzxx);
 	}
 
 	/**
 	* @Description: 删除
 	*/
 	@Transactional(rollbackFor = Exception.class)
-	public int delete(String zzId) {
-		return busZzdzxxMapper.delete(zzId);
+	public int delete(String id) {
+		return	busZzdzxxMapper.delete(id);
 	}
 
 	/**
@@ -42,14 +41,14 @@ public class BusZzdzxxServiceImpl implements IBusZzdzxxService {
 	*/
 	@Transactional(rollbackFor = Exception.class)
 	public int update(BusZzdzxx busZzdzxx) {
-		return busZzdzxxMapper.update(busZzdzxx);
+		busZzdzxxMapper.update(busZzdzxx);
 	}
 
 	/**
 	* @Description: 获取单个
 	*/
-	public BusZzdzxx getInfo(String zzId) {
-		return busZzdzxxMapper.getInfo(zzId);
+	public BusZzdzxx getInfo(String id) {
+		return busZzdzxxMapper.getInfo(id);
 	}
 
 	/**

railway-business/src/main/resources/mapper/business/BusFjxgmdMapper.xml

@@ -21,34 +21,34 @@
         FROM bus_fjxgmd dm WHERE TRIM( dm.qsgh ) IN
         (
             SELECT DISTINCT
-                A.ZHIZHUHAO
+                A.zzh
             FROM
                 bus_zzdzxx A,
             (
                 SELECT
-                    zz.ZZ_ID,
-                    zz.GONGLIBIAO
+                    zz.id,
+                    zz.glb
                 FROM
                     bus_zzdzxx zz
                 WHERE 1=1
                     <if test="query.zzh != null and query.zzh != ''">
-                        AND zz.ZHIZHUHAO = #{query.zzh}
+                        AND zz.zzh = #{query.zzh}
                     </if>
                     <if test="query.ssbm != null and query.ssbm != ''">
-                        AND zz.BUMEN = #{query.ssbm}
+                        AND zz.bm = #{query.ssbm}
                     </if>
                     <if test="query.xb != null and query.xb != ''">
-                        AND zz.XIANBIE = #{query.xb}
+                        AND zz.xb = #{query.xb}
                     </if>
                     <if test="query.qj != null and query.qj != ''">
-                        AND zz.ZHANQUJIAN = #{query.qj}
+                        AND zz.qj = #{query.qj}
                     </if>
                     <if test="query.hb != null and query.hb != ''">
-                        AND zz.XINGBIE = #{query.hb}
+                        AND zz.hb = #{query.hb}
                     </if>
             ) B
             WHERE
-                A.GONGLIBIAO BETWEEN B.GONGLIBIAO - #{query.zzfw} AND B.GONGLIBIAO + #{query.zzfw}
+                A.glb BETWEEN B.glb - #{query.zzfw} AND B.glb + #{query.zzfw}
         )
         ORDER BY dm.qsgh
     </select>

railway-generator/src/main/resources/templates/code-generator/railway/back/mybatis.ftl

@@ -50,7 +50,7 @@
 
     <delete id="delete">
         UPDATE ${classInfo.tableName}
-        set is_del='1'
+        set del_flag='1'
         WHERE ${primaryKey} = ${r"#{"}${primaryKeyCame}${r"}"}
     </delete>