跨域

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnergyElectricityController.java

@@ -1,6 +1,7 @@
 package com.huimv.guowei.admin.controller;
 
 
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/energy-electricity")
+@CrossOrigin
 public class EnergyElectricityController {
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnergyWarningInfoController.java

@@ -1,6 +1,7 @@
 package com.huimv.guowei.admin.controller;
 
 
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/energy-warning-info")
+@CrossOrigin
 public class EnergyWarningInfoController {
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnergyWarningThresholdController.java

@@ -1,6 +1,7 @@
 package com.huimv.guowei.admin.controller;
 
 
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/energy-warning-threshold")
+@CrossOrigin
 public class EnergyWarningThresholdController {
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnergyWaterController.java

@@ -1,6 +1,7 @@
 package com.huimv.guowei.admin.controller;
 
 
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/energy-water")
+@CrossOrigin
 public class EnergyWaterController {
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvDataController.java

@@ -3,11 +3,7 @@ package com.huimv.guowei.admin.controller;
 
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.service.IEnvDataService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.Map;
@@ -22,6 +18,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/env-data")
+@CrossOrigin
 public class EnvDataController {
     @Resource
     private IEnvDataService envDataService;

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvDeviceChipController.java

@@ -1,6 +1,7 @@
 package com.huimv.guowei.admin.controller;
 
 
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/env-device-chip")
+@CrossOrigin
 public class EnvDeviceChipController {
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvDeviceController.java

@@ -1,9 +1,17 @@
 package com.huimv.guowei.admin.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.alibaba.druid.util.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.guowei.admin.common.utils.Result;
+import com.huimv.guowei.admin.common.utils.ResultCode;
+import com.huimv.guowei.admin.entity.EnvDevice;
+import com.huimv.guowei.admin.service.IEnvDeviceService;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,6 +23,22 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/env-device")
+@CrossOrigin
 public class EnvDeviceController {
+    @Resource
+    private IEnvDeviceService envDeviceService;
+    @PostMapping("/listDevice")
+    public Result listDevice(@RequestBody Map<String ,String> paramsMap){
+        String deviceType = paramsMap.get("deviceType");
+        String farmId = paramsMap.get("farmId");
+        String pageNo = paramsMap.get("pageNo");
+        String pageSize = paramsMap.get("pageSize");
+        Page<EnvDevice> page = new Page(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
+
+        return new Result(ResultCode.SUCCESS,envDeviceService.page(page, new QueryWrapper<EnvDevice>()
+                        .eq(!StringUtils.isEmpty(deviceType),"device_type",deviceType)
+                        .eq("farm_id",farmId)));
+    }
+
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvDeviceEquipmentController.java

@@ -1,6 +1,7 @@
 package com.huimv.guowei.admin.controller;
 
 
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/env-device-equipment")
+@CrossOrigin
 public class EnvDeviceEquipmentController {
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvDeviceOnlineController.java

@@ -1,9 +1,17 @@
 package com.huimv.guowei.admin.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.guowei.admin.common.utils.Result;
+import com.huimv.guowei.admin.common.utils.ResultCode;
+import com.huimv.guowei.admin.entity.EnvDeviceOnline;
+import com.huimv.guowei.admin.service.IEnvDeviceOnlineService;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,6 +23,28 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/env-device-online")
+@CrossOrigin
 public class EnvDeviceOnlineController {
+    @Resource
+    private IEnvDeviceOnlineService envDeviceOnlineService;
+    @PostMapping("/getDate")
+    public Result getDate(@RequestBody Map<String ,String> paramsMap){
+        String farmId = paramsMap.get("farmId");
+        Map resultMap = new HashMap();
+        EnvDeviceOnline envDeviceOnline = envDeviceOnlineService.getOne(new QueryWrapper<EnvDeviceOnline>().eq("farm_id", farmId).orderByDesc("creat_time").last("limit 1"));
+        if (ObjectUtil.isEmpty(envDeviceOnline)){
+            resultMap.put("totalDevice",0);
+            resultMap.put("deviceOn",0);
+            resultMap.put("deviceOff",0);
+            resultMap.put("onlineRate",0.0);
+        }else {
+            resultMap.put("totalDevice",envDeviceOnline.getDeviceOn()+envDeviceOnline.getDeviceOff());
+            resultMap.put("deviceOn",envDeviceOnline.getDeviceOn());
+            resultMap.put("deviceOff",envDeviceOnline.getDeviceOff());
+            resultMap.put("onlineRate",envDeviceOnline.getOnlineRate());
+        }
+        return new Result(ResultCode.SUCCESS,resultMap);
+
+    }
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvWarningInfoController.java

@@ -3,11 +3,7 @@ package com.huimv.guowei.admin.controller;
 
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.service.IEnvWarningInfoService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.Map;
@@ -22,6 +18,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/env-warning-info")
+@CrossOrigin
 public class EnvWarningInfoController {
     @Resource
     private IEnvWarningInfoService envWarningInfoService;

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/SysCameraAreaController.java

@@ -1,6 +1,7 @@
 package com.huimv.guowei.admin.controller;
 
 
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/sys-camera-area")
+@CrossOrigin
 public class SysCameraAreaController {
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/SysCameraBrandController.java

@@ -1,6 +1,7 @@
 package com.huimv.guowei.admin.controller;
 
 
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/sys-camera-brand")
+@CrossOrigin
 public class SysCameraBrandController {
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/SysCameraController.java

@@ -1,6 +1,7 @@
 package com.huimv.guowei.admin.controller;
 
 
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/sys-camera")
+@CrossOrigin
 public class SysCameraController {
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/SysCameraFunctionAreaController.java

@@ -1,6 +1,7 @@
 package com.huimv.guowei.admin.controller;
 
 
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/sys-camera-function-area")
+@CrossOrigin
 public class SysCameraFunctionAreaController {
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/SysCameraFunctionController.java

@@ -1,6 +1,7 @@
 package com.huimv.guowei.admin.controller;
 
 
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/sys-camera-function")
+@CrossOrigin
 public class SysCameraFunctionController {
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/EnvDeviceOnline.java

@@ -3,6 +3,8 @@ package com.huimv.guowei.admin.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.math.BigDecimal;
 import  java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
@@ -58,7 +60,7 @@ public class EnvDeviceOnline implements Serializable {
     /**
      * 在线率
      */
-    private String onlineRate;
+    private BigDecimal onlineRate;
 
     private String ohter1;
 

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/BaseBuildingServiceImpl.java

@@ -127,7 +127,7 @@ public class BaseBuildingServiceImpl extends ServiceImpl<BaseBuildingMapper, Bas
         Page<BaseBuilding> baseBuildingPage = this.page(page, new QueryWrapper<BaseBuilding>()
                 .eq("farm_id", farmId)
                 .eq("f_type",1)
-                .like(StringUtils.isNotBlank(stageCode), "stage_code", stageCode)
+                .eq(StringUtils.isNotBlank(stageCode), "stage_code", stageCode)
                 .like(StringUtils.isNotBlank(buildName), "build_name", buildName)
                 .orderByAsc("id"));
         return new Result(ResultCode.SUCCESS,baseBuildingPage);

huimv-admin/src/main/java/com/huimv/guowei/admin/timer/DeviceTimer.java

@@ -0,0 +1,48 @@
+package com.huimv.guowei.admin.timer;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.guowei.admin.entity.EnvDevice;
+import com.huimv.guowei.admin.entity.EnvDeviceOnline;
+import com.huimv.guowei.admin.service.IEnvDeviceOnlineService;
+import com.huimv.guowei.admin.service.IEnvDeviceService;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Configuration
+@EnableScheduling
+public class DeviceTimer {
+
+    @Resource
+    private IEnvDeviceService envDeviceService;
+    @Resource
+    private IEnvDeviceOnlineService envDeviceOnlineService;
+
+    @Scheduled(cron = "0 */5 * * * ?")
+//    @Scheduled(cron = "*/5 * * * * ?")
+    private void saveOnlineDevice(){
+        String farmId = "25";
+        double rate = 0.0;
+        Integer deviceOff = envDeviceService.count(new QueryWrapper<EnvDevice>().eq("farm_id", farmId).eq("device_status", 0));
+        Integer deviceOn = envDeviceService.count(new QueryWrapper<EnvDevice>().eq("farm_id", farmId).eq("device_status", 1));
+        Integer total = deviceOff+deviceOn;
+        try {
+            rate = (deviceOn/total)*100;
+        }catch (ArithmeticException e){
+            System.out.println(e);
+        }
+        EnvDeviceOnline envDeviceOnline = new EnvDeviceOnline();
+        envDeviceOnline.setDeviceOn(deviceOn);
+        envDeviceOnline.setDeviceOff(deviceOff);
+        envDeviceOnline.setOnlineRate(new BigDecimal(rate).setScale(2, RoundingMode.UP));
+        envDeviceOnline.setFarmId(farmId);
+        envDeviceOnline.setCreatTime(new Date());
+        envDeviceOnlineService.save(envDeviceOnline);
+    }
+}