智能表阀控管理查询

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/bjgl/controller/YhCbkxxController.java

@@ -38,6 +38,7 @@ import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -55,14 +56,18 @@ public class YhCbkxxController {
 
     private final YyCblrService yyCblrService;
 
-    /**
-     * 分页查询
-     */
     @ApiOperationSupport(order = 5)
     @GetMapping("/page")
-    @ApiOperation(value = "查询水表档案（分页）", tags = {"抄表序号调整", "批量设置水价", "用户换表"})
+    @ApiOperation(value = "查询普表水表档案（分页）", tags = {"抄表序号调整", "批量设置水价", "用户换表"})
     public ResultRespone<PageResult<YhCbkxxSelect2>> getPage(@ModelAttribute PageDto pageDto, @ModelAttribute YhCbkxxFilter filter) {
-        return ResultRespone.success(yhCbkxxService.getPage(pageDto, filter));
+        return ResultRespone.success(yhCbkxxService.getPage(pageDto, filter, List.of("0")));
+    }
+
+    @ApiOperationSupport(order = 6)
+    @GetMapping("/page2")
+    @ApiOperation(value = "查询智能表水表档案（分页）", tags = {"智能表阀控管理"})
+    public ResultRespone<PageResult<YhCbkxxSelect2>> getPage2(@ModelAttribute PageDto pageDto, @ModelAttribute YhCbkxxFilter filter) {
+        return ResultRespone.success(yhCbkxxService.getPage(pageDto, filter, List.of("2", "3")));
     }
 
 

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/bjgl/entity/YhCbkxx.java

@@ -10,6 +10,7 @@ import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.tofly.feesapi.common.constant.FmztEnum;
 import com.tofly.feesapi.common.constant.JfztEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -229,6 +230,9 @@ public class YhCbkxx implements Serializable {
     @ApiModelProperty("智能表剩余金额")
     private BigDecimal syje = BigDecimal.ZERO;
 
+    @ApiModelProperty("阀门状态(0关阀 1处理中 2开阀)")
+    private FmztEnum fmzt;
+
     public static final String YHBH = "YHBH";
 
     public static final String CBKH = "CBKH";
@@ -346,4 +350,6 @@ public class YhCbkxx implements Serializable {
     public static final String LJSL = "LJSL";
 
     public static final String SYJE = "SYJE";
+
+    public static final String FMZT = "FMZT";
 }

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/bjgl/entity/vo/YhCbkxxSelect2.java

@@ -1,6 +1,7 @@
 package com.tofly.feesapi.bjgl.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.tofly.feesapi.common.constant.FmztEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -98,4 +99,13 @@ public class YhCbkxxSelect2 implements Serializable {
     @ApiModelProperty(value = "联系电话", position = 24)
     private String lxdh;
 
+    @ApiModelProperty(value = "水表编号", position = 25)
+    private String sbbh;
+
+    @ApiModelProperty(value = "水表类别", position = 27)
+    private String sblbmc;
+
+    @ApiModelProperty(value = "阀门状态(0关阀 1处理中 2开阀)", position = 28)
+    private FmztEnum fmzt;
+
 }

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/bjgl/mapper/YhCbkxxMapper.java

@@ -18,7 +18,7 @@ public interface YhCbkxxMapper extends BaseMapper<YhCbkxx> {
 
     //YhCbkxxView getViewById(@Param("yhbh") String yhbh);
 
-    PageDto<YhCbkxxSelect2> getPage(PageDto pageDto, @Param("filter") YhCbkxxFilter filter);
+    PageDto<YhCbkxxSelect2> getPage(PageDto pageDto, @Param("filter") YhCbkxxFilter filter, @Param("sblbs") List<String> sblbs);
 
     //根据用户编号，表卡号，查询水表档案信息
     YhCbkxx2 SelectYhcbkxx(String yhbh, String cbkh);
@@ -33,6 +33,8 @@ public interface YhCbkxxMapper extends BaseMapper<YhCbkxx> {
     int getMaxCbxh(List<String> yhbhs);
 
     YhCbkxx getUp(@Param("sscbb") String sscbb, @Param("cbxh") int cbxh);
+
     YhCbkxx getDown(@Param("sscbb") String sscbb, @Param("cbxh") int cbxh);
+
     void lockTable();
 }

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/bjgl/service/YhCbkxxService.java

@@ -36,7 +36,7 @@ public interface YhCbkxxService extends IService<YhCbkxx> {
 
     boolean updateCbxh(YhCbkxxCbxhUpdate update, CzyUserDetails czyUserDetails);
 
-    PageResult<YhCbkxxSelect2> getPage(PageDto pageDto, YhCbkxxFilter filter);
+    PageResult<YhCbkxxSelect2> getPage(PageDto pageDto, YhCbkxxFilter filter, List<String> sblbs);
 
 
 

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/bjgl/service/impl/YhCbkxxServiceImpl.java

@@ -213,8 +213,8 @@ public class YhCbkxxServiceImpl extends ServiceImpl<YhCbkxxMapper, YhCbkxx> impl
     }
 
     @Override
-    public PageResult<YhCbkxxSelect2> getPage(PageDto pageDto, YhCbkxxFilter filter) {
-        PageDto<YhCbkxxSelect2> page = this.baseMapper.getPage(pageDto, filter);
+    public PageResult<YhCbkxxSelect2> getPage(PageDto pageDto, YhCbkxxFilter filter, List<String> sblbs) {
+        PageDto<YhCbkxxSelect2> page = this.baseMapper.getPage(pageDto, filter, sblbs);
         List<BmSjSelect> list = sjService.getList();
         Map<String, BmSjSelect> sjMap = list.stream().collect(Collectors.toMap(BmSjSelect::getCode, e -> e));
         PageResult<YhCbkxxSelect2> pageResult = page.toVo();

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/common/constant/FmztEnum.java

@@ -0,0 +1,27 @@
+package com.tofly.feesapi.common.constant;
+
+import com.baomidou.mybatisplus.annotation.IEnum;
+import lombok.Getter;
+
+/**
+ * 阀门状态
+ */
+@Getter
+public enum FmztEnum implements IEnum<String> {
+    关阀("0", ""),
+    处理中("1", ""),
+    开阀("2", "");
+
+    FmztEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    private String value;
+    private String desc;
+
+    @Override
+    public String getValue() {
+        return this.value;
+    }
+}

collect-fees/collect-fees-api/src/main/resources/mapper/bjgl/YhCbkxxMapper.xml

@@ -60,19 +60,17 @@
     </select>
     <!--自定义水表档案分页查询 -->
     <select id="getPage" resultType="com.tofly.feesapi.bjgl.entity.vo.YhCbkxxSelect2">
-        <include refid="sql2"></include>
-    </select>
-    <sql id="sql2">
         SELECT a.yhbh, a.cbkh, c.yhxm, c.yhdz, a.ybdjbz, a.wsfbz, a.sjbm, a.sjbm1, a.slbl1, a.sjbm2, a.slbl2, a.sjbm3, a.slbl3,
-        a.cbxh, f.cbbmc AS sscbbmc, g.cbpqmc AS sscbpqmc, c.lxdh
+        a.cbxh, a.sbbh, a.fmzt, f.cbbmc AS sscbbmc, g.cbpqmc AS sscbpqmc, c.lxdh, d.name AS sblbmc
         FROM yh_cbkxx a
         LEFT JOIN yh_khjbxx c ON a.yhbh = c.yhbh
+        LEFT JOIN bm_sblb d ON a.sblb = d.code
         LEFT JOIN bm_cbb f ON c.sscbb = f.cbbbm
         LEFT JOIN bm_cbpq g ON c.sscbpq = g.cbpqbm
         WHERE 1=1
         <!--模糊查询 -->
         <if test="filter.searchText!=null">
-            AND ( c.yhbh like '%${filter.searchText}%'
+            AND (c.yhbh like '%${filter.searchText}%'
             OR c.yhxm like '%${filter.searchText}%'
             OR c.yhdz like '%${filter.searchText}%'
             OR c.lxdh like '%${filter.searchText}%')
@@ -140,7 +138,13 @@
                 AND (a.cbxh IS NULL OR a.cbxh = 0)
             </if>
         </if>
-    </sql>
+        <if test="sblbs!=null and sblbs.size()>0">
+            AND a.sblb IN
+            <foreach collection="sblbs" item="sblb" index="index" open="(" close=")" separator=",">
+                #{sblb}
+            </foreach>
+        </if>
+    </select>
     <select id="getMaxCbxh" resultType="Integer">
         SELECT NVL(MAX(cbxh),0) AS cbxh FROM yh_cbkxx WHERE yhbh IN
         <foreach collection="yhbhs" item="yhbh" index="index" open="(" close=")" separator=",">