包机组修改

whyclxw

2025-05-15 37e56e8a613c66a6f047a5b3c0b194d1eed83762

包机组修改

 src/main/java/com/whyc/controller/BaojiGroupController.java

@@ -52,7 +52,7 @@
    }

    @GetMapping("stationList")
    @ApiOperation(value = "已添加机房锁和未添加机房电源")
    @ApiOperation(value = "已添加机房电源和未添加机房电源")
    public Response<Map<String,List<PowerInf>>> getStationList(@RequestParam int id){
        Map<String,List<PowerInf>> resultMap = service.getStationList(id);
        return new Response().setII(1,resultMap.size()>0,resultMap,"已添加机房锁和未添加机房电源");

 src/main/resources/mapper/BaojigroupPowerMapper.xml

@@ -4,7 +4,7 @@

    <delete id="deleteStationAndLockList">
        <foreach collection="list" item="item" separator=";">
            delete from db_user.tb_baojigroup_power where baoji_id = #{item.baojiId} and
            delete from db_user.tb_baojigroup_power where baoji_group_id = #{item.baojiId} and
            station_id = #{item.stationId} and power_id=#{item.powerId}
        </foreach>
    </delete>
@@ -14,14 +14,14 @@
        where
              tb_baojigroup_power.station_id=tb_station_inf.station_id
              and tb_baojigroup_power.power_id=tb_power_inf.power_id
              and baoji_id=#{id}
        order by tb_baojigroup_power.baoji_id asc ,tb_baojigroup_power.station_id asc,tb_baojigroup_power.power_id asc
              and baoji_group_id=#{id}
        order by tb_baojigroup_power.baoji_group_id asc ,tb_baojigroup_power.station_id asc,tb_baojigroup_power.power_id asc
    </select>
    <select id="getHomeStationAndLock" resultType="com.whyc.pojo.db_user.BaojigroupPower">
        select distinct tb_baojigroup_power.station_id,tb_baojigroup_power.power_id
        from db_user.tb_baojigroup_power,db_user.tb_baojigroup_usr
       <where>
           tb_baojigroup_power.baoji_id=tb_baojigroup_usr.baoji_id
           tb_baojigroup_power.baoji_group_id=tb_baojigroup_usr.baoji_group_id
           <if test="uid>100">
               and tb_baojigroup_usr.uid=#{uid}
           </if>
@@ -31,7 +31,7 @@
        select distinct tb_baojigroup_power.power_id
        from db_user.tb_baojigroup_power
        <where>
            tb_baojigroup_power.baoji_id=#{baojiId}
            tb_baojigroup_power.baoji_group_id=#{baojiId}
          and tb_baojigroup_power.station_id=#{stationId}
        </where>
    </select>
@@ -39,16 +39,14 @@
        select distinct l.power_id,l.power_name,l.station_id,s.station_name
        from db_user.tb_baojigroup_power bl ,db_station.tb_power_inf l,db_station.tb_station_inf s
        where bl.power_id = l.power_id and bl.station_id = s.station_id
        and l.del_flag=0
        and bl.baoji_id = #{id}
        and bl.baoji_group_id = #{id}
        order by s.station_name
    </select>
    <select id="getPowerList" resultType="com.whyc.pojo.db_station.PowerInf">
        select distinct l.power_id,l.power_name,l.station_id,s.station_name
        from db_user.tb_baojigroup_power bl ,db_station.tb_power_inf l,db_station.tb_station_inf s
        where bl.power_id = l.power_id and bl.station_id = s.station_id
        and l.del_flag=0
        and bl.baoji_id = #{id}
        and bl.baoji_group_id = #{id}
        order by s.station_name
    </select>
</mapper>

 src/main/resources/mapper/BaojigroupUsrMapper.xml

@@ -8,16 +8,16 @@
        </foreach>
    </delete>
    <select id="getALlUsrByBjId" resultType="com.whyc.pojo.db_user.BaojigroupUsr">
        select tb_baojigroup_usr.*,tb_user_inf.uname
        from db_user.tb_baojigroup_usr,db_user.tb_user_inf
        where tb_baojigroup_usr.uid=tb_user_inf.uid
        and   baoji_id = #{id}
        select tb_baojigroup_usr.*,tb_user.name
        from db_user.tb_baojigroup_usr,db_user.tb_user
        where tb_baojigroup_usr.uid=tb_user.id
        and   baoji_group_id = #{id}
    </select>
    <select id="getUserList" resultType="com.whyc.pojo.db_user.User">
        select u.uid,u.uname from db_user.tb_baojigroup_usr bu,db_user.tb_user_inf u
        where bu.uid = u.uid
          and bu.baoji_id = #{id}
          and u.uid>100
        select u.id,u.name from db_user.tb_baojigroup_usr bu,db_user.tb_user u
        where bu.uid = u.id
          and bu.baoji_group_id = #{id}
          and u.id>100
    </select>
    <select id="getGroupFlag" resultType="java.lang.Integer">
        select b.team_flag from db_user.tb_baojigroup_usr bu,db_user.tb_baojigroup b