diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/ChannelController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/ChannelController.java index 700658e..39d85ff 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/ChannelController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/ChannelController.java @@ -6,6 +6,7 @@ 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.TerminalChannelListModel; +import com.shxy.xymanager_common.model.TerminalChannelTreeListModel; import com.shxy.xymanager_common.model.TerminalListModel; import com.shxy.xymanager_common.vo.TerminalIdVo; import com.shxy.xymanager_service.service.TerminalChannelService; @@ -42,4 +43,17 @@ public class ChannelController extends BaseController { 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("/getChannelTreeList") + @Log(title = "获取所有通道树状列表", type = "查询") + public ResponseReult getChannelTreeList() { + ServiceBody serviceBody = terminalChannelService.getChannelTreeList(); + if (serviceBody.getCode() == ServiceStatus.SUCCESS) { + return ResponseReult.success(serviceBody.getData()); + } else { + return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); + } + } } 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 4f31832..0c39b6d 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 @@ -55,7 +55,6 @@ public class TerminalScheduleRuleController extends BaseController { } } - @ApiOperation(value = "添加任务规则列表", notes = "添加任务规则列表接口", httpMethod = "POST") @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/addSchelduleRuleList") @@ -69,7 +68,6 @@ public class TerminalScheduleRuleController extends BaseController { } } - @ApiOperation(value = "修改任务规则", notes = "修改任务规则接口", httpMethod = "POST") @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/updateSchelduleRule") @@ -96,5 +94,18 @@ public class TerminalScheduleRuleController extends BaseController { } } + @ApiOperation(value = "拍照任务规则关联设备", notes = "拍照任务规则关联设备接口", httpMethod = "POST") + @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/relateSchelduleRule") + @Log(title = "删除任务规则", type = "修改") + public ResponseReult relateSchelduleRule(@RequestBody @Validated RelateTerminalRuleIdVo vo) { + ServiceBody serviceBody = terminalScheduleRuleService.relateSchelduleRule(vo); + if (serviceBody.getCode() == ServiceStatus.SUCCESS) { + return ResponseReult.success(serviceBody.getData()); + } else { + return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); + } + } + } diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalScheduleRuleMapperController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalScheduleRuleMapperController.java new file mode 100644 index 0000000..a18e65b --- /dev/null +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalScheduleRuleMapperController.java @@ -0,0 +1,16 @@ +package com.shxy.xymanager_admin.controller; + +import com.shxy.xymanager_common.base.BaseController; +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RestController; + + +@Api(value = "关联任务规则接口", tags = "关联任务规则接口相关") +@RestController +@Slf4j +public class TerminalScheduleRuleMapperController extends BaseController { + + + +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleMapper.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleMapper.java index fc803e1..e7d80ab 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleMapper.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleMapper.java @@ -11,7 +11,7 @@ public class TerminalScheduleMapper implements Serializable { private Integer termId; - private Byte channelId; + private Integer channelId; private Integer scheduleId; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalChannelTreeListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalChannelTreeListModel.java new file mode 100644 index 0000000..13398ba --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalChannelTreeListModel.java @@ -0,0 +1,101 @@ +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.util.List; + +/** + * 通道列表 + */ +@Data +@ApiModel(value = "通道树状列表", description = "通道树状列表信息") +public class TerminalChannelTreeListModel implements Serializable { + + @ApiModelProperty(value = "电压列表", example = "[]") + private List list; + + @Data + public static class DyListBean { + @ApiModelProperty(value = "电压编号", example = "123456") + private Integer id; + + @ApiModelProperty(value = "电压名称", example = "AAAA") + private String name; + + @ApiModelProperty(value = "电压大小", example = "AAAA") + private Integer dyValue; + + @ApiModelProperty(value = "线路列表", example = "[]") + private List list; + } + + @Data + public static class LineBean { + + @ApiModelProperty(value = "线路编号", example = "123456") + private Integer id; + + @ApiModelProperty(value = "线路名称", example = "AAAA") + private String name; + + @ApiModelProperty(value = "单位", example = "123456") + private String bsManufacturer; + + @ApiModelProperty(value = "装置信息", example = "123456") + private List list; + + } + + @Data + public static class TerminalBean { + + @ApiModelProperty(value = "装置编号", example = "123456") + private Integer id; + + @ApiModelProperty(value = "杆塔编号", example = "123456") + private Integer towerid; + + @ApiModelProperty(value = "图像监测装置 ID（17 位编码）", example = "12345678") + private String cmdid; + + @ApiModelProperty(value = "装置名称", example = "名称名称") + private String equipName; + + @ApiModelProperty(value = "显示名", example = "名称名称") + private String name; + + @ApiModelProperty(value = "装置型号", example = "型号型号") + private String model; + + @ApiModelProperty(value = "通道列表对象", example = "[]") + private List list; + } + + + @Data + public static class ChannelBean { + + @ApiModelProperty(value = "通道id", example = "12321") + private Integer id; + + @ApiModelProperty(value = "装置编号", example = "123456") + private Integer termId; + + @ApiModelProperty(value = "通道编号", example = "123456") + private Byte channelNo; + + @ApiModelProperty(value = "通道名称", example = "123456") + private String channelName; + + @ApiModelProperty(value = "分辨率W", example = "123456") + private Integer maxResolutionWidth; + + @ApiModelProperty(value = "分辨率H", example = "123456") + private Integer maxResolutionHeight; + + } + +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/RelateTerminalRuleIdVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/RelateTerminalRuleIdVo.java new file mode 100644 index 0000000..dbe3482 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/RelateTerminalRuleIdVo.java @@ -0,0 +1,28 @@ +package com.shxy.xymanager_common.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * 设备关联拍照时间任务规则 + */ +@Data +@ApiModel(value = "关联任务规则编号对象", description = "关联任务规则编号对象描述") +public class RelateTerminalRuleIdVo { + + @NotNull(message = "规则编号不能缺少") + @ApiModelProperty(value = "规则编号", example = "123455") + private Integer ruleid; + + @NotNull(message = "通道编号列表不能缺少") + @ApiModelProperty(value = "通道编号列表", example = "123455") + private List channelidlist; + + @NotNull(message = "装置编号") + @ApiModelProperty(value = "装置编号", example = "123455") + private Integer termid; +} diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleMapperDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleMapperDao.java index 274ab85..99f0b93 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleMapperDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleMapperDao.java @@ -1,16 +1,24 @@ package com.shxy.xymanager_dao.dao; import com.shxy.xymanager_common.entity.TerminalScheduleMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.Date; +import java.util.List; public interface TerminalScheduleMapperDao { - int deleteByPrimaryKey(Integer id); + int deleteByChannelId(@Param("list") List list, @Param("termid") Integer termid); int insert(TerminalScheduleMapper record); int insertSelective(TerminalScheduleMapper record); + int insertList(@Param("list") List record, @Param("createat") Date create, @Param("updateat") Date update); + TerminalScheduleMapper selectByPrimaryKey(Integer id); + List selectByChannelId(@Param("list") List list, @Param("termid") Integer termid); + int updateByPrimaryKeySelective(TerminalScheduleMapper record); int updateByPrimaryKey(TerminalScheduleMapper record); diff --git a/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml index 64d7646..8093ed2 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml @@ -9,6 +9,27 @@ + + + + + + + + + + + + + + + + + + + + + id, term_id, channel_no, channel_name, max_resolution_width, max_resolution_height @@ -25,6 +46,20 @@ from terminal_channels where term_id = #{termid} + + + delete from terminal_channels where id = #{id,jdbcType=INTEGER} diff --git a/xymanager_dao/src/main/resources/mappers/TerminalScheduleMapperDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalScheduleMapperDao.xml index e690123..829a688 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalScheduleMapperDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalScheduleMapperDao.xml @@ -18,10 +18,37 @@ from terminal_schedulemapper where id = #{id,jdbcType=INTEGER} - - delete from terminal_schedulemapper - where id = #{id,jdbcType=INTEGER} - + + + + + delete from terminal_schedulemapper + where channel_id in + + #{id} + + and term_id = #{termid} + + + + insert into terminal_schedulemapper + (term_id,channel_id,schedule_id,create_time,update_time) + VALUES + + (#{item.termId},#{item.channelId},#{item.scheduleId},#{createat},#{updateat}) + + + + insert into terminal_schedulemapper (id, term_id, channel_id, schedule_id, create_time, update_time diff --git a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/config/WebConfig.java b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/config/WebConfig.java new file mode 100644 index 0000000..02acd2e --- /dev/null +++ b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/config/WebConfig.java @@ -0,0 +1,14 @@ +package com.shxy.xymanager_framework.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WebConfig implements WebMvcConfigurer { + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + registry.addResourceHandler("/download/**").addResourceLocations("file:/usr/local/home/manager/download/"); + } +} 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 66fc61a..5a2870d 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 @@ -6,6 +6,7 @@ import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.entity.TerminalChannels; import com.shxy.xymanager_common.exception.Asserts; import com.shxy.xymanager_common.model.TerminalChannelListModel; +import com.shxy.xymanager_common.model.TerminalChannelTreeListModel; import com.shxy.xymanager_common.vo.TerminalIdVo; import com.shxy.xymanager_dao.dao.TerminalChannelsDao; import com.shxy.xymanager_service.service.TerminalChannelService; @@ -45,4 +46,24 @@ public class TerminalChannelServiceImpl implements TerminalChannelService { } return Asserts.success(model); } + + + /** + * 获取所有通道树状列表 + * @return + */ + @Override + public ServiceBody getChannelTreeList() { + TerminalChannelListModel model = new TerminalChannelListModel(); + List list = terminalChannelsDao.selectByTermid(1); + boolean empty = CollectionUtil.isEmpty(list); + if (empty) { + model.setList(new ArrayList<>()); + } else { + List channelBeans = BeanUtil.copyToList(list, TerminalChannelListModel.ChannelBean.class); + model.setList(channelBeans); + } + + return null; + } } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPresetServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPresetServiceImpl.java index 12eac57..a4b801d 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPresetServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPresetServiceImpl.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.TerminalPresetsService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; 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 c7ed6e2..1e3d305 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 @@ -5,6 +5,7 @@ import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.collection.CollectionUtil; import com.github.pagehelper.PageInfo; import com.shxy.xymanager_common.bean.ServiceBody; +import com.shxy.xymanager_common.entity.TerminalScheduleMapper; import com.shxy.xymanager_common.entity.TerminalScheduleRule; import com.shxy.xymanager_common.enums.CommonStatus; import com.shxy.xymanager_common.exception.Asserts; @@ -13,12 +14,15 @@ import com.shxy.xymanager_common.model.TerminalScheduleRuleModel; import com.shxy.xymanager_common.page.PageUtils; import com.shxy.xymanager_common.util.MyDateUtils; import com.shxy.xymanager_common.vo.*; +import com.shxy.xymanager_dao.dao.TerminalScheduleMapperDao; import com.shxy.xymanager_dao.dao.TerminalScheduleRuleDao; import com.shxy.xymanager_service.service.TerminalScheduleRuleService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -33,6 +37,9 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ @Autowired TerminalScheduleRuleDao terminalScheduleRuleDao; + @Autowired + TerminalScheduleMapperDao terminalScheduleMapperDao; + /** * 获取时间任务规则列表 * @@ -158,4 +165,41 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ } } + /** + * 关联任务时间列表 + * + * @param vo + * @return + */ + @Override + @Transactional + public ServiceBody relateSchelduleRule(RelateTerminalRuleIdVo vo) { + + ArrayList list = new ArrayList<>(); + List channelidlist = vo.getChannelidlist(); + Integer ruleid = vo.getRuleid(); + Integer termid = vo.getTermid(); + + List mappers = terminalScheduleMapperDao.selectByChannelId(channelidlist, termid); + boolean empty = CollectionUtil.isEmpty(mappers); + if (!empty) { + terminalScheduleMapperDao.deleteByChannelId(channelidlist, termid); + } + for (Integer item : channelidlist) { + TerminalScheduleMapper record = new TerminalScheduleMapper(); + record.setChannelId(item); + record.setScheduleId(ruleid); + record.setTermId(termid); + list.add(record); + } + Date date = new Date(); + int i = terminalScheduleMapperDao.insertList(list, date, date); + if (i != 0) { + return Asserts.success("关联成功"); + } else { + return Asserts.error("关联失败"); + } + + } + } 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 cb4c565..fcfe9c2 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 @@ -10,16 +10,14 @@ import com.shxy.xymanager_common.enums.CommonStatus; import com.shxy.xymanager_common.exception.Asserts; import com.shxy.xymanager_common.model.TerminalListModel; import com.shxy.xymanager_common.page.PageUtils; -import com.shxy.xymanager_common.vo.PageVo; -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.vo.*; import com.shxy.xymanager_dao.dao.TerminalsDao; import com.shxy.xymanager_service.service.TerminalService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.validation.constraints.NotEmpty; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -79,7 +77,7 @@ public class TerminalServiceImpl implements TerminalService { public ServiceBody addTerminal(TerminalVo vo) { List list = BeanUtil.copyToList(vo.getList(), Terminals.class); Date time = new Date(); - int i = terminalsDao.insertList(list, CommonStatus.EFFECTIVE.value(), time,time); + int i = terminalsDao.insertList(list, CommonStatus.EFFECTIVE.value(), time, time); if (i != 0) { return Asserts.success("录入成功"); } else { @@ -89,6 +87,7 @@ public class TerminalServiceImpl implements TerminalService { /** * 修改装置信息 + * * @param vo * @return */ @@ -96,7 +95,7 @@ public class TerminalServiceImpl implements TerminalService { public ServiceBody updateTerminal(UpdateTerminalVo vo) { Terminals terminals = new Terminals(); BeanUtil.copyProperties(vo, terminals, true); - int i = terminalsDao.updateByPrimaryKeySelective(terminals,new Date()); + int i = terminalsDao.updateByPrimaryKeySelective(terminals, new Date()); if (i != 0) { return Asserts.success("修改成功"); } else { @@ -112,8 +111,16 @@ public class TerminalServiceImpl implements TerminalService { */ @Override public ServiceBody deleteTerminal(TerminalIdListVo vo) { - List list = BeanUtil.copyToList(vo.getList(), Terminals.class); - int i = terminalsDao.deleteById(list,CommonStatus.DELETE.value(),new Date()); + ArrayList list = new ArrayList<>(); + List beans = vo.getList(); + for (TerminalIdVo item : beans) { + Terminals terminals = new Terminals(); + terminals.setId(item.getTermid()); + list.add(terminals); + } + +// List list = BeanUtil.copyToList(vo.getList(), Terminals.class); + int i = terminalsDao.deleteById(list, CommonStatus.DELETE.value(), new Date()); if (i != 0) { return Asserts.success("删除成功"); } else { diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalChannelService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalChannelService.java index 346d9c6..ebd2928 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalChannelService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalChannelService.java @@ -2,6 +2,7 @@ package com.shxy.xymanager_service.service; import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.model.TerminalChannelListModel; +import com.shxy.xymanager_common.model.TerminalChannelTreeListModel; import com.shxy.xymanager_common.model.TerminalListModel; import com.shxy.xymanager_common.vo.TerminalIdVo; import com.shxy.xymanager_common.vo.TerminalVo; @@ -19,4 +20,12 @@ public interface TerminalChannelService { */ ServiceBody getChannelList(TerminalIdVo vo); + /** + * + * 获取所有通道树状列表 + * + * @return + */ + ServiceBody getChannelTreeList(); + } 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 9bbe47a..949b977 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 @@ -33,7 +33,6 @@ public interface TerminalScheduleRuleService { */ ServiceBody addSchedulelRuleList(TerminalRuleListVo vo); - /** * 修改任务规则接口 * @@ -42,7 +41,6 @@ public interface TerminalScheduleRuleService { */ ServiceBody updateSchelduleRule(TerminalRuleVo vo); - /** * 删除任务规则接口 * @@ -50,4 +48,12 @@ public interface TerminalScheduleRuleService { * @return */ ServiceBody deleteSchelduleRule(TerminalRuleIdListVo vo); + + /** + * 关联任务规则接口 + * + * @param vo + * @return + */ + ServiceBody relateSchelduleRule(RelateTerminalRuleIdVo vo); }