From 54a8c009b95cc3816c4438df5851384ff87f5e3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <13281114856@qq.com>
Date: Fri, 17 Feb 2023 15:27:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=83=AD=E9=97=A8=E8=AF=8D?=
=?UTF-8?q?=E6=B1=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../module/device/service/impl/DeviceServiceImpl.java | 5 ++++-
.../xhx/module/device/web/DeviceController.java | 11 +++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/fill-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java b/fill-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java
index 8e311eb..138e121 100644
--- a/fill-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java
+++ b/fill-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java
@@ -46,6 +46,7 @@ public class DeviceServiceImpl extends AbstractCRUDServiceImpl<DeviceDao, Device
String productName = GlobalSysInfo.getParamValue(Constant.PARAMS_PRODUCT_NAME, "濉崟鏈�");
devicePdu.setProductName(productName);
+ devicePdu.setSiteId(entity.getSiteId());
Rest<RespData<List<DevicePdu>>> rest = deviceFeign.list(devicePdu);
if (rest.getCode().equals(YesNoEnum.YES.getValue())) {
@@ -55,10 +56,12 @@ public class DeviceServiceImpl extends AbstractCRUDServiceImpl<DeviceDao, Device
return deviceEntity;
}).collect(Collectors.toList());
+
+
result.setList(collect);
result.setDict(rest.getDict());
}
+ this.findAfter(entity, pageInfo, context, result.getList());
return result;
-
}
}
\ No newline at end of file
diff --git a/fill-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java b/fill-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java
index 02c2c0d..89c14cd 100644
--- a/fill-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java
+++ b/fill-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java
@@ -1,5 +1,9 @@
package com.mortals.xhx.module.device.web;
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.device.model.DeviceEntity;
import com.mortals.xhx.module.device.service.DeviceService;
@@ -7,6 +11,8 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.Map;
+
/**
* 璁惧
*
@@ -19,4 +25,9 @@ import org.springframework.web.bind.annotation.RestController;
public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceService, DeviceEntity, Long> {
+ @Override
+ protected int doListAfter(DeviceEntity query, Map<String, Object> model, Context context) throws AppException {
+ log.info("result:{}", JSON.toJSONString(model));
+ return super.doListAfter(query, model, context);
+ }
}
\ No newline at end of file
--
2.24.3