修改分页查询入参形式

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

@@ -17,7 +17,7 @@ import java.util.List;
 
 import javax.validation.Valid;
 
-@Api(value = "rest/catenary/bus/zzdzxx", tags = "支柱吊柱信息 row_format =")
+@Api(value = "rest/catenary/bus/zzdzxx", tags = "支柱吊柱信息")
 @RestController
 @Validated
 @RequestMapping(value = "business/catenary/bus/zzdzxx")
@@ -54,7 +54,7 @@ public class BusZzdzxxController extends BaseController {
 
     @ApiOperation(value = "列表")
     @PostMapping(value = "list")
-    public TableDataInfo getList(@RequestBody BusZzdzxx busZzdzxx) {
+    public TableDataInfo getList(BusZzdzxx busZzdzxx) {
         startPage();
         List<BusZzdzxx> list = busZzdzxxService.getList(busZzdzxx);
         return getDataTable(list);

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

@@ -11,10 +11,10 @@ import org.hibernate.validator.constraints.Length;
 import javax.validation.constraints.NotNull;
 /**
  * 支柱吊柱信息
- * @author wuhonghao 2021-10-12
+ * @author wuhonghao 2021-10-13
  */
 @Data
-@ApiModel("支柱吊柱信息 row_format =")
+@ApiModel("= 支柱吊柱信息")
 @EqualsAndHashCode(callSuper = true)
 public class BusZzdzxx extends BaseEntity{
 
@@ -23,359 +23,287 @@ public class BusZzdzxx extends BaseEntity{
 
     @ApiModelProperty(value = "段别")
     @Length(min = 1, max = 200, message = "【段别】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【段别】不能为空")
     private String db;
 
     @ApiModelProperty(value = "所属部门")
     @Length(min = 1, max = 100, message = "【所属部门】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【所属部门】不能为空")
     private String bm;
 
     @ApiModelProperty(value = "线别")
     @Length(min = 1, max = 100, message = "【线别】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【线别】不能为空")
     private String xb;
 
     @ApiModelProperty(value = "站/区间")
     @Length(min = 1, max = 100, message = "【站/区间】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【站/区间】不能为空")
     private String qj;
 
     @ApiModelProperty(value = "行别")
     @Length(min = 1, max = 50, message = "【行别】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【行别】不能为空")
     private String hb;
 
     @ApiModelProperty(value = "支柱号")
     @Length(min = 1, max = 10, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【支柱号】不能为空")
     private String zzh;
 
     @ApiModelProperty(value = "股道")
     @Length(min = 1, max = 100, message = "【股道】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【股道】不能为空")
     private String gd;
 
     @ApiModelProperty(value = "管辖模式")
     @Length(min = 1, max = 20, message = "【管辖模式】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【管辖模式】不能为空")
     private String gxms;
 
     @ApiModelProperty(value = "基本单元代码")
     @Length(min = 1, max = 100, message = "【基本单元代码】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【基本单元代码】不能为空")
     private String jbdydm;
 
     @ApiModelProperty(value = "隧道")
     @Length(min = 1, max = 50, message = "【隧道】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【隧道】不能为空")
     private String sd;
 
     @ApiModelProperty(value = "公里标（m）")
     @Length(min = 1, max = 20, message = "【公里标（m）】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【公里标（m）】不能为空")
     private String glb;
 
     @ApiModelProperty(value = "接触悬挂锚段号")
     @Length(min = 1, max = 100, message = "【接触悬挂锚段号】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【接触悬挂锚段号】不能为空")
     private String jcxgmdh;
 
     @ApiModelProperty(value = "接触悬挂安装图号")
     @Length(min = 1, max = 200, message = "【接触悬挂安装图号】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【接触悬挂安装图号】不能为空")
     private String jcxgazth;
 
     @ApiModelProperty(value = "附加悬挂安装图号")
     @Length(min = 1, max = 200, message = "【附加悬挂安装图号】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【附加悬挂安装图号】不能为空")
     private String fjxgazth;
 
     @ApiModelProperty(value = "支柱类型")
     @Length(min = 1, max = 50, message = "【支柱类型】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【支柱类型】不能为空")
     private String zzlx;
 
     @ApiModelProperty(value = "支柱型号")
     @Length(min = 1, max = 100, message = "【支柱型号】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【支柱型号】不能为空")
     private String zzxh;
 
     @ApiModelProperty(value = "支柱用途")
     @Length(min = 1, max = 100, message = "【支柱用途】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【支柱用途】不能为空")
     private String zzyt;
 
     @ApiModelProperty(value = "材质")
     @Length(min = 1, max = 100, message = "【材质】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【材质】不能为空")
     private String cz;
 
     @ApiModelProperty(value = "直线/曲外/曲内")
     @Length(min = 1, max = 50, message = "【直线/曲外/曲内】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【直线/曲外/曲内】不能为空")
     private String zxqwqn;
 
     @ApiModelProperty(value = "跨距（m）")
     @Length(min = 1, max = 50, message = "【跨距（m）】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【跨距（m）】不能为空")
     private String kj;
 
     @ApiModelProperty(value = "曲线半径（m）")
     @Length(min = 1, max = 50, message = "【曲线半径（m）】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【曲线半径（m）】不能为空")
     private String qxbj;
 
     @ApiModelProperty(value = "导高")
     @Length(min = 1, max = 50, message = "【导高】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【导高】不能为空")
     private String dg;
 
     @ApiModelProperty(value = "拉出值")
     @Length(min = 1, max = 50, message = "【拉出值】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【拉出值】不能为空")
     private String lcz;
 
     @ApiModelProperty(value = "轨面标高（mm）-实测值（支柱侧轨面红线高度）")
     @Length(min = 1, max = 50, message = "【轨面标高（mm）-实测值（支柱侧轨面红线高度）】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【轨面标高（mm）-实测值（支柱侧轨面红线高度）】不能为空")
     private String gmbgScz;
 
     @ApiModelProperty(value = "轨面标高（mm）-标准值（红横线位置）")
     @Length(min = 1, max = 50, message = "【轨面标高（mm）-标准值（红横线位置）】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【轨面标高（mm）-标准值（红横线位置）】不能为空")
     private String gmbgBzz;
 
     @ApiModelProperty(value = "侧面限界（mm）-实测值")
     @Length(min = 1, max = 50, message = "【侧面限界（mm）-实测值】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【侧面限界（mm）-实测值】不能为空")
     private String cmxjScz;
 
     @ApiModelProperty(value = "侧面限界（mm）-标准值")
     @Length(min = 1, max = 50, message = "【侧面限界（mm）-标准值】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【侧面限界（mm）-标准值】不能为空")
     private String cmxjBzz;
 
     @ApiModelProperty(value = "外轨超高（mm）-实测值")
     @Length(min = 1, max = 50, message = "【外轨超高（mm）-实测值】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【外轨超高（mm）-实测值】不能为空")
     private String wgcgScz;
 
     @ApiModelProperty(value = "外轨超高（mm）-标准值")
     @Length(min = 1, max = 50, message = "【外轨超高（mm）-标准值】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【外轨超高（mm）-标准值】不能为空")
     private String wgcgBzz;
 
     @ApiModelProperty(value = "支柱状态")
     @Length(min = 1, max = 50, message = "【支柱状态】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【支柱状态】不能为空")
     private String zzzt;
 
     @ApiModelProperty(value = "生产厂家")
     @Length(min = 1, max = 200, message = "【生产厂家】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【生产厂家】不能为空")
     private String sccj;
 
     @ApiModelProperty(value = "投运日期")
-    @NotNull(message = "【投运日期】不能为空")
     private Date tyrq;
 
     @ApiModelProperty(value = "出厂日期")
-    @NotNull(message = "【出厂日期】不能为空")
     private Date ccrq;
 
     @ApiModelProperty(value = "设计寿命（年）")
     @Length(min = 1, max = 10, message = "【设计寿命（年）】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【设计寿命（年）】不能为空")
     private String sjsm;
 
     @ApiModelProperty(value = "支柱基础状态")
     @Length(min = 1, max = 50, message = "【支柱基础状态】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【支柱基础状态】不能为空")
     private String zzjczt;
 
     @ApiModelProperty(value = "基础类型")
     @Length(min = 1, max = 50, message = "【基础类型】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【基础类型】不能为空")
     private String jclx;
 
     @ApiModelProperty(value = "地线状态")
     @Length(min = 1, max = 50, message = "【地线状态】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【地线状态】不能为空")
     private String dxzt;
 
     @ApiModelProperty(value = "检修周期")
     @Length(min = 1, max = 10, message = "【检修周期】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【检修周期】不能为空")
     private String jxzq;
 
     @ApiModelProperty(value = "af、pw线绝缘子、肩架及对锚是否满足要求")
     @Length(min = 1, max = 10, message = "【af、pw线绝缘子、肩架及对锚是否满足要求】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【af、pw线绝缘子、肩架及对锚是否满足要求】不能为空")
     private String sfSfpwjjdm;
 
     @ApiModelProperty(value = "是否有补偿装置")
     @Length(min = 1, max = 10, message = "【是否有补偿装置】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有补偿装置】不能为空")
     private String sfBczz;
 
     @ApiModelProperty(value = "是否有分段绝缘器")
     @Length(min = 1, max = 10, message = "【是否有分段绝缘器】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有分段绝缘器】不能为空")
     private String sfFdjyq;
 
     @ApiModelProperty(value = "是否有分相绝缘器")
     @Length(min = 1, max = 10, message = "【是否有分相绝缘器】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有分相绝缘器】不能为空")
     private String sfFxjyq;
 
     @ApiModelProperty(value = "是否处于交叉线岔")
     @Length(min = 1, max = 10, message = "【是否处于交叉线岔】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否处于交叉线岔】不能为空")
     private String sfJcxc;
 
     @ApiModelProperty(value = "是否处于两线无交叉线岔")
     @Length(min = 1, max = 10, message = "【是否处于两线无交叉线岔】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否处于两线无交叉线岔】不能为空")
     private String sfLxwjcxc;
 
     @ApiModelProperty(value = "是否处于三线无交叉线岔")
     @Length(min = 1, max = 10, message = "【是否处于三线无交叉线岔】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否处于三线无交叉线岔】不能为空")
     private String sfSxwjcxc;
 
     @ApiModelProperty(value = "是否处于锚段关节式分相")
     @Length(min = 1, max = 10, message = "【是否处于锚段关节式分相】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否处于锚段关节式分相】不能为空")
     private String sfMdgjzfx;
 
     @ApiModelProperty(value = "是否有硬横跨")
     @Length(min = 1, max = 10, message = "【是否有硬横跨】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有硬横跨】不能为空")
     private String sfHkd;
 
     @ApiModelProperty(value = "是否有电连接")
     @Length(min = 1, max = 10, message = "【是否有电连接】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有电连接】不能为空")
     private String sfDlj;
 
     @ApiModelProperty(value = "是否有隔离开关")
     @Length(min = 1, max = 10, message = "【是否有隔离开关】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有隔离开关】不能为空")
     private String sfGlkg;
 
     @ApiModelProperty(value = "是否有避雷器")
     @Length(min = 1, max = 10, message = "【是否有避雷器】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有避雷器】不能为空")
     private String sfBlq;
 
     @ApiModelProperty(value = "是否有地磁感应装置")
     @Length(min = 1, max = 10, message = "【是否有地磁感应装置】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有地磁感应装置】不能为空")
     private String sfDcgyzz;
 
     @ApiModelProperty(value = "是否有行车标志牌")
     @Length(min = 1, max = 10, message = "【是否有行车标志牌】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有行车标志牌】不能为空")
     private String sfXcbzp;
 
     @ApiModelProperty(value = "是否有接地装置")
     @Length(min = 1, max = 10, message = "【是否有接地装置】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有接地装置】不能为空")
     private String sfJdzz;
 
     @ApiModelProperty(value = "是否有吸上线")
     @Length(min = 1, max = 10, message = "【是否有吸上线】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有吸上线】不能为空")
     private String sfXsx;
 
     @ApiModelProperty(value = "是否有回流线")
     @Length(min = 1, max = 10, message = "【是否有回流线】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有回流线】不能为空")
     private String sfHlx;
 
     @ApiModelProperty(value = "是否有gw线")
     @Length(min = 1, max = 10, message = "【是否有gw线】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有gw线】不能为空")
     private String sfGwx;
 
     @ApiModelProperty(value = "是否有供电线")
     @Length(min = 1, max = 10, message = "【是否有供电线】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有供电线】不能为空")
     private String sfGdx;
 
     @ApiModelProperty(value = "是否有pw线")
     @Length(min = 1, max = 10, message = "【是否有pw线】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有pw线】不能为空")
     private String sfPwx;
 
     @ApiModelProperty(value = "是否有af线")
     @Length(min = 1, max = 10, message = "【是否有af线】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有af线】不能为空")
     private String sfSfx;
 
     @ApiModelProperty(value = "是否有加强线")
     @Length(min = 1, max = 10, message = "【是否有加强线】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有加强线】不能为空")
     private String sfJqx;
 
     @ApiModelProperty(value = "是否有避雷线")
     @Length(min = 1, max = 10, message = "【是否有避雷线】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有避雷线】不能为空")
     private String sfBlx;
 
     @ApiModelProperty(value = "是否有拉线")
     @Length(min = 1, max = 10, message = "【是否有拉线】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有拉线】不能为空")
     private String sfLx;
 
     @ApiModelProperty(value = "是否有中锚")
     @Length(min = 1, max = 10, message = "【是否有中锚】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有中锚】不能为空")
     private String sfZm;
 
     @ApiModelProperty(value = "其它")
     @Length(min = 1, max = 255, message = "【其它】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【其它】不能为空")
     private String qt;
 
     @ApiModelProperty(value = "附件")
     @Length(min = 1, max = 255, message = "【附件】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【附件】不能为空")
     private String fj;
 
     @ApiModelProperty(value = "数量")
     @Length(min = 1, max = 10, message = "【数量】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【数量】不能为空")
     private String sl;
 
     @ApiModelProperty(value = "单位")
     @Length(min = 1, max = 100, message = "【单位】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【单位】不能为空")
     private String dw;
 
     @ApiModelProperty(value = "数据编号")
     @Length(min = 1, max = 255, message = "【数据编号】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【数据编号】不能为空")
     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

@@ -7,9 +7,9 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
-* 支柱吊柱信息 row_format =
+*  支柱吊柱信息
 * @author wuhonghao
-* @date 2021/10/12
+* @date 2021/10/13
 */
 @Mapper
 @Repository

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

@@ -3,9 +3,9 @@ package com.railway.business.catenary.service;
 import com.railway.business.catenary.domain.BusZzdzxx;
 import java.util.List;
 /**
-* 支柱吊柱信息 row_format =
+*  支柱吊柱信息
 * @author wuhonghao
-* @date 2021/10/12
+* @date 2021/10/13
 */
 public interface IBusZzdzxxService{
 

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

@@ -10,9 +10,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
 /**
-* 支柱吊柱信息 row_format =
+*  支柱吊柱信息
 * @author wuhonghao
-* @date 2021/10/12
+* @date 2021/10/13
 */
 @Service
 @Transactional(readOnly = true)
@@ -25,7 +25,7 @@ private BusZzdzxxMapper busZzdzxxMapper;
 	*/
 	@Transactional(rollbackFor = Exception.class)
 	public int create(BusZzdzxx busZzdzxx) {
-		return busZzdzxxMapper.insert(busZzdzxx);
+		return  busZzdzxxMapper.insert(busZzdzxx);
 	}
 
 	/**

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

@@ -42,7 +42,7 @@ public class ${classInfo.className} extends BaseEntity{
     @Length(min = 1, max = ${fieldItem.fieldLength}, message = "【${fieldItem.fieldComment}】长度必须介于 {min} 和 {max} 之间")
     </#if>
 <#--    <#if fieldItem.fieldClass=='Date' >-->
-    @NotNull(message = "【${fieldItem.fieldComment}】不能为空")
+<#--@NotNull(message = "【${fieldItem.fieldComment}】不能为空")-->
 <#--    </#if>-->
     private ${fieldItem.fieldClass} ${fieldItem.fieldName};
 

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

@@ -25,7 +25,7 @@ private ${classInfo.className}Mapper ${classInfo.className?uncap_first}Mapper;
 	*/
 	@Transactional(rollbackFor = Exception.class)
 	public int create(${classInfo.className} ${classInfo.className?uncap_first}) {
-		${classInfo.className?uncap_first}Mapper.insert(${classInfo.className?uncap_first});
+		return ${classInfo.className?uncap_first}Mapper.insert(${classInfo.className?uncap_first});
 	}
 
 	/**
@@ -41,7 +41,7 @@ private ${classInfo.className}Mapper ${classInfo.className?uncap_first}Mapper;
 	*/
 	@Transactional(rollbackFor = Exception.class)
 	public int update(${classInfo.className} ${classInfo.className?uncap_first}) {
-		${classInfo.className?uncap_first}Mapper.update(${classInfo.className?uncap_first});
+		return ${classInfo.className?uncap_first}Mapper.update(${classInfo.className?uncap_first});
 	}
 
 	/**