#20230510 欣影管理平台装置信息查询代码

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 {

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;
+
+
+}

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);
     }
 
 

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);