Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo

modules/i3plus-pojo-aps/pom.xml

@@ -11,6 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-aps</artifactId>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java

@@ -21,5 +21,4 @@ public class GanttCalendarModel {
     //private String timeRangeColor;
     private String eventColor;
     private String name;
-    private Long workId;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java

@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import lombok.Data;
+
+@Data
+public class GanttDragModel {
+    private Long workId;
+    private Long resId;
+    private Long targetWorkId;
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventRequest.java

@@ -20,7 +20,7 @@ import java.util.List;
  **/
 @Data
 @Api("甘特图分页查询参数")
-public class GanttEventModel {
+public class GanttEventRequest {
     private Long[] resourceIds;
     @JsonSerialize(using = CustomDateSerializer.class)
     @JsonDeserialize(using = CustomDateDeserializer.class)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class GanttPlanModel {
+    private Long resourceId;
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
+    private Date startDate;
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
+    private Date endDate;
+    private String cls;
+    //private String timeRangeColor;
+    private String eventColor;
+    private String name;
+    private Long workId;
+    private List<Long> resIds;
+}

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java

@@ -1972,7 +1972,7 @@ public class BlockFormEnumUtil {
         }
 
         private String getJDBCUrlMySQL(String database,String host,Integer port){
-            return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8&rewriteBatchedStatements=true";
+            return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8";
         }
 
         private String getJDBCUrlOracle(String database,String host,Integer port){
@@ -1984,7 +1984,7 @@ public class BlockFormEnumUtil {
         }
 
         private String getJDBCUrlSQLServer(String database,String host,Integer port){
-            return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+"?rewriteBatchedStatements=true";
+            return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true";
         }
     }
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java

@@ -15,7 +15,8 @@ import java.util.List;
 @Data
 public class WmsJobParamModel implements Serializable {
     private static final long serialVersionUID = 5784492509251527816L;
-    private String organizeCode;
+    private String organizeCode;//工厂代码
-    private List<String> zonesNoList;
+    private List<String> zonesNoList;//存储区编号
-    private Integer snType;
+    private Integer snType;//条码类型（虚拟，实物）
+    private String devOpsEmail;//运维人员邮箱
 }