对外提供接口 修改

PHM-admin/phm-manage/src/main/java/com/phm/manage/controller/ProcessController.java

@@ -0,0 +1,38 @@
+package com.phm.manage.controller;
+
+import com.phm.manage.domain.common.CommonResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description 流程任务处理接口
+ *
+ * @Author WGK
+ * @Date 2023/9/6 17:37
+ */
+@RestController
+@RequestMapping("/process")
+public class ProcessController {
+    /**
+     * 分析功能
+     *
+     * @return CommonResult
+     */
+    @PostMapping("/analyze")
+    public CommonResult analyze() {
+        // TODO
+        return CommonResult.buildSuccess();
+    }
+
+    /**
+     * 执行指令功能
+     *
+     * @return CommonResult
+     */
+    @PostMapping("/execute")
+    public CommonResult execute() {
+        // TODO
+        return CommonResult.buildSuccess();
+    }
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/common/controller/ExternalInterfaceController.java → PHM-admin/phm-manage/src/main/java/com/phm/manage/controller/externalInter/ExternalInterfaceController.java

@@ -1,14 +1,15 @@
-package com.phm.manage.common.controller;
+package com.phm.manage.controller.externalInter;
 
 import com.phm.common.annotation.Anonymous;
 import com.phm.common.core.domain.entity.SysDictData;
 import com.phm.common.utils.StringUtils;
-import com.phm.manage.common.domain.CommonResult;
-import com.phm.manage.common.domain.CommonResultXML;
-import com.phm.manage.common.domain.OrderXmlVO;
+import com.phm.manage.domain.common.CommonResult;
+import com.phm.manage.domain.common.CommonResultXML;
+import com.phm.manage.domain.common.OrderXmlVO;
 import com.phm.manage.domain.Sortie;
 import com.phm.manage.service.ISortieService;
 import com.phm.system.service.ISysDictTypeService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
@@ -25,6 +26,7 @@ import java.util.List;
 @RestController
 @Anonymous
 @RequestMapping("/publicservice")
+@Slf4j
 public class ExternalInterfaceController {
 
     @Autowired
@@ -34,7 +36,7 @@ public class ExternalInterfaceController {
     private ISortieService sortieService;
 
     /**
-     * 指令接受API
+     * 指令接收API
      *
      * @param orderXmlVO 入参
      * @return res
@@ -42,7 +44,8 @@ public class ExternalInterfaceController {
     @PostMapping(value = "/receive", consumes = {MediaType.APPLICATION_XML_VALUE, MediaType.TEXT_XML_VALUE},
             produces = MediaType.APPLICATION_XML_VALUE)
     public CommonResultXML<OrderXmlVO> receive(@RequestBody OrderXmlVO orderXmlVO) {
-        return CommonResultXML.success(orderXmlVO);
+        log.info("指令入参：{}", orderXmlVO.toString());
+        return CommonResultXML.buildSuccess();
     }
 
     /**
@@ -50,6 +53,7 @@ public class ExternalInterfaceController {
      */
     @GetMapping(value = "/type/{dictType}", produces = MediaType.APPLICATION_JSON_VALUE)
     public CommonResult<List<SysDictData>> dictType(@PathVariable String dictType) {
+        log.info("dictType：{}", dictType);
         List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
         if (StringUtils.isNull(data)) {
             data = new ArrayList<SysDictData>();
@@ -63,8 +67,20 @@ public class ExternalInterfaceController {
      * @return 架次列表
      */
     @GetMapping(value = "/sortieList", produces = MediaType.APPLICATION_JSON_VALUE)
-    public CommonResult<List<Sortie>> dictType() {
+    public CommonResult<List<Sortie>> sortieList() {
         List<Sortie> data = sortieService.selectSortieList(null);
         return CommonResult.success(data);
     }
+
+    /**
+     * 监测模块状态
+     *
+     * @param type 模块类型
+     * @return 模块状态信息
+     */
+    @GetMapping(value = "/monitorModule/{type}", produces = MediaType.APPLICATION_JSON_VALUE)
+    public CommonResult monitor(@PathVariable String type) {
+        log.info("monitor:{}", type);
+        return CommonResult.buildSuccess();
+    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/common/domain/CommonResult.java → PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/common/CommonResult.java

@@ -1,9 +1,9 @@
-package com.phm.manage.common.domain;
+package com.phm.manage.domain.common;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.phm.manage.common.enums.GlobalErrorCodeConstants;
-import com.phm.manage.common.util.ErrorCode;
-import com.phm.manage.common.util.ServiceException;
+import com.phm.manage.enums.GlobalErrorCodeConstants;
+import com.phm.manage.util.ErrorCode;
+import com.phm.manage.util.ServiceException;
 import lombok.Data;
 import org.springframework.util.Assert;
 
@@ -49,6 +49,14 @@ public class CommonResult<T> implements Serializable {
         return result;
     }
 
+    public static <T> CommonResult<T> buildSuccess() {
+        CommonResult<T> result = new CommonResult<>();
+        result.code = GlobalErrorCodeConstants.SUCCESS.getCode();
+        result.data = null;
+        result.msg = "";
+        return result;
+    }
+
     public static boolean isSuccess(Integer code) {
         return Objects.equals(code, GlobalErrorCodeConstants.SUCCESS.getCode());
     }

PHM-admin/phm-manage/src/main/java/com/phm/manage/common/domain/CommonResultXML.java → PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/common/CommonResultXML.java

@@ -1,11 +1,11 @@
-package com.phm.manage.common.domain;
+package com.phm.manage.domain.common;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.phm.manage.common.enums.GlobalErrorCodeConstants;
-import com.phm.manage.common.util.ErrorCode;
-import com.phm.manage.common.util.ServiceException;
+import com.phm.manage.enums.GlobalErrorCodeConstants;
+import com.phm.manage.util.ErrorCode;
+import com.phm.manage.util.ServiceException;
 import lombok.Data;
 import org.springframework.util.Assert;
 
@@ -54,6 +54,13 @@ public class CommonResultXML<T> implements Serializable {
         result.msg = "";
         return result;
     }
+    public static <T> CommonResultXML<T> buildSuccess() {
+        CommonResultXML<T> result = new CommonResultXML<>();
+        result.code = GlobalErrorCodeConstants.SUCCESS.getCode();
+        result.data = null;
+        result.msg = "";
+        return result;
+    }
 
     public static boolean isSuccess(Integer code) {
         return Objects.equals(code, GlobalErrorCodeConstants.SUCCESS.getCode());

PHM-admin/phm-manage/src/main/java/com/phm/manage/common/domain/OrderXmlVO.java → PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/common/OrderXmlVO.java

@@ -1,4 +1,4 @@
-package com.phm.manage.common.domain;
+package com.phm.manage.domain.common;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
@@ -10,7 +10,9 @@ import lombok.Data;
 @Data
 @JacksonXmlRootElement(localName = "ORDER")
 public class OrderXmlVO {
-    // 指令类型
+    /**
+     * 指令类型
+     */
     @JacksonXmlProperty(localName = "ORDER-TYPE")
     private String orderType;
 
@@ -19,7 +21,7 @@ public class OrderXmlVO {
     private String orderName;
 
     // 模型
-    @JacksonXmlProperty(localName = "MODEL")
+    @JacksonXmlProperty(localName = "MODEL-TYPE")
     private String model;
 
     // 架次号

PHM-admin/phm-manage/src/main/java/com/phm/manage/common/domain/PageParam.java → PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/common/PageParam.java

@@ -1,4 +1,4 @@
-package com.phm.manage.common.domain;
+package com.phm.manage.domain.common;
 
 import lombok.Data;
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/common/domain/PageResult.java → PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/common/PageResult.java

@@ -1,4 +1,4 @@
-package com.phm.manage.common.domain;
+package com.phm.manage.domain.common;
 
 import lombok.Data;
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/common/enums/GlobalErrorCodeConstants.java → PHM-admin/phm-manage/src/main/java/com/phm/manage/enums/GlobalErrorCodeConstants.java

@@ -1,6 +1,6 @@
-package com.phm.manage.common.enums;
+package com.phm.manage.enums;
 
-import com.phm.manage.common.util.ErrorCode;
+import com.phm.manage.util.ErrorCode;
 
 /**
  * @author wangg

PHM-admin/phm-manage/src/main/java/com/phm/manage/common/enums/ModelEnum.java → PHM-admin/phm-manage/src/main/java/com/phm/manage/enums/ModelEnum.java

@@ -1,4 +1,4 @@
-package com.phm.manage.common.enums;
+package com.phm.manage.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

PHM-admin/phm-manage/src/main/java/com/phm/manage/common/enums/OrderEnum.java → PHM-admin/phm-manage/src/main/java/com/phm/manage/enums/OrderEnum.java

@@ -1,4 +1,4 @@
-package com.phm.manage.common.enums;
+package com.phm.manage.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

PHM-admin/phm-manage/src/main/java/com/phm/manage/common/util/ErrorCode.java → PHM-admin/phm-manage/src/main/java/com/phm/manage/util/ErrorCode.java

@@ -1,4 +1,4 @@
-package com.phm.manage.common.util;
+package com.phm.manage.util;
 
 import lombok.Data;
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/common/util/ServiceException.java → PHM-admin/phm-manage/src/main/java/com/phm/manage/util/ServiceException.java

@@ -1,4 +1,4 @@
-package com.phm.manage.common.util;
+package com.phm.manage.util;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;