咳嗽管家

huimv-eartag2-admin/src/test/java/com/huimv/eartag2/admin/CodeGenerator.java

@@ -17,7 +17,6 @@ import com.baomidou.mybatisplus.generator.config.PackageConfig;
 import com.baomidou.mybatisplus.generator.config.StrategyConfig;
 import com.baomidou.mybatisplus.generator.config.rules.DateType;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import org.junit.platform.commons.util.StringUtils;
 
 import java.util.Scanner;
 

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

@@ -24,7 +24,7 @@ import org.springframework.web.client.RestTemplate;
 @EnableScheduling
 public class HuimvEnvironApplication {
     public static void main(String[] args) {
-        ApplicationContext applicationContext = SpringApplication.run(HuimvEnvironApplication.class, args);
+         SpringApplication.run(HuimvEnvironApplication.class, args);
 
     }
     @Bean

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

@@ -85,10 +85,11 @@ public class BaseRoomServiceImpl extends ServiceImpl<BaseRoomMapper, BaseRoom> i
         baseRoomMapper.setS();
         BaseRoom baseRoom = new BaseRoom();
         if (StrUtil.isBlank(roomId)){
-            baseRoom =  this.getOne(new QueryWrapper<BaseRoom>().eq("farm_id",farmId).last("limit 1"));
-            if (ObjectUtil.isNotEmpty(baseRoom)){
-                roomId = baseRoom.getId()+"";
-            }
+          roomId  = "157";
+//            baseRoom =  this.getOne(new QueryWrapper<BaseRoom>().eq("farm_id",farmId).last("limit 1"));
+//            if (ObjectUtil.isNotEmpty(baseRoom)){
+//                roomId = baseRoom.getId()+"";
+//            }
 
         }
         baseRoom =this.getById(roomId);

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

@@ -57,10 +57,11 @@ public class SysDayWaterServiceImpl extends ServiceImpl<SysDayWaterMapper, SysDa
         baseRoomMapper.setS();
         BaseRoom baseRoom ;
         if (roomId == null){
-            baseRoom =  baseRoomMapper.selectOne(new QueryWrapper<BaseRoom>().eq("farm_id",farmId).last("limit 1"));
+            roomId = "157";
+           /* baseRoom =  baseRoomMapper.selectOne(new QueryWrapper<BaseRoom>().eq("farm_id",farmId).last("limit 1"));
             if (ObjectUtil.isNotEmpty(baseRoom)){
                 roomId = baseRoom.getId()+"";
-            }
+            }*/
         }
         baseRoom =baseRoomMapper.selectById(roomId);
 

huimv-farm-environ/src/test/java/com/huimv/environ/eco/CodeGenerator.java

@@ -1,125 +1,125 @@
-package com.huimv.environ.eco;
-
-/**
- * @Project :
- * @Package :
- * @Description : TODO
- * @Version : 1.0
- * @Author : ZhuoNing
- * @Create :
- **/
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
-import com.baomidou.mybatisplus.generator.AutoGenerator;
-import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
-import com.baomidou.mybatisplus.generator.config.GlobalConfig;
-import com.baomidou.mybatisplus.generator.config.PackageConfig;
-import com.baomidou.mybatisplus.generator.config.StrategyConfig;
-import com.baomidou.mybatisplus.generator.config.rules.DateType;
-import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import org.junit.platform.commons.util.StringUtils;
-
-import java.util.Scanner;
-
-public class CodeGenerator {
-    // user defined
-    private static String childProjectPath = "/huimv-farm-environ";
-    private static String rootPackage = "com.huimv.environ.eco";
-    private static String dbIp = "192.168.1.7";
-    private static String dbPort = "3306";
-    private static String dbName = "huimv-lishui";
-    private static String driverName = "com.mysql.cj.jdbc.Driver";
-    private static String username = "root";
-    private static String password = "hm123456";
-
-    public static String scanner(String tip) {
-        Scanner scanner = new Scanner(System.in);
-        StringBuilder help = new StringBuilder();
-        help.append("请输入" + tip + "：");
-        System.out.println(help.toString());
-        if (scanner.hasNext()) {
-            String ipt = scanner.next();
-            if (StringUtils.isNotBlank(ipt)) {
-                return ipt;
-            }
-        }
-        throw new MybatisPlusException("请输入正确的" + tip + "！");
-    }
-
-    public static void main(String[] args) {
-        // 代码生成器
-        AutoGenerator mpg = new AutoGenerator();
-
-        // 全局配置
-        GlobalConfig gc = new GlobalConfig();
-        String rootPath = System.getProperty("user.dir");
-        System.out.println("rootPath + childProjectPath="+rootPath + childProjectPath);
-        gc.setOutputDir(rootPath + childProjectPath + "/src/main/java");//设置代码生成路径
-        gc.setFileOverride(true);//是否覆盖以前文件
-        gc.setOpen(false);//是否打开生成目录
-        gc.setAuthor("zn");//设置项目作者名称
-        gc.setIdType(IdType.AUTO);//设置主键策略
-        gc.setBaseResultMap(true);//生成基本ResultMap
-        gc.setBaseColumnList(true);//生成基本ColumnList
-        gc.setServiceName("%sService");//去掉服务默认前缀
-        gc.setDateType(DateType.ONLY_DATE);//设置时间类型
-        mpg.setGlobalConfig(gc);
-
-        // 数据源配置
-        DataSourceConfig dsc = new DataSourceConfig();
-        String url = "jdbc:mysql://"+dbIp+":"+dbPort+"/"+dbName+"?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai";
-        System.out.println("url="+url);
-        System.out.println("driverName="+driverName);
-        System.out.println("username="+username);
-        System.out.println("password="+password);
-        dsc.setUrl(url);
-        dsc.setDriverName(driverName);
-        dsc.setUsername(username);
-        dsc.setPassword(password);
-        mpg.setDataSource(dsc);
-
-        // 包配置
-        PackageConfig pc = new PackageConfig();
-        pc.setParent(rootPackage);
-        pc.setMapper("mapper");
-        pc.setXml("mapper.xml");
-//        pc.setEntity("pojo");
-        pc.setEntity("entity");
-        pc.setService("service");
-        pc.setServiceImpl("service.impl");
-        pc.setController("controller");
-        mpg.setPackageInfo(pc);
-
-        // 策略配置
-        StrategyConfig sc = new StrategyConfig();
-        sc.setNaming(NamingStrategy.underline_to_camel);
-        sc.setColumnNaming(NamingStrategy.underline_to_camel);
-        sc.setEntityLombokModel(true);//自动lombok
-        sc.setRestControllerStyle(true);
-        sc.setControllerMappingHyphenStyle(true);
-
-        sc.setLogicDeleteFieldName("deleted");//设置逻辑删除
-
-        //设置自动填充配置
-//        TableFill gmt_create = new TableFill("create_time", FieldFill.INSERT);
-//        TableFill gmt_modified = new TableFill("update_time", FieldFill.INSERT_UPDATE);
-//        ArrayList<TableFill> tableFills=new ArrayList<>();
-//        tableFills.add(gmt_create);
-//        tableFills.add(gmt_modified);
-//        sc.setTableFillList(tableFills);
-
-        //乐观锁
-        sc.setVersionFieldName("version");
-        sc.setRestControllerStyle(true);//驼峰命名
-
-
-
-        //  sc.setTablePrefix("tbl_"); 设置表名前缀
-        sc.setInclude(scanner("表名，多个英文逗号分割").split(","));
-        mpg.setStrategy(sc);
-
-        // 生成代码
-        mpg.execute();
-    }
-
-}
+//package com.huimv.environ.eco;
+//
+///**
+// * @Project :
+// * @Package :
+// * @Description : TODO
+// * @Version : 1.0
+// * @Author : ZhuoNing
+// * @Create :
+// **/
+//import com.baomidou.mybatisplus.annotation.IdType;
+//import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
+//import com.baomidou.mybatisplus.generator.AutoGenerator;
+//import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
+//import com.baomidou.mybatisplus.generator.config.GlobalConfig;
+//import com.baomidou.mybatisplus.generator.config.PackageConfig;
+//import com.baomidou.mybatisplus.generator.config.StrategyConfig;
+//import com.baomidou.mybatisplus.generator.config.rules.DateType;
+//import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+//import org.junit.platform.commons.util.StringUtils;
+//
+//import java.util.Scanner;
+//
+//public class CodeGenerator {
+//    // user defined
+//    private static String childProjectPath = "/huimv-farm-environ";
+//    private static String rootPackage = "com.huimv.environ.eco";
+//    private static String dbIp = "192.168.1.7";
+//    private static String dbPort = "3306";
+//    private static String dbName = "huimv-lishui";
+//    private static String driverName = "com.mysql.cj.jdbc.Driver";
+//    private static String username = "root";
+//    private static String password = "hm123456";
+//
+//    public static String scanner(String tip) {
+//        Scanner scanner = new Scanner(System.in);
+//        StringBuilder help = new StringBuilder();
+//        help.append("请输入" + tip + "：");
+//        System.out.println(help.toString());
+//        if (scanner.hasNext()) {
+//            String ipt = scanner.next();
+//            if (StringUtils.isNotBlank(ipt)) {
+//                return ipt;
+//            }
+//        }
+//        throw new MybatisPlusException("请输入正确的" + tip + "！");
+//    }
+//
+//    public static void main(String[] args) {
+//        // 代码生成器
+//        AutoGenerator mpg = new AutoGenerator();
+//
+//        // 全局配置
+//        GlobalConfig gc = new GlobalConfig();
+//        String rootPath = System.getProperty("user.dir");
+//        System.out.println("rootPath + childProjectPath="+rootPath + childProjectPath);
+//        gc.setOutputDir(rootPath + childProjectPath + "/src/main/java");//设置代码生成路径
+//        gc.setFileOverride(true);//是否覆盖以前文件
+//        gc.setOpen(false);//是否打开生成目录
+//        gc.setAuthor("zn");//设置项目作者名称
+//        gc.setIdType(IdType.AUTO);//设置主键策略
+//        gc.setBaseResultMap(true);//生成基本ResultMap
+//        gc.setBaseColumnList(true);//生成基本ColumnList
+//        gc.setServiceName("%sService");//去掉服务默认前缀
+//        gc.setDateType(DateType.ONLY_DATE);//设置时间类型
+//        mpg.setGlobalConfig(gc);
+//
+//        // 数据源配置
+//        DataSourceConfig dsc = new DataSourceConfig();
+//        String url = "jdbc:mysql://"+dbIp+":"+dbPort+"/"+dbName+"?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai";
+//        System.out.println("url="+url);
+//        System.out.println("driverName="+driverName);
+//        System.out.println("username="+username);
+//        System.out.println("password="+password);
+//        dsc.setUrl(url);
+//        dsc.setDriverName(driverName);
+//        dsc.setUsername(username);
+//        dsc.setPassword(password);
+//        mpg.setDataSource(dsc);
+//
+//        // 包配置
+//        PackageConfig pc = new PackageConfig();
+//        pc.setParent(rootPackage);
+//        pc.setMapper("mapper");
+//        pc.setXml("mapper.xml");
+////        pc.setEntity("pojo");
+//        pc.setEntity("entity");
+//        pc.setService("service");
+//        pc.setServiceImpl("service.impl");
+//        pc.setController("controller");
+//        mpg.setPackageInfo(pc);
+//
+//        // 策略配置
+//        StrategyConfig sc = new StrategyConfig();
+//        sc.setNaming(NamingStrategy.underline_to_camel);
+//        sc.setColumnNaming(NamingStrategy.underline_to_camel);
+//        sc.setEntityLombokModel(true);//自动lombok
+//        sc.setRestControllerStyle(true);
+//        sc.setControllerMappingHyphenStyle(true);
+//
+//        sc.setLogicDeleteFieldName("deleted");//设置逻辑删除
+//
+//        //设置自动填充配置
+////        TableFill gmt_create = new TableFill("create_time", FieldFill.INSERT);
+////        TableFill gmt_modified = new TableFill("update_time", FieldFill.INSERT_UPDATE);
+////        ArrayList<TableFill> tableFills=new ArrayList<>();
+////        tableFills.add(gmt_create);
+////        tableFills.add(gmt_modified);
+////        sc.setTableFillList(tableFills);
+//
+//        //乐观锁
+//        sc.setVersionFieldName("version");
+//        sc.setRestControllerStyle(true);//驼峰命名
+//
+//
+//
+//        //  sc.setTablePrefix("tbl_"); 设置表名前缀
+//        sc.setInclude(scanner("表名，多个英文逗号分割").split(","));
+//        mpg.setStrategy(sc);
+//
+//        // 生成代码
+//        mpg.execute();
+//    }
+//
+//}

huimv-farm-environ/src/test/java/com/huimv/environ/eco/TaskTest.java

@@ -1,68 +1,68 @@
-package com.huimv.environ.eco;
-
-import com.huimv.environ.eco.schedule.ScheduleTask;
-import com.huimv.environ.eco.service.EcoDryListService;
-import com.huimv.environ.env.utils.DateUtil;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import sun.dc.pr.PRError;
-
-import java.text.ParseException;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * @Project : huimv-farm-datacenter
- * @Package : ${}
- * @Description : TODO
- * @Version : 1.0
- * @Author : ZhuoNing
- * @Create : 2022/11/9
- **/
-@SpringBootTest
-public class TaskTest {
-    @Autowired
-    private ScheduleTask test;
-    @Autowired
-    private EcoDryListService ecoDryListService;
-    @Autowired
-    private DateUtil dateUtil;
-
+//package com.huimv.environ.eco;
+//
+//import com.huimv.environ.eco.schedule.ScheduleTask;
+//import com.huimv.environ.eco.service.EcoDryListService;
+//import com.huimv.environ.env.utils.DateUtil;
+//import org.junit.jupiter.api.Test;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import sun.dc.pr.PRError;
+//
+//import java.text.ParseException;
+//import java.util.Calendar;
+//import java.util.Date;
+//
+///**
+// * @Project : huimv-farm-datacenter
+// * @Package : ${}
+// * @Description : TODO
+// * @Version : 1.0
+// * @Author : ZhuoNing
+// * @Create : 2022/11/9
+// **/
+//@SpringBootTest
+//public class TaskTest {
+//    @Autowired
+//    private ScheduleTask test;
+//    @Autowired
+//    private EcoDryListService ecoDryListService;
+//    @Autowired
+//    private DateUtil dateUtil;
+//
+////    @Test
+////    public void testDevice() throws ParseException {
+////        test.getDeviceFlow();
+////    }
+//
 //    @Test
-//    public void testDevice() throws ParseException {
-//        test.getDeviceFlow();
+//    public void testCompareTemp(){
+//        String temp = "38.1";
+//        temp = "25.7";
+//        String temp1 = "25.6";
+//        String temp2 = "45.5";
+//        System.out.println("temp="+temp);
+//        if(Float.parseFloat(temp) > Float.parseFloat(temp1) && Float.parseFloat(temp)<Float.parseFloat(temp2)){
+//            System.out.println("烘干温度未达到烘干温度阈值");
+//        }else if(Float.parseFloat(temp)>=Float.parseFloat(temp2)){
+//            System.out.println("烘干温度已达到烘干温度阈值");
+//        }else{
+//            System.out.println("当前温度小于常温阈值");
+//        }
 //    }
-
-    @Test
-    public void testCompareTemp(){
-        String temp = "38.1";
-        temp = "25.7";
-        String temp1 = "25.6";
-        String temp2 = "45.5";
-        System.out.println("temp="+temp);
-        if(Float.parseFloat(temp) > Float.parseFloat(temp1) && Float.parseFloat(temp)<Float.parseFloat(temp2)){
-            System.out.println("烘干温度未达到烘干温度阈值");
-        }else if(Float.parseFloat(temp)>=Float.parseFloat(temp2)){
-            System.out.println("烘干温度已达到烘干温度阈值");
-        }else{
-            System.out.println("当前温度小于常温阈值");
-        }
-    }
-
-    @Test
-    public void testSendDryTempAlarm(){
-        String alarmInfo = "2022-11-12,当前温度[40]未达到烘干阈值温度[50]";
-        String farmId ="331023001";
-        String todayTime = "2022-11-12 19:35:52";
-        ecoDryListService.sendLowDryTempAlarm(alarmInfo,farmId,todayTime,todayTime);
-    }
-
-    @Test
-    public void testAdd() throws ParseException {
-        DateUtil dateUtil = new DateUtil();
-        String addTime = "2022-11-13 11:36:08";
-        System.out.println("newDate -10 ="+dateUtil.formatDateTime(dateUtil.getDateBeforeMinute(addTime,10)));
-        System.out.println("newDate +10 ="+dateUtil.formatDateTime(dateUtil.getDateAfterMinute(addTime,10)));
-    }
-}
+//
+//    @Test
+//    public void testSendDryTempAlarm(){
+//        String alarmInfo = "2022-11-12,当前温度[40]未达到烘干阈值温度[50]";
+//        String farmId ="331023001";
+//        String todayTime = "2022-11-12 19:35:52";
+//        ecoDryListService.sendLowDryTempAlarm(alarmInfo,farmId,todayTime,todayTime);
+//    }
+//
+//    @Test
+//    public void testAdd() throws ParseException {
+//        DateUtil dateUtil = new DateUtil();
+//        String addTime = "2022-11-13 11:36:08";
+//        System.out.println("newDate -10 ="+dateUtil.formatDateTime(dateUtil.getDateBeforeMinute(addTime,10)));
+//        System.out.println("newDate +10 ="+dateUtil.formatDateTime(dateUtil.getDateAfterMinute(addTime,10)));
+//    }
+//}

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

@@ -50,8 +50,8 @@ public class SysThreshold extends Model {
      */
     private String dryTem;
     //阈值
-    /*
-     *烘干持续时长报警阈值
+    /*烘干持续时长报警阈值
+     *
      */
     private String dryMin;
 

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

@@ -6,11 +6,16 @@ import com.huimv.receiver.cloud.service.IWarningInfo;
 import com.huimv.receiver.eco.entity.*;
 import com.huimv.receiver.eco.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.List;
 
 
@@ -157,4 +162,5 @@ public class EcoController {
         return "成功";
     }
 
+
 }

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

@@ -14,12 +14,13 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  * @Description : TODO
  * @Version : 1.0
  * @Author : ZhuoNing
+ *
  * @Create : 2020-12-25
  **/
 @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/BaseController/SysTelecomController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.text.DecimalFormat;
 import java.util.Map;
 
@@ -27,7 +28,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("/device")
 public class SysTelecomController {
-    @Autowired
+    @Resource
     private ISysTelecomService telecomService;
 
     @PostMapping("/deviceResponse")

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

@@ -98,13 +98,7 @@ public class ClientPersonManageController {
         Object fileUrl = jsonObject1.get("fileUrl");
         return R.ok("请求成功").put("data", fileUrl.toString());
 
-
-
-
-
-
 /*
-
         Map map  = new HashMap();
         HttpClient httpClient = new HttpClient(URL);
         httpClient.setHttps(true);
@@ -113,7 +107,6 @@ public class ClientPersonManageController {
         String content = httpClient.httpClientUploadFilePost(URL, file, header,map);
 */
 
-
     }
 
 

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/controller/ClientPersonManageControllerTest.java

@@ -285,7 +285,6 @@ public class ClientPersonManageControllerTest {
             params1.put("openResult", 0); //刷脸失败
             Object action1 = requestHn.doAction();
             action = action1;
-
         }
         if (farmId == 21) {
             System.out.println("cangnan");
@@ -517,6 +516,7 @@ public class ClientPersonManageControllerTest {
         } else if (farmId == 21) {
             System.out.println("苍南");
             DepartmentListRequestCn departmentList = new DepartmentListRequestCn(oauthConfigBaseInfo03);
+            System.out.println(departmentList);
             return R.ok("请求成功").put("data", departmentList.doAction());
         } else {
             return R.error();

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/controller/ClientXunZhengControllerTest.java

@@ -1,11 +1,14 @@
 package com.huimv.video.dhicc.test.controller;
 
+import com.alibaba.druid.filter.config.ConfigTools;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.huimv.video.dhicc.result.R;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
+//import com.huimv.video.dhicc.test.factory.XunZheng;
+//import com.huimv.video.dhicc.test.factory.XunZhengRequestFactory;
 import com.huimv.video.dhicc.test.request.XunZhengRequest.Cn.XunZhengCountRequestCn;
 import com.huimv.video.dhicc.test.request.XunZhengRequest.Cn.XunZhengRequestCn;
 import com.huimv.video.dhicc.test.request.XunZhengRequest.Hn.XunZhengCountRequestHn;
@@ -32,6 +35,8 @@ public class ClientXunZhengControllerTest {
     public R xunZhengEvent(@RequestBody XunZhengRequestSg xunZhengRequestSg){
         Integer farmId = xunZhengRequestSg.getFarmId();
         if (farmId == 1){
+//            XunZheng chart = XunZhengRequestFactory.getChart(oauthConfigBaseInfo);
+
             System.out.println("曙光");
             XunZhengRequestSg requestSg = new XunZhengRequestSg(oauthConfigBaseInfo);
             requestSg.setEventType(xunZhengRequestSg.getEventType());
@@ -94,4 +99,14 @@ public class ClientXunZhengControllerTest {
         }
     }
 
+    //数据库密码加密
+    public static void main(String[] args) throws Exception {
+        // 需要加密的明文密码
+//        String password = "Xnef*<bpo9+2";
+        String password = "hm123456789.addPerson(";
+        // 调用 druid 生成私钥、公钥、密文
+        ConfigTools.main(new String[]{password});
+    }
+
+
 }

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/factory/XunZheng.java

@@ -0,0 +1,6 @@
+/*
+package com.huimv.video.dhicc.test.factory;
+
+public interface XunZheng {
+}
+*/

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/factory/XunZhengRequest.java

@@ -0,0 +1,12 @@
+/*
+package com.huimv.video.dhicc.test.factory;
+
+
+import com.huimv.video.dhicc.test.request.XunZhengRequest.Sg.XunZhengRequestSg;
+
+public class XunZhengRequest implements XunZheng {
+    public XunZhengRequest() {
+        XunZhengRequestSg requestSg = new XunZhengRequestSg(oauthConfigBaseInfo);
+    }
+}
+*/

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/factory/XunZhengRequestFactory.java

@@ -0,0 +1,17 @@
+/*
+package com.huimv.video.dhicc.test.factory;
+
+
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
+
+public class XunZhengRequestFactory {
+    public static XunZheng getChart(Object type) {
+        XunZheng  xunZheng = null;
+        if (type instanceof OauthConfigBaseInfo) {
+            xunZheng = new XunZhengRequest(type);
+        }
+        return xunZheng;
+    }
+
+}
+*/

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/DepartmentRequest/Cn/DepartmentListRequestCn.java

@@ -36,8 +36,8 @@ public class DepartmentListRequestCn extends BaseRequest03 {
         //发送请求
         String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
         //获取响应
-
-        // PersonListResponseSg devicePageResponse = JSON.parseObject(res, PersonListResponseSg.class);
+        System.out.println(res);
+//         PersonListResponseSg devicePageResponse = JSON.parseObject(res, PersonListResponseSg.class);
 
         return res;
     }

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/XunZhengRequest/Sg/XunZhengRequestSg.java

@@ -44,9 +44,7 @@ public class XunZhengRequestSg extends BaseRequest {
         //发送请求
         String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
         //获取响应
-
         // PersonListResponseSg devicePageResponse = JSON.parseObject(res, PersonListResponseSg.class);
-
         return res;
     }
 

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

@@ -1,162 +1,162 @@
-package com.huimv.video.dhicc.timmer;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.huimv.video.dhicc.entity.SysTelecom;
-import com.huimv.video.dhicc.entity.SysTelecomEvent;
-import com.huimv.video.dhicc.entity.SysThreshold;
-import com.huimv.video.dhicc.mapper.SysTelecomEventMapper;
-import com.huimv.video.dhicc.mapper.SysTelecomMapper;
-import com.huimv.video.dhicc.mapper.SysThresholdMapper;
-import com.huimv.video.dhicc.service.ISysTelecomEventService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-//主要用来生产烘干数据的 时间拿时间 --可以吧大华的代码赋值出来 自己改一改  应该是OK的
-@Component
-public class SysTelcomEnentTimmer {
-    @Autowired
-    private SysTelecomMapper sysTelecomMapper;
-    @Autowired
-    private SysTelecomEventMapper sysTelecomEventMapperMapper;
-    @Autowired
-    private ISysTelecomEventService sysTelecomEventService;
-
-    @Autowired
-    private SysThresholdMapper sysThresholdMapper;
-
-    //检查烘干是否合格--找出时间 阈值直接计算
-    // @Scheduled(cron = " 0/10 * * * * ? ")
-    @Scheduled(cron = " 0 */59 * * * ? ")
-    private void checkOk() {
-
-        //拿对应牧场的阈值
-        LambdaQueryWrapper<SysThreshold> wrapper1 = Wrappers.lambdaQuery();
-        wrapper1.eq(SysThreshold::getFarmId, 1);
-        SysThreshold sysThreshold = sysThresholdMapper.selectOne(wrapper1);//System.out.println(sysTelecoms);
-        // System.out.println("yuzhi"+sysThreshold);
-
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Calendar TimeDeviceId = Calendar.getInstance();
-        TimeDeviceId.setTime(new Date());
-        TimeDeviceId.add(Calendar.HOUR_OF_DAY, -30);
-        Date began1time = TimeDeviceId.getTime();
-        String startTime1 = format.format(began1time);
-        String endTime1 = format.format(new Date());
-
-        //拿事件
-        LambdaQueryWrapper<SysTelecomEvent> wrapper = Wrappers.lambdaQuery();
-        wrapper.eq(SysTelecomEvent::getFarmId, 1);
-        wrapper.between(SysTelecomEvent::getEventTime, startTime1, endTime1);
-        List<SysTelecomEvent> SysTelecomEvent = sysTelecomEventMapperMapper.selectList(wrapper);//System.out.println(sysTelecoms);
-        // System.out.println("yuzhi"+SysTelecomEvent);
-
-        for (SysTelecomEvent sysTelecomEvent : SysTelecomEvent) {
-            // System.out.println("yuzhi"+sysTelecomEvent);
-            Calendar eventTime = Calendar.getInstance();
-            eventTime.setTime(sysTelecomEvent.getEventTime());
-            //事件时间就是开始时间
-            String EventStartTime = format.format(sysTelecomEvent.getEventTime());
-            //一次烘干50度以上一般在8次左右  就是说40分钟  这里取一小时
-            eventTime.add(Calendar.MINUTE, +60);
-            Date EventEndTime1 = eventTime.getTime();
-            String EventEndTime = format.format(EventEndTime1);
-
-            //查第一次五十度事件之后的数据  统计持续在设定温度之上的事件
-            LambdaQueryWrapper<SysTelecom> wrapper3 = Wrappers.lambdaQuery();
-            wrapper3.eq(SysTelecom::getDeviceId, sysTelecomEvent.getDeviceId());
-            wrapper3.eq(SysTelecom::getFarmId, 1);
-            wrapper3.between(SysTelecom::getTimestamp, EventStartTime, EventEndTime);
-            List<SysTelecom> sysTelecoms = sysTelecomMapper.selectList(wrapper3);//System.out.println(sysTelecoms);
-
-            Integer count = 0;
-            for (SysTelecom sysTelecom : sysTelecoms) {
-                if (Double.parseDouble(sysTelecom.getTemp()) > Double.parseDouble(sysThreshold.getBenconValue())) {
-                    count++;
-
-                }
-            }
-//            if (Double.parseDouble(sysThreshold.getBenconValue()) < count * 5) {
-            if (count >0 ) {
-                System.out.println("高于阈值温度时间" + count * 5);
-                //正确烘干为1
-
-                sysTelecomEvent.setRemark("1");
-            } else {
-                sysTelecomEvent.setRemark("0");
-            }
-            System.out.println("存储" + sysTelecomEvent.getRemark());
-            sysTelecomEventService.updateById(sysTelecomEvent);
-
-            //System.out.println("事件时间=" + EventStartTime + sysTelecoms);
-        }
-    }
-
-    //每小时执行一次
-
-    // @Scheduled(cron = " 0/5 * * * * ? ")
-//     @Scheduled(cron = " 0/50 * * * * ? ")
-    @Scheduled(cron = " 0 0 * * * ? ")
-    private void updateBox() {
-        //获得设备列表 查找烘干数据
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        LambdaQueryWrapper<SysTelecom> lambdaQueryWrapper =
-                new LambdaQueryWrapper<>();
-        lambdaQueryWrapper
-                .select(SysTelecom::getDeviceId);
-        List<String> collect = sysTelecomMapper.selectObjs(lambdaQueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList());
-        //System.out.println(collect);
-        for (String deviceId : collect) {
-            Calendar TimeDeviceId = Calendar.getInstance();
-            TimeDeviceId.setTime(new Date());
-            TimeDeviceId.add(Calendar.MINUTE, -300);
-            Date began1time = TimeDeviceId.getTime();
-            String startTime1 = format.format(began1time);
-            String endTime1 = format.format(new Date());
-            LambdaQueryWrapper<SysTelecom> wrapper = Wrappers.lambdaQuery();
-            wrapper.eq(SysTelecom::getDeviceId, deviceId);
-            wrapper.eq(SysTelecom::getFarmId, 1);
-            wrapper.between(SysTelecom::getTimestamp, startTime1, endTime1);
-            List<SysTelecom> sysTelecoms = sysTelecomMapper.selectList(wrapper);//System.out.println(sysTelecoms);
-            for (SysTelecom sysTelecom : sysTelecoms) {
-                if (Double.parseDouble(sysTelecom.getTemp()) > 50) {
-//                    System.out.println("温度" + sysTelecom.getTemp() + sysTelecom.getDeviceId() + sysTelecom.getTimestamp());
-                    //产生时间段
-                    Calendar eventTime = Calendar.getInstance();
-                    eventTime.setTime(sysTelecom.getTimestamp());
-                    eventTime.add(Calendar.MINUTE, -60);
-                    Date began = eventTime.getTime();
-                    String EventStartTime = format.format(began);
-                    eventTime.add(Calendar.MINUTE, +110);
-                    Date EventEndTime1 = eventTime.getTime();
-                    String EventEndTime = format.format(EventEndTime1);
-                    //查询在大于50摄氏度这条记录的 前60分钟 后60分钟  时间里，有没有存储过报警事件  有就放弃  没有就加一条
-                    int count = sysTelecomEventService.count(Wrappers.<SysTelecomEvent>lambdaQuery()
-                            .eq(SysTelecomEvent::getDeviceId, sysTelecom.getDeviceId())
-                            .eq(SysTelecomEvent::getFarmId, sysTelecom.getFarmId())
-                            .between(SysTelecomEvent::getEventTime, EventStartTime, EventEndTime));
-//                    System.out.println("插结果" + count);
-                    if (count == 0) {
-                        // System.out.println("保存了一条");
-                        SysTelecomEvent sysTelecomEvent = new SysTelecomEvent();
-                        sysTelecomEvent.setDeviceId(sysTelecom.getDeviceId());
-                        sysTelecomEvent.setEventTime(sysTelecom.getTimestamp());
-                        sysTelecomEvent.setEventId(sysTelecom.getId());
-                        sysTelecomEvent.setFarmId(sysTelecom.getFarmId());
-                        sysTelecomEvent.setRemark(sysTelecom.getTemp());
-                        sysTelecomEventService.save(sysTelecomEvent);
-                    }
-                    // System.out.println("抛弃");
-                }
-            }
-        }
-    }
-}
+//package com.huimv.video.dhicc.timmer;
+//
+//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+//import com.huimv.video.dhicc.entity.SysTelecom;
+//import com.huimv.video.dhicc.entity.SysTelecomEvent;
+//import com.huimv.video.dhicc.entity.SysThreshold;
+//import com.huimv.video.dhicc.mapper.SysTelecomEventMapper;
+//import com.huimv.video.dhicc.mapper.SysTelecomMapper;
+//import com.huimv.video.dhicc.mapper.SysThresholdMapper;
+//import com.huimv.video.dhicc.service.ISysTelecomEventService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.scheduling.annotation.Scheduled;
+//import org.springframework.stereotype.Component;
+//
+//import java.text.SimpleDateFormat;
+//import java.util.Calendar;
+//import java.util.Date;
+//import java.util.List;
+//import java.util.stream.Collectors;
+//
+//
+////主要用来生产烘干数据的 时间拿时间 --可以吧大华的代码赋值出来 自己改一改  应该是OK的
+//@Component
+//public class SysTelcomEnentTimmer {
+//    @Autowired
+//    private SysTelecomMapper sysTelecomMapper;
+//    @Autowired
+//    private SysTelecomEventMapper sysTelecomEventMapperMapper;
+//    @Autowired
+//    private ISysTelecomEventService sysTelecomEventService;
+//
+//    @Autowired
+//    private SysThresholdMapper sysThresholdMapper;
+//
+//    //检查烘干是否合格--找出时间 阈值直接计算
+//    // @Scheduled(cron = " 0/10 * * * * ? ")
+//    @Scheduled(cron = " 0 */59 * * * ? ")
+//    private void checkOk() {
+//
+//        //拿对应牧场的阈值
+//        LambdaQueryWrapper<SysThreshold> wrapper1 = Wrappers.lambdaQuery();
+//        wrapper1.eq(SysThreshold::getFarmId, 1);
+//        SysThreshold sysThreshold = sysThresholdMapper.selectOne(wrapper1);//System.out.println(sysTelecoms);
+//        // System.out.println("yuzhi"+sysThreshold);
+//
+//        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        Calendar TimeDeviceId = Calendar.getInstance();
+//        TimeDeviceId.setTime(new Date());
+//        TimeDeviceId.add(Calendar.HOUR_OF_DAY, -30);
+//        Date began1time = TimeDeviceId.getTime();
+//        String startTime1 = format.format(began1time);
+//        String endTime1 = format.format(new Date());
+//
+//        //拿事件
+//        LambdaQueryWrapper<SysTelecomEvent> wrapper = Wrappers.lambdaQuery();
+//        wrapper.eq(SysTelecomEvent::getFarmId, 1);
+//        wrapper.between(SysTelecomEvent::getEventTime, startTime1, endTime1);
+//        List<SysTelecomEvent> SysTelecomEvent = sysTelecomEventMapperMapper.selectList(wrapper);//System.out.println(sysTelecoms);
+//        // System.out.println("yuzhi"+SysTelecomEvent);
+//
+//        for (SysTelecomEvent sysTelecomEvent : SysTelecomEvent) {
+//            // System.out.println("yuzhi"+sysTelecomEvent);
+//            Calendar eventTime = Calendar.getInstance();
+//            eventTime.setTime(sysTelecomEvent.getEventTime());
+//            //事件时间就是开始时间
+//            String EventStartTime = format.format(sysTelecomEvent.getEventTime());
+//            //一次烘干50度以上一般在8次左右  就是说40分钟  这里取一小时
+//            eventTime.add(Calendar.MINUTE, +60);
+//            Date EventEndTime1 = eventTime.getTime();
+//            String EventEndTime = format.format(EventEndTime1);
+//
+//            //查第一次五十度事件之后的数据  统计持续在设定温度之上的事件
+//            LambdaQueryWrapper<SysTelecom> wrapper3 = Wrappers.lambdaQuery();
+//            wrapper3.eq(SysTelecom::getDeviceId, sysTelecomEvent.getDeviceId());
+//            wrapper3.eq(SysTelecom::getFarmId, 1);
+//            wrapper3.between(SysTelecom::getTimestamp, EventStartTime, EventEndTime);
+//            List<SysTelecom> sysTelecoms = sysTelecomMapper.selectList(wrapper3);//System.out.println(sysTelecoms);
+//
+//            Integer count = 0;
+//            for (SysTelecom sysTelecom : sysTelecoms) {
+//                if (Double.parseDouble(sysTelecom.getTemp()) > Double.parseDouble(sysThreshold.getBenconValue())) {
+//                    count++;
+//
+//                }
+//            }
+////            if (Double.parseDouble(sysThreshold.getBenconValue()) < count * 5) {
+//            if (count >0 ) {
+//                System.out.println("高于阈值温度时间" + count * 5);
+//                //正确烘干为1
+//
+//                sysTelecomEvent.setRemark("1");
+//            } else {
+//                sysTelecomEvent.setRemark("0");
+//            }
+//            System.out.println("存储" + sysTelecomEvent.getRemark());
+//            sysTelecomEventService.updateById(sysTelecomEvent);
+//
+//            //System.out.println("事件时间=" + EventStartTime + sysTelecoms);
+//        }
+//    }
+//
+//    //每小时执行一次
+//
+//    // @Scheduled(cron = " 0/5 * * * * ? ")
+////     @Scheduled(cron = " 0/50 * * * * ? ")
+//    @Scheduled(cron = " 0 0 * * * ? ")
+//    private void updateBox() {
+//        //获得设备列表 查找烘干数据
+//        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        LambdaQueryWrapper<SysTelecom> lambdaQueryWrapper =
+//                new LambdaQueryWrapper<>();
+//        lambdaQueryWrapper
+//                .select(SysTelecom::getDeviceId);
+//        List<String> collect = sysTelecomMapper.selectObjs(lambdaQueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList());
+//        //System.out.println(collect);
+//        for (String deviceId : collect) {
+//            Calendar TimeDeviceId = Calendar.getInstance();
+//            TimeDeviceId.setTime(new Date());
+//            TimeDeviceId.add(Calendar.MINUTE, -300);
+//            Date began1time = TimeDeviceId.getTime();
+//            String startTime1 = format.format(began1time);
+//            String endTime1 = format.format(new Date());
+//            LambdaQueryWrapper<SysTelecom> wrapper = Wrappers.lambdaQuery();
+//            wrapper.eq(SysTelecom::getDeviceId, deviceId);
+//            wrapper.eq(SysTelecom::getFarmId, 1);
+//            wrapper.between(SysTelecom::getTimestamp, startTime1, endTime1);
+//            List<SysTelecom> sysTelecoms = sysTelecomMapper.selectList(wrapper);//System.out.println(sysTelecoms);
+//            for (SysTelecom sysTelecom : sysTelecoms) {
+//                if (Double.parseDouble(sysTelecom.getTemp()) > 50) {
+////                    System.out.println("温度" + sysTelecom.getTemp() + sysTelecom.getDeviceId() + sysTelecom.getTimestamp());
+//                    //产生时间段
+//                    Calendar eventTime = Calendar.getInstance();
+//                    eventTime.setTime(sysTelecom.getTimestamp());
+//                    eventTime.add(Calendar.MINUTE, -60);
+//                    Date began = eventTime.getTime();
+//                    String EventStartTime = format.format(began);
+//                    eventTime.add(Calendar.MINUTE, +110);
+//                    Date EventEndTime1 = eventTime.getTime();
+//                    String EventEndTime = format.format(EventEndTime1);
+//                    //查询在大于50摄氏度这条记录的 前60分钟 后60分钟  时间里，有没有存储过报警事件  有就放弃  没有就加一条
+//                    int count = sysTelecomEventService.count(Wrappers.<SysTelecomEvent>lambdaQuery()
+//                            .eq(SysTelecomEvent::getDeviceId, sysTelecom.getDeviceId())
+//                            .eq(SysTelecomEvent::getFarmId, sysTelecom.getFarmId())
+//                            .between(SysTelecomEvent::getEventTime, EventStartTime, EventEndTime));
+////                    System.out.println("插结果" + count);
+//                    if (count == 0) {
+//                        // System.out.println("保存了一条");
+//                        SysTelecomEvent sysTelecomEvent = new SysTelecomEvent();
+//                        sysTelecomEvent.setDeviceId(sysTelecom.getDeviceId());
+//                        sysTelecomEvent.setEventTime(sysTelecom.getTimestamp());
+//                        sysTelecomEvent.setEventId(sysTelecom.getId());
+//                        sysTelecomEvent.setFarmId(sysTelecom.getFarmId());
+//                        sysTelecomEvent.setRemark(sysTelecom.getTemp());
+//                        sysTelecomEventService.save(sysTelecomEvent);
+//                    }
+//                    // System.out.println("抛弃");
+//                }
+//            }
+//        }
+//    }
+//}

huimv-farm-video/src/main/resources/application-prod.yml

@@ -2,7 +2,7 @@ server:
   port: 8096
 spring:
   application:
-    name: pigfarm-local-device
+    name: huimv-farm-video
   #------DataSource-----
   datasource:
     druid:
@@ -15,6 +15,10 @@ spring:
         config.decrypt: true
         config.decrypt.key: ${spring.datasource.druid.publickey}
     type: com.alibaba.druid.pool.DruidDataSource
+#    url: jdbc:mysql://47.96.4.54:10052/huimv-farm-center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#    username: root
+#    password: hm123456789
+#    driver-class-name: com.mysql.cj.jdbc.Driver
   autoconfigure:
     exclude:
       - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration

pom.xml

@@ -33,11 +33,7 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
+
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid-spring-boot-starter</artifactId>