Merge branch 'dev' into test

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

@@ -757,8 +757,8 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CONFIG_TYPE {
 
-        FASTDFS_SAVE_PATH(10, "savePath");
-
+        FASTDFS_SAVE_PATH(10, "savePath"),
+        NGINX_IP(20,"nginxIp");
 
         private int value;
         private String description;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java

@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.mes.pcn.sqlpack;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesConfig;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @Description:
@@ -26,4 +28,24 @@ public class MesHqlPack {
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
         return packBean;
     }
+
+    /**
+     * MES PCN系统配置信息条件查询
+     *
+     * @param mesConfig
+     * @return
+     */
+    public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) {
+        DdlPackBean packBean = getAllBaseData(organizeCode);
+        if (StringUtils.isNotEmpty(mesConfig.getCfgCode())) {
+            DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesConfig.getCfgName())) {
+            DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean);
+        }
+        if (mesConfig.getIsValid() != null) {
+            DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean);
+        }
+        return packBean;
+    }
 }

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

@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -65,10 +66,12 @@ public class MesPlanOrder extends BaseBean {
     private Integer status;
 
     @Column(name="START_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam("计划开始时间")
     private String startTime;
 
     @Column(name="END_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam("计划结束时间")
     private String endTime;
 

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

@@ -26,6 +26,9 @@ public class FastDfsDownloadModel {
     private String fileName;
 
     @ApiParam("文件字节")
-    private byte[] fileByte;
+    private String fileByte;
+
+    @ApiParam("文件url")
+    private String url;
 
 }