监利立户

meter-reading-system/src/main/java/com/zcxk/meterreadingsystemv2/controller/MssqlController.java

@@ -23,7 +23,15 @@ public class MssqlController {
     @GetMapping("addCustomer")
     @ApiOperation("添加监利客户信息")
     public AjaxMessage addCustomer(){
-        mssqlService.addCustomer();
+        //mssqlService.addCustomer();
+        mssqlService.addJlCustomer();
+        return new AjaxMessage<>(ResultStatus.OK);
+    }
+
+    @GetMapping("test")
+    @ApiOperation("test")
+    public AjaxMessage test(){
+        mssqlService.test();
         return new AjaxMessage<>(ResultStatus.OK);
     }
 }

meter-reading-system/src/main/java/com/zcxk/meterreadingsystemv2/controller/TestController.java

@@ -60,12 +60,14 @@ public class TestController {
     @ApiOperation(value = "测试")
     public AjaxMessage testGetUser(
     ) {
-        List<MeterReadData> list =  meterReadService.getMeterReadData(3,null,20200531,20200628);
-        System.out.println(JSON.toJSONString(list));
+        //List<MeterReadData> list =  meterReadService.getMeterReadData(3,null,20200531,20200628);
+        meterReadService.test();
         return new AjaxMessage<>(ResultStatus.OK);
     }
 
 
+
+
     @GetMapping("xpTasks")
     @ApiOperation(value = "执行新蒲新区(遵义新区供水)定时任务")
     public AjaxMessage xpTasks(

meter-reading-system/src/main/java/com/zcxk/meterreadingsystemv2/dao/DeviceDataDimMapper.java

@@ -1,5 +1,6 @@
 package com.zcxk.meterreadingsystemv2.dao;
 
+import com.zcxk.meterreadingsystemv2.entity.InstallList;
 import com.zcxk.meterreadingsystemv2.entity.MeterReadData;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -22,4 +23,6 @@ public interface DeviceDataDimMapper {
     List<MeterReadData> getMeterReadDataV3(@Param("buildingId") Integer buildingId);
 
     List<MeterReadData> getMeterReadDataByCustomerIdV3(@Param("customerId") Integer customerId);
+
+    InstallList getTest(@Param("s") String s);
 }

meter-reading-system/src/main/java/com/zcxk/meterreadingsystemv2/dao/DeviceMapper.java

@@ -9,4 +9,6 @@ import java.util.List;
 @Mapper
 public interface DeviceMapper {
     List<DeviceCustomerInfo> getDeviceCustomerInfo(@Param("communityId") Integer communityId, @Param("buildingId") Integer buildingId);
+
+    List<DeviceCustomerInfo> getDeviceCustomerInfoByCustomerId(@Param("customerId") Integer customerId);
 }

meter-reading-system/src/main/java/com/zcxk/meterreadingsystemv2/dao/TRemoteCustomerMapper.java

@@ -1,16 +1,17 @@
 package com.zcxk.meterreadingsystemv2.dao;
 
 import com.zcxk.meterreadingsystemv2.entity.TRemoteCustomer;
+import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 @Mapper
 public interface TRemoteCustomerMapper {
     int insertSelective(TRemoteCustomer record);
 
     int batchInsert(@Param("list") List<TRemoteCustomer> list);
 
+    int updateByPrimaryKeySelective(TRemoteCustomer tRemoteCustomer);
+
     TRemoteCustomer findByMeteraddr(@Param("deviceNo") String deviceNo);
 }

meter-reading-system/src/main/java/com/zcxk/meterreadingsystemv2/dto/DeviceCustomerInfo.java

@@ -18,6 +18,9 @@ public class DeviceCustomerInfo implements Serializable {
     @ApiModelProperty(value = "设备编号",position = 2)
     private String deviceNo;
 
+    @ApiModelProperty(value = "电子号",position = 2)
+    private String waterMeterNo;
+
     @ApiModelProperty(value = "地址",position = 3)
     private String location;
 
@@ -27,6 +30,9 @@ public class DeviceCustomerInfo implements Serializable {
     @ApiModelProperty(value = "用户手机号",position = 5)
     private String userPhone;
 
+    @ApiModelProperty(value = "身份证",position = 6)
+    private String idCard;
+
     @ApiModelProperty(value = "安装时间",position = 6)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date installTime;

meter-reading-system/src/main/java/com/zcxk/meterreadingsystemv2/entity/InstallList.java

@@ -0,0 +1,145 @@
+package com.zcxk.meterreadingsystemv2.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigInteger;
+import java.time.LocalDateTime;
+
+@ApiModel(value = "安装清单")
+@Data
+public class InstallList {
+    @ApiModelProperty(value = "主键")
+    private Integer id;
+
+    @ApiModelProperty(value = "站点，参考sc_site")
+	private Integer siteId ;
+
+    @ApiModelProperty(value = "计划id，参考sc_install_plan")
+    private Integer installPlanId;
+
+    /**
+    * 安装计划数据id
+    */
+    @ApiModelProperty(value="安装计划数据id")
+    private Long installPlanDataId;
+
+    /**
+    * 建筑id，参考sc_building
+    */
+    @ApiModelProperty(value="建筑id，参考sc_building")
+    private Integer buildingId;
+
+    @ApiModelProperty(value = "验收计划，参考sc_accept_plan")
+    private Integer acceptPlanId;
+
+    @ApiModelProperty(value = "安装批次，参考sc_install_batch")
+    private Integer intallBatchId;
+
+    @ApiModelProperty(value = "设备类型，参考sc_device_type")
+    private Integer deviceTypeId;
+
+    @ApiModelProperty(value = "客户Id，参考sc_customer")
+    private Integer customerId ;
+
+    @ApiModelProperty(value = "门牌")
+    private String doorNo;
+
+    @ApiModelProperty(value = "设备id")
+    private Long deviceId;
+
+    @ApiModelProperty(value="节点编号")
+    private String deviceNo;
+
+    @ApiModelProperty(value = "电子号")
+    private String electronicNo;
+
+    @ApiModelProperty(value = "档案号")
+    private String fileNo;
+
+    @ApiModelProperty(value = "新表起度",position = 7)
+    private String newMeterStart;
+
+    @ApiModelProperty(value = "旧表止度",position = 8)
+    private String oldMeterEnd;
+
+    @ApiModelProperty(value = "安装照片",position = 9)
+    private String imageUrl;
+
+    @ApiModelProperty(value = "旧表照片")
+    private String oldImageUrl ;
+
+    @ApiModelProperty(value = "用户姓名")
+    private String userName;
+
+    @ApiModelProperty(value = "用户手机号",position = 11)
+    private String userPhone;
+
+    @JsonIgnore
+    @ApiModelProperty(value = "是否计划内，0否1是", hidden = true)
+    private Integer isInPlan;
+
+    @ApiModelProperty(value = "是否已安装，0否1是")
+    private Integer isInstalled;
+
+    @ApiModelProperty(value = "是否验收，0否1是")
+    private Integer isAccepted;
+
+    @JsonIgnore
+    @ApiModelProperty(value = "计划时间",hidden = true)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime planTime;
+
+    @ApiModelProperty(value = "安装时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime installTime;
+
+    @ApiModelProperty(value = "验收时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime acceptTime;
+
+    @JsonIgnore
+    @ApiModelProperty(value = "备注",hidden = true)
+    private String remark;
+
+    @JsonIgnore
+    @ApiModelProperty(value = "状态",hidden = true)
+    private Integer status;
+
+    @JsonIgnore
+    @ApiModelProperty(value = "创建时间",hidden = true)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime dateCreate;
+
+    @JsonIgnore
+    @ApiModelProperty(value = "更新时间",hidden = true)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime dateUpdate;
+
+    @JsonIgnore
+    @ApiModelProperty(value = "创建人",hidden = true)
+    private String createBy;
+
+    @JsonIgnore
+    @ApiModelProperty(value = "更新人",hidden = true)
+    private String updateBy;
+
+    @ApiModelProperty(value="楼层")
+    private Integer floor;
+
+    @JsonIgnore
+    @ApiModelProperty(value = "序号",hidden = true)
+    private Integer index;
+
+    @ApiModelProperty(value = "水表档案号")
+    private  String metercode;
+
+    @ApiModelProperty(value = "客户信息ID")
+    private BigInteger account_id;
+
+    @ApiModelProperty(value = "客户信息ID")
+    private BigInteger accountId;
+}

meter-reading-system/src/main/java/com/zcxk/meterreadingsystemv2/kafka/AddAccountReceiver.java

@@ -80,7 +80,7 @@ public class AddAccountReceiver {
                 }
                 //监利立户
                 else if("prd".equals(acceptData.getActive()) && acceptData.getCustomerId() == 19){
-                    DynamicDataSourceContextHolder.setDataSourceKey("jl");
+                    /*DynamicDataSourceContextHolder.setDataSourceKey("jl");
                     log.info("＝＝＝＝＝service当前连接的数据库是:" + DynamicDataSourceContextHolder.getDataSourceKey());
                     if (acceptData.getAcceptListData() != null && acceptData.getAcceptListData().size() > 0) {
                         for (AcceptListData acceptListData : acceptData.getAcceptListData()) {
@@ -112,7 +112,7 @@ public class AddAccountReceiver {
                             //tRemoteCustomer.setId();
                             tRemoteCustomerMapper.insertSelective(tRemoteCustomer);
                         }
-                    }
+                    }*/
                 }
                 else {
                     return ;

meter-reading-system/src/main/java/com/zcxk/meterreadingsystemv2/service/MeterReadService.java

@@ -9,4 +9,7 @@ public interface MeterReadService {
 
     List<MeterReadData> getMeterReadData(Integer customerId,Integer buildingId, Integer startDate, Integer endDate);
 
+
+    void test();
+
 }

meter-reading-system/src/main/java/com/zcxk/meterreadingsystemv2/service/MssqlService.java

@@ -9,9 +9,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import static com.google.common.collect.Lists.newArrayList;
+
 @Slf4j
 @Service
 public class MssqlService {
@@ -65,4 +68,91 @@ public class MssqlService {
             log.info("=======================end list size="+list.size()+"-count="+count.get());
         }
     }
+
+    public void test() {
+        String originName = "jl";
+        DynamicDataSourceContextHolder.setDataSourceKey(originName);
+        log.info("＝＝＝＝＝service当前连接的数据库是:" + DynamicDataSourceContextHolder.getDataSourceKey());
+        TRemoteCustomer tRemoteCustomerOld = tRemoteCustomerMapper.findByMeteraddr("004A770124022052");
+        if (tRemoteCustomerOld != null) {
+            log.info("已经存在");
+            tRemoteCustomerOld.setUsername("李丹");
+            tRemoteCustomerOld.setLinkman("李丹");
+            tRemoteCustomerOld.setPhone("18708931160");
+            tRemoteCustomerOld.setPaperno("421023199004156622");
+            tRemoteCustomerOld.setAddress("3301");
+            tRemoteCustomerMapper.updateByPrimaryKeySelective(tRemoteCustomerOld);
+            return;
+        }else {
+            log.info("不存在");
+        }
+        TRemoteCustomer tRemoteCustomer = new TRemoteCustomer();
+        tRemoteCustomer.setFactoryid(5);
+        tRemoteCustomer.setMeteraddr("770124022052");
+        tRemoteCustomer.setUsername("李丹");
+        tRemoteCustomer.setLinkman("李丹");
+        tRemoteCustomer.setPhone("18708931160");
+        tRemoteCustomer.setPaperno("421023199004156622");
+        tRemoteCustomer.setAddress("3301");
+        //tRemoteCustomer.setCaliber(); 口径
+        tRemoteCustomer.setInstalldate(new Date());
+        tRemoteCustomer.setIfctrlvalve(0);//是否阀控表
+        tRemoteCustomer.setImported(0);
+        //log.info(JSON.toJSONString(tRemoteCustomer));
+        //tRemoteCustomer.setOldmeterid();
+        //tRemoteCustomer.setUsercode();//客户编码
+        //tRemoteCustomer.setExtenddata1();
+        //tRemoteCustomer.setExtenddata2();
+        //tRemoteCustomer.setExtenddata3();
+        //tRemoteCustomer.setOldmeteraddr();
+        //tRemoteCustomer.setValveflag();
+        //tRemoteCustomer.setId();
+        //tRemoteCustomerMapper.insertSelective(tRemoteCustomer);
+
+    }
+
+    public void addJlCustomer() {
+        String originName = "jl";
+        AtomicInteger count = new AtomicInteger(0);
+        DynamicDataSourceContextHolder.setDataSourceKey("smart-city");
+        log.info("＝＝＝＝＝service当前连接的数据库是:" + DynamicDataSourceContextHolder.getDataSourceKey());
+        List<DeviceCustomerInfo> list = deviceMapper.getDeviceCustomerInfoByCustomerId(19);
+
+        DynamicDataSourceContextHolder.setDataSourceKey(originName);
+        log.info("＝＝＝＝＝service当前连接的数据库是:" + DynamicDataSourceContextHolder.getDataSourceKey());
+        if (list != null && list.size() > 0) {
+            log.info("=======================list size="+list.size());
+            for (DeviceCustomerInfo deviceCustomerInfo : list) {
+                TRemoteCustomer tRemoteCustomerOld = tRemoteCustomerMapper.findByMeteraddr(deviceCustomerInfo.getDeviceNo());
+                if (tRemoteCustomerOld != null) {
+                    log.info(deviceCustomerInfo.getDeviceNo()+"已经存在");
+                    continue;
+                }
+                TRemoteCustomer tRemoteCustomer = new TRemoteCustomer();
+                tRemoteCustomer.setFactoryid(5);
+                tRemoteCustomer.setMeteraddr(deviceCustomerInfo.getWaterMeterNo());
+                tRemoteCustomer.setUsername(deviceCustomerInfo.getUserName());
+                tRemoteCustomer.setLinkman(deviceCustomerInfo.getUserName());
+                tRemoteCustomer.setPhone(deviceCustomerInfo.getUserPhone());
+                tRemoteCustomer.setPaperno(deviceCustomerInfo.getIdCard());
+                tRemoteCustomer.setAddress(deviceCustomerInfo.getLocation());
+                //tRemoteCustomer.setCaliber(); 口径
+                tRemoteCustomer.setInstalldate(deviceCustomerInfo.getInstallTime());
+                tRemoteCustomer.setIfctrlvalve(0);//是否阀控表
+                tRemoteCustomer.setImported(0);
+                //log.info(JSON.toJSONString(tRemoteCustomer));
+                //tRemoteCustomer.setOldmeterid();
+                //tRemoteCustomer.setUsercode();//客户编码
+                //tRemoteCustomer.setExtenddata1();
+                //tRemoteCustomer.setExtenddata2();
+                //tRemoteCustomer.setExtenddata3();
+                //tRemoteCustomer.setOldmeteraddr();
+                //tRemoteCustomer.setValveflag();
+                //tRemoteCustomer.setId();
+                tRemoteCustomerMapper.insertSelective(tRemoteCustomer);
+                count.incrementAndGet();
+            }
+            log.info("=======================end list size="+list.size()+"-count="+count.get());
+        }
+    }
 }

meter-reading-system/src/main/java/com/zcxk/meterreadingsystemv2/service/impl/MeterReadServiceImpl.java

@@ -5,6 +5,7 @@ import com.zcxk.meterreadingsystemv2.dao.YcblhbMapper;
 import com.zcxk.meterreadingsystemv2.dbs.DynamicDataSource;
 import com.zcxk.meterreadingsystemv2.dbs.DynamicDataSourceContextHolder;
 import com.zcxk.meterreadingsystemv2.dbs.SwitchDB;
+import com.zcxk.meterreadingsystemv2.entity.InstallList;
 import com.zcxk.meterreadingsystemv2.entity.MeterReadData;
 import com.zcxk.meterreadingsystemv2.entity.Ycblhb;
 import com.zcxk.meterreadingsystemv2.service.MeterReadService;
@@ -92,4 +93,1146 @@ public class MeterReadServiceImpl implements MeterReadService {
         query.with(Sort.by(Sort.Order.desc("readDate")));
         return  mongoTemplate.find(query, MeterReadRecord.class);
     }
+
+    @Override
+    public void test() {
+        List<String> list = newArrayList("00000190294854",
+                "00000190295120",
+                "00000190294277",
+                "00000190294466",
+                "00000190295182",
+                "00000190294125",
+                "00000190265459",
+                "00000190294159",
+                "00000190294987",
+                "00000190294233",
+                "00000190294527",
+                "00000190294492",
+                "00000190294317",
+                "00000190294803",
+                "00000190294067",
+                "00000190294382",
+                "00000190295184",
+                "00000190280092",
+                "00000190295015",
+                "00000190295057",
+                "00000190295204",
+                "00000190265344",
+                "00000190295178",
+                "00000190295121",
+                "00000190294142",
+                "00000190295034",
+                "00000190295129",
+                "00000190294976",
+                "00000190295122",
+                "00000190294999",
+                "00000190265467",
+                "00000190294554",
+                "00000190295165",
+                "00000190294138",
+                "00000190294546",
+                "00000190294558",
+                "00000190294923",
+                "00000190294662",
+                "00000190294539",
+                "00000190294192",
+                "00000190294201",
+                "00000190295189",
+                "00000190294229",
+                "00000190294431",
+                "00000190294239",
+                "00000190242394",
+                "00000190294076",
+                "00000190280071",
+                "00000190295110",
+                "00000190295176",
+                "00000190265457",
+                "00000190294555",
+                "00000190295133",
+                "00000190294566",
+                "00000190295187",
+                "00000190265239",
+                "00000190294374",
+                "00000190294109",
+                "00000190295034",
+                "00000190294578",
+                "00000190294548",
+                "00000190294263",
+                "00000190294538",
+                "00000190294668",
+                "00000190294144",
+                "00000190294815",
+                "00000190294470",
+                "00000190294463",
+                "00000190294060",
+                "00000190294212",
+                "00000190280062",
+                "00000190295054",
+                "00000190294294",
+                "00000190280158",
+                "00000190295001",
+                "00000190265373",
+                "00000190295004",
+                "00000190294314",
+                "00000190294875",
+                "00000190295058",
+                "00000190295106",
+                "00000190294135",
+                "00000190294905",
+                "00000190295033",
+                "00000190294632",
+                "00000190294339",
+                "00000190295068",
+                "00000190294045",
+                "00000190294063",
+                "00000190294102",
+                "00000190294297",
+                "00000190294531",
+                "00000190294465",
+                "00000190294591",
+                "00000190294351",
+                "00000190294521",
+                "00000190295109",
+                "00000190294119",
+                "00000190294024",
+                "00000190265241",
+                "00000190295061",
+                "00000190295146",
+                "00000190294418",
+                "00000190294464",
+                "00000190242370",
+                "00000190265506",
+                "00000190294089",
+                "00000190294498",
+                "00000190294406",
+                "00000190265572",
+                "00000190294994",
+                "00000190295164",
+                "00000190294411",
+                "00000190294806",
+                "00000190265550",
+                "00000190294545",
+                "00000190294300",
+                "00000190265112",
+                "00000190294532",
+                "00000190294612",
+                "00000190295119",
+                "00000190295036",
+                "00000190294570",
+                "00000190294199",
+                "00000190294332",
+                "00000190294452",
+                "00000190294608",
+                "00000190295114",
+                "00000190295132",
+                "00000190265205",
+                "00000190294584",
+                "00000190295006",
+                "00000190294924",
+                "00000190265216",
+                "00000190280111",
+                "00000190295154",
+                "00000190295065",
+                "00000190294251",
+                "00000190265538",
+                "00000190294499",
+                "00000190294821",
+                "00000190265476",
+                "00000190294106",
+                "00000190294165",
+                "00000190294215",
+                "00000190294252",
+                "00000190295153",
+                "00000190294443",
+                "00000190265487",
+                "00000190294639",
+                "00000190294377",
+                "00000190294617",
+                "00000190295013",
+                "00000190265454",
+                "00000190294962",
+                "00000190294336",
+                "00000190295042",
+                "00000190294242",
+                "00000190294830",
+                "00000190294611",
+                "00000190280256",
+                "00000190294814",
+                "00000200029109",
+                "00000190294762",
+                "00000190294519",
+                "00000190294446",
+                "00000190294542",
+                "00000190294091",
+                "00000190294143",
+                "00000190280067",
+                "00000190280075",
+                "00000190294313",
+                "00000190295140",
+                "00000190294565",
+                "00000190294243",
+                "00000190294851",
+                "00000190294337",
+                "00000190295127",
+                "00000190294557",
+                "00000190265510",
+                "00000190294602",
+                "00000190295174",
+                "00000190285548",
+                "00000190265463",
+                "00000190265504",
+                "00000190265448",
+                "00000190294899",
+                "00000190280568",
+                "00000190294567",
+                "00000190295190",
+                "00000190294260",
+                "00000190294696",
+                "00000190294490",
+                "00000190294180",
+                "00000190294191",
+                "00000190294335",
+                "00000190294646",
+                "00000190294619",
+                "00000190295149",
+                "00000190295090",
+                "00000190294098",
+                "00000190294884",
+                "00000190295055",
+                "00000180280059",
+                "00000294456",
+                "00000190265465",
+                "00000190265201",
+                "00000190294074",
+                "00000190294168",
+                "00000190280140",
+                "00000190294502",
+                "00000190295126",
+                "00000190265547",
+                "00000190294350",
+                "00000190294489",
+                "00000190294901",
+                "00000190294123",
+                "00000190242424",
+                "00000190295169",
+                "00000190294209",
+                "00000190294981",
+                "00000190294789",
+                "00000190294103",
+                "00000190280060",
+                "00000190294614",
+                "00000190294046",
+                "00000190294097",
+                "00000190242385",
+                "00000190265499",
+                "00000190295192",
+                "00000190295032",
+                "00000190294256",
+                "00000190294081",
+                "00000190294070",
+                "00000190294218",
+                "00000190294388",
+                "00000190294985",
+                "00000190295098",
+                "00000190294618",
+                "00000190294844",
+                "00000190294247",
+                "00000190294310",
+                "00000190295039",
+                "00000190209417",
+                "00000190294334",
+                "00000190280074",
+                "00000190265446",
+                "00000190295195",
+                "00000190265480",
+                "00000190294161",
+                "00000190295197",
+                "00000190294248",
+                "00000190294384",
+                "00000190295075",
+                "00000190295041",
+                "00000190265561",
+                "00000190295012",
+                "00000190294444",
+                "00000190280567",
+                "00000190294171",
+                "00000190242106",
+                "00000190294858",
+                "00000190294997",
+                "00000190294811",
+                "00000190294967",
+                "00000190294230",
+                "00000190295018",
+                "00000190265581",
+                "00000190294386",
+                "00000190294810",
+                "00000190294718",
+                "00000190294712",
+                "00000190295074",
+                "00000190294723",
+                "00000190295191",
+                "00000190294834",
+                "00000190294447",
+                "00000190294919",
+                "00000190295205",
+                "00000190294259",
+                "00000190295183",
+                "00000190294893",
+                "00000190265552",
+                "00000190295139",
+                "00000190265569",
+                "00000190295031",
+                "00000190265521",
+                "00000190294573",
+                "00000190295188",
+                "00000190294417",
+                "00000190294177",
+                "00000190294127",
+                "00000190294281",
+                "00000190265567",
+                "00000190294965",
+                "00000190295000",
+                "00000190295070",
+                "00000190265475",
+                "00000190294082",
+                "00000190294164",
+                "00000190265212",
+                "00000190265249",
+                "00000190294313",
+                "00000190265513",
+                "00000190294092",
+                "00000190294126",
+                "00000190295207",
+                "00000190294725",
+                "00000190294435",
+                "00000190294301",
+                "00000190294187",
+                "00000190294150",
+                "00000190265495",
+                "00000190294512",
+                "00000190295077",
+                "00000190265509",
+                "00000190265526",
+                "00000190265539",
+                "00000190294424",
+                "00000190242188",
+                "00000190294267",
+                "00000190294217",
+                "00000190294341",
+                "00000190294807",
+                "00000190294323",
+                "00000190294422",
+                "00000190295080",
+                "00000190294083",
+                "00000190295156",
+                "00000190295156",
+                "00000190294436",
+                "00000190294072",
+                "00000190294942",
+                "00000190294064",
+                "00000190294621",
+                "00000190294147",
+                "00000190294399",
+                "00000190294953",
+                "00000190294778",
+                "00000190294796",
+                "00000190294975",
+                "00000190294955",
+                "00000190294933",
+                "00000190295170",
+                "00000190294128",
+                "00000190294864",
+                "00000190265469",
+                "00000190295021",
+                "00000190294121",
+                "00000190294318",
+                "00000190294214",
+                "00000190294299",
+                "00000190295123",
+                "00000190265442",
+                "00000190294375",
+                "00000190295072",
+                "00000190294859",
+                "00000190294989",
+                "00000190294629",
+                "00000190265503",
+                "00000190265554",
+                "00000190294474",
+                "00000190295141",
+                "00000190265505",
+                "00000190295181",
+                "00000190294359",
+                "00000190295564",
+                "00000190295447",
+                "00000190294315",
+                "00000190294355",
+                "00000190265489",
+                "00000190294808",
+                "00000190265515",
+                "00000190294928",
+                "00000190294856",
+                "00000190265443",
+                "00000190265575",
+                "00000190294879",
+                "0000019026552",
+                "00000190294863",
+                "00000190294978",
+                "00000190294601",
+                "00000190294051",
+                "00000190265250",
+                "00000190265508",
+                "00000190294211",
+                "00000190294158",
+                "00000190295027",
+                "00000190294501",
+                "00000190265468",
+                "00000190294188",
+                "00000190294692",
+                "00000190295103",
+                "00000190295151",
+                "00000190294052",
+                "00000190295150",
+                "00000190294306",
+                "00000190294627",
+                "00000190265511",
+                "00000190294316",
+                "00000190294520",
+                "00000190294915",
+                "00000190294870",
+                "00000190294925",
+                "00000190294750",
+                "00000190294496",
+                "00000190295097",
+                "00000190265483",
+                "00000190265458",
+                "00000190294472",
+                "00000190294421",
+                "00000190265558",
+                "00000190294285",
+                "00000190265542",
+                "00000190294610",
+                "00000190294832",
+                "00000190294788",
+                "00000190294813",
+                "00000190295005",
+                "00000190294182",
+                "00000190265560",
+                "00000190265555",
+                "00000190294904",
+                "00000190295147",
+                "00000190294116",
+                "00000190265570",
+                "00000190294761",
+                "00000190294638",
+                "00000190294282",
+                "00000190265438",
+                "00000190294529",
+                "00000190294571",
+                "00000190294273",
+                "00000190295168",
+                "00000190294420",
+                "00000190265536",
+                "00000190294993",
+                "00000190265456",
+                "00000190294368",
+                "00000190294292",
+                "00000190294366",
+                "00000190265568",
+                "00000190294208",
+                "00000190294929",
+                "00000190294148",
+                "00000190294235",
+                "00000190294849",
+                "00000190294402",
+                "00000190265520",
+                "00000190295113",
+                "00000190265579",
+                "00000190294600",
+                "00000190294342",
+                "00000190265436",
+                "00000190294124",
+                "00000190265525",
+                "00000190294564",
+                "00000190265530",
+                "00000190294822",
+                "00000190294973",
+                "00000190295138",
+                "00000190294222",
+                "00000190294487",
+                "00000190294944",
+                "00000190295115",
+                "00000190294493",
+                "00000190294174",
+                "00000190294799",
+                "00000190294370",
+                "00000190295200",
+                "00000190294896",
+                "00000190295130",
+                "00000190295101",
+                "00000190294387",
+                "00000190294628",
+                "00000190294477",
+                "00000190294139",
+                "00000190294969",
+                "00000190265481",
+                "00000190294088",
+                "00000190265444",
+                "00000190294061",
+                "00000190295161",
+                "00000190294726",
+                "00000190294964",
+                "00000190294941",
+                "00000190294836",
+                "00000190294577",
+                "00000190294024",
+                "00000190294438",
+                "00000190294114",
+                "00000190294441",
+                "00000190294838",
+                "00000190294190",
+                "00000190294809",
+                "00000190294552",
+                "00000190294881",
+                "00000190295086",
+                "00000190294401",
+                "00000190265531",
+                "00000190290114",
+                "00000190294642",
+                "00000190295142",
+                "00000190294302",
+                "00000190294296",
+                "00000190294220",
+                "00000190294137",
+                "00000190295003",
+                "00000190295082",
+                "00000190294903",
+                "00000190294044",
+                "00000190294107",
+                "00000190295144",
+                "00000190294900",
+                "00000190294880",
+                "00000190294902",
+                "00000190242400",
+                "00000190295143",
+                "00000190295196",
+                "00000190294303",
+                "00000190294353",
+                "00000190294133",
+                "00000190294950",
+                "00000190294268",
+                "000001902941912",
+                "00000190294245",
+                "00000190265472",
+                "00000190294141",
+                "00000190294261",
+                "00000190294580",
+                "00000190295016",
+                "00000190295062",
+                "00000190294054",
+                "00000190265321",
+                "00000190294914",
+                "00000190294827",
+                "00000190294737",
+                "00000190294100",
+                "00000190294797",
+                "00000190294829",
+                "00000190265476",
+                "00000190294724",
+                "00000190295038",
+                "00000190294848",
+                "00000190295135",
+                "00000190294559",
+                "00000190294320",
+                "00000190294819",
+                "00000190294461",
+                "00000190294122",
+                "00000190294494",
+                "00000190294982",
+                "00000190265516",
+                "00000190294961",
+                "00000190294244",
+                "00000190294959",
+                "00000190294855",
+                "00000190294110",
+                "00000190294293",
+                "00000190265544",
+                "00000190294238",
+                "00000190294304",
+                "00000190294733",
+                "00000190294269",
+                "00000190265559",
+                "00000190265518",
+                "00000190294288",
+                "00000190294541",
+                "00000190294152",
+                "00000190297425",
+                "00000190294237",
+                "0000019265488",
+                "00000190294624",
+                "00000190294345",
+                "00000190294193",
+                "00000190294568",
+                "00000190294202",
+                "00000190294544",
+                "00000190294224",
+                "00000190294101",
+                "00000190294162",
+                "00000190294984",
+                "00000190265571",
+                "00000190294537",
+                "00000190294163",
+                "00000190294094",
+                "00000190294395",
+                "00000190294131",
+                "00000190294093",
+                "00000190295087",
+                "00000190294151",
+                "00000190294891",
+                "00000190294708",
+                "00000190294195",
+                "00000190294333",
+                "00000190280093",
+                "00000190294488",
+                "00000190294047",
+                "00000190294560",
+                "00000190294287",
+                "00000190294586",
+                "00000190294309",
+                "00000190294311",
+                "00000190294604",
+                "00000190294236",
+                "00000190294636",
+                "00000190295203",
+                "00000190294828",
+                "00000190294783",
+                "00000190265534",
+                "00000190294946",
+                "00000190294367",
+                "00000190294549",
+                "00000190294872",
+                "00000190294308",
+                "00000190294298",
+                "00000190294189",
+                "00000190294480",
+                "00000190294379",
+                "00000190294280",
+                "00000190265514",
+                "00000190294974",
+                "00000190294069",
+                "00000190294205",
+                "00000190294373",
+                "00000190294459",
+                "00000190294990",
+                "00000190265493",
+                "00000190294050",
+                "00000190294645",
+                "00000190294096",
+                "00000190265439",
+                "00000190294140",
+                "00000190265566",
+                "00000190294473",
+                "00000190294818",
+                "00000190294745",
+                "00000190294623",
+                "00000200029182",
+                "00000190294085",
+                "00000190294736",
+                "00000190294357",
+                "00000190295017",
+                "00000190294510",
+                "00000190294585",
+                "00000190294647",
+                "00000190294348",
+                "00000190294079",
+                "00000190294049",
+                "00000190294416",
+                "00000190294877",
+                "00000190294250",
+                "00000190294515",
+                "00000190294084",
+                "00000190294883",
+                "00000190294392",
+                "00000190294360",
+                "00000190294185",
+                "00000190294120",
+                "00000190294592",
+                "00000190265461",
+                "00000190294845",
+                "00000190294911",
+                "00000190295045",
+                "00000190294857",
+                "00000190294457",
+                "00000190294346",
+                "00000190294895",
+                "00000190265437",
+                "00000190294053",
+                "00000190294068",
+                "00000190265486",
+                "00000190294495",
+                "00000190294289",
+                "00000190294266",
+                "00000190294216",
+                "00000190294971",
+                "00000190294365",
+                "00000190294556",
+                "00000190294579",
+                "00000190294227",
+                "00000190295019",
+                "00000190294823",
+                "00000190294398",
+                "00000190294434",
+                "00000190294440",
+                "00000190294526",
+                "00000190265563",
+                "00000190265574",
+                "00000190294616",
+                "00000190295102",
+                "00000190294630",
+                "00000190294784",
+                "00000190295030",
+                "00000190294105",
+                "00000190294800",
+                "00000190295172",
+                "00000190265496",
+                "00000190294603",
+                "00000190294963",
+                "00000190295028",
+                "00000190265573",
+                "00000190294536",
+                "00000190294111",
+                "00000190294467",
+                "00000190294977",
+                "00000190294897",
+                "00000190295099",
+                "00000190294598",
+                "00000190294835",
+                "00000190294169",
+                "00000190294506",
+                "00000190295112",
+                "00000190294562",
+                "00000190294595",
+                "00000190294113",
+                "00000190265553",
+                "00000190294983",
+                "00000190295028",
+                "00000190295020",
+                "00000190265474",
+                "00000190295037",
+                "00000190294071",
+                "00000190295083",
+                "00000190294479",
+                "00000190294132",
+                "00000190294852",
+                "00000190294058",
+                "00000190265578",
+                "00000190294921",
+                "00000190265471",
+                "00000190294513",
+                "00000190294200",
+                "00000190294172",
+                "00000190265450",
+                "00000190294516",
+                "00000190294804",
+                "00000190294448",
+                "00000190265580",
+                "00000190294354",
+                "00000190294593",
+                "00000190294325",
+                "00000190295040",
+                "00000190294065",
+                "00000190265492",
+                "00000190294157",
+                "00000190294265",
+                "00000190265565",
+                "00000190294284",
+                "00000190294641",
+                "00000190294871",
+                "00000190294523",
+                "00000190294364",
+                "00000190294062",
+                "00000190295186",
+                "00000190295093",
+                "00000190294701",
+                "00000190294272",
+                "00000190294770",
+                "00000190294594",
+                "00000190294576",
+                "00000190265466",
+                "00000190294055",
+                "00000190294134",
+                "00000190294792",
+                "00000190265517",
+                "00000190294846",
+                "00000190294511",
+                "00000190294547",
+                "00000190265464",
+                "00000190295180",
+                "00000190294620",
+                "00000190295024",
+                "00000190295066",
+                "00000190295048",
+                "0000019294352",
+                "00000190280230",
+                "00000190294403",
+                "00000190294206",
+                "00000190294644",
+                "00000190294427",
+                "00000190294372",
+                "00000190294631",
+                "00000190294945",
+                "00000190294429",
+                "00000190265529",
+                "00000190295081",
+                "00000190295056",
+                "00000190294910",
+                "00000190294099",
+                "00000190294518",
+                "00000190294497",
+                "00000190294599",
+                "00000190294371",
+                "00000190265507",
+                "00000190294407",
+                "00000190294626",
+                "00000190294307",
+                "00000190294231",
+                "00000190294968",
+                "00000190280134",
+                "00000190294153",
+                "00000190265482",
+                "00000190294455",
+                "00000190265524",
+                "00000190242182",
+                "00000190265532",
+                "00000190265562",
+                "00000190280089",
+                "00000190294400",
+                "00000190294271",
+                "00000190280133",
+                "00000190294291",
+                "00000190294482",
+                "00000190294156",
+                "00000190294960",
+                "00000190295118",
+                "00000190294482",
+                "00000190294839",
+                "00000190265470",
+                "00000190294225",
+                "00000190294643",
+                "00000190294167",
+                "00000190294326",
+                "00000190265462",
+                "00000190294219",
+                "00000190294421",
+                "00000190294588",
+                "00000190294090",
+                "00000190294380",
+                "00000190294154",
+                "00000190294583",
+                "00000190265551",
+                "00000190294328",
+                "00000190265242",
+                "00000190294391",
+                "00000190294312",
+                "00000190294260",
+                "00000190294338",
+                "00000190265491",
+                "00000190280129",
+                "00000190265395",
+                "00000190294262",
+                "00000190265453",
+                "00000190295052",
+                "00000190295025",
+                "00000190295069",
+                "00000190294948",
+                "00000190294918",
+                "00000190265308",
+                "00000190294115",
+                "00000190294478",
+                "00000190294104",
+                "00000190294197",
+                "00000190294186",
+                "00000190294275",
+                "00000190294433",
+                "00000190294442",
+                "00000190294430",
+                "00000190294361",
+                "00000190294129",
+                "00000190294530",
+                "00000190294597",
+                "00000190294596",
+                "00000190294491",
+                "00000190294986",
+                "00000190265256",
+                "00000190295108",
+                "00000190294078",
+                "00000190294118",
+                "00000190294751",
+                "00000190294817",
+                "00000190294073",
+                "00000190294389",
+                "00000190294066",
+                "00000190295145",
+                "00000190294428",
+                "00000190294450",
+                "00000190294056",
+                "00000190294322",
+                "00000190294485",
+                "00000190294917",
+                "00000190294405",
+                "00000190294181",
+                "00000190294381",
+                "00000190294563",
+                "00000190294276",
+                "00000190265484",
+                "00000190294587",
+                "00000190294240",
+                "00000190295160",
+                "00000190294086",
+                "00000190280104",
+                "00000190295084",
+                "00000190294067",
+                "00000190265549",
+                "00000190295053",
+                "00000190265490",
+                "00000190294166",
+                "00000190294550",
+                "00000190294569",
+                "00000190295177",
+                "00000190294637",
+                "00000190294075",
+                "00000190294890",
+                "00000190294500",
+                "00000190294581",
+                "00000200029196",
+                "00000190294609",
+                "00000190294223",
+                "00000190294178",
+                "00000190294324",
+                "00000190294041",
+                "00000190294415",
+                "00000190294635",
+                "00000190294437",
+                "00000190294176",
+                "00000190265441",
+                "00000190294258",
+                "00000190294257",
+                "00000190294468",
+                "00000190294228",
+                "00000190265237",
+                "00000190295002",
+                "00000190294615",
+                "00000190294916",
+                "00000190294077",
+                "00000190295166",
+                "00000190295095",
+                "00000190295162",
+                "00000190295171",
+                "00000190294319",
+                "00000190265217",
+                "00000190294873",
+                "00000190294136",
+                "00000190295008",
+                "00000190294409",
+                "00000190295011",
+                "00000190294279",
+                "00000190294087",
+                "00000190294108",
+                "00000190265485",
+                "00000190294996",
+                "00000190294553",
+                "00000190294471",
+                "00000190295152",
+                "00000190295128",
+                "00000190295211",
+                "00000190295212",
+                "00000190294369",
+                "00000190294183",
+                "00000190294175",
+                "00000190265451",
+                "00000190294991",
+                "00000190294439",
+                "00000190295199",
+                "00000190295046",
+                "00000190265541",
+                "00000190265497",
+                "00000190242104",
+                "00000190294906",
+                "00000190294590",
+                "00000190265523",
+                "00000190294947",
+                "00000190265449",
+                "00000190265252",
+                "00000190294771",
+                "00000190294080",
+                "00000190265452",
+                "00000190265502",
+                "00000190295134",
+                "00000190265445",
+                "00000190294816",
+                "00000190265576",
+                "00000190265479",
+                "00000190294956",
+                "00000190294179",
+                "00000190294826",
+                "00000190295009",
+                "00000200029221",
+                "00000190294777",
+                "00000190265546",
+                "00000190294475",
+                "00000190294451",
+                "00000190265556",
+                "00000190294393",
+                "00000190294376",
+                "00000190294254",
+                "00000190294378",
+                "00000190265533",
+                "00000190294876",
+                "00000190295158",
+                "00000200029153",
+                "00000190294514",
+                "00000190294841",
+                "00000190294486",
+                "00000190295116",
+                "00000190295155",
+                "00000190294432",
+                "00000190294768",
+                "00000190294145",
+                "00000190294155",
+                "00000190294290",
+                "00000190294198",
+                "00000190294983",
+                "00000190294347",
+                "00000190295148",
+                "00000190280150",
+                "00000190294882",
+                "00000190294517",
+                "00000190294095",
+                "00000190294329",
+                "00000190294469",
+                "00000190295088",
+                "00000190294207",
+                "00000190294356",
+                "00000190294048",
+                "00000190265244",
+                "00000190295198",
+                "00000190294394",
+                "00000190295194",
+                "00000190295210",
+                "00000190295167",
+                "00000190294927",
+                "00000190280190",
+                "00000190265460",
+                "00000190295060",
+                "00000190295163",
+                "00000190294445",
+                "00000190295209",
+                "00000190294423",
+                "00000190265527",
+                "00000190294194",
+                "00000190294057",
+                "00000190294847",
+                "00000190295100",
+                "00000190294551",
+                "00000190294972",
+                "00000190295179",
+                "00000190295107",
+                "00000190295044",
+                "00000190295092",
+                "00000190295111",
+                "00000190294507",
+                "00000190290082",
+                "00000190294225",
+                "00000190295125",
+                "00000190294522",
+                "00000190295014",
+                "00000190265535",
+                "00000190294922",
+                "00000190295131",
+                "00000190294274",
+                "00000190294508",
+                "00000190295096",
+                "00000190294898",
+                "00000190265477",
+                "00000190294112",
+                "00000190295035",
+                "00000190294340",
+                "00000190294173",
+                "00000190294934",
+                "00000190295202",
+                "00000190294936",
+                "00000190295173",
+                "00000190294995",
+                "00000190294130",
+                "00000190295179",
+                "00000190294397",
+                "00000190294385",
+                "00000190294833",
+                "00000190294426",
+                "00000190295104",
+                "00000190294279",
+                "00000190294184",
+                "00000190295063",
+                "00000190265498",
+                "00000190294589",
+                "00000190265455",
+                "00000190294484",
+                "00000190294841",
+                "00000190295175",
+                "00000190295201",
+                "00000190295193",
+                "00000190280566",
+                "00000190294865",
+                "00000190294543",
+                "00000190294327",
+                "00000190294404",
+                "00000190294988",
+                "00000190295157",
+                "00000190294449",
+                "00000190294059",
+                "00000190294742",
+                "00000190294203",
+                "00000190294344",
+                "00000190294358",
+                "00000190294419",
+                "00000190294793",
+                "00000190294234",
+                "00000190265537",
+                "00000190295137",
+                "00000190295124",
+                "00000190294752",
+                "00000190265577",
+                "00000190294453",
+                "00000190294561",
+                "00000190265540",
+                "00000190294575",
+                "00000190242441",
+                "00000190242511",
+                "00000190242145",
+                "00000190242420",
+                "00000190242208",
+                "00000190242122",
+                "00000190242267",
+                "00000190242501"
+                );
+
+        DynamicDataSourceContextHolder.setDataSourceKey("smart-city");
+        List<String> stringList = newArrayList();
+        List<String> stringList1 = newArrayList();
+        for (String s : list) {
+            try {
+                InstallList installList = deviceDataDimMapper.getTest(s);
+                if (installList == null) {
+                    stringList.add(s);
+                }
+            }catch (Exception e){
+                stringList1.add(s);
+                System.out.println("=============错误："+s);
+            }
+
+
+        }
+        System.out.println("============="+stringList);
+        System.out.println("============="+stringList1);
+        System.out.println("完成");
+    }
 }

meter-reading-system/src/main/resources/application.properties

@@ -1,2 +1,2 @@
 #开发环境：dev  测试环境：sit  线上环境：prd  演示环境：uat
-spring.profiles.active=dev
+spring.profiles.active=prd

meter-reading-system/src/main/resources/mapper/DeviceDataDimMapper.xml

@@ -76,5 +76,9 @@
         sc_device d
         WHERE d.`status` = 1 and d.sys_id != -99 and d.building_id in (SELECT building_id FROM sc_device WHERE status = 1 and customer_id = #{customerId} and sys_id != -99 GROUP BY building_id )
     </select>
+
+    <select id="getTest" resultType="com.zcxk.meterreadingsystemv2.entity.InstallList">
+        select id,device_no,electronic_no from sc_install_list where status = 1 and electronic_no = #{s}
+    </select>
 </mapper>
 

meter-reading-system/src/main/resources/mapper/DeviceMapper.xml

@@ -18,5 +18,41 @@
         <if test="communityId != null"> and b.community = #{communityId}</if>
         <if test="buildingId != null"> and sd.building_id = #{buildingId}</if>
     </select>
+
+    <select id="getDeviceCustomerInfoByCustomerId" resultType="com.zcxk.meterreadingsystemv2.dto.DeviceCustomerInfo">
+        select
+        sd.id as device_id,
+        sd.device_no as device_no,
+        sd.water_meter_no,
+        sd.loc_desc  as location,
+        sil.user_name,
+        sil.user_phone,
+        sil.id_card,
+        sil.install_time
+        from sc_device sd
+        left join sc_install_list sil on (sil.device_id = sd.id and sil.status = 1)
+        where sd.status = 1
+        <if test="customerId != null"> and sd.customer_id = #{customerId}</if>
+        and sd.water_meter_no not in('00000190294024',
+        '00000190265476',
+        '00000190294879',
+        '00000190294421',
+        '00000190295101',
+        '00000190294024',
+        '00000190265476',
+        '00000190294185',
+        '00000190294857',
+        '00000190295028',
+        '00000190294983',
+        '00000190295028',
+        '00000190294225',
+        '00000190294421',
+        '00000190294262',
+        '00000190294609',
+        '00000190294279',
+        '00000190294983',
+        '00000190294225',
+        '00000190294279')
+    </select>
 </mapper>
 

meter-reading-system/src/main/resources/mapper/TRemoteCustomerMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.zcxk.meterreadingsystemv2.dao.TRemoteCustomerMapper">
   <resultMap id="BaseResultMap" type="com.zcxk.meterreadingsystemv2.entity.TRemoteCustomer">
     <!--@mbg.generated-->
+    <!--@Table tRemote_customer-->
     <result column="FactoryId" property="factoryid" />
     <result column="MeterAddr" property="meteraddr" />
     <result column="MeterId" property="meterid" />
@@ -25,6 +26,12 @@
     <result column="ValveFlag" property="valveflag" />
     <result column="id" property="id" />
   </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    FactoryId, MeterAddr, MeterId, UserName, Linkman, Phone, PaperNo, Address, Caliber, 
+    InstallDate, IfCtrlValve, Remark, Imported, OldMeterID, UserCode, ExtendData1, ExtendData2, 
+    ExtendData3, OldMeterAddr, ValveFlag, id
+  </sql>
   <insert id="insertSelective" parameterType="com.zcxk.meterreadingsystemv2.entity.TRemoteCustomer">
     <!--@mbg.generated-->
     insert into tRemote_customer
@@ -174,6 +181,29 @@
         #{item.valveflag}, #{item.id})
     </foreach>
   </insert>
+
+  <update id="updateByPrimaryKeySelective" parameterType="com.zcxk.meterreadingsystemv2.entity.TRemoteCustomer">
+    update tRemote_customer
+    <set>
+      <if test="username != null">
+        UserName = #{username},
+      </if>
+      <if test="linkman != null">
+        Linkman = #{linkman},
+      </if>
+      <if test="phone != null">
+        Phone = #{phone},
+      </if>
+      <if test="paperno != null">
+        PaperNo = #{paperno},
+      </if>
+      <if test="address != null">
+        Address = #{address},
+      </if>
+    </set>
+    where MeterAddr = #{meteraddr} and FactoryId = 5
+  </update>
+
     <select id="findByMeteraddr" resultMap="BaseResultMap">
       select * from tRemote_customer where MeterAddr = #{deviceNo}
     </select>