device代码添加字段

pqs-common/common-core/src/main/java/com/njcn/common/utils/PubUtils.java

@@ -92,6 +92,24 @@ public class PubUtils {
         return bf.format(new Date());
     }
 
+    /**
+     * 毫秒转时间 ms:需要转换的毫秒时间
+     */
+    public static Date ms2Date(Long ms) {
+        Calendar c = Calendar.getInstance();
+        c.setTimeInMillis(ms);
+        return c.getTime();
+    }
+
+    /**
+     * 日期转字符串函数 date:需要转换的日期 strFormat:转换的格式(yyyy-MM-dd HH:mm:ss)
+     */
+    public static String date2String(Date date, String strFormat){
+        SimpleDateFormat format = new SimpleDateFormat(strFormat);
+
+        return format.format(date);
+    }
+
     /**
      * 获取当前web的IP
      */

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/LineDevGetDTO.java

@@ -53,6 +53,11 @@ public class LineDevGetDTO {
      */
     private Integer lineType;
 
+    /**
+     * pq返回干扰源类型 pms主网返回监测对象类型，配网返回监测点类别
+     */
+    private String lineTag;
+
     /**
      * 装置通讯状态
      */

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml

@@ -25,10 +25,12 @@
             pq_dept_line.id unitId,
             point.id pointId,
             lineDetail.Time_Interval as `interval`,
+            lineDetail.load_type lineTag,
             dic.value voltageLevel,
             dev.id devId,
             device.com_flag comFlag,
-            1 as lineType
+            1 as lineType,
+            0 as type
         </if>
         <!--母线-->
         <if test="type == 2">