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

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SystemConfigController.java

@@ -7,6 +7,7 @@ import com.shxy.xymanager_common.bean.ServiceBody;
 import com.shxy.xymanager_common.bean.ServiceStatus;
 import com.shxy.xymanager_common.model.LineListModel;
 import com.shxy.xymanager_common.model.SystemConfigModel;
+import com.shxy.xymanager_common.model.UpperComputerInfoModel;
 import com.shxy.xymanager_common.vo.*;
 import com.shxy.xymanager_service.service.LineService;
 import com.shxy.xymanager_service.service.SystemConfigService;
@@ -70,6 +71,31 @@ public class SystemConfigController extends BaseController {
         }
     }
 
+    @ApiOperation(value = "获取上位机信息触发", notes = "获取上位机信息触发接口", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/upperComputerGet")
+    @Log(title = "获取上位机信息触发", type = "查询")
+    public ResponseReult<Integer> upperComputerGet(@RequestParam("cmdId") String cmdId) {
+        ServiceBody<Integer> serviceBody = configService.upperComputerGet(cmdId);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
+    @ApiOperation(value = "获取上位机信息", notes = "获取上位机信息接口", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/getUpperComputerInfo")
+    @Log(title = "获取上位机信息", type = "查询")
+    public ResponseReult<UpperComputerInfoModel> getUpperComputerInfo(@RequestParam("requestId") Integer requestId) {
+        ServiceBody<UpperComputerInfoModel> serviceBody = configService.getUpperComputerInfo(requestId);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
 
 
 }

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java

@@ -154,8 +154,8 @@ public class TerminalPhotoController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/getPhotoQueryParamList")
     @Log(title = "最新图片采集参数触发", type = "查询")
-    public ResponseReult<Integer> getPhotoQueryParamList(@RequestBody @Validated ReturnedPhotoParamsGetVo vo) {
+    public ResponseReult<TerminalStatusGetModel> getPhotoQueryParamList(@RequestBody @Validated ReturnedPhotoParamsGetVo vo) {
-        ServiceBody<Integer> serviceBody = terminalPhotoService.getPhotoQueryParam(vo);
+        ServiceBody<TerminalStatusGetModel> serviceBody = terminalPhotoService.getPhotoQueryParam(vo);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
         } else {

xymanager_common/src/main/java/com/shxy/xymanager_common/model/UpperComputerInfoModel.java

@@ -0,0 +1,32 @@
+package com.shxy.xymanager_common.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 上位机信息
+ */
+@Data
+@ApiModel(value = "上位机信息", description = "获取上位机信息")
+public class UpperComputerInfoModel implements Serializable {
+
+    @ApiModelProperty(value = "采集装置ID", example = "120")
+    private String termId;
+
+    @ApiModelProperty(value = "监测装置ID", example = "120")
+    private String cmdId;
+
+    @ApiModelProperty(value = "上位机IP", example = "120")
+    private String ip;
+
+    @ApiModelProperty(value = "上位机端口", example = "120")
+    private Short port;
+
+    @ApiModelProperty(value = "上位机域名", example = "120")
+    private String domain;
+
+
+}

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SystemConfigServiceImpl.java

@@ -8,6 +8,7 @@ import com.shxy.xymanager_common.entity.TerminalParams;
 import com.shxy.xymanager_common.exception.Asserts;
 import com.shxy.xymanager_common.model.SystemConfigModel;
 import com.shxy.xymanager_common.model.TerminalPhotosParamsModel;
+import com.shxy.xymanager_common.model.UpperComputerInfoModel;
 import com.shxy.xymanager_common.util.ProcessExecUtils;
 import com.shxy.xymanager_common.util.StringUtils;
 import com.shxy.xymanager_common.vo.SystemConfigReqVo;
@@ -78,4 +79,25 @@ public class SystemConfigServiceImpl implements SystemConfigService {
         }
         return Asserts.success(model);
     }
+
+    @Override
+    public ServiceBody<Integer> upperComputerGet(String cmdId) {
+        String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --clientid=10 --act=cma --flag=0 --cmdid="+cmdId+ "\t"+"--reqid="+Constants.REQUEST_ID;
+        ProcessExecUtils.exec(cmd);
+        Constants.REQUEST_ID.addAndGet(1);
+        return Asserts.success(Integer.parseInt(Constants.REQUEST_ID.toString()));
+    }
+
+    @Override
+    public ServiceBody<UpperComputerInfoModel> getUpperComputerInfo(Integer requestId) {
+        String result = terminalPhotoDao.getRequestResult(requestId);
+        UpperComputerInfoModel model = new UpperComputerInfoModel();
+        if(StringUtils.isNotBlank(result)) {
+            JSONObject resultObj = JSONObject.parseObject(result);
+            model = JSONObject.parseObject(resultObj.get("groupData").toString(), UpperComputerInfoModel.class);
+        }else{
+
+        }
+        return Asserts.success(model);
+    }
 }

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java

@@ -395,15 +395,17 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
     }
 
     @Override
-    public ServiceBody<Integer> getPhotoQueryParam(ReturnedPhotoParamsGetVo vo) {
+    public ServiceBody<TerminalStatusGetModel> getPhotoQueryParam(ReturnedPhotoParamsGetVo vo) {
+        TerminalStatusGetModel model = new TerminalStatusGetModel();
         String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=imgparams --cmdid="+vo.getCmdId() +"\t" +"--clientid=10 --reqid="+Constants.REQUEST_ID+"--flag=1 --rf=7 --channel="  + vo.getChannelId();
         ProcessExecUtils.exec(cmd);
+        model.setRequestId(Constants.REQUEST_ID.addAndGet(1));
      /*   TerminalPhotosParamsModel model = new TerminalPhotosParamsModel();
         PhotoParamsDto dto= terminalPhotoDao.selectPhotoParams(termId);
         if(dto!=null) {
             BeanUtils.copyProperties(dto, model);
         }*/
-        return Asserts.success(Constants.REQUEST_ID.addAndGet(1));
+        return Asserts.success(model);
     }
 
     @Override

xymanager_service/src/main/java/com/shxy/xymanager_service/service/SystemConfigService.java

@@ -2,6 +2,7 @@ package com.shxy.xymanager_service.service;
 
 import com.shxy.xymanager_common.bean.ServiceBody;
 import com.shxy.xymanager_common.model.SystemConfigModel;
+import com.shxy.xymanager_common.model.UpperComputerInfoModel;
 import com.shxy.xymanager_common.vo.SystemConfigReqVo;
 import com.shxy.xymanager_common.vo.SystemConfigVo;
 import org.springframework.web.multipart.MultipartFile;
@@ -31,4 +32,13 @@ public interface SystemConfigService {
 
     ServiceBody<SystemConfigModel> getSystemConfigDetail(SystemConfigReqVo vo);
 
+    /**
+     * 获取上位机信息触发
+     *
+     * @return
+     */
+    ServiceBody<Integer> upperComputerGet(String cmdId);
+
+    ServiceBody<UpperComputerInfoModel> getUpperComputerInfo(Integer requestId);
+
 }

xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java

@@ -69,7 +69,7 @@ public interface TerminalPhotoService {
      *
      * @return
      */
-    ServiceBody<Integer> getPhotoQueryParam(ReturnedPhotoParamsGetVo vo);
+    ServiceBody<TerminalStatusGetModel> getPhotoQueryParam(ReturnedPhotoParamsGetVo vo);
 
     ServiceBody<Integer> addOrUpdatePhotoParams(PhotoParamsVo vo);