修改门卫室通道

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/HuimvEnvironApplication.java

@@ -1,10 +1,12 @@
 package com.huimv.environ;
 
+import com.huimv.common.config.InterceptorConfig;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.client.RestTemplate;
 
@@ -18,7 +20,7 @@ import org.springframework.web.client.RestTemplate;
  **/
 @SpringBootApplication
 @MapperScan("com.huimv.environ.*.mapper")
-//@Import(InterceptorConfig.class)
+@Import(InterceptorConfig.class)
 @EnableScheduling
 public class HuimvEnvironApplication {
     public static void main(String[] args) {

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/controller/BaseRoomController.java

@@ -1,6 +1,8 @@
 package com.huimv.environ.eco.controller;
 
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
@@ -9,6 +11,9 @@ import com.huimv.environ.eco.service.IBaseRoomService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -50,6 +55,7 @@ public class BaseRoomController {
 
     @GetMapping("/listLargeScreen")
     public Result listLargeScreen(@RequestParam(name = "farmId") String farmId){
+
         return baseRoomService.listLargeScreen(farmId);
     }
 
@@ -59,4 +65,6 @@ public class BaseRoomController {
     }
 
 
+
+
 }

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/controller/EggDataCotroller.java

@@ -1,6 +1,7 @@
 package com.huimv.environ.eco.controller;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONObject;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
@@ -58,6 +59,9 @@ public class EggDataCotroller {
         for (HousVo datum : data) {
             datum.setName(datum.getI()+"号舍");
         }
+//        if(ObjectUtil.isEmpty(data)){
+//
+//        }
 
         return new Result(ResultCode.SUCCESS,data);
     }

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/entity/dto/ScreenDto.java

@@ -12,5 +12,4 @@ public class ScreenDto {
     private String dayWater;
     private String monthWater;
 
-
 }

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/BaseRoomServiceImpl.java

@@ -10,11 +10,13 @@ import com.huimv.common.utils.DataUill;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
 import com.huimv.environ.eco.entity.BaseRoom;
+import com.huimv.environ.eco.entity.EggData;
 import com.huimv.environ.eco.entity.SysHumidity;
 import com.huimv.environ.eco.entity.SysTemperature;
 import com.huimv.environ.eco.entity.dto.AllRoomEnvironment;
 import com.huimv.environ.eco.entity.dto.AllWaterEnvPowerApp;
 import com.huimv.environ.eco.entity.dto.ScreenDto;
+import com.huimv.environ.eco.entity.eggvo.EggVo;
 import com.huimv.environ.eco.mapper.*;
 import com.huimv.environ.eco.service.IBaseRoomService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -140,10 +142,34 @@ public class BaseRoomServiceImpl extends ServiceImpl<BaseRoomMapper, BaseRoom> i
         resultMap.put("roomName",baseRoom.getAlias()+baseRoom.getRoomName());
         return new Result(ResultCode.SUCCESS,resultMap);
     }
+    @Autowired
+    private EggDataMapper eggDataMapper;
 
     @Override
     public Result listLargeScreen(String farmId) {
         ScreenDto screenDto =  fodderMapper.fodderMapper(farmId);
+        Date now = new Date();
+        QueryWrapper<EggData> wrapper = new QueryWrapper<>();
+        wrapper.ge("upload_time", DateUtil.beginOfDay(now ));
+        List<EggVo> list =  eggDataMapper.getAllDay(wrapper);
+        double maxWater = 0.0;
+        if (ObjectUtil.isNotEmpty(list)){
+            for (EggVo eggVo : list) {
+                maxWater = Math.max(eggVo.getWtrTdy(), maxWater);
+            }
+        }
+
+        screenDto.setDayWater(String.format("%.2f",maxWater));
+        QueryWrapper<EggData> wrapper1 = new QueryWrapper<>();
+        wrapper1.ge("upload_time", DateUtil.beginOfMonth(now));
+        List<EggVo> list1 =  eggDataMapper.getAllWeek(wrapper1);
+        double maxWater1 = 0.0;
+        if (ObjectUtil.isNotEmpty(list1)){
+            for (EggVo eggVo : list1) {
+                maxWater1 += eggVo.getWtrTdy();
+            }
+        }
+        screenDto.setMonthWater(String.format("%.2f",maxWater1));
         return new Result(ResultCode.SUCCESS,screenDto);
 
     }

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/EggDataServiceImpl.java

@@ -38,8 +38,6 @@ public class EggDataServiceImpl extends ServiceImpl<EggDataMapper, EggData> impl
         Date now = new Date();
         DecimalFormat df = new DecimalFormat("0.00");
 
-
-
         QueryWrapper<EggData> wrapper = new QueryWrapper<>();
 
         //周
@@ -73,7 +71,7 @@ public class EggDataServiceImpl extends ServiceImpl<EggDataMapper, EggData> impl
             Map endMap = new HashMap();
             endMap.put("list" ,list);
             endMap.put("maxFood" ,maxFood);
-            endMap.put("maxWater" ,maxWater);
+            endMap.put("maxWater" ,String.format("%.2f",maxWater));
             return new Result(ResultCode.SUCCESS,endMap);
         }
 
@@ -88,8 +86,8 @@ public class EggDataServiceImpl extends ServiceImpl<EggDataMapper, EggData> impl
 
         Map endMap = new HashMap();
         endMap.put("list" ,list);
-        endMap.put("maxFood" ,maxFood);
-        endMap.put("maxWater" ,maxWater);
+        endMap.put("maxFood" , maxFood);
+        endMap.put("maxWater" ,String.format("%.2f",maxWater));
 
 
         return new Result(ResultCode.SUCCESS,endMap);

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/env/controller/AlarmController.java

@@ -82,6 +82,13 @@ public class AlarmController {
         return iAlarm.getOneWeekAlarm(farmId);
     }
 
+    @RequestMapping(value = "/getOneDayAlarm",method = RequestMethod.GET)
+    public Result getOneDayAlarm(@RequestParam(value = "farmId",required = true) Integer farmId) throws ParseException {
+        log.info("farmId>>"+farmId);
+        //
+        return iAlarm.getOneDayAlarm(farmId);
+    }
+
 
 
 

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/env/service/IAlarm.java

@@ -16,4 +16,7 @@ public interface IAlarm {
     Result getOneWeekAlarm(Integer farmId) throws ParseException;
 
     Result getAlarmRate(Integer farmId) throws ParseException, ClientException;
+
+    Result getOneDayAlarm(Integer farmId) throws ParseException;
+
 }

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/env/service/impl/AlarmImpl.java

@@ -184,6 +184,7 @@ public class AlarmImpl implements IAlarm {
         //倒序查询最近7天警报数据
         String startDate = dateUtil.getPastDate(6);
         String endDate = dateUtil.getTodayDateText();
+
         //
         List<BaseWarningInfoEntity> warningInfoEntityList = warningInfoRepo.findLastSevenDaysAlarm(farmId,startDate,endDate);
         JSONObject outJo = new JSONObject();
@@ -269,6 +270,19 @@ public class AlarmImpl implements IAlarm {
         }
     }
 
+    @Override
+    public Result getOneDayAlarm(Integer farmId)throws ParseException {
+        String startDate = dateUtil.getPastDate(0);
+        String endDate = dateUtil.getTodayDateText();
+        //
+        List<BaseWarningInfoEntity> warningInfoEntityList = warningInfoRepo.findLastSevenDaysAlarm(farmId,startDate,endDate);
+        JSONObject outJo = new JSONObject();
+        outJo.put("one",_countAlarmTotal("一级",warningInfoEntityList));
+        outJo.put("two",_countAlarmTotal("二级",warningInfoEntityList));
+        outJo.put("three",_countAlarmTotal("三级",warningInfoEntityList));
+        return new Result(ResultCode.SUCCESS,outJo);
+    }
+
     //调用大华接口返回人脸门禁的数量
     public String SendMassageGetPagePersonAlarm(String begin, String end  ) throws ClientException {
         Map<String, Object> params = new HashMap<>();

huimv-farm-datacenter-egg/huimv-farm-video/src/main/java/com/huimv/video/dhicc/controller/ClientController/ClientWeiQiangController.java

@@ -1,114 +1,114 @@
-package com.huimv.video.dhicc.controller.ClientController;
-
-import com.alibaba.fastjson.JSON;
-import com.dahuatech.hutool.http.Method;
-import com.dahuatech.icc.exception.ClientException;
-import com.dahuatech.icc.oauth.http.DefaultClient;
-import com.dahuatech.icc.oauth.http.IClient;
-import com.dahuatech.icc.oauth.model.v202010.GeneralRequest;
-import com.dahuatech.icc.oauth.model.v202010.GeneralResponse;
-import com.huimv.common.utils.StringUtilsWork;
-import com.huimv.video.dhicc.icc.CommonConstant;
-import com.huimv.video.dhicc.result.R;
-import net.sf.json.JSONObject;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-
-//其实可以整合到一起去了
-@RestController
-@RequestMapping("/event")
-public class ClientWeiQiangController {
-
-    //所有的事件接口
-    @RequestMapping("/weiQiang")
-    public R SiZhuList(@RequestBody Map<String, Object> params1) throws ClientException, ParseException {
-        Integer farmId = (int) params1.get("farmId");
-        if (farmId != 1) {
-            return R.ok("当前牧场无设备").put("data", null);
-        }
-        return R.ok("请求成功").put("data", getEventList(params1)).put("total", CountTimes(params1));
-    }
-
-
-    //围墙事件
-    public GeneralResponse getEventList(Map<String, Object> params1) throws ClientException {
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Calendar c = Calendar.getInstance();
-        Date date = new Date();
-        c.setTime(date);
-        c.set(Calendar.HOUR, 0);
-        c.set(Calendar.MINUTE, 0);
-        c.set(Calendar.SECOND, 0);
-        Date A = c.getTime();
-        String formatA = format.format(A);
-        c.set(Calendar.HOUR, +24);
-        Date d = c.getTime();
-        String formatD = format.format(d);
-        Map<String, Object> params = new HashMap<>();
-        params.put("alarmStartDateString", formatA);
-        params.put("alarmEndDateString", formatD);
-        if (StringUtilsWork.isNotEmpty((String) params1.get("alarmStartDateString"))) {
-            params.put("alarmStartDateString", (String) params1.get("alarmStartDateString"));
-            params.put("alarmEndDateString", (String) params1.get("alarmEndDateString"));
-        }
-        params.put("pageNum", (Integer) params1.get("pageNum"));
-        params.put("pageSize", (Integer) params1.get("pageSize"));
-        params.put("alarmType", 303);
-        params.put("dbType", 0);
-        params.put("deviceCategory", 1);
-        String[] nodeCodeList = CommonConstant.EggWeiQiang;
-        params.put("nodeCodeList", nodeCodeList);
-        String URL = "/evo-apigw/evo-event/1.2.0/alarm-record/page";  //获取事件URL    post请求
-        IClient iClient = new DefaultClient();
-        GeneralRequest generalRequest = new GeneralRequest(URL, Method.POST);
-        generalRequest.header("Content-Type", " application/json");
-        generalRequest.body(JSON.toJSONString(params));
-        GeneralResponse generalResponse = iClient.doAction(generalRequest, generalRequest.getResponseClass());
-        return generalResponse;
-    }
-
-
-    public String CountTimes(Map<String, Object> params1) throws ClientException {
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Calendar c = Calendar.getInstance();
-        Date date = new Date();
-        c.setTime(date);
-        c.set(Calendar.HOUR, 0);
-        c.set(Calendar.MINUTE, 0);
-        c.set(Calendar.SECOND, 0);
-        Date A = c.getTime();
-        String formatA = format.format(A);
-        c.set(Calendar.HOUR, +24);
-        Date d = c.getTime();
-        String formatD = format.format(d);
-        Map<String, Object> params = new HashMap<>();
-        params.put("alarmStartDateString", formatA);
-        params.put("alarmEndDateString", formatD);
-        if (StringUtilsWork.isNotEmpty((String) params1.get("alarmStartDateString"))) {
-            params.put("alarmStartDateString", params1.get("alarmStartDateString"));
-            params.put("alarmEndDateString", params1.get("alarmEndDateString"));
-        }
-        params.put("alarmType", 303);
-        params.put("dbType", 0);
-        params.put("deviceCategory", 1);
-        String[] nodeCodeList = CommonConstant.EggWeiQiang;
-        params.put("nodeCodeList", nodeCodeList);
-        String URL = "/evo-apigw/evo-event/1.0.0/alarm-record/count-num";  //获取事件URL    post请求
-        IClient iClient = new DefaultClient();
-        GeneralRequest generalRequest = new GeneralRequest(URL, Method.POST);
-        generalRequest.header("Content-Type", " application/json");
-        generalRequest.body(JSON.toJSONString(params));
-        JSONObject jsonObject = JSONObject.fromObject(JSONObject.fromObject(iClient.doAction(generalRequest, generalRequest.getResponseClass()).getResult()).get("data"));
-        return jsonObject.get("value").toString();
-    }
-}
-
+//package com.huimv.video.dhicc.controller.ClientController;
+//
+//import com.alibaba.fastjson.JSON;
+//import com.dahuatech.hutool.http.Method;
+//import com.dahuatech.icc.exception.ClientException;
+//import com.dahuatech.icc.oauth.http.DefaultClient;
+//import com.dahuatech.icc.oauth.http.IClient;
+//import com.dahuatech.icc.oauth.model.v202010.GeneralRequest;
+//import com.dahuatech.icc.oauth.model.v202010.GeneralResponse;
+//import com.huimv.common.utils.StringUtilsWork;
+//import com.huimv.video.dhicc.icc.CommonConstant;
+//import com.huimv.video.dhicc.result.R;
+//import net.sf.json.JSONObject;
+//import org.springframework.web.bind.annotation.RequestBody;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import java.text.ParseException;
+//import java.text.SimpleDateFormat;
+//import java.util.Calendar;
+//import java.util.Date;
+//import java.util.HashMap;
+//import java.util.Map;
+//
+//
+////其实可以整合到一起去了
+//@RestController
+//@RequestMapping("/event")
+//public class ClientWeiQiangController {
+//
+//    //所有的事件接口
+//    @RequestMapping("/weiQiang")
+//    public R SiZhuList(@RequestBody Map<String, Object> params1) throws ClientException, ParseException {
+//        Integer farmId = (int) params1.get("farmId");
+//        if (farmId != 1) {
+//            return R.ok("当前牧场无设备").put("data", null);
+//        }
+//        return R.ok("请求成功").put("data", getEventList(params1)).put("total", CountTimes(params1));
+//    }
+//
+//
+//    //围墙事件
+//    public GeneralResponse getEventList(Map<String, Object> params1) throws ClientException {
+//        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        Calendar c = Calendar.getInstance();
+//        Date date = new Date();
+//        c.setTime(date);
+//        c.set(Calendar.HOUR, 0);
+//        c.set(Calendar.MINUTE, 0);
+//        c.set(Calendar.SECOND, 0);
+//        Date A = c.getTime();
+//        String formatA = format.format(A);
+//        c.set(Calendar.HOUR, +24);
+//        Date d = c.getTime();
+//        String formatD = format.format(d);
+//        Map<String, Object> params = new HashMap<>();
+//        params.put("alarmStartDateString", formatA);
+//        params.put("alarmEndDateString", formatD);
+//        if (StringUtilsWork.isNotEmpty((String) params1.get("alarmStartDateString"))) {
+//            params.put("alarmStartDateString", (String) params1.get("alarmStartDateString"));
+//            params.put("alarmEndDateString", (String) params1.get("alarmEndDateString"));
+//        }
+//        params.put("pageNum", (Integer) params1.get("pageNum"));
+//        params.put("pageSize", (Integer) params1.get("pageSize"));
+//        params.put("alarmType", 303);
+//        params.put("dbType", 0);
+//        params.put("deviceCategory", 1);
+//        String[] nodeCodeList = CommonConstant.W;
+//        params.put("nodeCodeList", nodeCodeList);
+//        String URL = "/evo-apigw/evo-event/1.2.0/alarm-record/page";  //获取事件URL    post请求
+//        IClient iClient = new DefaultClient();
+//        GeneralRequest generalRequest = new GeneralRequest(URL, Method.POST);
+//        generalRequest.header("Content-Type", " application/json");
+//        generalRequest.body(JSON.toJSONString(params));
+//        GeneralResponse generalResponse = iClient.doAction(generalRequest, generalRequest.getResponseClass());
+//        return generalResponse;
+//    }
+//
+//
+//    public String CountTimes(Map<String, Object> params1) throws ClientException {
+//        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        Calendar c = Calendar.getInstance();
+//        Date date = new Date();
+//        c.setTime(date);
+//        c.set(Calendar.HOUR, 0);
+//        c.set(Calendar.MINUTE, 0);
+//        c.set(Calendar.SECOND, 0);
+//        Date A = c.getTime();
+//        String formatA = format.format(A);
+//        c.set(Calendar.HOUR, +24);
+//        Date d = c.getTime();
+//        String formatD = format.format(d);
+//        Map<String, Object> params = new HashMap<>();
+//        params.put("alarmStartDateString", formatA);
+//        params.put("alarmEndDateString", formatD);
+//        if (StringUtilsWork.isNotEmpty((String) params1.get("alarmStartDateString"))) {
+//            params.put("alarmStartDateString", params1.get("alarmStartDateString"));
+//            params.put("alarmEndDateString", params1.get("alarmEndDateString"));
+//        }
+//        params.put("alarmType", 303);
+//        params.put("dbType", 0);
+//        params.put("deviceCategory", 1);
+//        String[] nodeCodeList = CommonConstant.EggWeiQiang;
+//        params.put("nodeCodeList", nodeCodeList);
+//        String URL = "/evo-apigw/evo-event/1.0.0/alarm-record/count-num";  //获取事件URL    post请求
+//        IClient iClient = new DefaultClient();
+//        GeneralRequest generalRequest = new GeneralRequest(URL, Method.POST);
+//        generalRequest.header("Content-Type", " application/json");
+//        generalRequest.body(JSON.toJSONString(params));
+//        JSONObject jsonObject = JSONObject.fromObject(JSONObject.fromObject(iClient.doAction(generalRequest, generalRequest.getResponseClass()).getResult()).get("data"));
+//        return jsonObject.get("value").toString();
+//    }
+//}
+//