MesMaximo查询仪表主数据+设备主数据接口

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesMaximoAssetMainDataService.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesMaximoAssetMainData;
+
+/**
+ * @Description :Maximo设备主数据
+ * @Reference :
+ * @Author : gsz
+ * @CreateDate 2024/5/17 10:06
+ * @Modify:
+ **/
+public interface IMesMaximoAssetMainDataService extends IBaseMesService<MesMaximoAssetMainData> {
+}

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesMaximoMeterMainDataService.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesMaximoMeterMainData;
+
+/**
+ * @Description :Maximo仪表主数据
+ * @Reference :
+ * @Author : gsz
+ * @CreateDate 2024/5/17 10:06
+ * @Modify:
+ **/
+public interface IMesMaximoMeterMainDataService extends IBaseMesService<MesMaximoMeterMainData> {
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMaximoAssetMainDataController.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.MesMaximoAssetMainData;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : gsz
+ * @CreateDate : 2024-05-17 10:16
+ * @Modify:
+ **/
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesMaximoAssetMainData")
+public class MesMaximoAssetMainDataController extends BaseMesController<MesMaximoAssetMainData>{
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMaximoMeterMainDataController.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.MesMaximoMeterMainData;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : gsz
+ * @CreateDate : 2024-05-17 10:16
+ * @Modify:
+ **/
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesMaximoMeterMainData")
+public class MesMaximoMeterMainDataController extends BaseMesController<MesMaximoMeterMainData>{
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoAssetMainDataServiceImpl.java

@@ -0,0 +1,29 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesMaximoAssetMainDataService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesMaximoAssetMainData;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @Description : Maximo设备主数据
+ * @Reference :
+ * @Author : gsz
+ * @CreateDate 2024/5/17 10:06
+ * @Modify:
+ **/
+@Service
+@Slf4j
+public class MesMaximoAssetMainDataServiceImpl extends BaseMesService<MesMaximoAssetMainData> implements IMesMaximoAssetMainDataService {
+
+    protected void setPackQueryBean(MesMaximoAssetMainData bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getAssetNum(), "assetNum", packBean);
+        DdlPreparedPack.getNumEqualPack(bean.getDescription(), "description", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getStatus(), "status", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getFailureCode(), "failureCode", packBean);
+    }
+
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoMeterMainDataServiceImpl.java

@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesMaximoMeterMainDataService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesMaximoMeterMainData;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @Description : Maximo仪表主数据
+ * @Reference :
+ * @Author : gsz
+ * @CreateDate 2024/5/17 10:06
+ * @Modify:
+ **/
+@Service
+@Slf4j
+public class MesMaximoMeterMainDataServiceImpl extends BaseMesService<MesMaximoMeterMainData> implements IMesMaximoMeterMainDataService {
+
+    protected void setPackQueryBean(MesMaximoMeterMainData bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getAssetNum(), "assetNum", packBean);
+        DdlPreparedPack.getNumEqualPack(bean.getBaseMeasureUnitId(), "baseMeasureUnitId", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getMeterName(), "meterName", packBean);
+    }
+
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MaximoServiceImpl.java

@@ -2,21 +2,13 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.busi;
 
 import cn.estsh.i3plus.ext.mes.api.busi.IMaximoService;
 import cn.estsh.i3plus.ext.mes.pojo.model.MaximoParamModel;
-import cn.estsh.i3plus.icloud.softswitch.sdk.IBsSuitServiceCloud;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
-import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
-import cn.estsh.i3plus.platform.common.tool.HttpClientTool;
 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.bean.MaximoAssetMainData;
+import cn.estsh.i3plus.pojo.mes.bean.MesMaximoAssetMainData;
-import cn.estsh.i3plus.pojo.mes.bean.MaximoMeterMainData;
+import cn.estsh.i3plus.pojo.mes.bean.MesMaximoMeterMainData;
-import cn.estsh.i3plus.pojo.mes.repository.IMaximoAssetMainDataRepository;
+import cn.estsh.i3plus.pojo.mes.repository.IMesMaximoAssetMainDataRepository;
-import cn.estsh.i3plus.pojo.mes.repository.IMaximoMeterMainDataRepository;
+import cn.estsh.i3plus.pojo.mes.repository.IMesMaximoMeterMainDataRepository;
-import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
-import cn.estsh.impp.framework.boot.util.ResultBean;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,10 +29,10 @@ public class MaximoServiceImpl implements IMaximoService {
     private static final Logger LOGGER = LoggerFactory.getLogger(MaximoServiceImpl.class);
 
     @Autowired
-    private IMaximoAssetMainDataRepository maximoAssetMainDataRDao;
+    private IMesMaximoAssetMainDataRepository maximoAssetMainDataRDao;
 
     @Autowired
-    private IMaximoMeterMainDataRepository maximoMeterMainDataRDao;
+    private IMesMaximoMeterMainDataRepository maximoMeterMainDataRDao;
 
 
     @Override
@@ -59,7 +51,7 @@ public class MaximoServiceImpl implements IMaximoService {
             return  resultMap;
         }
         try {
-            MaximoMeterMainData maximoMeterMainData = new MaximoMeterMainData();
+            MesMaximoMeterMainData maximoMeterMainData = new MesMaximoMeterMainData();
             maximoMeterMainData.setOrganizeCode(paramModel.getSiteId());
             maximoMeterMainData.setMeterName(paramModel.getMeterName());
             maximoMeterMainData.setAssetNum(paramModel.getAssetNum());
@@ -107,7 +99,7 @@ public class MaximoServiceImpl implements IMaximoService {
             return  resultMap;
         }
         try {
-            MaximoAssetMainData maximoAssetMainData = new MaximoAssetMainData();
+            MesMaximoAssetMainData maximoAssetMainData = new MesMaximoAssetMainData();
             maximoAssetMainData.setOrganizeCode(paramModel.getSiteId());
             maximoAssetMainData.setAssetNum(paramModel.getAssetNum());
             maximoAssetMainData.setDescription(paramModel.getDescription());