diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvDeviceDeployController.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvDeviceDeployController.java index 9304fda..bb44dd6 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvDeviceDeployController.java +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvDeviceDeployController.java @@ -1,9 +1,6 @@ package org.jeecg.system.applet.controller; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -21,6 +18,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.jeecg.system.applet.service.ISurvStationInfoService; +import org.jeecg.system.applet.util.Iotutils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -61,10 +59,13 @@ public class SurvDeviceDeployController { mp.put(survStationInfo.getStationCode(),survStationInfo.getStationName()); } //补充站点名称' + List deploys = new ArrayList<>(); for (SurvDeviceDeploy deviceDeploy : survList) { deviceDeploy.setStationName(mp.get(deviceDeploy.getStationCode())); + deviceDeploy = Iotutils.addOnlineStatus(deviceDeploy); + deploys.add(deviceDeploy); } - return R.ok(survList); + return R.ok(deploys); } }