src/main/java/com/whyc/controller/DevA200TestparamController.java
@@ -2,7 +2,7 @@ import com.whyc.dto.A200ResDto; import com.whyc.dto.Response; import com.whyc.service.DevA200TestparamService; import com.whyc.service.DevA200TestParamService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -15,7 +15,7 @@ @RequestMapping("a200param") public class DevA200TestparamController { @Autowired private DevA200TestparamService service; private DevA200TestParamService service; @ApiOperation(value = "读取a200一体机参数") src/main/java/com/whyc/controller/DevActmTestparamController.java
@@ -2,7 +2,7 @@ import com.whyc.dto.ActmResDto; import com.whyc.dto.Response; import com.whyc.service.DevActmTestparamService; import com.whyc.service.DevActmTestParamService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -16,7 +16,7 @@ public class DevActmTestparamController { @Autowired private DevActmTestparamService service; private DevActmTestParamService service; @ApiOperation(value = "读取actm一体机参数") @GetMapping("getActmParam") src/main/java/com/whyc/controller/DevalarmDataHisController.java
@@ -3,7 +3,7 @@ import com.whyc.dto.DalmDto; import com.whyc.dto.Response; import com.whyc.pojo.db_user.UserInf; import com.whyc.service.DevalarmDataService; import com.whyc.service.DevAlarmDataService; import com.whyc.util.ActionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -17,7 +17,7 @@ @RequestMapping("tinf") public class DevalarmDataHisController { @Autowired private DevalarmDataService dataService; private DevAlarmDataService dataService; @ApiOperation(value = "测试实时告警") @PostMapping("getDAlmInf") src/main/java/com/whyc/controller/WorkstateChangeeventController.java
@@ -1,7 +1,7 @@ package com.whyc.controller; import com.whyc.dto.Response; import com.whyc.service.WorkstateChangeeventService; import com.whyc.service.WorkStateChangeEventService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -15,7 +15,7 @@ @RequestMapping("workEvent") public class WorkstateChangeeventController { @Autowired private WorkstateChangeeventService service; private WorkStateChangeEventService service; @ApiOperation(value = "读取设备工作状态的切换过程") @GetMapping("getWorkEvent") src/main/java/com/whyc/mapper/DevA200TestParamMapper.java
File was renamed from src/main/java/com/whyc/mapper/DevA200TestparamMapper.java @@ -2,5 +2,5 @@ import com.whyc.pojo.db_lithium_ram_db.DevA200TestParam; public interface DevA200TestparamMapper extends CustomMapper<DevA200TestParam>{ public interface DevA200TestParamMapper extends CustomMapper<DevA200TestParam>{ } src/main/java/com/whyc/mapper/DevActmTestParamMapper.java
File was renamed from src/main/java/com/whyc/mapper/DevActmTestparamMapper.java @@ -2,5 +2,5 @@ import com.whyc.pojo.db_lithium_ram_db.DevActmTestParam; public interface DevActmTestparamMapper extends CustomMapper<DevActmTestParam>{ public interface DevActmTestParamMapper extends CustomMapper<DevActmTestParam>{ } src/main/java/com/whyc/mapper/DevAlarmDataMapper.java
File was renamed from src/main/java/com/whyc/mapper/DevalarmDataMapper.java @@ -6,7 +6,7 @@ import java.util.List; public interface DevalarmDataMapper extends CustomMapper<DevAlarmData>{ public interface DevAlarmDataMapper extends CustomMapper<DevAlarmData>{ //获取设备告警信息 List<DevAlarmData> getDAlmInf(@Param("dto") DalmDto dto); //弹窗告警 src/main/java/com/whyc/mapper/WorkStateCfgMapper.java
New file @@ -0,0 +1,6 @@ package com.whyc.mapper; import com.whyc.pojo.db_lithium_ram_db.WorkStateCfg; public interface WorkStateCfgMapper extends CustomMapper<WorkStateCfg>{ } src/main/java/com/whyc/mapper/WorkStateChangeEventMapper.java
File was renamed from src/main/java/com/whyc/mapper/WorkstateChangeeventMapper.java @@ -2,5 +2,5 @@ import com.whyc.pojo.db_lithium_ram_db.WorkStateChangeEvent; public interface WorkstateChangeeventMapper extends CustomMapper<WorkStateChangeEvent>{ public interface WorkStateChangeEventMapper extends CustomMapper<WorkStateChangeEvent>{ } src/main/java/com/whyc/mapper/WorkstateCfgMapper.java
File was deleted src/main/java/com/whyc/service/DevA200TestParamService.java
File was renamed from src/main/java/com/whyc/service/DevA200TestparamService.java @@ -6,7 +6,7 @@ import com.whyc.dto.Response; import com.whyc.dto.ResultA200Dto; import com.whyc.factory.ThreadPoolExecutorFactory; import com.whyc.mapper.DevA200TestparamMapper; import com.whyc.mapper.DevA200TestParamMapper; import com.whyc.mapper.DevInfMapper; import com.whyc.pojo.db_lithium_ram_db.DevA200TestParam; import com.whyc.pojo.db_lithium_ram_db.DevInf; @@ -28,9 +28,9 @@ import java.util.concurrent.TimeUnit; @Service public class DevA200TestparamService { public class DevA200TestParamService { @Autowired(required = false) private DevA200TestparamMapper mapper; private DevA200TestParamMapper mapper; @Autowired(required = false) private DevInfMapper dinfMapper; @@ -38,7 +38,7 @@ private final RestTemplate restTemplate; @Autowired public DevA200TestparamService(RestTemplate restTemplate) { public DevA200TestParamService(RestTemplate restTemplate) { this.restTemplate = restTemplate; } //批量处理发送接口请求 src/main/java/com/whyc/service/DevActmTestParamService.java
File was renamed from src/main/java/com/whyc/service/DevActmTestparamService.java @@ -7,7 +7,7 @@ import com.whyc.dto.Response; import com.whyc.dto.ResultActmDto; import com.whyc.factory.ThreadPoolExecutorFactory; import com.whyc.mapper.DevActmTestparamMapper; import com.whyc.mapper.DevActmTestParamMapper; import com.whyc.mapper.DevInfMapper; import com.whyc.pojo.db_lithium_ram_db.DevActmTestParam; import com.whyc.pojo.db_lithium_ram_db.DevInf; @@ -27,9 +27,9 @@ @Service public class DevActmTestparamService { public class DevActmTestParamService { @Autowired(required = false) private DevActmTestparamMapper mapper; private DevActmTestParamMapper mapper; @Autowired(required = false) private DevInfMapper dinfMapper; @@ -37,7 +37,7 @@ private final RestTemplate restTemplate; @Autowired public DevActmTestparamService(RestTemplate restTemplate) { public DevActmTestParamService(RestTemplate restTemplate) { this.restTemplate = restTemplate; }
File was renamed from src/main/java/com/whyc/service/DevalarmDataService.java @@ -6,7 +6,7 @@ import com.whyc.constant.DevAlmEnum; import com.whyc.dto.DalmDto; import com.whyc.dto.Response; import com.whyc.mapper.DevalarmDataMapper; import com.whyc.mapper.DevAlarmDataMapper; import com.whyc.pojo.db_alarm.DevAlarmData; import com.whyc.pojo.db_user.UserInf; import com.whyc.util.ActionUtil; @@ -21,10 +21,10 @@ import java.util.Map; @Service public class DevalarmDataService { public class DevAlarmDataService { @Autowired(required = false) private DevalarmDataMapper mapper; private DevAlarmDataMapper mapper; @Autowired(required = false) private SubTablePageInfoUtil service; src/main/java/com/whyc/service/WorkStateChangeEventService.java
File was renamed from src/main/java/com/whyc/service/WorkstateChangeeventService.java @@ -2,8 +2,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.whyc.dto.Response; import com.whyc.mapper.WorkstateCfgMapper; import com.whyc.mapper.WorkstateChangeeventMapper; import com.whyc.mapper.WorkStateCfgMapper; import com.whyc.mapper.WorkStateChangeEventMapper; import com.whyc.pojo.db_lithium_ram_db.WorkStateCfg; import com.whyc.pojo.db_lithium_ram_db.WorkStateChangeEvent; import org.springframework.beans.factory.annotation.Autowired; @@ -12,12 +12,12 @@ import java.util.List; @Service public class WorkstateChangeeventService { public class WorkStateChangeEventService { @Autowired(required = false) private WorkstateChangeeventMapper mapper; private WorkStateChangeEventMapper mapper; @Autowired(required = false) private WorkstateCfgMapper cfgMapper; private WorkStateCfgMapper cfgMapper; //读取设备工作状态的切换过程 src/main/java/com/whyc/webSocket/DevAlmPopUp.java
@@ -3,7 +3,7 @@ import com.whyc.config.WebSocketConfig; import com.whyc.dto.Response; import com.whyc.pojo.db_user.UserInf; import com.whyc.service.DevalarmDataService; import com.whyc.service.DevAlarmDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -22,12 +22,12 @@ private Session session; private Thread thread; private static DevalarmDataService almService; private static DevAlarmDataService almService; private HttpSession httpSession; @Autowired public void setDevalarmDataService(DevalarmDataService almService) { public void setDevalarmDataService(DevAlarmDataService almService) { DevAlmPopUp.almService = almService; }
File was renamed from src/main/java/com/whyc/webSocket/DevRtstateSocket.java @@ -6,7 +6,7 @@ import com.whyc.service.A200RealstateService; import com.whyc.service.ActmRealstateService; import com.whyc.service.BattRtdataService; import com.whyc.service.WorkstateChangeeventService; import com.whyc.service.WorkStateChangeEventService; import com.whyc.util.ActionUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -22,7 +22,7 @@ */ @Component @ServerEndpoint(value = "/rtstateSocket",encoders = WebSocketEncoder.class,configurator = WebSocketConfig.class) public class DevRtstateSocket { public class DevRtStateSocket { private Session session; private Thread thread; @@ -33,7 +33,7 @@ private static ActmRealstateService actmService; private static WorkstateChangeeventService eventService; private static WorkStateChangeEventService eventService; private volatile boolean runFlag = true; @@ -44,22 +44,22 @@ @Autowired public void setBattRtdataService(BattRtdataService rtdataService) { DevRtstateSocket.rtdataService = rtdataService; DevRtStateSocket.rtdataService = rtdataService; } @Autowired public void setA200RealstateService(A200RealstateService a200Service) { DevRtstateSocket.a200Service = a200Service; DevRtStateSocket.a200Service = a200Service; } @Autowired public void setActmRealstateService(ActmRealstateService actmService) { DevRtstateSocket.actmService = actmService; DevRtStateSocket.actmService = actmService; } @Autowired public void setWorkstateChangeeventService(WorkstateChangeeventService eventService) { DevRtstateSocket.eventService = eventService; public void setWorkstateChangeeventService(WorkStateChangeEventService eventService) { DevRtStateSocket.eventService = eventService; } @OnOpen src/main/java/com/whyc/webSocket/DevalarmSocket.java
@@ -4,7 +4,7 @@ import com.whyc.dto.DalmDto; import com.whyc.dto.Response; import com.whyc.pojo.db_user.UserInf; import com.whyc.service.DevalarmDataService; import com.whyc.service.DevAlarmDataService; import com.whyc.util.ActionUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -26,7 +26,7 @@ private Thread thread; private static DevalarmDataService dalmService; private static DevAlarmDataService dalmService; private HttpSession httpSession; @@ -37,7 +37,7 @@ private volatile Map<Long,Boolean> threadFlagMap = new HashMap<>(); @Autowired public void setDevalarmDataService(DevalarmDataService dalmService) { public void setDevalarmDataService(DevAlarmDataService dalmService) { DevalarmSocket.dalmService = dalmService; }
@@ -47,7 +47,7 @@ <select id="getBaojiInfo" resultMap="baojiList"> select * from db_user.tb_baojigroup order by baoji_group_id asc </select> <select id="getUsrBaoji" resultType="com.whyc.pojo.db_user.Baojigroup"> <select id="getUsrBaoji" resultType="com.whyc.pojo.db_user.BaojiGroup"> select * from db_user.tb_baojigroup <where> baoji_group_id in ( src/main/resources/mapper/DevAlarmDataMapper.xml
File was renamed from src/main/resources/mapper/DevalarmDataMapper.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.DevalarmDataMapper"> <mapper namespace="com.whyc.mapper.DevAlarmDataMapper"> <resultMap type="com.whyc.pojo.db_alarm.DevAlarmData" id="almDev"> <id column="num" property="num"/> <result column="dev_id" property="devId"/>
