|
|
|
|
@ -8,22 +8,19 @@ import cn.hutool.core.date.DateTime;
|
|
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
|
|
import com.github.pagehelper.PageInfo;
|
|
|
|
|
import com.shxy.xymanager_common.bean.ServiceBody;
|
|
|
|
|
import com.shxy.xymanager_common.constant.Constants;
|
|
|
|
|
import com.shxy.xymanager_common.dto.ChannelAndTermDto;
|
|
|
|
|
import com.shxy.xymanager_common.dto.ScheduleAndRuleDto;
|
|
|
|
|
import com.shxy.xymanager_common.dto.ScheduleRuleDto;
|
|
|
|
|
import com.shxy.xymanager_common.entity.Schedules;
|
|
|
|
|
import com.shxy.xymanager_common.entity.TerminalScheduleMapper;
|
|
|
|
|
import com.shxy.xymanager_common.entity.TerminalScheduleRule;
|
|
|
|
|
import com.shxy.xymanager_common.entity.*;
|
|
|
|
|
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.model.TerminalScheduleRuleTimeListModel;
|
|
|
|
|
import com.shxy.xymanager_common.model.*;
|
|
|
|
|
import com.shxy.xymanager_common.page.PageUtils;
|
|
|
|
|
import com.shxy.xymanager_common.util.MyDateUtils;
|
|
|
|
|
import com.shxy.xymanager_common.util.ProcessExecUtils;
|
|
|
|
|
import com.shxy.xymanager_common.vo.*;
|
|
|
|
|
import com.shxy.xymanager_dao.dao.TerminalScheduleDao;
|
|
|
|
|
import com.shxy.xymanager_dao.dao.TerminalScheduleMapperDao;
|
|
|
|
|
import com.shxy.xymanager_dao.dao.TerminalScheduleRuleDao;
|
|
|
|
|
import com.shxy.xymanager_dao.dao.*;
|
|
|
|
|
import com.shxy.xymanager_service.service.TerminalScheduleRuleService;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
@ -43,13 +40,22 @@ import java.util.List;
|
|
|
|
|
public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleService {
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
TerminalScheduleDao terminalScheduleDao;
|
|
|
|
|
SchedulesDao schedulesDao;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
TerminalScheduleRuleDao terminalScheduleRuleDao;
|
|
|
|
|
ScheduleDetailsDao scheduleDetailsDao;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
TerminalScheduleMapperDao terminalScheduleMapperDao;
|
|
|
|
|
TerminalSchedulesDao terminalSchedulesDao;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
TerminalSchedulesTempDao terminalSchedulesTempDao;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
TerminalsDao terminalsDao;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
RequestResultsDao requestResultsDao;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 获取时间任务规则列表
|
|
|
|
|
@ -62,7 +68,7 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
|
|
|
|
|
int pageindex = vo.getPageindex();
|
|
|
|
|
int pagesize = vo.getPagesize();
|
|
|
|
|
PageUtils.SetPage(pageindex, pagesize);
|
|
|
|
|
List<ScheduleAndRuleDto> list = terminalScheduleDao.selectAll(CommonStatus.EFFECTIVE.value());
|
|
|
|
|
List<ScheduleAndRuleDto> list = schedulesDao.selectAll(CommonStatus.EFFECTIVE.value());
|
|
|
|
|
boolean empty = CollectionUtil.isEmpty(list);
|
|
|
|
|
if (empty) {
|
|
|
|
|
model.setList(new ArrayList<>());
|
|
|
|
|
@ -91,7 +97,7 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public ServiceBody<TerminalScheduleRuleModel> getSingleScheduleRule(ScheduleIdVo vo) {
|
|
|
|
|
ScheduleAndRuleDto bean = terminalScheduleDao.selectSingle(vo.getId(), CommonStatus.EFFECTIVE.value());
|
|
|
|
|
ScheduleAndRuleDto bean = schedulesDao.selectSingle(vo.getId(), CommonStatus.EFFECTIVE.value());
|
|
|
|
|
if (BeanUtil.isEmpty(bean)) {
|
|
|
|
|
return Asserts.error("没有该对象");
|
|
|
|
|
} else {
|
|
|
|
|
@ -116,18 +122,18 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
|
|
|
|
|
schedules.setStatus(CommonStatus.EFFECTIVE.value());
|
|
|
|
|
schedules.setCreateTime(date);
|
|
|
|
|
schedules.setUpdateTime(date);
|
|
|
|
|
int i1 = terminalScheduleDao.insertSelective(schedules);
|
|
|
|
|
int i1 = schedulesDao.insertSelective(schedules);
|
|
|
|
|
if (i1 != 0) {
|
|
|
|
|
ArrayList<TerminalScheduleRule> list = new ArrayList<>();
|
|
|
|
|
ArrayList<ScheduleDetails> list = new ArrayList<>();
|
|
|
|
|
for (ScheduleRuleVo item : vo.getList()) {
|
|
|
|
|
TerminalScheduleRule rule = new TerminalScheduleRule();
|
|
|
|
|
ScheduleDetails rule = new ScheduleDetails();
|
|
|
|
|
rule.setScheduleId(schedules.getId());
|
|
|
|
|
rule.setStartTime(item.getStartTime());
|
|
|
|
|
rule.setEndTime(item.getEndTime());
|
|
|
|
|
rule.setSpan(item.getSpan());
|
|
|
|
|
list.add(rule);
|
|
|
|
|
}
|
|
|
|
|
int i = terminalScheduleRuleDao.insertList(list, date, date);
|
|
|
|
|
int i = scheduleDetailsDao.insertList(list, date, date);
|
|
|
|
|
if (i != 0) {
|
|
|
|
|
return Asserts.success("录入成功");
|
|
|
|
|
} else {
|
|
|
|
|
@ -148,7 +154,7 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
|
|
|
|
|
@Transactional
|
|
|
|
|
public ServiceBody<String> updateSchelduleRule(UpdateScheduleListVo vo) {
|
|
|
|
|
Integer scheduleid = vo.getId();
|
|
|
|
|
Schedules bean = terminalScheduleDao.selectByPrimaryKey(vo.getId());
|
|
|
|
|
Schedules bean = schedulesDao.selectByPrimaryKey(vo.getId());
|
|
|
|
|
if (BeanUtil.isEmpty(bean)) {
|
|
|
|
|
return Asserts.error("没有需要修改任务规则");
|
|
|
|
|
}
|
|
|
|
|
@ -158,20 +164,20 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
|
|
|
|
|
schedule.setName(vo.getName());
|
|
|
|
|
schedule.setRemark(vo.getRemark());
|
|
|
|
|
schedule.setUpdateTime(date);
|
|
|
|
|
terminalScheduleDao.updateByPrimaryKeySelective(schedule);
|
|
|
|
|
schedulesDao.updateByPrimaryKeySelective(schedule);
|
|
|
|
|
|
|
|
|
|
terminalScheduleRuleDao.deleteById(scheduleid);
|
|
|
|
|
scheduleDetailsDao.deleteById(scheduleid);
|
|
|
|
|
|
|
|
|
|
ArrayList<TerminalScheduleRule> list = new ArrayList<>();
|
|
|
|
|
ArrayList<ScheduleDetails> list = new ArrayList<>();
|
|
|
|
|
for (ScheduleRuleVo item : vo.getList()) {
|
|
|
|
|
TerminalScheduleRule rule = new TerminalScheduleRule();
|
|
|
|
|
ScheduleDetails rule = new ScheduleDetails();
|
|
|
|
|
rule.setScheduleId(scheduleid);
|
|
|
|
|
rule.setStartTime(item.getStartTime());
|
|
|
|
|
rule.setEndTime(item.getEndTime());
|
|
|
|
|
rule.setSpan(item.getSpan());
|
|
|
|
|
list.add(rule);
|
|
|
|
|
}
|
|
|
|
|
int i = terminalScheduleRuleDao.insertList(list, date, date);
|
|
|
|
|
int i = scheduleDetailsDao.insertList(list, date, date);
|
|
|
|
|
if (i != 0) {
|
|
|
|
|
return Asserts.success("修改成功");
|
|
|
|
|
} else {
|
|
|
|
|
@ -189,7 +195,7 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
|
|
|
|
|
@Override
|
|
|
|
|
public ServiceBody<String> deleteSchelduleRule(ScheduleIdListVo vo) {
|
|
|
|
|
List<Schedules> list = BeanUtil.copyToList(vo.getList(), Schedules.class);
|
|
|
|
|
int i = terminalScheduleDao.updateStatusById(list, CommonStatus.DELETE.value(), new Date());
|
|
|
|
|
int i = schedulesDao.updateStatusById(list, CommonStatus.DELETE.value(), new Date());
|
|
|
|
|
if (i != 0) {
|
|
|
|
|
return Asserts.success("删除成功");
|
|
|
|
|
} else {
|
|
|
|
|
@ -205,65 +211,178 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
@Transactional
|
|
|
|
|
public ServiceBody<String> relateSchelduleRule(RelateTerminalListRuleIdVo vo) {
|
|
|
|
|
public ServiceBody<GetModel> relateSchelduleRule(RelateTerminalListRuleIdVo vo) {
|
|
|
|
|
|
|
|
|
|
ArrayList<TerminalScheduleMapper> list = new ArrayList<>();
|
|
|
|
|
List<RelateTerminalListRuleIdVo.Items> termBeanList = vo.getList();
|
|
|
|
|
Integer scheduleid = vo.getScheduleid();
|
|
|
|
|
GetModel model = new GetModel();
|
|
|
|
|
List<TerminalSchedulesTemp> list = terminalSchedulesTempDao.selectByTermAndChannel(vo.getList(), CommonStatus.DELETE.value());
|
|
|
|
|
if (CollectionUtil.isNotEmpty(list)) {
|
|
|
|
|
|
|
|
|
|
List<TerminalScheduleMapper> mappers = terminalScheduleMapperDao.selectByTerminalBean(termBeanList);
|
|
|
|
|
boolean empty = CollectionUtil.isEmpty(mappers);
|
|
|
|
|
if (!empty) {
|
|
|
|
|
terminalScheduleMapperDao.deleteByChannelId(mappers);
|
|
|
|
|
return Asserts.error("有装置时间尚未下发成功");
|
|
|
|
|
}
|
|
|
|
|
for (RelateTerminalListRuleIdVo.Items item : termBeanList) {
|
|
|
|
|
for (Integer id : item.getChannelidlist()) {
|
|
|
|
|
TerminalScheduleMapper record = new TerminalScheduleMapper();
|
|
|
|
|
record.setChannelId(id);
|
|
|
|
|
record.setScheduleId(scheduleid);
|
|
|
|
|
record.setTermId(item.getTermid());
|
|
|
|
|
list.add(record);
|
|
|
|
|
List<RelateTerminalListRuleIdVo.Items> termlist = vo.getList();
|
|
|
|
|
|
|
|
|
|
Integer scheduleid = vo.getScheduleid();
|
|
|
|
|
List<TerminalSchedulesTemp> temps = new ArrayList<>();
|
|
|
|
|
List<Integer> termidlist = new ArrayList<>();
|
|
|
|
|
for (RelateTerminalListRuleIdVo.Items item : termlist) {
|
|
|
|
|
termidlist.add(item.getTermid());
|
|
|
|
|
List<Integer> channelidlist = item.getChannelidlist();
|
|
|
|
|
for (Integer it : channelidlist) {
|
|
|
|
|
TerminalSchedulesTemp temp = new TerminalSchedulesTemp();
|
|
|
|
|
temp.setTermId(item.getTermid());
|
|
|
|
|
temp.setScheduleId(scheduleid);
|
|
|
|
|
temp.setChannelId(it);
|
|
|
|
|
temps.add(temp);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
Date date = new Date();
|
|
|
|
|
int i = terminalScheduleMapperDao.insertList(list, date, date);
|
|
|
|
|
int i = terminalSchedulesTempDao.insertList(temps, CommonStatus.EFFECTIVE.value(), date, date);
|
|
|
|
|
|
|
|
|
|
List<ChannelAndTermDto> terminalsList = terminalsDao.selectByIdList(vo.getList(), CommonStatus.EFFECTIVE.value());
|
|
|
|
|
|
|
|
|
|
if (CollectionUtil.isEmpty(termidlist)) {
|
|
|
|
|
return Asserts.error("没有该装置");
|
|
|
|
|
}
|
|
|
|
|
ScheduleAndRuleDto dto = schedulesDao.selectSingle(scheduleid, CommonStatus.EFFECTIVE.value());
|
|
|
|
|
List<ScheduleRuleDto> dtoList = dto.getList();
|
|
|
|
|
if (CollectionUtil.isEmpty(dtoList)) {
|
|
|
|
|
return Asserts.error("没有该拍照时间规则");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
StringBuffer timestr = new StringBuffer();
|
|
|
|
|
for (int j = 0; j < dtoList.size(); j++) {
|
|
|
|
|
TerminalPhotosTimeModel.PhotosTimeBean bean = new TerminalPhotosTimeModel.PhotosTimeBean();
|
|
|
|
|
Integer span = dtoList.get(j).getSpan();
|
|
|
|
|
Date startTime = dtoList.get(j).getStartTime();
|
|
|
|
|
Short startHour = Short.parseShort(MyDateUtils.parseHourAndMinute(startTime).split("/")[0]);
|
|
|
|
|
Short startMin = Short.parseShort(MyDateUtils.parseHourAndMinute(startTime).split("/")[1]);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Date endTime = dtoList.get(j).getEndTime();
|
|
|
|
|
Short endTimeHour = Short.parseShort(MyDateUtils.parseHourAndMinute(endTime).split("/")[0]);
|
|
|
|
|
Short endTimeMin = Short.parseShort(MyDateUtils.parseHourAndMinute(endTime).split("/")[1]);
|
|
|
|
|
|
|
|
|
|
Integer span1 = -1;
|
|
|
|
|
Integer span2 = -1;
|
|
|
|
|
if (span / 60 > 0) {
|
|
|
|
|
span1 = (span / 60);
|
|
|
|
|
span2 = (span % 60);
|
|
|
|
|
} else if (span < 60) {
|
|
|
|
|
span1 = 0;
|
|
|
|
|
span2 = span;
|
|
|
|
|
}
|
|
|
|
|
String string = "--hour1=" + startHour + "\t" + "--min1=" + startMin + "\t" + "--preset1=255 --hour2=" + endTimeHour + "\t" + "--min2=" + endTimeMin + "\t"
|
|
|
|
|
+ "--preset2=255 --hour3=" + span1 + "\t" + "--min3=" + span2 + "\t" + "--preset3=255";
|
|
|
|
|
timestr.append(string);
|
|
|
|
|
}
|
|
|
|
|
for (int x = 0; x < terminalsList.size(); x++) {
|
|
|
|
|
ChannelAndTermDto channelAndTermDto = terminalsList.get(x);
|
|
|
|
|
String cmd = Constants.CMD + "schedule --flag=1 --cmdid=" + channelAndTermDto.getCmdid() + "\t" + "--channel=" + channelAndTermDto.getChannelid() + "\t" +
|
|
|
|
|
timestr.toString();
|
|
|
|
|
ProcessExecUtils.exec(cmd);
|
|
|
|
|
}
|
|
|
|
|
model.setRequestId(Integer.parseInt(Constants.REQUEST_ID.toString()));
|
|
|
|
|
Constants.REQUEST_ID.addAndGet(1);
|
|
|
|
|
if (i != 0) {
|
|
|
|
|
return Asserts.success("关联成功");
|
|
|
|
|
return Asserts.success(model);
|
|
|
|
|
} else {
|
|
|
|
|
return Asserts.error("关联失败");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 查询拍照时间表任务是否下发成功
|
|
|
|
|
*
|
|
|
|
|
* @param vo
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@Transactional
|
|
|
|
|
public ServiceBody<GetModel> checkScheldule(RelateTerminalListRuleIdVo vo) {
|
|
|
|
|
ArrayList<Integer> intlist = new ArrayList<>();
|
|
|
|
|
RequestResults results = requestResultsDao.selectByRequestId(1);
|
|
|
|
|
String data = results.getData();
|
|
|
|
|
Integer result = results.getResult();
|
|
|
|
|
if (result == 255) {
|
|
|
|
|
// terminalSchedulesTempDao.selectByRequestId(intlist);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
GetModel model = new GetModel();
|
|
|
|
|
List<TerminalSchedulesTemp> list = terminalSchedulesTempDao.selectByTermAndChannel(vo.getList(), CommonStatus.DELETE.value());
|
|
|
|
|
if (CollectionUtil.isNotEmpty(list)) {
|
|
|
|
|
return Asserts.error("有装置时间尚未下发成功");
|
|
|
|
|
}
|
|
|
|
|
List<RelateTerminalListRuleIdVo.Items> termlist = vo.getList();
|
|
|
|
|
|
|
|
|
|
Integer scheduleid = vo.getScheduleid();
|
|
|
|
|
List<TerminalSchedulesTemp> temps = new ArrayList<>();
|
|
|
|
|
List<Integer> termidlist = new ArrayList<>();
|
|
|
|
|
for (RelateTerminalListRuleIdVo.Items item : termlist) {
|
|
|
|
|
termidlist.add(item.getTermid());
|
|
|
|
|
List<Integer> channelidlist = item.getChannelidlist();
|
|
|
|
|
for (Integer it : channelidlist) {
|
|
|
|
|
TerminalSchedulesTemp temp = new TerminalSchedulesTemp();
|
|
|
|
|
temp.setTermId(item.getTermid());
|
|
|
|
|
temp.setScheduleId(scheduleid);
|
|
|
|
|
temp.setChannelId(it);
|
|
|
|
|
temps.add(temp);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
Date date = new Date();
|
|
|
|
|
int i = terminalSchedulesTempDao.insertList(temps, CommonStatus.EFFECTIVE.value(), date, date);
|
|
|
|
|
|
|
|
|
|
List<ChannelAndTermDto> terminalsList = terminalsDao.selectByIdList(vo.getList(), CommonStatus.EFFECTIVE.value());
|
|
|
|
|
|
|
|
|
|
if (CollectionUtil.isEmpty(termidlist)) {
|
|
|
|
|
return Asserts.error("没有该装置");
|
|
|
|
|
}
|
|
|
|
|
ScheduleAndRuleDto dto = schedulesDao.selectSingle(scheduleid, CommonStatus.EFFECTIVE.value());
|
|
|
|
|
List<ScheduleRuleDto> dtoList = dto.getList();
|
|
|
|
|
if (CollectionUtil.isEmpty(dtoList)) {
|
|
|
|
|
return Asserts.error("没有该拍照时间规则");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// List<TerminalPhotoScheduleDto> dtoList = terminalPhotoDao.selectPhotoSchedule(vo);
|
|
|
|
|
//
|
|
|
|
|
// for (int j = 0; j < dtoList.size(); j++) {
|
|
|
|
|
// TerminalPhotosTimeModel.PhotosTimeBean bean = new TerminalPhotosTimeModel.PhotosTimeBean();
|
|
|
|
|
// Short span = dtoList.get(j).getSpan();
|
|
|
|
|
// Date startTime = dtoList.get(j).getStartTime();
|
|
|
|
|
// Short startHour = Short.parseShort(MyDateUtils.parseHourAndMinute(startTime).split("/")[0]);
|
|
|
|
|
// Short startMin = Short.parseShort(MyDateUtils.parseHourAndMinute(startTime).split("/")[1]);
|
|
|
|
|
//
|
|
|
|
|
//
|
|
|
|
|
// Date endTime = dtoList.get(j).getEndTime();
|
|
|
|
|
// Short endTimeHour = Short.parseShort(MyDateUtils.parseHourAndMinute(endTime).split("/")[0]);
|
|
|
|
|
// Short endTimeMin = Short.parseShort(MyDateUtils.parseHourAndMinute(endTime).split("/")[1]);
|
|
|
|
|
//
|
|
|
|
|
// Short span1 = -1;
|
|
|
|
|
// Short span2 = -1;
|
|
|
|
|
// if (span / 60 > 0) {
|
|
|
|
|
// span1 = (short) (span / 60);
|
|
|
|
|
// span2 = (short) (span % 60);
|
|
|
|
|
// } else if (span < 60) {
|
|
|
|
|
// span1 = (short) 0;
|
|
|
|
|
// span2 = span;
|
|
|
|
|
// }
|
|
|
|
|
// String cmd = Constants.CMD + "schedule --flag=1 --cmdid=" + dtoList.get(j).getCmid() + "\t" + "--channel=" + vo.getChannel() + "\t"
|
|
|
|
|
// + "--group=3 --hour1=" + startHour + "\t" + "--min1=" + startMin + "\t" + "--preset1=255 --hour2=" + endTimeHour + "\t" + "--min2=" + endTimeMin + "\t"
|
|
|
|
|
// + "--preset2=255 --hour3=" + span1 + "\t" + "--min3=" + span2 + "\t" + "--preset3=255";
|
|
|
|
|
// ProcessExecUtils.exec(cmd);
|
|
|
|
|
// }
|
|
|
|
|
StringBuffer timestr = new StringBuffer();
|
|
|
|
|
for (int j = 0; j < dtoList.size(); j++) {
|
|
|
|
|
TerminalPhotosTimeModel.PhotosTimeBean bean = new TerminalPhotosTimeModel.PhotosTimeBean();
|
|
|
|
|
Integer span = dtoList.get(j).getSpan();
|
|
|
|
|
Date startTime = dtoList.get(j).getStartTime();
|
|
|
|
|
Short startHour = Short.parseShort(MyDateUtils.parseHourAndMinute(startTime).split("/")[0]);
|
|
|
|
|
Short startMin = Short.parseShort(MyDateUtils.parseHourAndMinute(startTime).split("/")[1]);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Date endTime = dtoList.get(j).getEndTime();
|
|
|
|
|
Short endTimeHour = Short.parseShort(MyDateUtils.parseHourAndMinute(endTime).split("/")[0]);
|
|
|
|
|
Short endTimeMin = Short.parseShort(MyDateUtils.parseHourAndMinute(endTime).split("/")[1]);
|
|
|
|
|
|
|
|
|
|
Integer span1 = -1;
|
|
|
|
|
Integer span2 = -1;
|
|
|
|
|
if (span / 60 > 0) {
|
|
|
|
|
span1 = (span / 60);
|
|
|
|
|
span2 = (span % 60);
|
|
|
|
|
} else if (span < 60) {
|
|
|
|
|
span1 = 0;
|
|
|
|
|
span2 = span;
|
|
|
|
|
}
|
|
|
|
|
String string = "--hour1=" + startHour + "\t" + "--min1=" + startMin + "\t" + "--preset1=255 --hour2=" + endTimeHour + "\t" + "--min2=" + endTimeMin + "\t"
|
|
|
|
|
+ "--preset2=255 --hour3=" + span1 + "\t" + "--min3=" + span2 + "\t" + "--preset3=255";
|
|
|
|
|
timestr.append(string);
|
|
|
|
|
}
|
|
|
|
|
for (int x = 0; x < terminalsList.size(); x++) {
|
|
|
|
|
ChannelAndTermDto channelAndTermDto = terminalsList.get(x);
|
|
|
|
|
String cmd = Constants.CMD + "schedule --flag=1 --cmdid=" + channelAndTermDto.getCmdid() + "\t" + "--channel=" + channelAndTermDto.getChannelid() + "\t" +
|
|
|
|
|
timestr.toString();
|
|
|
|
|
ProcessExecUtils.exec(cmd);
|
|
|
|
|
}
|
|
|
|
|
model.setRequestId(Integer.parseInt(Constants.REQUEST_ID.toString()));
|
|
|
|
|
Constants.REQUEST_ID.addAndGet(1);
|
|
|
|
|
if (i != 0) {
|
|
|
|
|
return Asserts.success(model);
|
|
|
|
|
} else {
|
|
|
|
|
return Asserts.error("关联失败");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
@ -275,12 +394,12 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
|
|
|
|
|
@Override
|
|
|
|
|
public ServiceBody<TerminalScheduleRuleTimeListModel> getChannelSchelduleRule(TerminalAndChannelIdVo vo) {
|
|
|
|
|
TerminalScheduleRuleTimeListModel model = new TerminalScheduleRuleTimeListModel();
|
|
|
|
|
TerminalScheduleMapper mapper = terminalScheduleMapperDao.selectByChannelId(vo.getChannelid(), vo.getTerminalid());
|
|
|
|
|
TerminalSchedules mapper = terminalSchedulesDao.selectByChannelId(vo.getChannelid(), vo.getTerminalid());
|
|
|
|
|
if (mapper == null) {
|
|
|
|
|
model.setList(new ArrayList<>());
|
|
|
|
|
} else {
|
|
|
|
|
Integer scheduleId = mapper.getScheduleId();
|
|
|
|
|
ScheduleAndRuleDto bean = terminalScheduleDao.selectSingle(scheduleId, CommonStatus.EFFECTIVE.value());
|
|
|
|
|
ScheduleAndRuleDto bean = schedulesDao.selectSingle(scheduleId, CommonStatus.EFFECTIVE.value());
|
|
|
|
|
List<ScheduleRuleDto> list = bean.getList();
|
|
|
|
|
ArrayList<String> timelist = new ArrayList<>();
|
|
|
|
|
for (ScheduleRuleDto item : list) {
|
|
|
|
|
|
liuguijing
2 years ago