锂电设备相关代码更新

whycxzp

2025-03-17 e50d8c30b43dd30daa77da27101ce21d8ef2fcef

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

File was renamed from src/main/java/com/whyc/webSocket/DevStaticSocket.java
@@ -5,7 +5,7 @@
import com.whyc.factory.ThreadPoolExecutorFactory;
import com.whyc.pojo.db_user.UserInf;
import com.whyc.service.BattTestDataInfService;
import com.whyc.service.DevInfService;
import com.whyc.service.DevLithiumInfService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

@@ -23,28 +23,28 @@
 * 左侧列表
 */
@Component
@ServerEndpoint(value = "/staticSocket",encoders = WebSocketEncoder.class,configurator = WebSocketConfig.class)
public class DevStaticSocket{
@ServerEndpoint(value = "/devLithiumStatistic",encoders = WebSocketEncoder.class,configurator = WebSocketConfig.class)
public class DevLithiumStatisticSocket {

    private Session session;

    private Thread thread;

    private static DevInfService dinfService;
    private static DevLithiumInfService devLithiumInfService;

    private static BattTestDataInfService tinfService;
    private static BattTestDataInfService battTestDataInfService;


    private HttpSession httpSession;

    @Autowired
    public void setDevInfService(DevInfService dinfService) {
        DevStaticSocket.dinfService = dinfService;
    public void setDevLithiumInfService(DevLithiumInfService devLithiumInfService) {
        DevLithiumStatisticSocket.devLithiumInfService = devLithiumInfService;
    }

    @Autowired
    public void setBatttestdataInfService(BattTestDataInfService tinfService) {
        DevStaticSocket.tinfService = tinfService;
    public void setBattTestDataInfService(BattTestDataInfService battTestDataInfService) {
        DevLithiumStatisticSocket.battTestDataInfService = battTestDataInfService;
    }


@@ -59,7 +59,7 @@
            public void run() {
                try {
                    while (!currentThread().isInterrupted()) {
                        Response res = getDevStatic(userId);
                        Response res = getStatistics(userId);
                        session.getBasicRemote().sendObject(res);
                        sleep(4000);
                    }
@@ -72,27 +72,27 @@
        this.thread = thread;
    }
    //获取统计信息
    private Response getDevStatic(int userId) {
    private Response getStatistics(int userId) {
        Map<String,Object> map=new HashMap<>();
        try {
            ThreadPoolExecutor poolExecutor = ThreadPoolExecutorFactory.getPoolExecutor();
            CountDownLatch latch = new CountDownLatch(3);
            //充放电一体机测试统计/锂电均衡仪测试统计
            poolExecutor.execute(() -> {
                Map<String,Object> devTinfMap=tinfService.getDevTinfByYearMonth(userId);
                map.put("devTinf",devTinfMap);
                Map<String,Object> lithiumTestInfMap = battTestDataInfService.getDevTinfByYearMonth(userId);
                map.put("lithiumTestInf",lithiumTestInfMap);
                latch.countDown();
            });
            //设备分类总数统计/设备状态统计/地图信息
            poolExecutor.execute(() -> {
                Map<String,Object> devSaticMap=dinfService.getDevStaticByType(userId);
                map.put("devSatic",devSaticMap);
                Map<String,Object> devSaticMap=devLithiumInfService.getDevStaticByType(userId);
                map.put("devLithiumStatistics",devSaticMap);
                latch.countDown();
            });
            //近一周电池测试趋势统计(从当前时间开始)
            poolExecutor.execute(() -> {
                Map<String,Object> devTestByWeekMap=tinfService.getDevTinfByWeek(userId);
                map.put("devTestByWeek",devTestByWeekMap);
                Map<String,Object> devTestByWeekMap=battTestDataInfService.getDevTinfByWeek(userId);
                map.put("devLithiumTestByWeek",devTestByWeekMap);
                latch.countDown();
            });
            latch.await(10, TimeUnit.MINUTES);