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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -97,25 +97,25 @@ public abstract class BaseBean implements Serializable {
     public String modifyDatetime;
 
     @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="创建日期查询用，查询起始日期",example = "2018-01-01 01:00:00")
     @AnnoOutputColumn(hidden = true)
     public String createDateTimeStart;
 
     @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
     @AnnoOutputColumn(hidden = true)
     public String createDateTimeEnd;
 
     @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="修改日期查询用，查询起始日期",example = "2018-01-01 01:00:00")
     @AnnoOutputColumn(hidden = true)
     public String modifyDateTimeStart;
 
     @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "修改日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
     @AnnoOutputColumn(hidden = true)
     public String modifyDateTimeEnd;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java

@@ -60,6 +60,7 @@ public class XStreamFactory {
             }
         });
 
+        xStream.setMode(XStream.NO_REFERENCES);
         xStream.autodetectAnnotations(true);
 
         return xStream;

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

@@ -1030,6 +1030,57 @@ public class CommonEnumUtil {
         }
     }
 
+    /**
+     * 变量类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum  BASIS_TYPE {
+        INT(1, "int"),
+        DOUBLE(2, "double"),
+        LONG(3, "long"),
+        FLOAT(4, "float"),
+        CHAR(5, "char"),
+        BOOLEAN(6,"boolean"),
+        BYTE(7, "byte"),
+        SHORT(8, "short");
+
+        private int value;
+        private String description;
+
+        private BASIS_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
 
     // 数据有效的静态常量
     public static final int VALID = CommonEnumUtil.IS_VAILD.VAILD.getValue();

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -150,7 +150,12 @@ public class DdlPreparedPack {
                 } else {
                     order[i] = "desc";
                 }
-                sqlStr += " model." + columnName[i] + " " + order[i].toString() + ",";
+                if(columnName[i].indexOf(" model.") == -1){
+                    sqlStr += " model." + columnName[i];
+                }else{
+                    sqlStr += columnName[i];
+                }
+                sqlStr += " " + order[i].toString() + ",";
             }
         }
 
@@ -506,4 +511,24 @@ public class DdlPreparedPack {
             packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);
         }
     }
+
+    /**
+     * 转换排序列
+     * @param columnName 列名
+     * @param basisType 基本类型
+     * @see CommonEnumUtil.BASIS_TYPE
+     * @return
+     */
+    public static String getOrderColConvertType(String columnName,int basisType){
+        String name =" model." + columnName;
+
+        if (basisType == CommonEnumUtil.BASIS_TYPE.INT.getValue()) {
+            name = " cast(" + name+ " as integer)";
+        } else if (basisType == CommonEnumUtil.BASIS_TYPE.DOUBLE.getValue()){
+            name = " cast(" + name+ " as double)";
+        } else if (basisType == CommonEnumUtil.BASIS_TYPE.LONG.getValue()){
+            name = " cast(" + name+ " as long)";
+        }
+        return name;
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java

@@ -70,12 +70,12 @@ public class MesBom extends BaseBean {
 
     @Column(name = "EFF_START_TIME")
     @ApiParam(value = "生效时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private String effStartTime;
 
     @Column(name = "EFF_END_TIME")
     @ApiParam(value = "失效时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private String effEndTime;
 
     public double getQtyVal() {

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java

@@ -49,7 +49,7 @@ public class MesPcnSyncCfg extends BaseBean {
     private Integer syncFrequency;
 
     @Column(name="SYNC_TIME")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value ="同步时间")
     private String syncTime;
 
@@ -62,7 +62,7 @@ public class MesPcnSyncCfg extends BaseBean {
     private Integer syncType;
 
     @Column(name="LAST_SYNC_TIME")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value ="上一同步时间")
     private String lastSyncTime;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java

@@ -94,24 +94,24 @@ public class MesPlanOrder extends BaseBean {
 
     /**********************  冗余字段 *********************************/
     @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
     public String startTimeStart;
 
 
     @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
     public String startTimeEnd;
 
 
     @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
     public String endTimeStart;
 
     @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
     public String endTimeEnd;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
+import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -191,6 +192,11 @@ public class MesWorkOrder extends BaseBean {
         return Arrays.asList(MesEnumUtil.WORK_ORDER_SOURCE.values());
     }
 
+    @Transient
+    @ApiParam("mes生产工单页面按钮控制")
+    private MesWorkOrderButtonModel workOrderButtonModel;
+
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/8/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("mes生产工单页面按钮控制model")
+public class MesWorkOrderButtonModel implements Serializable {
+
+    @ApiParam("修改按钮")
+    private boolean updateButton;
+
+    @ApiParam("按配置修改按钮")
+    private boolean updateButton4Config;
+
+    @ApiParam("下达按钮")
+    private boolean transmitButton;
+
+    @ApiParam("测试动态下达按钮")
+    private boolean dynamicTransmitButton4Test;
+
+    @ApiParam("启动按钮")
+    private boolean startUpButton;
+
+    @ApiParam("暂停按钮")
+    private boolean suspendButton;
+
+    @ApiParam("撤销按钮")
+    private boolean revokeButton;
+
+    @ApiParam("关闭按钮")
+    private boolean closeButton;
+
+
+}

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

@@ -60,7 +60,6 @@ public class SuitCoreModel {
     /**
      * 适配器套件
      */
-    @XStreamOmitField
     private BsSuitCase bsSuitCase;
 
     /**
@@ -100,7 +99,7 @@ public class SuitCoreModel {
         // 设置套件代码
         this.suitCaseCode = bsSuitCase.getSuitCaseCode();
         // 设置默认
-        this.suitCaseStatusCode = ResourceEnumUtil.MESSAGE.FAIL.getCode();
+        this.suitCaseStatusCode = ResourceEnumUtil.MESSAGE.SUCCESS.getCode();
         // 设置默认
         this.suitSslKeyResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
         // 设置默认

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java

@@ -34,6 +34,10 @@ public class SysTask extends BaseBean {
     @ApiParam(value ="名称")
     private String name;
 
+    @Column(name="TASK_CODE")
+    @ApiParam(value ="任务代码")
+    private String taskCode;
+
     // 软件类型 CommonEnumUtil.SOFT_TYPE
     @Column(name="TASK_SOFT_TYPE")
     @ApiParam(value = "软件类型")
@@ -47,6 +51,10 @@ public class SysTask extends BaseBean {
     @ApiParam(value ="任务类名")
     private String taskClass;
 
+    @Column(name="IS_SYSTEM")
+    @ApiParam(value ="是否是系统job")
+    private String isSystem;
+
     @Column(name="TASK_DESCRIPTION")
     @ApiParam(value ="任务描述" , access ="任务描述")
     private String taskDescription;

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

@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
@@ -38,9 +39,31 @@ public class BsSuitSchedule extends BaseBean {
     @ApiParam(value = "适配套件名称")
     private String suitCaseNameRdd;
 
-    @Column(name = "EXECUTE_CRON")
+    @Column(name = "SCHEDULE_NAME")
-    @ApiParam(value = "执行时间表达式")
+    @ApiParam(value = "任务名称")
-    private String executeCron;
+    private String scheduleName;
+
+    @Column(name = "SCHEDULE_GROUP_NAME")
+    @ApiParam(value = "任务组名称")
+    private String scheduleGroupName;
+
+    @Column(name = "TASK_PLAN_ID")
+    @ApiParam(value = "任务计划id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long taskPlanId;
+
+    @Column(name = "TASK_CYCLE_ID")
+    @ApiParam(value = "任务周期id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long taskCycleId;
+
+    @Column(name = "TASK_CYCLE_NAME_RDD")
+    @ApiParam(value = "任务周期名称")
+    private String taskCycleName;
+
+    @Column(name = "TASK_CYCLE_EXECUTE_RDD")
+    @ApiParam(value = "任务周期表达式表达式")
+    private String taskCycleExecuteRdd;
 
     @Column(name = "LAST_EXECUTE_DATE_TIME")
     @ApiParam(value = "最后一次执行时间")

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

@@ -3,10 +3,7 @@ package cn.estsh.i3plus.pojo.softswitch.sqlpack;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsParamAdapter;
+import cn.estsh.i3plus.pojo.softswitch.bean.*;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam;
-import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase;
 import org.apache.commons.lang3.StringUtils;
 
 /**
@@ -145,4 +142,68 @@ public class SoftSwitchHqlPack {
         return ddlPackBean;
     }
 
+    /**
+     * 定时适配任务查询条件封装
+     * @param bsSuitSchedule 查询条件
+     * @return
+     */
+    public static DdlPackBean packHqlBsSuitSchedule(BsSuitSchedule bsSuitSchedule){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getScheduleGroupName(),"scheduleGroupName",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getSuitCaseId(),"suitCaseId",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getTaskCycleId(),"taskCycleId",ddlPackBean);
+
+        ddlPackBean.setOrderByStr(bsSuitSchedule.orderBy());
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 定时适配任务唯一校验
+     * @param bsSuitSchedule
+     * @return
+     */
+    public static DdlPackBean packHqlCheckBsSuitScheduleOnly(BsSuitSchedule bsSuitSchedule){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getId(),"id",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleGroupName(),"scheduleGroupName",ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 安全证书查询条件分页
+     * @param bsSslKey 查询条件
+     * @return
+     */
+    public static DdlPackBean packHqlBsSslKey(BsSslKey bsSslKey){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(),"keyName",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSslKey.getKeyType(),"keyType",ddlPackBean);
+
+        ddlPackBean.setOrderByStr(bsSslKey.orderBy());
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 安全证书唯一校验
+     * @param bsSslKey
+     * @return
+     */
+    public static DdlPackBean packHqlCheckBsSslKeyOnly(BsSslKey bsSslKey){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bsSslKey.getId(),"id",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(), "keyName", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -2078,8 +2078,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsCSRange.getLocateNo(), "locateNo", result);
         DdlPreparedPack.getStringLikerPack(wmsCSRange.getZoneNo(), "zoneNo", result);
 
-        DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"item"}, result);
+        DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{
-
+                DdlPreparedPack.getOrderColConvertType("item",CommonEnumUtil.BASIS_TYPE.INT.getValue())}, result);
         getStringBuilderPack(wmsCSRange, result);
 
         return result;