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 727631d..f7f3123 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 @@ -94,19 +94,6 @@ public class TerminalPhotoController extends BaseController { } } - @ApiOperation(value = "拍照时间表查询", notes = "拍照时间表查询", httpMethod = "POST") - @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) - @RequestMapping("/selectPhotoTime") - @Log(title = "拍照时间表查询", type = "查询") - public ResponseReult selectPhotoTime(@RequestBody @Validated TerminalReqPhotoTimeVo vo) { - ServiceBody serviceBody = terminalPhotoService.selectPhotoTime(vo); - 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("/getPhotoList") diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/enums/Protocol.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/enums/Protocol.java new file mode 100644 index 0000000..c687bb4 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/enums/Protocol.java @@ -0,0 +1,28 @@ +package com.shxy.xymanager_common.enums; + +public enum Protocol { + + PROTOCOL_UNKNOWN(0), // 未分析的规约类型 + + PROTOCOL_NW_201106(1), // 南网规约2011-06月及更早版本 + PROTOCOL_NW_V10(2), // 南网规约2011-11月版本(V1.0) + + PROTOCOL_ZW(64), // 浙江电网规约 + + PROTOCOL_GW13(128), // 国家电网13号文件规约（含网省公司对13号文件的扩展规约） + PROTOCOL_GW1738(129), // 国家电网1738号文件规约 + + PROTOCOL_GW_I1(0xFF00), // GW-I1 + PROTOCOL_GW_I1_AH(0xFF01), // GW-AnHui + PROTOCOL_GW_I1_JS(0xFF02), // GW-JiangSu + PROTOCOL_GW_I1_HN(0xFF03), // GW-HUNAN + PROTOCOL_GW_I1_ZJ(0xFF04), // GW-ZJ + PROTOCOL_GW_I1_HEN(0xFF05), // GW-HENAN + PROTOCOL_GW_I1_SHX(0xFF06); // GW-SHANXI + + private Integer value; + + Protocol(Integer value) { + this.value = value; + } +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleListModel.java index a7763a8..608013a 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleListModel.java @@ -26,38 +26,4 @@ public class TerminalScheduleRuleListModel implements Serializable { @ApiModelProperty(value = "时间任务列表", example = "[]") private List list; -// @Data -// public static class ScheduleBean { -// -// @ApiModelProperty(value = "任务编号", example = "123456") -// private Integer id; -// -// @ApiModelProperty(value = "任务名称", example = "123456") -// private String name; -// -// @ApiModelProperty(value = "备注", example = "erwsafsasa") -// private String remark; -// -// @ApiModelProperty(value = "时间任务详情列表", example = "erwsafsasa") -// private List list; -// -// } - -// @Data -// public static class ScheduleDetailsBean { -// @ApiModelProperty(value = "任务详情编号", example = "123456") -// private Integer id; -// -// @ApiModelProperty(value = "任务规则编号", example = "123456") -// private Integer scheduleId; -// -// @ApiModelProperty(value = "间隔", example = "213") -// private Integer span; -// -// @ApiModelProperty(value = "开始时间", example = "2022-06-08") -// private Time startTime; -// -// @ApiModelProperty(value = "结束时间", example = "2022-06-08") -// private Time endTime; -// } } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleModel.java index ac7606f..42866c7 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleModel.java @@ -35,13 +35,13 @@ public class TerminalScheduleRuleModel implements Serializable { @ApiModelProperty(value = "任务规则编号", example = "123456") private Integer scheduleId; - @ApiModelProperty(value = "间隔", example = "213") - private Integer span; + @ApiModelProperty(value = "时", example = "213") + private Integer hour; - @ApiModelProperty(value = "开始时间", example = "2022-06-08") - private Time startTime; + @ApiModelProperty(value = "分", example = "2022-06-08") + private Integer minute; - @ApiModelProperty(value = "结束时间", example = "2022-06-08") - private Time endTime; + @ApiModelProperty(value = "预置位", example = "2022-06-08") + private Integer preset; } } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleTimeListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleTimeListModel.java index b72021d..ba01e13 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleTimeListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleTimeListModel.java @@ -16,13 +16,24 @@ import java.util.List; public class TerminalScheduleRuleTimeListModel implements Serializable { @ApiModelProperty(value = "任务名称", example = "123456") - private List list; - + private List list; @ApiModelProperty(value = "是否最新", example = "123456") private Boolean isNew = false; @ApiModelProperty(value = "偏移量", example = "123456") - private Integer offset ; + private Integer offset; + + @Data + public static class ScheduleRuleBean { + + @ApiModelProperty(value = "时", example = "213") + private Integer hour; + + @ApiModelProperty(value = "分", example = "2022-06-08") + private Integer minute; + @ApiModelProperty(value = "预置位", example = "2022-06-08") + private Integer preset; + } } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/ScheduleListUtils.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/ScheduleListUtils.java index 9e2f2b9..96187b7 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/ScheduleListUtils.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/ScheduleListUtils.java @@ -33,31 +33,39 @@ public class ScheduleListUtils { ArrayList list = new ArrayList<>(); for (ScheduleRuleVo item : beans) { - Integer span = item.getSpan(); - ScheduleDetails spanrule = new ScheduleDetails(); - spanrule.setScheduleId(scheduleid); - spanrule.setHour(XyNumberUtils.delivery(span, 60)); - spanrule.setMinute(XyNumberUtils.remainder(span, 60)); - spanrule.setPreset(255); - list.add(spanrule); - - ScheduleDetails startrule = new ScheduleDetails(); - startrule.setScheduleId(scheduleid); - Time startTime = item.getStartTime(); - startrule.setHour(MyDateUtils.hour(startTime, true)); - startrule.setMinute(MyDateUtils.minute(startTime)); - startrule.setPreset(255); - list.add(startrule); - - ScheduleDetails endrule = new ScheduleDetails(); - endrule.setScheduleId(scheduleid); - Time endTime = item.getEndTime(); - endrule.setHour(MyDateUtils.hour(endTime, true)); - endrule.setMinute(MyDateUtils.minute(endTime)); - endrule.setPreset(255); - list.add(endrule); - +// Integer span = item.getSpan(); +// ScheduleDetails spanrule = new ScheduleDetails(); +// spanrule.setScheduleId(scheduleid); +// spanrule.setHour(XyNumberUtils.delivery(span, 60)); +// spanrule.setMinute(XyNumberUtils.remainder(span, 60)); +// spanrule.setPreset(255); +// list.add(spanrule); +// +// ScheduleDetails startrule = new ScheduleDetails(); +// startrule.setScheduleId(scheduleid); +// Time startTime = item.getStartTime(); +// startrule.setHour(MyDateUtils.hour(startTime, true)); +// startrule.setMinute(MyDateUtils.minute(startTime)); +// startrule.setPreset(255); +// list.add(startrule); +// +// ScheduleDetails endrule = new ScheduleDetails(); +// endrule.setScheduleId(scheduleid); +// Time endTime = item.getEndTime(); +// endrule.setHour(MyDateUtils.hour(endTime, true)); +// endrule.setMinute(MyDateUtils.minute(endTime)); +// endrule.setPreset(255); +// list.add(endrule); + ScheduleDetails rule = new ScheduleDetails(); + Integer hour = item.getHour(); + Integer minute = item.getMinute(); + Integer preset = item.getPreset(); + rule.setScheduleId(scheduleid); + rule.setHour(hour); + rule.setMinute(minute); + rule.setPreset(preset); + list.add(rule); } return list; } @@ -171,32 +179,48 @@ public class ScheduleListUtils { * @return */ public static ArrayList getScheduleDetailsBeans(List details) { +// ArrayList detailsBeans = new ArrayList<>(); +// TerminalScheduleRuleModel.ScheduleRuleBean scheduleDetailsBean = new TerminalScheduleRuleModel.ScheduleRuleBean(); +// for (int i = 0; i < details.size(); i++) { +// ScheduleDetailsDto dto = details.get(i); +// if (XyNumberUtils.remainder(i, 3) == 0) { +// scheduleDetailsBean = new TerminalScheduleRuleModel.ScheduleRuleBean(); +// Integer hour = dto.getHour(); +// Integer minute = dto.getMinute(); +// Number mul = XyNumberUtils.mul((Number) hour, 60); +// Number add = XyNumberUtils.add(mul, minute); +// scheduleDetailsBean.setId(dto.getId()); +// scheduleDetailsBean.setScheduleId(dto.getScheduleId()); +// scheduleDetailsBean.setSpan(add.intValue()); +// } else if (XyNumberUtils.remainder(i, 3) == 1) { +// Integer hour = dto.getHour(); +// Integer minute = dto.getMinute(); +// Time time = MyDateUtils.HHMMToTime(hour, minute); +// scheduleDetailsBean.setStartTime(time); +// } else if (XyNumberUtils.remainder(i, 3) == 2) { +// Integer hour = dto.getHour(); +// Integer minute = dto.getMinute(); +// Time time = MyDateUtils.HHMMToTime(hour, minute); +// scheduleDetailsBean.setEndTime(time); +// detailsBeans.add(scheduleDetailsBean); +// } +// } + ArrayList detailsBeans = new ArrayList<>(); - TerminalScheduleRuleModel.ScheduleRuleBean scheduleDetailsBean = new TerminalScheduleRuleModel.ScheduleRuleBean(); for (int i = 0; i < details.size(); i++) { ScheduleDetailsDto dto = details.get(i); - if (XyNumberUtils.remainder(i, 3) == 0) { - scheduleDetailsBean = new TerminalScheduleRuleModel.ScheduleRuleBean(); - Integer hour = dto.getHour(); - Integer minute = dto.getMinute(); - Number mul = XyNumberUtils.mul((Number) hour, 60); - Number add = XyNumberUtils.add(mul, minute); - scheduleDetailsBean.setId(dto.getId()); - scheduleDetailsBean.setScheduleId(dto.getScheduleId()); - scheduleDetailsBean.setSpan(add.intValue()); - } else if (XyNumberUtils.remainder(i, 3) == 1) { - Integer hour = dto.getHour(); - Integer minute = dto.getMinute(); - Time time = MyDateUtils.HHMMToTime(hour, minute); - scheduleDetailsBean.setStartTime(time); - } else if (XyNumberUtils.remainder(i, 3) == 2) { - Integer hour = dto.getHour(); - Integer minute = dto.getMinute(); - Time time = MyDateUtils.HHMMToTime(hour, minute); - scheduleDetailsBean.setEndTime(time); - detailsBeans.add(scheduleDetailsBean); - } + TerminalScheduleRuleModel.ScheduleRuleBean scheduleDetailsBean = new TerminalScheduleRuleModel.ScheduleRuleBean(); + Integer hour = dto.getHour(); + Integer minute = dto.getMinute(); + Integer preset = dto.getPreset(); + scheduleDetailsBean.setId(dto.getId()); + scheduleDetailsBean.setScheduleId(dto.getScheduleId()); + scheduleDetailsBean.setHour(hour); + scheduleDetailsBean.setMinute(minute); + scheduleDetailsBean.setPreset(preset); + detailsBeans.add(scheduleDetailsBean); } + return detailsBeans; } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ScheduleRuleVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ScheduleRuleVo.java index f33b908..be4dc16 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ScheduleRuleVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ScheduleRuleVo.java @@ -13,17 +13,17 @@ import java.util.List; @ApiModel(value = "任务规则对象详情", description = "任务规则对象详情描述") public class ScheduleRuleVo { - @ApiModelProperty(value = "开始时间", example = "单位") - @NotBlank(message = "开始时间不能缺少") - private Time startTime; + @ApiModelProperty(value = "时", example = "单位") + @NotBlank(message = "时不能缺少") + private Integer hour; - @ApiModelProperty(value = "结束时间", example = "型号型号") - @NotBlank(message = "结束时间不能缺少") - private Time endTime; + @ApiModelProperty(value = "分", example = "型号型号") + @NotBlank(message = "分不能缺少") + private Integer minute; - @ApiModelProperty(value = "时间间隔", example = "型号型号") - @NotBlank(message = "时间间隔不能缺少") - private Integer span; + @ApiModelProperty(value = "预置位", example = "型号型号") + @NotBlank(message = "预置位不能缺少") + private Integer preset; } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/VideoGetVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/VideoGetVo.java index 6d237ce..3b322f4 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/VideoGetVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/VideoGetVo.java @@ -19,5 +19,4 @@ public class VideoGetVo { @ApiModelProperty(value = "通道编号", example = "01") private Integer channelId; - } diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalSchedulesTempDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalSchedulesTempDao.java index 8340dbc..369ab17 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalSchedulesTempDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalSchedulesTempDao.java @@ -13,7 +13,6 @@ public interface TerminalSchedulesTempDao { List selectByRequestId(@Param("list") List id, @Param("status") Integer status); - int deleteByPrimaryKey(Integer id); int insert(TerminalSchedulesTemp record); 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 799752a..ac077f7 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 @@ -456,9 +456,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { Map termchannelMap = cacheService.getTermChannelMap(); Map towerMap = cacheService.getTowerMap(); List photoList = terminalPhotoDao.selectPhotosByIdList(photolist); - beans = TerminalUtils.setPhotoList(requestIp, list, lineMap, termchannelMapMap, terminalMap, termchannelMap, towerMap, photoList); - } model.setList(beans); PageInfo pageData = PageUtils.getPageData(list); @@ -517,39 +515,6 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { return Asserts.success(model); } - @Override - public ServiceBody selectPhotoTime(TerminalReqPhotoTimeVo vo) { - String result = requestResultsDao.getRequestResult(vo.getRequestId());//待修改 - TerminalScheduleRuleTimeListModel model = new TerminalScheduleRuleTimeListModel(); - if (StringUtils.isNotBlank(result)) { - JSONObject resultObj = JSONObject.parseObject(result); - if (null != resultObj.get("groupData")) { - List resultDtoList = JSONArray.parseArray(resultObj.get("groupData").toString(), PhotoTimeResultDto.class); - if (CollectionUtil.isNotEmpty(resultDtoList)) { - 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); - } - } - } else { - TerminalAndChannelIdVo idVo = new TerminalAndChannelIdVo(); - BeanUtils.copyProperties(vo, idVo); - ServiceBody listModel = terminalScheduleRuleService.getChannelSchelduleRule(idVo); - model = listModel.getData(); - } - return Asserts.success(model); - } - @Override public ServiceBody selectPhotoTimeGet(TerminalPhotoTimeGetVo vo) { GetModel model = new GetModel(); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java index 570c022..04493e1 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java @@ -283,7 +283,6 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ return Asserts.success(model); } - /** * 查询拍照时间表任务是否下发成功 * @@ -372,26 +371,16 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ if (CollectionUtil.isEmpty(list)) { model.setList(new ArrayList<>()); } else { - ArrayList detailsBeans = ScheduleListUtils.getScheduleDetailsBeans(list); - ArrayList timestrlist = new ArrayList<>(); - for (TerminalScheduleRuleModel.ScheduleRuleBean item : detailsBeans) { - DateTime startTime = MyDateUtils.offsetMinute(item.getStartTime(), offset); - if (startTime.isAfterOrEquals(MyDateUtils.endOfDay(item.getStartTime()))) { - startTime = MyDateUtils.endOfDay(item.getStartTime()); - } - DateTime endTime = MyDateUtils.offsetMinute(item.getEndTime(), offset); - if (endTime.isAfterOrEquals(MyDateUtils.endOfDay(item.getEndTime()))) { - endTime = MyDateUtils.endOfDay(item.getEndTime()); - } - -// Time startTime = item.getStartTime(); -// Time endTime = item.getEndTime(); - Integer span = item.getSpan(); - List dateTimes = MyDateUtils.rangeToList(startTime, endTime, DateField.MINUTE, span); - for (DateTime data : dateTimes) { - String dateTime = DateUtil.formatTime(data); - timestrlist.add(dateTime); - } + ArrayList timestrlist = new ArrayList<>(); + for (ScheduleDetailsDto item : list) { + TerminalScheduleRuleTimeListModel.ScheduleRuleBean scheduleRuleBean = new TerminalScheduleRuleTimeListModel.ScheduleRuleBean(); + Integer hour = item.getHour(); + Integer minute = item.getMinute(); + Integer preset = item.getPreset(); + scheduleRuleBean.setHour(hour); + scheduleRuleBean.setMinute(minute); + scheduleRuleBean.setPreset(preset); + timestrlist.add(scheduleRuleBean); } model.setList(timestrlist); } @@ -427,9 +416,19 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ if (StringUtils.isNotBlank(resultsData)) { JSONObject resultObj = JSONObject.parseObject(resultsData); if (null != resultObj.get("groupData")) { + ArrayList list = new ArrayList<>(); List resultDtoList = JSONArray.parseArray(resultObj.get("groupData").toString(), PhotoTimeResultDto.class); - List resultDetails = ScheduleListUtils.getResultDetails(resultDtoList); - model.setList(resultDetails); + if (CollectionUtil.isNotEmpty(resultDtoList)) { + for (int j = 0; j < resultDtoList.size(); j++) { + PhotoTimeResultDto item = resultDtoList.get(j); + TerminalScheduleRuleTimeListModel.ScheduleRuleBean bean = new TerminalScheduleRuleTimeListModel.ScheduleRuleBean(); + bean.setHour(item.getHour()); + bean.setMinute(item.getMinute()); + bean.setPreset(item.getPreset()); + list.add(bean); + } + } + model.setList(list); model.setIsNew(true); } } 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 93448e2..9a592c6 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 @@ -75,7 +75,6 @@ public interface TerminalPhotoService { ServiceBody getLastedPhotoQueryParam(ReturnedPhotoParamsVo vo); - ServiceBody selectPhotoTime(TerminalReqPhotoTimeVo vo); ServiceBody selectPhotoTimeGet(TerminalPhotoTimeGetVo vo);