配置修改

meter-reading-sishui/read-sqlSever/pom.xml

@@ -84,10 +84,21 @@
             <groupId>org.quartz-scheduler</groupId>
             <artifactId>quartz</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.4</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>20.0</version>
+        </dependency>
     </dependencies>
 
     <build>

meter-reading-sishui/read-sqlSever/src/main/java/com/zcxk/config/QuartzManager.java

@@ -58,11 +58,23 @@ public class QuartzManager {
         JobKey jobKey = JobKey.jobKey(jobName, JOB_GROUP_NAME);
         try {
             Scheduler sched = gSchedulerFactory.getScheduler();
+
             sched.deleteJob(jobKey);
         } catch (SchedulerException e) {
             e.printStackTrace();
         }
     }
+    public static boolean checkExists(String jobName) {
+        JobKey jobKey = JobKey.jobKey(jobName, JOB_GROUP_NAME);
+        try {
+            Scheduler sched = gSchedulerFactory.getScheduler();
+
+            return sched.checkExists(jobKey);
+        } catch (SchedulerException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
 
     public static void main(String[] args) {
         QuartzManager.addJob("test", TestJob.class,"*/5 * * * * ?",new HashMap<>());

meter-reading-sishui/read-sqlSever/src/main/java/com/zcxk/config/SnowflakeIdWorker.java

@@ -0,0 +1,185 @@
+package com.zcxk.config;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Twitter_Snowflake<br>
+ * SnowFlake的结构如下(每部分用-分开):<br>
+ * 0 - 0000000000 0000000000 0000000000 0000000000 0 - 00000 - 00000 - 000000000000 <br>
+ * 1位标识，由于long基本类型在Java中是带符号的，最高位是符号位，正数是0，负数是1，所以id一般是正数，最高位是0<br>
+ * 41位时间截(毫秒级)，注意，41位时间截不是存储当前时间的时间截，而是存储时间截的差值（当前时间截 - 开始时间截)
+ * 得到的值），这里的的开始时间截，一般是我们的id生成器开始使用的时间，由我们程序来指定的（如下下面程序IdWorker类的startTime属性）。41位的时间截，可以使用69年，年T = (1L << 41) / (1000L * 60 * 60 * 24 * 365) = 69<br>
+ * 10位的数据机器位，可以部署在1024个节点，包括5位datacenterId和5位workerId<br>
+ * 12位序列，毫秒内的计数，12位的计数顺序号支持每个节点每毫秒(同一机器，同一时间截)产生4096个ID序号<br>
+ * 加起来刚好64位，为一个Long型。<br>
+ * SnowFlake的优点是，整体上按照时间自增排序，并且整个分布式系统内不会产生ID碰撞(由数据中心ID和机器ID作区分)，并且效率较高，经测试，SnowFlake每秒能够产生26万ID左右。
+ */
+public class SnowflakeIdWorker {
+
+    // ==============================Fields===========================================
+    /**
+     * 开始时间截 (2015-01-01)
+     */
+    private final long twepoch = 1420041600000L;
+
+    /**
+     * 机器id所占的位数
+     */
+    private final long workerIdBits = 5L;
+
+    /**
+     * 数据标识id所占的位数
+     */
+    private final long datacenterIdBits = 5L;
+
+    /**
+     * 支持的最大机器id，结果是31 (这个移位算法可以很快的计算出几位二进制数所能表示的最大十进制数)
+     */
+    private final long maxWorkerId = -1L ^ (-1L << workerIdBits);
+
+    /**
+     * 支持的最大数据标识id，结果是31
+     */
+    private final long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);
+
+    /**
+     * 序列在id中占的位数
+     */
+    private final long sequenceBits = 12L;
+
+    /**
+     * 机器ID向左移12位
+     */
+    private final long workerIdShift = sequenceBits;
+
+    /**
+     * 数据标识id向左移17位(12+5)
+     */
+    private final long datacenterIdShift = sequenceBits + workerIdBits;
+
+    /**
+     * 时间截向左移22位(5+5+12)
+     */
+    private final long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits;
+
+    /**
+     * 生成序列的掩码，这里为4095 (0b111111111111=0xfff=4095)
+     */
+    private final long sequenceMask = -1L ^ (-1L << sequenceBits);
+
+    /**
+     * 工作机器ID(0~31)
+     */
+    private long workerId;
+
+    /**
+     * 数据中心ID(0~31)
+     */
+    private long datacenterId;
+
+    /**
+     * 毫秒内序列(0~4095)
+     */
+    private long sequence = 0L;
+
+    /**
+     * 上次生成ID的时间截
+     */
+    private long lastTimestamp = -1L;
+
+    //==============================Constructors=====================================
+
+    /**
+     * 构造函数
+     *
+     * @param workerId     工作ID (0~31)
+     * @param datacenterId 数据中心ID (0~31)
+     */
+    public SnowflakeIdWorker(long workerId, long datacenterId) {
+        if (workerId > maxWorkerId || workerId < 0) {
+            throw new IllegalArgumentException(String.format("worker Id can't be greater than %d or less than 0", maxWorkerId));
+        }
+        if (datacenterId > maxDatacenterId || datacenterId < 0) {
+            throw new IllegalArgumentException(String.format("datacenter Id can't be greater than %d or less than 0", maxDatacenterId));
+        }
+        this.workerId = workerId;
+        this.datacenterId = datacenterId;
+    }
+
+    // ==============================Methods==========================================
+
+    /**
+     * 获得下一个ID (该方法是线程安全的)
+     *
+     * @return SnowflakeId
+     */
+    public synchronized long nextId() {
+        long timestamp = timeGen();
+
+        //如果当前时间小于上一次ID生成的时间戳，说明系统时钟回退过这个时候应当抛出异常
+        if (timestamp < lastTimestamp) {
+            throw new RuntimeException(
+                    String.format("Clock moved backwards.  Refusing to generate id for %d milliseconds", lastTimestamp - timestamp));
+        }
+
+        //如果是同一时间生成的，则进行毫秒内序列
+        if (lastTimestamp == timestamp) {
+            sequence = (sequence + 1) & sequenceMask;
+            //毫秒内序列溢出
+            if (sequence == 0) {
+                //阻塞到下一个毫秒,获得新的时间戳
+                timestamp = tilNextMillis(lastTimestamp);
+            }
+        }
+        //时间戳改变，毫秒内序列重置
+        else {
+            sequence = 0L;
+        }
+
+        //上次生成ID的时间截
+        lastTimestamp = timestamp;
+
+        //移位并通过或运算拼到一起组成64位的ID
+        return ((timestamp - twepoch) << timestampLeftShift) //
+                | (datacenterId << datacenterIdShift) //
+                | (workerId << workerIdShift) //
+                | sequence;
+    }
+
+    /**
+     * 阻塞到下一个毫秒，直到获得新的时间戳
+     *
+     * @param lastTimestamp 上次生成ID的时间截
+     * @return 当前时间戳
+     */
+    protected long tilNextMillis(long lastTimestamp) {
+        long timestamp = timeGen();
+        while (timestamp <= lastTimestamp) {
+            timestamp = timeGen();
+        }
+        return timestamp;
+    }
+
+    /**
+     * 返回以毫秒为单位的当前时间
+     *
+     * @return 当前时间(毫秒)
+     */
+    protected long timeGen() {
+        return System.currentTimeMillis();
+    }
+
+    //==============================Test=============================================
+
+    /**
+     * 测试
+     */
+    public static void main(String[] args) {
+        SnowflakeIdWorker idWorker = new SnowflakeIdWorker(0, 0);
+        for (int i = 0; i < 5; i++) {
+            long id = idWorker.nextId();
+            System.out.println(id);
+        }
+    }
+}

meter-reading-sishui/read-sqlSever/src/main/java/com/zcxk/controller/DemoController.java

@@ -1,19 +1,18 @@
 package com.zcxk.controller;
 
+import com.google.common.collect.Sets;
+import com.zcxk.config.SnowflakeIdWorker;
 import com.zcxk.dao.mysql.SendDao;
 import com.zcxk.dao.sqlserver.ReceiveDao;
-import com.zcxk.entity.MeterDataEntity;
-import com.zcxk.entity.TaskEntity;
-import com.zcxk.entity.UploadWaterMeterDataEntity;
-import com.zcxk.entity.WaterMeterBaseEntity;
+import com.zcxk.entity.*;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @RestController
 public class DemoController {
@@ -21,14 +20,72 @@ public class DemoController {
     ReceiveDao receiveDao;
     @Autowired
     SendDao sendDao;
+    @Value("${customerId}")
+    Integer customerId;
+    @Value("${siteId}")
+    Integer siteId;
+    @Value("${sysId}")
+    Integer sysId;
+    @Value("${buildingId}")
+    Integer buildingId;
     @GetMapping("/getBaseInfo")
     public void countPlanDevice(Integer id){
 
         WaterMeterBaseEntity waterMeterBaseEntity=new WaterMeterBaseEntity();
+        SnowflakeIdWorker idWorker = new SnowflakeIdWorker(0, 0);
         waterMeterBaseEntity.setRegionId(id+"");
         List<Map<String, Object>> meterInfor = receiveDao.getMeterInfor(waterMeterBaseEntity);
+        Map<String,Object>args=new HashMap<>();
+        args.put("customerId",customerId);
+        Set<String> hasDeviceNos = sendDao.selectDevice(args);
+        List<DeviceType> deviceTypes = sendDao.selectDeviceType();
+        Map<String,DeviceType>mapDeviceType=new HashMap<>();
+        deviceTypes.forEach(deviceType -> {
+            mapDeviceType.put(deviceType.getModel(),deviceType);
+        });
+
+        Set<String> allDeviceNos=new HashSet<>();
+        meterInfor.forEach(map->{
+            String deviceNo=(String) map.get("releationId");
+            allDeviceNos.add(StringUtils.lowerCase(deviceNo));
+        });
+        Sets.SetView<String> difference = Sets.difference(allDeviceNos, hasDeviceNos);
+        for (String temp : difference) {
+            System.out.println(temp);
+        }
+        List<Device>needAddWaterMeter=new ArrayList<>();
+        meterInfor.forEach(map->{
+            String deviceNo=(String) map.get("releationId");
+            if(difference.contains(deviceNo)){
+                 Device device = new Device();
+                device.setId(idWorker.nextId());
+                device.setDeviceNo(StringUtils.lowerCase(deviceNo));
+                DeviceType deviceType = mapDeviceType.get(map.get("releationId"));
+                if(deviceType!=null){
+                    device.setDeviceType(deviceType.getDeviceType() );
+                    device.setManufacturerId(deviceType.getManufacturerId());
+                }
+                device.setSysId(sysId);
+                device.setSiteId(siteId);
+                device.setBuildingId(buildingId);
+                device.setLocDesc((String) map.get("address"));
+
+                device.setDeviceStatus(5+"");//未启用
+                device.setStatus(1);
+                device.setDateCreate(new Date());
+                device.setCreateBy("system");
+                device.setCustomerId(customerId);
+                device.setWaterMeterNo((String) map.get("meterNo"));
+                device.setRegisterStatus(0);
+                needAddWaterMeter.add(device);
+
+            }
+        });
+        if(needAddWaterMeter.size()>0){
+            sendDao.insertDeviceInfo(needAddWaterMeter);
+        }
+
 
-        System.out.println(meterInfor);
 
     }
     @GetMapping("/uploadData")
@@ -38,18 +95,33 @@ public class DemoController {
         uploadPlan.forEach(map->{
             TaskEntity taskEntity=new TaskEntity();
             taskEntity.setPlanId((String) map.get("PlanId"));
+
             receiveDao.creatUploadTask(taskEntity);
             if(taskEntity.getReturnCode()==1){
 
 
                try {
+                   Map<String,Object>args=new HashMap<>();
 
                    List<MeterDataEntity>datas=new ArrayList<>();
-                   MeterDataEntity meterDataEntity=new MeterDataEntity();
-                   meterDataEntity.setReleationId("MT72CDB3A8842D51BF85D8F1CBFA7454");
-                   meterDataEntity.setCurrentReading(12.05f);
-                   meterDataEntity.setCurrentReadDate("2021-01-05 12:15:16");
-                   datas.add(meterDataEntity);
+                   SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-dd-MM HH:mm:ss");
+                   String uplaodTime= (String) map.get("UploadTime");
+                   Date time=simpleDateFormat.parse(uplaodTime);
+                   Date needUploadTime=new Date(time.getTime()-24*3600*1000);
+                   SimpleDateFormat needUploadDateFormate=new SimpleDateFormat("yyyyddMM");
+                   int needUploadTimeDate = Integer.parseInt(needUploadDateFormate.format(needUploadTime));
+                   args.put("readDate",needUploadTimeDate);
+                   args.put("customerId",customerId);
+                   List<MeterReadRecord> meterReadRecords = sendDao.selectDeviceMeterReader(args);
+                   meterReadRecords.forEach(meterReadRecord -> {
+                       MeterDataEntity meterDataEntity=new MeterDataEntity();
+                       meterDataEntity.setReleationId(meterReadRecord.getDeviceNo());
+                       meterDataEntity.setCurrentReading(Float.parseFloat(meterReadRecord.getReadData()));
+                       meterDataEntity.setCurrentReadDate(simpleDateFormat.format(meterReadRecord.getReadTime()));
+                       datas.add(meterDataEntity);
+                   });
+
+
                    UploadWaterMeterDataEntity uploadWaterMeterDataEntity=new UploadWaterMeterDataEntity();
                    uploadWaterMeterDataEntity.setTaskId(taskEntity.getTaskId());
                    uploadWaterMeterDataEntity.setMeterData(datas);
@@ -63,4 +135,18 @@ public class DemoController {
 
         });
     }
+    public static void main(String[] args) {
+        Set<String> sets = Sets.newHashSet("1","2");
+        Set<String > sets2 = Sets.newHashSet("1");
+        // 交集
+
+        // 差集
+        System.out.println("差集为：");
+        Sets.SetView<String> diff = Sets.difference(sets, sets2);
+        for (String temp : diff) {
+            System.out.println(temp);
+        }
+
+    }
+
 }

meter-reading-sishui/read-sqlSever/src/main/java/com/zcxk/dao/mysql/SendDao.java

@@ -1,9 +1,21 @@
 package com.zcxk.dao.mysql;
 
+import com.zcxk.entity.Device;
+import com.zcxk.entity.DeviceType;
+import com.zcxk.entity.MeterReadRecord;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 
 @Mapper
 public interface SendDao {
-    public void selectOne();
+
+     Set<String> selectDevice(Map<String,Object> args);
+     List<DeviceType>selectDeviceType();
+     List<MeterReadRecord> selectDeviceMeterReader(Map<String,Object> args);
+
+     void insertDeviceInfo(List<Device>list);
 }

meter-reading-sishui/read-sqlSever/src/main/java/com/zcxk/entity/Device.java

@@ -0,0 +1,114 @@
+package com.zcxk.entity;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * (Device)实体类
+ *
+ * @author hym
+ * @since 2021-01-06 09:50:34
+ */
+@Data
+
+public class Device implements Serializable {
+    private static final long serialVersionUID = -72693685139645498L;
+   
+    private Long id;
+    
+    private String deviceNo;
+   
+    private Integer deviceType;
+    /**
+     * siteId
+     */
+
+    private Integer siteId;
+   
+    private Integer sysId;
+   
+    private Integer buildingId;
+    /**
+     * 建筑单元，存储格式, 数字+单元，例:1单元
+     */
+
+    private String buildingUnit;
+   
+    private Integer floor;
+   
+    private String locDesc;
+    /**
+     * 設備客戶,對應sc_customer表id
+     */
+
+    private Integer customerId;
+   
+    private Long relatedDeviceNo;
+    /**
+     * 水表電子號
+     */
+
+    private String waterMeterNo;
+    /**
+     * 水表檔案號
+     */
+
+    private String waterMeterFileNo;
+   
+    private Integer manufacturerId;
+   
+    private String deviceStatus;
+    /**
+     * 设备最后上报时间
+     */
+
+    private Date lastReceiveTime;
+   
+    private Integer status;
+   
+    private String isTag;
+   
+    private Double xCoordinates;
+   
+    private Double yCoordinates;
+    /**
+     * planId
+     */
+
+    private Integer planId;
+    /**
+     * udip平台id
+     */
+
+    private String udipId;
+    /**
+     * 注册udip平台状态
+     */
+
+    private Integer registerStatus;
+    /**
+     * 同步状态
+     */
+
+    private Integer syncStatus;
+   
+    private String createBy;
+   
+    private String updateBy;
+   
+    private Date dateCreate;
+   
+    private Date dateUpdate;
+   
+    private String metercode;
+   
+    private Long accountId;
+    /**
+     * 铅封号
+     */
+
+    private String sealNo;
+}

meter-reading-sishui/read-sqlSever/src/main/java/com/zcxk/entity/DeviceType.java

@@ -0,0 +1,24 @@
+package com.zcxk.entity;
+
+import lombok.Data;
+
+@Data
+public class DeviceType {
+    private static final long serialVersionUID = 987389838608639392L;
+
+
+    private Integer id;
+
+
+    private String equipmentType;
+
+
+    private String model;
+
+
+    private Integer manufacturerId;
+
+
+    private Integer deviceType;
+
+}

meter-reading-sishui/read-sqlSever/src/main/java/com/zcxk/entity/MeterReadRecord.java

@@ -0,0 +1,159 @@
+package com.zcxk.entity;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * (MeterReadRecord)实体类
+ *
+ * @author hym
+ * @since 2021-01-06 09:51:24
+ */
+@Data
+
+public class MeterReadRecord implements Serializable {
+    private static final long serialVersionUID = -87696822649581957L;
+    /**
+     * 主键
+     */
+
+    private Long id;
+    /**
+     * 读表日期
+     */
+
+    private Integer readDate;
+    /**
+     * 站点
+     */
+
+    private Integer siteId;
+    /**
+     * 场景
+     */
+
+    private Integer sysId;
+    /**
+     * 省
+     */
+
+    private Integer province;
+    /**
+     * 市
+     */
+
+    private Integer city;
+    /**
+     * 区
+     */
+
+    private Integer region;
+    /**
+     * 小区
+     */
+
+    private Integer community;
+    /**
+     * 客户
+     */
+
+    private Integer customerId;
+    /**
+     * 集中器
+     */
+
+    private Integer concentratorId;
+    /**
+     * 采集器
+     */
+
+    private Integer collectorId;
+    /**
+     * 建筑
+     */
+
+    private Integer buildingId;
+    /**
+     * 安装地址
+     */
+
+    private String location;
+    /**
+     * 设备类型
+     */
+
+    private Integer deviceTypeId;
+    /**
+     * 设备id
+     */
+
+    private Long deviceId;
+    /**
+     * 节点编号
+     */
+
+    private String deviceNo;
+    /**
+     * 电子号
+     */
+
+    private String meterNo;
+    /**
+     * 档案号
+     */
+
+    private String meterFileNo;
+    /**
+     * 读表时间
+     */
+
+    private Date readTime;
+    /**
+     * 读表状态
+     */
+
+    private String readStatus;
+    /**
+     * 读表数据
+     */
+
+    private String readData;
+    /**
+     * 最近有效数据
+     */
+
+    private String lastValid;
+    /**
+     * 距离上次的消耗
+     */
+
+    private Double lastCost;
+    /**
+     * 状态
+     */
+
+    private Integer status;
+    /**
+     * 创建时间
+     */
+
+    private Date dateCreate;
+    /**
+     * 更新时间
+     */
+
+    private Date dateUpdate;
+    /**
+     * 创建人
+     */
+
+    private String createBy;
+    /**
+     * 更新人
+     */
+
+    private String updateBy;
+}

meter-reading-sishui/read-sqlSever/src/main/resources/application-dev.properties

@@ -3,7 +3,7 @@ spring.application.name=sishui-meter-reading
 logging.file.path=./logs/sishui-meter-reading
 logging.level.root=debug
 spring.datasource.hikari.max-lifetime=30000
-spring.datasource.mysql.jdbc-url=jdbc:mysql://114.135.61.188:33306/sms?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+spring.datasource.mysql.jdbc-url=jdbc:mysql://114.135.61.188:33306/smart_city_sit_6_10?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
 spring.datasource.mysql.username=root
 spring.datasource.mysql.password=100Zone@123
 spring.datasource.mysql.driver-class-name=com.mysql.jdbc.Driver
@@ -16,3 +16,8 @@ mybatis.configuration.map-underscore-to-camel-case=true
 
 mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 mybatis.configuration.use-column-label=true
+
+customerId=-1
+siteId=-1
+sysId=-1
+buildingId=-1

meter-reading-sishui/read-sqlSever/src/main/resources/mysql-mapper/SendDao.xml

@@ -5,9 +5,33 @@
 
 <mapper namespace="com.zcxk.dao.mysql.SendDao">
 
-
-    <select id="selectOne" resultType="map">
-        select count(*) from sms_alarm_details
+    <insert id="insertDeviceInfo">
+        insert into sc_device(id, device_no, device_type, site_id, sys_id, building_id, building_unit, floor, loc_desc,
+        customer_id, related_device_no, water_meter_no, water_meter_file_no, manufacturer_id, device_status,
+        last_receive_time, status, is_tag, x_coordinates, y_coordinates, plan_id, udip_id, register_status, sync_status,
+        create_by, update_by, date_create, date_update, metercode, account_id, seal_no)
+        values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            #{item.id}, #{item.deviceNo}, #{item.deviceType}, #{item.siteId}, #{item.sysId}, #{item.buildingId},
+            #{item.buildingUnit}, #{item.floor}, #{item.locDesc}, #{item.customerId}, #{item.relatedDeviceNo},
+            #{item.waterMeterNo}, #{item.waterMeterFileNo}, #{item.manufacturerId}, #{item.deviceStatus},
+            #{item.lastReceiveTime}, #{item.status}, #{item.isTag}, #{item.xCoordinates}, #{item.yCoordinates},
+            #{item.planId}, #{item.udipId}, #{item.registerStatus}, #{item.syncStatus}, #{item.createBy},
+            #{item.updateBy}, #{item.dateCreate}, #{item.dateUpdate}, #{item.metercode}, #{item.accountId},
+            #{item.sealNo} )
+        </foreach>
+    </insert>
+    <select id="selectDeviceMeterReader" resultType="com.zcxk.entity.MeterReadRecord">
+      select device_no,read_time,read_data from sc_meter_read_record where customer_id=#{customerId}
+      and read_date=#{readDate}
+    </select>
+    <select id="selectDevice" resultType="string">
+        select device_no from sc_device where customer_id=#{customerId}
     </select>
+    <select id="selectDeviceType" resultType="com.zcxk.entity.DeviceType">
+           select * from sc_device_type
+    </select>
+
 
 </mapper>