[任务：1851 安灯升级配置变更]

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRoute.java

@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
+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;
+import java.io.Serializable;
+
+/**
+ * @Description : ANDON_上升流程配置
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 9:53
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_RITE_ROUTE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_上升流程配置")
+public class AndonRiteRoute extends BaseBean  implements Serializable {
+
+    private static final long serialVersionUID = 5542314911937418047L;
+
+    @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型")
+    private String alarmCode;
+
+    @AnnoOutputColumn(refClass = AndonEnumUtil.ANDON_ACTION_TAG.class,refForeignKey = "code",value = "description")
+    @Column(name = "ANDON_STATUS")
+    @ApiParam(value = "安灯状态")
+    private String andonStatus;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心")
+    private String workCenterCode;
+
+    @Column(name = "MEMO")
+    @ApiParam(value = "备注")
+    private String memo;
+
+    @AnnoOutputColumn(hidden = true)
+    @Column(name = "WORK_CENTER_NAME_RDD")
+    @ApiParam(value = "工作中心名称")
+    private String workCenterNameRdd;
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRouteDetail.java

@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
+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;
+import java.io.Serializable;
+
+/**
+ * @Description : ANDON_上升配置明细
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 9:53
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_RITE_ROUTE_DETAIL")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_上升配置明细")
+public class AndonRiteRouteDetail extends BaseBean  implements Serializable {
+
+    private static final long serialVersionUID = 8382210828244626428L;
+
+    @Column(name = "RITE_ROUTE_ID")
+    @ApiParam(value = "上升流程配置ID")
+    private Long riteRouteId;
+
+    @Column(name = "RP_WHERE")
+    @ApiParam(value = "通知时间")
+    private String rpWhere;
+
+    @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")
+    @Column(name = "RP_CODE")
+    @ApiParam(value = "通知方式代码")
+    private String rpCode;
+
+    @Column(name = "RP_OBJECT_CODE")
+    @ApiParam(value = "通知对象")
+    private String rpObjectCode;
+
+    @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_LEVEL.class,refForeignKey = "value",value = "description")
+    @Column(name = "RP_LEVEL")
+    @ApiParam(value = "通知级别")
+    private String rpLevel;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRiteRouteDetailModel.java

@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 上升配置明细model
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-11-12-10:21
+ * @Modify:
+ **/
+@Data
+public class AndonRiteRouteDetailModel implements Serializable {
+
+    private static final long serialVersionUID = 1993963582174708808L;
+
+    @ApiParam(value = "安灯类型")
+    private String alarmCode;
+
+    @ApiParam(value = "安灯状态")
+    private String andonStatus;
+
+    @ApiParam(value = "工作中心")
+    private String workCenterCode;
+
+    @ApiParam(value = "备注")
+    private String memo;
+
+    @ApiParam(value = "工作中心名称")
+    private String workCenterNameRdd;
+
+    @ApiParam(value = "上升流程配置ID")
+    private Long riteRouteId;
+
+    @ApiParam(value = "通知时间")
+    private String rpWhere;
+
+    @ApiParam(value = "通知方式代码")
+    private String rpCode;
+
+    @ApiParam(value = "通知对象")
+    private String rpObjectCode;
+
+    @ApiParam(value = "通知级别")
+    private String rpLevel;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteDetailRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRouteDetail;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface IAndonRiteRouteDetailRepository extends BaseRepository<AndonRiteRouteDetail, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRoute;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface IAndonRiteRouteRepository extends BaseRepository<AndonRiteRoute, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -988,4 +988,50 @@ public class AndonHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 上升流程配置
+     * @param riteRoute
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonRiteRoute(AndonRiteRoute riteRoute, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(riteRoute, organizeCode);
+        if (!StringUtils.isEmpty(riteRoute.getAlarmCode())) {
+            DdlPreparedPack.getStringLikerPack(riteRoute.getAlarmCode(), "alarmCode", packBean);
+        }
+        if (!StringUtils.isEmpty(riteRoute.getAndonStatus())) {
+            DdlPreparedPack.getStringEqualPack(riteRoute.getAndonStatus(), "andonStatus", packBean);
+        }
+        if (!StringUtils.isEmpty(riteRoute.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(riteRoute.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(riteRoute.getWorkCenterNameRdd())) {
+            DdlPreparedPack.getStringLikerPack(riteRoute.getWorkCenterNameRdd(), "workCenterNameRdd", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 上升配置明细
+     * @param riteRouteDetail
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonRiteRouteDetail(AndonRiteRouteDetail riteRouteDetail, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(riteRouteDetail, organizeCode);
+        if (!StringUtils.isEmpty(riteRouteDetail.getRiteRouteId())) {
+            DdlPreparedPack.getNumEqualPack(riteRouteDetail.getRiteRouteId(), "riteRouteId", packBean);
+        }
+        if (!StringUtils.isEmpty(riteRouteDetail.getRpCode())) {
+            DdlPreparedPack.getStringEqualPack(riteRouteDetail.getRpCode(), "rpCode", packBean);
+        }
+        if (!StringUtils.isEmpty(riteRouteDetail.getRpLevel())) {
+            DdlPreparedPack.getStringEqualPack(riteRouteDetail.getRpLevel(), "rpLevel", packBean);
+        }
+        if (!StringUtils.isEmpty(riteRouteDetail.getRpObjectCode())) {
+            DdlPreparedPack.getStringLikerPack(riteRouteDetail.getRpObjectCode(), "rpObjectCode", packBean);
+        }
+        return packBean;
+    }
 }