修改

lxw

2023-04-11 dfa731785b57c7211f5912a1b54c9ff0d083cb8f

修改

 src/main/java/com/whyc/dto/result/DischargeState.java

New file
@@ -0,0 +1,27 @@
package com.whyc.dto.result;

import com.whyc.pojo.BattRtstate;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.ToString;

@Data
@AllArgsConstructor
@NoArgsConstructor
@ToString
public class DischargeState {
    private int battGroupId;
    private String stationId;
    private String stationName;
    private String stationName1;
    private String stationName2;
    private String stationName3;
    private String stationName4;
    private String stationName5;
    private int nodeStation;
    private String fbsDeviceName;
    private int devId;
    private int devWorkstate;
    private BattRtstate rtstate;
}

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

@@ -1,5 +1,6 @@
package com.whyc.mapper;

import com.whyc.dto.result.DischargeState;
import com.whyc.pojo.Battinf;
import com.whyc.pojo.Fbs9100State;
import org.apache.ibatis.annotations.Param;
@@ -29,7 +30,7 @@


        //今日放电站点统计
        List<Fbs9100State> getChargeStaticToday(int userId);
        List<DischargeState> getChargeStaticToday(int userId);

        //实时停电放电
        int getJcAnalysis(int userId);

 src/main/java/com/whyc/pojo/Fbs9100State.java

@@ -134,8 +134,6 @@
    private String deviceName;
    @TableField(exist = false)
    private String note;
    @TableField(exist = false)
    private Integer battTestTLong;

    @ApiModelProperty("")
    private Float a059GroupVol1;

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

@@ -6,6 +6,7 @@
import com.github.pagehelper.PageInfo;
import com.whyc.constant.DeviceConstant;
import com.whyc.dto.Response;
import com.whyc.dto.result.DischargeState;
import com.whyc.mapper.BattInfMapper;
import com.whyc.mapper.BattRtstateMapper;
import com.whyc.mapper.Fbs9100StateMapper;
@@ -221,27 +222,24 @@
    public Response getChargeStaticToday(int userId) {
        try {
            Map<String, Object> map = new HashMap<>();
            List<Fbs9100State> list = mapper.getChargeStaticToday(userId);
            List<DischargeState> list = mapper.getChargeStaticToday(userId);
            Map<String, Object> stateMap = new HashMap<>();
            Map<String, Object> stateNumMap = new HashMap<>();
            stateNumMap.put("state2", 0);
            stateNumMap.put("state3", 0);
            stateMap.put("state2", new ArrayList<>());
            stateMap.put("state3", new ArrayList<>());
            Map<Integer, List<Fbs9100State>> stateDisMap = list.stream().collect(Collectors.groupingBy(Fbs9100State::getDevWorkstate));
            Map<Integer, List<DischargeState>> stateDisMap = list.stream().collect(Collectors.groupingBy(DischargeState::getDevWorkstate));
            for (Integer workState : stateDisMap.keySet()) {
                if (workState == 2 || workState == 3) {
                    stateNumMap.put("state" + workState, stateDisMap.get(workState).size());
                    List<Fbs9100State> worklist = stateDisMap.get(workState);
                    for (Fbs9100State state : worklist) {
                    List<DischargeState> worklist = stateDisMap.get(workState);
                    /*for (DischargeState state : worklist) {
                        int battgroupId = 0;
                        int battTestLong = 0;
                        battgroupId = binfMapper.searchBattGroupId(state.getStationId());
                        state.setBattGroupId(battgroupId);
                        //根据电池组查询时长
                        battTestLong = rtstateMapper.selectBattTestLong(battgroupId);
                        state.setBattTestTLong(battTestLong);
                    }
                    }*/
                    stateMap.put("state" + workState, worklist);
                }
            }

 src/main/resources/mapper/Fbs9100StateMapper.xml

@@ -183,22 +183,41 @@
        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.*,
    <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="StationName" property="stationName"></result>
        <result column="StationName1" property="stationName1"></result>
        <result column="StationName2" property="stationName2"></result>
        <result column="StationName3" property="stationName3"></result>
        <result column="StationName4" property="stationName4"></result>
        <result column="StationName5" property="stationName5"></result>
        <result column="FBSDeviceName" property="fbsDeviceName"></result>
        <result column="nodeStation" property="nodeStation"></result>
        <collection property="rtstate" javaType="com.whyc.pojo.BattRtstate" ofType="com.whyc.pojo.BattRtstate"
                    column="{battGroupId=battGroupId}" select="selectBattTestLong">
        </collection>
    </resultMap>
    <select id="getChargeStaticToday" resultMap="chargeStatic">
        select tb_fbs9100_state.dev_workstate,
               tb_battinf.StationName,
               tb_battinf.StationName1,
               tb_battinf.StationName2,
               tb_battinf.StationName3,
               tb_battinf.StationName4,
               tb_battinf.StationName5,
               tb_battinf.NodeStation,
               tb_battinf.nodeStation,
               tb_battinf.FBSDeviceName,
               tb_battinf.battGroupId,
               tb_battinf.stationId
        from db_ram_db.tb_fbs9100_state,
             db_battinf.tb_battinf
        where tb_fbs9100_state.dev_id = tb_battinf.FBSDeviceId
          and TO_DAYS(record_datetime) = TO_DAYS(NOW())
          and tb_battinf.GroupIndexInFBSDevice = 0
          and tb_fbs9100_state.dev_id in (select distinct db_battinf.tb_battinf.FBSDeviceId
                                          from db_battinf.tb_battinf
                                             , db_user.tb_user_battgroup_baojigroup_battgroup
@@ -211,6 +230,11 @@
                                            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="selectBattTestLong" resultType="battRtstate">
        select distinct(tb_batt_rtstate.*)
        from db_ram_db.tb_batt_rtstate
        where battGroupId = #{battgroupId}
    </select>
    <select id="getJcAnalysis" resultType="java.lang.Integer">
        select count(dev_id)
        from db_ram_db.tb_fbs9100_state