Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,34 @@
+package com.huimv.produce.controller;
+
+
+import com.huimv.common.utils.Result;
+import com.huimv.produce.service.IBaseWarningInfoService;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-02
+ */
+@RestController
+@RequestMapping("/warningInfo")
+public class BaseWarningInfoController {
+    @Autowired
+    private IBaseWarningInfoService warningInfoService;
+
+    @GetMapping("/listWarningInfo")
+    public Result listWarningInfo(@RequestParam(name = "farmId") Integer farmId){
+
+return null;
+
+    }
+
+}

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

@@ -3,6 +3,7 @@ package com.huimv.produce.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.common.utils.DataUill;
+import com.huimv.common.utils.NumberUtils;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
 import com.huimv.produce.entity.ProdCostStatistics;
@@ -36,6 +37,8 @@ public class ProdCostStatisticsController {
         CostDto costDto3 = new CostDto("育肥猪群","0","0","0");
         CostDto costDto4 = new CostDto("后备猪群","0","0","0");
         CostDto costDto5 = new CostDto("总成本","0","0","0");
+        Map map = new HashMap<>();
+
         for (ProdCostStatistics prodCostStatistics : list) {
             String projectName = prodCostStatistics.getProjectName();
 
@@ -45,6 +48,8 @@ public class ProdCostStatisticsController {
                 costDto3.setGtValue(prodCostStatistics.getFattenPig());
                 costDto4.setGtValue(prodCostStatistics.getReplaceGilt());
                 costDto5.setGtValue(prodCostStatistics.getTotal());
+
+                map.put("gt", NumberUtils.format(prodCostStatistics.getTotal()));
             }
             if ("兽药".equals(projectName)){
                 costDto1.setSyValue(prodCostStatistics.getBaseGroup());
@@ -52,6 +57,7 @@ public class ProdCostStatisticsController {
                 costDto3.setSyValue(prodCostStatistics.getFattenPig());
                 costDto4.setSyValue(prodCostStatistics.getReplaceGilt());
                 costDto5.setSyValue(prodCostStatistics.getTotal());
+                map.put("sy", NumberUtils.format(prodCostStatistics.getTotal()));
 
             }
             if ("饲料".equals(projectName)){
@@ -60,10 +66,11 @@ public class ProdCostStatisticsController {
                 costDto3.setSlValue(prodCostStatistics.getFattenPig());
                 costDto4.setSlValue(prodCostStatistics.getReplaceGilt());
                 costDto5.setSlValue(prodCostStatistics.getTotal());
+                map.put("sl", NumberUtils.format(prodCostStatistics.getTotal()));
             }
         }
 
-        Map map = new HashMap<>();
+
 
         map.put("baseGroup",costDto1);
         map.put("pigletGroup",costDto2);
@@ -71,6 +78,9 @@ public class ProdCostStatisticsController {
         map.put("replaceGilt",costDto4);
         map.put("total",costDto5);
 
+
+
+
         return new Result(ResultCode.SUCCESS,map);
     }
 

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

@@ -31,12 +31,14 @@ public class ProdGoodsWarningController {
     private IProdGoodsWarningService goodsWarningService;
 
     @PostMapping("listGoodsWarning")
-    public Result getCost(@RequestBody Map<String,Integer> map){
+    public Result listGoodsWarning(@RequestBody Map<String,Integer> map){
         Integer current = map.get("current");
         Integer farmId = map.get("farmId");
         Integer size = map.get("size");
-        QueryWrapper<ProdGoodsWarning> eq = new QueryWrapper<ProdGoodsWarning>().eq("farm_id", farmId).eq("set_time", DataUill.getTimesmorning());
+        QueryWrapper<ProdGoodsWarning> wrapper = new QueryWrapper<>();
+        wrapper.eq("farm_id", farmId);
+        Page<ProdGoodsWarning> page = goodsWarningService.page(new Page<>(current, size), wrapper);
 
-        return new Result(ResultCode.SUCCESS,goodsWarningService.page(new Page<>(current,size),eq));
+        return new Result(ResultCode.SUCCESS,page);
     }
 }

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

@@ -13,7 +13,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -29,10 +31,36 @@ public class ProdWorkPlanController {
     @Autowired
     private IProdWorkPlanService workPlanService;
 
+    @Autowired
+    private IProdWarningMsgService warningMsgService;
+
     @GetMapping("/listWorkPlan")
     public Result getCost(@RequestParam(name = "farmId") Integer farmId){
         List<ProdWorkPlan> list = workPlanService.list(new QueryWrapper<ProdWorkPlan>().eq("farm_id", farmId).eq("add_time", DataUill.getTimesmorning()));
-        return new Result(ResultCode.SUCCESS,list);
+        Map endMap = new HashMap();
+        for (ProdWorkPlan workPlan : list) {
+            String planName = workPlan.getPlanName();
+            switch (planName){
+                case "转舍计划":
+                    endMap.put("transferHouse",workPlan);
+                    break;
+                case "普免计划":
+                    endMap.put("ordinary",workPlan);
+                    break;
+                case "日常计划":
+                    endMap.put("daily",workPlan);
+                    break;
+                case "免疫计划":
+                    endMap.put("immune",workPlan);
+                    break;
+            }
+        }
+        ProdWorkPlan prodWorkPlan = new ProdWorkPlan();
+        prodWorkPlan.setPlanTimes(warningMsgService.count(new QueryWrapper<ProdWarningMsg>().eq("farm_id", farmId).eq("add_time", DataUill.getTimesmorning())));
+        prodWorkPlan.setPlanName("报警计划");
+
+        endMap.put("warning",prodWorkPlan);
+        return new Result(ResultCode.SUCCESS,endMap);
     }
 
     @GetMapping("/listLargeScreen")

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

@@ -0,0 +1,67 @@
+package com.huimv.produce.controller;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import com.huimv.produce.entity.SysThreshold;
+import com.huimv.produce.entity.SysWarningPhone;
+import com.huimv.produce.service.ISysThresholdService;
+import com.huimv.produce.service.ISysWarningPhoneService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-01
+ */
+@RestController
+@RequestMapping("/warningPhone")
+public class SysWarningPhoneController {
+    @Autowired
+    private ISysWarningPhoneService phoneService;
+
+    @PostMapping("/addWarningPhone")
+    public Result addThreshold(@RequestBody List<SysWarningPhone> warningPhones){
+        Integer id = null;
+
+        if (ObjectUtil.isEmpty(warningPhones)){
+            return new Result(10001,"参数为空",true);
+        }else {
+            id = warningPhones.get(0).getId();
+        }
+        if (ObjectUtil.isEmpty(id)){
+            phoneService.saveBatch(warningPhones);
+        }else {
+            phoneService.updateBatchById(warningPhones);
+        }
+
+        return new Result(10000,"设置成功",true);
+    }
+
+    @GetMapping("/getWarningPhone")
+    public Result getThreshold(@RequestParam(name = "farmId") String farmId){
+        List<SysWarningPhone> phones = phoneService.list(new QueryWrapper<SysWarningPhone>().eq("farm_id", farmId));
+        Map endMap = new HashMap();
+        for (SysWarningPhone phone : phones) {
+
+            Integer level = phone.getLevel();
+            if (level== 2){
+                endMap.put("two",phone);
+            }
+            if (level== 3){
+                endMap.put("three",phone);
+            }
+        }
+        return new Result(ResultCode.SUCCESS,endMap);
+    }
+}

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

@@ -0,0 +1,64 @@
+package com.huimv.produce.controller;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import com.huimv.produce.entity.SysThreshold;
+import com.huimv.produce.entity.SysWarningSet;
+import com.huimv.produce.entity.SysWarningSetBase;
+import com.huimv.produce.service.ISysThresholdService;
+import com.huimv.produce.service.ISysWarningSetBaseService;
+import com.huimv.produce.service.ISysWarningSetService;
+import com.huimv.produce.service.ISysWarningSetService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-01
+ */
+@RestController
+@RequestMapping("/warningSet")
+public class SysWarningSetController {
+    @Autowired
+    private ISysWarningSetService setService;
+
+    @Autowired
+    private ISysWarningSetBaseService setBaseService;
+
+    @PostMapping("/addWarningSet")
+    public Result addThreshold(@RequestBody List<SysWarningSet> warningSets){
+
+        List<SysWarningSet> sysWarningSets = new ArrayList<>();
+        if (ObjectUtil.isNotEmpty(warningSets)){
+            Integer farmId = warningSets.get(0).getFarmId();
+           sysWarningSets = setService.list(new QueryWrapper<SysWarningSet>().eq("farm_id", farmId));
+        }
+
+        if (ObjectUtil.isEmpty(sysWarningSets)){
+            setService.saveBatch(warningSets);
+        }else {
+            setService.updateBatchById(warningSets);
+        }
+
+        return new Result(10000,"设置成功",true);
+    }
+
+    @GetMapping("/getWarningSet")
+    public Result getThreshold(@RequestParam(name = "farmId") String farmId){
+        List<SysWarningSet> warningSets = setService.list(new QueryWrapper<SysWarningSet>().eq("farm_id", farmId));
+        if (ObjectUtil.isEmpty(warningSets)){
+            return new Result(ResultCode.SUCCESS,setBaseService.list());
+        }
+        return new Result(ResultCode.SUCCESS,warningSets);
+    }
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/icc/CommonConstant.java

@@ -0,0 +1,19 @@
+package com.huimv.produce.dhicc.icc;
+
+public class CommonConstant {
+
+    //性别 0-女 1-男
+    public static final Integer GENDER_FEMALE = 0;
+    public static final Integer GENDER_MALE = 1;
+
+    //默认分页
+    //初始页面
+    public static final Integer PAGE_NUM = 1;
+    public static final String PAGE_NUM_STR = "1";
+
+
+    //一页数据量
+    public static final Integer PAGE_SIZE = 20;
+    public static final String PAGE_SIZE_STR = "20";
+
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/icc/ITtest.java

@@ -0,0 +1,35 @@
+package com.huimv.produce.dhicc.icc;
+
+
+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;
+
+public class ITtest {
+
+
+        //1.测试获取门禁通行记录
+        public static void main(String[] args) throws ClientException {
+            IClient iClient = new DefaultClient();
+            /**
+             * 1、请求地址是统一网关入口，以 /evo-apigw 开头
+             * 2、方法参见 @see com.dahuatech.hutool.http.Method
+             */
+            GeneralRequest generalRequest = new GeneralRequest("evo-pic/1a78324a-fc4c-11eb-b5b5-6c1c71fd5d8c/20211026/1/dsf_7999c070-3618-11ec-8931-6c1c71fd5d8c_11620962_11649419.jpg?token=1:e506fe5a-67d2-421e-9057-adee542e4a6e&oss_addr=172.16.3.223:8925", Method.GET);
+            // set http post body
+            //generalRequest.body("json请求体");
+            // set http get method param 例如?name=xiao&mobile=1xxx
+            generalRequest.form("key", "value");
+            // set header
+
+            //设置map.获取数据
+
+           // generalRequest.setBody();
+            generalRequest.header("key", "value");
+            // 发起请求处理应答
+            GeneralResponse generalResponse =iClient.doAction(generalRequest, generalRequest.getResponseClass());
+    }
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/icc/IccDemo.java

@@ -0,0 +1,21 @@
+package com.huimv.produce.dhicc.icc;
+
+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.http.IccTokenResponse;
+import com.dahuatech.icc.oauth.profile.GrantType;
+
+//测试拿token的接口
+public class IccDemo {
+
+    public static void main(String[] args) {
+        try {
+            IClient client = new DefaultClient("36.26.62.70:447", "huimv","1653d6c9-c611-4827-ac87-0bfd48deadd4");
+            IccTokenResponse.IccToken clientToken = client.getAccessToken(GrantType.client_credentials);
+            System.out.println(clientToken);
+        } catch (ClientException e) {
+            e.printStackTrace();
+        }
+    }
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/icc/IccUtil.java

@@ -0,0 +1,22 @@
+package com.huimv.produce.dhicc.icc;
+
+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.http.IccTokenResponse;
+import com.dahuatech.icc.oauth.profile.IccProfile;
+
+public class IccUtil {
+    //获取token
+    public String  getToken ()   throws ClientException {
+        IClient iClient = new DefaultClient();
+        //IccProfile 授权类型，根据你的初始化使用的password,client_credentials
+        IccTokenResponse.IccToken token = iClient.getAccessToken(IccProfile.grantType);
+        System.out.println(token);
+        System.out.println("获取到的Token为："+token.getAccess_token());
+        return token.getAccess_token() ;
+    }
+
+
+
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/newcontroller/AccidentController.java

@@ -0,0 +1,74 @@
+package com.huimv.produce.dhicc.newcontroller;
+
+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 org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
+
+
+@RestController
+@RequestMapping("accident")
+@CrossOrigin
+public class AccidentController {
+
+    /**
+     * 洗消数据查询的接口，三个洗消的摄像头是固定的
+     *
+     * @param params
+     * @return
+     * @throws ClientException
+     */
+    @RequestMapping("/accident_record_xixiao")
+    public GeneralResponse getAccidentRecord(@RequestBody Map<String, Object> params) throws ClientException {
+        String URL = "/evo-apigw/evo-event/1.2.0/alarm-record/page";  //获取事件URL    post请求
+        IClient iClient = new DefaultClient();
+        System.out.println("开始执行");
+        //这种已经在配置文件里面安排了账号ip以及密码
+        GeneralRequest generalRequest = new GeneralRequest(URL, Method.POST);
+        generalRequest.header("Content-Type", " application/json");
+        System.out.println(JSON.toJSONString(params));
+        //里面是
+        generalRequest.body(JSON.toJSONString(params));
+        //发起请求处理应答
+        GeneralResponse generalResponse = iClient.doAction(generalRequest, generalRequest.getResponseClass());
+        System.out.println("执行结束");
+        return generalResponse;
+    }
+
+    /**
+     * 洗消数据查询的接口，三个洗消的摄像头是固定的
+     *
+     * @param params
+     * @return
+     * @throws ClientException
+     */
+    @RequestMapping("/accident_record_xixiao_totalpage")
+    public GeneralResponse getAccidentRecordTotalPage(@RequestBody Map<String, Object> params) throws ClientException {
+        String URL = "/evo-apigw/evo-event/1.0.0/alarm-record/count-num";  //获取事件URL    post请求
+        IClient iClient = new DefaultClient();
+        System.out.println("开始执行");
+        //这种已经在配置文件里面安排了账号ip以及密码
+        GeneralRequest generalRequest = new GeneralRequest(URL, Method.POST);
+        generalRequest.header("Content-Type", " application/json");
+        System.out.println(JSON.toJSONString(params));
+        //里面是
+        generalRequest.body(JSON.toJSONString(params));
+        //发起请求处理应答
+        GeneralResponse generalResponse = iClient.doAction(generalRequest, generalRequest.getResponseClass());
+        System.out.println("执行结束");
+        return generalResponse;
+    }
+
+
+
+
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/newcontroller/CarManageController.java

@@ -0,0 +1,67 @@
+package com.huimv.produce.dhicc.newcontroller;
+
+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 org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("car")
+@CrossOrigin
+public class CarManageController {
+        //过车的数据
+        /**
+         * 保存ntamade
+         */
+        @RequestMapping("/get_car_record")
+        public GeneralResponse getCarRecord(HttpServletRequest request ) throws ClientException {
+            System.out.println(request.getRequestURL()   );
+            System.out.println(request.getQueryString());
+            String queryString = request.getQueryString();
+            String URL = "/evo-apigw/ipms/carcapture/find/conditions?";  //获取事件URL    post请求
+            IClient iClient = new DefaultClient();
+            System.out.println("开始执行");
+            String newUrl = URL + queryString;
+            System.out.println(newUrl);
+            //这种已经在配置文件里面安排了账号ip以及密码    现在变了
+            GeneralRequest generalRequest = new GeneralRequest(newUrl, Method.GET);
+            //generalRequest.header("Content-Type", " application/json");
+            GeneralResponse generalResponse = iClient.doAction(generalRequest, generalRequest.getResponseClass());
+            System.out.println("执行结束");
+            return generalResponse;
+        }
+
+
+
+
+
+        @RequestMapping("/get_person_detail")
+        public GeneralResponse getPersonDetail( @RequestBody Map<String, Object> params ) throws ClientException {
+            String URL = "/evo-apigw/evo-accesscontrol/${version}/card/accessControl/swingCardRecord/19241";  //获取事件URL    post请求
+            IClient iClient = new DefaultClient();
+            System.out.println("开始执行");
+            String URL_id = URL + params.get("id");
+            //这种已经在配置文件里面安排了账号ip以及密码
+            GeneralRequest generalRequest = new GeneralRequest(URL_id, Method.POST);
+            generalRequest.header("Content-Type", " application/json");
+            //发起请求处理应答
+            GeneralResponse generalResponse = iClient.doAction(generalRequest, generalRequest.getResponseClass());
+            System.out.println("执行结束");
+            return generalResponse;
+        }
+
+
+
+
+
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/newcontroller/GetToken.java

@@ -0,0 +1,26 @@
+package com.huimv.produce.dhicc.newcontroller;
+
+import com.dahuatech.icc.exception.ClientException;
+import com.huimv.produce.dhicc.icc.IccUtil;
+import com.huimv.produce.dhicc.result.R;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 事件信息的最终端口*/
+@RestController
+@RequestMapping("token")
+@CrossOrigin
+public class GetToken {
+        @RequestMapping("/getToken")
+        public R getAccidentRecordPicture(HttpServletRequest request
+        ) throws ClientException {
+            String token = new IccUtil().getToken();
+            return  R.ok("请求成功").put("token",token)   ;
+        }
+    }
+
+

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/newcontroller/PersonManageController.java

@@ -0,0 +1,114 @@
+package com.huimv.produce.dhicc.newcontroller;
+
+
+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 org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+@RequestMapping("person")
+@CrossOrigin
+public class PersonManageController {
+
+
+    /**
+     * 人员通行记录 ---测试通过  ---参数说明见大华官网 https://open-icc.dahuatech.com/#/
+     * 此处只做了代理
+     *
+     *pageNum              	是	Integer	当前页
+     * pageSize	            是	Integer	分页大小
+     * startSwingTime	    否	String	查询开始时间
+     * endSwingTime	        否	String	查询结束时间
+     * openType          	否	Integer	开门类型
+     * category	           否	String	卡片类型, null-全部, 0-IC卡, 1-有源RFID, 2-CPU卡
+     * personName          	否	String	人员名称
+     * personCode	        否	String	人员编号
+     * channelCode	       否	String	通道编码
+     * deptIds	           否	String	部门ID, 部门间”, “分隔
+     * cardNumber       	否	String	卡号
+     * enterOrExit       	否	String	事件类型, null-全部, 1-进门, 2出门, 3-进/出门
+     * openResult	        否	Integer	开门结果, null-全部, 1-成功, 0-失败
+     *
+     *
+     * @param params
+     * @return
+     * @throws ClientException
+     */
+    @RequestMapping("/get_person_record")
+    public GeneralResponse getAccidentRecord( @RequestBody Map<String, Object> params ) throws ClientException {
+        String URL = "/evo-apigw/evo-accesscontrol/1.0.0/card/accessControl/swingCardRecord/bycondition/combined";  //获取事件URL    post请求
+        IClient iClient = new DefaultClient();
+        System.out.println("开始执行");
+        //这种已经在配置文件里面安排了账号ip以及密码
+        GeneralRequest generalRequest = new GeneralRequest(URL, Method.POST);
+        generalRequest.header("Content-Type", " application/json");
+        System.out.println(JSON.toJSONString(params));
+        //里面是
+        generalRequest.body(JSON.toJSONString(params));
+        //发起请求处理应答
+        GeneralResponse generalResponse = iClient.doAction(generalRequest, generalRequest.getResponseClass());
+        System.out.println("执行结束");
+        return generalResponse;
+    }
+
+
+   //总页数
+    @RequestMapping("/get_person_record_totalpage")
+    public GeneralResponse get_person_record_totalpage( @RequestBody Map<String, Object> params ) throws ClientException {
+        String URL = "/evo-apigw/evo-accesscontrol/1.0.0/card/accessControl/swingCardRecord/bycondition/combinedCount?systime=";  //获取事件URL    post请求
+        IClient iClient = new DefaultClient();
+        String timestamp = String.valueOf((new Date()).getTime());
+        Long aLong = Long.valueOf(timestamp);
+        String NewUrl = URL + aLong;
+        System.out.println("开始执行");
+        //这种已经在配置文件里面安排了账号ip以及密码
+        GeneralRequest generalRequest = new GeneralRequest(NewUrl, Method.POST);
+        System.out.println(NewUrl);
+        generalRequest.header("Content-Type", " application/json");
+        System.out.println(JSON.toJSONString(params));
+        //里面是
+        generalRequest.body(JSON.toJSONString(params));
+        //发起请求处理应答
+        GeneralResponse generalResponse = iClient.doAction(generalRequest, generalRequest.getResponseClass());
+        System.out.println("执行结束");
+        return generalResponse;
+    }
+
+
+
+
+
+
+
+
+
+    @RequestMapping("/get_person_detail")
+    public GeneralResponse getPersonDetail( @RequestBody Map<String, Object> params ) throws ClientException {
+        String URL = "/evo-apigw/evo-accesscontrol/${version}/card/accessControl/swingCardRecord/19241";  //获取事件URL    post请求
+        IClient iClient = new DefaultClient();
+        System.out.println("开始执行");
+        String URL_id = URL + params.get("id");
+        //这种已经在配置文件里面安排了账号ip以及密码
+        GeneralRequest generalRequest = new GeneralRequest(URL_id, Method.POST);
+        generalRequest.header("Content-Type", " application/json");
+        //发起请求处理应答
+        GeneralResponse generalResponse = iClient.doAction(generalRequest, generalRequest.getResponseClass());
+        System.out.println("执行结束");
+        return generalResponse;
+    }
+
+
+
+
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/result/R.java

@@ -0,0 +1,53 @@
+package com.huimv.produce.dhicc.result;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class R extends HashMap<String, Object> {
+
+    private static final long serialVersionUID = 1L;
+
+    public R() {
+        put("code", 0);
+        put("msg", "success");
+    }
+
+    public static R error() {
+        return error(500, "未知异常，请联系管理员");
+    }
+
+    public static R error(String msg) {
+        return error(500, msg);
+    }
+
+    public static R error(int code, String msg) {
+        R r = new R();
+        r.put("code", code);
+        r.put("msg", msg);
+        return r;
+    }
+
+    public static R ok(String msg) {
+        R r = new R();
+        r.put("msg", msg);
+        return r;
+    }
+
+    public static R ok(Map<String, Object> map) {
+        R r = new R();
+        r.putAll(map);
+        return r;
+    }
+
+    public static R ok() {
+        return new R();
+    }
+
+    @Override
+    public R put(String key, Object value) {
+        super.put(key, value);
+        return this;
+    }
+
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/result/RRException.java

@@ -0,0 +1,48 @@
+package com.huimv.produce.dhicc.result;
+
+public class RRException extends RuntimeException {
+	private static final long serialVersionUID = 1L;
+	
+    private String msg;
+    private int code = 500;
+    
+    public RRException(String msg) {
+		super(msg);
+		this.msg = msg;
+	}
+	
+	public RRException(String msg, Throwable e) {
+		super(msg, e);
+		this.msg = msg;
+	}
+	
+	public RRException(String msg, int code) {
+		super(msg);
+		this.msg = msg;
+		this.code = code;
+	}
+	
+	public RRException(String msg, int code, Throwable e) {
+		super(msg, e);
+		this.msg = msg;
+		this.code = code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	public int getCode() {
+		return code;
+	}
+
+	public void setCode(int code) {
+		this.code = code;
+	}
+	
+	
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/result/RRExceptionHandler.java

@@ -0,0 +1,116 @@
+/**
+ * Copyright (c) 2016-2019 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.huimv.produce.dhicc.result;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.validation.FieldError;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.HttpRequestMethodNotSupportedException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.MissingServletRequestParameterException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.servlet.NoHandlerFoundException;
+
+/**
+ * 异常处理器
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+@RestControllerAdvice
+public class RRExceptionHandler {
+	private Logger logger = LoggerFactory.getLogger(getClass());
+
+	/**
+	 * 处理自定义异常
+	 */
+	@ExceptionHandler(RRException.class)
+	public R handleRRException(RRException e){
+		R r = new R();
+		r.put("code", e.getCode());
+		r.put("msg", e.getMessage());
+		logger.error(e.getMsg(),e);
+		return r;
+	}
+
+	@ExceptionHandler(NoHandlerFoundException.class)
+	public R handlerNoFoundException(Exception e) {
+		logger.error(e.getMessage(), e);
+		return R.error(404, "路径不存在，请检查路径是否正确");
+	}
+
+	@ExceptionHandler(DuplicateKeyException.class)
+	public R handleDuplicateKeyException(DuplicateKeyException e){
+		logger.error(e.toString());
+		String message = e.getCause().getMessage();
+		String[] s = message.split(" ");
+		return R.error(600,s[2].replace("'","") + " 已经存在!");
+	}
+
+//	@ExceptionHandler(AuthorizationException.class)
+//	public R handleAuthorizationException(AuthorizationException e){
+//		logger.error(e.getMessage(), e);
+//		return R.error("没有权限，请联系管理员授权");
+//	}
+//
+//	@ExceptionHandler(value = LimitAccessException.class)
+//	public R handleLimitAccessException(LimitAccessException e) {
+//		logger.error("LimitAccessException", e);
+//		return  R.error(429,e.getMessage());
+//	}
+
+	//当校验失败时，会抛出MethodArgumentNotValidException
+	//输出错误原因到前端
+	@ExceptionHandler(MethodArgumentNotValidException.class)
+	public R handleMethodArgumentNotValidException(MethodArgumentNotValidException ex) {
+		logger.error(ex.getMessage(),ex);
+		StringBuilder sb = new StringBuilder();
+		for(ObjectError error : ex.getBindingResult().getAllErrors()){
+			if(error instanceof FieldError){
+				FieldError e = (FieldError) error;
+				sb.append(e.getField()).append(e.getDefaultMessage()).append(" ");
+			}
+		}
+		return R.error(1001,sb.toString());
+	}
+
+//	@ExceptionHandler(ConstraintViolationException.class)
+//	public R handleConstraintViolationException(ConstraintViolationException e) {
+//		logger.error(e.getMessage(),e);
+//		StringBuilder sb = new StringBuilder();
+//		e.getConstraintViolations().forEach(constraintViolation -> sb.append(constraintViolation.getMessage()).append(" "));
+//		return R.error(1001,sb.toString().substring(0,sb.length() - 1));
+//	}
+
+	@ExceptionHandler(MissingServletRequestParameterException.class)
+	public R handMissingServletRequestParameterException(MissingServletRequestParameterException e) {
+		logger.error(e.getMessage(),e);
+		return R.error(1001,e.getMessage());
+	}
+
+	@ExceptionHandler(DataIntegrityViolationException.class)
+	public R handDataIntegrityViolationException(DataIntegrityViolationException e) {
+		logger.error(e.getMessage(),e);
+		return R.error(1001,e.getCause().getMessage());
+	}
+
+	@ExceptionHandler(HttpRequestMethodNotSupportedException.class)
+	public R handHttpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e) {
+		logger.error(e.getMessage(), e);
+		return R.error(1001, e.getMessage());
+	}
+	@ExceptionHandler(Exception.class)
+	public R handleException(Exception e){
+		logger.error(e.getMessage(), e);
+		return R.error();
+	}
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/entity/BaseWarningInfo.java

@@ -0,0 +1,39 @@
+package com.huimv.produce.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class BaseWarningInfo extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer farmId;
+
+    private Integer level;
+
+    private String msg;
+
+    private String levelName;
+
+    private String warningName;
+
+
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/entity/SysWarningPhone.java

@@ -0,0 +1,36 @@
+package com.huimv.produce.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-12-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class SysWarningPhone extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer farmId;
+
+    private String wraningName;
+
+    private String phone;
+
+    private Integer level;
+
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/entity/SysWarningSet.java

@@ -0,0 +1,47 @@
+package com.huimv.produce.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class SysWarningSet extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer farmId;
+
+    /**
+     * 大项
+     */
+    private String major;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    private Boolean firstLevel;
+
+    private Boolean secondLevel;
+
+    private Boolean thirdlyLevel;
+
+
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/entity/SysWarningSetBase.java

@@ -0,0 +1,45 @@
+package com.huimv.produce.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class SysWarningSetBase extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "base_id", type = IdType.AUTO)
+    private Integer baseId;
+
+    /**
+     * 大项
+     */
+    private String major;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    private Boolean firstLevel;
+
+    private Boolean secondLevel;
+
+    private Boolean thirdlyLevel;
+
+
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/mapper/BaseWarningInfoMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.produce.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.produce.entity.BaseWarningInfo;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-02
+ */
+public interface BaseWarningInfoMapper extends BaseMapper<BaseWarningInfo> {
+
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/mapper/SysWarningPhoneMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.produce.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.produce.entity.SysWarningPhone;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-01
+ */
+public interface SysWarningPhoneMapper extends BaseMapper<SysWarningPhone> {
+
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/mapper/SysWarningSetBaseMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.produce.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.produce.entity.SysWarningSetBase;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-01
+ */
+public interface SysWarningSetBaseMapper extends BaseMapper<SysWarningSetBase> {
+
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/mapper/SysWarningSetMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.produce.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.produce.entity.SysWarningSet;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-01
+ */
+public interface SysWarningSetMapper extends BaseMapper<SysWarningSet> {
+
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/service/IBaseWarningInfoService.java

@@ -0,0 +1,16 @@
+package com.huimv.produce.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.produce.entity.BaseWarningInfo;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-02
+ */
+public interface IBaseWarningInfoService extends IService<BaseWarningInfo> {
+
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/service/ISysWarningPhoneService.java

@@ -0,0 +1,16 @@
+package com.huimv.produce.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.produce.entity.SysWarningPhone;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-01
+ */
+public interface ISysWarningPhoneService extends IService<SysWarningPhone> {
+
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/service/ISysWarningSetBaseService.java

@@ -0,0 +1,16 @@
+package com.huimv.produce.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.produce.entity.SysWarningSetBase;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-01
+ */
+public interface ISysWarningSetBaseService extends IService<SysWarningSetBase> {
+
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/service/ISysWarningSetService.java

@@ -0,0 +1,16 @@
+package com.huimv.produce.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.produce.entity.SysWarningSet;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-01
+ */
+public interface ISysWarningSetService extends IService<SysWarningSet> {
+
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/service/impl/BaseRoomServiceImpl.java

@@ -51,8 +51,8 @@ public class BaseRoomServiceImpl extends ServiceImpl<BaseRoomMapper, BaseRoom> i
         List resultList = new ArrayList();
         for (BaseRoom baseRoom : roomList) {
             Map map =new HashMap();
-            SysHumidity humidity = humidityMapper.selectOne(new QueryWrapper<SysHumidity>().eq("farm_id",farmId).eq("room_id", baseRoom.getId()).last("ORDER BY hum_id  DESC limit 1"));
-            SysTemperature temperature = temperatureMapper.selectOne(new QueryWrapper<SysTemperature>().eq("farm_id",farmId).eq("room_id", baseRoom.getId()).last("ORDER BY tem_id  DESC limit 1"));
+            SysHumidity humidity = humidityMapper.selectOne(new QueryWrapper<SysHumidity>().ge("create_time",DataUill.getTimesmorning()).eq("farm_id",farmId).eq("room_id", baseRoom.getId()).last("ORDER BY hum_id  DESC limit 1"));
+            SysTemperature temperature = temperatureMapper.selectOne(new QueryWrapper<SysTemperature>().ge("create_time",DataUill.getTimesmorning()).eq("farm_id",farmId).eq("room_id", baseRoom.getId()).last("ORDER BY tem_id  DESC limit 1"));
             if (humidity != null){
                 map.put("humidity",humidity.getValue());
             }else {

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/service/impl/BaseWarningInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.produce.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.produce.entity.BaseWarningInfo;
+import com.huimv.produce.mapper.BaseWarningInfoMapper;
+import com.huimv.produce.service.IBaseWarningInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-02
+ */
+@Service
+public class BaseWarningInfoServiceImpl extends ServiceImpl<BaseWarningInfoMapper, BaseWarningInfo> implements IBaseWarningInfoService {
+
+}

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

@@ -2,10 +2,7 @@ package com.huimv.produce.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.huimv.common.utils.DataUill;
-import com.huimv.common.utils.PercentUtil;
-import com.huimv.common.utils.Result;
-import com.huimv.common.utils.ResultCode;
+import com.huimv.common.utils.*;
 import com.huimv.produce.entity.ProdCostStatistics;
 import com.huimv.produce.entity.ProdSales;
 import com.huimv.produce.entity.dto.ClientHomeDto;
@@ -16,6 +13,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -44,6 +42,7 @@ public class ProdSalesServiceImpl extends ServiceImpl<ProdSalesMapper, ProdSales
         QueryWrapper<ProdSales> wrapper = new QueryWrapper<>();
         wrapper.eq("farm_id",farmId);
         Map endMap = new HashMap();
+
         List<ProdSales> list = new ArrayList<>();
         //本周
         if (1==type){
@@ -80,22 +79,25 @@ public class ProdSalesServiceImpl extends ServiceImpl<ProdSalesMapper, ProdSales
         List timeList = new ArrayList();
         List moneyList = new ArrayList();
         List quantityList = new ArrayList();
+        List moneyList1 = new ArrayList();
 
 
         for (ProdSales prodSales : list) {
             timeList.add(DateUtil.format(prodSales.getAddDate(),"MM-dd"));
             moneyList.add(  prodSales.getTodayMoney());
+
             quantityList.add(  prodSales.getTodayQuantity());
+            moneyList1.add( NumberUtils.format( prodSales.getTodayMoney()));
         }
 
         endMap.put("timeList",timeList);
         endMap.put("moneyList",moneyList);
         endMap.put("quantityList",quantityList);
-
+        endMap.put("moneyList1",moneyList1);
 
         endMap.put("quantity",lastProdSales.getQuantity());
         endMap.put("quantityPercent", PercentUtil.getGrowth(lastProdSales.getQuantity(),lastTwoProdSales.getQuantity()));
-        endMap.put("money",lastProdSales.getMoney());
+        endMap.put("money",NumberUtils.format(lastProdSales.getMoney()+""));
         endMap.put("moneyPercent", PercentUtil.getGrowth(lastProdSales.getMoney(),lastTwoProdSales.getMoney()));
         return new Result(ResultCode.SUCCESS,endMap);
     }

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

@@ -1,5 +1,6 @@
 package com.huimv.produce.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.produce.entity.ProdStock;
@@ -55,6 +56,7 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
 //        wrapper4.eq("stock_type","fatpig_stock");
 //        List<ProdStock> fatpigStock = this.list(wrapper);
 //        map.put("fatpigStock",fatpigStock);
+        Date now = new Date();
 
         List list = new ArrayList();
         list.add("sow_stock");

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/service/impl/SysFodderServiceImpl.java

@@ -94,7 +94,7 @@ public class SysFodderServiceImpl extends ServiceImpl<SysFodderMapper, SysFodder
         wrapper.eq("floor_id",floorId);
         Map endMap = new HashMap();
         //自定义
-        if ("3".equals(type+"")){
+        if ("4".equals(type+"")){
             endDate = endDate +" 23:59:59";
             startDate = startDate+" 00:00:00";
             wrapper.between("create_time",startDate,endDate);

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/service/impl/SysWarningPhoneServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.produce.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.produce.entity.SysWarningPhone;
+import com.huimv.produce.mapper.SysWarningPhoneMapper;
+import com.huimv.produce.service.ISysWarningPhoneService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-01
+ */
+@Service
+public class SysWarningPhoneServiceImpl extends ServiceImpl<SysWarningPhoneMapper, SysWarningPhone> implements ISysWarningPhoneService {
+
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/service/impl/SysWarningSetBaseServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.produce.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.produce.entity.SysWarningSetBase;
+import com.huimv.produce.mapper.SysWarningSetBaseMapper;
+import com.huimv.produce.service.ISysWarningSetBaseService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-01
+ */
+@Service
+public class SysWarningSetBaseServiceImpl extends ServiceImpl<SysWarningSetBaseMapper, SysWarningSetBase> implements ISysWarningSetBaseService {
+
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/service/impl/SysWarningSetServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.produce.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.produce.entity.SysWarningSet;
+import com.huimv.produce.mapper.SysWarningSetMapper;
+import com.huimv.produce.service.ISysWarningSetService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-01
+ */
+@Service
+public class SysWarningSetServiceImpl extends ServiceImpl<SysWarningSetMapper, SysWarningSet> implements ISysWarningSetService {
+
+}

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

@@ -24,9 +24,7 @@ import org.springframework.stereotype.Component;
 
 import java.io.IOException;
 import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 @Component
 public class SgdTimer {
@@ -53,6 +51,7 @@ public class SgdTimer {
     @Autowired
     private ISysFodderService fodderService;
 
+
     private Integer hyFarmId = 1;
 
   /*  //更新盒子,房间信息
@@ -112,6 +111,7 @@ public class SgdTimer {
     //更新环境数据
     @Scheduled(cron = "0 0/30 * * * ?")
     private void updateEnv(){
+
         ConsoleLoggerFactory loggerFactory = new ConsoleLoggerFactory();
         // 指定连接服务器的凭据参数
         TokenManager tokenManager = new TokenManager(new StaticCredentialProvider(Global.clientId, Global.clientSecret, Global.username, Global.password), Global.idServerUrl, loggerFactory);
@@ -121,7 +121,6 @@ public class SgdTimer {
 
 
         try {
-
         List<BaseBox> boxes = baseBoxService.list();
         for (BaseBox box : boxes) {
             String uid = box.getUid();
@@ -191,13 +190,11 @@ public class SgdTimer {
                 humidityService.saveBatch(humList);
                 temperatureService.saveBatch(temList);
 
-            }
 
 
+            }
         }
 
-
-
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -422,18 +419,15 @@ public class SgdTimer {
         if (oldVale < value){
             oneFodder.setValue(value);
             fodderService.updateById(oneFodder);
-//            System.out.println("一号楼更新------------>"+monitoryValue);
         }else if (value < oldVale){
             SysFodder fodder = new SysFodder();
             fodder.setValue(value);
             fodder.setCreateTime(monitoryValue.getTimestamp());
             fodder.setFloorId(1);
             fodder.setId(monitoryValue.getId());
-            fodder.setFodderId(hyFarmId);
+            fodder.setFarmId(hyFarmId);
             fodderService.save(fodder);
-//            System.out.println("一号楼新增------------>"+monitoryValue);
-        }else {
-//            System.out.println("一号楼舍弃------------>"+monitoryValue);
+
         }
 
 

huimv-farm-v2/huimv-produce-warning/src/main/resources/application-dev.yml

@@ -9,8 +9,12 @@ spring:
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
-  jpa:
-    hibernate:
-      ddl-auto: update
-    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
-    show-sql: true
+#  jpa:
+#    hibernate:
+#      ddl-auto: update
+#    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+#    show-sql: true
+
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

huimv-farm-v2/huimv-produce-warning/src/main/resources/com/huimv/produce/mapper/ProdSalesMapper.xml

@@ -20,11 +20,11 @@
 
        IFNULL((SELECT today_money
         FROM `prod_sales`
-        WHERE farm_id = #{farmId} AND TO_DAYS(NOW( ) ) - TO_DAYS( add_date) <= 1  ) ,0)money,
+        WHERE farm_id = #{farmId} AND TO_DAYS(NOW( ) ) - TO_DAYS( add_date) = 1  ) ,0)money,
 
        IFNULL ( (SELECT today_quantity
         FROM `prod_sales`
-        WHERE farm_id = #{farmId} AND TO_DAYS(NOW( ) ) - TO_DAYS( add_date) <= 1  ),0) quantity,
+        WHERE farm_id = #{farmId} AND TO_DAYS(NOW( ) ) - TO_DAYS( add_date) = 1  ),0) quantity,
 
         IFNULL ((SELECT week_quantity
         FROM `prod_sales`