系统字典分页查询修改,渗压设备字段补充,闸阀关联视频点分页查询修改

src/main/java/com/gunshi/project/xyt/controller/SysDictBController.java

@@ -54,6 +54,9 @@ public class SysDictBController {
                 throw new IllegalArgumentException("当父级不存在");
             }
         }
+        if (null == dto.getPid()){
+            dto.setPid(0L);
+        }
         dto.setCreateTm(new Date());
         dto.setId(IdWorker.getId());
 
@@ -108,7 +111,7 @@ public class SysDictBController {
 
         LambdaQueryWrapper<SysDictB> queryWrapper = Wrappers.lambdaQuery();
 
-        Page<SysDictB> data = service.page(page.getPageSo().toPage(), queryWrapper.isNull(SysDictB::getPid));
+        Page<SysDictB> data = service.page(page.getPageSo().toPage(), queryWrapper.eq(SysDictB::getPid,0L));
         return R.ok(data);
     }
 

src/main/java/com/gunshi/project/xyt/mapper/GateValveCctvRelMapper.java

@@ -33,8 +33,8 @@ public interface GateValveCctvRelMapper extends BaseMapper<GateValveCctvRel> {
                      acb.name LIKE concat('%',#{obj.indexName},'%') 
                 </if> 
                 </where>
-                <if test="obj.sortField != null and obj.sortField !=''">
-                    order by t.${obj.sortField} asc
+                <if test="obj.orderField != null and obj.orderField !=''">
+                    order by t.${obj.orderField} asc
                 </if> 
             </script>
             """)

src/main/java/com/gunshi/project/xyt/model/OsmoticPressDevice.java

@@ -148,7 +148,7 @@ public class OsmoticPressDevice implements Serializable {
         /**
         * 温度的基准值T₀
         */
-        @TableField(value="t")
+        @TableField(value="t0")
         @Schema(description="温度的基准值T₀")
         private BigDecimal t0;
 

src/main/java/com/gunshi/project/xyt/model/SysDictB.java

@@ -40,7 +40,7 @@ public class SysDictB implements Serializable {
         @TableId(value="id", type= IdType.AUTO)
         @Schema(description="ID")
         // @Size(max = 0,message = "ID最大长度要小于 0")
-        @NotBlank(message = "ID不能为空",groups = {Insert.class, Update.class})
+        @NotNull(message = "ID不能为空",groups = { Update.class})
         @JsonSerialize(using = ToStringSerializer.class)
         private Long id;
 
@@ -68,7 +68,6 @@ public class SysDictB implements Serializable {
         @TableField(value="pid")
         @Schema(description="父id")
         // @Size(max = 0,message = "父id最大长度要小于 0")
-        @NotBlank(message = "父id不能为空",groups = {Insert.class, Update.class})
         private Long pid;
 
         /**
@@ -77,7 +76,7 @@ public class SysDictB implements Serializable {
         @TableField(value="sort_on")
         @Schema(description="排序字段")
         // @Size(max = 0,message = "排序字段最大长度要小于 0")
-        @NotBlank(message = "排序字段不能为空",groups = {Insert.class, Update.class})
+//        @NotNull(message = "排序字段不能为空",groups = {Insert.class, Update.class})
         private Integer sortOn;
 
         /**
@@ -106,7 +105,6 @@ public class SysDictB implements Serializable {
         @TableField(value="status")
         @Schema(description="状态 1：启用 0：禁用")
         // @Size(max = 0,message = "状态 1：启用 0：禁用最大长度要小于 0")
-        @NotNull(message = "状态 1：启用 0：禁用不能为空",groups = {Insert.class, Update.class})
         private Integer status;