xymp
/
backend
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

时间表修改

Browse Source
dev
liuguijing 2 years ago
parent d7820a3ec1
commit f5808d64db
12 changed files with 149 additions and 172 deletions
Show Stats Download Patch File Download Diff File

13
xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java
Unescape Escape View File

@ -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<TerminalScheduleRuleTimeListModel> selectPhotoTime(@RequestBody @Validated TerminalReqPhotoTimeVo vo) {
ServiceBody<TerminalScheduleRuleTimeListModel> 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") @ApiOperation(value = "图片查询", notes = "图片查询接口", httpMethod = "POST")
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/getPhotoList") @RequestMapping("/getPhotoList")

28
xymanager_common/src/main/java/com/shxy/xymanager_common/enums/Protocol.java
Unescape Escape View File

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

34
xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleListModel.java
Unescape Escape View File

@ -26,38 +26,4 @@ public class TerminalScheduleRuleListModel implements Serializable {
@ApiModelProperty(value = "时间任务列表", example = "[]") @ApiModelProperty(value = "时间任务列表", example = "[]")
private List<TerminalScheduleRuleModel> list; private List<TerminalScheduleRuleModel> 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<ScheduleDetailsBean> 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;
// }
} }

12
xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleModel.java
Unescape Escape View File

@ -35,13 +35,13 @@ public class TerminalScheduleRuleModel implements Serializable {
@ApiModelProperty(value = "任务规则编号", example = "123456") @ApiModelProperty(value = "任务规则编号", example = "123456")
private Integer scheduleId; private Integer scheduleId;
@ApiModelProperty(value = "间隔", example = "213") @ApiModelProperty(value = "时", example = "213")
private Integer span; private Integer hour;
@ApiModelProperty(value = "开始时间", example = "2022-06-08") @ApiModelProperty(value = "分", example = "2022-06-08")
private Time startTime; private Integer minute;
@ApiModelProperty(value = "结束时间", example = "2022-06-08") @ApiModelProperty(value = "预置位", example = "2022-06-08")
private Time endTime; private Integer preset;
} }
} }

17
xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleTimeListModel.java
Unescape Escape View File

@ -16,13 +16,24 @@ import java.util.List;
public class TerminalScheduleRuleTimeListModel implements Serializable { public class TerminalScheduleRuleTimeListModel implements Serializable {
@ApiModelProperty(value = "任务名称", example = "123456") @ApiModelProperty(value = "任务名称", example = "123456")
private List<String> list; private List<ScheduleRuleBean> list;
@ApiModelProperty(value = "是否最新", example = "123456") @ApiModelProperty(value = "是否最新", example = "123456")
private Boolean isNew = false; private Boolean isNew = false;
@ApiModelProperty(value = "偏移量", example = "123456") @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;
}
} }

106
xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/ScheduleListUtils.java
Unescape Escape View File

@ -33,31 +33,39 @@ public class ScheduleListUtils {
ArrayList<ScheduleDetails> list = new ArrayList<>(); ArrayList<ScheduleDetails> list = new ArrayList<>();
for (ScheduleRuleVo item : beans) { for (ScheduleRuleVo item : beans) {
Integer span = item.getSpan(); // Integer span = item.getSpan();
ScheduleDetails spanrule = new ScheduleDetails(); // ScheduleDetails spanrule = new ScheduleDetails();
spanrule.setScheduleId(scheduleid); // spanrule.setScheduleId(scheduleid);
spanrule.setHour(XyNumberUtils.delivery(span, 60)); // spanrule.setHour(XyNumberUtils.delivery(span, 60));
spanrule.setMinute(XyNumberUtils.remainder(span, 60)); // spanrule.setMinute(XyNumberUtils.remainder(span, 60));
spanrule.setPreset(255); // spanrule.setPreset(255);
list.add(spanrule); // list.add(spanrule);
//
ScheduleDetails startrule = new ScheduleDetails(); // ScheduleDetails startrule = new ScheduleDetails();
startrule.setScheduleId(scheduleid); // startrule.setScheduleId(scheduleid);
Time startTime = item.getStartTime(); // Time startTime = item.getStartTime();
startrule.setHour(MyDateUtils.hour(startTime, true)); // startrule.setHour(MyDateUtils.hour(startTime, true));
startrule.setMinute(MyDateUtils.minute(startTime)); // startrule.setMinute(MyDateUtils.minute(startTime));
startrule.setPreset(255); // startrule.setPreset(255);
list.add(startrule); // list.add(startrule);
//
ScheduleDetails endrule = new ScheduleDetails(); // ScheduleDetails endrule = new ScheduleDetails();
endrule.setScheduleId(scheduleid); // endrule.setScheduleId(scheduleid);
Time endTime = item.getEndTime(); // Time endTime = item.getEndTime();
endrule.setHour(MyDateUtils.hour(endTime, true)); // endrule.setHour(MyDateUtils.hour(endTime, true));
endrule.setMinute(MyDateUtils.minute(endTime)); // endrule.setMinute(MyDateUtils.minute(endTime));
endrule.setPreset(255); // endrule.setPreset(255);
list.add(endrule); // 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; return list;
} }
@ -171,32 +179,48 @@ public class ScheduleListUtils {
* @return * @return
*/ */
public static ArrayList<TerminalScheduleRuleModel.ScheduleRuleBean> getScheduleDetailsBeans(List<ScheduleDetailsDto> details) { public static ArrayList<TerminalScheduleRuleModel.ScheduleRuleBean> getScheduleDetailsBeans(List<ScheduleDetailsDto> details) {
// ArrayList<TerminalScheduleRuleModel.ScheduleRuleBean> 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<TerminalScheduleRuleModel.ScheduleRuleBean> detailsBeans = new ArrayList<>(); ArrayList<TerminalScheduleRuleModel.ScheduleRuleBean> detailsBeans = new ArrayList<>();
TerminalScheduleRuleModel.ScheduleRuleBean scheduleDetailsBean = new TerminalScheduleRuleModel.ScheduleRuleBean();
for (int i = 0; i < details.size(); i++) { for (int i = 0; i < details.size(); i++) {
ScheduleDetailsDto dto = details.get(i); ScheduleDetailsDto dto = details.get(i);
if (XyNumberUtils.remainder(i, 3) == 0) { TerminalScheduleRuleModel.ScheduleRuleBean scheduleDetailsBean = new TerminalScheduleRuleModel.ScheduleRuleBean();
scheduleDetailsBean = new TerminalScheduleRuleModel.ScheduleRuleBean();
Integer hour = dto.getHour(); Integer hour = dto.getHour();
Integer minute = dto.getMinute(); Integer minute = dto.getMinute();
Number mul = XyNumberUtils.mul((Number) hour, 60); Integer preset = dto.getPreset();
Number add = XyNumberUtils.add(mul, minute);
scheduleDetailsBean.setId(dto.getId()); scheduleDetailsBean.setId(dto.getId());
scheduleDetailsBean.setScheduleId(dto.getScheduleId()); scheduleDetailsBean.setScheduleId(dto.getScheduleId());
scheduleDetailsBean.setSpan(add.intValue()); scheduleDetailsBean.setHour(hour);
} else if (XyNumberUtils.remainder(i, 3) == 1) { scheduleDetailsBean.setMinute(minute);
Integer hour = dto.getHour(); scheduleDetailsBean.setPreset(preset);
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); detailsBeans.add(scheduleDetailsBean);
} }
}
return detailsBeans; return detailsBeans;
} }

18
xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ScheduleRuleVo.java
Unescape Escape View File

@ -13,17 +13,17 @@ import java.util.List;
@ApiModel(value = "任务规则对象详情", description = "任务规则对象详情描述") @ApiModel(value = "任务规则对象详情", description = "任务规则对象详情描述")
public class ScheduleRuleVo { public class ScheduleRuleVo {
@ApiModelProperty(value = "开始时间", example = "单位") @ApiModelProperty(value = "时", example = "单位")
@NotBlank(message = "开始时间不能缺少") @NotBlank(message = "时不能缺少")
private Time startTime; private Integer hour;
@ApiModelProperty(value = "结束时间", example = "型号型号") @ApiModelProperty(value = "分", example = "型号型号")
@NotBlank(message = "结束时间不能缺少") @NotBlank(message = "分不能缺少")
private Time endTime; private Integer minute;
@ApiModelProperty(value = "时间间隔", example = "型号型号") @ApiModelProperty(value = "预置位", example = "型号型号")
@NotBlank(message = "时间间隔不能缺少") @NotBlank(message = "预置位不能缺少")
private Integer span; private Integer preset;
} }

1
xymanager_common/src/main/java/com/shxy/xymanager_common/vo/VideoGetVo.java
Unescape Escape View File

@ -19,5 +19,4 @@ public class VideoGetVo {
@ApiModelProperty(value = "通道编号", example = "01") @ApiModelProperty(value = "通道编号", example = "01")
private Integer channelId; private Integer channelId;
} }

1
xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalSchedulesTempDao.java
Unescape Escape View File

@ -13,7 +13,6 @@ public interface TerminalSchedulesTempDao {
List<TerminalSchedulesTemp> selectByRequestId(@Param("list") List<Integer> id, @Param("status") Integer status); List<TerminalSchedulesTemp> selectByRequestId(@Param("list") List<Integer> id, @Param("status") Integer status);
int deleteByPrimaryKey(Integer id); int deleteByPrimaryKey(Integer id);
int insert(TerminalSchedulesTemp record); int insert(TerminalSchedulesTemp record);

35
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java
Unescape Escape View File

@ -456,9 +456,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
Map<Integer, TerminalChannels> termchannelMap = cacheService.getTermChannelMap(); Map<Integer, TerminalChannels> termchannelMap = cacheService.getTermChannelMap();
Map<Integer, TowerDto> towerMap = cacheService.getTowerMap(); Map<Integer, TowerDto> towerMap = cacheService.getTowerMap();
List<TerminalPhoto> photoList = terminalPhotoDao.selectPhotosByIdList(photolist); List<TerminalPhoto> photoList = terminalPhotoDao.selectPhotosByIdList(photolist);
beans = TerminalUtils.setPhotoList(requestIp, list, lineMap, termchannelMapMap, terminalMap, termchannelMap, towerMap, photoList); beans = TerminalUtils.setPhotoList(requestIp, list, lineMap, termchannelMapMap, terminalMap, termchannelMap, towerMap, photoList);
} }
model.setList(beans); model.setList(beans);
PageInfo pageData = PageUtils.getPageData(list); PageInfo pageData = PageUtils.getPageData(list);
@ -517,39 +515,6 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
return Asserts.success(model); return Asserts.success(model);
} }
@Override
public ServiceBody<TerminalScheduleRuleTimeListModel> 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<PhotoTimeResultDto> resultDtoList = JSONArray.parseArray(resultObj.get("groupData").toString(), PhotoTimeResultDto.class);
if (CollectionUtil.isNotEmpty(resultDtoList)) {
List<String> 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<DateTime> 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<TerminalScheduleRuleTimeListModel> listModel = terminalScheduleRuleService.getChannelSchelduleRule(idVo);
model = listModel.getData();
}
return Asserts.success(model);
}
@Override @Override
public ServiceBody<GetModel> selectPhotoTimeGet(TerminalPhotoTimeGetVo vo) { public ServiceBody<GetModel> selectPhotoTimeGet(TerminalPhotoTimeGetVo vo) {
GetModel model = new GetModel(); GetModel model = new GetModel();

45
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java
Unescape Escape View File

@ -283,7 +283,6 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
return Asserts.success(model); return Asserts.success(model);
} }
/** /**
* 查询拍照时间表任务是否下发成功 * 查询拍照时间表任务是否下发成功
* *
@ -372,26 +371,16 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
if (CollectionUtil.isEmpty(list)) { if (CollectionUtil.isEmpty(list)) {
model.setList(new ArrayList<>()); model.setList(new ArrayList<>());
} else { } else {
ArrayList<TerminalScheduleRuleModel.ScheduleRuleBean> detailsBeans = ScheduleListUtils.getScheduleDetailsBeans(list); ArrayList<TerminalScheduleRuleTimeListModel.ScheduleRuleBean> timestrlist = new ArrayList<>();
ArrayList<String> timestrlist = new ArrayList<>(); for (ScheduleDetailsDto item : list) {
for (TerminalScheduleRuleModel.ScheduleRuleBean item : detailsBeans) { TerminalScheduleRuleTimeListModel.ScheduleRuleBean scheduleRuleBean = new TerminalScheduleRuleTimeListModel.ScheduleRuleBean();
DateTime startTime = MyDateUtils.offsetMinute(item.getStartTime(), offset); Integer hour = item.getHour();
if (startTime.isAfterOrEquals(MyDateUtils.endOfDay(item.getStartTime()))) { Integer minute = item.getMinute();
startTime = MyDateUtils.endOfDay(item.getStartTime()); Integer preset = item.getPreset();
} scheduleRuleBean.setHour(hour);
DateTime endTime = MyDateUtils.offsetMinute(item.getEndTime(), offset); scheduleRuleBean.setMinute(minute);
if (endTime.isAfterOrEquals(MyDateUtils.endOfDay(item.getEndTime()))) { scheduleRuleBean.setPreset(preset);
endTime = MyDateUtils.endOfDay(item.getEndTime()); timestrlist.add(scheduleRuleBean);
}
// Time startTime = item.getStartTime();
// Time endTime = item.getEndTime();
Integer span = item.getSpan();
List<DateTime> dateTimes = MyDateUtils.rangeToList(startTime, endTime, DateField.MINUTE, span);
for (DateTime data : dateTimes) {
String dateTime = DateUtil.formatTime(data);
timestrlist.add(dateTime);
}
} }
model.setList(timestrlist); model.setList(timestrlist);
} }
@ -427,9 +416,19 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
if (StringUtils.isNotBlank(resultsData)) { if (StringUtils.isNotBlank(resultsData)) {
JSONObject resultObj = JSONObject.parseObject(resultsData); JSONObject resultObj = JSONObject.parseObject(resultsData);
if (null != resultObj.get("groupData")) { if (null != resultObj.get("groupData")) {
ArrayList<TerminalScheduleRuleTimeListModel.ScheduleRuleBean> list = new ArrayList<>();
List<PhotoTimeResultDto> resultDtoList = JSONArray.parseArray(resultObj.get("groupData").toString(), PhotoTimeResultDto.class); List<PhotoTimeResultDto> resultDtoList = JSONArray.parseArray(resultObj.get("groupData").toString(), PhotoTimeResultDto.class);
List<String> resultDetails = ScheduleListUtils.getResultDetails(resultDtoList); if (CollectionUtil.isNotEmpty(resultDtoList)) {
model.setList(resultDetails); 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); model.setIsNew(true);
} }
} }

1
xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java
Unescape Escape View File

@ -75,7 +75,6 @@ public interface TerminalPhotoService {
ServiceBody<TerminalPhotosParamsModel> getLastedPhotoQueryParam(ReturnedPhotoParamsVo vo); ServiceBody<TerminalPhotosParamsModel> getLastedPhotoQueryParam(ReturnedPhotoParamsVo vo);
ServiceBody<TerminalScheduleRuleTimeListModel> selectPhotoTime(TerminalReqPhotoTimeVo vo);
ServiceBody<GetModel> selectPhotoTimeGet(TerminalPhotoTimeGetVo vo); ServiceBody<GetModel> selectPhotoTimeGet(TerminalPhotoTimeGetVo vo);

Write Preview
Loading…
Cancel
Save