From b6624288dba9019db0ec4d6bb5570bb6b10df1be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <13281114856@qq.com>
Date: Wed, 1 Mar 2023 00:09:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=B7=BB=E5=8A=A0=E4=BA=A7?=
=?UTF-8?q?=E5=93=81=E7=BC=96=E7=A0=81=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=B9=B6?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0=E4=BA=A7?=
=?UTF-8?q?=E5=93=81=E7=BC=96=E7=A0=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
device-manager-ui/admin/src/views/device/list.vue | 11 +++--------
.../mortals/xhx/busiz/req/ApiThirdPartyReq.java | 6 +++---
.../com/mortals/xhx/common/utils/SendTask.java | 13 +++++--------
.../applicationservice/DeviceStartService.java | 14 --------------
4 files changed, 11 insertions(+), 33 deletions(-)
diff --git a/device-manager-ui/admin/src/views/device/list.vue b/device-manager-ui/admin/src/views/device/list.vue
index eb4b7008..1e3466db 100644
--- a/device-manager-ui/admin/src/views/device/list.vue
+++ b/device-manager-ui/admin/src/views/device/list.vue
@@ -319,12 +319,13 @@ export default {
},
changeStat(val, enabled) {
- return;
//鍘婚櫎鍏跺畠鏉′欢
delete this.query["productId"]
delete this.query["deviceName"]
delete this.query["deviceCode"]
- //this.query = Object.assign(this.query, { deviceStatus: val });
+ if(val!=null){
+ this.query = Object.assign(this.query, { deviceStatus: val });
+ }
this.query["page"]=1
if (!enabled) {
@@ -525,12 +526,6 @@ export default {
type: "select",
label: "璁惧绫诲瀷",
},
-
- {
- name: "deviceStatus",
- type: "select",
- label: "璁惧鐘舵€�",
- },
],
columns: [
{
diff --git a/device-manager/src/main/java/com/mortals/xhx/busiz/req/ApiThirdPartyReq.java b/device-manager/src/main/java/com/mortals/xhx/busiz/req/ApiThirdPartyReq.java
index 49fbff1d..a54ff760 100644
--- a/device-manager/src/main/java/com/mortals/xhx/busiz/req/ApiThirdPartyReq.java
+++ b/device-manager/src/main/java/com/mortals/xhx/busiz/req/ApiThirdPartyReq.java
@@ -13,10 +13,10 @@ public class ApiThirdPartyReq<T> {
* 缁撴灉鎻忚堪
*/
private String msg;
- /**
- * 0:璁惧澧炲垹鏀规煡锛宒ata鏁版嵁鍩熷皝瑁呭叿浣撹澶囨秷鎭紝1锛氳澶囨秷鎭被锛屾暟鎹煙閫忎紶璁惧涓婅娑堟伅浣撱€�
- */
+
private Integer type;
+
+
/**
* 鍝嶅簲鏁版嵁
*/
diff --git a/device-manager/src/main/java/com/mortals/xhx/common/utils/SendTask.java b/device-manager/src/main/java/com/mortals/xhx/common/utils/SendTask.java
index ec0026a7..ec4375fe 100644
--- a/device-manager/src/main/java/com/mortals/xhx/common/utils/SendTask.java
+++ b/device-manager/src/main/java/com/mortals/xhx/common/utils/SendTask.java
@@ -3,13 +3,10 @@ package com.mortals.xhx.common.utils;
import com.alibaba.fastjson.JSON;
import com.mortals.framework.util.HttpUtil;
import com.mortals.xhx.busiz.req.ApiThirdPartyReq;
-import com.mortals.xhx.busiz.req.DeviceReq;
-import com.mortals.xhx.busiz.rsp.ApiResp;
import com.mortals.xhx.common.code.MessageTypeEnum;
import com.mortals.xhx.common.code.YesNoEnum;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
import java.util.HashMap;
import java.util.Map;
@@ -31,15 +28,15 @@ public class SendTask implements Runnable {
@Override
public void run() {
- ApiThirdPartyReq<String> deviceReqApiReq = new ApiThirdPartyReq<>();
- deviceReqApiReq.setCode(YesNoEnum.YES.getValue());
- deviceReqApiReq.setType(MessageTypeEnum.TRANSACTION.getValue());
- deviceReqApiReq.setData(content);
+ ApiThirdPartyReq<String> apiThirdReqApiReq = new ApiThirdPartyReq<>();
+ apiThirdReqApiReq.setCode(YesNoEnum.YES.getValue());
+ apiThirdReqApiReq.setType(MessageTypeEnum.TRANSACTION.getValue());
+ apiThirdReqApiReq.setData(content);
String resp = null;
try {
Map<String, String> header = new HashMap<>();
header.put(HEADER_CONTENT_TYPE, "application/json");
- String reqStr = JSON.toJSONString(deviceReqApiReq);
+ String reqStr = JSON.toJSONString(apiThirdReqApiReq);
log.info("sendUrl:{} \n sendMessageReq:{}",sendUrl, reqStr);
resp = HttpUtil.doPost(sendUrl, header, reqStr);
log.debug("sendMessageResp:{}", resp);
diff --git a/device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceStartService.java b/device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceStartService.java
index fcadaeba..46dc57c4 100644
--- a/device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceStartService.java
+++ b/device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceStartService.java
@@ -1,11 +1,7 @@
package com.mortals.xhx.daemon.applicationservice;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.TypeReference;
import com.mortals.framework.common.Rest;
import com.mortals.framework.service.ICacheService;
-import com.mortals.framework.springcloud.service.IApplicationService;
import com.mortals.framework.springcloud.service.IApplicationStartedService;
import com.mortals.xhx.common.pdu.RespData;
import com.mortals.xhx.common.pdu.site.SitePdu;
@@ -18,19 +14,11 @@ import com.mortals.xhx.module.platform.model.PlatformQuery;
import com.mortals.xhx.module.platform.service.PlatformService;
import com.mortals.xhx.module.product.model.ProductQuery;
import com.mortals.xhx.module.product.service.ProductService;
-import com.mortals.xhx.queue.TbQueueMsg;
-import com.mortals.xhx.utils.IotThreadFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
-import java.util.ArrayList;
import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
import static com.mortals.xhx.common.key.RedisKey.*;
@@ -78,9 +66,7 @@ public class DeviceStartService implements IApplicationStartedService {
}
});
-
//鍒濆鍖栫珯鐐圭紦瀛�
-
SitePdu sitePdu = new SitePdu();
sitePdu.setSize(-1);
Rest<RespData<List<SitePdu>>> resp = siteFeign.list(sitePdu);
--
2.24.3