joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

【指示灯、按钮】管理接口BUG修复

Browse Source 
Signed-off-by: weizhihong <weizhihong@joylink.club>
This commit is contained in:
weizhihong 2022-04-20 10:52:11 +08:00
parent 2a14147c6a
commit 923db614cd
4 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/club/joylink/rtss/dao/AssistIndicatorDAO.java
View File

@ -9,4 +9,5 @@ import org.springframework.stereotype.Repository;
*/ */
@Repository @Repository
public interface AssistIndicatorDAO extends MyBatisBaseDao<IndicatorSection, Long, IndicatorSectionExample> { public interface AssistIndicatorDAO extends MyBatisBaseDao<IndicatorSection, Long, IndicatorSectionExample> {
} }

2
src/main/java/club/joylink/rtss/services/AssistButtonIndicatorService.java
View File

@ -54,6 +54,7 @@ public class AssistButtonIndicatorService implements IAssistButtonIndicatorServi
@Override @Override
public String saveIndicatorSection(Long mapId, IndicatorSection vo) { public String saveIndicatorSection(Long mapId, IndicatorSection vo) {
vo.setMapId(mapId);
if (!CollectionUtils.isEmpty(vo.getSectionList())) { if (!CollectionUtils.isEmpty(vo.getSectionList())) {
vo.setSectionsCode(String.join(",", vo.getSectionList())); vo.setSectionsCode(String.join(",", vo.getSectionList()));
} }
@ -96,6 +97,7 @@ public class AssistButtonIndicatorService implements IAssistButtonIndicatorServi
@Override @Override
public String saveButtonStand(Long mapId, ButtonStand vo) { public String saveButtonStand(Long mapId, ButtonStand vo) {
vo.setMapId(mapId);
int line; int line;
if (vo.getId() != null) { if (vo.getId() != null) {
line = assistButtonDAO.updateByPrimaryKey(vo); line = assistButtonDAO.updateByPrimaryKey(vo);

32
src/main/resources/mybatis/mapper/AssistButtonDAO.xml
View File

@ -3,8 +3,8 @@
<mapper namespace="club.joylink.rtss.dao.AssistButtonDAO"> <mapper namespace="club.joylink.rtss.dao.AssistButtonDAO">
<resultMap id="ButtonBaseResultMap" type="club.joylink.rtss.entity.ButtonStand"> <resultMap id="ButtonBaseResultMap" type="club.joylink.rtss.entity.ButtonStand">
<id column="id" jdbcType="INTEGER" property="id"/> <id column="id" jdbcType="BIGINT" property="id"/>
<result column="map_id" jdbcType="INTEGER" property="mapId"/> <result column="map_id" jdbcType="BIGINT" property="mapId"/>
<result column="button_code" jdbcType="VARCHAR" property="buttonCode"/> <result column="button_code" jdbcType="VARCHAR" property="buttonCode"/>
<result column="stand_code" jdbcType="VARCHAR" property="standCode"/> <result column="stand_code" jdbcType="VARCHAR" property="standCode"/>
<result column="next_stand_code" jdbcType="VARCHAR" property="nextStandCode"/> <result column="next_stand_code" jdbcType="VARCHAR" property="nextStandCode"/>
@ -101,15 +101,15 @@
</if> </if>
</select> </select>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="ButtonBaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ButtonBaseResultMap">
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from button_stand_route from button_stand_route
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=BIGINT}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from button_stand_route where id = #{id,jdbcType=INTEGER} delete from button_stand_route where id = #{id,jdbcType=BIGINT}
</delete> </delete>
<delete id="deleteByExample" parameterType="club.joylink.rtss.entity.CgyRecordExample"> <delete id="deleteByExample" parameterType="club.joylink.rtss.entity.CgyRecordExample">
@ -123,7 +123,7 @@
useGeneratedKeys="true"> useGeneratedKeys="true">
insert into button_stand_route (map_id, button_code,stand_code,next_stand_code,pre_stand_code) insert into button_stand_route (map_id, button_code,stand_code,next_stand_code,pre_stand_code)
values ( values (
#{mapId,jdbcType=INTEGER}, #{buttonCode,jdbcType=VARCHAR}, #{standCode,jdbcType=VARCHAR}, #{mapId,jdbcType=BIGINT}, #{buttonCode,jdbcType=VARCHAR}, #{standCode,jdbcType=VARCHAR},
#{nextStandCode,jdbcType=VARCHAR}, #{preStandCode,jdbcType=VARCHAR} #{nextStandCode,jdbcType=VARCHAR}, #{preStandCode,jdbcType=VARCHAR}
) )
</insert> </insert>
@ -139,7 +139,7 @@
<if test="preStandCode != null">pre_stand_code,</if> <if test="preStandCode != null">pre_stand_code,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="mapId != null">#{mapId,jdbcType=INTEGER},</if> <if test="mapId != null">#{mapId,jdbcType=BIGINT},</if>
<if test="buttonCode != null">#{buttonCode,jdbcType=VARCHAR},</if> <if test="buttonCode != null">#{buttonCode,jdbcType=VARCHAR},</if>
<if test="standCode != null">#{standCode,jdbcType=VARCHAR},</if> <if test="standCode != null">#{standCode,jdbcType=VARCHAR},</if>
<if test="nextStandCode != null">#{nextStandCode,jdbcType=VARCHAR},</if> <if test="nextStandCode != null">#{nextStandCode,jdbcType=VARCHAR},</if>
@ -158,10 +158,10 @@
update button_stand_route update button_stand_route
<set> <set>
<if test="record.id != null"> <if test="record.id != null">
id = #{record.id,jdbcType=INTEGER}, id = #{record.id,jdbcType=BIGINT},
</if> </if>
<if test="record.mapId != null"> <if test="record.mapId != null">
map_id = #{record.mapId,jdbcType=INTEGER}, map_id = #{record.mapId,jdbcType=BIGINT},
</if> </if>
<if test="record.buttonCode != null"> <if test="record.buttonCode != null">
button_code = #{record.buttonCode,jdbcType=VARCHAR}, button_code = #{record.buttonCode,jdbcType=VARCHAR},
@ -183,8 +183,8 @@
<update id="updateByExample" parameterType="map"> <update id="updateByExample" parameterType="map">
update button_stand_route update button_stand_route
set id = #{record.id,jdbcType=INTEGER}, set id = #{record.id,jdbcType=BIGINT},
map_id = #{record.mapId,jdbcType=INTEGER}, map_id = #{record.mapId,jdbcType=BIGINT},
button_code = #{record.buttonCode,jdbcType=VARCHAR}, button_code = #{record.buttonCode,jdbcType=VARCHAR},
stand_code = #{record.standCode,jdbcType=VARCHAR}, stand_code = #{record.standCode,jdbcType=VARCHAR},
next_stand_code = #{record.nextStandCode,jdbcType=VARCHAR}, next_stand_code = #{record.nextStandCode,jdbcType=VARCHAR},
@ -198,7 +198,7 @@
update button_stand_route update button_stand_route
<set> <set>
<if test="mapId != null"> <if test="mapId != null">
map_id = #{mapId,jdbcType=INTEGER}, map_id = #{mapId,jdbcType=BIGINT},
</if> </if>
<if test="buttonCode != null"> <if test="buttonCode != null">
button_code = #{buttonCode,jdbcType=VARCHAR}, button_code = #{buttonCode,jdbcType=VARCHAR},
@ -213,16 +213,16 @@
pre_stand_code = #{preStandCode,jdbcType=VARCHAR}, pre_stand_code = #{preStandCode,jdbcType=VARCHAR},
</if> </if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=BIGINT}
</update> </update>
<update id="updateByPrimaryKey" parameterType="club.joylink.rtss.entity.ButtonStand"> <update id="updateByPrimaryKey" parameterType="club.joylink.rtss.entity.ButtonStand">
update button_stand_route update button_stand_route
set map_id = #{mapId,jdbcType=INTEGER}, set map_id = #{mapId,jdbcType=BIGINT},
button_code = #{buttonCode,jdbcType=VARCHAR}, button_code = #{buttonCode,jdbcType=VARCHAR},
stand_code = #{standCode,jdbcType=VARCHAR}, stand_code = #{standCode,jdbcType=VARCHAR},
next_stand_code = #{nextStandCode,jdbcType=VARCHAR}, next_stand_code = #{nextStandCode,jdbcType=VARCHAR},
pre_stand_code = #{preStandCode,jdbcType=VARCHAR} pre_stand_code = #{preStandCode,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>

32
src/main/resources/mybatis/mapper/AssistIndicatorDAO.xml
View File

@ -2,8 +2,8 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="club.joylink.rtss.dao.AssistIndicatorDAO"> <mapper namespace="club.joylink.rtss.dao.AssistIndicatorDAO">
<resultMap id="IndicatorBaseResultMap" type="club.joylink.rtss.entity.IndicatorSection"> <resultMap id="IndicatorBaseResultMap" type="club.joylink.rtss.entity.IndicatorSection">
<id column="id" jdbcType="INTEGER" property="id"/> <id column="id" jdbcType="BIGINT" property="id"/>
<result column="map_id" jdbcType="INTEGER" property="mapId"/> <result column="map_id" jdbcType="BIGINT" property="mapId"/>
<result column="indicator_code" jdbcType="VARCHAR" property="indicatorCode"/> <result column="indicator_code" jdbcType="VARCHAR" property="indicatorCode"/>
<result column="sections_code" jdbcType="VARCHAR" property="sectionsCode"/> <result column="sections_code" jdbcType="VARCHAR" property="sectionsCode"/>
<result column="stand_code" jdbcType="VARCHAR" property="standCode"/> <result column="stand_code" jdbcType="VARCHAR" property="standCode"/>
@ -102,15 +102,15 @@
</if> </if>
</select> </select>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="IndicatorBaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="IndicatorBaseResultMap">
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from indicator_section_stand_route from indicator_section_stand_route
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=BIGINT}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from indicator_section_stand_route where id = #{id,jdbcType=INTEGER} delete from indicator_section_stand_route where id = #{id,jdbcType=BIGINT}
</delete> </delete>
<delete id="deleteByExample" parameterType="club.joylink.rtss.entity.IndicatorSectionExample"> <delete id="deleteByExample" parameterType="club.joylink.rtss.entity.IndicatorSectionExample">
@ -126,7 +126,7 @@
map_id, indicator_code, sections_code, stand_code, next_stand_code,pre_stand_code, route_code map_id, indicator_code, sections_code, stand_code, next_stand_code,pre_stand_code, route_code
) )
values ( values (
#{mapId,jdbcType=INTEGER}, #{indicatorCode,jdbcType=VARCHAR}, #{sectionsCode,jdbcType=VARCHAR}, #{mapId,jdbcType=BIGINT}, #{indicatorCode,jdbcType=VARCHAR}, #{sectionsCode,jdbcType=VARCHAR},
#{standCode,jdbcType=VARCHAR},#{nextStandCode,jdbcType=VARCHAR}, #{preStandCode,jdbcType=VARCHAR}, #{standCode,jdbcType=VARCHAR},#{nextStandCode,jdbcType=VARCHAR}, #{preStandCode,jdbcType=VARCHAR},
#{routeCode,jdbcType=VARCHAR} #{routeCode,jdbcType=VARCHAR}
) )
@ -146,7 +146,7 @@
<if test="routeCode != null">route_code,</if> <if test="routeCode != null">route_code,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="mapId != null">#{mapId,jdbcType=INTEGER},</if> <if test="mapId != null">#{mapId,jdbcType=BIGINT},</if>
<if test="indicatorCode != null">#{indicatorCode,jdbcType=VARCHAR},</if> <if test="indicatorCode != null">#{indicatorCode,jdbcType=VARCHAR},</if>
<if test="sectionsCode != null">#{sectionsCode,jdbcType=VARCHAR},</if> <if test="sectionsCode != null">#{sectionsCode,jdbcType=VARCHAR},</if>
<if test="standCode != null">#{standCode,jdbcType=VARCHAR},</if> <if test="standCode != null">#{standCode,jdbcType=VARCHAR},</if>
@ -168,10 +168,10 @@
update indicator_section_stand_route update indicator_section_stand_route
<set> <set>
<if test="record.id != null"> <if test="record.id != null">
id = #{record.id,jdbcType=INTEGER}, id = #{record.id,jdbcType=BIGINT},
</if> </if>
<if test="record.mapId != null"> <if test="record.mapId != null">
map_id = #{record.mapId,jdbcType=INTEGER}, map_id = #{record.mapId,jdbcType=BIGINT},
</if> </if>
<if test="indicatorCode != null"> <if test="indicatorCode != null">
indicator_code = #{record.indicatorCode,jdbcType=VARCHAR}, indicator_code = #{record.indicatorCode,jdbcType=VARCHAR},
@ -199,8 +199,8 @@
<update id="updateByExample" parameterType="map"> <update id="updateByExample" parameterType="map">
update indicator_section_stand_route update indicator_section_stand_route
set id = #{record.id,jdbcType=INTEGER}, set id = #{record.id,jdbcType=BIGINT},
map_id = #{record.mapId,jdbcType=INTEGER}, map_id = #{record.mapId,jdbcType=BIGINT},
indicator_code = #{record.indicatorCode,jdbcType=VARCHAR}, indicator_code = #{record.indicatorCode,jdbcType=VARCHAR},
sections_code = #{record.sectionsCode,jdbcType=VARCHAR}, sections_code = #{record.sectionsCode,jdbcType=VARCHAR},
stand_code = #{record.standCode,jdbcType=VARCHAR}, stand_code = #{record.standCode,jdbcType=VARCHAR},
@ -216,7 +216,7 @@
update indicator_section_stand_route update indicator_section_stand_route
<set> <set>
<if test="mapId != null"> <if test="mapId != null">
map_id = #{mapId,jdbcType=INTEGER}, map_id = #{mapId,jdbcType=BIGINT},
</if> </if>
<if test="indicatorCode != null"> <if test="indicatorCode != null">
indicator_code = #{indicatorCode,jdbcType=VARCHAR}, indicator_code = #{indicatorCode,jdbcType=VARCHAR},
@ -237,19 +237,19 @@
route_code = #{routeCode,jdbcType=VARCHAR}, route_code = #{routeCode,jdbcType=VARCHAR},
</if> </if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=BIGINT}
</update> </update>
<update id="updateByPrimaryKey" parameterType="club.joylink.rtss.entity.IndicatorSection"> <update id="updateByPrimaryKey" parameterType="club.joylink.rtss.entity.IndicatorSection">
update indicator_section_stand_route update indicator_section_stand_route
set set
map_id = #{mapId,jdbcType=INTEGER}, map_id = #{mapId,jdbcType=BIGINT},
indicator_code = #{indicatorCode,jdbcType=VARCHAR}, indicator_code = #{indicatorCode,jdbcType=VARCHAR},
sections_code = #{sectionsCode,jdbcType=VARCHAR}, sections_code = #{sectionsCode,jdbcType=VARCHAR},
stand_code = #{standCode,jdbcType=VARCHAR}, stand_code = #{standCode,jdbcType=VARCHAR},
next_stand_code = #{nextStandCode,jdbcType=VARCHAR}, next_stand_code = #{nextStandCode,jdbcType=VARCHAR},
pre_stand_code = #{preStandCode,jdbcType=VARCHAR}, pre_stand_code = #{preStandCode,jdbcType=VARCHAR},
route_code = #{routeCode,jdbcType=VARCHAR} route_code = #{routeCode,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>