diff --git a/xymanager_admin/pom.xml b/xymanager_admin/pom.xml index f3e6d51..95dcde5 100644 --- a/xymanager_admin/pom.xml +++ b/xymanager_admin/pom.xml @@ -84,17 +84,17 @@ - - - src/main/resources + + + - - **/*.properties - **/*.yml + + + - - - + + + xymanager-admin diff --git a/xymanager_admin/src/main/resources/META-INF/spring.factories b/xymanager_admin/src/main/resources/META-INF/spring.factories index 5e2059b..8e7c358 100644 --- a/xymanager_admin/src/main/resources/META-INF/spring.factories +++ b/xymanager_admin/src/main/resources/META-INF/spring.factories @@ -1 +1 @@ -org.springframework.boot.env.EnvironmentPostProcessor=com.shxy.xymanager_framework.config.MyEnvironmentPostProcessor +#org.springframework.boot.env.EnvironmentPostProcessor=com.shxy.xymanager_framework.config.MyEnvironmentPostProcessor diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/ScheduleAndRuleDto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/ScheduleAndRuleDto.java index 8e435af..9db9178 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/ScheduleAndRuleDto.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/ScheduleAndRuleDto.java @@ -3,7 +3,6 @@ package com.shxy.xymanager_common.dto; import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; @Data @@ -16,7 +15,7 @@ public class ScheduleAndRuleDto implements Serializable { private Integer status; - private List list; + private List list; private static final long serialVersionUID = 1L; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/ScheduleRuleDto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/ScheduleDetailsDto.java similarity index 64% rename from xymanager_common/src/main/java/com/shxy/xymanager_common/dto/ScheduleRuleDto.java rename to xymanager_common/src/main/java/com/shxy/xymanager_common/dto/ScheduleDetailsDto.java index 11eb348..4d9272c 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/ScheduleRuleDto.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/ScheduleDetailsDto.java @@ -7,16 +7,16 @@ import java.sql.Time; import java.util.Date; @Data -public class ScheduleRuleDto implements Serializable { +public class ScheduleDetailsDto implements Serializable { private Integer id; private Integer scheduleId; - private Time startTime; + private Integer hour; - private Time endTime; + private Integer minute; - private Integer span; + private Integer preset; private static final long serialVersionUID = 1L; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/ScheduleDetailss.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/ScheduleDetailss.java new file mode 100644 index 0000000..8b4eb4b --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/ScheduleDetailss.java @@ -0,0 +1,28 @@ +package com.shxy.xymanager_common.entity; + +import lombok.Data; + +import java.io.Serializable; +import java.sql.Time; +import java.util.Date; + +@Data +public class ScheduleDetailss implements Serializable { + + private Integer id; + + private Integer scheduleId; + + private Integer hour; + + private Integer minute; + + private Integer preset; + + private Date createTime; + + private Date updateTime; + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleDetailss.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleDetailss.java new file mode 100644 index 0000000..d73dcd7 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleDetailss.java @@ -0,0 +1,28 @@ +package com.shxy.xymanager_common.entity; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class TerminalScheduleDetailss implements Serializable { + private Integer id; + + private Integer termId; + + private Integer channelId; + + private Integer hour; + + private Integer minute; + + private Integer span; + + private Date createTime; + + private Date updateTime; + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file 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 index 5ff7770..cdf0496 100644 --- 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 @@ -6,7 +6,6 @@ import lombok.Data; import java.io.Serializable; import java.sql.Time; -import java.util.Date; import java.util.List; /** @@ -40,12 +39,12 @@ public class TerminalScheduleRuleListModel implements Serializable { private String remark; @ApiModelProperty(value = "时间任务详情列表", example = "erwsafsasa") - private List list; + private List list; } @Data - public static class ScheduleRuleBean { + public static class ScheduleDetailsBean { @ApiModelProperty(value = "任务详情编号", example = "123456") private Integer id; 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 index a984d88..cdf4812 100644 --- 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 @@ -10,6 +10,7 @@ import org.apache.commons.lang3.time.DateFormatUtils; import java.lang.management.ManagementFactory; import java.math.BigInteger; +import java.sql.Time; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; @@ -216,4 +217,19 @@ public class MyDateUtils extends DateUtil { String date =sdf.format(timeLong*1000); return date; } + + + /** + * 时分转Time + * + * @return + */ + public static Time HHMMToTime(Integer hour, Integer minute) { + DateTime dateTime = new DateTime(); + dateTime.setField(DateField.HOUR_OF_DAY, hour); + dateTime.setField(DateField.MINUTE, minute); + dateTime.setField(DateField.SECOND, 0); + Time time = Time.valueOf(dateTime.toTimeStr()); + return time; + } } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/ScheduleListUtils.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/ScheduleListUtils.java new file mode 100644 index 0000000..383713f --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/ScheduleListUtils.java @@ -0,0 +1,131 @@ +package com.shxy.xymanager_common.util; + +import cn.hutool.core.date.DateTime; +import com.shxy.xymanager_common.dto.ScheduleDetailsDto; +import com.shxy.xymanager_common.entity.ScheduleDetailss; +import com.shxy.xymanager_common.entity.Schedules; +import com.shxy.xymanager_common.model.TerminalScheduleRuleModel; +import com.shxy.xymanager_common.vo.ScheduleListVo; +import com.shxy.xymanager_common.vo.ScheduleRuleVo; + +import javax.validation.constraints.NotEmpty; +import java.sql.Time; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * 拍照时间表工具类 + * jingjing + */ +public class ScheduleListUtils { + /** + * 将前端时间格式转换为湖南规约标准的数据库格式 + * + * @param beans 规则列表 + * @param scheduleid 规则编号 + * @return + */ + public static ArrayList getScheduleDetailsses(List beans, Integer scheduleid) { + ArrayList list = new ArrayList<>(); + for (ScheduleRuleVo item : beans) { + + ScheduleDetailss startrule = new ScheduleDetailss(); + startrule.setScheduleId(scheduleid); + Time startTime = item.getStartTime(); + startrule.setHour(MyDateUtils.hour(startTime, true)); + startrule.setMinute(MyDateUtils.minute(startTime)); + startrule.setPreset(255); + list.add(startrule); + + ScheduleDetailss endrule = new ScheduleDetailss(); + endrule.setScheduleId(scheduleid); + Time endTime = item.getEndTime(); + endrule.setHour(MyDateUtils.hour(endTime, true)); + endrule.setMinute(MyDateUtils.minute(endTime)); + endrule.setPreset(255); + list.add(endrule); + + Integer span = item.getSpan(); + ScheduleDetailss spanrule = new ScheduleDetailss(); + spanrule.setScheduleId(scheduleid); + spanrule.setHour(XyNumberUtils.delivery(span, 60)); + spanrule.setMinute(XyNumberUtils.remainder(span, 60)); + spanrule.setPreset(255); + list.add(spanrule); + + } + return list; + } + + + /** + * 将前端时间格式转换为CMA时间表下发标准的字符串 + * + * @param dtoList + * @param offset + * @return + */ + public static String relateTime(List dtoList, int offset) { + StringBuffer timestr = new StringBuffer(); + short perset = dtoList.get(0).getPreset().shortValue(); + for (int i = 0; i < dtoList.size(); i++) { + short startHour = 0; + short startMin= 0; + short endHour= 0; + short endMin= 0; + short spanHour= 0; + short spanMin= 0; + if (XyNumberUtils.remainder(i, 3) == 1) { + startHour = dtoList.get(i).getHour().shortValue(); + startMin = dtoList.get(i).getMinute().shortValue(); + } else if (XyNumberUtils.remainder(i, 3) == 2) { + endHour = dtoList.get(i).getHour().shortValue(); + endMin = dtoList.get(i).getMinute().shortValue(); + } else if (XyNumberUtils.remainder(i, 3) == 0) { + spanHour = dtoList.get(i).getHour().shortValue(); + spanMin = dtoList.get(i).getMinute().shortValue(); + } + int spanindex = i+1; + int endindex = i+2; + int startindex = i+3; + + String string = " --hour" + startindex + "=" + startHour + "\t" + "--min" + startindex + "=" + startMin + "\t" + "--preset" + startindex + "=" + perset + " --hour" + endindex + "=" + endHour + "\t" + "--min" + endindex + "=" + endMin + "\t" + + "--preset" + endindex + "=" + perset +"--hour" + spanindex + "=" + spanHour + "\t" + "--min" + spanindex + "=" + spanMin + "\t" + "--preset" + spanindex + "=" + perset ; + timestr.append(string); + } + return timestr.toString(); + } + + + /** + * 将数据库标准转为前端的时间列表 + * @param details + * @return + */ + public static ArrayList getScheduleRuleBeans(List details) { + ArrayList detailsBeans = new ArrayList<>(); + for (int i = 0; i < details.size(); i++) { + TerminalScheduleRuleModel.ScheduleRuleBean scheduleDetailsBean = new TerminalScheduleRuleModel.ScheduleRuleBean(); + if (XyNumberUtils.remainder(i, 3) == 1) { + Integer hour = details.get(i).getHour(); + Integer minute = details.get(i).getMinute(); + Time time = MyDateUtils.HHMMToTime(hour, minute); + scheduleDetailsBean.setStartTime(time); + } else if (XyNumberUtils.remainder(i, 3) == 2) { + Integer hour = details.get(i).getHour(); + Integer minute = details.get(i).getMinute(); + Time time = MyDateUtils.HHMMToTime(hour, minute); + scheduleDetailsBean.setEndTime(time); + } else if (XyNumberUtils.remainder(i, 3) == 0) { + Integer hour = details.get(i).getHour(); + Integer minute = details.get(i).getMinute(); + Number mul = XyNumberUtils.mul((Number) hour, 60); + Number add = XyNumberUtils.add(mul, minute); + scheduleDetailsBean.setSpan(add.intValue()); + } + detailsBeans.add(scheduleDetailsBean); + } + return detailsBeans; + } +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/XyNumberUtils.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/XyNumberUtils.java new file mode 100644 index 0000000..25a87f5 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/XyNumberUtils.java @@ -0,0 +1,25 @@ +package com.shxy.xymanager_common.util; + +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.NumberUtil; + +import java.math.BigDecimal; +import java.math.RoundingMode; + +/** + * 算数类 + * + * @author 晶晶 + */ +public class XyNumberUtils extends NumberUtil { + + /*取余*/ + public static int remainder(int a, int b) { + return a % b; + } + + /*取模*/ + public static int delivery(int a, int b) { + return a / b; + } +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoSelectVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoSelectVo.java index 1824371..fd57f1d 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoSelectVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoSelectVo.java @@ -21,9 +21,12 @@ public class TerminalPhotoSelectVo { @ApiModelProperty(value = "装置编号", example = "123455") private Integer lineid; - @ApiModelProperty(value = "装置编号", example = "123455") + @ApiModelProperty(value = "杆塔编号", example = "123455") private Integer towerid; + @ApiModelProperty(value = "装置编号", example = "123455") + private Integer termid; + @ApiModelProperty(value = "通道编号", example = "123455") private Integer channelid; diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/ScheduleDetailssDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/ScheduleDetailssDao.java new file mode 100644 index 0000000..542f45d --- /dev/null +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/ScheduleDetailssDao.java @@ -0,0 +1,31 @@ +package com.shxy.xymanager_dao.dao; + +import com.shxy.xymanager_common.entity.ScheduleDetails; +import com.shxy.xymanager_common.entity.ScheduleDetailss; +import com.shxy.xymanager_common.entity.TerminalSchedule; +import org.apache.ibatis.annotations.Param; + +import java.util.Date; +import java.util.List; + +public interface ScheduleDetailssDao { + + int insertSelective(ScheduleDetailss record); + + int insertList(@Param("list") List record, @Param("createat") Date create, @Param("updateat") Date update); + + ScheduleDetails selectByPrimaryKey(Integer id); + + List selectAll(@Param("status") Integer status); + + List selectAllByList(@Param("list") List list); + + int deleteById(@Param("scheduleid") Integer id); + + + int updateByPrimaryKeySelective(@Param("data") ScheduleDetailss record, @Param("updateat") Date update); + + int updateByPrimaryKey(ScheduleDetailss 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/TerminalScheduleDetailssDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleDetailssDao.java new file mode 100644 index 0000000..26d2dcf --- /dev/null +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleDetailssDao.java @@ -0,0 +1,27 @@ +package com.shxy.xymanager_dao.dao; + +import com.shxy.xymanager_common.entity.TerminalSchedule; +import com.shxy.xymanager_common.entity.TerminalScheduleDetailss; +import org.apache.ibatis.annotations.Param; + +import java.util.Date; +import java.util.List; + +public interface TerminalScheduleDetailssDao { + + int deleteByTermiAndChannel(Integer id); + + int deleteByTermidAndChannelIdList(@Param("list") List lsit); + + int insert(TerminalScheduleDetailss record); + + int insertList(@Param("list") List record, @Param("createat") Date createat, @Param("updateat") Date updateat); + + int insertSelective(TerminalScheduleDetailss record); + + TerminalScheduleDetailss selectByPrimaryKey(Integer id); + + int updateByPrimaryKeySelective(TerminalScheduleDetailss record); + + int updateByPrimaryKey(TerminalScheduleDetailss record); +} \ No newline at end of file diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java index a4732fe..2b15974 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java @@ -22,6 +22,8 @@ public interface TerminalsDao { Terminals selectByCmdid(@Param("cmdid") String cmdid, @Param("status") Integer status); + List selectByTowerId(@Param("towerid") Integer towerid, @Param("status") Integer status); + Terminals selectByToweridAndLineid(@Param("lineid") Integer lineid,@Param("towerid") Integer towerid, @Param("status") Integer status); int insertList(@Param("item") Terminals record, @Param("status") Integer status, @Param("createat") Date create, @Param("updateat") Date update); diff --git a/xymanager_dao/src/main/resources/mappers/ScheduleDetailssDao.xml b/xymanager_dao/src/main/resources/mappers/ScheduleDetailssDao.xml new file mode 100644 index 0000000..9a8f08b --- /dev/null +++ b/xymanager_dao/src/main/resources/mappers/ScheduleDetailssDao.xml @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + id, schedule_id, start_time, end_time, create_time, update_time + + + + + + + + + + + + insert into schedule_detailss (id, name, start_time, + end_time, span, remark, + create_time, update_time) + values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{startTime,jdbcType=TIME}, + #{endTime,jdbcType=TIME}, #{span,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}) + + + + insert into schedule_detailss + (schedule_id,`hour`,`minute`,preset,create_time,update_time) + VALUES + + (#{item.scheduleId},#{item.hour},#{item.minute},#{item.preset},#{createat},#{updateat}) + + + + + + insert into schedule_detailss + + + id, + + + name, + + + start_time, + + + end_time, + + + span, + + + remark, + + + create_time, + + + update_time, + + + + + #{id,jdbcType=INTEGER}, + + + #{name,jdbcType=VARCHAR}, + + + #{startTime,jdbcType=TIME}, + + + #{endTime,jdbcType=TIME}, + + + #{span,jdbcType=INTEGER}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + + + + + delete from schedule_detailss + where schedule_id = #{scheduleid} + + + + update schedules + + + name = #{data.name,jdbcType=VARCHAR}, + + + remark = #{data.remark,jdbcType=VARCHAR}, + + + update_time = #{updateat,jdbcType=TIMESTAMP}, + + + where id = #{data.id,jdbcType=INTEGER} + + + update schedule_detailss + set name = #{name,jdbcType=VARCHAR}, + start_time = #{startTime,jdbcType=TIME}, + end_time = #{endTime,jdbcType=TIME}, + span = #{span,jdbcType=INTEGER}, + remark = #{remark,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_time = #{updateTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=INTEGER} + + \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/SchedulesDao.xml b/xymanager_dao/src/main/resources/mappers/SchedulesDao.xml index a1a922b..06cc051 100644 --- a/xymanager_dao/src/main/resources/mappers/SchedulesDao.xml +++ b/xymanager_dao/src/main/resources/mappers/SchedulesDao.xml @@ -15,12 +15,12 @@ - + - - - + + + @@ -42,28 +42,28 @@ x.status as status, y.id as ruleid, y.schedule_id as schedule_id, - y.start_time as start_time, - y.end_time as end_time, - y.span as span + y.hour as hour, + y.minute as minute, + y.preset as preset from schedules x, - schedule_details y + schedule_detailss y where y.schedule_id = x.id and x.status = #{status} order by x.create_time desc insert into schedules (id, term_id, channel_id, diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml index 1bbd0bd..f8bc630 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml @@ -98,8 +98,11 @@ select from terminal_photos - where term_id = #{terminalid} and photo_time between #{starttime} and #{endtime} - + where photo_time between #{starttime} and #{endtime} + + and term_id = #{terminalid} + + and channel_id in #{item} diff --git a/xymanager_dao/src/main/resources/mappers/TerminalScheduleDetailssDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalScheduleDetailssDao.xml new file mode 100644 index 0000000..8bdc097 --- /dev/null +++ b/xymanager_dao/src/main/resources/mappers/TerminalScheduleDetailssDao.xml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + id,term_id, channel_id, start_time, end_time, span, create_time, update_time + + + + delete from terminal_schedule_detailss + where id = #{id,jdbcType=INTEGER} + + + insert into terminal_schedule_detailss (id, schedule_id, start_time, + end_time, span, create_time, + update_time) + values (#{id,jdbcType=INTEGER}, #{scheduleId,jdbcType=INTEGER}, #{startTime,jdbcType=TIME}, + #{endTime,jdbcType=TIME}, #{span,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, + #{updateTime,jdbcType=TIMESTAMP}) + + + + + insert into terminal_schedule_detailss + (term_id, channel_id,start_time, end_time, span, create_time, update_time) + values + + (#{item.termId},#{item.channelId},#{item.startTime},#{item.endTime},#{item.span},#{createat},#{updateat}) + + + + insert into terminal_schedule_detailss + + + id, + + + schedule_id, + + + start_time, + + + end_time, + + + span, + + + create_time, + + + update_time, + + + + + #{id,jdbcType=INTEGER}, + + + #{scheduleId,jdbcType=INTEGER}, + + + #{startTime,jdbcType=TIME}, + + + #{endTime,jdbcType=TIME}, + + + #{span,jdbcType=INTEGER}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + + + update terminal_schedule_detailss + + + schedule_id = #{scheduleId,jdbcType=INTEGER}, + + + start_time = #{startTime,jdbcType=TIME}, + + + end_time = #{endTime,jdbcType=TIME}, + + + span = #{span,jdbcType=INTEGER}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=INTEGER} + + + update terminal_schedule_detailss + set schedule_id = #{scheduleId,jdbcType=INTEGER}, + start_time = #{startTime,jdbcType=TIME}, + end_time = #{endTime,jdbcType=TIME}, + span = #{span,jdbcType=INTEGER}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_time = #{updateTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=INTEGER} + + + delete from terminal_schedule_detailss + where + + term_id = #{item.termId} and channel_id = #{item.channelId} + + + \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml index 89ffce9..83b0f77 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml @@ -178,6 +178,15 @@ from terminals where line_id = #{lineid} and tower_id = #{towerid} and status = #{status} limit 1; + insert into terminals diff --git a/xymanager_dao/src/main/resources/mappers/TowerDao.xml b/xymanager_dao/src/main/resources/mappers/TowerDao.xml index 2cd03be..17a2093 100644 --- a/xymanager_dao/src/main/resources/mappers/TowerDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TowerDao.xml @@ -27,7 +27,10 @@ select id, name, line_id from tower - where line_id = #{lineid} and status = #{status} + where status = #{status} + + and line_id = #{lineid} +