Merge remote-tracking branch 'origin/20200908' into 20200908

meter-reading-common/pom.xml

@@ -83,5 +83,11 @@
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
         </dependency>
+        <!-- httpclient -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.6</version>
+        </dependency>
     </dependencies>
 </project>

meter-reading-common/src/main/java/com/huaxu/zoniot/dao/DeviceInfoPushConfigMapper.java

@@ -0,0 +1,28 @@
+package com.huaxu.zoniot.dao;
+
+import com.huaxu.zoniot.entity.DeviceInfoPushConfig;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p></p>
+ * @Author wilian.peng
+ * @Date 2021/1/27 16:33
+ * @Version 1.0
+ */
+@Mapper
+public interface DeviceInfoPushConfigMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(DeviceInfoPushConfig record);
+
+    int insertSelective(DeviceInfoPushConfig record);
+
+    DeviceInfoPushConfig selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(DeviceInfoPushConfig record);
+
+    int updateByPrimaryKey(DeviceInfoPushConfig record);
+
+    DeviceInfoPushConfig findConfigById(@Param("configId")Integer configId);
+}

meter-reading-common/src/main/java/com/huaxu/zoniot/dao/MeasuringDataDefMapper.java

@@ -0,0 +1,30 @@
+package com.huaxu.zoniot.dao;
+
+import com.huaxu.zoniot.entity.MeasuringDataDef;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p></p>
+ * @Author wilian.peng
+ * @Date 2021/1/27 9:58
+ * @Version 1.0
+ */
+@Mapper
+public interface MeasuringDataDefMapper {
+    int deleteByPrimaryKey(@Param("measuringDesc") Integer measuringDesc, @Param("dataValue") String dataValue);
+
+    int insert(MeasuringDataDef record);
+
+    int insertSelective(MeasuringDataDef record);
+
+    MeasuringDataDef selectByPrimaryKey(@Param("measuringDesc") Integer measuringDesc, @Param("dataValue") String dataValue);
+
+    int updateByPrimaryKeySelective(MeasuringDataDef record);
+
+    int updateByPrimaryKey(MeasuringDataDef record);
+
+    List<MeasuringDataDef> findByMeasuringDesc(@Param("measuringDesc") Integer measuringDesc);
+}

meter-reading-common/src/main/java/com/huaxu/zoniot/dao/MeasuringDescMapper.java

@@ -0,0 +1,29 @@
+package com.huaxu.zoniot.dao;
+
+import com.huaxu.zoniot.entity.MeasuringDesc;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * <p></p>
+ * @Author wilian.peng
+ * @Date 2021/1/27 9:57
+ * @Version 1.0
+ */
+@Mapper
+public interface MeasuringDescMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(MeasuringDesc record);
+
+    int insertSelective(MeasuringDesc record);
+
+    MeasuringDesc selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(MeasuringDesc record);
+
+    int updateByPrimaryKey(MeasuringDesc record);
+
+    List<MeasuringDesc> findMeasuringDescListByDeviceType(Integer deviceTypeId);
+}

meter-reading-common/src/main/java/com/huaxu/zoniot/dao/MeterInfoMapper.java

@@ -0,0 +1,32 @@
+package com.huaxu.zoniot.dao;
+
+import com.huaxu.zoniot.entity.MeterInfo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p></p>
+ * @Author wilian.peng
+ * @Date 2021/1/28 11:30
+ * @Version 1.0
+ */
+@Mapper
+public interface MeterInfoMapper {
+    int deleteByPrimaryKey(String meterNo);
+
+    int insert(MeterInfo record);
+
+    int insertSelective(MeterInfo record);
+
+    MeterInfo selectByPrimaryKey(String meterNo);
+
+    int updateByPrimaryKeySelective(MeterInfo record);
+
+    int updateByPrimaryKey(MeterInfo record);
+
+    Integer countByCustomer(@Param("customerId") Integer customerId);
+
+    int insertList(@Param("meterInfoList") List<MeterInfo> meterInfoList);
+}

meter-reading-common/src/main/java/com/huaxu/zoniot/dao/WaterMeterMapper.java

@@ -4,7 +4,9 @@ import com.huaxu.zoniot.entity.WaterMeter;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p></p>
@@ -70,4 +72,21 @@ public interface WaterMeterMapper {
 
     List<WaterMeter> findWaterMeterByDeviceNoAndChildrenCustomer(@Param("deviceNoList")List<String> deviceNoList , @Param("customerList") List<Integer> customerList);
 
+    List<WaterMeter> getMeterListByRange(
+            @Param("customers") String customers,
+            @Param("communitys") String communitys,
+            @Param("buildings") String buildings,
+            @Param("channels") String channels,
+            @Param("deviceTypes") String deviceTypes
+    );
+
+    List<Map<String, Object>> getPushMeterList(
+            @Param("customers") String customers,
+            @Param("communitys") String communitys,
+            @Param("buildings") String buildings,
+            @Param("channels") String channels,
+            @Param("deviceTypes") String deviceTypes,
+            @Param("status") Integer status,
+            @Param("beginDate") Date beginDate,
+            @Param("endDate") Date endDate);
 }

meter-reading-common/src/main/java/com/huaxu/zoniot/entity/DeviceInfoPushConfig.java

@@ -0,0 +1,88 @@
+package com.huaxu.zoniot.entity;
+
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * <p></p>
+ * @Author wilian.peng
+ * @Date 2021/1/27 16:33
+ * @Version 1.0
+ */
+@Data
+public class DeviceInfoPushConfig {
+    /**
+    * 主键
+    */
+    private Integer id;
+
+    /**
+    * 接受方名称
+    */
+    private String receiverName;
+
+    /**
+    * 推送方式，目前支持http
+    */
+    private String pushMethod;
+
+    /**
+    * 推送客户
+    */
+    private String pushCustomers;
+
+    /**
+    * 推送小区
+    */
+    private String pushCommunitys;
+
+    /**
+    * 推送建筑
+    */
+    private String pushBuildings;
+
+    /**
+    * 推送场景
+    */
+    private String pushChannels;
+
+    /**
+    * 推送设备类型
+    */
+    private String pushDeviceTypes;
+
+    /**
+    * 推送网址
+    */
+    private String pushUrl;
+
+    /**
+    * 推送频率，填写quartz表达式
+    */
+    private String period;
+
+    /**
+    * 状态
+    */
+    private Integer status;
+
+    /**
+    * 创建人
+    */
+    private String createBy;
+
+    /**
+    * 更新人
+    */
+    private String updateBy;
+
+    /**
+    * 创建日期
+    */
+    private Date dateCreate;
+
+    /**
+    * 更新日期
+    */
+    private Date dateUpdate;
+}

meter-reading-common/src/main/java/com/huaxu/zoniot/entity/MeasuringDataDef.java

@@ -0,0 +1,59 @@
+package com.huaxu.zoniot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * <p></p>
+ * @Author wilian.peng
+ * @Date 2021/1/27 9:58
+ * @Version 1.0
+ */
+@Data
+public class MeasuringDataDef implements Serializable {
+    /**
+    * 测点描述
+    */
+    private Integer measuringDesc;
+
+    /**
+    * 数据值
+    */
+    private String dataValue;
+
+    /**
+    * 数据名称
+    */
+    private String dataName;
+
+    /**
+    * 数据描述
+    */
+    private String dataDesc;
+
+    /**
+    * 状态
+    */
+    private Boolean status;
+
+    /**
+    * 创建人
+    */
+    private String createBy;
+
+    /**
+    * 更新人
+    */
+    private String updateBy;
+
+    /**
+    * 创建时间
+    */
+    private Date dateCreate;
+
+    /**
+    * 更新时间
+    */
+    private Date dateUpdate;
+}

meter-reading-common/src/main/java/com/huaxu/zoniot/entity/MeasuringDesc.java

@@ -0,0 +1,86 @@
+package com.huaxu.zoniot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import lombok.Data;
+
+/**
+ * <p></p>
+ * @Author wilian.peng
+ * @Date 2021/1/27 9:57
+ * @Version 1.0
+ */
+@Data
+public class MeasuringDesc implements Serializable {
+    /**
+    * 主键
+    */
+    private Integer id;
+
+    /**
+    * 设备类型
+    */
+    private Integer deviceType;
+
+    /**
+    * 系统测点
+    */
+    private Integer measuringId;
+
+    /**
+    * 测点编码
+    */
+    private String measuringCode;
+
+    /**
+    * 测点名称
+    */
+    private String measuringName;
+
+    /**
+    * 测点描述
+    */
+    private String measuringDesc;
+
+    /**
+    * 测点单位
+    */
+    private String measuringUnit;
+
+    /**
+    * 测点数据类型
+    */
+    private String measuringDataType;
+
+    /**
+    * 状态
+    */
+    private Byte status;
+
+    /**
+    * 创建时间
+    */
+    private Date dateCreate;
+
+    /**
+    * 更新时间
+    */
+    private Date dateUpdate;
+
+    /**
+    * 创建人
+    */
+    private String createBy;
+
+    /**
+    * 更新人
+    */
+    private String updateBy;
+
+    /**
+     * 测点数据定义项
+     */
+    private List<MeasuringDataDef> measuringDataDefList ;
+}

meter-reading-common/src/main/java/com/huaxu/zoniot/entity/MeterInfo.java

@@ -0,0 +1,73 @@
+package com.huaxu.zoniot.entity;
+
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * <p></p>
+ * @Author wilian.peng
+ * @Date 2021/1/28 11:30
+ * @Version 1.0
+ */
+@Data
+public class MeterInfo {
+    /**
+    * 水表电子号
+    */
+    private String meterNo;
+
+    /**
+    * 客户ID
+    */
+    private Integer customerId;
+
+    /**
+    * 水表口径
+    */
+    private String caliber;
+
+    /**
+    * 用户编号
+    */
+    private String userNo;
+
+    /**
+    * 用户地址
+    */
+    private String userAddress;
+
+    /**
+    * 用户手机
+    */
+    private String userPhone;
+
+    /**
+    * 区域名称
+    */
+    private String areaName;
+
+    /**
+    * 用户名称
+    */
+    private String userName;
+
+    /**
+    * 建档时间
+    */
+    private Date archiveTime;
+
+    /**
+    * 厂商
+    */
+    private String factory;
+
+    /**
+    * 创建时间
+    */
+    private Date dateCreate;
+
+    /**
+    * 更新时间
+    */
+    private Date dateUpdate;
+}

meter-reading-common/src/main/java/com/huaxu/zoniot/service/MeasuringDescService.java

@@ -0,0 +1,17 @@
+package com.huaxu.zoniot.service;
+
+import com.huaxu.zoniot.entity.MeasuringDesc;
+
+import java.util.Map;
+
+/**
+ * <p>设备测点服务类</p>
+ *
+ * @Author wilian.peng
+ * @Date 2021/1/27 11:34
+ * @Version 1.0
+ */
+public interface MeasuringDescService {
+
+    Map<String , MeasuringDesc> findMeasuringDesc(Integer deviceTypeId);
+}

meter-reading-common/src/main/java/com/huaxu/zoniot/service/impl/MeasuringDescServiceImpl.java

@@ -0,0 +1,45 @@
+package com.huaxu.zoniot.service.impl;
+
+import com.huaxu.zoniot.dao.MeasuringDescMapper;
+import com.huaxu.zoniot.entity.MeasuringDesc;
+import com.huaxu.zoniot.service.MeasuringDescService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p></p>
+ *
+ * @Author wilian.peng
+ * @Date 2021/1/27 11:35
+ * @Version 1.0
+ */
+@Slf4j
+@EnableCaching
+@Service
+public class MeasuringDescServiceImpl implements MeasuringDescService {
+    @Autowired
+    MeasuringDescMapper  measuringDescMapper ;
+
+    @Cacheable(value = "MeasuringDesc", key= "#deviceTypeId",unless = "#result == null")
+    @Override
+    public Map<String, MeasuringDesc> findMeasuringDesc(Integer deviceTypeId) {
+        List<MeasuringDesc> measuringDescList = measuringDescMapper.findMeasuringDescListByDeviceType(deviceTypeId);
+        if(measuringDescList.size() != 0){
+            Map<String, MeasuringDesc> result = new HashMap<>(measuringDescList.size());
+            measuringDescList.forEach(measuringDesc->{
+                result.put(measuringDesc.getMeasuringCode(),measuringDesc);
+            });
+            return result;
+        }
+        else {
+            return null;
+        }
+    }
+}

meter-reading-common/src/main/java/com/huaxu/zoniot/service/impl/WaterMeterServiceImpl.java

@@ -63,10 +63,12 @@ public class WaterMeterServiceImpl implements WaterMeterService, ModelValidate<W
         WaterMeterType waterMeterType = findWaterMeterType(waterMeter.getDeviceTypeId());
         WaterMeter exist = null ;
         if(Constants.AI_METER_TYPE.equals(waterMeterType.getParentId())){
+            // 物联网表使用物联网节点号进行唯一性判断
             exist = waterMeterMapper.findWaterMeterByDeviceNoAndCustomerId(waterMeter.getDeviceNo(), waterMeter.getCustomerId());
         }
         else if(Constants.REMOTE_METER_TYPE.equals(waterMeterType.getParentId())){
-            exist = waterMeterMapper.findWaterMeterByDeviceNoAndCustomerId(waterMeter.getDeviceNo(), waterMeter.getCustomerId());
+            // 远程表使用电子号进行唯一性判断
+            exist = waterMeterMapper.findWaterMeterByMeterNoAndCustomerId(waterMeter.getMeterNo(), waterMeter.getCustomerId());
         }
         if(exist != null){
             return exist ;

meter-reading-common/src/main/java/com/huaxu/zoniot/utils/HttpClientUtils.java

@@ -0,0 +1,136 @@
+package com.huaxu.zoniot.utils;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.Consts;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.client.params.ClientPNames;
+import org.apache.http.config.SocketConfig;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+@Slf4j
+public class HttpClientUtils {
+    private static CloseableHttpClient CLIENT;
+ 
+    static {
+        try {
+            HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
+            httpClientBuilder.setMaxConnTotal(1000);
+            httpClientBuilder.setMaxConnPerRoute(100);
+            httpClientBuilder.evictIdleConnections(15,TimeUnit.SECONDS);
+            SocketConfig.Builder socketConfigBuilder = SocketConfig.custom();
+            socketConfigBuilder.setTcpNoDelay(true);
+            httpClientBuilder.setDefaultSocketConfig(socketConfigBuilder.build());
+            RequestConfig.Builder requestConfigBuilder = RequestConfig.custom();
+            requestConfigBuilder.setConnectTimeout(3000);
+            requestConfigBuilder.setSocketTimeout(300000);
+            httpClientBuilder.setDefaultRequestConfig(requestConfigBuilder.build());
+            SSLContext ctx = SSLContext.getInstance("TLS");
+            X509TrustManager tm = new X509TrustManager() {
+            	@Override
+        		public X509Certificate[] getAcceptedIssuers() {
+        			return null;
+        		}
+        		
+        		@Override
+        		public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+        			
+        		}
+        		
+        		@Override
+        		public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+        			
+        		}
+            };
+            ctx.init(null, new TrustManager[]{tm}, null);
+            httpClientBuilder.setSSLContext(ctx);
+            CLIENT = httpClientBuilder.build();
+        } catch (Exception e) {
+            log.error("", e);
+        }
+    }
+
+    public static String doGet(String url) throws Exception {
+        return execute(new HttpGet(url));
+    }
+ 
+    public static String doGet(String url, String hostname) throws Exception {
+        HttpGet getMethod = new HttpGet(url);
+        if (StringUtils.isNotEmpty(hostname)) {
+            getMethod.setHeader(ClientPNames.VIRTUAL_HOST, hostname);
+        }
+        return execute(getMethod);
+    }
+ 
+    public static String doPost(String url, Map<String, String> params) throws Exception {
+        return doPost(url, params, null);
+    }
+ 
+    public static String doPost(String url, Map<String, String> params, String hostname) throws Exception {
+        if (log.isDebugEnabled()) {
+        	log.debug("request url = {}, params = {}",url,params);
+        }
+ 
+        HttpPost post = new HttpPost(url);
+        List<BasicNameValuePair> urlParameters = new ArrayList();
+        BasicNameValuePair basicNameValuePair = null;
+        for (Map.Entry<String,String> kvEntry : params.entrySet()) {
+            basicNameValuePair = new BasicNameValuePair(kvEntry.getKey(), kvEntry.getValue());
+            urlParameters.add(basicNameValuePair);
+        }
+        HttpEntity postParams = new UrlEncodedFormEntity(urlParameters);
+        post.setEntity(postParams);
+        if (StringUtils.isNotEmpty(hostname)) {
+            post.setHeader(ClientPNames.VIRTUAL_HOST, hostname);
+        }
+        return execute(post);
+    }
+ 
+    public static String doPostWithJson(String url, String context) throws Exception {
+    	log.info("request url = {}, content = {}",url,context);
+        HttpPost post = new HttpPost(url);
+        HttpEntity requestEntity = new StringEntity(context, ContentType.APPLICATION_JSON);
+        post.setEntity(requestEntity);
+        return execute(post);
+    }
+    
+    public static String doPostWithJsonWithHeader(String url, String context,String headerKey ,String headerValue) throws Exception {
+    	log.info("request url = {}, content = {}",url,context);
+        HttpPost post = new HttpPost(url);
+        post.setHeader(headerKey,headerValue);
+        HttpEntity requestEntity = new StringEntity(context, ContentType.APPLICATION_JSON);
+        post.setEntity(requestEntity);
+        return execute(post);
+    }
+    
+ 
+    private static String execute(HttpUriRequest request) throws Exception {
+        CloseableHttpResponse response = CLIENT.execute(request);
+        if (HttpStatus.SC_OK != response.getStatusLine().getStatusCode()) {
+            throw new Exception("Invalid http status code:" + response.getStatusLine().getStatusCode());
+        }
+        return EntityUtils.toString(response.getEntity(), Consts.UTF_8);
+    }
+}

meter-reading-common/src/main/java/com/huaxu/zoniot/utils/Sha256Util.java

@@ -0,0 +1,50 @@
+package com.huaxu.zoniot.utils;
+
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public class Sha256Util {
+
+	/**
+	 * 利用java原生的类实现SHA256加密
+	 * 
+	 * @param str 加密后的报文
+	 * @return
+	 */
+	public static String getSHA256(String str) {
+		MessageDigest messageDigest;
+		String encodestr = "";
+		try {
+			messageDigest = MessageDigest.getInstance("SHA-256");
+			messageDigest.update(str.getBytes("UTF-8"));
+			encodestr = byte2Hex(messageDigest.digest());
+		} catch (NoSuchAlgorithmException e) {
+			e.printStackTrace();
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		return encodestr;
+	}
+
+	/**
+	 * 将byte转为16进制
+	 * 
+	 * @param bytes
+	 * @return
+	 */
+	private static String byte2Hex(byte[] bytes) {
+		StringBuffer stringBuffer = new StringBuffer();
+		String temp = null;
+		for (int i = 0; i < bytes.length; i++) {
+			temp = Integer.toHexString(bytes[i] & 0xFF);
+			if (temp.length() == 1) {
+				// 1得到一位的进行补0操作
+				stringBuffer.append("0");
+			}
+			stringBuffer.append(temp);
+		}
+		return stringBuffer.toString();
+	}
+
+}

meter-reading-common/src/main/resources/application-common-dev.properties

@@ -31,7 +31,7 @@ mybatis.configuration.use-column-label=true
 spring.redis.host=114.135.61.188
 spring.redis.port=26379
 spring.redis.password=zoniot
-spring.redis.database=1
+spring.redis.database=15
 spring.redis.lettuce.pool.max-active=8
 spring.redis.lettuce.pool.max-wait=100
 spring.redis.lettuce.pool.max-idle=8

meter-reading-common/src/main/resources/mapper/BuildingMapper.xml

@@ -730,5 +730,6 @@
     where status = 1
       and name = #{name,jdbcType=VARCHAR}
       and community = #{communityId,jdbcType=INTEGER}
+    limit 1
   </select>
 </mapper>

meter-reading-common/src/main/resources/mapper/DeviceInfoPushConfigMapper.xml

@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huaxu.zoniot.dao.DeviceInfoPushConfigMapper">
+  <resultMap id="BaseResultMap" type="com.huaxu.zoniot.entity.DeviceInfoPushConfig">
+    <!--@mbg.generated-->
+    <!--@Table sc_device_info_push_config-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="receiver_name" jdbcType="VARCHAR" property="receiverName" />
+    <result column="push_method" jdbcType="VARCHAR" property="pushMethod" />
+    <result column="push_customers" jdbcType="VARCHAR" property="pushCustomers" />
+    <result column="push_communitys" jdbcType="VARCHAR" property="pushCommunitys" />
+    <result column="push_buildings" jdbcType="VARCHAR" property="pushBuildings" />
+    <result column="push_channels" jdbcType="VARCHAR" property="pushChannels" />
+    <result column="push_device_types" jdbcType="VARCHAR" property="pushDeviceTypes" />
+    <result column="push_url" jdbcType="VARCHAR" property="pushUrl" />
+    <result column="period" jdbcType="VARCHAR" property="period" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+    <result column="date_create" jdbcType="TIMESTAMP" property="dateCreate" />
+    <result column="date_update" jdbcType="TIMESTAMP" property="dateUpdate" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, receiver_name, push_method, push_customers, push_communitys, push_buildings, 
+    push_channels, push_device_types, push_url, period, `status`, create_by, update_by, 
+    date_create, date_update
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--@mbg.generated-->
+    select 
+    <include refid="Base_Column_List" />
+    from sc_device_info_push_config
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--@mbg.generated-->
+    delete from sc_device_info_push_config
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.huaxu.zoniot.entity.DeviceInfoPushConfig" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into sc_device_info_push_config (receiver_name, push_method, push_customers, 
+      push_communitys, push_buildings, push_channels, 
+      push_device_types, push_url, period, 
+      `status`, create_by, update_by, 
+      date_create, date_update)
+    values (#{receiverName,jdbcType=VARCHAR}, #{pushMethod,jdbcType=VARCHAR}, #{pushCustomers,jdbcType=VARCHAR}, 
+      #{pushCommunitys,jdbcType=VARCHAR}, #{pushBuildings,jdbcType=VARCHAR}, #{pushChannels,jdbcType=VARCHAR}, 
+      #{pushDeviceTypes,jdbcType=VARCHAR}, #{pushUrl,jdbcType=VARCHAR}, #{period,jdbcType=VARCHAR}, 
+      #{status,jdbcType=INTEGER}, #{createBy,jdbcType=VARCHAR}, #{updateBy,jdbcType=VARCHAR}, 
+      #{dateCreate,jdbcType=TIMESTAMP}, #{dateUpdate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.huaxu.zoniot.entity.DeviceInfoPushConfig" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into sc_device_info_push_config
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="receiverName != null">
+        receiver_name,
+      </if>
+      <if test="pushMethod != null">
+        push_method,
+      </if>
+      <if test="pushCustomers != null">
+        push_customers,
+      </if>
+      <if test="pushCommunitys != null">
+        push_communitys,
+      </if>
+      <if test="pushBuildings != null">
+        push_buildings,
+      </if>
+      <if test="pushChannels != null">
+        push_channels,
+      </if>
+      <if test="pushDeviceTypes != null">
+        push_device_types,
+      </if>
+      <if test="pushUrl != null">
+        push_url,
+      </if>
+      <if test="period != null">
+        period,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="updateBy != null">
+        update_by,
+      </if>
+      <if test="dateCreate != null">
+        date_create,
+      </if>
+      <if test="dateUpdate != null">
+        date_update,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="receiverName != null">
+        #{receiverName,jdbcType=VARCHAR},
+      </if>
+      <if test="pushMethod != null">
+        #{pushMethod,jdbcType=VARCHAR},
+      </if>
+      <if test="pushCustomers != null">
+        #{pushCustomers,jdbcType=VARCHAR},
+      </if>
+      <if test="pushCommunitys != null">
+        #{pushCommunitys,jdbcType=VARCHAR},
+      </if>
+      <if test="pushBuildings != null">
+        #{pushBuildings,jdbcType=VARCHAR},
+      </if>
+      <if test="pushChannels != null">
+        #{pushChannels,jdbcType=VARCHAR},
+      </if>
+      <if test="pushDeviceTypes != null">
+        #{pushDeviceTypes,jdbcType=VARCHAR},
+      </if>
+      <if test="pushUrl != null">
+        #{pushUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="period != null">
+        #{period,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createBy != null">
+        #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateBy != null">
+        #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="dateCreate != null">
+        #{dateCreate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="dateUpdate != null">
+        #{dateUpdate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.huaxu.zoniot.entity.DeviceInfoPushConfig">
+    <!--@mbg.generated-->
+    update sc_device_info_push_config
+    <set>
+      <if test="receiverName != null">
+        receiver_name = #{receiverName,jdbcType=VARCHAR},
+      </if>
+      <if test="pushMethod != null">
+        push_method = #{pushMethod,jdbcType=VARCHAR},
+      </if>
+      <if test="pushCustomers != null">
+        push_customers = #{pushCustomers,jdbcType=VARCHAR},
+      </if>
+      <if test="pushCommunitys != null">
+        push_communitys = #{pushCommunitys,jdbcType=VARCHAR},
+      </if>
+      <if test="pushBuildings != null">
+        push_buildings = #{pushBuildings,jdbcType=VARCHAR},
+      </if>
+      <if test="pushChannels != null">
+        push_channels = #{pushChannels,jdbcType=VARCHAR},
+      </if>
+      <if test="pushDeviceTypes != null">
+        push_device_types = #{pushDeviceTypes,jdbcType=VARCHAR},
+      </if>
+      <if test="pushUrl != null">
+        push_url = #{pushUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="period != null">
+        period = #{period,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createBy != null">
+        create_by = #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateBy != null">
+        update_by = #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="dateCreate != null">
+        date_create = #{dateCreate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="dateUpdate != null">
+        date_update = #{dateUpdate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.huaxu.zoniot.entity.DeviceInfoPushConfig">
+    <!--@mbg.generated-->
+    update sc_device_info_push_config
+    set receiver_name = #{receiverName,jdbcType=VARCHAR},
+      push_method = #{pushMethod,jdbcType=VARCHAR},
+      push_customers = #{pushCustomers,jdbcType=VARCHAR},
+      push_communitys = #{pushCommunitys,jdbcType=VARCHAR},
+      push_buildings = #{pushBuildings,jdbcType=VARCHAR},
+      push_channels = #{pushChannels,jdbcType=VARCHAR},
+      push_device_types = #{pushDeviceTypes,jdbcType=VARCHAR},
+      push_url = #{pushUrl,jdbcType=VARCHAR},
+      period = #{period,jdbcType=VARCHAR},
+      `status` = #{status,jdbcType=INTEGER},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      update_by = #{updateBy,jdbcType=VARCHAR},
+      date_create = #{dateCreate,jdbcType=TIMESTAMP},
+      date_update = #{dateUpdate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="findConfigById" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from
+    sc_device_info_push_config
+    where status = 1
+    and id = #{configId}
+  </select>
+</mapper>

meter-reading-common/src/main/resources/mapper/MeasuringDataDefMapper.xml

@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huaxu.zoniot.dao.MeasuringDataDefMapper">
+  <resultMap id="BaseResultMap" type="com.huaxu.zoniot.entity.MeasuringDataDef">
+    <!--@mbg.generated-->
+    <!--@Table sc_tpl_measuring_data_def-->
+    <id column="measuring_desc" jdbcType="INTEGER" property="measuringDesc" />
+    <id column="data_value" jdbcType="VARCHAR" property="dataValue" />
+    <result column="data_name" jdbcType="VARCHAR" property="dataName" />
+    <result column="data_desc" jdbcType="VARCHAR" property="dataDesc" />
+    <result column="status" jdbcType="BOOLEAN" property="status" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+    <result column="date_create" jdbcType="TIMESTAMP" property="dateCreate" />
+    <result column="date_update" jdbcType="TIMESTAMP" property="dateUpdate" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    measuring_desc, data_value, data_name, data_desc, `status`, create_by, update_by, 
+    date_create, date_update
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="map" resultMap="BaseResultMap">
+    <!--@mbg.generated-->
+    select 
+    <include refid="Base_Column_List" />
+    from sc_tpl_measuring_data_def
+    where measuring_desc = #{measuringDesc,jdbcType=INTEGER}
+      and data_value = #{dataValue,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="map">
+    <!--@mbg.generated-->
+    delete from sc_tpl_measuring_data_def
+    where measuring_desc = #{measuringDesc,jdbcType=INTEGER}
+      and data_value = #{dataValue,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.huaxu.zoniot.entity.MeasuringDataDef">
+    <!--@mbg.generated-->
+    insert into sc_tpl_measuring_data_def (measuring_desc, data_value, data_name, 
+      data_desc, `status`, create_by, 
+      update_by, date_create, date_update
+      )
+    values (#{measuringDesc,jdbcType=INTEGER}, #{dataValue,jdbcType=VARCHAR}, #{dataName,jdbcType=VARCHAR}, 
+      #{dataDesc,jdbcType=VARCHAR}, #{status,jdbcType=BOOLEAN}, #{createBy,jdbcType=VARCHAR}, 
+      #{updateBy,jdbcType=VARCHAR}, #{dateCreate,jdbcType=TIMESTAMP}, #{dateUpdate,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.huaxu.zoniot.entity.MeasuringDataDef">
+    <!--@mbg.generated-->
+    insert into sc_tpl_measuring_data_def
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="measuringDesc != null">
+        measuring_desc,
+      </if>
+      <if test="dataValue != null">
+        data_value,
+      </if>
+      <if test="dataName != null">
+        data_name,
+      </if>
+      <if test="dataDesc != null">
+        data_desc,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="updateBy != null">
+        update_by,
+      </if>
+      <if test="dateCreate != null">
+        date_create,
+      </if>
+      <if test="dateUpdate != null">
+        date_update,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="measuringDesc != null">
+        #{measuringDesc,jdbcType=INTEGER},
+      </if>
+      <if test="dataValue != null">
+        #{dataValue,jdbcType=VARCHAR},
+      </if>
+      <if test="dataName != null">
+        #{dataName,jdbcType=VARCHAR},
+      </if>
+      <if test="dataDesc != null">
+        #{dataDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=BOOLEAN},
+      </if>
+      <if test="createBy != null">
+        #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateBy != null">
+        #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="dateCreate != null">
+        #{dateCreate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="dateUpdate != null">
+        #{dateUpdate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.huaxu.zoniot.entity.MeasuringDataDef">
+    <!--@mbg.generated-->
+    update sc_tpl_measuring_data_def
+    <set>
+      <if test="dataName != null">
+        data_name = #{dataName,jdbcType=VARCHAR},
+      </if>
+      <if test="dataDesc != null">
+        data_desc = #{dataDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=BOOLEAN},
+      </if>
+      <if test="createBy != null">
+        create_by = #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateBy != null">
+        update_by = #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="dateCreate != null">
+        date_create = #{dateCreate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="dateUpdate != null">
+        date_update = #{dateUpdate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where measuring_desc = #{measuringDesc,jdbcType=INTEGER}
+      and data_value = #{dataValue,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.huaxu.zoniot.entity.MeasuringDataDef">
+    <!--@mbg.generated-->
+    update sc_tpl_measuring_data_def
+    set data_name = #{dataName,jdbcType=VARCHAR},
+      data_desc = #{dataDesc,jdbcType=VARCHAR},
+      `status` = #{status,jdbcType=BOOLEAN},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      update_by = #{updateBy,jdbcType=VARCHAR},
+      date_create = #{dateCreate,jdbcType=TIMESTAMP},
+      date_update = #{dateUpdate,jdbcType=TIMESTAMP}
+    where measuring_desc = #{measuringDesc,jdbcType=INTEGER}
+      and data_value = #{dataValue,jdbcType=VARCHAR}
+  </update>
+  <select id="findByMeasuringDesc" resultMap="BaseResultMap">
+    select
+        <include refid="Base_Column_List" />
+    from
+        sc_tpl_measuring_data_def
+    where status =1
+    and measuring_desc = #{measuringDesc,jdbcType=INTEGER}
+  </select>
+</mapper>

meter-reading-common/src/main/resources/mapper/MeasuringDescMapper.xml

@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huaxu.zoniot.dao.MeasuringDescMapper">
+  <resultMap id="BaseResultMap" type="com.huaxu.zoniot.entity.MeasuringDesc">
+    <!--@mbg.generated-->
+    <!--@Table sc_tpl_measuring_desc-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="device_type" jdbcType="INTEGER" property="deviceType" />
+    <result column="measuring_id" jdbcType="INTEGER" property="measuringId" />
+    <result column="measuring_code" jdbcType="VARCHAR" property="measuringCode" />
+    <result column="measuring_name" jdbcType="VARCHAR" property="measuringName" />
+    <result column="measuring_desc" jdbcType="VARCHAR" property="measuringDesc" />
+    <result column="measuring_unit" jdbcType="VARCHAR" property="measuringUnit" />
+    <result column="measuring_data_type" jdbcType="CHAR" property="measuringDataType" />
+    <result column="status" jdbcType="TINYINT" property="status" />
+    <result column="date_create" jdbcType="TIMESTAMP" property="dateCreate" />
+    <result column="date_update" jdbcType="TIMESTAMP" property="dateUpdate" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+    <collection property="measuringDataDefList" ofType="com.huaxu.zoniot.entity.MeasuringDataDef"
+    select="com.huaxu.zoniot.dao.MeasuringDataDefMapper.findByMeasuringDesc" column="id" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, device_type, measuring_id, measuring_code, measuring_name, measuring_desc, measuring_unit, 
+    measuring_data_type, `status`, date_create, date_update, create_by, update_by
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--@mbg.generated-->
+    select 
+    <include refid="Base_Column_List" />
+    from sc_tpl_measuring_desc
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--@mbg.generated-->
+    delete from sc_tpl_measuring_desc
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.huaxu.zoniot.entity.MeasuringDesc" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into sc_tpl_measuring_desc (device_type, measuring_id, measuring_code, 
+      measuring_name, measuring_desc, measuring_unit, 
+      measuring_data_type, `status`, date_create, 
+      date_update, create_by, update_by
+      )
+    values (#{deviceType,jdbcType=INTEGER}, #{measuringId,jdbcType=INTEGER}, #{measuringCode,jdbcType=VARCHAR}, 
+      #{measuringName,jdbcType=VARCHAR}, #{measuringDesc,jdbcType=VARCHAR}, #{measuringUnit,jdbcType=VARCHAR}, 
+      #{measuringDataType,jdbcType=CHAR}, #{status,jdbcType=TINYINT}, #{dateCreate,jdbcType=TIMESTAMP}, 
+      #{dateUpdate,jdbcType=TIMESTAMP}, #{createBy,jdbcType=VARCHAR}, #{updateBy,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.huaxu.zoniot.entity.MeasuringDesc" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into sc_tpl_measuring_desc
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="deviceType != null">
+        device_type,
+      </if>
+      <if test="measuringId != null">
+        measuring_id,
+      </if>
+      <if test="measuringCode != null">
+        measuring_code,
+      </if>
+      <if test="measuringName != null">
+        measuring_name,
+      </if>
+      <if test="measuringDesc != null">
+        measuring_desc,
+      </if>
+      <if test="measuringUnit != null">
+        measuring_unit,
+      </if>
+      <if test="measuringDataType != null">
+        measuring_data_type,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="dateCreate != null">
+        date_create,
+      </if>
+      <if test="dateUpdate != null">
+        date_update,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="updateBy != null">
+        update_by,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="deviceType != null">
+        #{deviceType,jdbcType=INTEGER},
+      </if>
+      <if test="measuringId != null">
+        #{measuringId,jdbcType=INTEGER},
+      </if>
+      <if test="measuringCode != null">
+        #{measuringCode,jdbcType=VARCHAR},
+      </if>
+      <if test="measuringName != null">
+        #{measuringName,jdbcType=VARCHAR},
+      </if>
+      <if test="measuringDesc != null">
+        #{measuringDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="measuringUnit != null">
+        #{measuringUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="measuringDataType != null">
+        #{measuringDataType,jdbcType=CHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=TINYINT},
+      </if>
+      <if test="dateCreate != null">
+        #{dateCreate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="dateUpdate != null">
+        #{dateUpdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createBy != null">
+        #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateBy != null">
+        #{updateBy,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.huaxu.zoniot.entity.MeasuringDesc">
+    <!--@mbg.generated-->
+    update sc_tpl_measuring_desc
+    <set>
+      <if test="deviceType != null">
+        device_type = #{deviceType,jdbcType=INTEGER},
+      </if>
+      <if test="measuringId != null">
+        measuring_id = #{measuringId,jdbcType=INTEGER},
+      </if>
+      <if test="measuringCode != null">
+        measuring_code = #{measuringCode,jdbcType=VARCHAR},
+      </if>
+      <if test="measuringName != null">
+        measuring_name = #{measuringName,jdbcType=VARCHAR},
+      </if>
+      <if test="measuringDesc != null">
+        measuring_desc = #{measuringDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="measuringUnit != null">
+        measuring_unit = #{measuringUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="measuringDataType != null">
+        measuring_data_type = #{measuringDataType,jdbcType=CHAR},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=TINYINT},
+      </if>
+      <if test="dateCreate != null">
+        date_create = #{dateCreate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="dateUpdate != null">
+        date_update = #{dateUpdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createBy != null">
+        create_by = #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateBy != null">
+        update_by = #{updateBy,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.huaxu.zoniot.entity.MeasuringDesc">
+    <!--@mbg.generated-->
+    update sc_tpl_measuring_desc
+    set device_type = #{deviceType,jdbcType=INTEGER},
+      measuring_id = #{measuringId,jdbcType=INTEGER},
+      measuring_code = #{measuringCode,jdbcType=VARCHAR},
+      measuring_name = #{measuringName,jdbcType=VARCHAR},
+      measuring_desc = #{measuringDesc,jdbcType=VARCHAR},
+      measuring_unit = #{measuringUnit,jdbcType=VARCHAR},
+      measuring_data_type = #{measuringDataType,jdbcType=CHAR},
+      `status` = #{status,jdbcType=TINYINT},
+      date_create = #{dateCreate,jdbcType=TIMESTAMP},
+      date_update = #{dateUpdate,jdbcType=TIMESTAMP},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      update_by = #{updateBy,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="findMeasuringDescListByDeviceType" resultMap="BaseResultMap">
+      SELECT
+          <include refid="Base_Column_List" />
+      FROM
+          sc_tpl_measuring_desc
+      where  `status` = 1
+      and  device_type = #{deviceTypeId,jdbcType=INTEGER}
+  </select>
+</mapper>

meter-reading-common/src/main/resources/mapper/MeterInfoMapper.xml

@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huaxu.zoniot.dao.MeterInfoMapper">
+  <resultMap id="BaseResultMap" type="com.huaxu.zoniot.entity.MeterInfo">
+    <!--@mbg.generated-->
+    <!--@Table sc_meter_info-->
+    <id column="meter_no" jdbcType="VARCHAR" property="meterNo" />
+    <result column="customer_id" jdbcType="INTEGER" property="customerId" />
+    <result column="caliber" jdbcType="VARCHAR" property="caliber" />
+    <result column="user_no" jdbcType="VARCHAR" property="userNo" />
+    <result column="user_address" jdbcType="VARCHAR" property="userAddress" />
+    <result column="user_phone" jdbcType="VARCHAR" property="userPhone" />
+    <result column="area_name" jdbcType="VARCHAR" property="areaName" />
+    <result column="user_name" jdbcType="VARCHAR" property="userName" />
+    <result column="archive_time" jdbcType="TIMESTAMP" property="archiveTime" />
+    <result column="factory" jdbcType="VARCHAR" property="factory" />
+    <result column="date_create" jdbcType="TIMESTAMP" property="dateCreate" />
+    <result column="date_update" jdbcType="TIMESTAMP" property="dateUpdate" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    meter_no, customer_id, caliber, user_no, user_address, user_phone, area_name, user_name, 
+    archive_time, factory, date_create, date_update
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--@mbg.generated-->
+    select 
+    <include refid="Base_Column_List" />
+    from sc_meter_info
+    where meter_no = #{meterNo,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--@mbg.generated-->
+    delete from sc_meter_info
+    where meter_no = #{meterNo,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.huaxu.zoniot.entity.MeterInfo">
+    <!--@mbg.generated-->
+    insert into sc_meter_info (meter_no, customer_id, caliber, 
+      user_no, user_address, user_phone, 
+      area_name, user_name, archive_time, 
+      factory, date_create, date_update
+      )
+    values (#{meterNo,jdbcType=VARCHAR}, #{customerId,jdbcType=INTEGER}, #{caliber,jdbcType=VARCHAR}, 
+      #{userNo,jdbcType=VARCHAR}, #{userAddress,jdbcType=VARCHAR}, #{userPhone,jdbcType=VARCHAR}, 
+      #{areaName,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{archiveTime,jdbcType=TIMESTAMP}, 
+      #{factory,jdbcType=VARCHAR}, #{dateCreate,jdbcType=TIMESTAMP}, #{dateUpdate,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.huaxu.zoniot.entity.MeterInfo">
+    <!--@mbg.generated-->
+    insert into sc_meter_info
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="meterNo != null">
+        meter_no,
+      </if>
+      <if test="customerId != null">
+        customer_id,
+      </if>
+      <if test="caliber != null">
+        caliber,
+      </if>
+      <if test="userNo != null">
+        user_no,
+      </if>
+      <if test="userAddress != null">
+        user_address,
+      </if>
+      <if test="userPhone != null">
+        user_phone,
+      </if>
+      <if test="areaName != null">
+        area_name,
+      </if>
+      <if test="userName != null">
+        user_name,
+      </if>
+      <if test="archiveTime != null">
+        archive_time,
+      </if>
+      <if test="factory != null">
+        factory,
+      </if>
+      <if test="dateCreate != null">
+        date_create,
+      </if>
+      <if test="dateUpdate != null">
+        date_update,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="meterNo != null">
+        #{meterNo,jdbcType=VARCHAR},
+      </if>
+      <if test="customerId != null">
+        #{customerId,jdbcType=INTEGER},
+      </if>
+      <if test="caliber != null">
+        #{caliber,jdbcType=VARCHAR},
+      </if>
+      <if test="userNo != null">
+        #{userNo,jdbcType=VARCHAR},
+      </if>
+      <if test="userAddress != null">
+        #{userAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="userPhone != null">
+        #{userPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="areaName != null">
+        #{areaName,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null">
+        #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="archiveTime != null">
+        #{archiveTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="factory != null">
+        #{factory,jdbcType=VARCHAR},
+      </if>
+      <if test="dateCreate != null">
+        #{dateCreate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="dateUpdate != null">
+        #{dateUpdate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.huaxu.zoniot.entity.MeterInfo">
+    <!--@mbg.generated-->
+    update sc_meter_info
+    <set>
+      <if test="customerId != null">
+        customer_id = #{customerId,jdbcType=INTEGER},
+      </if>
+      <if test="caliber != null">
+        caliber = #{caliber,jdbcType=VARCHAR},
+      </if>
+      <if test="userNo != null">
+        user_no = #{userNo,jdbcType=VARCHAR},
+      </if>
+      <if test="userAddress != null">
+        user_address = #{userAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="userPhone != null">
+        user_phone = #{userPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="areaName != null">
+        area_name = #{areaName,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null">
+        user_name = #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="archiveTime != null">
+        archive_time = #{archiveTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="factory != null">
+        factory = #{factory,jdbcType=VARCHAR},
+      </if>
+      <if test="dateCreate != null">
+        date_create = #{dateCreate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="dateUpdate != null">
+        date_update = #{dateUpdate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where meter_no = #{meterNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.huaxu.zoniot.entity.MeterInfo">
+    <!--@mbg.generated-->
+    update sc_meter_info
+    set customer_id = #{customerId,jdbcType=INTEGER},
+      caliber = #{caliber,jdbcType=VARCHAR},
+      user_no = #{userNo,jdbcType=VARCHAR},
+      user_address = #{userAddress,jdbcType=VARCHAR},
+      user_phone = #{userPhone,jdbcType=VARCHAR},
+      area_name = #{areaName,jdbcType=VARCHAR},
+      user_name = #{userName,jdbcType=VARCHAR},
+      archive_time = #{archiveTime,jdbcType=TIMESTAMP},
+      factory = #{factory,jdbcType=VARCHAR},
+      date_create = #{dateCreate,jdbcType=TIMESTAMP},
+      date_update = #{dateUpdate,jdbcType=TIMESTAMP}
+    where meter_no = #{meterNo,jdbcType=VARCHAR}
+  </update>
+  <select id="countByCustomer" resultType="java.lang.Integer">
+    select count(1) from sc_meter_info where customer_id = #{customerId}
+  </select>
+  <insert id="insertList">
+    REPLACE INTO sc_meter_info (
+    meter_no,
+    customer_id,
+    user_no,
+    user_address,
+    user_phone,
+    area_name,
+    user_name,
+    caliber,
+    factory,
+    archive_time,
+    date_create,
+    date_update
+    )VALUES
+    <foreach collection="meterInfoList" item="meterInfo" index="index" separator=",">
+      (
+      #{meterInfo.meterNo,jdbcType=VARCHAR},
+      #{meterInfo.customerId,jdbcType=INTEGER},
+      #{meterInfo.userNo,jdbcType=VARCHAR},
+      #{meterInfo.userAddress,jdbcType=VARCHAR},
+      #{meterInfo.userPhone,jdbcType=VARCHAR},
+      #{meterInfo.areaName,jdbcType=VARCHAR},
+      #{meterInfo.userName,jdbcType=VARCHAR},
+      #{meterInfo.caliber,jdbcType=VARCHAR},
+      #{meterInfo.factory,jdbcType=VARCHAR},
+      #{meterInfo.archiveTime,jdbcType=TIMESTAMP},
+      #{meterInfo.dateCreate,jdbcType=TIMESTAMP},
+      #{meterInfo.dateUpdate,jdbcType=TIMESTAMP}
+      )
+    </foreach>
+  </insert>
+</mapper>

meter-reading-common/src/main/resources/mapper/WaterMeterMapper.xml

@@ -232,7 +232,25 @@
             #{customerId}
         </foreach>
     </select>
-
+    <select id="getMeterListByRange" resultMap="BaseResultMap">
+        <include refid="Base_Meter_Query" />
+        AND d.sys_id != - 99
+        <if test="customers != null and customers != '' ">
+            AND FIND_IN_SET( d.customer_id, #{customers} )
+        </if>
+        <if test="communitys != null and communitys != '' ">
+            AND FIND_IN_SET( c.id, #{communitys} )
+        </if>
+        <if test="buildings != null and buildings != '' ">
+            AND FIND_IN_SET( d.building_id, #{buildings} )
+        </if>
+        <if test="channels != null and channels != '' ">
+            AND FIND_IN_SET( d.sys_id, #{channels} )
+        </if>
+        <if test="deviceTypes != null and deviceTypes != '' ">
+            AND FIND_IN_SET( d.device_type, #{deviceTypes} )
+        </if>
+    </select>
     <insert id="batchInsert" keyProperty="waterMeter.id" parameterType="map">
         INSERT INTO sc_device (
         id,
@@ -276,4 +294,54 @@
         )
         </foreach>
     </insert>
+
+    <select id="getPushMeterList" resultType="java.util.HashMap">
+        SELECT
+        d.id AS deviceId,
+        d.device_no AS deviceNo,
+        cast(d.status as SIGNED  ) AS status,
+        dt.equipment_type AS deviceType,
+        DATE_FORMAT( d.date_create, '%Y-%m-%d' ) AS dateCreate,
+        ifnull(m.factory,f.`name`) as factory,
+        m.user_name AS userName,
+        if(LENGTH(trim(ifnull(ll.new_meter_start,'0')))>0 ,ifnull(ll.new_meter_start,'0'),'0') AS beginWSV,
+        ifnull(m.area_name,c.`name`) AS areaName,
+        d.loc_desc AS location,
+        d.water_meter_no AS meterNumber,
+        ifnull(m.meter_no,d.water_meter_no) as meter_no,
+        ifnull(m.user_address,b.`name`) AS userAddress,
+        m.user_no AS userNumber,
+        m.user_phone AS userPhone,
+        DATE_FORMAT(m.archive_time,'%Y-%m-%d') AS archiveTime,
+        m.caliber
+        FROM
+        sc_device d
+        Left JOIN sc_install_list ll on (d.id = ll.device_id and ll.status  =1 )
+        LEFT JOIN sc_meter_info m ON ( CONCAT('91000',d.water_meter_no) = m.meter_no )
+        LEFT JOIN sc_device_type dt ON ( d.device_type = dt.id )
+        LEFT JOIN sc_building b on (d.building_id =b.id)
+        LEFT JOIN sc_community c on (b.community = c.id)
+        left join sc_device_manufacturer f on (dt.manufacturer_id = f.id)
+        where d.sys_id != -99
+        <if test="customers != null and customers != '' ">
+            AND FIND_IN_SET( d.customer_id, #{customers} )
+        </if>
+        <if test="communitys != null and communitys != '' ">
+            AND FIND_IN_SET( c.id, #{communitys} )
+        </if>
+        <if test="buildings != null and buildings != '' ">
+            AND FIND_IN_SET( d.building_id, #{buildings} )
+        </if>
+        <if test="channels != null and channels != '' ">
+            AND FIND_IN_SET( d.sys_id, #{channels} )
+        </if>
+        <if test="deviceTypes != null and deviceTypes != '' ">
+            AND FIND_IN_SET( d.device_type, #{deviceTypes} )
+        </if>
+        <if test="status != null">
+            AND d.status = #{status}
+        </if>
+        and d.date_update > #{beginDate ,jdbcType=TIMESTAMP }
+        and d.date_update <![CDATA[ <= ]]> #{endDate ,jdbcType=TIMESTAMP }
+    </select>
 </mapper>

meter-reading-common/src/test/java/MainTest.java

@@ -0,0 +1,97 @@
+import cn.hutool.core.text.StrFormatter;
+
+/**
+ * <p></p>
+ *
+ * @Author wilian.peng
+ * @Date 2021/1/21 20:17
+ * @Version 1.0
+ */
+public class MainTest {
+    public static void main(String[] args) {
+        String str ="[SSBF]CSLLJ_1:1期出水瞬时流量" +
+                ",[SSBF]CSLLJ_1_LJ:1期出水累计流量" +
+                ",[SSBF]CSYL_1:1期出水压力" +
+                ",[SSBF]QSKYW_1:1期清水库液位" +
+                ",[SSBF]CSLLJ2:2期出水瞬时流量" +
+                ",[SSBF]CSYL:2期出水压力" +
+                ",[SSBF]QSKYW:2期清水库液位" +
+                ",[SSBF]CSDZD:出水低浊度" +
+                ",[SSBF]CSYLFX:出水余氯" +
+                ",[SSBF]JJDY_A:送水泵房进线A相电压" +
+                ",[SSBF]JJDY_B:送水泵房进线B相电压" +
+                ",[SSBF]JJDY_C:送水泵房进线C相电压" +
+                ",[SSBF]SSB1.DL:1#送水泵运行电流" +
+                ",[SSBF]SSB2.DL:2#送水泵运行电流" +
+                ",[SSBF]SSB3.DL:3#送水泵运行电流" +
+                ",[SSBF]SSB4.DL:4#送水泵运行电流" +
+                ",[SSBF]SSB5.DL:5#送水泵运行电流" +
+                ",[SSBF]SSB6.DL:6#送水泵运行电流" +
+                ",[SSBF]SSB1.Run:1#送水泵运行状态" +
+                ",[SSBF]SSB1.Fault:1#送水泵故障状态" +
+                ",[SSBF]SSB2.Run:2#送水泵运行状态" +
+                ",[SSBF]SSB2.Fault:2#送水泵故障状态" +
+                ",[SSBF]SSB2.Run:2#送水泵运行状态" +
+                ",[SSBF]SSB2.Fault:2#送水泵故障状态" +
+                ",[SSBF]SSB3.Run:3#送水泵运行状态" +
+                ",[SSBF]SSB3.Fault:3#送水泵故障状态" +
+                ",[SSBF]SSB3.Run:3#送水泵运行状态" +
+                ",[SSBF]SSB3.Fault:3#送水泵故障状态" +
+                ",[SSBF]SSB4.Run:4#送水泵运行状态" +
+                ",[SSBF]SSB4.Fault:4#送水泵故障状态" +
+                ",[SSBF]SSB4.Run:4#送水泵运行状态" +
+                ",[SSBF]SSB4.Fault:4#送水泵故障状态" +
+                ",[SSBF]SSB5.Run:5#送水泵运行状态" +
+                ",[SSBF]SSB5.Fault:5#送水泵故障状态" +
+                ",[SSBF]SSB5.Run:5#送水泵运行状态" +
+                ",[SSBF]SSB5.Fault:5#送水泵故障状态" +
+                ",[SSBF]SSB6.Run:6#送水泵运行状态" +
+                ",[SSBF]SSB6.Fault:6#送水泵故障状态" +
+                ",[JLSC]dss:滤前低浊度" +
+                ",[JLSC]LG1_SW:1#滤格水位" +
+                ",[JLSC]LG2_SW:2#滤格水位" +
+                ",[JLSC]LG3_SW:3#滤格水位" +
+                ",[JLSC]LG4_SW:4#滤格水位" +
+                ",[JLSC]LG5_SW:5#滤格水位" +
+                ",[JLSC]LG6_SW:6#滤格水位" +
+                ",[JLSC]LG7_SW:7#滤格水位" +
+                ",[JLSC]LG8_SW:8#滤格水位" +
+                ",[JLSC]LG9_SW:9#滤格水位" +
+                ",[JLSC]LG10_SW:10#滤格水位" +
+                ",[JLSC]LG11_SW:11#滤格水位" +
+                ",[JLSC]LG12_SW:12#滤格水位" +
+                ",[JLSC]GFJ1.Run:1#鼓风机运行状态" +
+                ",[JLSC]GFJ1.Fault:1#鼓风机故障状态" +
+                ",[JLSC]GFJ2.Run:2#鼓风机运行状态" +
+                ",[JLSC]GFJ2.Fault:2#鼓风机故障状态" +
+                ",[JLSC]GFJ3.Run:3#鼓风机运行状态" +
+                ",[JLSC]GFJ3.Fault:3#鼓风机故障状态" +
+                ",[JLSC]FCB1.Run:1#反冲泵运行状态" +
+                ",[JLSC]FCB1.Fault:1#反冲泵故障状态" +
+                ",[JLSC]FCB2.Run:2#反冲泵运行状态" +
+                ",[JLSC]FCB2.Fault:2#反冲泵故障状态" +
+                ",[JLSC]FCB3.Run:3#反冲泵运行状态" +
+                ",[JLSC]FCB3.Fault:3#反冲泵故障状态" +
+                ",[JYJ]JSLLJ:进水流量" +
+                ",[JYJ]YSGZD:进水高浊度分析仪" +
+                ",[JYJ]YSPH:进水PH" +
+                ",[JYJ]YSYL:进水压力" +
+                ",[JYJ]JLJ1.Kaidu_FK:加氯机1开度反馈" +
+                ",[JYJ]JLJ2.Kaidu_FK:加氯机2开度反馈" +
+                ",[JYJ]JLJ3.Kaidu_FK:加氯机3开度反馈" +
+                ",[JYJ]JLJ4.Kaidu_FK:加氯机4开度反馈";
+        String tpl = "{" +
+                "      \"identifier\": \"{}\",\n" +
+                "      \"name\": \"{}\",\n" +
+                "      \"required\": true,\n" +
+                "      \"dataType\": \"double\" ,\n" +
+                "      \"description\": \"{}\"\n" +
+                "    },";
+        String[] items = str.split(",");
+        for(String item : items){
+            String[] kv = item.split(":");
+            String result1 = StrFormatter.format(tpl, kv[0], kv[1],kv[1]);
+            System.out.println(result1);
+        }
+    }
+}

meter-reading-tianjin/src/main/java/com/huaxu/zoniot/MeterReadingTianJinApplication.java

@@ -2,6 +2,7 @@ package com.huaxu.zoniot;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 /**
@@ -11,6 +12,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
  * @Date 2020/12/16 21:09
  * @Version 1.0
  */
+@EnableCaching
 @EnableAsync
 @SpringBootApplication
 public class MeterReadingTianJinApplication {

meter-reading-tianjin/src/main/java/com/huaxu/zoniot/service/impl/TianJinMeterReadingServiceImpl.java

@@ -93,7 +93,7 @@ public class TianJinMeterReadingServiceImpl implements TianJinMeterReadingServic
             waterMeter.setDeviceNo(request.getImei());
             waterMeter.setMeterNo(request.getRegistNo());
             waterMeter.setMeterFileNo(request.getCustomerNo());
-            waterMeter.setLocation(request.getLocation());
+            waterMeter.setLocation(request.getAddr()+request.getLocation());
             if(request.getMeterType() == 1){
                 // Lora表
                 waterMeter.setDeviceTypeId(deviceTypeLoraCode);

meter-reading-tianjin/src/test/java/com/huaxu/zoniot/MeterReadRecordTests.java

@@ -1,9 +1,12 @@
 package com.huaxu.zoniot;
 
 import com.alibaba.fastjson.JSON;
+import com.huaxu.zoniot.dao.MeasuringDescMapper;
 import com.huaxu.zoniot.dto.RespData;
+import com.huaxu.zoniot.entity.MeasuringDesc;
 import com.huaxu.zoniot.entity.MeterReadRecord;
 import com.huaxu.zoniot.repository.MeterReadRecordRepository;
+import com.huaxu.zoniot.service.MeasuringDescService;
 import com.huaxu.zoniot.service.TianJinMeterReadingService;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +19,7 @@ import org.springframework.data.mongodb.core.query.Query;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p></p>
@@ -35,6 +39,12 @@ public class MeterReadRecordTests {
 
     @Autowired
     TianJinMeterReadingService  tianJinMeterReadingService;
+
+    @Autowired
+    MeasuringDescMapper measuringDescMapper;
+
+    @Autowired
+    MeasuringDescService measuringDescService ;
     @Test
     void contextLoads() {
     }
@@ -76,6 +86,21 @@ public class MeterReadRecordTests {
         RespData respData = tianJinMeterReadingService.
                 queryReadRecordData(imeis.split(","), readDay,1);
         System.out.println(JSON.toJSONString(respData));
+    }
+    
+    @Test 
+    public void measuringDescMapperTest(){
+        List<MeasuringDesc> measuringDescList = measuringDescMapper.findMeasuringDescListByDeviceType(15);
+        for(MeasuringDesc desc : measuringDescList){
+            System.out.println(JSON.toJSONString(desc));
+        }
+    }
 
+    @Test
+    public void measuringDescServiceTest(){
+        Map<String, MeasuringDesc> measuringDescMap = measuringDescService.findMeasuringDesc(168);
+        measuringDescMap.forEach((key,value)->{
+            System.out.println(key+"--->"+JSON.toJSONString(value));
+        });
     }
 }