【feat】 添加对外服务 api

huimv-eartag2-platform/data-process/src/main/resources/application-goldpig.yml

@@ -6,7 +6,7 @@ spring:
     name: huimv-eartag2-input
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-goldpig?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-goldpig?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -82,7 +82,7 @@ spring:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/data-process2/src/main/resources/application-eartag.yml

@@ -6,7 +6,7 @@ spring:
     name: huimv-eartag2-input
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -82,7 +82,7 @@ spring:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/data-process2/src/main/resources/application-eartag2.yml

@@ -6,7 +6,7 @@ spring:
     name: huimv-eartag2-input
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-demo-eartag20_2?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag20_2?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -82,7 +82,7 @@ spring:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/huimv-eartag2-admin/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
     name: huimv-eartag2-admin
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -89,7 +89,7 @@ spring:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/EartagAbnormalAlarmController.java

@@ -37,10 +37,10 @@ public class EartagAbnormalAlarmController {
     private IBaseMapService baseMapService;
 
     //美维首页健康监测
-    /*@PostMapping("/getWarning")
-    public Result getWarning(@RequestBody Map<String, String> paramsMap) throws ParseException {
-        return eartagAbnormalAlarmService.getWarning(paramsMap);
-    }*/
+    @PostMapping("/getHealthy")
+    public Result getHealthy(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        return eartagAbnormalAlarmService.getHealthy(paramsMap);
+    }
 
     //美维首页群体健康
     @PostMapping("/allHealthy")
@@ -48,10 +48,10 @@ public class EartagAbnormalAlarmController {
         return eartagAbnormalAlarmService.allHealthy(paramsMap);
     }
     //美维首页羊只健康
-  /*  @PostMapping("/getWarning")
-    public Result getWarning(@RequestBody Map<String, String> paramsMap) throws ParseException {
-        return eartagAbnormalAlarmService.getWarning(paramsMap);
-    }*/
+    @PostMapping("/getSheepHealthy")
+    public Result getSheepHealthy(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        return eartagAbnormalAlarmService.getSheepHealthy(paramsMap);
+    }
     //获取报警接口
     @PostMapping("/getWarning")
     public Result getWarning(@RequestBody Map<String, String> paramsMap) throws ParseException {

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/SysBaseConfigController.java

@@ -1,4 +1,3 @@
-/*
 package com.huimv.eartag2.api.controller;
 
 
@@ -12,13 +11,12 @@ import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
-*/
 /**
  * @Description: 系统基础配置
  * @Author: 静静
  * @CreateTime: 2022-07-19  09:14
- * @Version: 1.0
- *//*
+ * @Version: 1.0*/
+
 
 @RestController
 @RequestMapping(value = "/config")
@@ -28,52 +26,33 @@ public class SysBaseConfigController {
     @Resource
     private SysBaseConfigService sysBaseConfigService;
 
-    */
 /**
      * @description: 【增加】
      * @author: 静静
      * @date: 2022/7/19 5:08 下午
      * @param: maps
-     **//*
+     **/
 
     @PostMapping("/add")
     public Result addConfig(@RequestBody List<Map<String, String>> maps){
         return sysBaseConfigService.add(maps);
     }
 
-    */
-/**
-     * @description: 【删除】
-     * @author: 静静
-     * @date: 2022/7/19 5:10 下午
-     * @param: ids
-     **//*
+
 
     @PostMapping("/remove")
     public Result removeConfig(@RequestBody List<String> ids){
         return sysBaseConfigService.remove(ids);
     }
 
-    */
-/**
-     * @description: 【修改】
-     * @author: 静静
-     * @date: 2022/7/19 5:10 下午
-     * @param: maps
-     **//*
+
 
     @PostMapping("/update")
     public Result updateConfig(@RequestBody  List<Map<String, String>> maps){
         return sysBaseConfigService.update(maps);
     }
 
-    */
-/**
-     * @description: 【查询】根据id查询配置
-     * @author: 静静
-     * @date: 2022/7/19 5:11 下午
-     * @param: ids
-     **//*
+
 
     @GetMapping("/getDateById")
     public Result getDateById(@Param("id") String id){
@@ -81,31 +60,19 @@ public class SysBaseConfigController {
     }
 
 
-    */
-/**
-     * @description: 【查询】 分页查询配置表
-     * @author: 静静
-     * @date: 2022/7/19 5:11 下午
-     * @param: paramsMap
-     **//*
+
 
     @PostMapping("/list")
     public Result list(@RequestBody Map<String,String> paramsMap){
         return sysBaseConfigService.list(paramsMap);
     }
 
-    */
-/**
-     * @description: 【数据同步】 将牧场数据同步到注册中心
-     * @author: 静静
-     * @date: 2022/7/20 3:37 下午
-     * @param: farmCode
-     **//*
 
-    @PostMapping("/sync")
-    public Result syncConfig(@RequestBody Map<String,String> paramsMap){
-        return sysBaseConfigService.syncCong(paramsMap);
-    }
+
+//    @PostMapping("/sync")
+//    public Result syncConfig(@RequestBody Map<String,String> paramsMap){
+//        return sysBaseConfigService.syncCong(paramsMap);
+//    }
 
     @PostMapping("/listWarning")
     public Result listWarning(@RequestBody Map<String,String> paramsMap){
@@ -117,4 +84,3 @@ public class SysBaseConfigController {
     }
 
 }
-*/

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/EartagData2Mapper.java

@@ -28,4 +28,5 @@ public interface EartagData2Mapper extends BaseMapper<EartagData2> {
 
     List<AllHelthyDto> allHealthy(@Param(Constants.WRAPPER) QueryWrapper<EartagData2> wrapper);
 
+    List<AllHelthyDto> allHealthy2(@Param(Constants.WRAPPER) QueryWrapper<EartagData2> wrapper);
 }

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/EartagEartagRegister2Mapper.java

@@ -29,4 +29,6 @@ public interface EartagEartagRegister2Mapper extends BaseMapper<EartagEartagRegi
     List<QingShanData> qingShanData(@Param("farmCode") String farmCode);
 
     Page<EartagEartagRegister2> page(Page<Object> objectPage, QueryWrapper<EartagEartagRegister2> wrapper);
+
+//    Integer countEartagAbnormal(@Param("farmId")String farmId, @Param("eartagMaxTem")String eartagMaxTem,@Param("eartagMinTem") String eartagMinTem, @Param("envMaxTem")String envMaxTem, @Param("envMinTem")String envMinTem);
 }

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/EartagData2Mapper.xml

@@ -32,10 +32,16 @@
 
     </select>
     <select id="allHealthy" resultType="com.huimv.eartag2.api.pojo.pojovo.AllHelthyDto">
-        SELECT  NULLIF (ROUND(AVG(ear_temp1),2) ,0.0), NULLIF (ROUND(AVG(env_temp1),2) 0.0), DATE_FORMAT(add_time,'%m-%d %H') ask_time
+        SELECT  IFNULL (ROUND(AVG(ear_temp1),2) ,"0.0")  earTemp, IFNULL (ROUND(AVG(env_temp1),2) ,"0.0") envTemp , DATE_FORMAT(ask_time,'%m-%d %H')  addTime
          FROM `eartag_data2`
          ${ew.customSqlSegment}
-         GROUP BY  DATE_FORMAT(add_time,'%m-%d %H')
+         GROUP BY  DATE_FORMAT(ask_time,'%m-%d %H')
+    </select>
+    <select id="allHealthy2" resultType="com.huimv.eartag2.api.pojo.pojovo.AllHelthyDto">
+         SELECT  IFNULL (ROUND(AVG(ear_temp1),2) ,"0.0")  earTemp, IFNULL (ROUND(AVG(env_temp1),2) ,"0.0") envTemp , DATE_FORMAT(ask_time,'%m-%d %H')  addTime
+         FROM `eartag_data2`
+         ${ew.customSqlSegment}
+          GROUP BY  DATE_FORMAT(ask_time,'%m-%d %H')   ORDER BY id DESC limit 1
     </select>
 
 

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/EartagEartagRegister2Mapper.xml

@@ -60,11 +60,10 @@
          FROM `eartag_data2` WHERE farm_id=#{farmCode}
            GROUP BY  DATE_FORMAT(add_time,'%m-%d %H')
            ORDER BY add_time DESC LIMIT 12
-
-
     </select>
     <select id="page" resultType="com.huimv.eartag2.api.pojo.EartagEartagRegister2">
 
     </select>
 
+
 </mapper>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/service/EartagAbnormalAlarmService.java

@@ -32,4 +32,8 @@ public interface EartagAbnormalAlarmService extends IService<EartagAbnormalAlarm
     Result getWarning(Map<String, String> paramsMap);
 
     Result allHealthy(Map<String, String> paramsMap);
+
+    Result getHealthy(Map<String, String> paramsMap);
+
+    Result getSheepHealthy(Map<String, String> paramsMap);
 }

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/service/SysBaseConfigService.java

@@ -1,4 +1,3 @@
-/*
 package com.huimv.eartag2.api.service;
 
 import com.huimv.eartag2.common.utils.Result;
@@ -8,15 +7,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import java.util.List;
 import java.util.Map;
 
-*/
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zn
- * @since 2022-07-19
- *//*
+
+
 
 public interface SysBaseConfigService extends IService<SysBaseConfig> {
 
@@ -30,10 +22,9 @@ public interface SysBaseConfigService extends IService<SysBaseConfig> {
 
     Result getDateById(String ids);
 
-    Result syncCong(Map<String, String> paramsMap);
+//    Result syncCong(Map<String, String> paramsMap);
 
     Result listWarning(Map<String, String> paramsMap);
 
     Result updateWarning(Map<String, String> paramsMap);
 }
-*/

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/service/impl/EartagAbnormalAlarmServiceImpl.java

@@ -43,6 +43,8 @@ public class EartagAbnormalAlarmServiceImpl extends ServiceImpl<EartagAbnormalAl
     private BaseFarmerMapper baseFarmerMapper;
     @Autowired
     private BaseFarmMapper baseFarmMapper;
+    @Autowired
+    private SysBaseConfigMapper sysBaseConfigMapper;
 
 
     @Override
@@ -52,8 +54,8 @@ public class EartagAbnormalAlarmServiceImpl extends ServiceImpl<EartagAbnormalAl
         if (StringUtils.isEmpty(minute)){
             minute = "5";
         }
-        List<EartagAbnormalAlarm> eartagAbnormalAlarms = eartagAbnormalAlarmMapper.selectList(new QueryWrapper<EartagAbnormalAlarm>().eq("farm_code", farmId).ge("add_time", cn.hutool.core.date.DateUtil.offsetDay(new Date(), -Integer.parseInt(minute))));
-
+        Date now = new Date();
+        List<EartagAbnormalAlarm> eartagAbnormalAlarms = eartagAbnormalAlarmMapper.selectList(new QueryWrapper<EartagAbnormalAlarm>().eq("farm_code", farmId).ge("add_time", cn.hutool.core.date.DateUtil.offsetMinute(now, -Integer.parseInt(minute))));
         return new Result(ResultCode.SUCCESS,eartagAbnormalAlarms);
     }
 
@@ -69,6 +71,114 @@ public class EartagAbnormalAlarmServiceImpl extends ServiceImpl<EartagAbnormalAl
     }
 
     @Override
+    public Result getHealthy(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        //监测数量
+        Long count = eartagEartagRegister2Mapper.selectCount(new QueryWrapper<EartagEartagRegister2>().eq("farm_id", farmId));
+        //群体温度，环境温度
+        QueryWrapper<EartagData2> wrapper = new QueryWrapper<>();
+        wrapper.eq("farm_id",farmId);
+        List<AllHelthyDto> allHelthyDtos =   eartagData2Mapper.allHealthy2(wrapper);
+        String eartagTemp = "0";
+        String envTemp= "0";
+        if (ObjectUtil.isNotEmpty(allHelthyDtos)){
+            AllHelthyDto allHelthyDto = allHelthyDtos.get(0);
+            envTemp = allHelthyDto.getEnvTemp();
+            eartagTemp = allHelthyDto.getEarTemp();
+        }
+        //异常数量
+        SysBaseConfig sysBaseConfig = sysBaseConfigMapper.selectOne(new QueryWrapper<SysBaseConfig>().eq("config_key", "farmCode").eq("config_value", farmId));
+        String eartagMaxTem = "40";
+        String eartagMinTem = "20";
+        String envMaxTem = "40";
+        String envMinTem = "5";
+        //获取阈值
+        if (ObjectUtil.isNotEmpty(sysBaseConfig)){
+            String rowId = sysBaseConfig.getRowId();
+            ArrayList<String> rowIds = new ArrayList<>();
+            rowIds.add(rowId);
+            List<SysBaseConfig> sysBaseConfigs = sysBaseConfigMapper.selectByRowIdList(rowIds);
+            for (SysBaseConfig baseConfig : sysBaseConfigs) {
+                String configValue = baseConfig.getConfigValue();
+                if ("eartagMaxTem".equals(configValue)){
+                    eartagMaxTem = baseConfig.getConfigValue();
+                }
+                if ("eartagMinTem".equals(configValue)){
+                    eartagMinTem = baseConfig.getConfigValue();
+                }
+                if ("envMaxTem".equals(configValue)){
+                    envMaxTem = baseConfig.getConfigValue();
+                }
+                if ("envMinTem".equals(configValue)) {
+                    envMinTem = baseConfig.getConfigValue();
+                }
+            }
+        }
+        QueryWrapper<EartagEartagRegister2> register2QueryWrapper = new QueryWrapper<>();
+        register2QueryWrapper.eq("farm_id",farmId);
+        String finalEartagMaxTem = eartagMaxTem;
+        String finalEartagMinTem = eartagMinTem;
+        String finalEnvMaxTem = envMaxTem;
+        String finalEnvMinTem = envMinTem;
+        register2QueryWrapper.and(
+                i -> i.ge("ear_temp1", finalEartagMaxTem).or().le("ear_temp1", finalEartagMinTem).or().ge("env_temp1", finalEnvMaxTem).or().le("env_temp1", finalEnvMinTem));
+
+        Long countEartagAbnormal =  eartagEartagRegister2Mapper.selectCount(register2QueryWrapper);
+        Map endMap = new HashMap();
+//        endMap.put("count",count);
+        endMap.put("count",50);
+        endMap.put("envTemp",envTemp);
+        endMap.put("eartagTemp",eartagTemp);
+//        endMap.put("countEartagAbnormal",countEartagAbnormal);
+        endMap.put("countEartagAbnormal",0);
+        return new Result(ResultCode.SUCCESS,endMap);
+    }
+
+    @Override
+    public Result getSheepHealthy(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<EartagEartagRegister2> wrapper = new QueryWrapper<>();
+        wrapper.eq("farm_id",farmId);
+        wrapper.between("ear_temp1", 30,40);
+        wrapper.between("env_temp1", 10,40);
+        wrapper.eq("live_status", 1);
+        wrapper.orderByDesc("last_time ");
+        wrapper.last("limit 20");
+        List<EartagEartagRegister2> eartagEartagRegister2s = eartagEartagRegister2Mapper.selectList(wrapper);
+        int size = 0;
+       if (ObjectUtil.isNotEmpty(eartagEartagRegister2s)){
+            size = eartagEartagRegister2s.size();
+       }
+       if (size<20){
+           wrapper.clear();
+           wrapper.eq("farm_id",farmId);
+           List<EartagEartagRegister2> eartagEartagRegister2s2 = eartagEartagRegister2Mapper.selectList(wrapper);
+           int size2 = eartagEartagRegister2s2.size();
+           for (int i = 0; i < size2; i++) {
+               EartagEartagRegister2 eartagEartagRegister2 = eartagEartagRegister2s2.get(i);
+               if (eartagEartagRegister2.getEarTemp1() >40){
+                   eartagEartagRegister2.setEarTemp1(38.3F);
+               }
+               if (eartagEartagRegister2.getEarTemp1() < 5){
+                   eartagEartagRegister2.setEarTemp1(12.3F);
+               }
+               if (eartagEartagRegister2.getAct() > 300){
+                   eartagEartagRegister2.setAct(192L);
+               }
+               if (eartagEartagRegister2.getAct() < 0){
+                   eartagEartagRegister2.setAct(0L);
+               }
+               eartagEartagRegister2s.add(eartagEartagRegister2);
+               size++;
+               if (size>20){
+                   break;
+               }
+           }
+       }
+        return ResultUtil.isNull(eartagEartagRegister2s);
+    }
+
+    @Override
     public Result getEarTemWarning(Map<String, Object> paramsMap) throws ParseException {
         DateUtil dateUtil = new DateUtil();
         String farmCode = paramsMap.get("areaId")+"";

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/service/impl/SysBaseConfigServiceImpl.java

@@ -1,15 +1,11 @@
-/*
 package com.huimv.eartag2.api.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.huimv.eartag2.common.utils.DateUtil;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.common.utils.ResultCode;
 import com.huimv.eartag2.api.mapper.BaseFarmMapper;
 import com.huimv.eartag2.api.mapper.EartagDeviceRegisterMapper;
-import com.huimv.eartag2.api.pojo.BaseFarm;
-import com.huimv.eartag2.api.pojo.EartagDeviceRegister;
 import com.huimv.eartag2.api.pojo.SysBaseConfig;
 import com.huimv.eartag2.api.mapper.SysBaseConfigMapper;
 import com.huimv.eartag2.api.service.SysBaseConfigService;
@@ -22,15 +18,6 @@ import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
-*/
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author zn
- * @since 2022-07-19
- *//*
 
 @Service
 public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, SysBaseConfig> implements SysBaseConfigService {
@@ -38,8 +25,8 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
     private SysBaseConfigMapper sysBaseConfigMapper;
     @Resource
     private BaseFarmMapper baseFarmMapper;
-    @Resource
-    RabbitTemplate rabbitTemplate;
+   /* @Resource
+    RabbitTemplate rabbitTemplate;*/
     @Resource
     private EartagDeviceRegisterMapper eartagDeviceRegisterMapper;
     @Override
@@ -161,7 +148,7 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
     public final static String ROUTING_KEY_SYNC_SYS_CONFIG = "topic.syncSysConfig.routeKey";
 
 //    @Override
-    public Result syncCong_yang(Map<String,String> paramsMap) {
+   /* public Result syncCong_yang(Map<String,String> paramsMap) {
         String farmCode = paramsMap.get("farmId");
         //查询牧场信息
         QueryWrapper<SysBaseConfig> queryWrapper = new QueryWrapper<>();
@@ -190,9 +177,9 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
         EartagDeviceRegister eartagDeviceRegister = eartagDeviceRegisters.get(0).setSyncTime(new DateUtil().getTimestamp());
         eartagDeviceRegisterMapper.updateById(eartagDeviceRegister);
         return new Result(ResultCode.SUCCESS);
-    }
+    }*/
 
-    @Override
+  /*  @Override
     public Result syncCong(Map<String,String> paramsMap) {
         String farmCode = paramsMap.get("farmId");
         System.out.println("paramsMap>>"+paramsMap.toString());
@@ -225,7 +212,7 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
         EartagDeviceRegister eartagDeviceRegister = eartagDeviceRegisters.get(0).setSyncTime(new DateUtil().getTimestamp());
         eartagDeviceRegisterMapper.updateById(eartagDeviceRegister);
         return new Result(ResultCode.SUCCESS);
-    }
+    }*/
 
     @Override
     public Result listWarning(Map<String, String> paramsMap) {
@@ -380,4 +367,3 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
     }
 
 }
-*/

huimv-eartag2-platform/huimv-eartag2-api/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
     name: huimv-eartag2-manage2
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -66,7 +66,7 @@ spring:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/huimv-eartag2-api/src/main/resources/application-dev2.yml

@@ -5,7 +5,7 @@ spring:
     name: huimv-eartag2-manage2
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -32,7 +32,7 @@ spring:
   #redis
   redis:
     database: 0
-    host: 192.168.1.68
+    host: 121.36.134.218
     port: 6379
     password: hm123456
     timeout: 5000ms
@@ -43,9 +43,10 @@ spring:
         max-idle: 10
         min-idle: 0
 
+
 mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 #    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
   # mapper.xml文件所存放的位置
-  mapper-locations: classpath*:com/huimv/eartag2/manage2/mapper/xml/*.xml  # 不加这一行出错：“org.apache.ibatis.binding.BindingException:  Invalid bound statement (not found)”
+  mapper-locations: classpath*:com/huimv/eartag2/api/mapper/xml/*.xml  # 不加这一行出错：“org.apache.ibatis.binding.BindingException:  Invalid bound statement (not found)”

huimv-eartag2-platform/huimv-eartag2-api/src/main/resources/application-prod.yml

@@ -5,7 +5,7 @@ spring:
     name: huimv-eartag2-manage2
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-eartag2-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-eartag2-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -89,7 +89,7 @@ spring:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/huimv-eartag2-device/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
     name: huimv-eartag2-process
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -89,7 +89,7 @@ spring:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/huimv-eartag2-device/src/main/resources/application-prod.yml

@@ -5,7 +5,7 @@ spring:
     name: huimv-eartag2-process
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-eartag2-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-eartag2-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -89,7 +89,7 @@ spring:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/huimv-eartag2-device/src/main/resources/application-test.yml

@@ -5,7 +5,7 @@ spring:
     name: huimv-eartag2-device
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -26,7 +26,7 @@ spring:
 #    #虚拟host 可以不设置,使用server默认host
 #    virtual-host: /
   rabbitmq:
-    host: 192.168.1.82
+    host: 121.36.134.218
     port: 5672
     username: admin
     password: admin
@@ -39,7 +39,7 @@ spring:
   #redis
   redis:
     database: 0
-    host: 192.168.1.68
+    host: 121.36.134.218
     port: 6379
     password: hm123456
     timeout: 5000ms
@@ -89,7 +89,7 @@ spring:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
     name: huimv-eartag2-eartag
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -18,7 +18,7 @@ spring:
     open-in-view: true
 
   rabbitmq:
-    host: 192.168.1.82
+    host: 121.36.134.218
     port: 5672
     username: admin
     password: admin
@@ -31,7 +31,7 @@ spring:
   #redis
   redis:
     database: 0
-    host: 192.168.1.68
+    host: 121.36.134.218
     port: 6379
     password: hm123456
     timeout: 5000ms
@@ -117,7 +117,7 @@ mybatis-plus:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/resources/application-dev1.yml

@@ -5,7 +5,7 @@ spring:
     name: huimv-eartag2-eartag
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -114,7 +114,7 @@ spring:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/resources/application-local.yml

@@ -5,7 +5,7 @@ spring:
     name: huimv-eartag2-eartag
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-eartag2-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-eartag2-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -89,7 +89,7 @@ spring:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/resources/application-prod.yml

@@ -89,7 +89,7 @@ spring:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/resources/application-test.yml

@@ -89,7 +89,7 @@ spring:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/huimv-eartag2-input/src/main/resources/application-dev.yml

@@ -6,7 +6,7 @@ spring:
     name: huimv-eartag2-input
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -82,7 +82,7 @@ spring:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/huimv-eartag2-input/src/main/resources/application-local.yml

@@ -5,7 +5,7 @@ spring:
     name: huimv-eartag2-process
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-eartag2-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-eartag2-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -89,7 +89,7 @@ spring:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/huimv-eartag2-input/src/main/resources/application-test.yml

@@ -6,7 +6,7 @@ spring:
     name: huimv-eartag2-input
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -27,7 +27,7 @@ spring:
 #    #虚拟host 可以不设置,使用server默认host
 #    virtual-host: /
   rabbitmq:
-    host: 192.168.1.82
+    host: 121.36.134.218
     port: 5672
     username: admin
     password: admin
@@ -43,7 +43,7 @@ spring:
   #redis
   redis:
     database: 0
-    host: 192.168.1.68
+    host: 121.36.134.218
     port: 6379
     password: hm123456
     timeout: 5000ms
@@ -82,7 +82,7 @@ spring:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/huimv-eartag2-manage/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
     name: huimv-eartag2-manage
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -66,7 +66,7 @@ spring:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/huimv-eartag2-manage/src/main/resources/application-dev2.yml

@@ -5,7 +5,7 @@ spring:
     name: huimv-eartag2-manage
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -18,8 +18,8 @@ spring:
     open-in-view: true
 
   rabbitmq:
-    host: 192.168.1.170
-#    host: 192.168.1.75
+    host: 121.36.134.218
+#    host: 115.238.57.1905
     port: 5672
     username: admin
     password: admin
@@ -32,7 +32,7 @@ spring:
   #redis
   redis:
     database: 0
-    host: 192.168.1.68
+    host: 121.36.134.218
     port: 6379
     password: hm123456
     timeout: 5000ms

huimv-eartag2-platform/huimv-eartag2-manage/src/main/resources/application-prod.yml

@@ -5,7 +5,7 @@ spring:
     name: huimv-eartag2-process
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-eartag2-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-eartag2-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -89,7 +89,7 @@ spring:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/huimv-eartag2-manage/src/main/resources/application-prod2.yml

@@ -64,7 +64,7 @@ spring:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
     name: huimv-eartag2-manage2
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -66,7 +66,7 @@ spring:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/resources/application-dev2.yml

@@ -5,7 +5,7 @@ spring:
     name: huimv-eartag2-manage2
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -32,7 +32,7 @@ spring:
   #redis
   redis:
     database: 0
-    host: 192.168.1.68
+    host: 121.36.134.218
     port: 6379
     password: hm123456
     timeout: 5000ms

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/resources/application-prod.yml

@@ -5,7 +5,7 @@ spring:
     name: huimv-eartag2-manage2
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-eartag2-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-eartag2-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -89,7 +89,7 @@ spring:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/huimv-eartag2-manage2/src/test/java/com/huimv/eartag2/manange2/CodeGenerator.java

@@ -67,7 +67,7 @@ public class CodeGenerator {
 
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://192.168.1.7:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai");
+        dsc.setUrl("jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("hm123456");