|
|
@ -42,6 +42,11 @@ public class OpenController extends BaseController {
|
|
|
|
@RequestMapping("/getPhotoListForOpen")
|
|
|
|
@RequestMapping("/getPhotoListForOpen")
|
|
|
|
@Log(title = "对外图片查询", type = "查询")
|
|
|
|
@Log(title = "对外图片查询", type = "查询")
|
|
|
|
public ResponseReult<TerminalPhotoListForOpenModel> getPhotoListForOpen(@RequestHeader HttpHeaders headers, @RequestBody @Validated OpenTerminalAndTimeVo vo) {
|
|
|
|
public ResponseReult<TerminalPhotoListForOpenModel> getPhotoListForOpen(@RequestHeader HttpHeaders headers, @RequestBody @Validated OpenTerminalAndTimeVo vo) {
|
|
|
|
|
|
|
|
if (vo.getCmdId().contains("SHXY")) {
|
|
|
|
|
|
|
|
String device = "XYIGQ10C230500";
|
|
|
|
|
|
|
|
String id = vo.getCmdId().substring(vo.getCmdId().length()-3,vo.getCmdId().length());
|
|
|
|
|
|
|
|
vo.setCmdId(device + id);
|
|
|
|
|
|
|
|
}
|
|
|
|
String requestIp = HeaderUtil.getRequestIp(headers);
|
|
|
|
String requestIp = HeaderUtil.getRequestIp(headers);
|
|
|
|
ServiceBody<TerminalPhotoListForOpenModel> serviceBody = terminalPhotoService.getPhotoListForOpen(requestIp,vo);
|
|
|
|
ServiceBody<TerminalPhotoListForOpenModel> serviceBody = terminalPhotoService.getPhotoListForOpen(requestIp,vo);
|
|
|
|
if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
|
|
|
|
if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
|
|
|
@ -74,6 +79,11 @@ public class OpenController extends BaseController {
|
|
|
|
@RequestMapping("/cmaDeviceStatus")
|
|
|
|
@RequestMapping("/cmaDeviceStatus")
|
|
|
|
@Log(title = "查询装置状态接口", type = "查询")
|
|
|
|
@Log(title = "查询装置状态接口", type = "查询")
|
|
|
|
public JSONObject cmaDeviceStatus(@RequestBody @Validated OpenCmdidVo vo) {
|
|
|
|
public JSONObject cmaDeviceStatus(@RequestBody @Validated OpenCmdidVo vo) {
|
|
|
|
|
|
|
|
if (vo.getDeviceID().contains("SHXY")) {
|
|
|
|
|
|
|
|
String device = "XYIGQ10C230500";
|
|
|
|
|
|
|
|
String id = vo.getDeviceID().substring(vo.getDeviceID().length()-3,vo.getDeviceID().length());
|
|
|
|
|
|
|
|
vo.setDeviceID(device + id);
|
|
|
|
|
|
|
|
}
|
|
|
|
JSONObject serviceBody = openService.cmaDeviceStatus(vo);
|
|
|
|
JSONObject serviceBody = openService.cmaDeviceStatus(vo);
|
|
|
|
return serviceBody;
|
|
|
|
return serviceBody;
|
|
|
|
}
|
|
|
|
}
|
|
|
|