调整换表模块字段名调整换表模块字段名

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/yhgl/controller/YhKhjbxxController.java

@@ -32,6 +32,8 @@ import com.tofly.feesapi.yhgl.mapper.YhKhjbxxMapper;
 import com.tofly.feesapi.yhgl.service.IYyZjzhService;
 import com.tofly.feesapi.yhgl.service.YhKhjbxxLogService;
 import com.tofly.feesapi.yhgl.service.YhKhjbxxService;
+import com.tofly.feesapi.znbgl.entity.ZnbYhda;
+import com.tofly.feesapi.znbgl.service.ZnbYhdaService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -78,6 +80,8 @@ public class YhKhjbxxController {
 
     private final IYyZjzhService zjzhService;
 
+    private final ZnbYhdaService znbYhdaService;
+
     @ApiOperationSupport(order = 1)
     @GetMapping("/yhbh")
     @ApiOperation(value = "获取用户编号")
@@ -338,6 +342,35 @@ public class YhKhjbxxController {
                                     bwMeterReadPlan.setSscbpq(sscbpq);//片区
                                     bwMeterReadPlan.setSscbb(sscbb);//抄表本
                                     yyCblrService.save(bwMeterReadPlan);
+                                    //同步智能表档案
+                                    if(sblb.equals("2") || sblb.equals("3"))
+                                    {
+                                        ZnbYhda znbYhda=new ZnbYhda();
+
+                                        znbYhda.setYhbh(user.getYhbh());//用户编号
+                                        znbYhda.setYhxm(user.getYhxm());//用户姓名
+                                        znbYhda.setYhdz(user.getYhdz());//用户地址
+                                        znbYhda.setSsgs(ssgs);//所属公司
+                                        znbYhda.setSspq(sscbpq);//片区
+                                        znbYhda.setSscbb(sscbb);//抄表本
+                                        znbYhda.setBjcj(sbsccj);//厂家
+                                        znbYhda.setBjbh(user.getSbbh());//表具编号
+                                        znbYhda.setBjwz(bjwz);//位置
+                                        znbYhda.setBjxh(sbxh);
+                                        znbYhda.setBjkj(user.getSbkj());//口径
+                                        znbYhda.setBjlb(sblb);//水表类型
+                                        znbYhda.setFmzt("1");//
+
+
+                                        znbYhda.setCzry(czrybm);
+
+                                        znbYhda.setCzrq(new Date());
+                                        znbYhda.setJdrq(new Date());
+
+                                        znbYhda.setJdlx("0");//建档
+
+
+                                    }
                                 }
                             }
                         }

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/znbgl/controller/ZnbYhdaController.java

@@ -0,0 +1,116 @@
+/*
+ * Author: wangjian
+ * 生成controller
+ */
+package com.tofly.feesapi.znbgl.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.tofly.common.core.entity.ResultRespone;
+import com.tofly.common.log.annotation.ToFlyAppLog;
+import com.tofly.feesapi.znbgl.entity.ZnbYhda;
+import com.tofly.feesapi.znbgl.service.ZnbYhdaService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import java.util.Arrays;
+/**
+ * 智能表用户档案
+ *
+ * @author sxb
+ * @date Tue Apr 23 00:00:00 CST 2024
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/znbyhda")
+@Api(tags="智能表用户档案接口")
+public class ZnbYhdaController {
+
+    private final  ZnbYhdaService znbYhdaService;
+
+    /**
+    * 分页查询
+    * @param page 分页对象
+    * @param znbYhda 智能表用户档案
+    * @return
+    */
+    @GetMapping("/page" )
+    @ApiOperation(value = "分页查询")
+    public ResultRespone getZnbYhdaPage(Page page, @ModelAttribute ZnbYhda znbYhda) {
+      return ResultRespone.success(znbYhdaService.page(page, Wrappers.query(znbYhda)));
+    }
+
+
+    /**
+     * 通过id查询智能表用户档案
+     * @param yhbh id
+     * @return ResultRespone
+     */
+    @GetMapping("/{yhbh}" )
+    @ApiOperation(value = "通过ID查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "yhbh", value = "ID", required = true, dataType = "String")
+    })
+    public ResultRespone getById(@PathVariable("yhbh" ) String yhbh) {
+      return ResultRespone.success(znbYhdaService.getById(yhbh));
+    }
+
+    /**
+     * 新增智能表用户档案
+     * @param znbYhda 智能表用户档案
+     * @return ResultRespone
+     */
+    @ToFlyAppLog(title="新增智能表用户档案" )
+    @ApiOperation(value = "新增智能表用户档案")
+    @PostMapping
+    public ResultRespone save(@RequestBody ZnbYhda znbYhda) {
+      return ResultRespone.success(znbYhdaService.save(znbYhda));
+    }
+
+    /**
+     * 修改智能表用户档案
+     * @param znbYhda 智能表用户档案
+     * @return ResultRespone
+     */
+    @ToFlyAppLog(title="修改智能表用户档案" )
+    @ApiOperation(value = "修改智能表用户档案")
+    @PutMapping
+    public ResultRespone updateById(@RequestBody ZnbYhda znbYhda) {
+      return ResultRespone.success(znbYhdaService.updateById(znbYhda));
+    }
+
+    /**
+     * 通过id删除智能表用户档案
+     * @param yhbh id
+     * @return ResultRespone
+     */
+    @ToFlyAppLog(title="通过id删除智能表用户档案" )
+    @ApiOperation(value = "通过ID删除智能表用户档案")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "yhbh", value = "ID", required = true, dataType = "String")
+    })
+    @DeleteMapping("/{yhbh}" )
+    public ResultRespone removeById(@PathVariable String yhbh) {
+      return ResultRespone.success(znbYhdaService.removeById(yhbh));
+    }
+
+    /**
+     * 通过id批量删除智能表用户档案
+     * @param ids id
+     * @return ResultRespone
+     */
+    @ToFlyAppLog(title="通过id批量删除智能表用户档案" )
+    @ApiOperation(value = "通过ID批量删除智能表用户档案")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", value = "批量删除，多个id以逗号隔开", required = true, dataType = "String")
+    })
+    @DeleteMapping("/deleteByIds" )
+    public ResultRespone removeByIds(String ids) {
+        return ResultRespone.success(znbYhdaService.removeByIds(Arrays.asList(ids.split(","))));
+    }
+}

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/znbgl/entity/ZnbYhda.java

@@ -0,0 +1,192 @@
+/*
+ * Author: wangjian
+ * 生成entity
+ */
+package com.tofly.feesapi.znbgl.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+/**
+ * 智能表用户档案
+ *
+ * @author sxb
+ * @date Tue Apr 23 00:00:00 CST 2024
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value="ZNB_YHDA",resultMap = "znbYhdaMap")
+@KeySequence("ZNB_YHDA")
+@ApiModel
+public class ZnbYhda extends Model<ZnbYhda> {
+    private static final long serialVersionUID = 1L;
+
+        /**
+     * 表具位置
+     */
+            @ApiModelProperty(value = "表具位置")
+                private String bjwz;
+                /**
+     * 表具口径
+     */
+            @ApiModelProperty(value = "表具口径")
+                private String bjkj;
+                /**
+     * 表具量程
+     */
+            @ApiModelProperty(value = "表具量程")
+                private String bjlc;
+                /**
+     * 抄表频率（0：每月抄；1：单月抄；2：双月抄；3：按日抄）
+     */
+            @ApiModelProperty(value = "抄表频率（0：每月抄；1：单月抄；2：双月抄；3：按日抄）")
+                private String cbpl;
+                /**
+     * 表具起度
+     */
+            @ApiModelProperty(value = "表具起度")
+                private BigDecimal bjqd;
+                /**
+     * 表具止度
+     */
+            @ApiModelProperty(value = "表具止度")
+                private BigDecimal bjzd;
+                /**
+     * 表具编号
+     */
+            @ApiModelProperty(value = "表具编号")
+                private String bjbh;
+                /**
+     * 建档日期
+     */
+            @ApiModelProperty(value = "建档日期")
+        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+                private Date jdrq;
+                /**
+     * 建档批次号
+     */
+            @ApiModelProperty(value = "建档批次号")
+                private String jdpch;
+                /**
+     * 操作人员
+     */
+            @ApiModelProperty(value = "操作人员")
+                private String czry;
+                /**
+     * 操作日期
+     */
+            @ApiModelProperty(value = "操作日期")
+        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+                private Date czrq;
+                /**
+     * 用户状态
+     */
+            @ApiModelProperty(value = "用户状态")
+                private String yhzt;
+                /**
+     * 阀门状态0关阀1开阀
+     */
+            @ApiModelProperty(value = "阀门状态0关阀1开阀")
+                private String fmzt;
+                /**
+     * 表具状态0异常1正常
+     */
+            @ApiModelProperty(value = "表具状态0异常1正常")
+                private String bjzt;
+                /**
+     * 具体状态异常信息
+     */
+            @ApiModelProperty(value = "具体状态异常信息")
+                private String bjmsg;
+                /**
+     * 表具余额
+     */
+            @ApiModelProperty(value = "表具余额")
+                private BigDecimal bjye;
+                /**
+     * 档案同步标志0未同步,1同步
+     */
+            @ApiModelProperty(value = "档案同步标志0未同步,1同步")
+                private String tbbz;
+                /**
+     * 建档类型（0：建档；1：变更；2：换表）
+     */
+            @ApiModelProperty(value = "建档类型（0：建档；1：变更；2：换表）")
+                private String jdlx;
+                /**
+     * 用户编号
+     */
+        @TableId(value = "YHBH",type= IdType.INPUT)
+            @ApiModelProperty(value = "用户编号")
+                private String yhbh;
+                /**
+     * 用户姓名
+     */
+            @ApiModelProperty(value = "用户姓名")
+                private String yhxm;
+                /**
+     * 用户地址
+     */
+            @ApiModelProperty(value = "用户地址")
+                private String yhdz;
+                /**
+     * 联系电话
+     */
+            @ApiModelProperty(value = "联系电话")
+                private String lxdh;
+                /**
+     * 所属公司
+     */
+            @ApiModelProperty(value = "所属公司")
+                private String ssgs;
+                /**
+     * 所属片区
+     */
+            @ApiModelProperty(value = "所属片区")
+                private String sspq;
+                /**
+     * 所属抄表本
+     */
+            @ApiModelProperty(value = "所属抄表本")
+                private String sscbb;
+                /**
+     * 用户类型
+     */
+            @ApiModelProperty(value = "用户类型")
+                private String yhlx;
+                /**
+     * 价格编码
+     */
+            @ApiModelProperty(value = "价格编码")
+                private String jgbm;
+                /**
+     * 表具厂家
+     */
+            @ApiModelProperty(value = "表具厂家")
+                private String bjcj;
+                /**
+     * 表具型号
+     */
+            @ApiModelProperty(value = "表具型号")
+                private String bjxh;
+                /**
+     * 表具类别
+     */
+            @ApiModelProperty(value = "表具类别")
+                private String bjlb;
+            
+}

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/znbgl/mapper/ZnbYhdaMapper.java

@@ -0,0 +1,21 @@
+/*
+ * Author: wangjian
+ * 生成mapper
+ */
+package com.tofly.feesapi.znbgl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.tofly.feesapi.znbgl.entity.ZnbYhda;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+
+import java.util.List;
+/**
+ * 智能表用户档案
+ *
+ * @author sxb
+ * @date Tue Apr 23 00:00:00 CST 2024
+ */
+public interface ZnbYhdaMapper extends BaseMapper<ZnbYhda> {
+                                                                                                                        }

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/znbgl/service/ZnbYhdaService.java

@@ -0,0 +1,18 @@
+/*
+ * Author: wangjian
+ * 生成Service
+ */
+package com.tofly.feesapi.znbgl.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.tofly.feesapi.znbgl.entity.ZnbYhda;
+
+/**
+ * 智能表用户档案
+ *
+ * @author sxb
+ * @date Tue Apr 23 00:00:00 CST 2024
+ */
+public interface ZnbYhdaService extends IService<ZnbYhda> {
+
+}

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/znbgl/service/impl/ZnbYhdaServiceImpl.java

@@ -0,0 +1,22 @@
+/*
+ * Author: wangjian
+ * 生成ServiceImpl
+ */
+package com.tofly.feesapi.znbgl.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.tofly.feesapi.znbgl.entity.ZnbYhda;
+import com.tofly.feesapi.znbgl.service.ZnbYhdaService;
+import org.springframework.stereotype.Service;
+import com.tofly.feesapi.znbgl.mapper.ZnbYhdaMapper;
+
+/**
+ * 智能表用户档案
+ *
+ * @author sxb
+ * @date Tue Apr 23 00:00:00 CST 2024
+ */
+@Service("znbYhdaService")
+public class ZnbYhdaServiceImpl extends ServiceImpl<ZnbYhdaMapper, ZnbYhda> implements ZnbYhdaService {
+
+}