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

modules/i3plus-pojo-hardswitch/pom.xml

@@ -42,6 +42,12 @@
             </properties>
         </profile>
     </profiles>
+    <dependencies>
+        <dependency>
+            <groupId>i3plus.pojo</groupId>
+            <artifactId>i3plus-pojo-base</artifactId>
+        </dependency>
+    </dependencies>
     <build>
         <finalName>${project.artifactId}-${project.version}</finalName>
     </build>

modules/i3plus-pojo-hardswitch/src/main/java/cn/estsh/i3plus/pojo/hardswitch/bean/OpcUAParam.java

@@ -0,0 +1,69 @@
+package cn.estsh.i3plus.pojo.hardswitch.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-11-12 17:03
+ * @Modify:
+ **/
+@Data
+public class OpcUAParam {
+
+    //opc.tcp://127.0.0.1:49320
+    @ApiParam("ua服务地址")
+    private String serverUrl;
+
+    /**
+     * 命名空间索引
+     * 地址所在的 OPC UA 服务器命名空间的索引。
+     */
+    @ApiParam("命名空间索引")
+    private Integer namespaceIndex;
+
+    /**
+     * 标记地址
+     * 通道.设备.标记
+     */
+    @ApiParam("标记地址")
+    private String tagAddress;
+
+    /**
+     * 标记值
+     */
+    @ApiParam("标记值")
+    private String tagValue;
+
+    /**
+     * 标记值类型
+     */
+    @ApiParam("标记值类型")
+//    @AnnoOutputColumn(refClass = OpcUAEnumUtil.OPC_UA_TAG_VALUE_TYPE.class)
+    private String tagValueType;
+    public String getTagValueTypeVal(){
+        return tagValueType == null ? "10" : tagValueType;
+    }
+
+    /**
+     * 用户名
+     */
+    @ApiParam("用户名")
+    private String userName;
+
+    /**
+     * 用户密码
+     */
+    @ApiParam("用户密码")
+    private String password;
+
+    /**
+     * 请求间隔
+     */
+    @ApiParam("请求间隔")
+    private Double requestInterval = 500.0;
+
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRecordModel.java

@@ -0,0 +1,33 @@
+package cn.estsh.i3plus.pojo.model.softswitch;
+
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-09-28 17:48
+ * @Modify:
+ **/
+@Data
+@ApiModel("适配记录模型")
+public class SuitRecordModel {
+
+    @ApiModelProperty("主记录")
+    private BsSuitRecord bsSuitRecord;
+
+    @ApiModelProperty("适配文件")
+    private BsSuitFile bsSuitFile;
+
+    public SuitRecordModel() {
+    }
+
+    public SuitRecordModel(BsSuitRecord bsSuitRecord, BsSuitFile bsSuitFile) {
+        this.bsSuitRecord = bsSuitRecord;
+        this.bsSuitFile = bsSuitFile;
+    }
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java

@@ -41,6 +41,7 @@ public class SuitServerModel implements Serializable {
     private String requestId;
     // 传输单对象
     @XmlElement(name = "data")
+    @XStreamAlias("data")
     private Object obj;
     // 传输集合
     private List list;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java

@@ -123,6 +123,9 @@ public class BsSuitCaseFTP extends BaseBean {
     @Transient
     @ApiParam(value = "临时适配路径")
     private String tempSuitFilePath;
+    @Transient
+    @ApiParam(value = "临时适配路径")
+    private List<String> ftpFileList;
 
     @Transient
     @ApiParam(value = "适配文件列表")

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java

@@ -85,4 +85,19 @@ public class BsSuitFile extends BaseBean {
     @ApiParam(value = "处理时间")
     private String processTime;
 
+    public void setFtpPathInfo(String ftpPathInfo){
+        if(ftpPathInfo == null){
+            return;
+        }
+
+        int pathIdx = ftpPathInfo.lastIndexOf("/");
+        if (pathIdx == -1) {
+            this.setFolderPath("/");
+            this.setFileName(ftpPathInfo);
+        }else{
+            this.setFolderPath(ftpPathInfo.substring(0,pathIdx));
+            this.setFileName(ftpPathInfo.substring(pathIdx + 1));
+        }
+    }
+
 }

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java

@@ -128,6 +128,7 @@ public class BsSuitRecord extends BaseBean {
 
     @Column(name = "PROCESS_STATE")
     @ApiParam(value = "处理状态")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.class)
     private Integer processState;
 
     @Column(name = "PROCESS_TIME")

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java

@@ -387,6 +387,7 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getStringLikerPack(bsSuitFile.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitFile.getSuitCaseId(), "suitCaseId", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitFile.getFileName(), "fileName", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitFile.getFolderPath(), "folderPath", ddlPackBean);
         DdlPreparedPack.timeBuilder(bsSuitFile.getSuitDateTime(), "suitDateTime", ddlPackBean, false, true);
 
         ddlPackBean.setOrderByStr(bsSuitFile.orderBy());
@@ -430,4 +431,13 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getNumEqualPack(bsBusiScript.getRefId(),"refId",ddlPackBean);
         return ddlPackBean;
     }
+
+    public static DdlPackBean packHqlCheckSuitFile(BsSuitFile bsSuitFile){
+        DdlPackBean ddlPackBean  = DdlPackBean.getDdlPackBean(bsSuitFile);
+        DdlPreparedPack.getNumEqualPack(bsSuitFile.getSuitCaseId(), "suitCaseId", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bsSuitFile.getFileName(),"fileName",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bsSuitFile.getFolderPath(),"folderPath",ddlPackBean);
+        DdlPreparedPack.getNumNOEqualPack(bsSuitFile.getId(),"id",ddlPackBean);
+        return ddlPackBean;
+    }
 }