whyczh
2022-01-21 bd3800806d529f17aab0ef36a09ea272ac92f676
首页接口更新(/fg/battMapInformation/multAmout)
3个文件已修改
55 ■■■■■ 已修改文件
src/main/java/com/whyc/mapper/BattdischargePlanMapper.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BattMapInformationService.java 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BattdischargePlanMapper.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/BattdischargePlanMapper.java
@@ -17,4 +17,7 @@
    //创建计划-创建计划
    int addPro(@Param("list")List<BattdischargePlan> list);
    int searchByStationId(@Param("stationId") String stationId);
}
src/main/java/com/whyc/service/BattMapInformationService.java
@@ -3,19 +3,24 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.whyc.dto.Response;
import com.whyc.mapper.BattMapInformationMapper;
import com.whyc.mapper.BattdischargePlanMapper;
import com.whyc.pojo.BattMapInformation;
import com.whyc.pojo.BattalarmData;
import com.whyc.pojo.Battinf;
import org.apache.commons.collections.map.HashedMap;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
@Service
public class BattMapInformationService {
    @Resource
    private BattMapInformationMapper mapper;
    private BattdischargePlanMapper battdischargePlanMapper;
    @Resource
    private BadBattMonService badBattMonService;
@@ -73,7 +78,6 @@
    public Response multiAmount(String stationId){
        Response model = new Response();
        String state="";
        int numBadBatt=0;//落后总数
        int numAlarm=0;//告警总数
@@ -94,27 +98,23 @@
        }
        String battAlarmStr = battAlarmConfirmed+","+battAlarmNoConfirmed;
        //todo 延迟总数
//        numPlan=(new BattDischarge_planImpl()).serchByStationId(binformation);    //延迟总数
//        if(numBadBatt>0){
//            state="item-behind";                                    //落后机房
//        }else{
//            if(numAlarm > 0){
//                state="item-warn";                                //告警机房
//            }else{
//                if(numPlan > 0){
//                    state="item-timeout";                        //延迟机房
//                }
//            }
//        }
        //}
        //model.setCode(numAlarm);        //告警总数
        model.setMsg(battAlarmStr);        //告警总数
//        model.setSum(numBadBatt);        //落后总数
//        model.setNewsum(numPlan);        //延时总数
        // model.setMsg(state);            //61850状态
        // model.setMsgN(binformation.getFBSDeviceId().toString());
        return model;
        numPlan=battdischargePlanMapper.searchByStationId(stationId);    //延迟总数
        if(numBadBatt>0){
            state="item-behind";                                    //落后机房
        }else{
            if(numAlarm > 0){
                state="item-warn";                                //告警机房
            }else{
                if(numPlan > 0){
                    state="item-timeout";                        //延迟机房
                }
            }
        }
        Map<String,Object> map = new HashedMap();
        map.put("battAlarmStr",battAlarmStr);
        map.put("numBadBatt",numBadBatt);
        map.put("numPlan",numAlarm);
        return new Response().set(1,map,"查询成功");
    }
src/main/resources/mapper/BattdischargePlanMapper.xml
@@ -97,6 +97,14 @@
            AND battgroupid in (select battgroupid FROM db_battinf.tb_battinf where stationname=#{stationName} );
        </where>
    </select>
    <!--查询机房放电计划中存在放电延时的总数
        地图上所有的放电延时机房  discharge_state=BattTestData.test_plan1 0:未放电,1:放电延时,2:放电完成,3:放电进行中,4:放电失败-->
    <select id="searchByStationId" resultType="java.lang.Integer">
        select count(num) as nums  from web_site.tb_battdischarge_plan
        where
            battgroupid in (select distinct battgroupid from db_battinf.tb_battinf where stationid=#{stationId} )
            and discharge_state = 1 limit 1
    </select>
    <insert id="addPro">
        insert into web_site.tb_battdischarge_plan(battgroupid,battIndexInFbs,discharge_starttime,discharge_state,discharge_reason,discharge_cleartype,preset_time,preset_cap,preset_monvol,preset_groupvol,preset_curr,preset_mon,dcvolhighlimit,chargecurrset,plan_circle,plan_rate)