Merge remote-tracking branch 'origin/master' into dev
18616268358
2 years ago
commit
1b8957e6b2
@ -1,12 +1,12 @@
|
|||||||
package com.shxy.xymanager_admin;
|
//package com.shxy.xymanager_admin;
|
||||||
|
//
|
||||||
import org.springframework.boot.builder.SpringApplicationBuilder;
|
//import org.springframework.boot.builder.SpringApplicationBuilder;
|
||||||
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
|
//import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
|
||||||
|
//
|
||||||
public class SpringBootStartApplication extends SpringBootServletInitializer {
|
//public class SpringBootStartApplication extends SpringBootServletInitializer {
|
||||||
@Override
|
// @Override
|
||||||
protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
|
// protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
|
||||||
// 注意这里要指向原先用main方法执行的Application启动类
|
// // 注意这里要指向原先用main方法执行的Application启动类
|
||||||
return builder.sources(XymanagerAdminApplication.class);
|
// return builder.sources(XymanagerAdminApplication.class);
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
#org.springframework.boot.env.EnvironmentPostProcessor=com.shxy.xymanager_framework.config.MyEnvironmentPostProcessor
|
org.springframework.boot.env.EnvironmentPostProcessor=com.shxy.xymanager_framework.config.MyEnvironmentPostProcessor
|
||||||
|
|||||||
@ -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;
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -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,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);
|
|
||||||
}
|
|
||||||
@ -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);
|
|
||||||
}
|
|
||||||
@ -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>
|
|
||||||
@ -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>
|
|
||||||
Loading…
Reference in New Issue