新增mes-pcn同步配置基础数据

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

@@ -0,0 +1,80 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+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;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-05-30-17:32
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PCN_SYNC_CFG")
+@Api("MES_PCN_同步配置")
+public class MesPcnSyncCfg extends BaseBean {
+    @Column(name="PCN_CODE")
+    @ApiParam("PCN代码")
+    private String pcnCode;
+
+    @Column(name="OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name="OBJECT_NAME")
+    @ApiParam("对象名称")
+    private String objectName;
+
+    @Column(name="OBJECT_KEY")
+    @ApiParam("对象主键")
+    private String objectKey;
+
+    @Column(name="SYNC_FREQUENCY")
+    @ApiParam("同步频率")
+    private Integer syncFrequency;
+
+    @Column(name="SYNC_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value ="同步时间")
+    private String syncTime;
+
+    @Column(name="SYNC_PATTERN")//2、新增  1、修改
+    @ApiParam("同步方式")
+    private Integer syncPattern;
+
+    @Column(name="SYNC_TYPE")//1\pcn获取mes数据   2、pcn推送数据至mes
+    @ApiParam("同步类型")
+    private Integer syncType;
+
+    @Column(name="LAST_SYNC_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value ="上一同步时间")
+    private String lastSyncTime;
+
+    public int getSyncFrequencyVal() {
+        return this.syncFrequency == null ? 0 : this.syncFrequency;
+    }
+
+    public int getSyncTypeVal() {
+        return this.syncType == null ? 0 : this.syncType;
+    }
+
+    public int getSyncPatternVal() {
+        return this.syncPattern == null ? 0 : this.syncPattern;
+    }
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSyncCfgRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPcnSyncCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-04-24-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesPcnSyncCfgRepository extends BaseRepository<MesPcnSyncCfg, Long> {
+}

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

@@ -717,4 +717,41 @@ public class MesHqlPack {
 
         return packBean;
     }
+
+    /**
+     * MES对象与dao对应关系查询条件封装
+     * @param objectDao
+     * @return
+     */
+    public static DdlPackBean getMesObjectDao(MesObjectDao objectDao, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(objectDao, organizeCode);
+        if (StringUtils.isNotEmpty(objectDao.getObjectCode())){
+            DdlPreparedPack.getStringEqualPack(objectDao.getObjectCode(), "objectCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(objectDao.getDaoClass())){
+            DdlPreparedPack.getStringEqualPack(objectDao.getDaoClass(), "daoClass", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES-PCN同步配置查询条件封装
+     * @param pcnSyncCfg
+     * @return
+     */
+    public static DdlPackBean getMesPcnSyncCfg(MesPcnSyncCfg pcnSyncCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(pcnSyncCfg, organizeCode);
+        if (StringUtils.isNotEmpty(pcnSyncCfg.getObjectCode())){
+            DdlPreparedPack.getStringEqualPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(pcnSyncCfg.getPcnCode())){
+            DdlPreparedPack.getStringEqualPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean);
+        }
+        if (null != pcnSyncCfg.getSyncType()){
+            DdlPreparedPack.getNumEqualPack(pcnSyncCfg.getSyncType(), "syncType", packBean);
+        }
+
+        return packBean;
+    }
 }