Merge branch 'demo_' of http://123.60.19.203:8088/hitch/hitch-sb into demo_

platform-dao/src/main/resources/mapper/sb/SbInfoMapper.xml

@@ -224,7 +224,7 @@ user.real_name as saveUserName,sb.repair_dept_id
             and sb.position_no = #{positionNo}
         </if>
         <if test="ppNo != null and ppNo!=''">
-            and sb.pp_no = #{ppNo}
+            and sb.pp_no like concat('%',#{ppNo},'%')
         </if>
         <if test="likeDeptCode != null and likeDeptCode!=''">
             and sdDept.dept_code like concat(#{likeDeptCode},'%')
@@ -426,7 +426,7 @@ user.real_name as saveUserName,sb.repair_dept_id
             and sb.position_no = #{positionNo}
         </if>
         <if test="ppNo != null and ppNo!=''">
-            and sb.pp_no = #{ppNo}
+            and sb.pp_no like concat('%',#{ppNo},'%')
         </if>
         <if test="measureStatus != null">
             and sb.measure_status = #{measureStatus}
@@ -509,7 +509,7 @@ user.real_name as saveUserName,sb.repair_dept_id
             and sb.position_no = #{positionNo}
         </if>
         <if test="ppNo != null and ppNo!=''">
-            and sb.pp_no = #{ppNo}
+            and sb.pp_no like concat('%',#{ppNo},'%')
         </if>
         <if test="measureStatus != null">
             and sb.measure_status = #{measureStatus}

platform-iec/src/main/java/com/platform/iec/master/MasterSysDataHandler.java

@@ -1,5 +1,6 @@
 package com.platform.iec.master;
 
+import com.alibaba.fastjson.JSON;
 import com.ydl.iec.iec104.common.BasicInstruction104;
 import com.ydl.iec.iec104.core.CachedThreadPool;
 import com.ydl.iec.iec104.message.MessageDetail;
@@ -34,7 +35,8 @@ public class MasterSysDataHandler implements DataHandler {
 
 	@Override
 	public void channelRead(ChannelHandler ctx, MessageDetail ruleDetail104) throws Exception {
-		log.info("启动字符：" + ruleDetail104.getStart());
+		log.info("接收上送数据：" + JSON.toJSONString(ruleDetail104));
+		/*log.info("启动字符：" + ruleDetail104.getStart());
 		log.info("字节长度：" + ruleDetail104.getApuuLength());
 		byte[] control  = ruleDetail104.getControl();
 		log.info("控制域：Accept" + Iec104Util.getAccept(control));
@@ -49,17 +51,12 @@ public class MasterSysDataHandler implements DataHandler {
 		log.info("是否有消息元素：" + ruleDetail104.isMessage());
 		log.info("判断是否有限定词：" + ruleDetail104.getQualifiersType());
 		log.info("判断是否有时标：" + ruleDetail104.isTimeScaleExit());
-		log.info("判断消息是否连续：" + ruleDetail104.isContinuous());
-
+		log.info("判断消息是否连续：" + ruleDetail104.isContinuous());*/
+		log.info(JSON.toJSONString(ruleDetail104));
 		if(ruleDetail104.getMeasgLength()>0){
-			MySqlUtil.dealMessage(ruleDetail104 );
-		}
-		try {
-			log.info("是否有消息元素：" + ruleDetail104.getQualifiersType().getValue());
-		}catch (Exception e){
-			e.printStackTrace();
+			MySqlUtil.dealMessage(ruleDetail104);
 		}
-		if(ruleDetail104.getQualifiersType() != null){
+		/*if(ruleDetail104.getQualifiersType() != null){
 			log.info("限定词：" + ruleDetail104.getQualifiersType().getValue());
 		}else{
 			log.info("限定词： 无");
@@ -67,7 +64,7 @@ public class MasterSysDataHandler implements DataHandler {
 		log.info("时标：" + ruleDetail104.getTimeScale());
 		log.info("限定词：" + ruleDetail104.getHexString());
 		System.out.println(ruleDetail104);
-		System.err.print("收到消息");
+		System.err.print("收到消息");*/
 	}
 
 	public static void main(String[] args) {

platform-iec/src/main/java/com/ydl/iec/util/Iec104Util.java

@@ -12,11 +12,10 @@ import com.ydl.iec.iec104.enums.UControlEnum;
 * @date 2020年5月13日
  */
 public class Iec104Util {
-	
+
 	private static int controlLength = 4;
-	public static int port = 2404;
-	public static String host = "127.0.0.1";
-	
+	public static int port = 8404;
+	public static String host = "192.168.2.21";
 	/**
 	 * I 格式 低位在前
 	 * @param accept 接收序列号

platform-iec/src/main/java/com/ydl/iec/util/MySqlUtil.java

@@ -32,10 +32,10 @@ public class MySqlUtil {
     public static String mysql_driver = "com.mysql.cj.jdbc.Driver";
     // 采集数据，结构：遥测最低,遥测最高;电度最低,电度最高
     public static String remote_config = "REMOTE_CONFIG";
-    public static int remote_config_measure_min = 11;
-    public static int remote_config_measure_max = 11;
-    public static int remote_config_degree_min = 11;
-    public static int remote_config_degree_max = 11;
+    public static int remote_config_measure_min = 16400;
+    public static int remote_config_measure_max = 18101;
+    public static int remote_config_degree_min = 25601;
+    public static int remote_config_degree_max = 25712;
     private static Connection conn = null;
 
     public static Connection getConnection() {
@@ -67,6 +67,7 @@ public class MySqlUtil {
      * @param ruleDetail104
      */
     public static void dealMessage(MessageDetail ruleDetail104) {
+        log.info("处理数据中……………………" );
         LocalDateTime time = LocalDateTime.now();
         int year = time.getYear();
         int month = time.getMonthValue();
@@ -84,10 +85,12 @@ public class MySqlUtil {
         }
         // 新增电度数据
         if (!CollectionUtils.isEmpty(addMessage)) {
+            log.info("新增电度数量：" + addMessage.size() );
             addBatch(addMessage, time, year, month, day, hour);
         }
         // 更新遥测数据
-        if (!CollectionUtils.isEmpty(addMessage)) {
+        if (!CollectionUtils.isEmpty(updateMessage)) {
+            log.info("更新遥测数量：" + updateMessage.size() );
             updateBatch(updateMessage);
         }
     }

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -2110,7 +2110,9 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                     i++;
                     // 如果有检定周期，就是需要检定
                     SbInfo tempInfo = BeanConverterUtil.copyObjectProperties(vo, SbInfo.class);
-                    tempInfo.setSeatNumber(30);// 默认30天提醒
+                    if (vo.getSeatNumber() == null) {
+                        tempInfo.setSeatNumber(30);// 如果为空默认30天提醒
+                    }
 
                     // 对必填字段进行判断
                     if (StringUtils.isBlank(vo.getPositionNo())) {
@@ -2273,8 +2275,9 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                     i++;
                     // 如果有检定周期，就是需要检定
                     SbInfo tempInfo = BeanConverterUtil.copyObjectProperties(vo, SbInfo.class);
-                    tempInfo.setSeatNumber(30);// 默认30天提醒
-
+                    if (vo.getSeatNumber() == null) {
+                        tempInfo.setSeatNumber(30);// 如果为空默认30天提醒
+                    }
                     // 对必填字段进行判断
                     if (StringUtils.isBlank(vo.getPositionNo())) {
                         throw new BusinessException("第" + i + "行,位号为空，位号为必填项目，请填写;");// 编号为空，复制位号