From 083eb4417a04201f1eb755faab8ee7121b3c7f16 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 17 十一月 2023 16:19:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway
---
src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java | 75 +++++++++++++++++++++++++++++++------
1 files changed, 63 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
index e7a1784..2210aed 100644
--- a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
+++ b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
@@ -4,20 +4,27 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.async.fzzy40.Fzzy40CommonService;
+import com.fzzy.gateway.GatewayUtils;
+import com.fzzy.gateway.api.GatewayRemoteManager;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.service.repository.GatewayDeviceRep;
+import com.fzzy.mqtt.MqttProviderConfig;
+import com.fzzy.mqtt.MqttPublishService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
+import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.List;
+@Slf4j
@Component
public class GatewayDeviceService {
@Resource
private GatewayDeviceRep gatewayDeviceRep;
-
/**
* gatewayDeviceService#listAll
@@ -26,26 +33,51 @@
*/
@DataProvider
public List<GatewayDevice> listAll() {
-
- List<GatewayDevice> list = gatewayDeviceRep.findAll();
-
- return list;
+ Sort sort = new Sort(Sort.Direction.ASC, "deviceId");
+ return gatewayDeviceRep.findAll(sort);
}
+
+// /**
+// * gatewayDeviceService#getQuery
+// *
+// * @return
+// */
+// @DataProvider
+// public GateWayTestParam getQuery() {
+// GateWayTestParam param = new GateWayTestParam();
+// param.setDayTime(new Date());
+// param.setCarNumber("宸滱12345");
+// param.setEnd(new Date());
+// param.setStart(new Date());
+// param.setWeight(25000.00);
+// return param;
+// }
/**
* gatewayDeviceService#updateSave
*
- * @param entity
+ * @param data
*/
@DataResolver
- public void updateSave(GatewayDevice entity) {
- GatewayDevice data = new GatewayDevice();
- BeanUtils.copyProperties(entity, data);
+ public void updateSave(GatewayDevice data) {
+ GatewayDevice data2 = new GatewayDevice();
+ BeanUtils.copyProperties(data, data2);
- if (null == data.getId()) {
- data.setId(ContextUtil.getUUID());
+ if (null == data2.getDeviceSn()) {
+ if (null != data2.getIp()) {
+ data.setDeviceSn(data2.getIp());
+ } else {
+ data.setDeviceSn(data2.getDeviceId());
+ }
}
- gatewayDeviceRep.save(data);
+
+ if (null == data2.getId()) {
+ data2.setId(ContextUtil.getUUID());
+ gatewayDeviceRep.save(data2);
+ } else {
+ gatewayDeviceRep.save(data2);
+ }
+ flushCache();
}
/**
@@ -58,6 +90,25 @@
GatewayDevice data2 = new GatewayDevice();
BeanUtils.copyProperties(data, data2);
gatewayDeviceRep.delete(data2);
+
+ GatewayUtils.removeCache(data2);
+
+ flushCache();
return null;
}
+
+ public void flushCache() {
+ List<GatewayDevice> list = listAll();
+ if (null == list || list.isEmpty()) return;
+ for (GatewayDevice device : list) {
+ GatewayUtils.add2Cache(device);
+ }
+ }
+
+
+ @Expose
+ public String test() {
+ log.info("-----------test-------------------");
+ return "SUCCESS";
+ }
}
--
Gitblit v1.9.3