增加在线状态
This commit is contained in:
parent
b5c7bbbeb8
commit
ec0f7224ce
|
|
@ -1,9 +1,6 @@
|
||||||
package org.jeecg.system.applet.controller;
|
package org.jeecg.system.applet.controller;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.*;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
|
|
@ -21,6 +18,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
||||||
import org.jeecg.system.applet.service.ISurvStationInfoService;
|
import org.jeecg.system.applet.service.ISurvStationInfoService;
|
||||||
|
import org.jeecg.system.applet.util.Iotutils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import org.springframework.web.servlet.ModelAndView;
|
import org.springframework.web.servlet.ModelAndView;
|
||||||
|
|
@ -61,10 +59,13 @@ public class SurvDeviceDeployController {
|
||||||
mp.put(survStationInfo.getStationCode(),survStationInfo.getStationName());
|
mp.put(survStationInfo.getStationCode(),survStationInfo.getStationName());
|
||||||
}
|
}
|
||||||
//补充站点名称'
|
//补充站点名称'
|
||||||
|
List<SurvDeviceDeploy> deploys = new ArrayList<>();
|
||||||
for (SurvDeviceDeploy deviceDeploy : survList) {
|
for (SurvDeviceDeploy deviceDeploy : survList) {
|
||||||
deviceDeploy.setStationName(mp.get(deviceDeploy.getStationCode()));
|
deviceDeploy.setStationName(mp.get(deviceDeploy.getStationCode()));
|
||||||
|
deviceDeploy = Iotutils.addOnlineStatus(deviceDeploy);
|
||||||
|
deploys.add(deviceDeploy);
|
||||||
}
|
}
|
||||||
return R.ok(survList);
|
return R.ok(deploys);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue