网关 端口

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

@@ -2,6 +2,7 @@ package com.huimv.env.admin.controller;
 
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.env.admin.common.utils.Result;
@@ -20,7 +21,9 @@ import com.huimv.env.admin.service.ITerminalService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -41,6 +44,8 @@ public class PortWarningInfoController {
     private ITerminalService terminalService;
     @Autowired
     private TerminalMapper terminalMapper;
+    @Autowired
+    private IBasePigpenService basePigpenService;
 
     @PostMapping("/page")
     public Result page(@RequestBody WarningPageParam warningPageParam){
@@ -51,17 +56,20 @@ public class PortWarningInfoController {
             endTime = endTime + " 23:59:59";
         }
         Page<PortWarningInfo> page = new Page<>(warningPageParam.getPageNum(),warningPageParam.getPageSize());
-        Page<PortWarningInfo> warningInfoPage = portWarningInfoService.page(page, new QueryWrapper<PortWarningInfo>().lambda()
+        LambdaQueryWrapper<PortWarningInfo> queryWrapper = new QueryWrapper<PortWarningInfo>().lambda()
                 .eq(ObjectUtil.isNotEmpty(warningPageParam.getWarningType()), PortWarningInfo::getWarningType, warningPageParam.getWarningType())
-                .between(ObjectUtil.isNotEmpty(startTime),PortWarningInfo::getCreateTime,startTime,endTime));
+                .between(ObjectUtil.isNotEmpty(startTime), PortWarningInfo::getCreateTime, startTime, endTime)
+                .orderByDesc(PortWarningInfo::getCreateTime);
+
+        Integer locationId = warningPageParam.getLocationId();
+        if (ObjectUtil.isNotEmpty(locationId)){
+            List<BasePigpen> basePigpens = basePigpenService.list(new QueryWrapper<BasePigpen>().lambda().like(BasePigpen::getOther2, locationId).eq(BasePigpen::getFType, 4));
+            List buildIds = basePigpens.stream().map(BasePigpen::getId).collect(Collectors.toList());
+            queryWrapper.in(PortWarningInfo::getLocationId,buildIds);
+        }
+        Page<PortWarningInfo> warningInfoPage = portWarningInfoService.page(page, queryWrapper);
         return new Result(ResultCode.SUCCESS,warningInfoPage);
     }
 
-    @PostMapping("/total")
-    public Result total(@RequestBody WarningTotalByLocationIdParam warningTotalByLocationIdParam){
-        List<Terminal> terminalList = terminalService.list(new QueryWrapper<Terminal>().lambda().eq(Terminal::getBuildId,warningTotalByLocationIdParam.getLocationId()));
-        WarningTotalResult warningTotalResult = terminalMapper.getTotal(terminalList);
-        return new Result(ResultCode.SUCCESS,warningTotalResult);
-    }
 
 }

huimv-env-admin/src/main/java/com/huimv/env/admin/entity/vo/WarningPageParam.java

@@ -8,6 +8,8 @@ import javax.validation.constraints.NotNull;
 public class WarningPageParam {
     private Integer warningType;
 
+    private Integer locationId;
+
     private String startTime;
 
     private String endTime;