预警分析管理

whyclxw

3 天以前 a4e25fc0cd113518980305af3c061892b1b24b14

预警分析管理

 src/main/java/com/whyc/constant/AnalysisEnum.java

New file
@@ -0,0 +1,49 @@
package com.whyc.constant;

import java.util.HashMap;
import java.util.Map;

public enum AnalysisEnum {
    ALARM_1(1,"直流电源"),
    ALARM_2(2,"通信电源"),
    ALARM_3(3,"配网电源"),
    ALARM_4(4,"蓄电池组"),
    ALARM_5(5,"设备"),
    ALARM_6(6,"ups电源"),
    ;

    private Integer stateId;
    private String stateName;

    AnalysisEnum(Integer stateId, String stateName) {
        this.stateId = stateId;
        this.stateName = stateName;
    }

    public Integer getStateId() {
        return stateId;
    }

    public String getStateName() {
        return stateName;
    }

    public static String getValue(Integer stateId) {
        if(stateId==null){
            return "";
        }
        for (AnalysisEnum ele : values()) {
            if(ele.getStateId().equals(stateId)) {
                return ele.getStateName();
            }
        }
        return null;
    }
    public static Map<Integer,String> getOpInfo() {
        Map<Integer,String> map=new HashMap<>();
        for (AnalysisEnum logOpEnum : AnalysisEnum.values()) {
            map.put(logOpEnum.getStateId(),logOpEnum.getStateName());
        }
        return map;
    }
}

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

New file
@@ -0,0 +1,48 @@
package com.whyc.controller;

import com.whyc.dto.Response;
import com.whyc.dto.Statistic.BattCompareStic;
import com.whyc.pojo.db_user.User;
import com.whyc.service.BatttestdataInfService;
import com.whyc.util.ActionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
@Api(tags = "蓄电池对比分析管理")
@RequestMapping("compare")
public class BattCompareController {

    @Autowired
    private BatttestdataInfService battTinfService;


    @ApiOperation(value = "蓄电池组对比分析界面（同一品牌同一时间）(1.2.15)")
    @PostMapping("getBattCompare15Statistic")
    public Response getBattCompare15Statistic(@RequestBody BattCompareStic stic){
        User uinf= ActionUtil.getUser();
        stic.setUid(uinf.getId());
        return battTinfService.getBattCompare15Statistic(stic);
    }

    @ApiOperation(value = "蓄电池组对比分析界面（不同品牌同一时间）(1.2.16)")
    @PostMapping("getBattCompare16Statistic")
    public Response getBattCompare16Statistic(@RequestBody BattCompareStic stic){
        User uinf= ActionUtil.getUser();
        stic.setUid(uinf.getId());
        return battTinfService.getBattCompare16Statistic(stic);
    }

    @ApiOperation(value = "蓄电池组对比分析界面（同一品牌不同时间）(1.2.17)")
    @PostMapping("getBattCompare17Statistic")
    public Response getBattCompare17Statistic(@RequestBody BattCompareStic stic){
        User uinf= ActionUtil.getUser();
        stic.setUid(uinf.getId());
        return battTinfService.getBattCompare17Statistic(stic);
    }
}

 src/main/java/com/whyc/pojo/db_param/AlmAnalysisParam.java

@@ -1,6 +1,7 @@
package com.whyc.pojo.db_param;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -41,11 +42,17 @@
    @ApiModelProperty(value = "主字段类型[1:直流，2：通信，3配网  4:电池 5:设备]")
    private Integer mainFieldType;

    @TableField(exist = false)
    private String mainFieldTypeName;

    @ApiModelProperty(value = "次要字段1参考配置")
    private String minorField1;

    @ApiModelProperty(value = "字段1类型[1:直流，2：通信，3配网  4:电池 5:设备]")
    private Integer minorField1Type;

    @TableField(exist = false)
    private String minorField1TypeName;

    @ApiModelProperty(value = "次要字段2参考配置")
    private String minorField2;
@@ -53,17 +60,26 @@
    @ApiModelProperty(value = "字段2类型[1:直流，2：通信，3配网  4:电池 5:设备]")
    private Integer minorField2Type;

    @TableField(exist = false)
    private String minorField2TypeName;

    @ApiModelProperty(value = "次要字段3参考配置")
    private String minorField3;

    @ApiModelProperty(value = "字段3类型[1:直流，2：通信，3配网  4:电池 5:设备]")
    private Integer minorField3Type;

    @TableField(exist = false)
    private String minorField3TypeName;

    @ApiModelProperty(value = "次要字段4参考配置")
    private String minorField4;

    @ApiModelProperty(value = "字段4类型[1:直流，2：通信，3配网  4:电池 5:设备]")
    private Integer minorField4Type;

    @TableField(exist = false)
    private String minorField4TypeName;


}

 src/main/java/com/whyc/pojo/db_param/AlmSummaryParam.java

@@ -1,6 +1,7 @@
package com.whyc.pojo.db_param;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -35,6 +36,10 @@
    @ApiModelProperty(value = "字段类型[1:直流，2：通信，3配网  4:电池 5:设备]")
    private Integer fieldType;

    @ApiModelProperty(value = "字段类型[1:直流，2：通信，3配网  4:电池 5:设备]")
    @TableField(exist = false)
    private String fieldTypeName;

    @ApiModelProperty(value = "字段属性")
    private String fieldName;


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

@@ -1,6 +1,7 @@
package com.whyc.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.whyc.constant.AnalysisEnum;
import com.whyc.dto.AnalysisAlm.AnalysisChangeRes;
import com.whyc.dto.AnalysisAlm.ResAnalysis;
import com.whyc.dto.Real.RealDateDTO;
@@ -47,6 +48,13 @@
        wrapper.eq("alm_id",almId);
        wrapper.last("limit 1");
        AlmAnalysisParam param= mapper.selectOne(wrapper);
        if(param!=null){
            param.setMainFieldTypeName(AnalysisEnum.getValue(param.getMainFieldType()));
            param.setMinorField1TypeName(AnalysisEnum.getValue(param.getMinorField1Type()));
            param.setMinorField2TypeName(AnalysisEnum.getValue(param.getMinorField2Type()));
            param.setMinorField3TypeName(AnalysisEnum.getValue(param.getMinorField3Type()));
            param.setMinorField4TypeName(AnalysisEnum.getValue(param.getMinorField4Type()));
        }
        return param;
    }

@@ -67,6 +75,7 @@
        if(almAnalysisParam==null||almAnalysisParam.getMainFieldType()==null){
            return new Response().set(1,false,"无对应分析属性");
        }else{

            //分组查看需要查询电源/电池实时表的哪些数据
            Map<String,  Map<String,Object>> groupmap=groupPwrAndBatt(almAnalysisParam);
            Map<String,Object> battMap=groupmap.get("batt");
@@ -262,6 +271,9 @@
    public Response getAlmSummaryParam() {
        //总的属性配置
        List<AlmSummaryParam> summaryList=summaryParamService.getInfo();
        summaryList.forEach(item->{
            item.setFieldTypeName(AnalysisEnum.getValue(item.getFieldType()));
        });
        return new Response().setII(1,true,summaryList,"预警分析管理-查询所有的属性对应关系");
    }
}

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

@@ -278,7 +278,6 @@
                if(param.getParamNamePsx().equals("batt_mon_damage_val")){
                    damageValue=param.getParamValue();
                }

            }
        }
        //1查询符合条件的电池组

 src/main/resources/mapper/BattInfMapper.xml

@@ -231,6 +231,12 @@
            <if test="stic.product!=null">
                and tb_batt_inf.product=#{stic.product}
            </if>
            <if test="stic.inuseStartTime!=null">
                and tb_batt_inf.inuse_time>=#{stic.inuseStartTime}
            </if>
            <if test="stic.inuseEndTime!=null">
                and tb_batt_inf.inuse_time&lt;=#{stic.inuseEndTimee}
            </if>
            <if test="stic.uid>100">
                and tb_batt_inf.station_id in(
                select distinct station_id from db_user.tb_baojigroup_power,db_user.tb_baojigroup_usr