From 14f61aaabba868715959cfcdd43609042c3d221c Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Tue, 23 May 2023 16:51:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8B=8D=E7=85=A7=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=A1=A8=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XymanagerAdminApplicationTests.java | 50 +++- ...alSchedules.java => TerminalSchedule.java} | 2 +- .../entity/TerminalScheduleDetails.java | 62 +---- .../xymanager_dao/dao/ScheduleDetailsDao.java | 7 +- .../dao/TerminalScheduleDao.java | 30 +++ .../dao/TerminalScheduleDetailsDao.java | 6 +- .../dao/TerminalSchedulesDao.java | 30 --- .../resources/mappers/ScheduleDetailsDao.xml | 21 ++ ...hedulesDao.xml => TerminalScheduleDao.xml} | 43 +-- .../mappers/TerminalScheduleDetailsDao.xml | 12 +- .../impl/TerminalScheduleRuleServiceImpl.java | 249 ++++++++++-------- 11 files changed, 279 insertions(+), 233 deletions(-) rename xymanager_common/src/main/java/com/shxy/xymanager_common/entity/{TerminalSchedules.java => TerminalSchedule.java} (85%) create mode 100644 xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleDao.java delete mode 100644 xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalSchedulesDao.java rename xymanager_dao/src/main/resources/mappers/{TerminalSchedulesDao.xml => TerminalScheduleDao.xml} (82%) diff --git a/xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java b/xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java index d9720c3..e6e8cb5 100644 --- a/xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java +++ b/xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java @@ -1,9 +1,9 @@ package com.shxy.xymanager_admin; -import com.shxy.xymanager_common.entity.TerminalSchedulesTemp; +import cn.hutool.core.collection.CollectionUtil; +import com.shxy.xymanager_common.entity.TerminalSchedule; +import com.shxy.xymanager_common.entity.Terminals; import com.shxy.xymanager_common.enums.CommonStatus; -import com.shxy.xymanager_common.model.TerminalScheduleRuleTimeListModel; -import com.shxy.xymanager_common.util.SaltUtil; import com.shxy.xymanager_dao.dao.*; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -32,6 +32,9 @@ class XymanagerAdminApplicationTests { @Autowired private TerminalSchedulesTempDao terminalSchedulesTempDao; + + @Autowired + private TerminalScheduleDao terminalScheduleDao; @Test void contextLoads() { @@ -121,16 +124,39 @@ class XymanagerAdminApplicationTests { // user.setPassword(MD5.toHex()); // userDao.save(user); - ArrayList requestidlist = new ArrayList<>(); - requestidlist.add(1); - requestidlist.add(2); - requestidlist.add(3); - - - List terminalSchedulesTemps = terminalSchedulesTempDao.updateStatusByRequestIdList(requestidlist, CommonStatus.EFFECTIVE.value(), new Date()); - System.out.println(terminalSchedulesTemps.toArray()); - +// ArrayList requestidlist = new ArrayList<>(); +// requestidlist.add(1); +// requestidlist.add(2); +// requestidlist.add(3); +// +// +// List terminalSchedulesTemps = terminalSchedulesTempDao.updateStatusByRequestIdList(requestidlist, CommonStatus.EFFECTIVE.value(), new Date()); +// System.out.println(terminalSchedulesTemps.toArray()); +// ArrayList record = new ArrayList<>(); +// TerminalSchedule e = new TerminalSchedule(); +// e.setTermId(1); +// e.setChannelId(1); +// e.setScheduleId(4); +// record.add(e); +// TerminalSchedule e1 = new TerminalSchedule(); +// e1.setTermId(1); +// e1.setChannelId(2); +// e1.setScheduleId(3); +// record.add(e1); +// int i = terminalScheduleDao.insertOrUpdate(record, new Date(), new Date()); +// System.out.println(i); +// TerminalSchedule terminalSchedule = terminalScheduleDao.selectByPrimaryKey(1); +// System.out.println(terminalSchedule.toString()); + + ArrayList list = new ArrayList<>(); + list.add(1); + list.add(1); + list.add(2); + list.add(3); + System.out.println(list.toArray()); + ArrayList distinct = CollectionUtil.distinct(list); + System.out.println(distinct.toArray()); } } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalSchedules.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalSchedule.java similarity index 85% rename from xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalSchedules.java rename to xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalSchedule.java index 108a961..845dc84 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalSchedules.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalSchedule.java @@ -6,7 +6,7 @@ import java.io.Serializable; import java.util.Date; @Data -public class TerminalSchedules implements Serializable { +public class TerminalSchedule implements Serializable { private Integer id; private Integer termId; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleDetails.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleDetails.java index 31d4533..63bc497 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleDetails.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleDetails.java @@ -1,12 +1,17 @@ package com.shxy.xymanager_common.entity; +import lombok.Data; + import java.io.Serializable; import java.util.Date; +@Data public class TerminalScheduleDetails implements Serializable { private Integer id; - private Integer scheduleId; + private Integer termId; + + private Integer channelId; private Date startTime; @@ -20,59 +25,4 @@ public class TerminalScheduleDetails implements Serializable { private static final long serialVersionUID = 1L; - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Integer getScheduleId() { - return scheduleId; - } - - public void setScheduleId(Integer scheduleId) { - this.scheduleId = scheduleId; - } - - public Date getStartTime() { - return startTime; - } - - public void setStartTime(Date startTime) { - this.startTime = startTime; - } - - public Date getEndTime() { - return endTime; - } - - public void setEndTime(Date endTime) { - this.endTime = endTime; - } - - public Integer getSpan() { - return span; - } - - public void setSpan(Integer span) { - this.span = span; - } - - 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_dao/src/main/java/com/shxy/xymanager_dao/dao/ScheduleDetailsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/ScheduleDetailsDao.java index 53e01ff..c5d4c64 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/ScheduleDetailsDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/ScheduleDetailsDao.java @@ -1,8 +1,10 @@ package com.shxy.xymanager_dao.dao; import com.shxy.xymanager_common.entity.ScheduleDetails; +import com.shxy.xymanager_common.entity.TerminalSchedule; import org.apache.ibatis.annotations.Param; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -16,11 +18,14 @@ public interface ScheduleDetailsDao { List selectAll(@Param("status") Integer status); - + List selectAllByList(@Param("list") List list); int deleteById(@Param("scheduleid") Integer id); + int updateByPrimaryKeySelective(@Param("data") ScheduleDetails record, @Param("updateat") Date update); int updateByPrimaryKey(ScheduleDetails record); + + List selectAllBySceduleidList(@Param("list") List distinct); } \ No newline at end of file diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleDao.java new file mode 100644 index 0000000..68aed0c --- /dev/null +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleDao.java @@ -0,0 +1,30 @@ +package com.shxy.xymanager_dao.dao; + +import com.shxy.xymanager_common.entity.TerminalSchedule; +import com.shxy.xymanager_common.vo.RelateTerminalListRuleIdVo; +import org.apache.ibatis.annotations.Param; + +import java.util.Date; +import java.util.List; + +public interface TerminalScheduleDao { + int deleteByChannelId(@Param("list") List list); + + int insert(TerminalSchedule record); + + int insertSelective(TerminalSchedule record); + + int insertList(@Param("list") List record, @Param("createat") Date create, @Param("updateat") Date update); + + TerminalSchedule selectByPrimaryKey(Integer id); + + TerminalSchedule selectByChannelId(@Param("channelid") Integer list, @Param("termid") Integer termid); + + List selectByTerminalBean(@Param("list") List list); + + int insertOrUpdate(@Param("list") List record, @Param("createat") Date create, @Param("updateat") Date update); + + int updateByPrimaryKeySelective(TerminalSchedule record); + + int updateByPrimaryKey(TerminalSchedule record); +} \ No newline at end of file diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleDetailsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleDetailsDao.java index 85586a4..4b46b52 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleDetailsDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleDetailsDao.java @@ -1,12 +1,16 @@ package com.shxy.xymanager_dao.dao; +import com.shxy.xymanager_common.entity.TerminalSchedule; import com.shxy.xymanager_common.entity.TerminalScheduleDetails; import org.apache.ibatis.annotations.Param; import java.util.List; public interface TerminalScheduleDetailsDao { - int deleteByPrimaryKey(Integer id); + + int deleteByTermiAndChannel(Integer id); + + int deleteByTermidAndChannelIdList(@Param("list") List lsit); int insert(TerminalScheduleDetails record); diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalSchedulesDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalSchedulesDao.java deleted file mode 100644 index d8a9006..0000000 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalSchedulesDao.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.shxy.xymanager_dao.dao; - -import com.shxy.xymanager_common.entity.TerminalSchedules; -import com.shxy.xymanager_common.vo.RelateTerminalListRuleIdVo; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -public interface TerminalSchedulesDao { - int deleteByChannelId(@Param("list") List list); - - int insert(TerminalSchedules record); - - int insertSelective(TerminalSchedules record); - - int insertList(@Param("list") List record, @Param("createat") Date create, @Param("updateat") Date update); - - TerminalSchedules selectByPrimaryKey(Integer id); - - TerminalSchedules selectByChannelId(@Param("channelid") Integer list, @Param("termid") Integer termid); - - List selectByTerminalBean(@Param("list") List list); - - int updateList(List record); - - int updateByPrimaryKeySelective(TerminalSchedules record); - - int updateByPrimaryKey(TerminalSchedules record); -} \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/ScheduleDetailsDao.xml b/xymanager_dao/src/main/resources/mappers/ScheduleDetailsDao.xml index df0f9c9..cc42e28 100644 --- a/xymanager_dao/src/main/resources/mappers/ScheduleDetailsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/ScheduleDetailsDao.xml @@ -13,6 +13,13 @@ id, schedule_id, start_time, end_time, span, create_time, update_time + + + + + + insert into schedule_details (id, name, start_time, end_time, span, remark, diff --git a/xymanager_dao/src/main/resources/mappers/TerminalSchedulesDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalScheduleDao.xml similarity index 82% rename from xymanager_dao/src/main/resources/mappers/TerminalSchedulesDao.xml rename to xymanager_dao/src/main/resources/mappers/TerminalScheduleDao.xml index e22cc3f..f57ebae 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalSchedulesDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalScheduleDao.xml @@ -1,7 +1,7 @@ - - + + @@ -58,7 +58,7 @@ - + insert into terminal_schedule (id, term_id, channel_id, schedule_id, create_time, update_time ) @@ -66,7 +66,7 @@ #{scheduleId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} ) - + insert into terminal_schedule @@ -109,7 +109,7 @@ - + update terminal_schedule @@ -130,17 +130,30 @@ where id = #{id,jdbcType=INTEGER} - - update terminal_schedule - set term_id = #{termId,jdbcType=INTEGER}, - channel_id = #{channelId,jdbcType=TINYINT}, - schedule_id = #{scheduleId,jdbcType=INTEGER}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=INTEGER} - + + + update terminal_schedule + set term_id = #{item.termId}, + channel_id = #{item.channelId}, + schedule_id = #{item.scheduleId}, + update_time = #{updateTime,jdbcType=TIMESTAMP} + where term_id = #{id,jdbcType=INTEGER} + + + + + insert into terminal_schedule (id,term_id,channel_id,schedule_id,create_time,update_time) + values + + (#{item.id} ,#{item.termId}, #{item.channelId},#{item.scheduleId},#{createat},#{updateat}) + + ON DUPLICATE KEY UPDATE + term_id = values(term_id), + channel_id = values(channel_id), + schedule_id = values(schedule_id) + - + update terminal_schedule set term_id = #{termId,jdbcType=INTEGER}, channel_id = #{channelId,jdbcType=TINYINT}, diff --git a/xymanager_dao/src/main/resources/mappers/TerminalScheduleDetailsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalScheduleDetailsDao.xml index 6446d13..856b249 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalScheduleDetailsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalScheduleDetailsDao.xml @@ -3,7 +3,8 @@ - + + @@ -11,7 +12,7 @@ - id, schedule_id, start_time, end_time, span, create_time, update_time + id,term_id, channel_id, start_time, end_time, span, create_time, update_time @@ -78,9 +78,6 @@ insert into terminal_schedules_temp - - id, - term_id, @@ -90,6 +87,12 @@ schedule_id, + + request_id, + + + status, + create_time, @@ -98,9 +101,6 @@ - - #{id,jdbcType=INTEGER}, - #{termId,jdbcType=INTEGER}, @@ -110,6 +110,12 @@ #{scheduleId,jdbcType=INTEGER}, + + #{requestId}, + + + #{status}, + #{createTime,jdbcType=TIMESTAMP}, diff --git a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml index c1683f7..45c91b7 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml @@ -81,7 +81,7 @@ where status = #{status} - select a.id as term_id, a.line_id as line_id, @@ -95,7 +95,7 @@ where a.status = #{status} and - + a.id = #{item.termid} and c.id in 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 a841830..4b93fba 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 @@ -296,15 +296,20 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { public ServiceBody getReturnedPhoto(ReturnedPhotoVo vo) { Boolean hasNew = false; TerminalPhoto photo = terminalPhotoDao.getLatestPhoto(vo.getTermId()); - BigInteger localPhotoTime = MyDateUtils.TimeMillSecond2Second(vo.getPhotoTime()); - log.info("请求时间:{}",localPhotoTime); - log.info("装置凯斯处理时间:{}",photo.getRecvTime()); - hasNew = photo.getRecvTime().compareTo(localPhotoTime) < 0 ? false : true; - if(hasNew && photo.getMediaType() == 1){ - if(!StringUtils.isNotBlank(photo.getThumb())){ - hasNew=false; + if (photo != null) { + BigInteger localPhotoTime = MyDateUtils.TimeMillSecond2Second(vo.getPhotoTime()); + log.info("请求时间:{}", localPhotoTime); + log.info("装置凯斯处理时间:{}", photo.getRecvTime()); + hasNew = photo.getRecvTime().compareTo(localPhotoTime) < 0 ? false : true; + if (hasNew && photo.getMediaType() == 1) { + if (!StringUtils.isNotBlank(photo.getThumb())) { + hasNew = false; + } } + }else { + hasNew = false; } + return Asserts.success(hasNew); } @@ -466,7 +471,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { JSONObject resultObj = JSONObject.parseObject(result); if (null != resultObj.get("groupData")) { List resultDtoList = JSONArray.parseArray(resultObj.get("groupData").toString(), PhotoTimeResultDto.class); - if(CollectionUtil.isNotEmpty(resultDtoList)) { + if (CollectionUtil.isNotEmpty(resultDtoList)) { List resultList = Lists.newArrayList(); String startTimeStr = resultDtoList.get(0).getHour() + ":" + resultDtoList.get(0).getMinute() + ":00"; String endTimeStr = resultDtoList.get(1).getHour() + ":" + resultDtoList.get(1).getMinute() + ":00"; 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 954aa79..bae4bd0 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 @@ -219,57 +219,37 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ */ @Override @Transactional - public ServiceBody relateSchelduleRule(RelateTerminalListRuleIdVo vo) { - - GetModel model = new GetModel(); + public ServiceBody relateSchelduleRule(RelateTerminalListRuleIdVo vo) { + GetListModel model = new GetListModel(); List list = terminalSchedulesTempDao.selectByTermAndChannel(vo.getList(), CommonStatus.DELETE.value()); if (CollectionUtil.isNotEmpty(list)) { return Asserts.error("有装置时间尚未下发成功"); } List termlist = vo.getList(); - Integer scheduleid = vo.getScheduleid(); - List temps = new ArrayList<>(); - List termidlist = new ArrayList<>(); - for (RelateTerminalListRuleIdVo.Items item : termlist) { - termidlist.add(item.getTermid()); - List 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 terminalsList = terminalsDao.selectByIdList(vo.getList(), CommonStatus.EFFECTIVE.value()); - if (CollectionUtil.isEmpty(termidlist)) { + List terminalsList = terminalsDao.selectByIdList(termlist, CommonStatus.EFFECTIVE.value()); + if (CollectionUtil.isEmpty(terminalsList)) { return Asserts.error("没有该装置"); } ScheduleAndRuleDto dto = schedulesDao.selectSingle(scheduleid, CommonStatus.EFFECTIVE.value()); + if (BeanUtil.isEmpty(dto)) { + return Asserts.error("没有该拍照时间规则"); + } List 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) { @@ -283,19 +263,29 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ + "--preset2=255 --hour3=" + span1 + "\t" + "--min3=" + span2 + "\t" + "--preset3=255"; timestr.append(string); } + + ArrayList requestIdList = new ArrayList<>(); 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("关联失败"); +// ProcessExecUtils.exec(cmd); + int requestId = Integer.parseInt(Constants.REQUEST_ID.toString()); + Constants.REQUEST_ID.addAndGet(1); + requestIdList.add(requestId); + Date date = new Date(); + TerminalSchedulesTemp temp = new TerminalSchedulesTemp(); + temp.setTermId(channelAndTermDto.getTermid()); + temp.setChannelId(channelAndTermDto.getChannelid()); + temp.setScheduleId(scheduleid); + temp.setRequestId(requestId); + temp.setStatus(CommonStatus.DELETE.value()); + temp.setCreateTime(date); + temp.setUpdateTime(date); + terminalSchedulesTempDao.insertSelective(temp); } + model.setList(requestIdList); + return Asserts.success(model); } @@ -358,13 +348,8 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ } } terminalScheduleDetailsDao.deleteByTermidAndChannelIdList(terminalSchedules); - terminalScheduleDetailsDao.insertList(terminalScheduleDetails); - - - - int i = requestResultsDao.updateByPrimaryKey(new RequestResults());//根据requestid将结果表中的状态修改为已下发 -//end - + terminalScheduleDetailsDao.insertList(terminalScheduleDetails, date, date); + int i = requestResultsDao.updateByRequestIdList(requestidlist, CommonStatus.EFFECTIVE.value());//根据requestid将结果表中的状态修改为已下发 if (i != 0) { return Asserts.success("下发成功"); } else { @@ -372,7 +357,6 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ } } - /** * 根据装置和通道编号查询拍照时间表 * @@ -381,10 +365,10 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ */ @Transactional public ServiceBody getSchedule(RelateTerminalListRuleIdVo vo) { -// GetModel model = new GetModel(); -// Integer requestid = 0; -// ArrayList intlist = new ArrayList<>(); -// RequestResults results = requestResultsDao.selectByRequestId(1); + GetModel model = new GetModel(); + Integer requestid = 0; + ArrayList intlist = new ArrayList<>(); + RequestResults results = requestResultsDao.selectByRequestId(1); // /* // * 如果下发成功 // * 1,将临时表中的数据状态改成1下发成功状态 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 3ebde13..f8ea623 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,10 +1,7 @@ package com.shxy.xymanager_service.service; import com.shxy.xymanager_common.bean.ServiceBody; -import com.shxy.xymanager_common.model.GetModel; -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.vo.*; /** @@ -57,7 +54,7 @@ public interface TerminalScheduleRuleService { * @param vo * @return */ - ServiceBody relateSchelduleRule(RelateTerminalListRuleIdVo vo); + ServiceBody relateSchelduleRule(RelateTerminalListRuleIdVo vo); /** * 查询规则下发状态