Sfoglia il codice sorgente

公网地址信息接收和更新2。

zhuoning 3 anni fa
parent
commit
d0a9ed8852

+ 2 - 1
huimv-farm-receiver/src/main/java/com/huimv/receiver/farm/controller/NetIPController.java

@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.UnsupportedEncodingException;
+import java.text.ParseException;
 
 /**
  * @Project : huimv.shiwan
@@ -25,7 +26,7 @@ public class NetIPController {
 
     @RequestMapping(value = "/updateNetIp",method = RequestMethod.POST)
 //    public void updateIp(@RequestBody String data) throws UnsupportedEncodingException {
-    public void updateIp(@RequestParam(value = "data",required = true) String data) throws UnsupportedEncodingException {
+    public void updateIp(@RequestParam(value = "data",required = true) String data) throws UnsupportedEncodingException, ParseException {
         //--更新公网ip
         netIPService.updateNetIP(data);
     }

+ 2 - 1
huimv-farm-receiver/src/main/java/com/huimv/receiver/farm/service/INetIPService.java

@@ -1,8 +1,9 @@
 package com.huimv.receiver.farm.service;
 
 import java.io.UnsupportedEncodingException;
+import java.text.ParseException;
 
 public interface INetIPService {
     //
-    void updateNetIP(String NetIP) throws UnsupportedEncodingException;
+    void updateNetIP(String NetIP) throws UnsupportedEncodingException, ParseException;
 }

+ 7 - 2
huimv-farm-receiver/src/main/java/com/huimv/receiver/farm/service/impl/NetIPServiceImpl.java

@@ -4,12 +4,14 @@ import com.alibaba.fastjson.JSONObject;
 import com.huimv.receiver.farm.dao.entity.SysCameraAreaEntity;
 import com.huimv.receiver.farm.dao.repo.SysCameraAreaRepo;
 import com.huimv.receiver.farm.service.INetIPService;
+import com.huimv.receiver.utils.DateUtil;
 import com.huimv.receiver.utils.TextUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.io.UnsupportedEncodingException;
+import java.text.ParseException;
 import java.util.List;
 
 /**
@@ -27,9 +29,11 @@ public class NetIPServiceImpl implements INetIPService {
     private TextUtil textUtil;
     @Autowired
     private SysCameraAreaRepo cameraAreaRepo;
+    @Autowired
+    private DateUtil dateUtil;
 
     @Override
-    public void updateNetIP(String data) throws UnsupportedEncodingException {
+    public void updateNetIP(String data) throws UnsupportedEncodingException, ParseException {
         JSONObject netIPJo = JSONObject.parseObject(textUtil.translateSymbol(data));
         log.info("接收牧场端发送的公网信息>>"+netIPJo);
         String farmId = netIPJo.getString("farmId");
@@ -42,7 +46,8 @@ public class NetIPServiceImpl implements INetIPService {
                 cameraAreaEntity.setPublicUrl(netIp);
             }
             cameraAreaRepo.saveAll(cameraAreaEntityList);
-            log.info("已经完成牧场公网IP更新>>"+netIp);
+
+            log.info(dateUtil.getTodayMissionText()+",已经完成牧场公网IP更新>>"+netIp);
         }
     }
 }