时间表删除不用的表结构

master
liuguijing 2 years ago
parent 90f06480c8
commit 8c293998f7

@ -13,11 +13,11 @@ public class ScheduleDetails implements Serializable {
private Integer scheduleId;
private Time startTime;
private Integer hour;
private Time endTime;
private Integer minute;
private Integer span;
private Integer preset;
private Date createTime;

@ -1,28 +0,0 @@
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;
}

@ -13,9 +13,9 @@ public class TerminalScheduleDetails implements Serializable {
private Integer channelId;
private Date startTime;
private Integer hour;
private Date endTime;
private Integer minute;
private Integer span;

@ -1,28 +0,0 @@
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;
}

@ -1,7 +1,7 @@
package com.shxy.xymanager_common.util;
import com.shxy.xymanager_common.dto.ScheduleDetailsDto;
import com.shxy.xymanager_common.entity.ScheduleDetailss;
import com.shxy.xymanager_common.entity.ScheduleDetails;
import com.shxy.xymanager_common.model.TerminalScheduleRuleModel;
import com.shxy.xymanager_common.vo.ScheduleRuleVo;
@ -21,11 +21,11 @@ public class ScheduleListUtils {
* @param scheduleid
* @return
*/
public static ArrayList<ScheduleDetailss> getScheduleDetailsses(List<ScheduleRuleVo> beans, Integer scheduleid) {
ArrayList<ScheduleDetailss> list = new ArrayList<>();
public static ArrayList<ScheduleDetails> getScheduleDetailsses(List<ScheduleRuleVo> beans, Integer scheduleid) {
ArrayList<ScheduleDetails> list = new ArrayList<>();
for (ScheduleRuleVo item : beans) {
ScheduleDetailss startrule = new ScheduleDetailss();
ScheduleDetails startrule = new ScheduleDetails();
startrule.setScheduleId(scheduleid);
Time startTime = item.getStartTime();
startrule.setHour(MyDateUtils.hour(startTime, true));
@ -33,7 +33,7 @@ public class ScheduleListUtils {
startrule.setPreset(255);
list.add(startrule);
ScheduleDetailss endrule = new ScheduleDetailss();
ScheduleDetails endrule = new ScheduleDetails();
endrule.setScheduleId(scheduleid);
Time endTime = item.getEndTime();
endrule.setHour(MyDateUtils.hour(endTime, true));
@ -42,7 +42,7 @@ public class ScheduleListUtils {
list.add(endrule);
Integer span = item.getSpan();
ScheduleDetailss spanrule = new ScheduleDetailss();
ScheduleDetails spanrule = new ScheduleDetails();
spanrule.setScheduleId(scheduleid);
spanrule.setHour(XyNumberUtils.delivery(span, 60));
spanrule.setMinute(XyNumberUtils.remainder(span, 60));
@ -75,15 +75,38 @@ public class ScheduleListUtils {
String string = "";
if (XyNumberUtils.remainder(i, 3) == 0) {
index = index + 3;
startHour = dtoList.get(i).getHour().shortValue();
startMin = dtoList.get(i).getMinute().shortValue();
Number add = XyNumberUtils.add((Number) dtoList.get(i).getMinute(), 60);
if (add.intValue() >= 60) {
Number add1 = XyNumberUtils.add((Number) dtoList.get(i).getHour(), 1);
if (add1.intValue() >= 24) {
startHour = Integer.valueOf(24).shortValue();
startMin = Integer.valueOf(0).shortValue();
} else {
startHour = XyNumberUtils.add((Number) dtoList.get(i).getHour(), 1).shortValue();
startMin = XyNumberUtils.sub(add, 60).shortValue();
}
} else {
startHour = dtoList.get(i).getHour().shortValue();
startMin = add.shortValue();
}
string = " --hour" + index + "=" + startHour + " --min" + index + "=" + startMin + " --preset" + index + "=" + perset;
} else if (XyNumberUtils.remainder(i, 3) == 1) {
index = index - 1;
endHour = dtoList.get(i).getHour().shortValue();
endMin = dtoList.get(i).getMinute().shortValue();
Number add = XyNumberUtils.add((Number) dtoList.get(i).getMinute(), 60);
if (add.intValue() >= 60) {
Number add1 = XyNumberUtils.add((Number) dtoList.get(i).getHour(), 1);
if (add1.intValue() >= 24) {
endHour = Integer.valueOf(24).shortValue();
endMin = Integer.valueOf(0).shortValue();
} else {
endHour = add1.shortValue();
endMin = XyNumberUtils.sub(add, 60).shortValue();
}
} else {
endHour = dtoList.get(i).getHour().shortValue();
endMin = add.shortValue();
}
string = " --hour" + index + "=" + endHour + " --min" + index + "=" + endMin + " --preset" + index + "=" + perset;
} else if (XyNumberUtils.remainder(i, 3) == 2) {
index = index - 1;
spanHour = dtoList.get(i).getHour().shortValue();

@ -32,6 +32,9 @@ public class RelateTerminalListRuleIdVo {
@NotNull(message = "通道编号列表不能缺少")
@ApiModelProperty(value = "通道编号列表", example = "123455")
private List<Integer> channelidlist;
@ApiModelProperty(value = "偏移量", example = "123455")
private Integer offset;
}
}

@ -4,7 +4,6 @@ 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;

@ -1,31 +0,0 @@
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<ScheduleDetailss> record, @Param("createat") Date create, @Param("updateat") Date update);
ScheduleDetails selectByPrimaryKey(Integer id);
List<ScheduleDetailss> selectAll(@Param("status") Integer status);
List<ScheduleDetailss> selectAllByList(@Param("list") List<TerminalSchedule> list);
int deleteById(@Param("scheduleid") Integer id);
int updateByPrimaryKeySelective(@Param("data") ScheduleDetailss record, @Param("updateat") Date update);
int updateByPrimaryKey(ScheduleDetailss record);
List<ScheduleDetailss> selectAllBySceduleidList(@Param("list") List<Integer> distinct);
}

@ -4,7 +4,6 @@ import com.shxy.xymanager_common.entity.TerminalSchedule;
import com.shxy.xymanager_common.entity.TerminalScheduleDetails;
import org.apache.ibatis.annotations.Param;
import javax.xml.crypto.Data;
import java.util.Date;
import java.util.List;

@ -1,27 +0,0 @@
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<TerminalSchedule> lsit);
int insert(TerminalScheduleDetailss record);
int insertList(@Param("list") List<TerminalScheduleDetailss> 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);
}

@ -4,14 +4,14 @@
<resultMap id="BaseResultMap" type="com.shxy.xymanager_common.entity.ScheduleDetails">
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="schedule_id" jdbcType="INTEGER" property="scheduleId"/>
<result column="start_time" jdbcType="TIME" property="startTime"/>
<result column="end_time" jdbcType="TIME" property="endTime"/>
<result column="span" jdbcType="INTEGER" property="span"/>
<result column="hour" jdbcType="INTEGER" property="hour"/>
<result column="minute" jdbcType="INTEGER" property="minute"/>
<result column="preset" jdbcType="INTEGER" property="preset"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
</resultMap>
<sql id="Base_Column_List">
id, schedule_id, start_time, end_time, span, create_time, update_time
id, schedule_id, start_time, end_time, create_time, update_time
</sql>
<select id="selectByScheduleId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
@ -34,7 +34,6 @@
where status = #{status}
</select>
<select id="selectAllBySceduleidList" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
@ -58,10 +57,10 @@
<insert id="insertList" parameterType="java.util.List">
insert into schedule_details
(schedule_id,start_time,end_time,span,create_time,update_time)
(schedule_id,`hour`,`minute`,preset,create_time,update_time)
VALUES
<foreach collection="list" item="item" separator=",">
(#{item.scheduleId},#{item.startTime},#{item.endTime},#{item.span},#{createat},#{updateat})
(#{item.scheduleId},#{item.hour},#{item.minute},#{item.preset},#{createat},#{updateat})
</foreach>
</insert>

@ -1,156 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.shxy.xymanager_dao.dao.ScheduleDetailssDao">
<resultMap id="BaseResultMap" type="com.shxy.xymanager_common.entity.ScheduleDetailss">
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="schedule_id" jdbcType="INTEGER" property="scheduleId"/>
<result column="hour" jdbcType="INTEGER" property="hour"/>
<result column="minute" jdbcType="INTEGER" property="minute"/>
<result column="preset" jdbcType="INTEGER" property="preset"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
</resultMap>
<sql id="Base_Column_List">
id, schedule_id, start_time, end_time, create_time, update_time
</sql>
<select id="selectByScheduleId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from schedule_detailss
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from schedule_detailss
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from schedule_detailss
where status = #{status}
</select>
<select id="selectAllBySceduleidList" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from schedule_detailss
<if test="list != null and list.size > 0">
where schedule_id in
<foreach collection="list" item="id" index="index" separator="," open="(" close=")">
#{id}
</foreach>
</if>
</select>
<insert id="insert" parameterType="com.shxy.xymanager_common.entity.ScheduleDetails">
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>
<insert id="insertList" parameterType="java.util.List">
insert into schedule_detailss
(schedule_id,`hour`,`minute`,preset,create_time,update_time)
VALUES
<foreach collection="list" item="item" separator=",">
(#{item.scheduleId},#{item.hour},#{item.minute},#{item.preset},#{createat},#{updateat})
</foreach>
</insert>
<insert id="insertSelective" parameterType="com.shxy.xymanager_common.entity.ScheduleDetails">
insert into schedule_detailss
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="name != null">
name,
</if>
<if test="startTime != null">
start_time,
</if>
<if test="endTime != null">
end_time,
</if>
<if test="span != null">
span,
</if>
<if test="remark != null">
remark,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=INTEGER},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="startTime != null">
#{startTime,jdbcType=TIME},
</if>
<if test="endTime != null">
#{endTime,jdbcType=TIME},
</if>
<if test="span != null">
#{span,jdbcType=INTEGER},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<delete id="deleteById">
delete from schedule_detailss
where schedule_id = #{scheduleid}
</delete>
<update id="updateByPrimaryKeySelective" parameterType="com.shxy.xymanager_common.entity.ScheduleDetails">
update schedules
<set>
<if test="data.name != null">
name = #{data.name,jdbcType=VARCHAR},
</if>
<if test="data.remark != null">
remark = #{data.remark,jdbcType=VARCHAR},
</if>
<if test="updateat != null">
update_time = #{updateat,jdbcType=TIMESTAMP},
</if>
</set>
where id = #{data.id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.shxy.xymanager_common.entity.ScheduleDetails">
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}
</update>
</mapper>

@ -53,7 +53,7 @@
y.minute as minute,
y.preset as preset
from schedules x,
schedule_detailss y
schedule_details y
where y.schedule_id = x.id and x.status = #{status}
<if test="list != null and list.size > 0">
and y.schedule_id in
@ -61,7 +61,7 @@
#{item.id}
</foreach>
</if>
order by x.create_time desc
order by y.id asc
</select>
<select id="selectSingleScheduleAndDetailsList" resultMap="ScheduleAndRule">
@ -76,7 +76,7 @@
y.minute as minute,
y.preset as preset
from schedules x,
schedule_detailss y
schedule_details y
where y.schedule_id = x.id and x.status = #{status} and y.schedule_id = #{id}
order by y.id asc
</select>

@ -5,8 +5,8 @@
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="term_id" jdbcType="INTEGER" property="termId"/>
<result column="channel_id" jdbcType="INTEGER" property="channelId"/>
<result column="start_time" jdbcType="TIME" property="startTime"/>
<result column="end_time" jdbcType="TIME" property="endTime"/>
<result column="hour" jdbcType="INTEGER" property="hour"/>
<result column="minute" jdbcType="INTEGER" property="minute"/>
<result column="span" jdbcType="INTEGER" property="span"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
@ -25,7 +25,7 @@
where id = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.shxy.xymanager_common.entity.TerminalScheduleDetails">
insert into terminal_schedule_details (id, schedule_id, start_time,
insert into terminal_schedule_details (id, schedule_id, start_time,
end_time, span, create_time,
update_time)
values (#{id,jdbcType=INTEGER}, #{scheduleId,jdbcType=INTEGER}, #{startTime,jdbcType=TIME},

@ -1,135 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.shxy.xymanager_dao.dao.TerminalScheduleDetailssDao">
<resultMap id="BaseResultMap" type="com.shxy.xymanager_common.entity.TerminalScheduleDetailss">
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="term_id" jdbcType="INTEGER" property="termId"/>
<result column="channel_id" jdbcType="INTEGER" property="channelId"/>
<result column="hour" jdbcType="INTEGER" property="hour"/>
<result column="minute" jdbcType="INTEGER" property="minute"/>
<result column="span" jdbcType="INTEGER" property="span"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
</resultMap>
<sql id="Base_Column_List">
id,term_id, channel_id, start_time, end_time, span, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from terminal_schedule_detailss
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from terminal_schedule_detailss
where id = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.shxy.xymanager_common.entity.TerminalScheduleDetails">
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>
<insert id="insertList">
insert into terminal_schedule_detailss
(term_id, channel_id,start_time, end_time, span, create_time, update_time)
values
<foreach collection="list" item="item" separator=",">
(#{item.termId},#{item.channelId},#{item.startTime},#{item.endTime},#{item.span},#{createat},#{updateat})
</foreach>
</insert>
<insert id="insertSelective" parameterType="com.shxy.xymanager_common.entity.TerminalScheduleDetails">
insert into terminal_schedule_detailss
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="scheduleId != null">
schedule_id,
</if>
<if test="startTime != null">
start_time,
</if>
<if test="endTime != null">
end_time,
</if>
<if test="span != null">
span,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=INTEGER},
</if>
<if test="scheduleId != null">
#{scheduleId,jdbcType=INTEGER},
</if>
<if test="startTime != null">
#{startTime,jdbcType=TIME},
</if>
<if test="endTime != null">
#{endTime,jdbcType=TIME},
</if>
<if test="span != null">
#{span,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.shxy.xymanager_common.entity.TerminalScheduleDetails">
update terminal_schedule_detailss
<set>
<if test="scheduleId != null">
schedule_id = #{scheduleId,jdbcType=INTEGER},
</if>
<if test="startTime != null">
start_time = #{startTime,jdbcType=TIME},
</if>
<if test="endTime != null">
end_time = #{endTime,jdbcType=TIME},
</if>
<if test="span != null">
span = #{span,jdbcType=INTEGER},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.shxy.xymanager_common.entity.TerminalScheduleDetails">
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}
</update>
<delete id="deleteByTermidAndChannelIdList">
delete from terminal_schedule_detailss
where
<foreach collection="list" item="item" index="index" separator="or" open="(" close=")">
term_id = #{item.termId} and channel_id = #{item.channelId}
</foreach>
</delete>
</mapper>

@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.RandomUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo;
@ -47,7 +46,7 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
SchedulesDao schedulesDao;
@Autowired
ScheduleDetailssDao scheduleDetailssDao;
ScheduleDetailsDao scheduleDetailsDao;
@Autowired
TerminalScheduleDao terminalScheduleDao;
@ -157,8 +156,8 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
schedules.setUpdateTime(date);
int i1 = schedulesDao.insertSelective(schedules);
if (i1 != 0) {
ArrayList<ScheduleDetailss> list = ScheduleListUtils.getScheduleDetailsses(vo.getList(), schedules.getId());
int i = scheduleDetailssDao.insertList(list, date, date);
ArrayList<ScheduleDetails> list = ScheduleListUtils.getScheduleDetailsses(vo.getList(), schedules.getId());
int i = scheduleDetailsDao.insertList(list, date, date);
if (i != 0) {
return Asserts.success("录入成功");
} else {
@ -189,9 +188,9 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
schedule.setRemark(vo.getRemark());
schedule.setUpdateTime(date);
schedulesDao.updateByPrimaryKeySelective(schedule);
scheduleDetailssDao.deleteById(scheduleid);
ArrayList<ScheduleDetailss> list = ScheduleListUtils.getScheduleDetailsses(vo.getList(), scheduleid);
int i = scheduleDetailssDao.insertList(list, date, date);
scheduleDetailsDao.deleteById(scheduleid);
ArrayList<ScheduleDetails> list = ScheduleListUtils.getScheduleDetailsses(vo.getList(), scheduleid);
int i = scheduleDetailsDao.insertList(list, date, date);
if (i != 0) {
return Asserts.success("修改成功");
} else {
@ -253,8 +252,13 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
for (int x = 0; x < terminalsList.size(); x++) {
ChannelAndTermDto channelAndTermDto = terminalsList.get(x);
int requestId = Constants.REQUEST_ID.addAndGet(1);
int offset = RandomUtil.randomInt(10);
int offset = 0;
for (int i = 0; i < termlist.size(); i++) {
if (channelAndTermDto.getTermid().intValue() == termlist.get(i).getTermid().intValue()) {
offset = termlist.get(i).getOffset();
}
}
// int offset = RandomUtil.randomInt(10);
String timestr = ScheduleListUtils.relateTime(dtoList, offset);
String cmd = Constants.CMD + "schedule --group=" + dtoList.size() + " --flag=1 --clientid=10 --cmdid="
@ -358,21 +362,28 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
} else {
Integer scheduleId = mapper.getScheduleId();
ScheduleAndRuleDto bean = schedulesDao.selectSingleScheduleAndDetailsList(scheduleId, CommonStatus.EFFECTIVE.value());
List<ScheduleDetailsDto> list = bean.getList();
ArrayList<TerminalScheduleRuleModel.ScheduleRuleBean> detailsBeans = ScheduleListUtils.getScheduleDetailsBeans(list);
ArrayList<String> timestrlist = new ArrayList<>();
for (TerminalScheduleRuleModel.ScheduleRuleBean item : detailsBeans) {
Time startTime = item.getStartTime();
Time endTime = item.getEndTime();
Integer span = item.getSpan();
List<DateTime> dateTimes = MyDateUtils.rangeToList(startTime, endTime, DateField.MINUTE, span);
for (DateTime data : dateTimes) {
String dateTime = DateUtil.formatTime(data);
timestrlist.add(dateTime);
if (BeanUtil.isEmpty(bean)) {
model.setList(new ArrayList<>());
}else {
List<ScheduleDetailsDto> list = bean.getList();
if (CollectionUtil.isEmpty(list)) {
model.setList(new ArrayList<>());
}else {
ArrayList<TerminalScheduleRuleModel.ScheduleRuleBean> detailsBeans = ScheduleListUtils.getScheduleDetailsBeans(list);
ArrayList<String> timestrlist = new ArrayList<>();
for (TerminalScheduleRuleModel.ScheduleRuleBean item : detailsBeans) {
Time startTime = item.getStartTime();
Time endTime = item.getEndTime();
Integer span = item.getSpan();
List<DateTime> dateTimes = MyDateUtils.rangeToList(startTime, endTime, DateField.MINUTE, span);
for (DateTime data : dateTimes) {
String dateTime = DateUtil.formatTime(data);
timestrlist.add(dateTime);
}
}
model.setList(timestrlist);
}
}
model.setList(timestrlist);
}
return Asserts.success(model);
}

Loading…
Cancel
Save