From 6ec7a4fb979bedcd5abeb01d79a34b547ac578a0 Mon Sep 17 00:00:00 2001
From: 18616268358 <1440265357@qq.com>
Date: Tue, 16 May 2023 17:23:19 +0800
Subject: [PATCH] =?UTF-8?q?#20230510=20=E6=AC=A3=E5=BD=B1=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E8=A3=85=E7=BD=AE=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TerminalPhotoController.java   |  4 ++--
 .../xymanager_common/model/CmaBackModel.java  | 21 +++++++++++++++++++
 .../impl/TerminalPhotoServiceImpl.java        |  6 ++++--
 .../service/TerminalPhotoService.java         |  2 +-
 4 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/model/CmaBackModel.java

diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java
index 12b08c8..db7659e 100644
--- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java
+++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java
@@ -76,8 +76,8 @@ public class TerminalPhotoController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/selectPhotoTimeGet")
     @Log(title = "拍照时间表查询触发", type = "查询")
-    public ResponseReult<Integer> selectPhotoTimeGet(@RequestBody @Validated TerminalPhotoTimeGetVo vo) {
-        ServiceBody<Integer> serviceBody = terminalPhotoService.selectPhotoTimeGet(vo);
+    public ResponseReult<CmaBackModel> selectPhotoTimeGet(@RequestBody @Validated TerminalPhotoTimeGetVo vo) {
+        ServiceBody<CmaBackModel> serviceBody = terminalPhotoService.selectPhotoTimeGet(vo);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
         } else {
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/CmaBackModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/CmaBackModel.java
new file mode 100644
index 0000000..980a94d
--- /dev/null
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/CmaBackModel.java
@@ -0,0 +1,21 @@
+package com.shxy.xymanager_common.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 所有杆塔列表
+ */
+@Data
+@ApiModel(value = "Cma返回信息", description = "Cma返回信息")
+public class CmaBackModel implements Serializable {
+
+    @ApiModelProperty(value = "请求ID", example = "1233")
+    private Integer requestId;
+
+
+}
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java
index 6d28392..ced4168 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java
@@ -462,12 +462,14 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
     }
 
     @Override
-    public ServiceBody<Integer> selectPhotoTimeGet(TerminalPhotoTimeGetVo vo) {
+    public ServiceBody<CmaBackModel> selectPhotoTimeGet(TerminalPhotoTimeGetVo vo) {
+        CmaBackModel model = new CmaBackModel();
         String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=schedule --cmdid=" +vo.getCmdId() + "\t" + "--reqid=" + Constants.REQUEST_ID + "\t" + "--clientid=10 --flag=0 --rf=7 --channel="+vo.getChannel();
         ProcessExecUtils.exec(cmd);
         Integer requestId = Integer.parseInt(Constants.REQUEST_ID.toString());
+        model.setRequestId(requestId);
         Constants.REQUEST_ID.addAndGet(1);
-        return Asserts.success(requestId);
+        return Asserts.success(model);
     }
 
 
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java
index e433613..62e4450 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java
@@ -78,7 +78,7 @@ public interface TerminalPhotoService {
 
     ServiceBody<TerminalScheduleRuleTimeListModel> selectPhotoTime(TerminalReqPhotoTimeVo vo);
 
-    ServiceBody<Integer> selectPhotoTimeGet(TerminalPhotoTimeGetVo vo);
+    ServiceBody<CmaBackModel> selectPhotoTimeGet(TerminalPhotoTimeGetVo vo);