From 7831940c2aa8856c232317210f08a47c730a8cee Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 22 May 2019 20:48:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?FastDfs=20=E6=B7=BB=E5=8A=A0=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index c729338..5b60a92 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -382,6 +382,7 @@ public class CoreHqlPack { HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); HqlPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); + HqlPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); if(user.getRoleIdList() != null){ HqlPack.getInPack(StringUtils.join(user.getRoleIdList(),","),"id",result); @@ -493,6 +494,7 @@ public class CoreHqlPack { // HqlPack.getNumEqualPack(userInfo.getDepartmentId(),"departmentId",result); HqlPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result); HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); + HqlPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result); if(userInfo.getDepartmentIdList() != null && userInfo.getDepartmentIdList().size() > 0){ HqlPack.getInPack(StringUtils.join(userInfo.getDepartmentIdList(), ","), "departmentId", result); From a42bb71aeeeadf30f41a5ce539d570c833443e3a Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 22 May 2019 20:57:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?docker=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index ec7d5c4..d98d25d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -54,9 +54,9 @@ public class AndonEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_BUSI_FLAG{ - ALARM_FLAG("10","按灯状态"), - USER_CODE("20","工号"), - READ_FLAG("30", "读取状态"); + ALARM_FLAG("10","安灯呼叫标识"), + USER_CODE("20","用户工号"), + READ_FLAG("30", "安灯读取状态"); private String value; private String description; @@ -192,11 +192,11 @@ public class AndonEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_CODE{ - PART("MM","物料"), - QUALITY("QM","质量"), - EQUIP("EQ","设备"), - PROCESS("GY","工艺"), - CHECK("JC","检测"); + PART("PART_ALARM","物料"), + QUALITY("QUALITY_ALARM","质量"), + EQUIP("EQUMENT_ALARM","设备"), + PROCESS("ROUTING_ALARM","工艺"), + CHECK("OTHER_ALARM","其他"); private String value; private String description; From d62904cac7c506dc8fae8cbf4e2e24582c99acc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Thu, 23 May 2019 09:49:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?ANDON=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=88=E5=BE=85=E6=94=B9=E8=BF=9B=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/AndonManageQueue.java | 28 ++++------------------ 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java index 933464b..e88717d 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java @@ -230,11 +230,11 @@ public class AndonManageQueue extends BaseBean { @Transient @ApiParam(value = "平均响应时长", example = "0") - private Double avgSignTime; + private Long avgSignTime; @Transient @ApiParam(value = "平均解决时长", example = "0") - private Double avgResolveTime; + private Long avgResolveTime; @Transient @ApiParam(value = "查询条件：ANDON状态") @@ -278,18 +278,18 @@ public class AndonManageQueue extends BaseBean { /** * 原因统计 构造函数 + * @param alarmCode * @param workCenterCode * @param workCellCode - * @param alarmCode * @param ecCode * @param ecNameRdd * @param emCode * @param emNameRdd + * @param andonCount * @param avgSignTime * @param avgResolveTime - * @param andonCount */ - public AndonManageQueue(String workCenterCode, String workCellCode, String alarmCode, String ecCode, String ecNameRdd, String emCode, String emNameRdd, Double avgSignTime, Double avgResolveTime, Long andonCount) { + public AndonManageQueue(String workCenterCode, String workCellCode, String alarmCode, String ecCode, String ecNameRdd, String emCode, String emNameRdd, Long avgSignTime, Long avgResolveTime, Long andonCount) { this.alarmCode = alarmCode; this.workCenterCode = workCenterCode; this.workCellCode = workCellCode; @@ -303,24 +303,6 @@ public class AndonManageQueue extends BaseBean { } /** - * 人员统计 构造函数 - * @param resetUser - * @param alarmCode - * @param andonCount - * @param proportion - * @param avgSignTime - * @param avgResolveTime - */ - public AndonManageQueue(String resetUser, String alarmCode, Long andonCount, Double proportion, Double avgSignTime, Double avgResolveTime) { - this.alarmCode = alarmCode; - this.resetUser = resetUser; - this.andonCount = andonCount; - this.avgSignTime = avgSignTime; - this.avgResolveTime = avgResolveTime; - this.proportion = proportion; - } - - /** * 柏拉图统计 构造函数 * @param alarmCode * @param ecCode