修改逻辑

whyclxw

2024-12-10 88ed0e2971154580635fd33f3073e3a26f52fc3a

修改逻辑

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

@@ -1,8 +1,8 @@
package com.whyc.controller;

import com.whyc.dto.Response;
import com.whyc.pojo.AlarmParam;
import com.whyc.service.AlarmParamService;
import com.whyc.pojo.db_param.BattalarmParam;
import com.whyc.service.BattalarmParamService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +16,7 @@
public class AlarmParamController {

    @Autowired
    private AlarmParamService service;
    private BattalarmParamService service;


    @ApiOperation("电池告警参数设置--列表查询")
@@ -33,7 +33,7 @@

    @ApiOperation("告警参数设置")
    @PostMapping("setParam")
    public Response setParam(@RequestBody List<AlarmParam> list) {
    public Response setParam(@RequestBody List<BattalarmParam> list) {
        return service.setParam(list);
    }
}

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

@@ -2,7 +2,7 @@


import com.whyc.dto.Response;
import com.whyc.pojo.UserInf;
import com.whyc.pojo.db_user.UserInf;
import com.whyc.service.UserInfService;
import com.whyc.util.UserUtil;
import io.swagger.annotations.Api;

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

@@ -1,14 +1,12 @@
package com.whyc.controller;

import com.whyc.dto.Response;
import com.whyc.pojo.MonInf;
import com.whyc.pojo.db_batt.MonInf;
import com.whyc.service.MonInfService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;

@RequestMapping("mon")
@RestController

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

@@ -1,7 +1,7 @@
package com.whyc.controller;

import com.whyc.dto.Response;
import com.whyc.pojo.MonPlan;
import com.whyc.pojo.db_batt.MonPlan;
import com.whyc.service.MonPlanService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

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

@@ -1,7 +1,7 @@
package com.whyc.controller;

import com.whyc.dto.Response;
import com.whyc.pojo.OperationLog;
import com.whyc.pojo.db_user.OperationLog;
import com.whyc.service.OperationLogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

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

@@ -1,7 +1,7 @@
package com.whyc.controller;

import com.whyc.dto.Response;
import com.whyc.pojo.UserInf;
import com.whyc.pojo.db_user.UserInf;
import com.whyc.service.UserInfService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

 src/main/java/com/whyc/filter/RolesOrAuthorizationFilter.java

@@ -1,6 +1,6 @@
package com.whyc.filter;

import com.whyc.pojo.UserInf;
import com.whyc.pojo.db_user.UserInf;
import org.apache.shiro.subject.Subject;
import org.apache.shiro.util.CollectionUtils;
import org.apache.shiro.web.filter.authz.AuthorizationFilter;

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

File was deleted

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

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

import com.whyc.pojo.BattAlarmHis;
import com.whyc.pojo.db_alarm.BattAlarmHis;

public interface BattAlarmHisMapper extends CustomMapper<BattAlarmHis>{
}

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

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

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.whyc.pojo.BattAlarm;
import com.whyc.pojo.db_alarm.BattAlarm;

import java.util.Date;
import java.util.List;

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

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

import com.whyc.pojo.BattTestInfData;
import com.whyc.pojo.db_dis_batt.BattTestInfData;

public interface BattTestInfDataMapper extends CustomMapper<BattTestInfData>{
}

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

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

import com.whyc.pojo.BattTestInf;
import com.whyc.pojo.db_dis_batt.BattTestInf;

import java.util.Date;
import java.util.List;

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

New file
@@ -0,0 +1,13 @@
package com.whyc.mapper;

import com.whyc.pojo.db_param.BattalarmParam;

import java.util.List;

public interface BattalarmParamMapper extends CustomMapper<BattalarmParam>{

    //电池告警参数设置--列表查询
    List<BattalarmParam> serchByCondition(List alarmIds);

    List<Float> getParamInfoList(int alarmId,int alarmId2);
}

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

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

import com.whyc.pojo.MonInf;
import com.whyc.pojo.db_batt.MonInf;

public interface MonInfMapper extends CustomMapper<MonInf>{
    //查询最大的单体编号

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

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

import com.whyc.pojo.MonPlan;
import com.whyc.pojo.db_batt.MonPlan;

public interface MonPlanMapper extends CustomMapper<MonPlan>{
}

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

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

import com.whyc.mapper.CustomMapper;
import com.whyc.pojo.OperationLog;
import com.whyc.pojo.db_user.OperationLog;

public interface OperationLogMapper extends CustomMapper<OperationLog> {
}

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

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

import com.whyc.pojo.PowerInf;
import com.whyc.pojo.db_batt.PowerInf;

public interface PowerInfMapper extends CustomMapper<PowerInf>{
}

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

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

import com.whyc.pojo.PowerRealRt1;
import com.whyc.pojo.db_power_rt.PowerRealRt1;

public interface PowerRealRt1Mapper extends CustomMapper<PowerRealRt1>{
}

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

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

import com.whyc.pojo.PowerRealRt2;
import com.whyc.pojo.db_power_rt.PowerRealRt2;

public interface PowerRealRt2Mapper extends CustomMapper<PowerRealRt2>{
}

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

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

import com.whyc.pojo.PowerRealRt3;
import com.whyc.pojo.db_power_rt.PowerRealRt3;

public interface PowerRealRt3Mapper extends CustomMapper<PowerRealRt3>{
}

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

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

import com.whyc.pojo.RtData;
import com.whyc.pojo.db_real_batt.RtData;

/**
 * packageName com.whyc.mapper

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

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

import com.whyc.pojo.RtEnvirment;
import com.whyc.pojo.db_real_batt.RtEnvirment;

public interface RtEnvirmentMapper extends CustomMapper<RtEnvirment>{
}

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

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

import com.whyc.pojo.RtState;
import com.whyc.pojo.db_real_batt.RtState;

/**
 * packageName com.whyc.mapper

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

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

import com.whyc.pojo.StationInf;
import com.whyc.pojo.db_batt.StationInf;

import java.util.List;


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

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

import com.whyc.mapper.CustomMapper;
import com.whyc.pojo.UserInf;
import com.whyc.pojo.db_user.UserInf;
import org.apache.ibatis.annotations.Param;

import java.util.List;

 src/main/java/com/whyc/pojo/db_alarm/BattAlarm.java

File was renamed from src/main/java/com/whyc/pojo/BattAlarm.java
@@ -1,7 +1,8 @@
package com.whyc.pojo;
package com.whyc.pojo.db_alarm;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -27,6 +28,7 @@
    private Integer binfId;

    @TableField("alm_start_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty("告警开始时间")
    private Date almStartTime;

@@ -46,6 +48,19 @@
    @ApiModelProperty("告警值")
    private Float almValue;

    @TableField("alm_confirm")
    @ApiModelProperty("确认告警：0未确认,1已确认")
    private Integer almConfirm;

    @TableField("alm_confirm_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty("确认时间")
    private Date almConfirmTime;

    @TableField("alm_type")
    @ApiModelProperty("告警类型[1-上限告警 2-下限告警]")
    private Integer almType;

    @TableField(exist = false)
    @ApiModelProperty("电池组名称")
    private String binfName;

 src/main/java/com/whyc/pojo/db_alarm/BattAlarmHis.java

File was renamed from src/main/java/com/whyc/pojo/BattAlarmHis.java
@@ -1,4 +1,4 @@
package com.whyc.pojo;
package com.whyc.pojo.db_alarm;

import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;

 src/main/java/com/whyc/pojo/db_batt/MonInf.java

File was renamed from src/main/java/com/whyc/pojo/MonInf.java
@@ -1,4 +1,4 @@
package com.whyc.pojo;
package com.whyc.pojo.db_batt;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;

 src/main/java/com/whyc/pojo/db_batt/MonPlan.java

File was renamed from src/main/java/com/whyc/pojo/MonPlan.java
@@ -1,4 +1,4 @@
package com.whyc.pojo;
package com.whyc.pojo.db_batt;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;

 src/main/java/com/whyc/pojo/db_batt/PowerInf.java

File was renamed from src/main/java/com/whyc/pojo/PowerInf.java
@@ -1,4 +1,4 @@
package com.whyc.pojo;
package com.whyc.pojo.db_batt;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;

 src/main/java/com/whyc/pojo/db_batt/StationInf.java

File was renamed from src/main/java/com/whyc/pojo/StationInf.java
@@ -1,7 +1,8 @@
package com.whyc.pojo;
package com.whyc.pojo.db_batt;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.whyc.pojo.db_batt.PowerInf;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;

 src/main/java/com/whyc/pojo/db_dis_batt/BattTestInf.java

File was renamed from src/main/java/com/whyc/pojo/BattTestInf.java
@@ -1,4 +1,4 @@
package com.whyc.pojo;
package com.whyc.pojo.db_dis_batt;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;

 src/main/java/com/whyc/pojo/db_dis_batt/BattTestInfData.java

File was renamed from src/main/java/com/whyc/pojo/BattTestInfData.java
@@ -1,4 +1,4 @@
package com.whyc.pojo;
package com.whyc.pojo.db_dis_batt;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -79,4 +79,8 @@
    @TableField("mon_tmp")
    @ApiModelProperty("单体温度")
    private Float monTmp;

    @TableField("mon_res")
    @ApiModelProperty("单体内阻")
    private Float monRes;
}

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

File was renamed from src/main/java/com/whyc/pojo/AlarmParam.java
@@ -1,4 +1,4 @@
package com.whyc.pojo;
package com.whyc.pojo.db_param;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -23,9 +23,9 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName(schema ="db_param",value = "alarm_param")
@ApiModel(value="AlarmParam对象", description="")
public class AlarmParam implements Serializable {
@TableName(schema ="db_param",value = "battalarm_param")
@ApiModel(value="BattalarmParam", description="")
public class BattalarmParam implements Serializable {

    private static final long serialVersionUID = 1L;


 src/main/java/com/whyc/pojo/db_power_rt/PowerRealRt1.java

File was renamed from src/main/java/com/whyc/pojo/PowerRealRt1.java
@@ -1,4 +1,4 @@
package com.whyc.pojo;
package com.whyc.pojo.db_power_rt;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

 src/main/java/com/whyc/pojo/db_power_rt/PowerRealRt2.java

File was renamed from src/main/java/com/whyc/pojo/PowerRealRt2.java
@@ -1,4 +1,4 @@
package com.whyc.pojo;
package com.whyc.pojo.db_power_rt;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

 src/main/java/com/whyc/pojo/db_power_rt/PowerRealRt3.java

File was renamed from src/main/java/com/whyc/pojo/PowerRealRt3.java
@@ -1,4 +1,4 @@
package com.whyc.pojo;
package com.whyc.pojo.db_power_rt;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

 src/main/java/com/whyc/pojo/db_real_batt/RtData.java

File was renamed from src/main/java/com/whyc/pojo/RtData.java
@@ -1,4 +1,4 @@
package com.whyc.pojo;
package com.whyc.pojo.db_real_batt;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;

 src/main/java/com/whyc/pojo/db_real_batt/RtEnvirment.java

File was renamed from src/main/java/com/whyc/pojo/RtEnvirment.java
@@ -1,4 +1,4 @@
package com.whyc.pojo;
package com.whyc.pojo.db_real_batt;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;

 src/main/java/com/whyc/pojo/db_real_batt/RtState.java

File was renamed from src/main/java/com/whyc/pojo/RtState.java
@@ -1,4 +1,4 @@
package com.whyc.pojo;
package com.whyc.pojo.db_real_batt;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;

 src/main/java/com/whyc/pojo/db_user/OperationLog.java

File was renamed from src/main/java/com/whyc/pojo/OperationLog.java
@@ -1,4 +1,4 @@
package com.whyc.pojo;
package com.whyc.pojo.db_user;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;

 src/main/java/com/whyc/pojo/db_user/UserInf.java

File was renamed from src/main/java/com/whyc/pojo/UserInf.java
@@ -1,4 +1,4 @@
package com.whyc.pojo;
package com.whyc.pojo.db_user;

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;

 src/main/java/com/whyc/realm/CustomRealm.java

@@ -1,7 +1,7 @@
package com.whyc.realm;

import com.whyc.anotation.Realm;
import com.whyc.pojo.UserInf;
import com.whyc.pojo.db_user.UserInf;
import com.whyc.service.UserBridgeService;
import com.whyc.util.RSAUtil;
import org.apache.shiro.authc.*;

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

@@ -2,7 +2,7 @@

import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
import com.whyc.pojo.BattAlarmHis;
import com.whyc.pojo.db_alarm.BattAlarmHis;
import com.whyc.util.SubTablePageInfoUtil;
import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,20 +1,16 @@
package com.whyc.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
import com.whyc.mapper.BattAlarmMapper;
import com.whyc.pojo.BattAlarm;
import com.whyc.pojo.RtData;
import com.whyc.pojo.db_alarm.BattAlarm;
import com.whyc.util.ActionUtil;
import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.Date;
import java.util.List;

@Service

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

@@ -1,9 +1,8 @@
package com.whyc.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.whyc.dto.Response;
import com.whyc.mapper.BattTestInfDataMapper;
import com.whyc.pojo.BattTestInfData;
import com.whyc.pojo.db_dis_batt.BattTestInfData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;


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

File was renamed from src/main/java/com/whyc/service/AlarmParamService.java
@@ -4,8 +4,8 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
import com.whyc.mapper.AlarmParamMapper;
import com.whyc.pojo.AlarmParam;
import com.whyc.mapper.BattalarmParamMapper;
import com.whyc.pojo.db_param.BattalarmParam;
import com.whyc.util.ActionUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -16,9 +16,9 @@
import java.util.Map;

@Service
public class AlarmParamService {
public class BattalarmParamService {
    @Resource
    private AlarmParamMapper mapper;
    private BattalarmParamMapper mapper;

    //电池告警参数设置--列表查询
    public Response serchByCondition(List AlarmIds) {
@@ -30,12 +30,12 @@
    //查询电池优劣好坏的标准
    public Response serchQuality() {
        //0.查询劣化(告警)和损坏(更换)的阈值
        QueryWrapper<AlarmParam> alarmWrapper = new QueryWrapper();
        QueryWrapper<BattalarmParam> alarmWrapper = new QueryWrapper();
        alarmWrapper.and(wrapper -> {
            return wrapper.eq("alm_name", "Batt_Alarm_Type_CapAlarm").or().eq("alm_name", "Batt_Alarm_Type_CapChange");
        });
        alarmWrapper.orderByAsc("alm_id");
        List<AlarmParam> paramList = mapper.selectList(alarmWrapper);
        List<BattalarmParam> paramList = mapper.selectList(alarmWrapper);
        float capAlarm = 0f;
        float capChange = 0f;
        if (paramList != null && paramList.size() > 0) {
@@ -53,13 +53,13 @@

    //告警参数设置
    @Transactional
    public Response setParam(List<AlarmParam> list) {
    public Response setParam(List<BattalarmParam> list) {
        if (list != null && list.size() > 0) {
            for (AlarmParam p : list) {
            for (BattalarmParam p : list) {
                UpdateWrapper wrapper = new UpdateWrapper();
                wrapper.set("alm_low_coe", p.getAlmLowCoe());
                wrapper.eq("alm_id", p.getAlmId());
                mapper.update((AlarmParam) ActionUtil.objeNull, wrapper);
                mapper.update((BattalarmParam) ActionUtil.objeNull, wrapper);
            }
        }
        return new Response().set(1, true);

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

@@ -6,7 +6,7 @@
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
import com.whyc.mapper.MonInfMapper;
import com.whyc.pojo.MonInf;
import com.whyc.pojo.db_batt.MonInf;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

@@ -5,9 +5,8 @@
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
import com.whyc.mapper.MonPlanMapper;
import com.whyc.pojo.MonPlan;
import com.whyc.pojo.StationInf;
import com.whyc.pojo.UserInf;
import com.whyc.pojo.db_batt.MonPlan;
import com.whyc.pojo.db_user.UserInf;
import com.whyc.util.ActionUtil;
import org.springframework.stereotype.Service;


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

@@ -7,8 +7,8 @@
import com.whyc.constant.OperationLogEnum;
import com.whyc.dto.Response;
import com.whyc.mapper.OperationLogMapper;
import com.whyc.pojo.OperationLog;
import com.whyc.pojo.UserInf;
import com.whyc.pojo.db_user.OperationLog;
import com.whyc.pojo.db_user.UserInf;
import com.whyc.util.HttpUtil;
import com.whyc.util.UserUtil;
import org.springframework.stereotype.Service;

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

@@ -2,8 +2,8 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.whyc.mapper.*;
import com.whyc.pojo.PowerInf;
import com.whyc.pojo.RtData;
import com.whyc.pojo.db_batt.PowerInf;
import com.whyc.pojo.db_real_batt.RtData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;


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

@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.whyc.dto.Response;
import com.whyc.mapper.RtDataMapper;
import com.whyc.pojo.RtData;
import com.whyc.pojo.RtState;
import com.whyc.pojo.db_real_batt.RtData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;


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

@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.whyc.dto.Response;
import com.whyc.mapper.RtEnvirmentMapper;
import com.whyc.pojo.RtEnvirment;
import com.whyc.pojo.db_real_batt.RtEnvirment;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;


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

@@ -1,15 +1,12 @@
package com.whyc.service;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.whyc.dto.BattDTO;
import com.whyc.dto.Response;
import com.whyc.mapper.RtStateMapper;
import com.whyc.pojo.RtState;
import com.whyc.pojo.db_real_batt.RtState;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * packageName com.whyc.service

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

@@ -2,7 +2,7 @@

import com.whyc.dto.Response;
import com.whyc.mapper.StationInfMapper;
import com.whyc.pojo.StationInf;
import com.whyc.pojo.db_batt.StationInf;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;


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

@@ -1,8 +1,8 @@
package com.whyc.service;

import com.whyc.mapper.CallBack;
import com.whyc.pojo.BattAlarmHis;
import com.whyc.pojo.BattTestInfData;
import com.whyc.pojo.db_alarm.BattAlarmHis;
import com.whyc.pojo.db_dis_batt.BattTestInfData;
import com.whyc.util.ActionUtil;
import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;

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

@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.whyc.mapper.UserInfMapper;
import com.whyc.pojo.UserInf;
import com.whyc.pojo.db_user.UserInf;
import org.apache.shiro.authz.AuthorizationInfo;
import org.apache.shiro.authz.SimpleAuthorizationInfo;
import org.springframework.cache.CacheManager;

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

@@ -7,7 +7,7 @@
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
import com.whyc.mapper.UserInfMapper;
import com.whyc.pojo.UserInf;
import com.whyc.pojo.db_user.UserInf;
import com.whyc.util.MD5Util;
import com.whyc.util.RSAUtil;
import org.apache.shiro.SecurityUtils;

 src/main/java/com/whyc/util/ActionUtil.java

@@ -3,7 +3,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonSyntaxException;
import com.whyc.pojo.UserInf;
import com.whyc.pojo.db_user.UserInf;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import sun.misc.BASE64Decoder;

 src/main/java/com/whyc/util/SubTablePageInfoUtil.java

@@ -3,7 +3,7 @@
import com.github.pagehelper.PageInfo;
import com.whyc.factory.ThreadPoolExecutorFactory;
import com.whyc.mapper.CommonMapper;
import com.whyc.pojo.BattAlarmHis;
import com.whyc.pojo.db_alarm.BattAlarmHis;
import com.whyc.service.SubTableService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;

 src/main/java/com/whyc/util/UserUtil.java

@@ -1,7 +1,7 @@
package com.whyc.util;


import com.whyc.pojo.UserInf;
import com.whyc.pojo.db_user.UserInf;
import org.apache.shiro.SecurityUtils;

/**

 src/main/java/com/whyc/webSocket/BattSocket.java

@@ -1,25 +1,18 @@
package com.whyc.webSocket;

import com.whyc.config.WebSocketConfig;
import com.whyc.dto.Response;
import com.whyc.factory.ThreadPoolExecutorFactory;
import com.whyc.pojo.RtState;
import com.whyc.pojo.StationInf;
import com.whyc.service.*;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import javax.servlet.http.HttpSession;
import javax.websocket.*;
import javax.websocket.server.ServerEndpoint;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

/**
 * packageName com.whyc.websocket

 src/main/java/com/whyc/webSocket/PowerSocket.java

@@ -1,27 +1,14 @@
package com.whyc.webSocket;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.whyc.config.WebSocketConfig;
import com.whyc.dto.Response;
import com.whyc.factory.ThreadPoolExecutorFactory;
import com.whyc.pojo.PowerInf;
import com.whyc.pojo.RtState;
import com.whyc.pojo.StationInf;
import com.whyc.service.*;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import javax.servlet.http.HttpSession;
import javax.websocket.*;
import javax.websocket.server.ServerEndpoint;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

/**
 * packageName com.whyc.websocket

 src/main/resources/mapper/BattAlarmMapper.xml

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.whyc.mapper.BattAlarmMapper">

    <select id="getBattAlarm" resultType="com.whyc.pojo.BattAlarm">
    <select id="getBattAlarm" resultType="com.whyc.pojo.db_alarm.BattAlarm">
        select batt_alarm.*,batt_inf.binf_name from db_alarm.batt_alarm,db_batt.batt_inf
        <where>
            batt_alarm.binf_id=batt_inf.binf_id
@@ -14,7 +14,7 @@
            order by batt_alarm.alm_start_time asc
        </where>
    </select>
    <select id="getResBattAlm" resultType="com.whyc.pojo.BattAlarm">
    <select id="getResBattAlm" resultType="com.whyc.pojo.db_alarm.BattAlarm">
        select batt_alarm.*,power_inf.binf_name from db_alarm.batt_alarm,db_batt.power_inf
        <where>
            batt_alarm.binf_id=power_inf.binf_id
@@ -22,7 +22,7 @@
            order by batt_alarm.alm_start_time asc
        </where>
    </select>
    <select id="getAlm2" resultType="com.whyc.pojo.BattAlarm">
    <select id="getAlm2" resultType="com.whyc.pojo.db_alarm.BattAlarm">
        SELECT distinct *
        from db_alarm.tb_battalarm_data
        <where>

 src/main/resources/mapper/BattTestInfMapper.xml

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.whyc.mapper.BattTestInfMapper">

    <select id="searchDischargeTest" resultType="com.whyc.pojo.BattTestInf">
    <select id="searchDischargeTest" resultType="com.whyc.pojo.db_dis_batt.BattTestInf">
        select
        battgroupid,test_curr,max_monvol,min_monvol,test_cap,test_starttime,record_time,test_timelong,test_stoptype
        from db_dis_batt.batt_test_inf
@@ -20,7 +20,7 @@
        </where>
        ORDER BY db_dis_batt.batt_test_inf.BattGroupId asc, test_starttime desc
    </select>
    <select id="searchDischargeTest_WJ" resultType="com.whyc.pojo.BattTestInf">
    <select id="searchDischargeTest_WJ" resultType="com.whyc.pojo.db_dis_batt.BattTestInf">
        select
        battgroupid,test_curr,max_monvol,min_monvol,test_cap,test_starttime,record_time,test_timelong,test_stoptype
        from db_dis_batt.batt_test_inf
@@ -38,7 +38,7 @@
        </where>
        ORDER BY db_dis_batt.batt_test_inf.BattGroupId asc, test_starttime desc
    </select>
    <select id="searchDischarge" resultType="com.whyc.pojo.BattTestInf">
    <select id="searchDischarge" resultType="com.whyc.pojo.db_dis_batt.BattTestInf">
        select
        battgroupid,test_curr,max_monvol,min_monvol,test_cap,test_starttime,record_time,test_timelong,test_stoptype
        from db_dis_batt.batt_test_inf

 src/main/resources/mapper/BattalarmParamMapper.xml

File was renamed from src/main/resources/mapper/AlarmParamMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.whyc.mapper.AlarmParamMapper">
    <select id="serchByCondition" resultType="AlarmParam">
<mapper namespace="com.whyc.mapper.BattalarmParamMapper">
    <select id="serchByCondition" resultType="BattalarmParam">
        select num,alm_id,alm_name,alm_high_coe,alm_low_coe,alm_high_level,alm_low_level,alm_high_en,alm_low_en  from db_param.alarm_param
        <where>
            <if test="AlarmIds!=null and AlarmIds.size>0">

 src/main/resources/mapper/StationInfMapper.xml

@@ -5,7 +5,7 @@
    <resultMap id="sinfList" type="StationInf">
        <id property="sinfId" column="sinf_id"></id>
        <result property="sinfName" column="sinf_name"></result>
        <collection property="pinfList" javaType="java.util.ArrayList" ofType="com.whyc.pojo.PowerInf" column="{sinfId=sinf_id}" select="selectPinfList">
        <collection property="pinfList" javaType="java.util.ArrayList" ofType="com.whyc.pojo.db_batt.PowerInf" column="{sinfId=sinf_id}" select="selectPinfList">
        </collection>
    </resultMap>
    <select id="getAllSinf" resultMap="sinfList">