whycxzp
2025-03-14 1f7c4004dfa2d39e3b761ce4a833f47d7663f461
类名命名规范化
25 文件已重命名
6个文件已修改
4个文件已删除
4个文件已添加
212 ■■■■ 已修改文件
src/main/java/com/whyc/controller/AlarmParamController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/BattGroupBaojiGroupController.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/BattTestDataInfController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/DevAlarmDataHisController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/A200RealStateMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/A200RealstateMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/ActmRealStateMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/ActmRealstateMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/BaojiGroupMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/BattAlarmParamMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/BattGroupBaojiGroupMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/BattGroupUsrMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/BattRtDataMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/BattRtdataMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/BattTestDataIdMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/BattTestDataInfMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/BatttestdataIdMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/PowerAlarmParamMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/A200RealStateService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/ActmRealStateService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BaojiGroupService.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BattAlarmParamService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BattGroupBaojiGroupService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BattGroupUsrService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BattRtDataService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BattTestDataIdService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BattTestDataInfService.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/DevInfService.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/ExcelExportService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/PoweralarmParamService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/webSocket/DevRtStateSocket.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/webSocket/DevStaticSocket.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BaojiGroupMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BattAlarmParamMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BattGroupBaojiGroupMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BattGroupUsrMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BattTestDataIdMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BattTestDataInfMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/PowerAlarmParamMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/AlarmParamController.java
@@ -3,7 +3,7 @@
import com.whyc.dto.Response;
import com.whyc.pojo.db_param.BattalarmParam;
import com.whyc.pojo.db_param.PoweralarmParam;
import com.whyc.service.BattalarmParamService;
import com.whyc.service.BattAlarmParamService;
import com.whyc.service.PoweralarmParamService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -18,7 +18,7 @@
public class AlarmParamController {
    @Autowired
    private BattalarmParamService service;
    private BattAlarmParamService service;
    @Autowired
    private PoweralarmParamService powerService;
src/main/java/com/whyc/controller/BattGroupBaojiGroupController.java
File was renamed from src/main/java/com/whyc/controller/BattgroupBaojigroupController.java
@@ -3,9 +3,9 @@
import com.whyc.dto.BaojiDto;
import com.whyc.dto.Response;
import com.whyc.pojo.db_user.UserInf;
import com.whyc.service.BaojigroupService;
import com.whyc.service.BattgroupBaojigroupService;
import com.whyc.service.BattgroupUsrService;
import com.whyc.service.BaojiGroupService;
import com.whyc.service.BattGroupBaojiGroupService;
import com.whyc.service.BattGroupUsrService;
import com.whyc.util.ActionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -17,15 +17,15 @@
@RestController
@Api(tags = "包机组管理")
@RequestMapping("baoji")
public class BattgroupBaojigroupController {
public class BattGroupBaojiGroupController {
    @Autowired
    private BattgroupBaojigroupService groupService;
    private BattGroupBaojiGroupService groupService;
    @Autowired
    private BattgroupUsrService usrService;
    private BattGroupUsrService usrService;
    @Autowired
    private BaojigroupService baojiService;
    private BaojiGroupService baojiService;
    @ApiOperation(value = "添加包机组")
src/main/java/com/whyc/controller/BattTestDataInfController.java
File was renamed from src/main/java/com/whyc/controller/BatttestdataInfController.java
@@ -1,7 +1,7 @@
package com.whyc.controller;
import com.whyc.dto.Response;
import com.whyc.service.BatttestdataInfService;
import com.whyc.service.BattTestDataInfService;
import com.whyc.service.ExcelExportService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -17,9 +17,9 @@
@RestController
@Api(tags = "测试管理")
@RequestMapping("tinf")
public class BatttestdataInfController {
public class BattTestDataInfController {
    @Autowired
    private BatttestdataInfService service;
    private BattTestDataInfService service;
    @Autowired
    private ExcelExportService exportService;
src/main/java/com/whyc/controller/DevAlarmDataHisController.java
File was renamed from src/main/java/com/whyc/controller/DevalarmDataHisController.java
@@ -15,7 +15,7 @@
@RestController
@Api(tags = "历史告警管理")
@RequestMapping("tinf")
public class DevalarmDataHisController {
public class DevAlarmDataHisController {
    @Autowired
    private DevAlarmDataService dataService;
src/main/java/com/whyc/mapper/A200RealStateMapper.java
New file
@@ -0,0 +1,6 @@
package com.whyc.mapper;
import com.whyc.pojo.db_lithium_ram_db.A200Realstate;
public interface A200RealStateMapper extends CustomMapper<A200Realstate>{
}
src/main/java/com/whyc/mapper/A200RealstateMapper.java
File was deleted
src/main/java/com/whyc/mapper/ActmRealStateMapper.java
New file
@@ -0,0 +1,6 @@
package com.whyc.mapper;
import com.whyc.pojo.db_lithium_ram_db.ActmRealstate;
public interface ActmRealStateMapper extends CustomMapper<ActmRealstate>{
}
src/main/java/com/whyc/mapper/ActmRealstateMapper.java
File was deleted
src/main/java/com/whyc/mapper/BaojiGroupMapper.java
File was renamed from src/main/java/com/whyc/mapper/BaojigroupMapper.java
@@ -4,7 +4,7 @@
import java.util.List;
public interface BaojigroupMapper extends CustomMapper<BaojiGroup>{
public interface BaojiGroupMapper extends CustomMapper<BaojiGroup>{
    //获取最大的包机组编号
    Integer getMaxBaojiGroupId();
src/main/java/com/whyc/mapper/BattAlarmParamMapper.java
File was renamed from src/main/java/com/whyc/mapper/BattalarmParamMapper.java
@@ -4,7 +4,7 @@
import java.util.List;
public interface BattalarmParamMapper extends CustomMapper<BattalarmParam>{
public interface BattAlarmParamMapper extends CustomMapper<BattalarmParam>{
    //电池告警参数设置--列表查询
    List<BattalarmParam> serchByCondition(List alarmIds);
src/main/java/com/whyc/mapper/BattGroupBaojiGroupMapper.java
File was renamed from src/main/java/com/whyc/mapper/BattgroupBaojigroupMapper.java
@@ -4,7 +4,7 @@
import java.util.List;
public interface BattgroupBaojigroupMapper extends CustomMapper<BattGroupBaojiGroup>{
public interface BattGroupBaojiGroupMapper extends CustomMapper<BattGroupBaojiGroup>{
    //包机组下移除设备
    void delDevInBaoji(List<BattGroupBaojiGroup> devList);
src/main/java/com/whyc/mapper/BattGroupUsrMapper.java
File was renamed from src/main/java/com/whyc/mapper/BattgroupUsrMapper.java
@@ -4,6 +4,6 @@
import java.util.List;
public interface BattgroupUsrMapper extends CustomMapper<BattGroupUsr>{
public interface BattGroupUsrMapper extends CustomMapper<BattGroupUsr>{
    void delUsrInBaoji(List<BattGroupUsr> usrList);
}
src/main/java/com/whyc/mapper/BattRtDataMapper.java
New file
@@ -0,0 +1,6 @@
package com.whyc.mapper;
import com.whyc.pojo.db_lithium_ram_db.BattRtdata;
public interface BattRtDataMapper extends CustomMapper<BattRtdata>{
}
src/main/java/com/whyc/mapper/BattRtdataMapper.java
File was deleted
src/main/java/com/whyc/mapper/BattTestDataIdMapper.java
New file
@@ -0,0 +1,6 @@
package com.whyc.mapper;
import com.whyc.pojo.db_batt_testdata.BattTestDataId;
public interface BattTestDataIdMapper extends CustomMapper<BattTestDataId>{
}
src/main/java/com/whyc/mapper/BattTestDataInfMapper.java
File was renamed from src/main/java/com/whyc/mapper/BatttestdataInfMapper.java
@@ -5,7 +5,7 @@
import java.util.List;
public interface BatttestdataInfMapper extends CustomMapper<BattTestDataInf>{
public interface BattTestDataInfMapper extends CustomMapper<BattTestDataInf>{
    //充放电一体机测试统计
    List<BattTestDataInf> getDevTinf(@Param("uid") int uid);
    //本年
src/main/java/com/whyc/mapper/BatttestdataIdMapper.java
File was deleted
src/main/java/com/whyc/mapper/PowerAlarmParamMapper.java
File was renamed from src/main/java/com/whyc/mapper/PoweralarmParamMapper.java
@@ -4,7 +4,7 @@
import java.util.List;
public interface PoweralarmParamMapper extends CustomMapper<PoweralarmParam>{
public interface PowerAlarmParamMapper extends CustomMapper<PoweralarmParam>{
    //电源告警参数设置
    List<PoweralarmParam> serchByCondition(List<Integer> alarmIds);
}
src/main/java/com/whyc/service/A200RealStateService.java
File was renamed from src/main/java/com/whyc/service/A200RealstateService.java
@@ -2,16 +2,16 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.whyc.dto.Response;
import com.whyc.mapper.A200RealstateMapper;
import com.whyc.mapper.A200RealStateMapper;
import com.whyc.pojo.db_lithium_ram_db.A200Realstate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class A200RealstateService {
public class A200RealStateService {
    @Autowired(required = false)
    private A200RealstateMapper mapper;
    private A200RealStateMapper mapper;
    //一体机A200实时数据
    public Response getA200State(int devId) {
src/main/java/com/whyc/service/ActmRealStateService.java
File was renamed from src/main/java/com/whyc/service/ActmRealstateService.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.whyc.dto.Response;
import com.whyc.mapper.ActmRealstateMapper;
import com.whyc.mapper.ActmRealStateMapper;
import com.whyc.pojo.db_lithium_ram_db.ActmRealstate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -10,10 +10,10 @@
import java.util.List;
@Service
public class ActmRealstateService {
public class ActmRealStateService {
    @Autowired(required = false)
    private ActmRealstateMapper mapper;
    private ActmRealStateMapper mapper;
    //均衡仪Actm实时数据
    public Response getActmState(int devId) {
        QueryWrapper wrapper=new QueryWrapper();
src/main/java/com/whyc/service/BaojiGroupService.java
File was renamed from src/main/java/com/whyc/service/BaojigroupService.java
@@ -2,9 +2,9 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.whyc.dto.Response;
import com.whyc.mapper.BaojigroupMapper;
import com.whyc.mapper.BattgroupBaojigroupMapper;
import com.whyc.mapper.BattgroupUsrMapper;
import com.whyc.mapper.BaojiGroupMapper;
import com.whyc.mapper.BattGroupBaojiGroupMapper;
import com.whyc.mapper.BattGroupUsrMapper;
import com.whyc.pojo.db_user.BaojiGroup;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -13,15 +13,15 @@
import java.util.List;
@Service
public class BaojigroupService {
public class BaojiGroupService {
    @Autowired(required = false)
    private BaojigroupMapper mapper;
    private BaojiGroupMapper mapper;
    @Autowired(required = false)
    private BattgroupBaojigroupMapper groupMapper;
    private BattGroupBaojiGroupMapper groupMapper;
    @Autowired(required = false)
    private BattgroupUsrMapper usrMapper;
    private BattGroupUsrMapper usrMapper;
    //包机组下添加设备
    public Response addBaoji(String baojiName) {
src/main/java/com/whyc/service/BattAlarmParamService.java
File was renamed from src/main/java/com/whyc/service/BattalarmParamService.java
@@ -5,12 +5,11 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
import com.whyc.mapper.BattalarmParamMapper;
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;
import org.springframework.web.bind.annotation.RequestParam;
import javax.annotation.Resource;
import java.util.HashMap;
@@ -18,9 +17,9 @@
import java.util.Map;
@Service
public class BattalarmParamService {
public class BattAlarmParamService {
    @Resource
    private BattalarmParamMapper mapper;
    private BattAlarmParamMapper mapper;
    //电池告警参数设置--列表查询
    public Response serchBattParamByCondition(List AlarmIds,  int pageNum,  int pageSize) {
src/main/java/com/whyc/service/BattGroupBaojiGroupService.java
File was renamed from src/main/java/com/whyc/service/BattgroupBaojigroupService.java
@@ -2,15 +2,15 @@
import com.whyc.dto.BaojiDto;
import com.whyc.dto.Response;
import com.whyc.mapper.BattgroupBaojigroupMapper;
import com.whyc.mapper.BattGroupBaojiGroupMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Service
public class BattgroupBaojigroupService {
public class BattGroupBaojiGroupService {
    @Autowired(required = false)
    private BattgroupBaojigroupMapper mapper;
    private BattGroupBaojiGroupMapper mapper;
src/main/java/com/whyc/service/BattGroupUsrService.java
File was renamed from src/main/java/com/whyc/service/BattgroupUsrService.java
@@ -2,14 +2,14 @@
import com.whyc.dto.BaojiDto;
import com.whyc.dto.Response;
import com.whyc.mapper.BattgroupUsrMapper;
import com.whyc.mapper.BattGroupUsrMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class BattgroupUsrService {
public class BattGroupUsrService {
    @Autowired(required = false)
    private BattgroupUsrMapper mapper;
    private BattGroupUsrMapper mapper;
    //包机组下添加用户
    public Response opreateUsrInBaoji(BaojiDto dto) {
src/main/java/com/whyc/service/BattRtDataService.java
File was renamed from src/main/java/com/whyc/service/BattRtdataService.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.whyc.dto.Response;
import com.whyc.mapper.BattRtdataMapper;
import com.whyc.mapper.BattRtDataMapper;
import com.whyc.pojo.db_lithium_ram_db.BattRtdata;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -10,10 +10,10 @@
import java.util.List;
@Service
public class BattRtdataService {
public class BattRtDataService {
    @Autowired(required = false)
    private BattRtdataMapper mapper;
    private BattRtDataMapper mapper;
    //获取a200电池组数据
src/main/java/com/whyc/service/BattTestDataIdService.java
File was renamed from src/main/java/com/whyc/service/BatttestdataIdService.java
@@ -3,5 +3,5 @@
import org.springframework.stereotype.Service;
@Service
public class BatttestdataIdService {
public class BattTestDataIdService {
}
src/main/java/com/whyc/service/BattTestDataInfService.java
File was renamed from src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -2,8 +2,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.whyc.dto.Response;
import com.whyc.mapper.BatttestdataIdMapper;
import com.whyc.mapper.BatttestdataInfMapper;
import com.whyc.mapper.BattTestDataIdMapper;
import com.whyc.mapper.BattTestDataInfMapper;
import com.whyc.pojo.db_batt_testdata.BattTestDataId;
import com.whyc.pojo.db_batt_testdata.BattTestDataInf;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,13 +16,13 @@
import java.util.stream.Collectors;
@Service
public class BatttestdataInfService {
public class BattTestDataInfService {
    @Autowired(required = false)
    private BatttestdataInfMapper mapper;
    private BattTestDataInfMapper mapper;
    @Autowired(required = false)
    private BatttestdataIdMapper dataMapper;
    private BattTestDataIdMapper dataMapper;
    @Autowired(required = false)
    private SubTablePageInfoService subService;
src/main/java/com/whyc/service/DevInfService.java
@@ -7,9 +7,9 @@
import com.github.pagehelper.PageInfo;
import com.whyc.dto.DevInfDto;
import com.whyc.dto.Response;
import com.whyc.mapper.A200RealstateMapper;
import com.whyc.mapper.ActmRealstateMapper;
import com.whyc.mapper.BattgroupBaojigroupMapper;
import com.whyc.mapper.A200RealStateMapper;
import com.whyc.mapper.ActmRealStateMapper;
import com.whyc.mapper.BattGroupBaojiGroupMapper;
import com.whyc.mapper.DevInfMapper;
import com.whyc.pojo.db_lithium_ram_db.A200Realstate;
import com.whyc.pojo.db_lithium_ram_db.ActmRealstate;
@@ -28,13 +28,13 @@
    private DevInfMapper mapper;
    @Autowired(required = false)
    private A200RealstateMapper a200Mapper;
    private A200RealStateMapper a200Mapper;
    @Autowired(required = false)
    private ActmRealstateMapper actmMapper;
    private ActmRealStateMapper actmMapper;
    @Autowired(required = false)
    private BattgroupBaojigroupMapper battBjmapper;
    private BattGroupBaojiGroupMapper battBjmapper;
    //添加设备
    @Transactional
src/main/java/com/whyc/service/ExcelExportService.java
@@ -23,7 +23,7 @@
    private SubTablePageInfoService subService;
    @Autowired(required = false)
    private BatttestdataInfService infService;
    private BattTestDataInfService infService;
    //导出文件
    public void exportExcel1(Integer devId,  Integer testRecordCount,HttpServletResponse response) {
src/main/java/com/whyc/service/PoweralarmParamService.java
@@ -4,8 +4,7 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
import com.whyc.mapper.PoweralarmParamMapper;
import com.whyc.pojo.db_param.BattalarmParam;
import com.whyc.mapper.PowerAlarmParamMapper;
import com.whyc.pojo.db_param.PoweralarmParam;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +15,7 @@
@Service
public class PoweralarmParamService {
    @Autowired(required = false)
    private PoweralarmParamMapper mapper;
    private PowerAlarmParamMapper mapper;
    //电源告警参数设置
    public Response serchPowerParamByCondition(List<Integer> AlarmIds,  int pageNum,  int pageSize) {
src/main/java/com/whyc/webSocket/DevRtStateSocket.java
@@ -3,9 +3,9 @@
import com.whyc.config.WebSocketConfig;
import com.whyc.dto.Response;
import com.whyc.dto.RtStateDto;
import com.whyc.service.A200RealstateService;
import com.whyc.service.ActmRealstateService;
import com.whyc.service.BattRtdataService;
import com.whyc.service.A200RealStateService;
import com.whyc.service.ActmRealStateService;
import com.whyc.service.BattRtDataService;
import com.whyc.service.WorkStateChangeEventService;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,11 +27,11 @@
    private Thread thread;
    private static BattRtdataService rtdataService;
    private static BattRtDataService rtdataService;
    private static A200RealstateService a200Service;
    private static A200RealStateService a200Service;
    private static ActmRealstateService actmService;
    private static ActmRealStateService actmService;
    private static WorkStateChangeEventService eventService;
@@ -43,17 +43,17 @@
    private volatile Map<Long,Boolean> threadFlagMap = new HashMap<>();
    @Autowired
    public void setBattRtdataService(BattRtdataService rtdataService) {
    public void setBattRtdataService(BattRtDataService rtdataService) {
        DevRtStateSocket.rtdataService = rtdataService;
    }
    @Autowired
    public void setA200RealstateService(A200RealstateService a200Service) {
    public void setA200RealstateService(A200RealStateService a200Service) {
        DevRtStateSocket.a200Service = a200Service;
    }
    @Autowired
    public void setActmRealstateService(ActmRealstateService actmService) {
    public void setActmRealstateService(ActmRealStateService actmService) {
        DevRtStateSocket.actmService = actmService;
    }
src/main/java/com/whyc/webSocket/DevStaticSocket.java
@@ -4,7 +4,7 @@
import com.whyc.dto.Response;
import com.whyc.factory.ThreadPoolExecutorFactory;
import com.whyc.pojo.db_user.UserInf;
import com.whyc.service.BatttestdataInfService;
import com.whyc.service.BattTestDataInfService;
import com.whyc.service.DevInfService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -32,7 +32,7 @@
    private static DevInfService dinfService;
    private static BatttestdataInfService tinfService;
    private static BattTestDataInfService tinfService;
    private HttpSession httpSession;
@@ -43,7 +43,7 @@
    }
    @Autowired
    public void setBatttestdataInfService(BatttestdataInfService tinfService) {
    public void setBatttestdataInfService(BattTestDataInfService tinfService) {
        DevStaticSocket.tinfService = tinfService;
    }
src/main/resources/mapper/BaojiGroupMapper.xml
File was renamed from src/main/resources/mapper/BaojigroupMapper.xml
@@ -1,13 +1,13 @@
<?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.BaojigroupMapper">
<mapper namespace="com.whyc.mapper.BaojiGroupMapper">
    <select id="getMaxBaojiGroupId" resultType="java.lang.Integer">
        select max(baoji_group_id) from db_user.tb_baojigroup
        limit 1
    </select>
    <resultMap id="baojiList" type="baojigroup">
    <resultMap id="baojiList" type="BaojiGroup">
        <id property="num" column="num"></id>
        <result property="baojiGroupId" column="baoji_group_id"></result>
        <result property="baojiGroupName" column="baoji_group_name"></result>
src/main/resources/mapper/BattAlarmParamMapper.xml
File was renamed from src/main/resources/mapper/BattalarmParamMapper.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.BattalarmParamMapper">
    <select id="serchByCondition" resultType="BattalarmParam">
<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/BattGroupBaojiGroupMapper.xml
File was renamed from src/main/resources/mapper/BattgroupBaojigroupMapper.xml
@@ -1,6 +1,6 @@
<?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.BattgroupBaojigroupMapper">
<mapper namespace="com.whyc.mapper.BattGroupBaojiGroupMapper">
    <delete id="delDevInBaoji">
        <foreach collection="list" item="item" separator=";" >
            delete from db_user.tb_battgroup_baojigroup where baoji_group_id = #{item.baojiGroupId} and dev_id = #{item.devId}
src/main/resources/mapper/BattGroupUsrMapper.xml
File was renamed from src/main/resources/mapper/BattgroupUsrMapper.xml
@@ -1,6 +1,6 @@
<?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.BattgroupUsrMapper">
<mapper namespace="com.whyc.mapper.BattGroupUsrMapper">
    <delete id="delUsrInBaoji">
        <foreach collection="list" item="item" separator=";" >
src/main/resources/mapper/BattTestDataIdMapper.xml
File was renamed from src/main/resources/mapper/BatttestdataIdMapper.xml
@@ -1,5 +1,5 @@
<?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.BatttestdataIdMapper">
<mapper namespace="com.whyc.mapper.BattTestDataIdMapper">
</mapper>
src/main/resources/mapper/BattTestDataInfMapper.xml
File was renamed from src/main/resources/mapper/BatttestdataInfMapper.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.BatttestdataInfMapper">
    <resultMap id="staticTinf" type="batttestdataInf">
<mapper namespace="com.whyc.mapper.BattTestDataInfMapper">
    <resultMap id="staticTinf" type="battTestDataInf">
        <id property="num" column="num"></id>
        <result property="devId" column="dev_id"></result>
        <result property="testType" column="test_type"></result>
src/main/resources/mapper/PowerAlarmParamMapper.xml
File was renamed from src/main/resources/mapper/PoweralarmParamMapper.xml
@@ -1,6 +1,6 @@
<?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.PoweralarmParamMapper">
<mapper namespace="com.whyc.mapper.PowerAlarmParamMapper">
    <select id="serchByCondition" resultType="com.whyc.pojo.db_param.PoweralarmParam">
        select num,alm_id,alm_level,alm_en  from db_param.poweralarm_param