[update] 优化路口表参数

wj-databus/src/main/java/net/wanji/databus/vo/CrossInfoPageVO.java

+package net.wanji.databus.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author duanruiming
+ * @date 2023/02/07 15:48
+ */
+@Data
+@ApiModel(value = "路口信息实体")
+public class CrossInfoPageVO extends PageVO{
+    @ApiModelProperty( value = "路口名称")
+    String crossName;
+    @ApiModelProperty( value = "信号机厂商")
+    String manufacturerNick;
+}

wj-databus/src/main/java/net/wanji/databus/vo/CrossInfoVO.java

@@ -5,14 +5,53 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
- * @author duanruiming
- * @date 2023/02/07 15:48
+ * @author wj
+ * @date 2022/11/28 9:42:39
  */
 @Data
-@ApiModel(value = "路口信息实体")
-public class CrossInfoVO extends PageVO{
-    @ApiModelProperty( value = "路口名称")
-    String crossName;
-    @ApiModelProperty( value = "信号机厂商")
-    String manufacturerNick;
+@ApiModel(value = "CrossInfoVO", description = "查询路口管理输入参数")
+public class CrossInfoVO {
+
+    /**
+     * 路口名称
+     */
+    @ApiModelProperty(value = "路口名称", required = true)
+    private String name;
+
+    /**
+     * 行政区划代码
+     */
+    @ApiModelProperty(value = "行政区划代码", required = true)
+    private Integer areaCode;
+
+    /**
+     * 行政区划名称
+     */
+    @ApiModelProperty(value = "行政区划名称", required = true)
+    private String areaName;
+
+    /**
+     * 是否信控路口：1是；0否
+     */
+    @ApiModelProperty(value = "是否信控路口：1是；0否", required = true)
+    private Integer isSignal;
+
+    /**
+     * 是否启动优化：1是；0否
+     */
+    @ApiModelProperty(value = "是否启动优化：1是；0否", required = true)
+    private Integer isStart;
+
+    /**
+     * 是否下发方案：1是；0否
+     */
+    @ApiModelProperty(value = "是否下发方案：1是；0否", required = true)
+    private Integer isSend;
+
+    @ApiModelProperty(value = "当前页")
+    private Integer pageNum;
+
+    @ApiModelProperty(value = "每页的数量")
+    private Integer pageSize;
+
 }

wj-databus/src/main/resources/mapper/CrossInfoMapper.xml

@@ -177,7 +177,7 @@
             gmt_modified = #{gmtModified,jdbcType=TIMESTAMP}
         where id = #{id,jdbcType=CHAR}
     </update>
-    <select id="selectAll" parameterType="net.wanji.databus.vo.CrossInfoVO" resultMap="SelectAllMap">
+    <select id="selectAll" parameterType="net.wanji.databus.vo.CrossInfoPageVO" resultMap="SelectAllMap">
         <bind name="startNum" value="(pageNum - 1) * pageSize"/>
         select c.id,c.name,c.type,c.level,c.area_code,a.name
         area_name,c.location,c.is_signal,c.is_start,c.is_send,c.gmt_create,c.gmt_modified
@@ -207,7 +207,7 @@
             limit #{startNum}, #{pageSize}
         </if>
     </select>
-    <select id="countSelectAll" parameterType="net.wanji.databus.vo.CrossInfoVO" resultType="integer">
+    <select id="countSelectAll" parameterType="net.wanji.databus.vo.CrossInfoPageVO" resultType="integer">
         select count(1)
         from t_base_cross_info c
         left join t_base_area_info a on c.area_code=a.code