将环保监测去掉“特此警告”

huimv-farm-device/huimv-farm-business/src/main/resources/application.properties

@@ -1,15 +1,16 @@
-spring.profiles.active=dev
-#spring.profiles.active=prod
+#spring.profiles.active=dev
+spring.profiles.active=prod
 
 #时间格式配置
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
 
 # 数据中心数据推送地址
-#dataCenter.ipAddr=http://115.238.57.190
+dataCenter.ipAddr=http://120.27.234.126
+dataCenter.port=:8010
 #测试IP
-dataCenter.ipAddr=http://192.168.1.49
-dataCenter.port=:10091
+#dataCenter.ipAddr=http://192.168.1.49
+#dataCenter.port=:10091
 # 日总称重数据服务
 dataCenter.service.dayWeight=/receiver/farm/weight/putDayWeight
 # 批次称重数据服务

huimv-farm-device/huimv-farm-cloud-environ/src/main/java/com/huimv/environ/service/impl/EnvironImpl.java

@@ -182,26 +182,26 @@ public class EnvironImpl implements IEnviron {
             JSONObject thresholdJo = JSON.parseObject(thresholdData);
             //环保氨氮数据>=阈值氨氮数据
             if(new BigDecimal(environJo.getString("adPj")).compareTo(new BigDecimal(thresholdJo.getString("ammonia"))) > -1){
-                String alarmInfo = "当前氨氮数据为"+environJo.getString("adPj")+"高于或等于阈值"+thresholdJo.getString("ammonia")+",特此警告.";
+                String alarmInfo = "当前氨氮数据为"+environJo.getString("adPj")+"高于或等于阈值"+thresholdJo.getString("ammonia")+".";
                 //向数据中心发送警报
                 _sendAlarmToCenter(alarmInfo,Const.TYPE_ALARM_AD);
             }
 
             //环保COD数据>=阈值COD数据
             if(new BigDecimal(environJo.getString("hxxylPj")).compareTo(new BigDecimal(thresholdJo.getString("cOD"))) > -1){
-                String alarmInfo = "当前化学需氧量数据为"+environJo.getString("hxxylPj")+"高于或等于阈值"+thresholdJo.getString("cOD")+",特此警告.";
+                String alarmInfo = "当前化学需氧量数据为"+environJo.getString("hxxylPj")+"高于或等于阈值"+thresholdJo.getString("cOD")+".";
                 //向数据中心发送警报
                 _sendAlarmToCenter(alarmInfo,Const.TYPE_ALARM_COD);
             }
             //环保PH数据>=阈值PH数据
             if(new BigDecimal(environJo.getString("phPj")).compareTo(new BigDecimal(thresholdJo.getString("ph"))) > -1){
-                String alarmInfo = "当前PH值数据为"+environJo.getString("phPj")+"高于或等于阈值"+thresholdJo.getString("ph")+",特此警告.";
+                String alarmInfo = "当前PH值数据为"+environJo.getString("phPj")+"高于或等于阈值"+thresholdJo.getString("ph")+".";
                 //向数据中心发送警报
                 _sendAlarmToCenter(alarmInfo,Const.TYPE_ALARM_PH);
             }
             //环保污水浓度数据>=阈值污水浓度数据
             if(new BigDecimal(environJo.getString("wsPj")).compareTo(new BigDecimal(thresholdJo.getString("flow"))) > -1){
-                String alarmInfo = "当前污水浓度数据为"+environJo.getString("wsPj")+"高于或等于阈值"+thresholdJo.getString("flow")+",特此警告.";
+                String alarmInfo = "当前污水浓度数据为"+environJo.getString("wsPj")+"高于或等于阈值"+thresholdJo.getString("flow")+".";
                 //向数据中心发送警报
                 _sendAlarmToCenter(alarmInfo,Const.TYPE_ALARM_WS);
             }

huimv-farm-device/huimv-farm-cloud-environ/src/main/java/com/huimv/environ/utils/HttpTemplete.java

@@ -39,6 +39,26 @@ public class HttpTemplete {
     static {
     }
 
+    //发送简单数据
+    public void doPostSimple(String serviceUrl,String data){
+        System.out.println("推送数据地址："+serviceUrl);
+        //
+        Map<String,String> paramsMap = new HashMap<String,String>();
+        paramsMap.put("data", data);
+        //
+        Map<String,Integer> timeoutMap = new HashMap<String,Integer>();
+        timeoutMap.put("connectTimeout", 5000);
+        timeoutMap.put("requestTimeout", 5000);
+        timeoutMap.put("socketTimeout", 5000);
+        try{
+            // 用Post方法推送接口数据
+            doPost(serviceUrl,paramsMap,timeoutMap);
+        } catch (IOException e) {
+            System.out.println("###错误信息："+e.getMessage());
+        }
+    }
+
+
     /**
      * @Method      : doPost
      * @Description : post方式推送接口

huimv-farm-device/huimv-farm-cloud-environ/src/main/resources/application.properties

@@ -5,13 +5,14 @@ spring.profiles.active=prod
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
 # 数据中心数据推送地址
-dataCenter.ipAddr=http://115.238.57.190
-dataCenter.port=:10091
+dataCenter.ipAddr=http://120.27.234.126
+#dataCenter.port=:10091
+dataCenter.port=:8010
 # 小时环境数据服务
-dataCenter.service.hourEnviron=/receiver/cloud/environ/putHourEnviron
+dataCenter.service.hourEnviron=/receiver/receiver/cloud/environ/putHourEnviron
 # 实时环境数据服务
-dataCenter.service.realTimeEnviron=/receiver/cloud/environ/putRealTimeEnviron
+dataCenter.service.realTimeEnviron=/receiver/receiver/cloud/environ/putRealTimeEnviron
 # 环境警报服务
-dataCenter.service.alarm=/receiver/alarm/environ/putEnvironAlarm
+dataCenter.service.alarm=/receiver/receiver/alarm/environ/putEnvironAlarm
 # 部署牧场ID（base_farm.id）
 local.farmID=1

huimv-farm-device/huimv-farm-netip/src/main/java/com/huimv/huimvfarmnetip/task/ScheduledService.java

@@ -61,8 +61,10 @@ public class ScheduledService {
 //        log.info("=====>>>>>使用cron  {}",System.currentTimeMillis());
         String ip = ipUtils.run(shellFile).replace("\n","");
         JSONObject ipJo= new JSONObject();
-        ipJo.put("farmId",farmId);
-        ipJo.put("farmName","玉环牧场");
+//        ipJo.put("farmId",farmId);
+//        ipJo.put("farmName","玉环牧场");
+        ipJo.put("farmId",4);
+        ipJo.put("farmName","黑猪场牧场");
         ipJo.put("netIp",ip+relayPort);
         log.info(dateUtil.getTodayMissionText()+",发送数据>>"+ipJo.toJSONString());
         //发送数据

huimv-farm-device/huimv-farm-netip/src/main/resources/application.properties

@@ -1,12 +1,16 @@
 spring.profiles.active=dev
 
-# 数据中心数据推送地址
-dataCenter.ipAddr=http://115.238.57.190
-dataCenter.port=:8098
-# 更新ip服务
-dataCenter.service.netIp=/ip/updateNetIp
-#dataCenter.service.netIp=/receiver/receiver/farm/ip/updateNetIp
-# 部署牧场ID（base_farm.id）
+# -------- TEST --------
+#dataCenter.ipAddr=http://115.238.57.190
+#dataCenter.port=:8098
+#dataCenter.service.netIp=/ip/updateNetIp
+
+# -------- QingLian dataCenter --------
+dataCenter.ipAddr=http://120.27.234.126
+dataCenter.port=:8010
+dataCenter.service.netIp=/receiver/ip/updateNetIp
+
+#farmID
 local.farmID=12
 local.shellFile=/opt/ip2/netIp.sh
 local.relay.port=:9080

huimv-farm-device/pom.xml

@@ -35,7 +35,7 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-
+        <!-- lombok -->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -54,6 +54,19 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
+        <!-- 慧牧Common -->
+<!--        <dependency>-->
+<!--            <groupId>com.huimv</groupId>-->
+<!--            <artifactId>huimv-common</artifactId>-->
+<!--            <version>0.0.1-SNAPSHOT</version>-->
+<!--        </dependency>-->
+
+        <!-- fastjson -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.28</version>
+        </dependency>
     </dependencies>
 
     <build>