修改

huimv-env-admin/src/main/java/com/huimv/env/admin/controller/BasePigpenController.java

@@ -158,7 +158,10 @@ public class BasePigpenController {
     public Result listPigpen(@RequestBody Map<String,Integer> map) {
         return  basePigpenService.listPigpen(map);
     }
-
+    @PostMapping( "/getGateway")
+    public Result getGateway(@RequestBody Map<String,Integer> map) {
+        return  basePigpenService.getGateway(map);
+    }
     @RequestMapping(value = "/list",method = RequestMethod.POST)
     public Result list(@RequestBody Map<String, Object> paramsMap) {
         System.out.println("paramsMap>>"+paramsMap.toString());

huimv-env-admin/src/main/java/com/huimv/env/admin/controller/PortChangeDataController.java

@@ -0,0 +1,34 @@
+package com.huimv.env.admin.controller;
+
+
+import com.huimv.env.admin.common.utils.Result;
+import com.huimv.env.admin.service.IPortChangeDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2024-05-09
+ */
+@RestController
+@RequestMapping("/port-change-data")
+@CrossOrigin
+public class PortChangeDataController {
+    @Autowired
+    private IPortChangeDataService dataService;
+
+    @RequestMapping("/listData")
+    public Result listDate(@RequestBody Map<String,String> paramsMap) {
+        return dataService.listData(paramsMap);
+    }
+}

huimv-env-admin/src/main/java/com/huimv/env/admin/entity/PortChangeData.java

@@ -0,0 +1,85 @@
+package com.huimv.env.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2024-05-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("port_change_data")
+public class PortChangeData implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String terminalPortCode;
+
+    private String terminalCode;
+
+    private String gatwayCode;
+
+    /**
+     * 现有功
+     */
+    private Integer activePower;
+
+    /**
+     * ，无功
+     */
+    private Integer reactivePower;
+
+    /**
+     * ，视在
+     */
+    private Integer apparentPower;
+
+    /**
+     * 前功率  有功
+     */
+    private Integer beforeActivePower;
+
+    /**
+     * ，无功
+     */
+    private Integer beforeReactivePower;
+
+    /**
+     * 视在
+     */
+    private Integer beforeApparentPower;
+
+    /**
+     * 电流buf
+     */
+    private String electricCurrent;
+
+    /**
+     * 变化前的电流buf
+     */
+    private String beforeElectricCurrent;
+
+    private LocalDateTime createTime;
+
+    /**
+     * 序号
+     */
+    private Integer num;
+
+
+}

huimv-env-admin/src/main/java/com/huimv/env/admin/mapper/PortChangeDataMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.env.admin.mapper;
+
+import com.huimv.env.admin.entity.PortChangeData;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-05-09
+ */
+public interface PortChangeDataMapper extends BaseMapper<PortChangeData> {
+
+}

huimv-env-admin/src/main/java/com/huimv/env/admin/service/IBasePigpenService.java

@@ -28,4 +28,6 @@ public interface IBasePigpenService extends IService<BasePigpen> {
     Result listPigpen(Map<String, Integer> map);
 
     Result deviceCount(Map<String, Integer> map);
+
+    Result getGateway(Map<String, Integer> map);
 }

huimv-env-admin/src/main/java/com/huimv/env/admin/service/IPortChangeDataService.java

@@ -0,0 +1,20 @@
+package com.huimv.env.admin.service;
+
+import com.huimv.env.admin.common.utils.Result;
+import com.huimv.env.admin.entity.PortChangeData;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-05-09
+ */
+public interface IPortChangeDataService extends IService<PortChangeData> {
+    Result  listData(Map<String, String> paramsMap);
+}

huimv-env-admin/src/main/java/com/huimv/env/admin/service/impl/BasePigpenServiceImpl.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.env.admin.common.utils.Result;
 import com.huimv.env.admin.common.utils.ResultCode;
 import com.huimv.env.admin.common.utils.ResultUtil;
@@ -135,11 +136,14 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
         Integer offGateway = 0;
         Integer onTerminal = 0;
         Integer offTerminal = 0;
-        Integer infoGateway = 0;//暂时不管
-        Integer infoTerminal = 0;//暂时不管
+//        Integer infoGateway = 0;//暂时不管
+//        Integer infoTerminal = 0;//暂时不管
         Integer onPort = 0;
         Integer offPort = 0;
-        Integer infoPort = 0;
+//        Integer infoPort = 0;
+        Integer tempCount = 0;//高温报警
+        Integer chargingCount = 0;//充电报警
+        Integer leakageCount = 0;//漏电报警
         QueryWrapper<Gateway> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("location_id", id);
         List<Gateway> gateways = gatewayMapper.selectList(queryWrapper);
@@ -179,22 +183,44 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             } else {
                 onPort++;
             }
-
+            if (terminal.getHeightTempWarning() == 1) {
+                tempCount++;
+            }
+            if (terminal.getChargingWarning() == 1) {
+                chargingCount++;
+            }
+            if (terminal.getLeakageWarning() == 1) {
+                leakageCount++;
+            }
         }
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("onGateway", onGateway);
         jsonObject.put("offGateway", offGateway);
         jsonObject.put("onTerminal", onTerminal);
         jsonObject.put("offTerminal", offTerminal);
-        jsonObject.put("infoGateway", infoGateway);
-        jsonObject.put("infoTerminal", infoTerminal);
+//        jsonObject.put("infoGateway", infoGateway);//
+//        jsonObject.put("infoTerminal", infoTerminal);//
         jsonObject.put("offPort", offPort);
         jsonObject.put("onPort", onPort);
-        jsonObject.put("infoPort", infoPort);
+        jsonObject.put("tempCount", tempCount);
+        jsonObject.put("chargingCount", chargingCount);
+        jsonObject.put("leakageCount", leakageCount);
+//        jsonObject.put("infoPort", infoPort);
         return new Result(ResultCode.SUCCESS,jsonObject);
     }
 
     @Override
+    public Result getGateway(Map<String, Integer> map) {
+        Integer id = map.get("id");
+        Integer pageNum = map.get("pageNum");
+        Integer pageSize = map.get("pageSize");
+        Page<Gateway> page = new Page(pageNum,pageSize);
+        QueryWrapper<Gateway> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("location_id", id);
+        return new Result(ResultCode.SUCCESS, gatewayMapper.selectPage(page,queryWrapper));
+    }
+
+    @Override
     public Result list(String farmCode, String buildName, String stageCode, String type) {
         QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(buildName), "build_name", buildName);

huimv-env-admin/src/main/java/com/huimv/env/admin/service/impl/PortChangeDataServiceImpl.java

@@ -0,0 +1,41 @@
+package com.huimv.env.admin.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.env.admin.common.utils.Result;
+import com.huimv.env.admin.common.utils.ResultCode;
+import com.huimv.env.admin.entity.PortChangeData;
+import com.huimv.env.admin.mapper.PortChangeDataMapper;
+import com.huimv.env.admin.service.IPortChangeDataService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-05-09
+ */
+@Service
+public class PortChangeDataServiceImpl extends ServiceImpl<PortChangeDataMapper, PortChangeData> implements IPortChangeDataService {
+
+    @Autowired
+    private PortChangeDataMapper dataMapper;
+
+    @Override
+    public Result listData(Map<String,String> paramsMap) {
+        String id = paramsMap.get("id");//端口id
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        Page<PortChangeData> page = new Page(Integer.valueOf(pageNum),Integer.valueOf(pageSize));
+        QueryWrapper<PortChangeData> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("terminal_port_code", id);
+        return new Result(ResultCode.SUCCESS, dataMapper.selectPage(page, queryWrapper));
+    }
+}

huimv-env-admin/src/main/resources/mapper/PortChangeDataMapper.xml

@@ -0,0 +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.huimv.env.admin.mapper.PortChangeDataMapper">
+
+</mapper>