添加摄像头回放

huimv-farm-admin/pom.xml

@@ -12,6 +12,11 @@
     <artifactId>huimv-farm-admin</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>com.huimv</groupId>
+            <artifactId>huimv-common</artifactId>
+            <version>0.0.1</version>
+        </dependency>
 
         <dependency>
             <groupId>cn.dustlight.captcha</groupId>

huimv-farm-admin/src/main/java/com/huimv/admin/HuimvAdminApplication.java

@@ -17,7 +17,7 @@ import org.springframework.context.annotation.Import;
  **/
 @SpringBootApplication
 @MapperScan("com.huimv.admin.*.mapper")
-@Import(InterceptorConfig.class)
+//@Import(InterceptorConfig.class)
 public class HuimvAdminApplication {
     public static void main(String[] args) {
         SpringApplication.run(HuimvAdminApplication.class, args);

huimv-farm-admin/src/main/resources/application.properties

@@ -1,6 +1,6 @@
-spring.profiles.active=dev
+#spring.profiles.active=dev
 #spring.profiles.active=prod3
-#spring.profiles.active=prod
+spring.profiles.active=prod
 #spring.profiles.active=demo
 #spring.profiles.active=yv
 

huimv-farm-environ/pom.xml

@@ -24,6 +24,13 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
 
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-extension</artifactId>
+            <version>3.4.2</version>
+        </dependency>
+
         <!--        <dependency>-->
         <!--            <groupId>com.dahuatech.icc</groupId>-->
         <!--            <artifactId>java-sdk-oauth</artifactId>-->
@@ -31,11 +38,11 @@
         <!--            <scope>compile</scope>-->
         <!--        </dependency>-->
         <!--ICC-->
-<!--        <dependency>-->
-<!--            <groupId>com.huimv</groupId>-->
-<!--            <artifactId>huimv-common</artifactId>-->
-<!--            <version>0.0.1-SNAPSHOT</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.huimv</groupId>
+            <artifactId>huimv-common</artifactId>
+            <version>0.0.1</version>
+        </dependency>
         <dependency>
             <groupId>com.dahuatech.icc</groupId>
             <artifactId>java-sdk-oauth</artifactId>
@@ -50,12 +57,6 @@
             <!-- jdk版本 -->
         </dependency>
 
-        <!-- huimv.com -->
-        <dependency>
-            <groupId>com.huimv</groupId>
-            <artifactId>huimv-common</artifactId>
-            <version>0.0.1</version>
-        </dependency>
     </dependencies>
 
     <build>

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

@@ -20,11 +20,12 @@ 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) {
         ApplicationContext applicationContext = SpringApplication.run(HuimvEnvironApplication.class, args);
+
     }
     @Bean
     public static RestTemplate getRestTemplate(){

huimv-farm-environ/src/main/java/com/huimv/environ/eco/controller/EggDataController.java

@@ -1,53 +0,0 @@
-package com.huimv.environ.eco.controller;
-
-
-import com.huimv.common.utils.Result;
-import com.huimv.environ.eco.service.IEggDataService;
-import org.springframework.beans.factory.annotation.Autowired;
-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 java.util.Map;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author author
- * @since 2022-06-22
- */
-@RestController
-@RequestMapping("/eggData")
-public class EggDataController {
-    @Autowired
-    private IEggDataService eggDataService;
-
-    @PostMapping("/getAll")
-    public Result getAll(@RequestBody Map<String,String> map){
-        return eggDataService.getAll(map);
-    }
-
-    @PostMapping("/getOneData")
-    public Result getOneData(@RequestBody Map<String,String> map){
-        return eggDataService.getOneData(map);
-    }
-
-    @PostMapping("/getAllFood")
-    public Result getAllFood(@RequestBody Map<String,String> map){
-        return eggDataService.getAllFood(map);
-    }
-
-    @PostMapping("/getOneFood")
-    public Result getOneFood(@RequestBody Map<String,String> map){
-        return eggDataService.getOneFood(map);
-    }
-
-    @PostMapping("/getAllWater")
-    public Result getAllWater(@RequestBody Map<String,String> map){
-        return eggDataService.getAllWater(map);
-    }
-}

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

@@ -1,84 +0,0 @@
-package com.huimv.environ.eco.controller;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.json.JSONObject;
-import com.huimv.common.utils.Result;
-import com.huimv.common.utils.ResultCode;
-import com.huimv.environ.eco.entity.eggvo.BaseResultEntity;
-import com.huimv.environ.eco.entity.eggvo.DataVo;
-import com.huimv.environ.eco.entity.eggvo.HistoryEntity;
-import com.huimv.environ.eco.entity.eggvo.HousVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.client.RestTemplate;
-
-import java.util.Date;
-import java.util.List;
-
-@RestController
-@RequestMapping("/eggData")
-public class EggDataCotroller {
-    private static  final  String BASE_URL= "https://iot1.bigherdsman.com/api/v2/";
-    private static  final  String TOKEN= "72438b180e9168fe90db126e3310cd0b20a7196d";
-
-
-    private static  final  String ACCOUNT_LOGIN_URL= "account/login/";
-    private static  final  String ACCOUNT_INFO_URL= "account/info/";
-    private static  final  String ENTITY_CORPORATION_URL= "entity/corporation/";
-    private static  final  String ENTITY_FARM_URL= "entity/farm/";
-    private static  final  String CURRENT_STATUS_URL= "current/status/?code=";
-    private static  final  String LIST_ORIGIN_HOUSE= "hardware/list-origin-house/?code=";
-    private static  final  String HOUSE_LIST_NAME= "entity/house/list-name/?farm=";
-    private static  final  String CURRENT_LIST= "current/list/?code=";
-    private static  final  String CURRENT_DETAIL= "current/detail/?code=";
-    private static  final  String HISTORY_LIST= "history/list/?code=";
-    private static  final  String META_LIST= "meta/list-field/?category=alarm";
-    private static  final  String CURRENT_ALARMING= "current/alarming/?code=";
-    private static  final  String ALARM_RECORD= "alarm/record/?code=";
-
-    private static final String FARM_CODE = "2022011710";
-
-    @Autowired
-    private RestTemplate restTemplate;
-
-    @GetMapping("current/list")
-    public Result list(){
-        HttpHeaders headers = new HttpHeaders();
-        headers.set("Authorization","Token "+TOKEN);
-        HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
-        ResponseEntity<BaseResultEntity> forEntity = restTemplate.exchange(BASE_URL + CURRENT_LIST+FARM_CODE+"&position=all", HttpMethod.GET, httpEntity,BaseResultEntity.class );
-
-        List<HousVo> data = forEntity.getBody().getData();
-        for (HousVo datum : data) {
-            datum.setName(datum.getI()+"号舍");
-        }
-
-        return new Result(ResultCode.SUCCESS,data);
-    }
-
-    @GetMapping("history/list")
-    public Result list(@RequestParam(name = "i") String i,
-                       @RequestParam(name = "start",required = false) Long start,
-                       @RequestParam(name = "end",required = false) Long end){
-
-        HttpHeaders headers = new HttpHeaders();
-        headers.set("Authorization","Token "+TOKEN);
-        HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
-        if (start ==null){
-             start = DateUtil.beginOfDay(new Date()).getTime();
-        }
-        if (end ==null){
-            end = System.currentTimeMillis();
-        }
-        ResponseEntity<HistoryEntity> forEntity = restTemplate.exchange(BASE_URL + HISTORY_LIST+FARM_CODE+"&i="+i+"&start="+start+"&end="+end, HttpMethod.GET, httpEntity,HistoryEntity.class );
-        return new Result(ResultCode.SUCCESS,forEntity.getBody().getData());
-    }
-
-}

huimv-farm-environ/src/main/java/com/huimv/environ/eco/controller/EggFarmController.java

@@ -1,32 +0,0 @@
-package com.huimv.environ.eco.controller;
-
-
-import com.huimv.common.utils.Result;
-import com.huimv.common.utils.ResultCode;
-import com.huimv.environ.eco.service.IEggFarmService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author author
- * @since 2022-06-22
- */
-@RestController
-@RequestMapping("/eggFarm")
-public class EggFarmController {
-    @Autowired
-    private IEggFarmService eggFarmService;
-
-    @GetMapping("/list")
-    public Result list(){
-        return  new Result(ResultCode.SUCCESS,eggFarmService.list());
-    }
-
-}

huimv-farm-environ/src/main/java/com/huimv/environ/eco/controller/EggHouseController.java

@@ -1,32 +0,0 @@
-package com.huimv.environ.eco.controller;
-
-
-import com.huimv.common.utils.Result;
-import com.huimv.common.utils.ResultCode;
-import com.huimv.environ.eco.service.IEggFarmService;
-import com.huimv.environ.eco.service.IEggHouseService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author author
- * @since 2022-06-22
- */
-@RestController
-@RequestMapping("/eggHouse")
-public class EggHouseController {
-    @Autowired
-    private IEggHouseService houseService;
-
-    @GetMapping("/list")
-    public Result list(){
-        return  new Result(ResultCode.SUCCESS,houseService.list());
-    }
-}

huimv-farm-environ/src/main/java/com/huimv/environ/eco/controller/SysTelecomController.java

@@ -30,6 +30,7 @@ public class SysTelecomController {
 
     @PostMapping("/deviceResponse")
     public String deviceResponse(@RequestBody TelecomDto telecomDto) {
+        System.out.println("yyyyyyyyyyyyyyyyyy---"+telecomDto);
         Map<String, Integer> payload = telecomDto.getPayload();
 
         SysTelecom telecom = new SysTelecom();

huimv-farm-environ/src/main/java/com/huimv/environ/eco/entity/BaseRoom.java

@@ -30,5 +30,6 @@ public class BaseRoom extends Model {
     private String roomName;
 
     private String alias;
+    private Integer status;
 
 }

huimv-farm-environ/src/main/java/com/huimv/environ/eco/entity/EggData.java

@@ -1,103 +0,0 @@
-package com.huimv.environ.eco.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author author
- * @since 2022-06-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("egg_data")
-public class EggData implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 温度
-     */
-    private Double tCur;
-
-    /**
-     * 湿度
-     */
-    private Integer hR;
-
-    /**
-     * 用水，吨
-     */
-    private Double wtrTdy;
-
-    /**
-     * 用料 kg
-     */
-    private Double ftDoTalTdy;
-
-    private Double co2;
-
-    /**
-     * 舍id
-     */
-    private Integer i;
-
-    //上传时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private Date uploadTime;
-    /**
-     * 风机开启数量
-     */
-    private Integer fN;
-
-
-    /**
-     * 通风量  km3/h
-     */
-    private Integer fV;
-
-    /**
-     *通风级别
-     */
-    private Integer fLv;
-
-
-    /**
-     * 体感温度
-     */
-    private Integer tS;
-
-
-    /**
-     *目标温度
-     */
-    private Integer tT;
-
-    /**
-     *设定湿度
-     */
-    private Integer hT;
-
-    /**
-     *加热 1
-     */
-    private Integer htL;
-
-
-
-}

huimv-farm-environ/src/main/java/com/huimv/environ/eco/entity/EggFarm.java

@@ -1,50 +0,0 @@
-package com.huimv.environ.eco.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author author
- * @since 2022-06-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("egg_farm")
-public class EggFarm implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "code", type = IdType.AUTO)
-    private String code;
-
-    private String address;
-
-    private LocalDateTime createTime;
-
-    private String corporation;
-
-    private Double latitude;
-
-    private Double longitude;
-
-    private String farmType;
-
-    private String province;
-
-    private String name;
-
-    private String id;
-
-
-}

huimv-farm-environ/src/main/java/com/huimv/environ/eco/entity/EggHouse.java

@@ -1,39 +0,0 @@
-package com.huimv.environ.eco.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author author
- * @since 2022-06-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("egg_house")
-public class EggHouse implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "i", type = IdType.AUTO)
-    private Integer i;
-
-    private String cupId;
-
-    private String protocol;
-
-    private String model;
-
-    private String name;
-
-
-}

huimv-farm-environ/src/main/java/com/huimv/environ/eco/entity/dto/AllRoomEnvironment.java

@@ -12,4 +12,5 @@ public class AllRoomEnvironment {
     private Integer roomId;
 
     private String room;
+    private Integer status;
 }

huimv-farm-environ/src/main/java/com/huimv/environ/eco/mapper/EggDataMapper.java

@@ -1,31 +0,0 @@
-package com.huimv.environ.eco.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.huimv.environ.eco.entity.EggData;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huimv.environ.eco.entity.eggvo.EggVo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author author
- * @since 2022-06-22
- */
-public interface EggDataMapper extends BaseMapper<EggData> {
-
-    List<EggVo> getAllDay(@Param(Constants.WRAPPER)QueryWrapper<EggData> wrapper);
-
-    List<EggVo> getAllWeek(@Param(Constants.WRAPPER)QueryWrapper<EggData> wrapper);
-
-    List<EggVo> getAllDayFood(@Param(Constants.WRAPPER)QueryWrapper<EggData> wrapper);
-
-    List<EggVo> getAllWeekFood(@Param(Constants.WRAPPER)QueryWrapper<EggData> wrapper);
-
-    List<EggVo> getAllWater(@Param(Constants.WRAPPER)QueryWrapper<EggData> wrapper);
-}

huimv-farm-environ/src/main/java/com/huimv/environ/eco/mapper/EggFarmMapper.java

@@ -1,16 +0,0 @@
-package com.huimv.environ.eco.mapper;
-
-import com.huimv.environ.eco.entity.EggFarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author author
- * @since 2022-06-22
- */
-public interface EggFarmMapper extends BaseMapper<EggFarm> {
-
-}

huimv-farm-environ/src/main/java/com/huimv/environ/eco/mapper/EggHouseMapper.java

@@ -1,16 +0,0 @@
-package com.huimv.environ.eco.mapper;
-
-import com.huimv.environ.eco.entity.EggHouse;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author author
- * @since 2022-06-22
- */
-public interface EggHouseMapper extends BaseMapper<EggHouse> {
-
-}

huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/IEggDataService.java

@@ -1,28 +0,0 @@
-package com.huimv.environ.eco.service;
-
-import com.huimv.common.utils.Result;
-import com.huimv.environ.eco.entity.EggData;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.Map;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author author
- * @since 2022-06-22
- */
-public interface IEggDataService extends IService<EggData> {
-
-    Result getAll(Map<String,String> map);
-
-    Result getOneData(Map<String, String> map);
-
-    Result getAllFood(Map<String, String> map);
-
-    Result getOneFood(Map<String, String> map);
-
-    Result getAllWater(Map<String, String> map);
-}

huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/IEggFarmService.java

@@ -1,16 +0,0 @@
-package com.huimv.environ.eco.service;
-
-import com.huimv.environ.eco.entity.EggFarm;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author author
- * @since 2022-06-22
- */
-public interface IEggFarmService extends IService<EggFarm> {
-
-}

huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/IEggHouseService.java

@@ -1,16 +0,0 @@
-package com.huimv.environ.eco.service;
-
-import com.huimv.environ.eco.entity.EggHouse;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author author
- * @since 2022-06-22
- */
-public interface IEggHouseService extends IService<EggHouse> {
-
-}

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

@@ -57,6 +57,19 @@ public class BaseRoomServiceImpl extends ServiceImpl<BaseRoomMapper, BaseRoom> i
     public Result getAllRoomEnvironment(Integer farmId) {
         baseRoomMapper.setS();
         List<AllRoomEnvironment> list =  baseRoomMapper.getAllRoomEnvironment(farmId);
+        for (AllRoomEnvironment allRoomEnvironment : list) {
+            if (allRoomEnvironment.getStatus() != 1){
+                allRoomEnvironment.setHumidity(null);
+                allRoomEnvironment.setTemperature(null);
+            }else {
+                if (null == allRoomEnvironment.getHumidity()){
+                    allRoomEnvironment.setHumidity(0.0);
+                }
+                if (null == allRoomEnvironment.getTemperature()){
+                    allRoomEnvironment.setTemperature(0.0);
+                }
+            }
+        }
 
         return new Result(ResultCode.SUCCESS,list);
     }

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

@@ -1,370 +0,0 @@
-package com.huimv.environ.eco.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.huimv.common.utils.Result;
-import com.huimv.common.utils.ResultCode;
-import com.huimv.environ.eco.entity.EggData;
-import com.huimv.environ.eco.entity.eggvo.EggVo;
-import com.huimv.environ.eco.mapper.EggDataMapper;
-import com.huimv.environ.eco.service.IEggDataService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import jdk.nashorn.internal.ir.LiteralNode;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.text.DecimalFormat;
-import java.util.*;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author author
- * @since 2022-06-22
- */
-@Service
-public class EggDataServiceImpl extends ServiceImpl<EggDataMapper, EggData> implements IEggDataService {
-
-    @Autowired
-    private EggDataMapper eggDataMapper;
-
-    @Override
-    public Result getAll(Map<String,String> map) {
-        String startDate = map.get("startDate");
-        String endDate = map.get("endDate");
-        String type = map.get("type");
-        Date now = new Date();
-        DecimalFormat df = new DecimalFormat("0.00");
-
-
-
-        QueryWrapper<EggData> wrapper = new QueryWrapper<>();
-
-        //周
-        if (type.equals("1")){
-            wrapper.ge("upload_time", DateUtil.beginOfWeek(now));
-
-        }
-        //月
-        else if (type.equals("2")){
-            wrapper.ge("upload_time", DateUtil.beginOfMonth(now));
-        }
-        //自定义
-        else if (type.equals("3")){
-
-            wrapper.between("upload_time",startDate,endDate);
-        }
-        //今日
-        else {
-            wrapper.ge("upload_time", DateUtil.beginOfDay(now));
-           List<EggVo> list =  eggDataMapper.getAllDay(wrapper);
-           double maxFood = 0.0;
-           double maxWater = 0.0;
-
-            for (EggVo eggVo : list) {
-                maxFood = Math.max(eggVo.getFtDoTalTdy(), maxFood);
-
-                maxWater = Math.max(eggVo.getWtrTdy(), maxWater);
-            }
-
-
-            Map endMap = new HashMap();
-            endMap.put("list" ,list);
-            endMap.put("maxFood" ,maxFood);
-            endMap.put("maxWater" ,maxWater);
-            return new Result(ResultCode.SUCCESS,endMap);
-        }
-
-        List<EggVo> list =  eggDataMapper.getAllWeek(wrapper);
-        double maxFood = 0.0;
-        double maxWater = 0.0;
-
-        for (EggVo eggVo : list) {
-            maxFood += eggVo.getFtDoTalTdy();
-            maxWater += eggVo.getWtrTdy();
-        }
-
-        Map endMap = new HashMap();
-        endMap.put("list" ,list);
-        endMap.put("maxFood" ,maxFood);
-        endMap.put("maxWater" ,maxWater);
-
-
-        return new Result(ResultCode.SUCCESS,endMap);
-    }
-
-    @Override
-    public Result getOneData(Map<String, String> map) {
-        String startDate = map.get("startDate");
-        String endDate = map.get("endDate");
-        String i = map.get("i");
-        String type = map.get("type");
-        Date now = new Date();
-        DecimalFormat df = new DecimalFormat("0.00");
-        if (StringUtils.isBlank(i)){
-            i ="1";
-        }
-        QueryWrapper<EggData> wrapper = new QueryWrapper<>();
-
-        wrapper.eq("i",i);
-        //周
-        if (type.equals("1")){
-            wrapper.ge("upload_time", DateUtil.beginOfWeek(now));
-
-        }
-        //月
-        else if (type.equals("2")){
-            wrapper.ge("upload_time", DateUtil.beginOfMonth(now));
-        }
-        //自定义
-        else if (type.equals("3")){
-
-            wrapper.between("upload_time",startDate,endDate);
-        }
-        //今日
-        else {
-            wrapper.ge("upload_time", DateUtil.beginOfDay(now));
-            List<EggVo> list =  eggDataMapper.getAllDay(wrapper);
-
-            double maxFood = 0.0;
-            double maxWater = 0.0;
-
-            for (EggVo eggVo : list) {
-                maxFood = Math.max(eggVo.getFtDoTalTdy(), maxFood);
-
-                maxWater = Math.max(eggVo.getWtrTdy(), maxWater);
-            }
-
-
-            Map endMap = new HashMap();
-            endMap.put("list" ,list);
-            endMap.put("maxFood" ,df.format(maxFood));
-            endMap.put("maxWater" ,df.format(maxWater));
-            return new Result(ResultCode.SUCCESS,endMap);
-        }
-
-        List<EggVo> list =  eggDataMapper.getAllWeek(wrapper);
-        double maxFood = 0.0;
-        double maxWater = 0.0;
-
-        for (EggVo eggVo : list) {
-            maxFood += eggVo.getFtDoTalTdy();
-            maxWater += eggVo.getWtrTdy();
-        }
-
-        Map endMap = new HashMap();
-        endMap.put("list" ,list);
-        endMap.put("maxFood" ,df.format(maxFood));
-        endMap.put("maxWater" ,df.format(maxWater));
-
-
-        return new Result(ResultCode.SUCCESS,endMap);
-    }
-
-    @Override
-    public Result getAllFood(Map<String, String> map) {
-        String startDate = map.get("startDate");
-        String endDate = map.get("endDate");
-        String type = map.get("type");
-        Date now = new Date();
-        DecimalFormat df = new DecimalFormat("0.00");
-
-
-
-        QueryWrapper<EggData> wrapper = new QueryWrapper<>();
-
-        //周
-        if (type.equals("1")){
-            wrapper.ge("upload_time", DateUtil.beginOfWeek(now));
-
-        }
-        //月
-        else if (type.equals("2")){
-            wrapper.ge("upload_time", DateUtil.beginOfMonth(now));
-        }
-        //自定义
-        else if (type.equals("3")){
-
-            wrapper.between("upload_time",startDate,endDate);
-        }
-        //今日
-        else {
-            wrapper.ge("upload_time", DateUtil.beginOfDay(now));
-            List<EggVo> list =  eggDataMapper.getAllDayFood(wrapper);
-            double maxFood = 0.0;
-            double maxWater = 0.0;
-
-            for (EggVo eggVo : list) {
-                maxFood = Math.max(eggVo.getFtDoTalTdy(), maxFood);
-
-                maxWater = Math.max(eggVo.getWtrTdy(), maxWater);
-            }
-
-
-            Map endMap = new HashMap();
-            endMap.put("list" ,list);
-            endMap.put("maxFood" ,df.format(maxFood));
-            endMap.put("maxWater" ,df.format(maxWater));
-            return new Result(ResultCode.SUCCESS,endMap);
-        }
-
-
-        List<EggVo> list =  eggDataMapper.getAllWeekFood(wrapper);
-        double maxFood = 0.0;
-        double maxWater = 0.0;
-
-        for (EggVo eggVo : list) {
-            maxFood += eggVo.getFtDoTalTdy();
-            maxWater += eggVo.getWtrTdy();
-        }
-        Set<String> set = new HashSet<>();
-        for (EggVo eggVo : list) {
-            set.add(eggVo.getUploadTime());
-        }
-        List endList = new ArrayList();
-        List<String> list2 = new ArrayList<String>();
-        for (String s : set) {
-            list2.add(s);
-        }
-        for(int i = list2.size() ; i >0 ;i --){
-            String o = list2.get(i-1);
-
-            Map map1 = new HashMap();
-
-            for (EggVo eggVo : list) {
-                if (eggVo.getUploadTime().equals(o)){
-                    map1.put("value"+eggVo.getI(),eggVo.getFtDoTalTdy());
-                }
-            }
-            map1.put("updateTime",o);
-            endList.add(map1);
-        }
-
-//        for (String o : set) {
-//            Map map1 = new HashMap();
-//
-//            for (EggVo eggVo : list) {
-//                if (eggVo.getUploadTime().equals(o)){
-//                    map1.put("value"+eggVo.getI(),eggVo.getFtDoTalTdy());
-//                }
-//            }
-//            map1.put("updateTime",o);
-//            endList.add(map1);
-//        }
-
-        Map endMap = new HashMap();
-        endMap.put("list" ,endList);
-
-        endMap.put("maxFood" ,df.format(maxFood));
-        endMap.put("maxWater" ,df.format(maxWater));
-
-
-        return new Result(ResultCode.SUCCESS,endMap);
-    }
-
-    @Override
-    public Result getOneFood(Map<String, String> map) {
-        String startDate = map.get("startDate");
-        String endDate = map.get("endDate");
-        String i = map.get("i");
-        String type = map.get("type");
-        Date now = new Date();
-        DecimalFormat df = new DecimalFormat("0.00");
-        if (StringUtils.isBlank(i)){
-            i ="1";
-        }
-        QueryWrapper<EggData> wrapper = new QueryWrapper<>();
-        wrapper.eq("i",i);
-        //周
-        if (type.equals("1")){
-            wrapper.ge("upload_time", DateUtil.beginOfWeek(now));
-
-        }
-        //月
-        else if (type.equals("2")){
-            wrapper.ge("upload_time", DateUtil.beginOfMonth(now));
-        }
-        //自定义
-        else if (type.equals("3")){
-
-            wrapper.between("upload_time",startDate,endDate);
-        }
-        //今日
-        else {
-            wrapper.ge("upload_time", DateUtil.beginOfDay(now));
-            List<EggVo> list =  eggDataMapper.getAllDayFood(wrapper);
-            double maxFood = 0.0;
-            double maxWater = 0.0;
-
-            for (EggVo eggVo : list) {
-                maxFood = Math.max(eggVo.getFtDoTalTdy(), maxFood);
-
-                maxWater = Math.max(eggVo.getWtrTdy(), maxWater);
-            }
-
-
-            Map endMap = new HashMap();
-            endMap.put("list" ,list);
-            endMap.put("maxFood" ,df.format(maxFood));
-            endMap.put("maxWater" ,df.format(maxWater));
-            return new Result(ResultCode.SUCCESS,endMap);
-        }
-
-        List<EggVo> list =  eggDataMapper.getAllWeekFood(wrapper);
-        double maxFood = 0.0;
-        double maxWater = 0.0;
-
-        for (EggVo eggVo : list) {
-            maxFood += eggVo.getFtDoTalTdy();
-            maxWater += eggVo.getWtrTdy();
-        }
-
-        Map endMap = new HashMap();
-        endMap.put("list" ,list);
-        endMap.put("maxFood" ,df.format(maxFood));
-        endMap.put("maxWater" ,df.format(maxWater));
-
-
-        return new Result(ResultCode.SUCCESS,endMap);
-    }
-
-    @Override
-    public Result getAllWater(Map<String, String> map) {
-        String startDate = map.get("startDate");
-        String endDate = map.get("endDate");
-        String type = map.get("type");
-        Date now = new Date();
-        DecimalFormat df = new DecimalFormat("0.00");
-
-        QueryWrapper<EggData> wrapper = new QueryWrapper<>();
-
-        //周
-        if (type.equals("1")){
-            wrapper.ge("upload_time", DateUtil.beginOfWeek(now));
-
-        }
-        //月
-        else if (type.equals("2")){
-            wrapper.ge("upload_time", DateUtil.beginOfMonth(now));
-        }
-        //自定义
-        else if (type.equals("3")){
-
-            wrapper.between("upload_time",startDate,endDate);
-        }
-        //今日
-        else {
-            wrapper.ge("upload_time", DateUtil.beginOfDay(now));
-
-        }
-
-        List<EggVo> list =  eggDataMapper.getAllWater(wrapper);
-
-
-        return new Result(ResultCode.SUCCESS,list);
-    }
-
-}

huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/EggFarmServiceImpl.java

@@ -1,20 +0,0 @@
-package com.huimv.environ.eco.service.impl;
-
-import com.huimv.environ.eco.entity.EggFarm;
-import com.huimv.environ.eco.mapper.EggFarmMapper;
-import com.huimv.environ.eco.service.IEggFarmService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author author
- * @since 2022-06-22
- */
-@Service
-public class EggFarmServiceImpl extends ServiceImpl<EggFarmMapper, EggFarm> implements IEggFarmService {
-
-}

huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/EggHouseServiceImpl.java

@@ -1,20 +0,0 @@
-package com.huimv.environ.eco.service.impl;
-
-import com.huimv.environ.eco.entity.EggHouse;
-import com.huimv.environ.eco.mapper.EggHouseMapper;
-import com.huimv.environ.eco.service.IEggHouseService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author author
- * @since 2022-06-22
- */
-@Service
-public class EggHouseServiceImpl extends ServiceImpl<EggHouseMapper, EggHouse> implements IEggHouseService {
-
-}

huimv-farm-environ/src/main/java/com/huimv/environ/eco/timer/EggTimer.java

@@ -1,92 +0,0 @@
-package com.huimv.environ.eco.timer;
-
-
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.json.JSONObject;
-import com.huimv.common.utils.Result;
-import com.huimv.common.utils.ResultCode;
-import com.huimv.environ.eco.entity.EggData;
-import com.huimv.environ.eco.entity.EggHouse;
-import com.huimv.environ.eco.entity.eggvo.HistoryEntity;
-import com.huimv.environ.eco.entity.eggvo.HistroyOne;
-import com.huimv.environ.eco.entity.eggvo.HistroyTwo;
-import com.huimv.environ.eco.service.IEggDataService;
-import com.huimv.environ.eco.service.IEggHouseService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
-
-import java.util.Date;
-import java.util.List;
-
-@Component
-public class EggTimer {
-    private static  final  String BASE_URL= "https://iot1.bigherdsman.com/api/v2/";
-    private static  final  String TOKEN= "72438b180e9168fe90db126e3310cd0b20a7196d";
-
-    private static  final  String HISTORY_LIST= "history/list/?code=";
-    private static final String FARM_CODE = "2022011710";
-
-    @Autowired
-    private IEggDataService eggDataService;
-    @Autowired
-    private IEggHouseService eggHouseService;
-
-
-    @Scheduled(cron = "0 0/10 * * * ? ")
-    public void saveEggData (){
-        System.out.println("test");
-        RestTemplate restTemplate = new RestTemplate();
-        HttpHeaders headers = new HttpHeaders();
-        headers.set("Authorization","Token "+TOKEN);
-        HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
-
-        List<EggHouse> list = eggHouseService.list();
-        Date date= new Date();
-        long end = date.getTime();
-        DateTime dateTime = DateUtil.offsetMinute(date, -10);
-        long start = dateTime.getTime();
-
-        for (EggHouse eggHouse : list) {
-            Integer i = eggHouse.getI();
-            ResponseEntity<HistoryEntity> forEntity = restTemplate.exchange(BASE_URL + HISTORY_LIST+FARM_CODE+"&i="+i+"&start="+start+"&end="+end, HttpMethod.GET, httpEntity,HistoryEntity.class );
-
-            List<HistroyOne> data = forEntity.getBody().getData();
-            for (HistroyOne datum : data) {
-                Long uploadTime = datum.getUpload_time();
-                HistroyTwo data1 = datum.getData();
-
-                EggData eggData = new EggData();
-                eggData.setCo2(data1.getCo2());
-                eggData.setFtDoTalTdy(data1.getFt_do_tal_tdy());
-                eggData.setHR(data1.getH_r());
-                eggData.setI(i);
-                eggData.setTCur(data1.getT_cur());
-                eggData.setWtrTdy(data1.getWtr_tdy());
-                eggData.setUploadTime( new Date(uploadTime));
-
-
-                eggData.setFN( data1.getF_n());
-                eggData.setFLv( data1.getF_lv());
-                eggData.setFV(data1.getF_v() );
-                eggData.setTS(data1.getT_s());
-                eggData.setTT( data1.getT_t());
-                eggData.setHT( data1.getH_t());
-                eggData.setHtL( data1.getHt_l());
-
-
-                eggDataService.save(eggData);
-            }
-
-        }
-
-    }
-
-
-}

huimv-farm-environ/src/main/java/com/huimv/environ/env/dao/repo/BaseWarningInfoRepo.java

@@ -10,7 +10,7 @@ import java.util.List;
 public interface BaseWarningInfoRepo extends JpaRepository<BaseWarningInfoEntity, Integer>, JpaSpecificationExecutor<BaseWarningInfoEntity> {
 
     //查询今天的N条记录列表
-    @Query(nativeQuery = true,value ="SELECT level_name,DATE_FORMAT(warning_time,'%T') warning_time,msg FROM base_warning_info where farm_id=?1 AND DATE_FORMAT(warning_time,'%Y-%m-%d')=DATE_FORMAT(?2,'%Y-%m-%d') ORDER BY id DESC LIMIT ?3")
+    @Query(nativeQuery = true,value ="SELECT level_name,DATE_FORMAT(warning_time,'%T') warning_time,msg FROM base_warning_info where farm_id=?1 AND DATE_FORMAT(warning_time,'%Y-%m-%d')=DATE_FORMAT(?2,'%Y-%m-%d') ORDER BY warning_time DESC LIMIT ?3")
     List<Object[]> findTodayAlarm(Integer farmId, String today, Integer quantity);
 
     //查询最近7天警报数据
@@ -18,6 +18,6 @@ public interface BaseWarningInfoRepo extends JpaRepository<BaseWarningInfoEntity
     List<BaseWarningInfoEntity> findLastSevenDaysAlarm(Integer farmId, String startDate, String endDate);
 
     //查询今天所有报警记录
-    @Query(nativeQuery = true,value ="SELECT * FROM base_warning_info where farm_id=?1 AND DATE_FORMAT(warning_time,'%Y-%m-%d')=DATE_FORMAT(?2,'%Y-%m-%d')")
+    @Query(nativeQuery = true,value ="SELECT * FROM base_warning_info where farm_id=?1 AND DATE_FORMAT(warning_time,'%Y-%m-%d')=DATE_FORMAT(?2,'%Y-%m-%d') ORDER BY warning_time DESC")
     List<BaseWarningInfoEntity> findTodayAllAlarm(Integer farmId, String todayText);
 }

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

@@ -239,20 +239,20 @@ public class AlarmImpl implements IAlarm {
             outJa.add(dataJo1);
             dataJo1.put("name","生态监测");
             //演示
-//            dataJo1.put("value",stjcQuantity);
-            dataJo1.put("value",16);
+            dataJo1.put("value",stjcQuantity);
+//            dataJo1.put("value",16);
             //
             JSONObject dataJo2 = new JSONObject();
             outJa.add(dataJo2);
             dataJo2.put("name","环境监测");
-//            dataJo2.put("value",hjjcQuantity);
-            dataJo2.put("value",0);
+            dataJo2.put("value",hjjcQuantity);
+//            dataJo2.put("value",0);
             //
             JSONObject dataJo3 = new JSONObject();
             outJa.add(dataJo3);
             dataJo3.put("name","人员违规");
-//            dataJo3.put("value",rywgQuantity);
-            dataJo3.put("value",0);
+            dataJo3.put("value",rywgQuantity);
+//            dataJo3.put("value",0);
 //            //
 //            JSONObject dataJo4 = new JSONObject();
 //            outJa.add(dataJo4);

huimv-farm-environ/src/main/resources/com/huimv/environ/eco/mapper/BaseRoomMapper.xml

@@ -10,14 +10,14 @@
 
     <select id="getAllRoomEnvironment" resultType="com.huimv.environ.eco.entity.dto.AllRoomEnvironment">
 
-  SELECT br.room_name room,br.id room_id  , tem.value temperature, hum.value humidity
+  SELECT CONCAT(br.alias, br.room_name )room,br.id room_id  , tem.value temperature, hum.value humidity ,br.status status
         FROM
         `base_room` br
         LEFT JOIN  (
           SELECT  a.tem_id ,a.room_id , a.value `value` FROM  `sys_temperature`  a RIGHT  JOIN
                 (
                 SELECT MAX(tem_id) AS tem_id, room_id , `value` FROM `sys_temperature`
-                WHERE  TO_DAYS(create_time) = TO_DAYS(NOW()) AND `value` &lt;= 50 AND `value` &gt;= -50
+                WHERE TO_DAYS(create_time) = TO_DAYS(NOW()) AND `value` &lt;= 50 AND `value` &gt;= -50
                  GROUP BY room_id
                 ) b
                 ON  a.tem_id=  b.tem_id
@@ -29,7 +29,7 @@
           SELECT  a.hum_id ,a.room_id , a.value `value` FROM  `sys_humidity`  a RIGHT  JOIN
                 (
                 SELECT MAX(hum_id) AS hum_id, room_id , `value` FROM `sys_humidity`
-                 WHERE  TO_DAYS(create_time) = TO_DAYS(NOW())  AND `value` &lt;= 100 AND`value` &gt;= 0
+                 WHERE  TO_DAYS(create_time) = TO_DAYS(NOW()) AND  `value` &lt;= 100 AND`value` &gt;= 0
                  GROUP BY room_id
                 ) b
                 ON  a.hum_id=  b.hum_id
@@ -55,7 +55,7 @@
           SELECT  a.tem_id ,a.room_id , a.value `value` FROM  `sys_temperature`  a RIGHT  JOIN
                 (
                 SELECT MAX(tem_id) AS tem_id, room_id , `value` FROM `sys_temperature`
-                WHERE  TO_DAYS(create_time) = TO_DAYS(NOW())  AND `value` &lt;= 50 AND`value` &gt;= -50
+                WHERE   `value` &lt;= 50 AND`value` &gt;= -50
                  GROUP BY room_id
                 ) b
                 ON  a.tem_id=  b.tem_id
@@ -67,7 +67,7 @@
           SELECT  a.hum_id ,a.room_id , a.value `value` FROM  `sys_humidity`  a RIGHT  JOIN
                 (
                 SELECT MAX(hum_id) AS hum_id, room_id , `value` FROM `sys_humidity`
-                 WHERE  TO_DAYS(create_time) = TO_DAYS(NOW())  AND `value` &lt;= 100 AND`value` &gt;= 0
+                 WHERE  `value` &lt;= 100 AND`value` &gt;= 0
                   GROUP BY room_id
                 ) b
                 ON  a.hum_id=  b.hum_id

huimv-farm-produce/pom.xml

@@ -12,6 +12,11 @@
     <artifactId>huimv-farm-produce</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>com.huimv</groupId>
+            <artifactId>huimv-common</artifactId>
+            <version>0.0.1</version>
+        </dependency>
 <!--        <dependency>-->
 <!--            <groupId>org.springframework.boot</groupId>-->
 <!--            <artifactId>spring-boot-starter-web</artifactId>-->
@@ -47,16 +52,7 @@
             <artifactId>jjwt</artifactId>
             <version>0.9.1</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
+
 <!--        &lt;!&ndash;CloseableHttpClient&ndash;&gt;-->
 <!--        <dependency>-->
 <!--            <groupId>org.apache.httpcomponents</groupId>-->
@@ -124,43 +120,7 @@
             <classifier>jdk15</classifier>
             <!-- jdk版本 -->
         </dependency>
-        <!-- huimv.com -->
-<!--        <dependency>-->
-<!--            <groupId>com.huimv</groupId>-->
-<!--            <artifactId>huimv-common</artifactId>-->
-<!--            <version>0.0.1</version>-->
-<!--        </dependency>-->
-        <dependency>
-            <groupId>com.huimv</groupId>
-            <artifactId>huimv-common</artifactId>
-            <version>0.0.6-SNAPSHOT</version>
-        </dependency>
 
     </dependencies>
 
-<!--    <build>-->
-<!--        <plugins>-->
-<!--            <plugin>-->
-<!--                <groupId>org.springframework.boot</groupId>-->
-<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
-<!--                <configuration>-->
-<!--                    <includeSystemScope>true</includeSystemScope>-->
-<!--                </configuration>-->
-<!--            </plugin>-->
-<!--        </plugins>-->
-<!--    </build>-->
-    <!--	<build>-->
-    <!--		<plugins>-->
-    <!--			<plugin>-->
-    <!--				<groupId>org.springframework.boot</groupId>-->
-    <!--				<artifactId>spring-boot-maven-plugin</artifactId>-->
-    <!--			</plugin>-->
-
-    <!--			<plugin>-->
-    <!--				<groupId>org.apache.maven.plugins</groupId>-->
-    <!--				<artifactId>maven-resources-plugin</artifactId>-->
-    <!--				<version>2.6</version>-->
-    <!--			</plugin>-->
-    <!--		</plugins>-->
-    <!--	</build>-->
 </project>

huimv-farm-produce/src/main/java/com/huimv/produce/produce/service/impl/ProdSalesServiceImpl.java

@@ -89,16 +89,23 @@ public class ProdSalesServiceImpl extends ServiceImpl<ProdSalesMapper, ProdSales
         ProdSales one = this.getOne(wrapper);
         if (ObjectUtil.isNotEmpty(one)){
             //本月
-            endMap.put("nowMoney", one.getMonthMoney());
-            endMap.put("nowQuantity", one.getMonthQuantity());
+            endMap.put("nowMoney", 0);
+            endMap.put("nowQuantity", 0);
+            if (one.getMonthMoney()!=null){
+                endMap.put("nowMoney", one.getMonthMoney());
+            }
+            if (one.getMonthQuantity()!=null){
+                endMap.put("nowQuantity", one.getMonthQuantity());
+            }
+
 
             endMap.put("timeList",timeList);
             endMap.put("moneyList",moneyList);
             endMap.put("quantityList",quantityList);
             endMap.put("moneyList1",moneyList1);
         }else {
-            endMap.put("nowMoney", null);
-            endMap.put("nowQuantity", null);
+            endMap.put("nowMoney", 0);
+            endMap.put("nowQuantity", 0);
 
             endMap.put("timeList",null);
             endMap.put("moneyList",null);
@@ -118,10 +125,10 @@ public class ProdSalesServiceImpl extends ServiceImpl<ProdSalesMapper, ProdSales
             endMap.put("money", NumberUtils.format(lastone.getMonthMoney()+""));
             endMap.put("moneyPercent", PercentUtil.getGrowth(lastProdSales.getMoney(),lastTwoProdSales.getMoney()));
         }else {
-            endMap.put("quantity",null);
-            endMap.put("quantityPercent", null);
-            endMap.put("money", null);
-            endMap.put("moneyPercent", null);
+            endMap.put("quantity",0);
+            endMap.put("quantityPercent", 0);
+            endMap.put("money", 0);
+            endMap.put("moneyPercent", 0);
         }
         return new Result(ResultCode.SUCCESS,endMap);
     }
@@ -182,7 +189,7 @@ public class ProdSalesServiceImpl extends ServiceImpl<ProdSalesMapper, ProdSales
         }
         //本月
         else {
-            wrapper.ge("add_date", DataUill.getTimesMonthmorning());
+            wrapper.ge("add_date", DateUtil.beginOfMonth(new Date()));
             wrapper.isNotNull("today_quantity");
             list = this.list(wrapper);
         }

huimv-farm-produce/src/main/java/com/huimv/produce/produce/service/impl/ProdStockServiceImpl.java

@@ -104,8 +104,10 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
                     break;
                 default:
                     break;
+
             }
         }
+
         map.put("sowStock",sowStock);
         map.put("boarStock",boarStock);
         map.put("griceStock",griceStock);

huimv-farm-produce/src/main/java/com/huimv/produce/warning/controller/ProdWarningMsgController.java

@@ -31,7 +31,7 @@ public class ProdWarningMsgController {
 
     @GetMapping("/listWarningMsg")
     public Result listWarningMsg(@RequestParam(name = "farmId") Integer farmId){
-        List<ProdWarningMsg> list = warningMsgService.list(new QueryWrapper<ProdWarningMsg>().eq("farm_id", farmId).eq("add_time", DataUill.getTimesmorning()));
+        List<ProdWarningMsg> list = warningMsgService.list(new QueryWrapper<ProdWarningMsg>().eq("farm_id", farmId).eq("add_time", DataUill.getTimesmorning()).orderByDesc("tip_time"));
         return new Result(ResultCode.SUCCESS,list);
     }
 }

huimv-farm-produce/src/main/java/com/huimv/produce/warning/timer/SavWarning.java

@@ -38,9 +38,10 @@ public class SavWarning {
     @Autowired
     private IBaseWarningInfoService baseWarningInfoService;
 
-    //    @GetMapping("/test")
+//        @GetMapping("/test")
     @Scheduled(cron = "0 0/10 * * * ? ")
     public void saveEggData () throws ParseException {
+            System.out.println("test");
         RestTemplate restTemplate = new RestTemplate();
         HttpHeaders headers = new HttpHeaders();
         headers.set("Authorization","Token "+TOKEN);
@@ -48,9 +49,9 @@ public class SavWarning {
 
         Date date= new Date();
         long end = date.getTime();
-//        DateTime dateTime = DateUtil.offsetMinute(date, -10);
-//        long start = dateTime.getTime();
-        long start =  DateUtil.offsetMonth(date, -12).getTime();
+        DateTime dateTime = DateUtil.offsetMinute(date, -10);
+        long start = dateTime.getTime();
+//        long start =  DateUtil.offsetMonth(date, -12).getTime();
 
         ResponseEntity<OneWarnig> exchange = restTemplate.exchange(BASE_URL + HISTORY_LIST + FARM_CODE + "&start=" + start + "&end=" + end, HttpMethod.GET, httpEntity, OneWarnig.class);
 
@@ -119,11 +120,4 @@ public class SavWarning {
 
     }
 
-    public static void main(String[] args) {
-        SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String str = "1656737608";
-        System.out.println(sf.format(new Date(Long.parseLong(str))));
-
-    }
-
 }

huimv-farm-produce/src/test/java/com.huimv.produce/service/Test1.java

@@ -1,3 +1,4 @@
+/*
 package com.huimv.produce.service;
 
 import com.huimv.common.utils.PercentUtil;
@@ -12,6 +13,7 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 
 
+*/
 /**
  * @Project : huimv.shiwan
  * @Package : com.huimv.biosafety.uface.controller
@@ -19,7 +21,8 @@ import java.util.Calendar;
  * @Version : 1.0
  * @Author : ZhuoNing
  * @Create : 2020-12-25
- **/
+ **//*
+
 @SpringBootTest
 @RunWith(SpringRunner.class)
 public class Test1 {
@@ -95,3 +98,4 @@ public class Test1 {
         System.out.println("t2="+t2);
     }
 }
+*/

huimv-farm-receiver/pom.xml

@@ -45,6 +45,11 @@
             <version>5.7.16</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.huimv</groupId>
+            <artifactId>huimv-common</artifactId>
+            <version>0.0.1</version>
+        </dependency>
         <!--ICC-->
         <dependency>
             <groupId>com.dahuatech.icc</groupId>

huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/controller/EcoController.java

@@ -1,6 +1,7 @@
 package com.huimv.receiver.eco.controller;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.huimv.receiver.cloud.service.IWarningInfo;
 import com.huimv.receiver.eco.entity.*;
 import com.huimv.receiver.eco.service.*;
@@ -35,6 +36,11 @@ public class EcoController {
     @Autowired
     private ISysDayWaterService dayWaterService;
 
+    @Autowired
+    private IBaseRoomService baseRoomService;
+
+
+
 
 
     @PostMapping(value = "/save")
@@ -44,6 +50,21 @@ public class EcoController {
         if (ObjectUtil.isEmpty(humAndTemDto)){
             return "数据为空";
         }
+        System.out.println(humAndTemDto.toString());
+        if (1 ==humAndTemDto.getType()){
+
+            BoxStateChanged boxStateChanged = humAndTemDto.getStateChange();
+            if (ObjectUtil.isNotEmpty(boxStateChanged)){
+                UpdateWrapper<BaseRoom> wrapper = new UpdateWrapper<>();
+                wrapper.eq("box_id",boxStateChanged.id);
+                BaseRoom baseRoom = new BaseRoom();
+                baseRoom.setStatus(boxStateChanged.getState());
+                baseRoomService.update(baseRoom,wrapper);
+                System.out.println( boxStateChanged.getState() +"-------------->"+boxStateChanged.getId());
+            }
+            return "成功";
+
+        }
 
 
         List<SysHumidity> humidity = humAndTemDto.getHumidity();

huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/entity/BaseRoom.java

@@ -0,0 +1,35 @@
+package com.huimv.receiver.eco.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class BaseRoom extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String boxId;
+
+    private String roomName;
+
+    private String alias;
+    private Integer status;
+
+}

huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/entity/BoxStateChanged.java

@@ -0,0 +1,12 @@
+package com.huimv.receiver.eco.entity;
+
+import lombok.Data;
+
+@Data
+public class BoxStateChanged {
+    public long id;
+    public int state;
+    public int net;
+
+
+}

huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/entity/HumAndTemDto.java

@@ -19,4 +19,7 @@ public class HumAndTemDto {
 
     private List<SysMonthWater> monthWaters;
 
+    private BoxStateChanged stateChange;
+    private Integer type;
+
 }

huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/mapper/BaseRoomMapper.java

@@ -0,0 +1,20 @@
+package com.huimv.receiver.eco.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.receiver.eco.entity.BaseRoom;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-11
+ */
+@Repository
+public interface BaseRoomMapper extends BaseMapper<BaseRoom> {
+
+}

huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/service/IBaseRoomService.java

@@ -0,0 +1,20 @@
+package com.huimv.receiver.eco.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.receiver.eco.entity.BaseRoom;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-11
+ */
+public interface IBaseRoomService extends IService<BaseRoom> {
+
+
+
+}

huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/service/impl/BaseRoomServiceImpl.java

@@ -0,0 +1,22 @@
+package com.huimv.receiver.eco.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.receiver.eco.entity.BaseRoom;
+import com.huimv.receiver.eco.mapper.BaseRoomMapper;
+import com.huimv.receiver.eco.service.IBaseRoomService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-11
+ */
+@Service
+public class BaseRoomServiceImpl extends ServiceImpl<BaseRoomMapper, BaseRoom> implements IBaseRoomService {
+
+
+}

huimv-farm-receiver/src/main/resources/application.properties

@@ -1,6 +1,7 @@
 #spring.profiles.active=dev
 #spring.profiles.active=prod3
-spring.profiles.active=demo
+#spring.profiles.active=demo
+spring.profiles.active=prod
 #spring.profiles.active=prod2
 
 #ʱ¼ä¸ñʽÅäÖÃ

huimv-farm-video/pom.xml

@@ -65,6 +65,24 @@
 			<artifactId>commons-lang3</artifactId>
 			<version>3.7</version>
 		</dependency>
+		<!-- huimv.com -->
+		<dependency>
+			<groupId>com.huimv</groupId>
+			<artifactId>huimv-common</artifactId>
+			<version>0.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sf.json-lib</groupId>
+			<artifactId>json-lib</artifactId>
+			<version>2.2.3</version>
+			<classifier>jdk15</classifier>
+		</dependency>
+		<!-- JPA -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+
 
 	</dependencies>
 

huimv-farm-video/src/main/java/com/huimv/video/HuimvVideoApplication.java

@@ -19,7 +19,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableScheduling
 @SpringBootApplication
 @MapperScan("com.huimv.video.*.mapper")
-@Import(InterceptorConfig.class)
+//@Import(InterceptorConfig.class)
 public class HuimvVideoApplication {
     public static void main(String[] args) {
         SpringApplication.run(HuimvVideoApplication.class, args);

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

@@ -1,3 +1,4 @@
+/*
 package com.huimv.video.dhicc.controller.ClientController;
 
 import com.alibaba.fastjson.JSON;
@@ -112,3 +113,4 @@ public class ClientWeiQiangController {
     }
 }
 
+*/

huimv-farm-video/src/main/java/com/huimv/video/dhicc/service/impl/ClientAllEventServiceImpl.java

@@ -297,12 +297,13 @@ public class ClientAllEventServiceImpl implements IClientAllEventService {
         c.set(Calendar.HOUR, +24);
         Date d = c.getTime();
         String formatD = format.format(d);
-        if (!StringUtilsWork.isNotEmpty((String) params1.get("startSwingTime"))) {
-            params1.put("startSwingTime", formatA);
-            params1.put("endSwingTime", formatD);
+        if (!StringUtilsWork.isNotEmpty((String) params1.get("alarmStartDateString"))) {
+            params1.put("alarmStartDateString", formatA);
+            params1.put("alarmEndDateString", formatD);
         }
         params1.put("containDomain", "1");
-        params1.put("openResult", 0); //刷脸失败
+        params1.put("openType", "61");
+//        params1.put("openResult", 1); //刷脸失败
         String URL = "/evo-apigw/evo-accesscontrol/1.0.0/card/accessControl/swingCardRecord/bycondition/combined?";
         IClient iClient = new DefaultClient();
         GeneralRequest generalRequest = new GeneralRequest(URL + Long.valueOf(String.valueOf((new Date()).getTime())), Method.POST);

huimv-farm-video/src/main/java/com/huimv/video/dhicc/timmer/SysTelcomEnentTimmer.java

@@ -102,7 +102,7 @@ public class SysTelcomEnentTimmer {
     //每小时执行一次
     //@Scheduled(cron = " 0 */59 * * * ? ")
     // @Scheduled(cron = " 0/5 * * * * ? ")
-    // @Scheduled(cron = " 0/50 * * * * ? ")
+     @Scheduled(cron = " 0/50 * * * * ? ")
     private void updateBox() {
         //获得设备列表 查找烘干数据
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

huimv-farm-video/src/main/java/com/huimv/video/video/service/impl/BaseSpecificVideoServiceImpl.java

@@ -54,6 +54,7 @@ public class BaseSpecificVideoServiceImpl extends ServiceImpl<BaseSpecificVideoM
 
     public CameraVo getCameraVo(Camera camera) {
 
+
         String cameraAccount = camera.getAccount();
         String cameraPassword = camera.getPassword();
         String camerIp = camera.getCameraIp();
@@ -73,8 +74,14 @@ public class BaseSpecificVideoServiceImpl extends ServiceImpl<BaseSpecificVideoM
 
         CameraVo cameraVo = new CameraVo();
         cameraVo.setAreaId(areaId);
-        cameraVo.setWsUrl("ws://" + url + "/camera_relay?tcpaddr=" + cameraAccount + "%3A" + cameraPassword + "%40" + camerIp);
-        cameraVo.setRtspUrl("rtsp://" + cameraAccount + ":" + cameraPassword + "@" + camerIp + rtsp);
+        if (camera.getId() == 767){
+            cameraVo.setWsUrl("ws://" + url + "/camera_relay?tcpaddr=" + cameraAccount + "%3A" + cameraPassword + "%40" + camerIp);
+            cameraVo.setRtspUrl("rtsp://" + cameraAccount + ":" + cameraPassword + "@" + camerIp + "/cam/realmonitor?channel=2&subtype=0");
+        }else {
+            cameraVo.setWsUrl("ws://" + url + "/camera_relay?tcpaddr=" + cameraAccount + "%3A" + cameraPassword + "%40" + camerIp);
+            cameraVo.setRtspUrl("rtsp://" + cameraAccount + ":" + cameraPassword + "@" + camerIp + rtsp);
+        }
+
         cameraVo.setCameraName(cameraName);
         return cameraVo;
     }

huimv-farm-video/src/main/java/com/huimv/video/video/service/impl/CameraServiceImpl.java

@@ -63,10 +63,6 @@ public class CameraServiceImpl extends ServiceImpl<CameraMapper, Camera> impleme
 
         QueryWrapper<Camera> wrapper = new QueryWrapper<>();
 
-        if (StringUtils.isNotBlank(strchStr)) {
-            wrapper.like("camera_name", strchStr)
-                    .or().like("camera_ip", strchStr);
-        }
         if (farmId != null) {
             wrapper.eq("farm_id", farmId);
         }
@@ -78,6 +74,12 @@ public class CameraServiceImpl extends ServiceImpl<CameraMapper, Camera> impleme
         if (brandId != null) {
             wrapper.eq("brand_id", brandId);
         }
+        if (StringUtils.isNotBlank(strchStr)) {
+            wrapper.like("camera_name", strchStr)
+                    .or().like("camera_ip", strchStr);
+        }
+
+
 
         if (sort == null) {
             wrapper.orderByDesc("id");

huimv-farm-video/src/main/resources/application.properties

@@ -1,5 +1,5 @@
-spring.profiles.active=dev
+#spring.profiles.active=dev
 #spring.profiles.active=prod3
 #spring.profiles.active=demo
-#spring.profiles.active=prod
+spring.profiles.active=prod
 #spring.profiles.active=prod2

huimv-farm-video/src/main/resources/config/iccSdk.properties

@@ -1,30 +1,30 @@
-# host
-icc.sdk.host=39.171.45.196:447
-# 客户端模式
-icc.sdk.clientId=huimv
-icc.sdk.clientSecret=6df1106c-d855-4861-a774-71bf8eea0d7d
-# 1653d6c9-c611-4827-ac87-0bfd48deadd4
-# 密码校验模式
-icc.sdk.pwdClientId=huimv
-icc.sdk.pwdClientSecret=6df1106c-d855-4861-a774-71bf8eea0d7d
-icc.sdk.username=system
-icc.sdk.password=hmkj6688
-# 使用授权类型password,client_credentials
-icc.sdk.grantType=password
-
-##青莲
 ## host
-#icc.sdk.host=36.26.62.70:447
+#icc.sdk.host=39.171.45.196:447
 ## 客户端模式
 #icc.sdk.clientId=huimv
-#icc.sdk.clientSecret=1653d6c9-c611-4827-ac87-0bfd48deadd4
+#icc.sdk.clientSecret=6df1106c-d855-4861-a774-71bf8eea0d7d
 ## 1653d6c9-c611-4827-ac87-0bfd48deadd4
 ## 密码校验模式
 #icc.sdk.pwdClientId=huimv
-#icc.sdk.pwdClientSecret=1653d6c9-c611-4827-ac87-0bfd48deadd4
-##icc.sdk.username=system
-##icc.sdk.password=hmkj6688
+#icc.sdk.pwdClientSecret=6df1106c-d855-4861-a774-71bf8eea0d7d
 #icc.sdk.username=system
-#icc.sdk.password=admin123.
+#icc.sdk.password=hmkj6688
 ## 使用授权类型password,client_credentials
-#icc.sdk.grantType=password
+#icc.sdk.grantType=password
+
+#青莲
+# host
+icc.sdk.host=36.26.62.70:447
+# 客户端模式
+icc.sdk.clientId=huimv
+icc.sdk.clientSecret=1653d6c9-c611-4827-ac87-0bfd48deadd4
+# 1653d6c9-c611-4827-ac87-0bfd48deadd4
+# 密码校验模式
+icc.sdk.pwdClientId=huimv
+icc.sdk.pwdClientSecret=1653d6c9-c611-4827-ac87-0bfd48deadd4
+#icc.sdk.username=system
+#icc.sdk.password=hmkj6688
+icc.sdk.username=system
+icc.sdk.password=admin123.
+# 使用授权类型password,client_credentials
+icc.sdk.grantType=password

pom.xml

@@ -68,11 +68,11 @@
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>3.4.2</version>
         </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-extension</artifactId>
-            <version>3.4.2</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>mybatis-plus-extension</artifactId>-->
+<!--            <version>3.4.2</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-generator</artifactId>
@@ -107,9 +107,8 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <classifier>execute</classifier>
-                </configuration>
+
+
             </plugin>
 
             <plugin>