diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java index 07a763e..faba6b9 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java @@ -130,12 +130,25 @@ public class TerminalController extends BaseController { } } - @ApiOperation(value = "图像装置ID查询", notes = "图像装置ID查询接口", httpMethod = "POST") + @ApiOperation(value = "图像装置ID查询触发", notes = "图像装置ID查询触发接口", httpMethod = "POST") @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) - @RequestMapping("/selectTerminalId") + @RequestMapping("/terminalIdGet") + @Log(title = "图像装置ID查询触发", type = "修改") + public ResponseReult terminalIdGet(@RequestBody @Validated TerminalIdUpdateVo vo) { + ServiceBody serviceBody = terminalService.terminalIdGet(vo); + if (serviceBody.getCode() == ServiceStatus.SUCCESS) { + return ResponseReult.success(serviceBody.getData()); + } else { + return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); + } + } + + @ApiOperation(value = "图像装置ID查询", notes = "图像装置ID查询触发", httpMethod = "POST") + @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/terminalIdGet") @Log(title = "图像装置ID查询", type = "修改") - public ResponseReult selectTerminalId(@RequestBody @Validated TerminalIdUpdateVo vo) { - ServiceBody serviceBody = terminalService.updateTerminalId(vo); + public ResponseReult terminalIdGet(@RequestParam("requestId")Integer requestId) { + ServiceBody serviceBody = terminalService.selectTerminalId(requestId); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalIdGetModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalIdGetModel.java new file mode 100644 index 0000000..ebb52b3 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalIdGetModel.java @@ -0,0 +1,20 @@ +package com.shxy.xymanager_common.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 设备ID触发查询信息 + */ +@Data +@ApiModel(value = "设备ID触发查询信息", description = "获取设备ID触发查询信息") +public class TerminalIdGetModel implements Serializable { + + @ApiModelProperty(value = "请求ID", example = "123456") + private Integer requestId; + + +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalIdModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalIdModel.java new file mode 100644 index 0000000..fef28c1 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalIdModel.java @@ -0,0 +1,22 @@ +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 = "设备ID信息", description = "获取设备ID信息") +public class TerminalIdModel implements Serializable { + + @ApiModelProperty(value = "装置编号", example = "123456") + private String cmdId; + + @ApiModelProperty(value = "是否最新", example = "123456") + private Boolean isNew = false; + +} 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 b9c5a19..3e0ed77 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 @@ -439,20 +439,22 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { TerminalScheduleRuleTimeListModel model = new TerminalScheduleRuleTimeListModel(); if (StringUtils.isNotBlank(result)) { JSONObject resultObj = JSONObject.parseObject(result); - List resultDtoList = JSONArray.parseArray(resultObj.get("groupData").toString(), PhotoTimeResultDto.class); - List resultList = Lists.newArrayList(); - String startTimeStr = resultDtoList.get(0).getHour() + ":" + resultDtoList.get(0).getMinute() + ":00"; - String endTimeStr = resultDtoList.get(1).getHour() + ":" + resultDtoList.get(1).getMinute() + ":00"; - Date startTime = DateUtil.parseTime(startTimeStr); - Date endTime = DateUtil.parseTime(endTimeStr); - Integer span = resultDtoList.get(2).getHour() * 60 + resultDtoList.get(2).getMinute(); - List dateTimes = MyDateUtils.rangeToList(startTime, endTime, DateField.MINUTE, span); - for (DateTime data : dateTimes) { - String dateTime = DateUtil.formatTime(data); - resultList.add(dateTime); + if(null!=resultObj.get("groupData")) { + List resultDtoList = JSONArray.parseArray(resultObj.get("groupData").toString(), PhotoTimeResultDto.class); + List resultList = Lists.newArrayList(); + String startTimeStr = resultDtoList.get(0).getHour() + ":" + resultDtoList.get(0).getMinute() + ":00"; + String endTimeStr = resultDtoList.get(1).getHour() + ":" + resultDtoList.get(1).getMinute() + ":00"; + Date startTime = DateUtil.parseTime(startTimeStr); + Date endTime = DateUtil.parseTime(endTimeStr); + Integer span = resultDtoList.get(2).getHour() * 60 + resultDtoList.get(2).getMinute(); + List dateTimes = MyDateUtils.rangeToList(startTime, endTime, DateField.MINUTE, span); + for (DateTime data : dateTimes) { + String dateTime = DateUtil.formatTime(data); + resultList.add(dateTime); + } + model.setList(resultList); + model.setIsNew(true); } - model.setList(resultList); - model.setIsNew(true); } else { TerminalAndChannelIdVo idVo = new TerminalAndChannelIdVo(); BeanUtils.copyProperties(vo, idVo); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java index 86aa601..b3d695e 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java @@ -4,12 +4,14 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUnit; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.constant.Constants; -import com.shxy.xymanager_common.dto.*; +import com.shxy.xymanager_common.dto.DyLineAndTerminalNoHeartDto; +import com.shxy.xymanager_common.dto.PhotoParamsDto; +import com.shxy.xymanager_common.dto.TerminalInfoDto; +import com.shxy.xymanager_common.dto.TerminalsAndLineAndChannelDto; import com.shxy.xymanager_common.entity.TerminalChannelMapper; import com.shxy.xymanager_common.entity.Terminals; import com.shxy.xymanager_common.enums.CommonStatus; @@ -251,7 +253,7 @@ public class TerminalServiceImpl implements TerminalService { @Override public ServiceBody updateTerminalId(TerminalIdUpdateVo vo) { TerminalUpdateModel model = new TerminalUpdateModel(); - String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --act=termid --cmdid=" + vo.getCmdId() + "\t" + "--reqid=" + Constants.REQUEST_ID + "\t" + "--newcmdid=" + vo.getNewCmdId() + "\t" + "--newcmdid=" + vo.getNewCmdId(); + String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=termid --cmdid=" + vo.getCmdId() + "\t" + "--newcmdid=" + vo.getNewCmdId() ; Integer retCode = ProcessExecUtils.exec(cmd); model.setRequestId(Integer.parseInt(Constants.REQUEST_ID.toString())); model.setTermId(vo.getTermId()); @@ -286,5 +288,26 @@ public class TerminalServiceImpl implements TerminalService { } return Asserts.success(model); } + + @Override + public ServiceBody terminalIdGet(TerminalIdUpdateVo vo) { + String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --clientid=10 --act=termid --cmdid=" + vo.getCmdId() + "\t" + "--reqid=" + Constants.REQUEST_ID; + ProcessExecUtils.exec(cmd); + TerminalIdGetModel model = new TerminalIdGetModel(); + model.setRequestId(Integer.parseInt(Constants.REQUEST_ID.toString())); + Constants.REQUEST_ID.addAndGet(1); + return Asserts.success(model); + } + + @Override + public ServiceBody selectTerminalId(Integer requestId) { + String result = terminalPhotoDao.getRequestResult(requestId); + TerminalIdModel model = new TerminalIdModel(); + if (StringUtils.isNotBlank(result)) { + model = JSONObject.parseObject(result, TerminalIdModel.class); + model.setIsNew(true); + } + return Asserts.success(model); + } } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalService.java index 46117cd..c16f6ac 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalService.java @@ -69,5 +69,20 @@ public interface TerminalService { */ ServiceBody getTermListByChannel(TerminalChannelIdVo vo); + /** + * 根据通道编号触发查询装置ID + * + * @param vo + * @return + */ + ServiceBody terminalIdGet(TerminalIdUpdateVo vo); + + /** + * 根据请求ID查询装置ID + * + * @param requestId + * @return + */ + ServiceBody selectTerminalId(Integer requestId); }