Selaa lähdekoodia

牧场端增加设备信息同步功能:删除设备数据

zhuoning 3 vuotta sitten
vanhempi
commit
fd7043b18b

+ 1 - 1
huimv-farm-device/huimv-farm-business/src/main/java/com/huimv/business/farm/controller/FarmDeviceController.java

@@ -70,7 +70,7 @@ public class FarmDeviceController {
      * @Time        : 14:43
      */
     @RequestMapping(value = "/removeDevice",method = RequestMethod.POST)
-    public Result removeDevice(@RequestBody String deviceData){
+    public Result removeDevice(@RequestBody String deviceData) throws UnsupportedEncodingException {
         log.info("接收前端参数>>"+deviceData);
         //删除设备信息
         return iFarmDevice.removeDevice(deviceData);

+ 1 - 1
huimv-farm-device/huimv-farm-business/src/main/java/com/huimv/business/farm/service/IFarmDevice.java

@@ -12,7 +12,7 @@ public interface IFarmDevice {
     Result editDevice(String deviceData) throws UnsupportedEncodingException;
 
     //删除设备信息
-    Result removeDevice(String deviceData);
+    Result removeDevice(String deviceData) throws UnsupportedEncodingException;
 
     //列表展示设备信息
     Result listDevice(String deviceData);

+ 23 - 2
huimv-farm-device/huimv-farm-business/src/main/java/com/huimv/business/farm/service/impl/FarmDeviceImpl.java

@@ -127,8 +127,29 @@ public class FarmDeviceImpl implements IFarmDevice {
     }
 
     @Override
-    public Result removeDevice(String deviceData){
-
+    public Result removeDevice(String deviceData) throws UnsupportedEncodingException {
+        JSONObject deviceDataJo = JSON.parseObject(deviceData);
+        Integer id = deviceDataJo.getInteger("id");
+        //查询记录是否存在
+        Optional<FarmDeviceEntity> optional = deviceRepo.findById(id);
+        if(!optional.isPresent()){
+            String ERR_INFO_NOEXIST = "该记录不存在.";
+            log.error(ERR_INFO_NOEXIST);
+            return new Result(10001,ERR_INFO_NOEXIST,false);
+        }
+        Long dataId = optional.get().getDataId();
+        //
+        deviceRepo.deleteById(id);
+        //同步牧场端设备数据
+        if(dataSync){
+            log.info("同步数据中心端设备数据。");
+            String serviceUrl = DATA_CENTER_IP_ADDR + PORT + deviceRemoveService;
+            log.info("serviceUrl>>"+serviceUrl);
+            String data = textUtil.encode(JSON.toJSONString(dataId));
+            log.info("base64密文>>"+data);
+            //提交请求
+            httpTemplete.doPostSimple(serviceUrl,data);
+        }
         return new Result(ResultCode.SUCCESS);
     }