1. 授权封装位置调整

2. 日志控制台查询封装
3. 添加软适配 同步接口调用
4. pom.xml 引用错误修复

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java

@@ -0,0 +1,107 @@
+package cn.estsh.i3plus.pojo.model.license;
+
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-2-10 下午5:10
+ * @Modify:
+ **/
+@Data
+public class ImppLicense implements Serializable {
+
+    private static final long serialVersionUID = 2365830603839063328L;
+    /**
+     *
+     * 授权人名称
+     * 授权开始时间
+     * 授权结束时间
+     *
+     * 授权工厂
+     * 仓库
+     * 产线
+     * 用户
+     * 授权描述
+     * 同时最大在线数量
+     *
+     */
+
+    /* 基础信息 */
+    @ApiParam(value ="授权ID")
+    private Long Id;                            // ID
+    @ApiParam(value ="授权应用ID")
+    private Long appId;                         // APP_ID
+    @ApiParam(value ="授权读取授权数据ID")
+    private Integer licenseSourceId;            // 授权数据来源
+    public String getLicenseSourceTxt() {
+        return licenseSourceId == null ? null : CommonEnumUtil.LICENSE_SOURCE.valueOf(licenseSourceId);
+    }
+
+    /* 授权信息 */
+    @ApiParam(value ="授权开始时间")
+    private Date licenseStartDateTime;          // 授权开始时间
+    @ApiParam(value ="授权结束时间")
+    private Date licenseEndDateTime;                // 授权结束时间
+    @ApiParam(value ="授权组织数量")
+    private Integer licenseMaxOrganize;         // 授权组织数量
+    @ApiParam(value ="授权仓库数量")
+    private Integer licenseMaxWarehouse;        // 授权仓库数量
+    @ApiParam(value ="授权产线数量")
+    private Integer licenseMaxProductionLine;   // 授权产线数量
+    @ApiParam(value ="授权用户数量")
+    private Integer licenseMaxUser;             // 授权用户数量
+    @ApiParam(value ="授权同时在线数量")
+    private Integer licenseMaxUserSession;      // 授权在线用户数量
+    @ApiParam(value ="授权描述信息")
+    private String licenseDescription;          // 授权描述信息
+    @ApiParam(value ="深思授权信息")
+    private ImppLicenseSenseshield senseshield;
+
+    /* 业务人员信息 */
+    @ApiParam(value ="授权创建时间")
+    private Date licenseCreateDateTime;         // 授权时间
+    @ApiParam(value ="授权创建人员ID")
+    private Long licenseCreateUserId;           // 授权用户ID
+    @ApiParam(value ="授权创建人员名称")
+    private String licenseCreateUserName;       // 授权人名称
+    @ApiParam(value ="授权更新人员ID")
+    private Long licenseUpdateUserId;           // 授权更新人员ID
+    @ApiParam(value ="授权更新人员名称")
+    private String licenseUpdateUserName;       // 授权人名称
+    @ApiParam(value ="授权更新人员时间")
+    private Date licenseUpdateDateTime;         // 授权更新时间
+
+    /* 授权锁信息(软锁,usb锁) */
+    @ApiParam(value ="授权使用开始时间")
+    private Date lockStartTime;
+    @ApiParam(value ="授权使用结束时间")
+    private Date lockEndTime;
+    @ApiParam(value ="锁类型")
+    private String lockType;
+
+    /* 基础业务逻辑 */
+    @ApiParam(value ="到期时间")
+    private Date maturityDateTime;
+
+    public void setSenseshield(ImppLicenseSenseshield senseshield) {
+        if(Objects.nonNull(senseshield)){
+            try {
+                this.lockStartTime = new Date(senseshield.getLast_update_timestamp() * 1000L);
+                this.lockEndTime = new Date((senseshield.getLast_update_timestamp() + senseshield.getSpan_time()) * 1000L);
+                this.lockType = senseshield.getType();
+                this.maturityDateTime = lockEndTime.getTime() > licenseEndDateTime.getTime() ? licenseEndDateTime: lockEndTime;
+            }catch (Exception e){
+            }
+        }
+        this.senseshield = senseshield;
+    }
+
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicenseSenseshield.java

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.model.license;
+
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-4-16 下午7:54
+ * @Modify:
+ **/
+@Data
+public class ImppLicenseSenseshield {
+
+
+    /**
+     * license_id : 170817
+     * enable : true
+     * guid : 6cece6946234ed4292617306ccd1191a
+     * first_use_time : 1587029768
+     * span_time : 315360000
+     * concurrent_type : win_user_session
+     * concurrent : 1000
+     * version : 0
+     * module : 0000000000000000
+     * last_update_timestamp : 1587029200
+     * last_update_timesn : 0
+     * rom_size : 1184
+     * raw_size : 1184
+     * pub_size : 0
+     * developer_id : 0800000000001005
+     * type : local
+     * sn : 9733c801000702075ed2000200270021
+     */
+
+    private int license_id;
+    private boolean enable;
+    private String guid;
+    private int first_use_time;
+    private int span_time;
+    private String concurrent_type;
+    private int concurrent;
+    private int version;
+    private String module;
+    private int last_update_timestamp;
+    private int last_update_timesn;
+    private int rom_size;
+    private int raw_size;
+    private int pub_size;
+    private String developer_id;
+    private String type;
+    private String sn;
+
+
+}

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

@@ -1,12 +1,14 @@
 package cn.estsh.i3plus.pojo.model.softswitch;
 
 import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.softswitch.bean.*;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
  * @Description : 适配器model
@@ -23,6 +25,9 @@ public class BsSuitCaseModel implements Serializable {
     @ApiParam(value = "适配器")
     private BsSuitCase bsSuitCase;
 
+    @ApiParam(value = "适配器同步处理Cloud微服务标识")
+    private Integer resultSoftType;
+
     @ApiParam(value = "数据源适配套件")
     private BsSuitCaseDataSource bsSuitCaseDataSource;
 
@@ -49,5 +54,8 @@ public class BsSuitCaseModel implements Serializable {
 
     public BsSuitCaseModel(BsSuitCase bsSuitCase) {
         this.bsSuitCase = bsSuitCase;
+        if(Objects.nonNull(bsSuitCase.getResultSoftType())){
+            this.resultSoftType = bsSuitCase.getResultSoftType();
+        }
     }
 }

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

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.model.softswitch;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-4-18 上午10:26
+ * @Modify:
+ **/
+@Data
+public class SuitImppCloudModel {
+
+    @ApiParam(value = "适配器信息")
+    private BsSuitCaseModel model;
+
+    @ApiParam(value = "请求参数信息")
+    private Object param;
+
+    public SuitImppCloudModel() {
+    }
+
+    public SuitImppCloudModel(SuitServerModel serverModel) {
+        this.model = serverModel.getBsSuitCaseModel();
+        this.param = serverModel.getObj();
+        this.param = serverModel.getObj();
+    }
+
+    public SuitImppCloudModel(BsSuitCaseModel model, Object param) {
+        this.model = model;
+        this.param = param;
+    }
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.platform.platbean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;

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

@@ -108,6 +108,13 @@ public class BsSuitCase extends BaseBean {
     @ApiParam(value = "是否推送MQ")
     private Integer isPushMQ;
 
+    @Column(name = "RESULT_SOFT_TYPE")
+    @ApiParam(value = "同步调用微服务")
+    private Integer resultSoftType;
+    public String getResultSoftTypeTxt() {
+        return resultSoftType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(resultSoftType);
+    }
+
     @Column(name = "SSL_KEY_ID")
     @ApiParam(value = "证书id")
     @JsonSerialize(using = ToStringSerializer.class)