/*设备类型管理->添加设备:增加新的设备类型失败问题解决。*/

inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/sftp/SftpClient.java

@@ -174,12 +174,13 @@ public class SftpClient {
             FTPSClient ftps = new FTPSClient(true);
 //            ftps.connect("192.168.1.198", 21);
 //            boolean loginRes = ftps.login("hangtian", "123qweasd");
-            ftps.connect("192.168.1.12", 1991);
+//            ftps.connect("124.221.104.159", 10990);
+            ftps.connect("192.168.1.193", 1990);
             boolean loginRes = ftps.login("ftpuser", "atia2018");
             System.out.println(loginRes);
             ftps.setFileType(2);
-            ftps.enterLocalPassiveMode();
-            ftps.enterLocalPassiveMode();
+//            ftps.enterLocalPassiveMode();
+//            ftps.enterLocalPassiveMode();
             ftps.setControlEncoding("UTF-8");
             ftps.setFileTransferMode(10);
             ftps.execPROT("P");

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java

@@ -122,20 +122,20 @@ public class ResultAnalysisController extends BaseController {
                         if (stringStringMap != null) {
                             if (StringUtils.isNotEmpty(stringStringMap.get("point_impt_level"))) {
                                 if (stringStringMap.get("point_impt_level").equals("Ⅰ")) {
-                                    brr.setWarnLevel("紧急");
+                                    brr.setWarnLevel("EMERGENCY");
                                 } else if (stringStringMap.get("point_impt_level").equals("Ⅱ")) {
-                                    brr.setWarnLevel("严重");
+                                    brr.setWarnLevel("SERIOUS");
                                 } else {
-                                    brr.setWarnLevel("一般");
+                                    brr.setWarnLevel("TEPID");
                                 }
                             } else {
-                                brr.setWarnLevel("一般");
+                                brr.setWarnLevel("TEPID");
                             }
                         } else {
-                            brr.setWarnLevel("一般");
+                            brr.setWarnLevel("TEPID");
                         }
                     } else {
-                        brr.setWarnLevel("正常");
+                        brr.setWarnLevel("NORMAL");
                     }
                 }
 

inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml

@@ -217,7 +217,7 @@
     <select id="selectChannelByEqId" parameterType="String" resultType="java.util.Map">
         select *
         from basedata_eqpbook_channel
-        where eqpbook_id = #{eqId}
+        where eqp_book_id = #{eqId}
     </select>
     <select id="selectPointInfoByCode" parameterType="String" resultType="java.util.Map">
         select *

inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/domain/BasedataDeviceType.java

@@ -10,6 +10,7 @@ import lombok.Setter;
 @Getter
 public class BasedataDeviceType extends TreeEntity {
     private static final long serialVersionUID = 1L;
+    @JsonProperty("devicetypeId")
     private Long deviceTypeId;
     
     @Excel(

inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/domain/vo/ProDeviceTypeTreeSelectVO.java

@@ -14,6 +14,7 @@ import lombok.Setter;
 public class ProDeviceTypeTreeSelectVO {
     private static final long serialVersionUID = 1L;
     private Long parentId;
+    @JsonProperty("devicetypeId")
     private Long deviceTypeId;
     @Excel(
             name = "电力主设备标识-Yes:是；No：否"

inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/service/impl/BasedataDeviceTypeServiceImpl.java

@@ -38,12 +38,13 @@ public class BasedataDeviceTypeServiceImpl implements IBasedataDeviceTypeService
         return this.basedataDevicetypeMapper.selectBasedataDeviceTypeList(basedataDevicetype);
     }
 
-    public int insertBasedataDeviceType(BasedataDeviceType basedataDevicetype) {
-        BasedataDeviceType info = basedataDevicetypeMapper.selectBasedataDeviceTypeByDeviceTypeId(basedataDevicetype.getParentId());
-        basedataDevicetype.setLevel(info.getLevel() + 1);
-        basedataDevicetype.setAncestors(info.getAncestors() + "," + basedataDevicetype.getParentId());
-        basedataDevicetype.setCreateTime(DateUtils.getNowDate());
-        return basedataDevicetypeMapper.insertBasedataDeviceType(basedataDevicetype);
+    public int insertBasedataDeviceType(BasedataDeviceType basedataDeviceType) {
+        log.info("[METADATA] insertBasedataDeviceType, param: {}", basedataDeviceType);
+        BasedataDeviceType info = basedataDevicetypeMapper.selectBasedataDeviceTypeByDeviceTypeId(basedataDeviceType.getParentId());
+        basedataDeviceType.setLevel(info.getLevel() + 1);
+        basedataDeviceType.setAncestors(info.getAncestors() + "," + basedataDeviceType.getParentId());
+        basedataDeviceType.setCreateTime(DateUtils.getNowDate());
+        return basedataDevicetypeMapper.insertBasedataDeviceType(basedataDeviceType);
     }
 
     public int updateBasedataDeviceType(BasedataDeviceType basedataDevicetype) {

inspect-metadata/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-	<property name="log.path" value="logs/iip-gateway" />
+	<property name="log.path" value="logs/inspect-metadata" />
    <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />