diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LineController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LineController.java index 0ce7278..6f0fbdb 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LineController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LineController.java @@ -37,7 +37,7 @@ public class LineController extends BaseController { @ApiOperation(value = "获取线路树状图", notes = "获取线路树状图接口", httpMethod = "POST") @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getLineTreeList") - @Log(title = "获取线路列表", type = "查询") + @Log(title = "获取线路树状图", type = "查询") public ResponseReult getLineTreeList() { ServiceBody serviceBody = lineService.getLineTreeList(); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalScheduleRuleController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalScheduleRuleController.java index afdc07e..c1287e7 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalScheduleRuleController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalScheduleRuleController.java @@ -5,13 +5,10 @@ import com.shxy.xymanager_common.base.BaseController; import com.shxy.xymanager_common.base.ResponseReult; import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.bean.ServiceStatus; -import com.shxy.xymanager_common.model.TerminalListModel; -import com.shxy.xymanager_common.vo.TerminalIdListVo; -import com.shxy.xymanager_common.vo.TerminalVo; -import com.shxy.xymanager_common.vo.UpdateTerminalVo; +import com.shxy.xymanager_common.model.TerminalScheduleRuleListModel; +import com.shxy.xymanager_common.model.TerminalScheduleRuleModel; +import com.shxy.xymanager_common.vo.*; import com.shxy.xymanager_service.service.TerminalScheduleRuleService; -import com.shxy.xymanager_service.service.TerminalScheduleService; -import com.shxy.xymanager_service.service.TerminalService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; @@ -36,8 +33,8 @@ public class TerminalScheduleRuleController extends BaseController { @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getScheduleRulelList") @Log(title = "获取任务规则列表", type = "查询") - public ResponseReult getSchedulelRuleList() { - ServiceBody serviceBody = terminalScheduleRuleService.getScheduleRuleList(); + public ResponseReult getSchedulelRuleList() { + ServiceBody serviceBody = terminalScheduleRuleService.getScheduleRuleList(); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { @@ -45,7 +42,59 @@ public class TerminalScheduleRuleController extends BaseController { } } + @ApiOperation(value = "获取单个任务规则", notes = "获取单个任务规则接口", httpMethod = "POST") + @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/getSingleScheduleRule") + @Log(title = "获取单个任务规则", type = "查询") + public ResponseReult getSingleScheduleRule(@RequestBody @Validated TerminalRuleIdVo vo) { + ServiceBody serviceBody = terminalScheduleRuleService.getSingleScheduleRule(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("/addSchelduleRuleList") + @Log(title = "添加任务规则列表", type = "新增") + public ResponseReult addSchedulelRuleList(@RequestBody @Validated TerminalRuleListVo vo) { + ServiceBody serviceBody = terminalScheduleRuleService.addSchedulelRuleList(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("/updateSchelduleRule") + @Log(title = "修改任务规则", type = "修改") + public ResponseReult updateSchelduleRule(@RequestBody @Validated TerminalRuleVo vo) { + ServiceBody serviceBody = terminalScheduleRuleService.updateSchelduleRule(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("/deleteSchelduleRule") + @Log(title = "删除任务规则", type = "修改") + public ResponseReult deleteSchelduleRule(@RequestBody @Validated TerminalRuleIdListVo vo) { + ServiceBody serviceBody = terminalScheduleRuleService.deleteSchelduleRule(vo); + if (serviceBody.getCode() == ServiceStatus.SUCCESS) { + return ResponseReult.success(serviceBody.getData()); + } else { + return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); + } + } + } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/LineAndTerminalDto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/LineAndTerminalDto.java index 08feea8..347b119 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/LineAndTerminalDto.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/LineAndTerminalDto.java @@ -16,6 +16,6 @@ public class LineAndTerminalDto { private Byte dyLevel; - private List itemList; + private List list; } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java index 586b4e2..84920d9 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java @@ -27,7 +27,7 @@ public class TerminalPhoto implements Serializable { private String path; - private Byte manualRequest; + private Integer manualRequest; private Date createTime; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalSchedule.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalSchedule.java index cdbcb83..648c8ba 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalSchedule.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalSchedule.java @@ -1,8 +1,11 @@ package com.shxy.xymanager_common.entity; +import lombok.Data; + import java.io.Serializable; import java.util.Date; +@Data public class TerminalSchedule implements Serializable { private Integer id; @@ -22,67 +25,4 @@ public class TerminalSchedule implements Serializable { private static final long serialVersionUID = 1L; - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Integer getTermId() { - return termId; - } - - public void setTermId(Integer termId) { - this.termId = termId; - } - - public Byte getChannelId() { - return channelId; - } - - public void setChannelId(Byte channelId) { - this.channelId = channelId; - } - - public Byte getHour() { - return hour; - } - - public void setHour(Byte hour) { - this.hour = hour; - } - - public Byte getMinute() { - return minute; - } - - public void setMinute(Byte minute) { - this.minute = minute; - } - - public Integer getPresetId() { - return presetId; - } - - public void setPresetId(Integer presetId) { - this.presetId = presetId; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } } \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleRule.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleRule.java index b46896b..9957c8a 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleRule.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleRule.java @@ -16,10 +16,12 @@ public class TerminalScheduleRule implements Serializable { private Date endTime; - private Integer interval; + private Integer span; private String remark; + private Integer status; + private Date createTime; private Date updateTime; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/LineListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/LineListModel.java index 918351d..3b6076e 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/LineListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/LineListModel.java @@ -16,7 +16,7 @@ import java.util.List; public class LineListModel implements Serializable { @ApiModelProperty(value = "杆塔线路列表", example = "[]") - private List terminalBeanList; + private List list; @Data public static class LineBean { diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/LineTreeListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/LineTreeListModel.java index a7c7666..d7f14a1 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/LineTreeListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/LineTreeListModel.java @@ -14,8 +14,8 @@ import java.util.List; @ApiModel(value = "获取线路树状图列表", description = "获取线路树状图列表信息") public class LineTreeListModel implements Serializable { - @ApiModelProperty(value = "杆塔线路列表", example = "[]") - private List linelist; + @ApiModelProperty(value = "线路列表", example = "[]") + private List list; @Data public static class LineBean { @@ -33,12 +33,15 @@ public class LineTreeListModel implements Serializable { private Byte dyLevel; @ApiModelProperty(value = "装置信息", example = "123456") - private List itemList; + private List list; } @Data - private static class TerminalBean { + public static class TerminalBean { + + @ApiModelProperty(value = "装置编号", example = "123456") + private Integer id; @ApiModelProperty(value = "杆塔编号", example = "123456") private Integer towerid; @@ -50,7 +53,7 @@ public class LineTreeListModel implements Serializable { private String equipName; @ApiModelProperty(value = "显示名", example = "名称名称") - private String displayName; + private String name; @ApiModelProperty(value = "装置型号", example = "型号型号") private String model; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java index bf1ad43..db77199 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java @@ -17,11 +17,14 @@ import java.util.List; public class TerminalListModel implements Serializable { @ApiModelProperty(value = "设备列表", example = "[]") - private List terminalBeanList; + private List list; @Data public static class TerminalBean { + @ApiModelProperty(value = "设备编号", example = "123456") + private Integer id; + @ApiModelProperty(value = "线路编号", example = "123456") private Integer lineid; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java index 7af747d..9d66224 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java @@ -9,10 +9,10 @@ import java.util.Date; import java.util.List; /** - * 通道列表 + * 图片列表 */ @Data -@ApiModel(value = "通道列表", description = "通道列表信息") +@ApiModel(value = "图片列表对象", description = "图片列表对象信息") public class TerminalPhotoListModel implements Serializable { @ApiModelProperty(value = "总记录数", example = "120") @@ -24,13 +24,13 @@ public class TerminalPhotoListModel implements Serializable { @ApiModelProperty(value = "每页记录数", example = "1") private int pagesize; - @ApiModelProperty(value = "通道列表对象", example = "[]") - private List list; + @ApiModelProperty(value = "照片对象", example = "[]") + private List list; @Data - public static class ChannelBean { + public static class PhotoBean { - @ApiModelProperty(value = "通道id", example = "12321") + @ApiModelProperty(value = "图片id", example = "12321") private Long id; @ApiModelProperty(value = "装置编号", example = "123456") @@ -61,7 +61,7 @@ public class TerminalPhotoListModel implements Serializable { private String path; @ApiModelProperty(value = "拍照方式", example = "123456") - private Byte manualRequest; + private Integer manualRequest; } } 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 new file mode 100644 index 0000000..3cb671d --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleListModel.java @@ -0,0 +1,44 @@ +package com.shxy.xymanager_common.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.sql.Time; +import java.util.Date; +import java.util.List; + +/** + * 时间任务列表 + */ +@Data +@ApiModel(value = "时间任务列表", description = "获取时间任务列表信息") +public class TerminalScheduleRuleListModel implements Serializable { + + @ApiModelProperty(value = "时间任务列表", example = "[]") + private List list; + + @Data + public static class ScheduleRuleBean { + + @ApiModelProperty(value = "任务编号", example = "123456") + private Integer id; + + @ApiModelProperty(value = "任务名称", example = "123456") + private String name; + + @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; + + @ApiModelProperty(value = "备注", example = "erwsafsasa") + private String remark; + + } +} 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 new file mode 100644 index 0000000..90b6719 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleModel.java @@ -0,0 +1,36 @@ +package com.shxy.xymanager_common.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.sql.Time; +import java.util.List; + +/** + * 时间任务列表 + */ +@Data +@ApiModel(value = "时间任务", description = "获取时间任务信息") +public class TerminalScheduleRuleModel implements Serializable { + + @ApiModelProperty(value = "任务编号", example = "123456") + private Integer id; + + @ApiModelProperty(value = "任务名称", example = "123456") + private String name; + + @ApiModelProperty(value = "间隔", example = "213") + private Integer span; + + @ApiModelProperty(value = "开始时间", example = "2022-06-08") + private String startTime; + + @ApiModelProperty(value = "结束时间", example = "2022-06-08") + private String endTime; + + @ApiModelProperty(value = "备注", example = "erwsafsasa") + private String remark; + +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/MyDateUtils.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/MyDateUtils.java new file mode 100644 index 0000000..42f7712 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/MyDateUtils.java @@ -0,0 +1,157 @@ +package com.shxy.xymanager_common.util; + +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; +import org.apache.commons.lang3.time.DateFormatUtils; + +import java.lang.management.ManagementFactory; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + +/** + * 时间工具类 + * + * @author 晶晶 + */ +public class MyDateUtils extends DateUtil { + public static String YYYY = "yyyy"; + + public static String YYYY_MM = "yyyy-MM"; + + public static String YYYY_MM_DD = "yyyy-MM-dd"; + + public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss"; + + public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss"; + + public static String[] parsePatterns = { + "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", "yyyy年MM月dd日", + "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM", "HH时mm分", "HH:mm","HH:mm:ss", + "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM","yyyyMMdd"}; + + /** + * 获取当前Date型日期 + * + * @return Date() 当前日期 + */ + public static Date getNowDate() { + return new Date(); + } + + /** + * 获取当前日期, 默认格式为yyyy-MM-dd + * + * @return String + */ + public static String getDate() { + return dateTimeNow(YYYY_MM_DD); + } + + public static final String getTime() { + return dateTimeNow(YYYY_MM_DD_HH_MM_SS); + } + + public static final String dateTimeNow() { + return dateTimeNow(YYYYMMDDHHMMSS); + } + + public static final String dateTimeNow(final String format) { + return parseDateToStr(format, new Date()); + } + + public static final String dateTime(final Date date) { + return parseDateToStr(YYYY_MM_DD, date); + } + + public static final String parseDateToStr(final String format, final Date date) { + return new SimpleDateFormat(format).format(date); + } + + public static final Date dateTime(final String format, final String ts) { + try { + return new SimpleDateFormat(format).parse(ts); + } catch (ParseException e) { + throw new RuntimeException(e); + } + } + + /** + * 日期路径 即年/月/日 如2018/08/08 + */ + public static final String datePath() { + Date now = new Date(); + return DateFormatUtils.format(now, "yyyy/MM/dd"); + } + + /** + * 日期路径 即年/月/日 如20180808 + */ + public static final String dateTime() { + Date now = new Date(); + return DateFormatUtils.format(now, "yyyyMMdd"); + } + + /** + * 日期型字符串转化为日期 格式 + */ + public static Date myparseDate(Object str) { + if (str == null) { + return null; + } + return parse(str.toString(), parsePatterns); + } + + + /** + * 日期型转化为HH:mm 格式 + */ + public static String parseHourAndMin(Date str) { + if (str == null) { + return null; + } + return format(str, "HH:mm"); + } + /** + * 日期型转化为"MM/dd" 格式 + */ + public static String parseMonthAndDay(Date str) { + if (str == null) { + return null; + } + return format(str, "MM/dd"); + } + /** + * 获取服务器启动时间 + */ + public static Date getServerStartDate() { + long time = ManagementFactory.getRuntimeMXBean().getStartTime(); + return new Date(time); + } + /** + * 日期型转化为"yyyy-MM-dd HH:mm" 格式 + */ + public static String formatYmdHmTime(Date date) { + return null == date ? null : DatePattern.NORM_DATETIME_MINUTE_FORMAT.format(date); + } + /** + * 计算两个时间差 + */ + public static String getDatePoor(Date endDate, Date nowDate) { + long nd = 1000 * 24 * 60 * 60; + long nh = 1000 * 60 * 60; + long nm = 1000 * 60; + // long ns = 1000; + // 获得两个时间的毫秒时间差异 + long diff = endDate.getTime() - nowDate.getTime(); + // 计算差多少天 + long day = diff / nd; + // 计算差多少小时 + long hour = diff % nd / nh; + // 计算差多少分钟 + long min = diff % nd % nh / nm; + // 计算差多少秒//输出结果 + // long sec = diff % nd % nh % nm / ns; + return day + "天" + hour + "小时" + min + "分钟"; + } +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdListVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdListVo.java index d5d4b73..8b46ccb 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdListVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdListVo.java @@ -12,11 +12,5 @@ import java.util.List; public class TerminalIdListVo { @NotEmpty(message = "不能传入空值") @ApiModelProperty(value = "装置对象数组", required = true, example = "A0001") - private List list; - - @Data - private static class Item { - @ApiModelProperty(value = "装置编号", example = "123455") - private Integer id; - } + private List list; } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdVo.java index 2cc8dbb..5ec6aa2 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdVo.java @@ -14,5 +14,5 @@ public class TerminalIdVo { @NotNull(message = "装置编号不能缺少") @ApiModelProperty(value = "装置编号", example = "123455") - private Integer cmdid; + private Integer termid; } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalRuleIdListVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalRuleIdListVo.java new file mode 100644 index 0000000..9fc1adc --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalRuleIdListVo.java @@ -0,0 +1,17 @@ +package com.shxy.xymanager_common.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.List; + +@Data +@ApiModel(value = "任务规则编号列表", description = "任务规则编号列表描述") +public class TerminalRuleIdListVo { + @NotEmpty(message = "不能传入空值") + @ApiModelProperty(value = "任务规则对象数组", required = true, example = "A0001") + private List list; +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalRuleIdVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalRuleIdVo.java new file mode 100644 index 0000000..e8682cc --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalRuleIdVo.java @@ -0,0 +1,16 @@ +package com.shxy.xymanager_common.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +@ApiModel(value = "任务规则编号对象", description = "任务规则编号对象描述") +public class TerminalRuleIdVo { + + @NotNull(message = "规则编号不能缺少") + @ApiModelProperty(value = "规则编号", example = "123455") + private Integer id; +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalRuleListVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalRuleListVo.java new file mode 100644 index 0000000..a0e7ba0 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalRuleListVo.java @@ -0,0 +1,18 @@ +package com.shxy.xymanager_common.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import java.util.List; + +@Data +@ApiModel(value = "任务规则对象列表", description = "任务规则对象列表描述") +public class TerminalRuleListVo { + @NotEmpty(message = "不能传入空值") + @ApiModelProperty(value = "任务规则对象数组", required = true, example = "A0001") + private List list; + + +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalRuleVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalRuleVo.java new file mode 100644 index 0000000..9f3f68b --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalRuleVo.java @@ -0,0 +1,38 @@ +package com.shxy.xymanager_common.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.util.List; + +@Data +@ApiModel(value = "任务规则对象", description = "任务规则对象描述") +public class TerminalRuleVo { + @ApiModelProperty(value = "任务规则编号", example = "名称名称") + @NotBlank(message = "任务编号不能缺少") + private Integer id; + + @ApiModelProperty(value = "任务规则名称", example = "名称名称") + @NotBlank(message = "任务规则名称不能缺少") + private String name; + + @ApiModelProperty(value = "开始时间", example = "单位") + @NotBlank(message = "开始时间不能缺少") + private String startTime; + + @ApiModelProperty(value = "结束时间", example = "型号型号") + @NotBlank(message = "结束时间不能缺少") + private String endTime; + + @ApiModelProperty(value = "时间间隔", example = "型号型号") + @NotBlank(message = "时间间隔不能缺少") + private Integer span; + + @ApiModelProperty(value = "备注", example = "型号型号") + @NotBlank(message = "时间间隔不能缺少") + private String remark; + +} diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleRuleDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleRuleDao.java index 49b350e..3a72e8e 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleRuleDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleRuleDao.java @@ -1,17 +1,24 @@ package com.shxy.xymanager_dao.dao; import com.shxy.xymanager_common.entity.TerminalScheduleRule; +import org.apache.ibatis.annotations.Param; -public interface TerminalScheduleRuleDao { - int deleteByPrimaryKey(Integer id); +import java.util.Date; +import java.util.List; - int insert(TerminalScheduleRule record); +public interface TerminalScheduleRuleDao { int insertSelective(TerminalScheduleRule record); + int insertList(@Param("list") List record, @Param("status") Integer status, @Param("createat") Date create, @Param("updateat") Date update); + TerminalScheduleRule selectByPrimaryKey(Integer id); - int updateByPrimaryKeySelective(TerminalScheduleRule record); + List selectAll(@Param("status") Integer status); + + int deleteById(@Param("list") List record, @Param("status") Integer status,@Param("updateat") Date update); + + int updateByPrimaryKeySelective(@Param("data") TerminalScheduleRule record,@Param("updateat") Date update); int updateByPrimaryKey(TerminalScheduleRule record); } \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/LinesDao.xml b/xymanager_dao/src/main/resources/mappers/LinesDao.xml index c238f0e..a4da790 100644 --- a/xymanager_dao/src/main/resources/mappers/LinesDao.xml +++ b/xymanager_dao/src/main/resources/mappers/LinesDao.xml @@ -17,7 +17,8 @@ - + + @@ -41,13 +42,12 @@ from `lines` where id = #{id,jdbcType=INTEGER} - - select from terminal_schedulerule where id = #{id,jdbcType=INTEGER} - - delete from terminal_schedulerule - where id = #{id,jdbcType=INTEGER} - + + insert into terminal_schedulerule (id, name, start_time, - end_time, interval, remark, + end_time, span, remark, create_time, update_time) values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{startTime,jdbcType=TIME}, - #{endTime,jdbcType=TIME}, #{interval,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, + #{endTime,jdbcType=TIME}, #{span,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}) + + + insert into terminal_schedulerule + (name,start_time,end_time,span,remark,status,create_time,update_time) + VALUES + + (#{item.name},#{item.startTime},#{item.endTime},#{item.span},#{item.remark},#{status},#{createat},#{updateat}) + + + + insert into terminal_schedulerule @@ -47,8 +62,8 @@ end_time, - - interval, + + span, remark, @@ -73,8 +88,8 @@ #{endTime,jdbcType=TIME}, - - #{interval,jdbcType=INTEGER}, + + #{span,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, @@ -87,39 +102,47 @@ + + + update terminal_schedulerule + set status = #{status}, + update_time = #{updateat} + where id in + + #{item.id} + + + update terminal_schedulerule - - name = #{name,jdbcType=VARCHAR}, - - - start_time = #{startTime,jdbcType=TIME}, + + name = #{data.name,jdbcType=VARCHAR}, - - end_time = #{endTime,jdbcType=TIME}, + + start_time = #{data.startTime,jdbcType=TIME}, - - interval = #{interval,jdbcType=INTEGER}, + + end_time = #{data.endTime,jdbcType=TIME}, - - remark = #{remark,jdbcType=VARCHAR}, + + span = #{data.span,jdbcType=INTEGER}, - - create_time = #{createTime,jdbcType=TIMESTAMP}, + + remark = #{data.remark,jdbcType=VARCHAR}, - - update_time = #{updateTime,jdbcType=TIMESTAMP}, + + update_time = #{updateat,jdbcType=TIMESTAMP}, - where id = #{id,jdbcType=INTEGER} + where id = #{data.id,jdbcType=INTEGER} update terminal_schedulerule set name = #{name,jdbcType=VARCHAR}, start_time = #{startTime,jdbcType=TIME}, end_time = #{endTime,jdbcType=TIME}, - interval = #{interval,jdbcType=INTEGER}, + span = #{span,jdbcType=INTEGER}, remark = #{remark,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=TIMESTAMP}, update_time = #{updateTime,jdbcType=TIMESTAMP} diff --git a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml index 7d91d04..101d1f1 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml @@ -154,6 +154,16 @@ + + update terminals + set status = #{status}, + update_time = #{updateat} + where id in + + #{item.id} + + + update terminals diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java index 4bc68c5..f02cce3 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java @@ -47,10 +47,15 @@ public class LineServiceImpl implements LineService { List list = linesDao.selectLineAndTerminalList(CommonStatus.EFFECTIVE.value()); boolean empty = CollectionUtil.isEmpty(list); if (empty) { - model.setLinelist(new ArrayList<>()); + model.setList(new ArrayList<>()); } else { List lineBeans = BeanUtil.copyToList(list, LineTreeListModel.LineBean.class, CopyOptions.create().ignoreCase()); - model.setLinelist(lineBeans); + for (int i = 0; i < lineBeans.size(); i++) { + for (int j = 0; j < lineBeans.get(i).getList().size(); j++) { + lineBeans.get(i).getList().get(j).setName(list.get(i).getList().get(j).getDisplayName()); + } + } + model.setList(lineBeans); } return Asserts.success(model); } @@ -66,10 +71,10 @@ public class LineServiceImpl implements LineService { List terminals = linesDao.selectAll(CommonStatus.EFFECTIVE.value()); boolean empty = CollectionUtil.isEmpty(terminals); if (empty) { - model.setTerminalBeanList(new ArrayList<>()); + model.setList(new ArrayList<>()); } else { List list = BeanUtil.copyToList(terminals, LineListModel.LineBean.class, CopyOptions.create().ignoreCase()); - model.setTerminalBeanList(list); + model.setList(list); } return Asserts.success(model); } @@ -84,7 +89,7 @@ public class LineServiceImpl implements LineService { public ServiceBody addLine(LineVo vo) { List lines = BeanUtil.copyToList(vo.getList(), Lines.class); Date date = new Date(); - int i = linesDao.insertList(lines,CommonStatus.EFFECTIVE.value(), date,date); + int i = linesDao.insertList(lines, CommonStatus.EFFECTIVE.value(), date, date); if (i != 0) { return Asserts.success("录入成功"); } else { @@ -102,7 +107,7 @@ public class LineServiceImpl implements LineService { public ServiceBody deleteLine(LineIdVo vo) { List lines = BeanUtil.copyToList(vo.getList(), Lines.class); Date date = new Date(); - int i = linesDao.deleteById(lines,CommonStatus.DELETE.value(), date); + int i = linesDao.deleteById(lines, CommonStatus.DELETE.value(), date); if (i != 0) { return Asserts.success("删除成功"); } else { @@ -119,8 +124,8 @@ public class LineServiceImpl implements LineService { */ @Override public ServiceBody updateLine(UpdateLineVo vo) { - Lines lines = BeanUtil.copyProperties(vo, Lines.class); - int i = linesDao.updateByPrimaryKeySelective(lines,new Date()); + Lines lines = BeanUtil.copyProperties(vo, Lines.class); + int i = linesDao.updateByPrimaryKeySelective(lines, new Date()); if (i != 0) { return Asserts.success("修改成功"); } else { diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalChannelServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalChannelServiceImpl.java index fbfb30e..66fc61a 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalChannelServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalChannelServiceImpl.java @@ -35,7 +35,7 @@ public class TerminalChannelServiceImpl implements TerminalChannelService { @Override public ServiceBody getChannelList(TerminalIdVo vo) { TerminalChannelListModel model = new TerminalChannelListModel(); - List list = terminalChannelsDao.selectByTermid(vo.getCmdid()); + List list = terminalChannelsDao.selectByTermid(vo.getTermid()); boolean empty = CollectionUtil.isEmpty(list); if (empty) { model.setList(new ArrayList<>()); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalParamsServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalParamsServiceImpl.java index 0f118e7..f28b1c4 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalParamsServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalParamsServiceImpl.java @@ -3,7 +3,6 @@ package com.shxy.xymanager_service.impl; import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.model.TerminalListModel; import com.shxy.xymanager_common.vo.TerminalVo; -import com.shxy.xymanager_service.service.TerminalChannelService; import com.shxy.xymanager_service.service.TerminalParamsService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; 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 6fa9589..63852be 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 @@ -46,7 +46,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { if (empty) { model.setList(new ArrayList<>()); } else { - List beans = BeanUtil.copyToList(list, TerminalPhotoListModel.ChannelBean.class, CopyOptions.create().ignoreCase()); + List beans = BeanUtil.copyToList(list, TerminalPhotoListModel.PhotoBean.class, CopyOptions.create().ignoreCase()); model.setList(beans); } PageInfo pageData = PageUtils.getPageData(list); 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 bebb0a0..01e0aa3 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 @@ -1,13 +1,26 @@ package com.shxy.xymanager_service.impl; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import cn.hutool.core.collection.CollectionUtil; import com.shxy.xymanager_common.bean.ServiceBody; -import com.shxy.xymanager_common.model.TerminalListModel; -import com.shxy.xymanager_common.vo.TerminalVo; +import com.shxy.xymanager_common.entity.TerminalScheduleRule; +import com.shxy.xymanager_common.enums.CommonStatus; +import com.shxy.xymanager_common.exception.Asserts; +import com.shxy.xymanager_common.model.TerminalScheduleRuleListModel; +import com.shxy.xymanager_common.model.TerminalScheduleRuleModel; +import com.shxy.xymanager_common.util.MyDateUtils; +import com.shxy.xymanager_common.vo.*; +import com.shxy.xymanager_dao.dao.TerminalScheduleRuleDao; import com.shxy.xymanager_service.service.TerminalScheduleRuleService; -import com.shxy.xymanager_service.service.TerminalScheduleService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + /** * 时间任务实现层 */ @@ -15,17 +28,119 @@ import org.springframework.stereotype.Service; @Slf4j public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleService { + @Autowired + TerminalScheduleRuleDao terminalScheduleRuleDao; + /** - * 时间 + * 获取时间任务规则列表 + * * @return */ @Override - public ServiceBody getScheduleRuleList() { - return null; + public ServiceBody getScheduleRuleList() { + TerminalScheduleRuleListModel model = new TerminalScheduleRuleListModel(); + List list = terminalScheduleRuleDao.selectAll(CommonStatus.EFFECTIVE.value()); + boolean empty = CollectionUtil.isEmpty(list); + if (empty) { + model.setList(new ArrayList<>()); + } else { + List beans = BeanUtil.copyToList(list, TerminalScheduleRuleListModel.ScheduleRuleBean.class, CopyOptions.create().ignoreCase()); + model.setList(beans); + } + return Asserts.success(model); } + /** + * 获取单个时间任务规则 + * + * @param vo + * @return + */ @Override - public ServiceBody addSchelduleRule(TerminalVo terminalVo) { - return null; + public ServiceBody getSingleScheduleRule(TerminalRuleIdVo vo) { + TerminalScheduleRule item = terminalScheduleRuleDao.selectByPrimaryKey(vo.getId()); + if (BeanUtil.isEmpty(item)) { + return Asserts.error("没有该对象"); + } else { + TerminalScheduleRuleModel bean = new TerminalScheduleRuleModel(); + bean.setId(item.getId()); + bean.setName(item.getName()); + bean.setStartTime(MyDateUtils.parseHourAndMin(item.getStartTime())); + bean.setEndTime(MyDateUtils.parseHourAndMin(item.getEndTime())); + bean.setSpan(item.getSpan()); + bean.setRemark(item.getRemark()); + return Asserts.success(bean); + } } + + /** + * 添加时间任务规则列表 + * + * @param vo + * @return + */ + @Override + public ServiceBody addSchedulelRuleList(TerminalRuleListVo vo) { + ArrayList list = new ArrayList<>(); + for (TerminalRuleVo item : vo.getList()) { + TerminalScheduleRule bean = new TerminalScheduleRule(); + bean.setName(item.getName()); + bean.setStartTime(MyDateUtils.myparseDate(item.getStartTime())); + bean.setEndTime(MyDateUtils.myparseDate(item.getEndTime())); + bean.setSpan(item.getSpan()); + bean.setRemark(item.getRemark()); + bean.setStatus(CommonStatus.EFFECTIVE.value()); + list.add(bean); + } + Date date = new Date(); + int i = terminalScheduleRuleDao.insertList(list, CommonStatus.EFFECTIVE.value(), date, date); + if (i != 0) { + return Asserts.success("录入成功"); + } else { + return Asserts.error("录入失败"); + } + } + + /** + * 修改时间任务规则 + * + * @param vo + * @return + */ + @Override + public ServiceBody updateSchelduleRule(TerminalRuleVo vo) { + TerminalScheduleRule bean = new TerminalScheduleRule(); + bean.setId(vo.getId()); + bean.setName(vo.getName()); + bean.setStartTime(MyDateUtils.myparseDate(vo.getStartTime())); + bean.setEndTime(MyDateUtils.myparseDate(vo.getEndTime())); + bean.setSpan(vo.getSpan()); + bean.setRemark(vo.getRemark()); + bean.setStatus(CommonStatus.EFFECTIVE.value()); + int i = terminalScheduleRuleDao.updateByPrimaryKeySelective(bean, new Date()); + if (i != 0) { + return Asserts.success("修改成功"); + } else { + return Asserts.error("修改失败"); + } + } + + + /** + * 删除时间任务规则列表 + * + * @param vo + * @return + */ + @Override + public ServiceBody deleteSchelduleRule(TerminalRuleIdListVo vo) { + List list = BeanUtil.copyToList(vo.getList(), TerminalScheduleRule.class); + int i = terminalScheduleRuleDao.deleteById(list, CommonStatus.DELETE.value(), new Date()); + if (i != 0) { + return Asserts.success("删除成功"); + } else { + return Asserts.error("删除失败"); + } + } + } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleServiceImpl.java index dac9b1a..468463f 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleServiceImpl.java @@ -3,7 +3,6 @@ package com.shxy.xymanager_service.impl; import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.model.TerminalListModel; import com.shxy.xymanager_common.vo.TerminalVo; -import com.shxy.xymanager_service.service.TerminalChannelService; import com.shxy.xymanager_service.service.TerminalScheduleService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -16,9 +15,8 @@ import org.springframework.stereotype.Service; @Slf4j public class TerminalScheduleServiceImpl implements TerminalScheduleService { - @Override - public ServiceBody getTerminalList() { + public ServiceBody getScheduleList() { return null; } 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 43edec9..b4f4f2d 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 @@ -41,16 +41,16 @@ public class TerminalServiceImpl implements TerminalService { */ @Override public ServiceBody getTerminalList() { - TerminalListModel terminalListModel = new TerminalListModel(); + TerminalListModel model = new TerminalListModel(); List terminals = terminalsDao.selectAll(CommonStatus.EFFECTIVE.value()); boolean empty = CollectionUtil.isEmpty(terminals); if (empty) { - terminalListModel.setTerminalBeanList(new ArrayList<>()); + model.setList(new ArrayList<>()); } else { List list = BeanUtil.copyToList(terminals, TerminalListModel.TerminalBean.class, CopyOptions.create().ignoreCase()); - terminalListModel.setTerminalBeanList(list); + model.setList(list); } - return Asserts.success(terminalListModel); + return Asserts.success(model); } /** diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalStatusServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalStatusServiceImpl.java index 936c262..8418908 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalStatusServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalStatusServiceImpl.java @@ -44,10 +44,10 @@ public class TerminalStatusServiceImpl implements TerminalStatusService { List terminals = terminalsDao.selectAll(CommonStatus.EFFECTIVE.value()); boolean empty = CollectionUtil.isEmpty(terminals); if (empty) { - terminalListModel.setTerminalBeanList(new ArrayList<>()); + terminalListModel.setList(new ArrayList<>()); } else { List list = BeanUtil.copyToList(terminals, TerminalListModel.TerminalBean.class, CopyOptions.create().ignoreCase()); - terminalListModel.setTerminalBeanList(list); + terminalListModel.setList(list); } return Asserts.success(terminalListModel); } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalScheduleRuleService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalScheduleRuleService.java index c16ad32..60af701 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalScheduleRuleService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalScheduleRuleService.java @@ -1,8 +1,9 @@ package com.shxy.xymanager_service.service; import com.shxy.xymanager_common.bean.ServiceBody; -import com.shxy.xymanager_common.model.TerminalListModel; -import com.shxy.xymanager_common.vo.TerminalVo; +import com.shxy.xymanager_common.model.TerminalScheduleRuleListModel; +import com.shxy.xymanager_common.model.TerminalScheduleRuleModel; +import com.shxy.xymanager_common.vo.*; /** * 任务规则接口 @@ -15,13 +16,38 @@ public interface TerminalScheduleRuleService { * * @return */ - ServiceBody getScheduleRuleList(); + ServiceBody getScheduleRuleList(); + + /** + * 获取单个任务规则 + * + * @param vo + * @return + */ + ServiceBody getSingleScheduleRule(TerminalRuleIdVo vo); /** * 添加任务规则接口 * * @return */ - ServiceBody addSchelduleRule(TerminalVo terminalVo); + ServiceBody addSchedulelRuleList(TerminalRuleListVo vo); + + + /** + * 修改任务规则接口 + * + * @param vo + * @return + */ + ServiceBody updateSchelduleRule(TerminalRuleVo vo); + + /** + * 删除任务规则接口 + * + * @param vo + * @return + */ + ServiceBody deleteSchelduleRule(TerminalRuleIdListVo vo); }