修改

lxw

2023-04-11 4ffa397a849182f556032ef5d8f5894f15446051

修改

 src/main/java/com/whyc/mapper/BattRtstateMapper.java

@@ -46,7 +46,5 @@

    //查询分组电池信息
    List<SystemGrdoupBatt> selectSystemGrdoupBatt(String stationId);

    //根据电池组查询时长
    int selectBattTestLong(int battgroupId);
    
}

 src/main/java/com/whyc/service/Fbs9100StateService.java

@@ -234,12 +234,6 @@
                if (workState == 2 || workState == 3) {
                    stateNumMap.put("state" + workState, stateDisMap.get(workState).size());
                    List<DischargeState> worklist = stateDisMap.get(workState);
                    /*for (DischargeState state : worklist) {
                        int battgroupId = 0;
                        int battTestLong = 0;
                        battgroupId = binfMapper.searchBattGroupId(state.getStationId());
                        state.setBattGroupId(battgroupId);
                    }*/
                    stateMap.put("state" + workState, worklist);
                }
            }

 src/main/resources/mapper/BattRtstateMapper.xml

@@ -416,11 +416,6 @@
    where tb_batt_rtstate.BattGroupId = tb_battinf.BattGroupId
      and tb_battinf.stationid = #{stationId}
  </select>
  <select id="selectBattTestLong" resultType="java.lang.Integer">
    select distinct(batt_test_tlong)
    from db_ram_db.tb_batt_rtstate
    where BattGroupId = #{battgroupId} limit 1
  </select>


</mapper>

 src/main/resources/mapper/Fbs9100StateMapper.xml

@@ -188,7 +188,7 @@
    <resultMap id="chargeStatic" type="com.whyc.dto.result.DischargeState">
        <result column="battGroupId" property="battGroupId"></result>
        <result column="stationId" property="stationId"></result>
        <result column="dev_workstate" property="stationId"></result>
        <result column="dev_workstate" property="devWorkstate"></result>
        <result column="StationName" property="stationName"></result>
        <result column="StationName1" property="stationName1"></result>
        <result column="StationName2" property="stationName2"></result>
@@ -231,9 +231,9 @@
                                            and db_user.tb_user_inf.uid = #{userId})
    </select>
    <select id="selectBattTestLong" resultType="battRtstate">
        select distinct(tb_batt_rtstate.*)
        select tb_batt_rtstate.*
        from db_ram_db.tb_batt_rtstate
        where battGroupId = #{battgroupId}
        where battGroupId = #{battGroupId} limit 1
    </select>
    <select id="getJcAnalysis" resultType="java.lang.Integer">
        select count(dev_id)