From 29e52d9524f22d7a641fd5658610a540e322d9aa Mon Sep 17 00:00:00 2001
From: gsz <fightgoo@qq.com>
Date: Fri, 17 May 2024 14:25:09 +0800
Subject: [PATCH] =?UTF-8?q?Mes=E8=AE=BE=E5=A4=87=E5=81=9C=E6=9C=BA?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0+=E8=AE=BE=E5=A4=87=E5=81=9C=E6=9C=BA?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/api/base/IMesBasDowntimeReasonService.java | 13 ++++++++++
 .../api/base/IMesBasDowntimeReasonTypeService.java | 13 ++++++++++
 .../base/MesBasDowntimeReasonController.java       | 18 ++++++++++++++
 .../base/MesBasDowntimeReasonTypeController.java   | 18 ++++++++++++++
 .../base/MesBasDowntimeReasonServiceImpl.java      | 28 ++++++++++++++++++++++
 .../base/MesBasDowntimeReasonTypeServiceImpl.java  | 27 +++++++++++++++++++++
 .../base/MesMaximoMeterMainDataServiceImpl.java    |  2 +-
 7 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonService.java
 create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonTypeService.java
 create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBasDowntimeReasonController.java
 create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBasDowntimeReasonTypeController.java
 create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonServiceImpl.java
 create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonTypeServiceImpl.java

diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonService.java
new file mode 100644
index 0000000..7796346
--- /dev/null
+++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonService.java
@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReason;
+
+/**
+ * @Description :设备停机原因
+ * @Reference :
+ * @Author : gsz
+ * @CreateDate 2024/5/17 14:06
+ * @Modify:
+ **/
+public interface IMesBasDowntimeReasonService extends IBaseMesService<MesBasDowntimeReason> {
+}
diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonTypeService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonTypeService.java
new file mode 100644
index 0000000..32c2ccd
--- /dev/null
+++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonTypeService.java
@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReasonType;
+
+/**
+ * @Description :设备停机类型
+ * @Reference :
+ * @Author : gsz
+ * @CreateDate 2024/5/17 14:06
+ * @Modify:
+ **/
+public interface IMesBasDowntimeReasonTypeService extends IBaseMesService<MesBasDowntimeReasonType> {
+}
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBasDowntimeReasonController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBasDowntimeReasonController.java
new file mode 100644
index 0000000..7b6df07
--- /dev/null
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBasDowntimeReasonController.java
@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
+
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReason;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : gsz
+ * @CreateDate : 2024-05-17 14:16
+ * @Modify:
+ **/
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesBasDowntimeReason")
+public class MesBasDowntimeReasonController extends BaseMesController<MesBasDowntimeReason>{
+}
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBasDowntimeReasonTypeController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBasDowntimeReasonTypeController.java
new file mode 100644
index 0000000..b5b33da
--- /dev/null
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBasDowntimeReasonTypeController.java
@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
+
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReasonType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : gsz
+ * @CreateDate : 2024-05-17 14:16
+ * @Modify:
+ **/
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesBasDowntimeReasonType")
+public class MesBasDowntimeReasonTypeController extends BaseMesController<MesBasDowntimeReasonType>{
+}
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonServiceImpl.java
new file mode 100644
index 0000000..e6c2010
--- /dev/null
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonServiceImpl.java
@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesBasDowntimeReasonService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReason;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @Description : Maximo仪表主数据
+ * @Reference :
+ * @Author : gsz
+ * @CreateDate 2024/5/17 14:06
+ * @Modify:
+ **/
+@Service
+@Slf4j
+public class MesBasDowntimeReasonServiceImpl extends BaseMesService<MesBasDowntimeReason> implements IMesBasDowntimeReasonService {
+
+    protected void setPackQueryBean(MesBasDowntimeReason bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getReasonCode(), "reasonCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getReasonName(), "reasonName", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getReasonType(), "reasonType", packBean);
+    }
+
+}
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonTypeServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonTypeServiceImpl.java
new file mode 100644
index 0000000..38d7566
--- /dev/null
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonTypeServiceImpl.java
@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesBasDowntimeReasonTypeService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReasonType;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @Description : Maximo仪表主数据
+ * @Reference :
+ * @Author : gsz
+ * @CreateDate 2024/5/17 14:06
+ * @Modify:
+ **/
+@Service
+@Slf4j
+public class MesBasDowntimeReasonTypeServiceImpl extends BaseMesService<MesBasDowntimeReasonType> implements IMesBasDowntimeReasonTypeService {
+
+    protected void setPackQueryBean(MesBasDowntimeReasonType bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getTypeCode(), "typeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getTypeName(), "typeName", packBean);
+    }
+
+}
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoMeterMainDataServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoMeterMainDataServiceImpl.java
index 851bf58..9b7d536 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoMeterMainDataServiceImpl.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoMeterMainDataServiceImpl.java
@@ -21,7 +21,7 @@ public class MesMaximoMeterMainDataServiceImpl extends BaseMesService<MesMaximoM
 
     protected void setPackQueryBean(MesMaximoMeterMainData bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getAssetNum(), "assetNum", packBean);
-        DdlPreparedPack.getNumEqualPack(bean.getBaseMeasureUnitId(), "baseMeasureUnitId", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getBaseMeasureUnitId(), "baseMeasureUnitId", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getMeterName(), "meterName", packBean);
     }