whycxzp
2023-04-07 c72f6f13083d59cfb995fbe1cb48d7a27e775959
设备状态排除ZJDYBTSE2协议
3个文件已修改
28 ■■■■■ 已修改文件
src/main/java/com/whyc/mapper/Fbs9100StateMapper.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/Fbs9100StateService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/Fbs9100StateMapper.xml 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/Fbs9100StateMapper.java
@@ -25,6 +25,9 @@
        //首页上点击核容放电站
        List<Battinf> searchCheckCapDischarge(String uId);
        List<Fbs9100State> getListWithoutZJDYBTSE2(int userId);
        //今日放电站点统计
        List<Fbs9100State> getChargeStaticToday(int userId);
}
src/main/java/com/whyc/service/Fbs9100StateService.java
@@ -158,9 +158,10 @@
            response.setCode(0);
            return response;
        }*/
            QueryWrapper<Fbs9100State> wrapper = Wrappers.query();
            /*QueryWrapper<Fbs9100State> wrapper = Wrappers.query();
            wrapper.select("record_datetime", "dev_workstate");
            List<Fbs9100State> fbs9100StateList = mapper.selectList(wrapper);
            List<Fbs9100State> fbs9100StateList = mapper.selectList(wrapper);*/
            List<Fbs9100State> fbs9100StateList = mapper.getListWithoutZJDYBTSE2(userId);
            //首先查看是否通讯故障,时间大于1分钟为通讯故障
            for (int i = 0; i < fbs9100StateList.size(); i++) {
                Calendar instance = Calendar.getInstance();
src/main/resources/mapper/Fbs9100StateMapper.xml
@@ -165,6 +165,26 @@
                                            and db_user.tb_user_inf.uid = #{uId}
        )
    </select>
    <select id="getListWithoutZJDYBTSE2" resultType="com.whyc.pojo.Fbs9100State">
        select state.*
        from db_ram_db.tb_fbs9100_state state,
        db_battinf.tb_battinf battInf
        where state.dev_id = battInf.fbsdeviceId
        and battInf.FBSDeviceName != "ZJDYBTSE2"
        and state.dev_id in (select distinct db_battinf.tb_battinf.fbsdeviceId
        from db_battinf.tb_battinf
        , db_user.tb_user_battgroup_baojigroup_battgroup
        , db_user.tb_user_battgroup_baojigroup_usr
        , db_user.tb_user_inf
        where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId =
        db_battinf.tb_battinf.BattGroupId
        and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id =
        db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id
        and db_user.tb_user_inf.uid =
        db_user.tb_user_battgroup_baojigroup_usr.uid
        and db_user.tb_user_inf.uid = #{userId}
        )
    </select>
    <select id="getChargeStaticToday" resultType="com.whyc.pojo.Fbs9100State">
        select tb_fbs9100_state.*,
               tb_battinf.StationName,