From 944fcfc56ba96cb12466604d33194fc76965faa8 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 05 Jun 2019 10:14:06 +0800
Subject: [PATCH] 增加获取污染溯源接口
---
src/main/java/com/moral/controller/ScreenController.java | 1500 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 770 insertions(+), 730 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 89efa5a..99f35a6 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -99,348 +99,342 @@
@RequestMapping("/screen")
@CrossOrigin(origins = "*", maxAge = 3600)
@SuppressWarnings({ "rawtypes", "unchecked", "unused" })
-@Api(tags = "Screen", description = "������������")
+@Api(tags = "Screen", description = "������������")
public class ScreenController {
- public static Logger log = Logger.getLogger(ScreenController.class);
+ public static Logger log = Logger.getLogger(ScreenController.class);
@Resource
- AlarmConfigService alarmConfigService;
- @Resource
- AreaService areaService;
+ AlarmConfigService alarmConfigService;
+ @Resource
+ AreaService areaService;
- @Resource
- SensorService sensorService;
- @Resource
- MonitorPointService monitorPointService;
- @Resource
- DeviceVersionService deviceVersionService;
+ @Resource
+ SensorService sensorService;
+ @Resource
+ MonitorPointService monitorPointService;
+ @Resource
+ DeviceVersionService deviceVersionService;
- /** The screen service. */
- @Resource
- private HistoryService historyService;
+ /** The screen service. */
+ @Resource
+ private HistoryService historyService;
- /** The account service. */
- @Resource
- private AccountService accountService;
+ /** The account service. */
+ @Resource
+ private AccountService accountService;
- /** The device service. */
- @Resource
- private DeviceService deviceService;
+ /** The device service. */
+ @Resource
+ private DeviceService deviceService;
- @Resource
- private HistoryMinutelyService historyMinutelyService;
+ @Resource
+ private HistoryMinutelyService historyMinutelyService;
- @Resource
- private MachineActivateService machineActivateService;
+ @Resource
+ private MachineActivateService machineActivateService;
- /** The resource. */
+ /** The resource. */
// @Value(value = "classpath:system/alarmLevels.json")
// private org.springframework.core.io.Resource resource;
- /** The redis template. */
- @Resource
- private RedisTemplate<String, String> redisTemplate;
+ /** The redis template. */
+ @Resource
+ private RedisTemplate<String, String> redisTemplate;
- /** The level key. */
- private String levelKey = "alarm_";
+ /** The level key. */
+ private String levelKey = "alarm_";
- @Resource
- private AlarmDailyService alarmDailyService;
- @Resource
- private OrganizationLayoutService orgLayoutService;
- @Resource
- private DeviceVersionService dviceVersionService;
- @Resource
- private OrganizationService organizationService;
- @Resource
- private DictionaryDataService dictionaryDataService;
-
- @Resource
- private WeatherService weatherService;
-
- @Resource
- private QualityDailyService qualityDailyService;
+ @Resource
+ private AlarmDailyService alarmDailyService;
+ @Resource
+ private OrganizationLayoutService orgLayoutService;
+ @Resource
+ private DeviceVersionService dviceVersionService;
+ @Resource
+ private OrganizationService organizationService;
+ @Resource
+ private DictionaryDataService dictionaryDataService;
- /**
- * Screen login. ������������
- *
- * @param request
- * the request
- * @return the map
- */
- @GetMapping("login")
- public Map<String, Object> screenLogin(HttpServletRequest request) {
- Map<String, Object> resultMap = new HashMap<String, Object>();
- Map<String, Object> parameters = getParametersStartingWith(request, null);
- if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {
- resultMap.put("msg", "������������������������������������");
- resultMap.put("accountId", -1);
- } else {
- resultMap = accountService.screenLogin(parameters);
- // ������������������������������������������
- Object orgId = resultMap.get("orgId");
- if(resultMap.get("orgId")!=null && resultMap.get("orgId") instanceof Integer) {
+ @Resource
+ private WeatherService weatherService;
+
+ @Resource
+ private QualityDailyService qualityDailyService;
+
+ /**
+ * Screen login. ������������
+ *
+ * @param request the request
+ * @return the map
+ */
+ @GetMapping("login")
+ public Map<String, Object> screenLogin(HttpServletRequest request) {
+ Map<String, Object> resultMap = new HashMap<String, Object>();
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {
+ resultMap.put("msg", "������������������������������������");
+ resultMap.put("accountId", -1);
+ } else {
+ resultMap = accountService.screenLogin(parameters);
+ // ������������������������������������������
+ Object orgId = resultMap.get("orgId");
+ if (resultMap.get("orgId") != null && resultMap.get("orgId") instanceof Integer) {
StringBuilder areaNamesBuilder = new StringBuilder("������");
- if(!((Integer) orgId).equals(dictionaryDataService.querySupperOrgId())) {
+ if (!((Integer) orgId).equals(dictionaryDataService.querySupperOrgId())) {
Organization organization = organizationService.getOrganizationById((Integer) orgId);
- if(organization.getAreaNames()!=null){
- Map<String,String> areaNameMap = BeanUtils.beanToMap(organization.getAreaNames());
- List<String> names = areaNameMap.entrySet().stream().filter(item -> {
- return item.getValue()!=null;
- }).map(item -> {
- return item.getValue();
- }).collect(Collectors.toList());
- AreaNames areaNames = organization.getAreaNames();
- areaNamesBuilder.append("/");
- areaNamesBuilder.append(String.join("/",names));
- }
- // ������������
- if(organization.getRank()!=null && organization.getRank() == 0) {
- resultMap.put("type","enterprise");
- }else{
- resultMap.put("type","government");
- }
- Number mapAreaCode = null;
- if(organization.getVillageCode()!=null){
- mapAreaCode = organization.getVillageCode();
- }else if (organization.getTownCode()!=null){
- mapAreaCode = organization.getTownCode();
- }else if(organization.getAreaCode()!=null) {
- mapAreaCode = organization.getAreaCode();
- }else if(organization.getCityCode()!=null) {
- mapAreaCode = organization.getCityCode();
- }else if(organization.getProvinceCode()!=null) {
- mapAreaCode = organization.getProvinceCode();
- }
- resultMap.put("mapAreaCode",mapAreaCode.toString() );
+ if (organization.getAreaNames() != null) {
+ Map<String, String> areaNameMap = BeanUtils.beanToMap(organization.getAreaNames());
+ List<String> names = areaNameMap.entrySet().stream().filter(item -> {
+ return item.getValue() != null;
+ }).map(item -> {
+ return item.getValue();
+ }).collect(Collectors.toList());
+ AreaNames areaNames = organization.getAreaNames();
+ areaNamesBuilder.append("/");
+ areaNamesBuilder.append(String.join("/", names));
+ }
+ // ������������
+ if (organization.getRank() != null && organization.getRank() == 0) {
+ resultMap.put("type", "enterprise");
+ } else {
+ resultMap.put("type", "government");
+ }
+ Number mapAreaCode = null;
+ if (organization.getVillageCode() != null) {
+ mapAreaCode = organization.getVillageCode();
+ } else if (organization.getTownCode() != null) {
+ mapAreaCode = organization.getTownCode();
+ } else if (organization.getAreaCode() != null) {
+ mapAreaCode = organization.getAreaCode();
+ } else if (organization.getCityCode() != null) {
+ mapAreaCode = organization.getCityCode();
+ } else if (organization.getProvinceCode() != null) {
+ mapAreaCode = organization.getProvinceCode();
+ }
+ resultMap.put("mapAreaCode", mapAreaCode.toString());
}
- resultMap.put("mapPath",areaNamesBuilder.toString());
+ resultMap.put("mapPath", areaNamesBuilder.toString());
}
- }
- return resultMap;
- }
+ }
+ return resultMap;
+ }
+ /**
+ * Gets the equipment states. ���������������������������������������
+ *
+ * @param request the request
+ * @return the equipment states
+ */
+ @GetMapping("/equipment-state")
+ @PreAuthorize("hasAnyRole('USER', 'ADMIN')")
+ public Map<String, Object> getDeviceStatesByAccount(HttpServletRequest request) {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ return deviceService.getDeviceStatesByAccount(parameters);
+ }
- /**
- * Gets the equipment states. ���������������������������������������
- *
- * @param request
- * the request
- * @return the equipment states
- */
- @GetMapping("/equipment-state")
- @PreAuthorize("hasAnyRole('USER', 'ADMIN')")
- public Map<String, Object> getDeviceStatesByAccount(HttpServletRequest request) {
- Map<String, Object> parameters = getParametersStartingWith(request, null);
- return deviceService.getDeviceStatesByAccount(parameters);
- }
-
- /**
- * Gets the alarm levels. ������������������
- *
- * @param request
- * the request
- * @return the alarm levels
- */
- @GetMapping("alarm-levels")
- public Object getAlarmLevels(HttpServletRequest request, Optional<Integer> orgId, Optional<Integer> mpId,Optional<String> mac) {
- List<Map<String,Object>> sensorAlarmList = null;
- try {
+ /**
+ * Gets the alarm levels. ������������������
+ *
+ * @param request the request
+ * @return the alarm levels
+ */
+ @GetMapping("alarm-levels")
+ public Object getAlarmLevels(HttpServletRequest request, Optional<Integer> orgId, Optional<Integer> mpId,
+ Optional<String> mac) {
+ List<Map<String, Object>> sensorAlarmList = null;
+ try {
AlarmConfig alarmConfig = null;
- if(orgId.isPresent()){
- alarmConfig = alarmConfigService.queryValueByOrganizationId(orgId.get()).get();
- }else if(mpId.isPresent()){
- alarmConfig = alarmConfigService.queryByMonitorPointId(mpId.get()).get();
- } else if(mac.isPresent() ){
- alarmConfig = alarmConfigService.queryByDeviceMac(mac.get()).get();
- }
- //���������������
- if(alarmConfig.getValue()!=null&&alarmConfig.getValue().getAlarmLevels()!=null){
- Map<String, AlarmSensorLevel> alarmLevelMap = alarmConfig.getValue().getAlarmLevels();
- // ������������������������������������������������������
- Map<String,AlarmSensorLevel> defaultSensorLevelMap = null;
- if(alarmConfig.getId()!=null){
- AlarmConfigValue defaultAlarmValue = alarmConfigService.getDefaultAlarmConfigValue();
- defaultSensorLevelMap = defaultAlarmValue.getAlarmLevels();
- }
- Map<String, AlarmSensorLevel> finalDefaultSensorLevelMap = defaultSensorLevelMap;
- alarmLevelMap.entrySet().stream().forEach(entry -> {
- //��� increment������0������������������������
- AlarmSensorLevel alarmSensorLevel = entry.getValue();
- if(alarmSensorLevel.getIncrement()!=null){
- boolean isAllZero = alarmSensorLevel.getIncrement().stream().allMatch(item -> item == 0);
- if(isAllZero){
- AlarmSensorLevel defaultAlarmSensorLevel = finalDefaultSensorLevelMap==null?null:finalDefaultSensorLevelMap.get(entry.getKey());
- if(defaultAlarmSensorLevel!=null){
- alarmSensorLevel.setIncrement(defaultAlarmSensorLevel.getIncrement());
- }else{
- List<Float> tempList = Arrays.asList(0.0f,200.0f,500.0f);
- alarmSensorLevel.setIncrement(tempList);
- }
- }
- }
- });
- //map to list
- Map<String, AlarmSensorLevel> finalAlarmLevelMap = alarmLevelMap;
- sensorAlarmList = alarmLevelMap.keySet().stream().map(key -> {
- AlarmSensorLevel alarmSensorLevel = finalAlarmLevelMap.get(key);
- Map<String,Object> alarmSensorLevelMap = new HashMap<>(BeanMap.create(alarmSensorLevel));
- alarmSensorLevelMap.put("key",key);
- return alarmSensorLevelMap;
- }).collect(Collectors.toList());
- }else{
- return new ResultBean<>("���������������������������������������������",ResultBean.FAIL);
- }
- } catch (Exception e) {
- e.printStackTrace();
- Map<String, Object> err = new LinkedHashMap<String, Object>();
- err.put("msg", "���������������������������������������������������" + e.getMessage());
- return err;
- }
- return sensorAlarmList;
- }
+ if (orgId.isPresent()) {
+ alarmConfig = alarmConfigService.queryValueByOrganizationId(orgId.get()).get();
+ } else if (mpId.isPresent()) {
+ alarmConfig = alarmConfigService.queryByMonitorPointId(mpId.get()).get();
+ } else if (mac.isPresent()) {
+ alarmConfig = alarmConfigService.queryByDeviceMac(mac.get()).get();
+ }
+ // ���������������
+ if (alarmConfig.getValue() != null && alarmConfig.getValue().getAlarmLevels() != null) {
+ Map<String, AlarmSensorLevel> alarmLevelMap = alarmConfig.getValue().getAlarmLevels();
+ // ������������������������������������������������������
+ Map<String, AlarmSensorLevel> defaultSensorLevelMap = null;
+ if (alarmConfig.getId() != null) {
+ AlarmConfigValue defaultAlarmValue = alarmConfigService.getDefaultAlarmConfigValue();
+ defaultSensorLevelMap = defaultAlarmValue.getAlarmLevels();
+ }
+ Map<String, AlarmSensorLevel> finalDefaultSensorLevelMap = defaultSensorLevelMap;
+ alarmLevelMap.entrySet().stream().forEach(entry -> {
+ // ��� increment������0������������������������
+ AlarmSensorLevel alarmSensorLevel = entry.getValue();
+ if (alarmSensorLevel.getIncrement() != null) {
+ boolean isAllZero = alarmSensorLevel.getIncrement().stream().allMatch(item -> item == 0);
+ if (isAllZero) {
+ AlarmSensorLevel defaultAlarmSensorLevel = finalDefaultSensorLevelMap == null ? null
+ : finalDefaultSensorLevelMap.get(entry.getKey());
+ if (defaultAlarmSensorLevel != null) {
+ alarmSensorLevel.setIncrement(defaultAlarmSensorLevel.getIncrement());
+ } else {
+ List<Float> tempList = Arrays.asList(0.0f, 200.0f, 500.0f);
+ alarmSensorLevel.setIncrement(tempList);
+ }
+ }
+ }
+ });
+ // map to list
+ Map<String, AlarmSensorLevel> finalAlarmLevelMap = alarmLevelMap;
+ sensorAlarmList = alarmLevelMap.keySet().stream().map(key -> {
+ AlarmSensorLevel alarmSensorLevel = finalAlarmLevelMap.get(key);
+ Map<String, Object> alarmSensorLevelMap = new HashMap<>(BeanMap.create(alarmSensorLevel));
+ alarmSensorLevelMap.put("key", key);
+ return alarmSensorLevelMap;
+ }).collect(Collectors.toList());
+ } else {
+ return new ResultBean<>("���������������������������������������������", ResultBean.FAIL);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ Map<String, Object> err = new LinkedHashMap<String, Object>();
+ err.put("msg", "���������������������������������������������������" + e.getMessage());
+ return err;
+ }
+ return sensorAlarmList;
+ }
- /**
- * Gets the standard by sensor.���������������������������
- *
- * @param macKey
- * the request
- * @return the standard by sensor
- */
- @GetMapping("sensor-standard")
- public Map<String, Object> getStandardBySensor(@RequestParam("macKey") String macKey) {
- ValidateUtil.notEmpty(macKey, "param.is.null");
- Map<String, Object> result = new HashMap<String, Object>();
- result.put("standard", getValue(macKey + "-standard"));
- return result;
- }
+ /**
+ * Gets the standard by sensor.���������������������������
+ *
+ * @param macKey the request
+ * @return the standard by sensor
+ */
+ @GetMapping("sensor-standard")
+ public Map<String, Object> getStandardBySensor(@RequestParam("macKey") String macKey) {
+ ValidateUtil.notEmpty(macKey, "param.is.null");
+ Map<String, Object> result = new HashMap<String, Object>();
+ result.put("standard", getValue(macKey + "-standard"));
+ return result;
+ }
- /**
- *
- * @param dataSortCondition ������������������������
- * @return
- */
- public ResultBean<Map<String,Object>> getOrderData(DataSortCondition dataSortCondition) {
- ResultBean resultBean = new ResultBean();
- if(dataSortCondition.getCode()==null){
- resultBean.setCode(ResultBean.FAIL);
- resultBean.setMessage("code can't be null");
- } else if(dataSortCondition.getStyle()==null){
- resultBean.setCode(ResultBean.FAIL);
- resultBean.setMessage("style can't be null");
- }
- String code = dataSortCondition.getCode().toString();
- Region region = Region.create(code);
- if(region == null) {
- resultBean.setCode(ResultBean.FAIL);
- resultBean.setMessage("code is not in the correct format");
- }
- // todo
- return null;
- }
- /**
- * Gets the day AQI by sensor.���������������AQI������
- *
- * @param request
- * the request
- * @return the day AQI by sensor
- */
- @GetMapping("day-aqi")
- public Map<String, Object> getDayAQIByDevice(HttpServletRequest request) {
- Map<String, Object> parameters = getParametersStartingWith(request, null);
- return historyMinutelyService.getDayAQIByDevice(parameters);
- }
+ /**
+ *
+ * @param dataSortCondition ������������������������
+ * @return
+ */
+ public ResultBean<Map<String, Object>> getOrderData(DataSortCondition dataSortCondition) {
+ ResultBean resultBean = new ResultBean();
+ if (dataSortCondition.getCode() == null) {
+ resultBean.setCode(ResultBean.FAIL);
+ resultBean.setMessage("code can't be null");
+ } else if (dataSortCondition.getStyle() == null) {
+ resultBean.setCode(ResultBean.FAIL);
+ resultBean.setMessage("style can't be null");
+ }
+ String code = dataSortCondition.getCode().toString();
+ Region region = Region.create(code);
+ if (region == null) {
+ resultBean.setCode(ResultBean.FAIL);
+ resultBean.setMessage("code is not in the correct format");
+ }
+ // todo
+ return null;
+ }
- /**
- * Gets the average by all. ������������������������10������������5������������������������������������������
- *
- * @param request
- * the request
- * @return the average by all
- * @throws Exception
- */
- @GetMapping("all-average")
- public Map<String, Object> getAllSensorAverageByDevice(HttpServletRequest request) throws Exception {
- Map<String, Object> parameters = getParametersStartingWith(request, null);
- return historyService.getAllSensorAverageByDevice(parameters);
- }
+ /**
+ * Gets the day AQI by sensor.���������������AQI������
+ *
+ * @param request the request
+ * @return the day AQI by sensor
+ */
+ @GetMapping("day-aqi")
+ public Map<String, Object> getDayAQIByDevice(HttpServletRequest request) {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ return historyMinutelyService.getDayAQIByDevice(parameters);
+ }
- /**
- * Gets the average by sensor.���������������������������������������������
- *
- * @param request
- * the request
- * @return the average by sensor
- */
- @GetMapping("sensor-average")
- public Map<String, Object> getDeviceRankingBySensorAverage(HttpServletRequest request) {
- Map<String, Object> parameters = getParametersStartingWith(request, null);
- return historyService.getDeviceRankingBySensorAverage(parameters);
- }
+ /**
+ * Gets the average by all. ������������������������10������������5������������������������������������������
+ *
+ * @param request the request
+ * @return the average by all
+ * @throws Exception
+ */
+ @GetMapping("all-average")
+ public Map<String, Object> getAllSensorAverageByDevice(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ return historyService.getAllSensorAverageByDevice(parameters);
+ }
- /**
- * Gets the month average by sensor.������������������������������
- *
- * @param request
- * the request
- * @return the month average by sensor
- */
- @GetMapping("month-sensor-average")
- public Map<String, Object> getMonthAverageBySensor(HttpServletRequest request) {
- Map<String, Object> parameters = getParametersStartingWith(request, null);
- return historyMinutelyService.getMonthAverageBySensor(parameters);
- }
+ /**
+ * Gets the average by sensor.���������������������������������������������
+ *
+ * @param request the request
+ * @return the average by sensor
+ */
+ @GetMapping("sensor-average")
+ public Map<String, Object> getDeviceRankingBySensorAverage(HttpServletRequest request) {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ return historyService.getDeviceRankingBySensorAverage(parameters);
+ }
- @GetMapping("check-activate")
- public ResultBean<Integer> checkActivate(String macCpuCode) {
- Integer result = machineActivateService.checkActivate(macCpuCode);
- return new ResultBean<Integer>(result);
- }
+ /**
+ * Gets the month average by sensor.������������������������������
+ *
+ * @param request the request
+ * @return the month average by sensor
+ */
+ @GetMapping("month-sensor-average")
+ public Map<String, Object> getMonthAverageBySensor(HttpServletRequest request) {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ return historyMinutelyService.getMonthAverageBySensor(parameters);
+ }
- @PostMapping("activate-machine")
- public ResultBean<Integer> activateMachine(HttpServletRequest request) {
- Map<String, Object> parameters = getParametersStartingWith(request, null);
- Integer result = machineActivateService.activateMachine(parameters);
- return new ResultBean<Integer>(result);
- }
+ @GetMapping("check-activate")
+ public ResultBean<Integer> checkActivate(String macCpuCode) {
+ Integer result = machineActivateService.checkActivate(macCpuCode);
+ return new ResultBean<Integer>(result);
+ }
- /*********************************************
- * ������������������������������������
- *********************************************/
- private String fileName = "Version.xml";
- private String ip = "47.96.19.115";
- private String userName = "ftp_user";
- private String userPwd = "qwer1234";
- private int port = 21;
- private String path = "/";
+ @PostMapping("activate-machine")
+ public ResultBean<Integer> activateMachine(HttpServletRequest request) {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ Integer result = machineActivateService.activateMachine(parameters);
+ return new ResultBean<Integer>(result);
+ }
- @RequestMapping(value = "/upgrade", method = RequestMethod.GET)
- public Version index() {
- Version version = new Version();
- FTPClient ftpClient = new FTPClient();
- try {
- ftpClient.connect(ip, port);
- ftpClient.login(userName, userPwd);
- ftpClient.changeWorkingDirectory(path);
- ftpClient.enterLocalPassiveMode();
- //ftpClient.enterLocalActiveMode();
+ /*********************************************
+ * ������������������������������������
+ *********************************************/
+ private String fileName = "Version.xml";
+ private String ip = "47.96.19.115";
+ private String userName = "ftp_user";
+ private String userPwd = "qwer1234";
+ private int port = 21;
+ private String path = "/";
- InputStream ins = ftpClient.retrieveFileStream(fileName);
- BufferedReader reader = new BufferedReader(new InputStreamReader(ins,"utf-8"));
- String line;
- StringBuilder builder = new StringBuilder();
- while ((line = reader.readLine()) != null) {
- builder.append(line);
- }
- reader.close();
- if (ins != null) {
- ins.close();
- }
- ftpClient.getReply();
- String content = builder.toString();
- if(ftpClient.isConnected()) {
- ftpClient.logout();
- ftpClient.disconnect();
- }
+ @RequestMapping(value = "/upgrade", method = RequestMethod.GET)
+ public Version index() {
+ Version version = new Version();
+ FTPClient ftpClient = new FTPClient();
+ try {
+ ftpClient.connect(ip, port);
+ ftpClient.login(userName, userPwd);
+ ftpClient.changeWorkingDirectory(path);
+ ftpClient.enterLocalPassiveMode();
+ // ftpClient.enterLocalActiveMode();
+
+ InputStream ins = ftpClient.retrieveFileStream(fileName);
+ BufferedReader reader = new BufferedReader(new InputStreamReader(ins, "utf-8"));
+ String line;
+ StringBuilder builder = new StringBuilder();
+ while ((line = reader.readLine()) != null) {
+ builder.append(line);
+ }
+ reader.close();
+ if (ins != null) {
+ ins.close();
+ }
+ ftpClient.getReply();
+ String content = builder.toString();
+ if (ftpClient.isConnected()) {
+ ftpClient.logout();
+ ftpClient.disconnect();
+ }
// String urlStr = "http://www.7drlb.com/apps/Version.xml";
// URL realUrl = new URL(urlStr);
@@ -454,440 +448,486 @@
// }
// String content = result.toString();
- SAXReader saxReader = new SAXReader();
- Document document = saxReader.read(new InputSource(new ByteArrayInputStream(content.getBytes("utf-8"))));
- Element root = document.getRootElement();
- version.setVer(root.element("Ver").getText());
- version.setFileName(root.element("FileName").getText());
- version.setFileMD5Hash(root.element("FileMD5Hash").getText());
- } catch (Exception e) {
- e.printStackTrace();
- }
- return version;
- }
+ SAXReader saxReader = new SAXReader();
+ Document document = saxReader.read(new InputSource(new ByteArrayInputStream(content.getBytes("utf-8"))));
+ Element root = document.getRootElement();
+ version.setVer(root.element("Ver").getText());
+ version.setFileName(root.element("FileName").getText());
+ version.setFileMD5Hash(root.element("FileMD5Hash").getText());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return version;
+ }
- public static void main(String[] args) {
- ScreenController sc = new ScreenController();
- Version a = sc.index();
- System.out.println(a.getVer());
- }
+ public static void main(String[] args) {
+ ScreenController sc = new ScreenController();
+ Version a = sc.index();
+ System.out.println(a.getVer());
+ }
- /**
- * ������������
- * ������
- */
- /**
- * ������������
- * @param model
- * @param code
- * @param accountId
- * @return
- */
- @RequestMapping(value = "/map-page", method = RequestMethod.GET)
- public ModelAndView map(ModelAndView model, @RequestParam("areaCode")long code, @RequestParam("accountId")int accountId){
- Account account = accountService.getAccountById(accountId);
- String regionName = areaService.queryFullNameByCode(code);
- if(account!=null&®ionName!=null){
- Object sensors = sensorService.queryAll();
- JSONObject params = new JSONObject();
- params.put("regionCode",code);
- params.put("regionName",regionName);
- params.put("accountId", accountId);
- params.put("orgId", account.getOrganizationId());
- params.put("sensors", sensors);
- String paramsJson = params.toJSONString();
- model.addObject("mapParams",paramsJson);
- model.setViewName("map");
- return model;
- } else {
- StringBuilder msg = new StringBuilder();
- msg.append(" param[0] areaCode:");
- msg.append(code);
- msg.append(" param[0] accountId:");
- msg.append(accountId);
- log.warn(msg);
- model.setViewName("403");
- return model;
- }
- }
- @RequestMapping(value="/get-monitorpoints",method = RequestMethod.GET)
- @ResponseBody
- public ResultBean getMonitorpointList(@RequestParam("orgId")String orgId,MapBounds mapBounds,@RequestParam("regionCode")String regionCode){
- ResultBean<List<MonitorPoint>> resultBean = new ResultBean();
- Map<String,Object> paramMap = new HashMap<String, Object>();
- paramMap.put("orgId", orgId);
- paramMap.put("mapBounds",mapBounds);
- paramMap.put("regionCode",regionCode);
- ParameterUtils.getRegionType4RegionCode(paramMap);
- List<MonitorPoint> list = monitorPointService.queryWithStateByMap(paramMap);
- resultBean.setData(list);
- resultBean.setCode(ResultBean.SUCCESS);
- return resultBean;
- }
- @RequestMapping(value="/get-devices",method = RequestMethod.GET)
- @ResponseBody
- public ResultBean getDevices(@RequestParam("orgId")Integer orgId,MapBounds mapBounds,@RequestParam("regionCode")String regionCode){
- ResultBean<List<Device>> resultBean = new ResultBean();
- Map<String,Object> paramMap = new HashMap<String, Object>();
- paramMap.put("orgId", orgId);
- paramMap.put("mapBounds",mapBounds);
- paramMap.put("regionCode",regionCode);
- ParameterUtils.getRegionType4RegionCode(paramMap);
- List<Device> list = deviceService.query(paramMap);
- resultBean.setData(list);
- resultBean.setCode(ResultBean.SUCCESS);
- return resultBean;
- }
- @RequestMapping(value = "get-devices-for-popup",method = RequestMethod.GET)
- @ResponseBody
- public PageResult getDevicesForPopup(
- @RequestParam("orgId")Integer orgId,
- String name,
- Integer pageSize,
- Integer pageNo
- ){
- return deviceService.query(orgId,name,pageSize,pageNo);
- }
- @RequestMapping(value = "get-devices-by-mid-oid",method = RequestMethod.GET)
- @ResponseBody
- public PageResult getDevicesByMidOid(
- @RequestParam("orgId")Integer orgId,
- @RequestParam("mpId")Integer mpId,
- Integer pageSize,
- Integer pageNo
- ){
- return deviceService.query(orgId,mpId,pageSize,pageNo);
- }
- @RequestMapping(value="/get-real-state-data",method = RequestMethod.POST)
- @ResponseBody
- public JsonData getRealStateAndData(@RequestBody JSONObject paramMap){
- JsonData jsonData = new JsonData();
- Map<String,Object> returnMap = new HashMap<String, Object>();
- returnMap.put("layer", paramMap.getString("layer"));
- //���������������������������
- if(!CollectionUtils.isEmpty(paramMap.getJSONArray("markerKeys"))) {
- JSONArray markerKeys = paramMap.getJSONArray("markerKeys");
- List<Map<String, String>> markers = null;
- if("equipments".equals(paramMap.getString("layer"))) {
- markers = deviceService.queryDevicesState(markerKeys.toJavaList(String.class),true);
- }else {//���������������id���state
- String orgId= paramMap.getString("orgId");
- String areaCode= paramMap.getString("areaCode");
- for(Object mPointId:markerKeys) {
- markers = monitorPointService.queryMonitroPointsState(markerKeys.toJavaList(Integer.class));
- }
- }
- returnMap.put("markers", markers);
- }
- if(paramMap.getJSONArray("popupEquMacs")!=null&¶mMap.getJSONArray("popupEquMacs").size()>0) {
- JSONArray popupEquMacs = paramMap.getJSONArray("popupEquMacs");
- List<Map<String, String>> popupEquWithStates = null;
- for(Object mac:popupEquMacs) {
- popupEquWithStates = deviceService.queryDevicesState(popupEquMacs.toJavaList(String.class),false);
- }
- //���������������������������
- returnMap.put("popupEquStates", popupEquWithStates);
- }
- jsonData.setExtData(returnMap);
- return jsonData;
- }
-
- @GetMapping("monitor_points")
- public ResultBean<List<MonitorPoint>> getMonitorPointsByOrganizationId(Integer orgId) {
- //Map<String, Object> parameters = getParametersStartingWith(request, null);
- List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsByOrganizationId(orgId);
- return new ResultBean<List<MonitorPoint>>(monitorPoints);
- }
+ /**
+ * ������������ ������
+ */
+ /**
+ * ������������
+ *
+ * @param model
+ * @param code
+ * @param accountId
+ * @return
+ */
+ @RequestMapping(value = "/map-page", method = RequestMethod.GET)
+ public ModelAndView map(ModelAndView model, @RequestParam("areaCode") long code,
+ @RequestParam("accountId") int accountId) {
+ Account account = accountService.getAccountById(accountId);
+ String regionName = areaService.queryFullNameByCode(code);
+ if (account != null && regionName != null) {
+ Object sensors = sensorService.queryAll();
+ JSONObject params = new JSONObject();
+ params.put("regionCode", code);
+ params.put("regionName", regionName);
+ params.put("accountId", accountId);
+ params.put("orgId", account.getOrganizationId());
+ params.put("sensors", sensors);
+ String paramsJson = params.toJSONString();
+ model.addObject("mapParams", paramsJson);
+ model.setViewName("map");
+ return model;
+ } else {
+ StringBuilder msg = new StringBuilder();
+ msg.append(" param[0] areaCode:");
+ msg.append(code);
+ msg.append(" param[0] accountId:");
+ msg.append(accountId);
+ log.warn(msg);
+ model.setViewName("403");
+ return model;
+ }
+ }
- @GetMapping("report_avg_datas")
- public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgData(HttpServletRequest request) throws Exception {
- Map<String, Object> parameters = getParametersStartingWith(request, null);
- ParameterUtils.getTimeType4Time(parameters);
- parameters.put("monitorPointId", parameters.remove("monitorPoint"));
- Object sensorKey = parameters.remove("sensorKey");
- parameters.put("sensors", Arrays.asList(sensorKey));
- //monitorPointService.isCompensateCalculation(parameters);
- List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
-
- for (Map<String, Object> map : list) {
- String time = map.get("time").toString();
- time = time.substring(time.length() - 2);
- map.put("time", Integer.valueOf(time));
- map.put("value", map.remove(sensorKey));
- }
- return new ResultBean<List<Map<String, Object>>>(list);
- }
+ @RequestMapping(value = "/get-monitorpoints", method = RequestMethod.GET)
+ @ResponseBody
+ public ResultBean getMonitorpointList(@RequestParam("orgId") String orgId, MapBounds mapBounds,
+ @RequestParam("regionCode") String regionCode) {
+ ResultBean<List<MonitorPoint>> resultBean = new ResultBean();
+ Map<String, Object> paramMap = new HashMap<String, Object>();
+ paramMap.put("orgId", orgId);
+ paramMap.put("mapBounds", mapBounds);
+ paramMap.put("regionCode", regionCode);
+ ParameterUtils.getRegionType4RegionCode(paramMap);
+ List<MonitorPoint> list = monitorPointService.queryWithStateByMap(paramMap);
+ resultBean.setData(list);
+ resultBean.setCode(ResultBean.SUCCESS);
+ return resultBean;
+ }
- @GetMapping("report_alarm_datas")
- public ResultBean<List<Map<String, Object>>> getAlarmData(HttpServletRequest request) throws Exception {
- Map<String, Object> parameters = getParametersStartingWith(request, null);
- ParameterUtils.getTimeType4Time(parameters);
- //parameters.put("type", "month");
- String sensorKey = "list";
- if (ObjectUtils.isEmpty(parameters.get("sensorKey"))) {
- parameters.put("description", "description");
- } else {
- sensorKey = parameters.remove("sensorKey").toString();
- List<String> sensorKeys = new ArrayList<String>();
- sensorKeys.add(sensorKey);
- parameters.put("sensors", sensorKeys);
- }
- if (!ObjectUtils.isEmpty(parameters.get("organizationId"))) {
- if (!Constants.isNotSpecialOrgId(Integer.valueOf(parameters.get("organizationId").toString()))) {
- parameters.remove("organizationId");
- }
- }
- Map pieData = alarmDailyService.getPieData(parameters);
- List<Map<String, Object>> list = (List<Map<String, Object>>) pieData.get(sensorKey);
- return new ResultBean<List<Map<String, Object>>>(list);
- }
+ @RequestMapping(value = "/get-devices", method = RequestMethod.GET)
+ @ResponseBody
+ public ResultBean getDevices(@RequestParam("orgId") Integer orgId, MapBounds mapBounds,
+ @RequestParam("regionCode") String regionCode) {
+ ResultBean<List<Device>> resultBean = new ResultBean();
+ Map<String, Object> paramMap = new HashMap<String, Object>();
+ paramMap.put("orgId", orgId);
+ paramMap.put("mapBounds", mapBounds);
+ paramMap.put("regionCode", regionCode);
+ ParameterUtils.getRegionType4RegionCode(paramMap);
+ List<Device> list = deviceService.query(paramMap);
+ resultBean.setData(list);
+ resultBean.setCode(ResultBean.SUCCESS);
+ return resultBean;
+ }
- /**
- * ���������������id������������������version���������
- * @param mptid
- * @return
- */
- @GetMapping("getvers")
- public ResultBean<List<Integer>> getVersions(Integer mptid){
- return new ResultBean<>(monitorPointService.queryVersionsById(mptid));
- }
-
- @GetMapping("region_ranking_data")
- @ApiOperation(value = "������������������", notes = "������������������")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "regionCode", value = "���������", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "dimension", value = "������(profession���region���monitorPoint������)", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "accountId", value = "������id", required = true, paramType = "query", dataType = "int"),
- @ApiImplicitParam(name = "timeType", value = "������������(month���day���hour������)", required = true, paramType = "query", dataType = "int"),
- })
- public ResultBean<List<Map<String, Object>>> getRegionRankingData(HttpServletRequest request){
- Map<String, Object> parameters = getParametersStartingWith(request, null);
- List<Map<String, Object>> list = historyService.getRegionRankingData(parameters);
- return new ResultBean<List<Map<String, Object>>>(list);
- }
- // todo
- @Value(value = "classpath:system/realTimeMonitorLayout.json")
- private org.springframework.core.io.Resource resource;
- @ApiOperation(value = "������������������������������", notes = "")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "primaryKey",defaultValue = "898607b0101730391967", value = "���������������mac������������id", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "type", defaultValue = "device",value = "���������'monitorPoint'���'device'", required = true, paramType = "query", dataType = "String"),
- })
- @GetMapping("rtm-layout")
- public ResultBean realTimeMonitorLayout(String primaryKey,String type){
- RealTimeDeviceLayout rtdLayout = null;
- if(type != null && type.equals("device")) {
- Device device = deviceService.getDeviceByMac(primaryKey,false);
- if(device!= null
- && device.getOrganizationIds()!=null
- && device.getOrganizationIds().size() >0
- && device.getDeviceVersionId()!=null) {
- Integer orgId = device.getOrganizationIds().get(0);
- DeviceVersion deviceVersion = deviceVersionService.queryVersionById(device.getDeviceVersionId());
- rtdLayout = orgLayoutService.queryRtdLayoutWithUnit(orgId,deviceVersion.getVersion());
- }else {
- String errMsg = "device ���������������"+ JSON.toJSONString(device);
- log.warn(errMsg);
- return ResultBean.fail(errMsg);
- }
+ @RequestMapping(value = "get-devices-for-popup", method = RequestMethod.GET)
+ @ResponseBody
+ public PageResult getDevicesForPopup(@RequestParam("orgId") Integer orgId, String name, Integer pageSize,
+ Integer pageNo) {
+ return deviceService.query(orgId, name, pageSize, pageNo);
+ }
- } else {
- MonitorPoint monitorPoint = monitorPointService.queryMonitorPointById(Integer.parseInt(primaryKey));
- List<DeviceVersion> versionList = deviceVersionService.queryByMpointId(monitorPoint.getId());
- if(versionList.size() > 0) {
- List<Integer> versionNolist = versionList.stream().map(item -> {
- return item.getVersion();
- }).collect(Collectors.toList());
- rtdLayout = orgLayoutService.queryRtdLayoutWithUnit(monitorPoint.getOrganizationId(),versionNolist);
- if(rtdLayout == null) {
- return ResultBean.fail();
- }
- }
- }
- if(rtdLayout!=null && rtdLayout.getDefaultMonitorItems().size() == 0 ) {
- rtdLayout.getDefaultMonitorItems().addAll(rtdLayout.getCoreMonitorItems());
- }
- return new ResultBean(rtdLayout == null? new RealTimeDeviceLayout():rtdLayout);
- }
+ @RequestMapping(value = "get-devices-by-mid-oid", method = RequestMethod.GET)
+ @ResponseBody
+ public PageResult getDevicesByMidOid(@RequestParam("orgId") Integer orgId, @RequestParam("mpId") Integer mpId,
+ Integer pageSize, Integer pageNo) {
+ return deviceService.query(orgId, mpId, pageSize, pageNo);
+ }
- @GetMapping("report_avg_data")
- @ApiOperation(value = "������������������������������", notes = "������������������������������")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "monitorPoint", value = "���������id", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "mac", value = "������mac", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "sensorKey", value = "���������key,���������������������������", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "time", value = "������,������(���������2018-03)", required = true, paramType = "query", dataType = "String"),
- })
- public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgDataBySensorKey(HttpServletRequest request) throws Exception {
- Map<String, Object> parameters = getParametersStartingWith(request, null);
- ParameterUtils.getTimeType4Time(parameters);
- parameters.put("monitorPointId", parameters.remove("monitorPoint"));
- String[] sensorKeys = parameters.remove("sensorKey").toString().split(",");
- parameters.put("sensors", Arrays.asList(sensorKeys));
- //monitorPointService.isCompensateCalculation(parameters);
- List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
-
- for (Map<String, Object> map : list) {
- String time = map.get("time").toString();
- time = time.substring(time.length() - 2);
- map.put("time", Integer.valueOf(time));
- List<Number> values = new ArrayList<Number>();
- for (String string : sensorKeys) {
- values.add((Number) map.remove(string));
- }
- map.put("values", values);
- }
- return new ResultBean<List<Map<String, Object>>>(list);
- }
- @GetMapping("getmpoint-byid")
- @ApiOperation(value = "���������������������", notes = "���������������������,���������������������������������������������")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "monitorPointId",defaultValue = "1",value = "���������id", required = true, paramType = "query", dataType = "Integer"),
- })
- public ResultBean<MonitorPoint> getMonitorPointById(Integer monitorPointId){
- MonitorPoint monitorPoint = monitorPointService.queryMonitorPointById(monitorPointId);
- return new ResultBean<>(monitorPoint);
- }
- @Resource
- HangzhouAqiService hangzhouAqiService;
- @GetMapping("aqi24hours")
- @ApiOperation(value = "������24������aqi������", notes = "������24������������aqi������")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "orgid",defaultValue = "5",value = "������id", required = true, paramType = "query", dataType = "Integer"),
- })
- public ResultBean<List<Map<String,Object>>> getAqi24HoursNC(@RequestParam("orgid") Integer organizationId) {
- return new ResultBean<>(hangzhouAqiService.queryAqi24Hours(organizationId));
- }
- @GetMapping("mpt-dev-summary")
- @ApiOperation(value = "���������������������������������", notes = "���������������������������������")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "orgid",defaultValue = "5",value = "������id", required = true, paramType = "query", dataType = "Integer"),
- })
- public ResultBean<Map> getMptAndDevSummary(@RequestParam("orgid") Integer organizationId){
- Map<String,Map> result = new HashMap<>(2);
- Integer mptCount = monitorPointService.countOfSubOrgs(organizationId);
- Map monitorPointSummary = new HashMap();
- monitorPointSummary.put("all",mptCount);
- Map deviceSummary = deviceService.queryDeviceStateSummary(organizationId);
- result.put("monitorPoint",monitorPointSummary);
- result.put("device",deviceSummary);
- return new ResultBean<>(result);
- }
-
- @GetMapping("weather")
- @ApiOperation(value = "������������������������", notes = "������������������������")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "organizationId",defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "String")
- })
- public ResultBean<Map<String, Object>> getWeatherDataByRegion(HttpServletRequest request) throws Exception {
- Map<String, Object> parameters = getParametersStartingWith(request, null);
- Map<String, Object> map = weatherService.getWeatherDataByRegion(parameters);
- return new ResultBean<Map<String,Object>>(map);
- }
+ @RequestMapping(value = "/get-real-state-data", method = RequestMethod.POST)
+ @ResponseBody
+ public JsonData getRealStateAndData(@RequestBody JSONObject paramMap) {
+ JsonData jsonData = new JsonData();
+ Map<String, Object> returnMap = new HashMap<String, Object>();
+ returnMap.put("layer", paramMap.getString("layer"));
+ // ���������������������������
+ if (!CollectionUtils.isEmpty(paramMap.getJSONArray("markerKeys"))) {
+ JSONArray markerKeys = paramMap.getJSONArray("markerKeys");
+ List<Map<String, String>> markers = null;
+ if ("equipments".equals(paramMap.getString("layer"))) {
+ markers = deviceService.queryDevicesState(markerKeys.toJavaList(String.class), true);
+ } else {// ���������������id���state
+ String orgId = paramMap.getString("orgId");
+ String areaCode = paramMap.getString("areaCode");
+ for (Object mPointId : markerKeys) {
+ markers = monitorPointService.queryMonitroPointsState(markerKeys.toJavaList(Integer.class));
+ }
+ }
+ returnMap.put("markers", markers);
+ }
+ if (paramMap.getJSONArray("popupEquMacs") != null && paramMap.getJSONArray("popupEquMacs").size() > 0) {
+ JSONArray popupEquMacs = paramMap.getJSONArray("popupEquMacs");
+ List<Map<String, String>> popupEquWithStates = null;
+ for (Object mac : popupEquMacs) {
+ popupEquWithStates = deviceService.queryDevicesState(popupEquMacs.toJavaList(String.class), false);
+ }
+ // ���������������������������
+ returnMap.put("popupEquStates", popupEquWithStates);
+ }
+ jsonData.setExtData(returnMap);
+ return jsonData;
+ }
- @GetMapping("actual")
- @ApiOperation(value = "���������������������������������", notes = "���������������������������������")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "accountId",defaultValue = "1", value = "���������������id", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "sensorKey",defaultValue = "e1,e2,e3", value = "���������key,���������������������������", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "time",defaultValue = "", value = "������(long������������)", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "interval",defaultValue = "30", value = "���������������������", required = true, paramType = "query", dataType = "Integer"),
- })
- public ResultBean<Map<String, Object>> getActualDataByRegion(HttpServletRequest request) throws Exception {
- Map<String, Object> parameters = getParametersStartingWith(request, null);
- Map<String, Object> map = historyService.getActualDataByRegion(parameters);
- return new ResultBean<Map<String, Object>>(map);
- }
+ @GetMapping("monitor_points")
+ public ResultBean<List<MonitorPoint>> getMonitorPointsByOrganizationId(Integer orgId) {
+ // Map<String, Object> parameters = getParametersStartingWith(request, null);
+ List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsByOrganizationId(orgId);
+ return new ResultBean<List<MonitorPoint>>(monitorPoints);
+ }
- @GetMapping("quality")
- @ApiOperation(value = "������������������", notes = "������������������")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "organizationId",defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "String")
- })
- public ResultBean<Map<String, Object>> getQualityCountDayByRegion(HttpServletRequest request) throws Exception {
- Map<String, Object> parameters = getParametersStartingWith(request, null);
- Map<String, Object> map = qualityDailyService.getQualityCountDayByRegion(parameters);
- return new ResultBean<Map<String, Object>>(map);
- }
+ @GetMapping("report_avg_datas")
+ public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgData(HttpServletRequest request)
+ throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ ParameterUtils.getTimeType4Time(parameters);
+ parameters.put("monitorPointId", parameters.remove("monitorPoint"));
+ Object sensorKey = parameters.remove("sensorKey");
+ parameters.put("sensors", Arrays.asList(sensorKey));
+ // monitorPointService.isCompensateCalculation(parameters);
+ List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
- @GetMapping("monitorpoints-devices")
- @ApiOperation(value = "���������������������������", notes = "���������������������������")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "organizationId",defaultValue = "8", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
- @ApiImplicitParam(name = "regionCode",defaultValue = "320583", value = "���������", required = true, paramType = "query", dataType = "String")
- })
- public ResultBean<List<MonitorPoint>> getMonitorPointsAndDevicesByRegion(HttpServletRequest request) throws Exception {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
- List<MonitorPoint> monitorPoints= monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);
- return new ResultBean<List<MonitorPoint>>(monitorPoints);
- }
+ for (Map<String, Object> map : list) {
+ String time = map.get("time").toString();
+ time = time.substring(time.length() - 2);
+ map.put("time", Integer.valueOf(time));
+ map.put("value", map.remove(sensorKey));
+ }
+ return new ResultBean<List<Map<String, Object>>>(list);
+ }
+ @GetMapping("report_alarm_datas")
+ public ResultBean<List<Map<String, Object>>> getAlarmData(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ ParameterUtils.getTimeType4Time(parameters);
+ // parameters.put("type", "month");
+ String sensorKey = "list";
+ if (ObjectUtils.isEmpty(parameters.get("sensorKey"))) {
+ parameters.put("description", "description");
+ } else {
+ sensorKey = parameters.remove("sensorKey").toString();
+ List<String> sensorKeys = new ArrayList<String>();
+ sensorKeys.add(sensorKey);
+ parameters.put("sensors", sensorKeys);
+ }
+ if (!ObjectUtils.isEmpty(parameters.get("organizationId"))) {
+ if (!Constants.isNotSpecialOrgId(Integer.valueOf(parameters.get("organizationId").toString()))) {
+ parameters.remove("organizationId");
+ }
+ }
+ Map pieData = alarmDailyService.getPieData(parameters);
+ List<Map<String, Object>> list = (List<Map<String, Object>>) pieData.get(sensorKey);
+ return new ResultBean<List<Map<String, Object>>>(list);
+ }
- @GetMapping("devices-state")
- @ApiOperation(value = "������������������", notes = "������������������")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "organizationId",defaultValue = "8", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
- @ApiImplicitParam(name = "regionCode",defaultValue = "320583", value = "���������", required = true, paramType = "query", dataType = "String")
- })
- public ResultBean<Collection<Object>> getDevicesStateByRegion(HttpServletRequest request) throws Exception {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
- Collection<Object> monitorPoints= monitorPointService.getDevicesStateByRegion(parameters);
- return new ResultBean<Collection<Object>>(monitorPoints);
- }
-
- @Resource
- private HistoryDailyService historyDailyService;
-
- @GetMapping("emissions")
- @ApiOperation(value = "���������", notes = "���������")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "organizationId",defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
- @ApiImplicitParam(name = "time",defaultValue = "2019", value = "���������������", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "sensorKey",defaultValue = "e27", value = "������������������������key", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "regionCode",defaultValue = "130000", value = "���������", required = true, paramType = "query", dataType = "String")
- })
- public ResultBean<List<Map<String, Object>>> getemissionsData(HttpServletRequest request) throws Exception {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
- List<Map<String, Object>> result = historyDailyService.getEmissionsData(parameters);
- return new ResultBean<List<Map<String, Object>>>(result);
- }
+ /**
+ * ���������������id������������������version���������
+ *
+ * @param mptid
+ * @return
+ */
+ @GetMapping("getvers")
+ public ResultBean<List<Integer>> getVersions(Integer mptid) {
+ return new ResultBean<>(monitorPointService.queryVersionsById(mptid));
+ }
+ @GetMapping("region_ranking_data")
+ @ApiOperation(value = "������������������", notes = "������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "regionCode", value = "���������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "dimension", value = "������(profession���region���monitorPoint������)", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "accountId", value = "������id", required = true, paramType = "query", dataType = "int"),
+ @ApiImplicitParam(name = "timeType", value = "������������(month���day���hour������)", required = true, paramType = "query", dataType = "int"), })
+ public ResultBean<List<Map<String, Object>>> getRegionRankingData(HttpServletRequest request) {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ List<Map<String, Object>> list = historyService.getRegionRankingData(parameters);
+ return new ResultBean<List<Map<String, Object>>>(list);
+ }
- @GetMapping("overproof")
- @ApiOperation(value = "������������", notes = "������������")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "organizationId",defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
- @ApiImplicitParam(name = "time",defaultValue = "2019", value = "���������������", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "sensorKey",defaultValue = "e27", value = "������������������������key", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "overproofRatio",defaultValue = "0", value = "������������(0,1,2,3)(������,������100%,������200%,������300%)", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "regionCode",defaultValue = "130000", value = "���������", required = true, paramType = "query", dataType = "String")
- })
- public ResultBean<Map> getOverproofData(HttpServletRequest request) throws Exception {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
- Map result = historyDailyService.getOverproofData(parameters);
- return new ResultBean<Map>(result);
- }
+ // todo
+ @Value(value = "classpath:system/realTimeMonitorLayout.json")
+ private org.springframework.core.io.Resource resource;
- @GetMapping("limit-device")
- @ApiOperation(value = "���������������������������", notes = "���������������������������")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "mac",defaultValue = "p5dnd7a0391956", value = "������mac���", required = true, paramType = "query", dataType = "String")
- })
- public ResultBean<List<Map<String, Object>>> getLimitDataByDevice(HttpServletRequest request) throws Exception {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
- String density = deviceService.getLimitDataByDevice(parameters);
- JSONObject parseObject = JSONObject.parseObject(density);
- List<Map<String, Object>> resuList = new ArrayList<Map<String,Object>>();
- for (Map.Entry entry : parseObject.entrySet()) {
- resuList.add(new HashMap<String, Object>() {
- {
- put("key",entry.getKey());
- put("limit", entry.getValue());
- }
- });
- }
- return new ResultBean<List<Map<String, Object>>>(resuList);
- }
+ @ApiOperation(value = "������������������������������", notes = "")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "primaryKey", defaultValue = "898607b0101730391967", value = "���������������mac������������id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "type", defaultValue = "device", value = "���������'monitorPoint'���'device'", required = true, paramType = "query", dataType = "String"), })
+ @GetMapping("rtm-layout")
+ public ResultBean realTimeMonitorLayout(String primaryKey, String type) {
+ RealTimeDeviceLayout rtdLayout = null;
+ if (type != null && type.equals("device")) {
+ Device device = deviceService.getDeviceByMac(primaryKey, false);
+ if (device != null && device.getOrganizationIds() != null && device.getOrganizationIds().size() > 0
+ && device.getDeviceVersionId() != null) {
+ Integer orgId = device.getOrganizationIds().get(0);
+ DeviceVersion deviceVersion = deviceVersionService.queryVersionById(device.getDeviceVersionId());
+ rtdLayout = orgLayoutService.queryRtdLayoutWithUnit(orgId, deviceVersion.getVersion());
+ } else {
+ String errMsg = "device ���������������" + JSON.toJSONString(device);
+ log.warn(errMsg);
+ return ResultBean.fail(errMsg);
+ }
+
+ } else {
+ MonitorPoint monitorPoint = monitorPointService.queryMonitorPointById(Integer.parseInt(primaryKey));
+ List<DeviceVersion> versionList = deviceVersionService.queryByMpointId(monitorPoint.getId());
+ if (versionList.size() > 0) {
+ List<Integer> versionNolist = versionList.stream().map(item -> {
+ return item.getVersion();
+ }).collect(Collectors.toList());
+ rtdLayout = orgLayoutService.queryRtdLayoutWithUnit(monitorPoint.getOrganizationId(), versionNolist);
+ if (rtdLayout == null) {
+ return ResultBean.fail();
+ }
+ }
+ }
+ if (rtdLayout != null && rtdLayout.getDefaultMonitorItems().size() == 0) {
+ rtdLayout.getDefaultMonitorItems().addAll(rtdLayout.getCoreMonitorItems());
+ }
+ return new ResultBean(rtdLayout == null ? new RealTimeDeviceLayout() : rtdLayout);
+ }
+
+ @GetMapping("report_avg_data")
+ @ApiOperation(value = "������������������������������", notes = "������������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "monitorPoint", value = "���������id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "mac", value = "������mac", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", value = "���������key,���������������������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "������,������(���������2018-03)", required = true, paramType = "query", dataType = "String"), })
+ public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgDataBySensorKey(HttpServletRequest request)
+ throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ ParameterUtils.getTimeType4Time(parameters);
+ parameters.put("monitorPointId", parameters.remove("monitorPoint"));
+ String[] sensorKeys = parameters.remove("sensorKey").toString().split(",");
+ parameters.put("sensors", Arrays.asList(sensorKeys));
+ // monitorPointService.isCompensateCalculation(parameters);
+ List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
+
+ for (Map<String, Object> map : list) {
+ String time = map.get("time").toString();
+ time = time.substring(time.length() - 2);
+ map.put("time", Integer.valueOf(time));
+ List<Number> values = new ArrayList<Number>();
+ for (String string : sensorKeys) {
+ values.add((Number) map.remove(string));
+ }
+ map.put("values", values);
+ }
+ return new ResultBean<List<Map<String, Object>>>(list);
+ }
+
+ @GetMapping("getmpoint-byid")
+ @ApiOperation(value = "���������������������", notes = "���������������������,���������������������������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "monitorPointId", defaultValue = "1", value = "���������id", required = true, paramType = "query", dataType = "Integer"), })
+ public ResultBean<MonitorPoint> getMonitorPointById(Integer monitorPointId) {
+ MonitorPoint monitorPoint = monitorPointService.queryMonitorPointById(monitorPointId);
+ return new ResultBean<>(monitorPoint);
+ }
+
+ @Resource
+ HangzhouAqiService hangzhouAqiService;
+
+ @GetMapping("aqi24hours")
+ @ApiOperation(value = "������24������aqi������", notes = "������24������������aqi������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "orgid", defaultValue = "5", value = "������id", required = true, paramType = "query", dataType = "Integer"), })
+ public ResultBean<List<Map<String, Object>>> getAqi24HoursNC(@RequestParam("orgid") Integer organizationId) {
+ return new ResultBean<>(hangzhouAqiService.queryAqi24Hours(organizationId));
+ }
+
+ @GetMapping("mpt-dev-summary")
+ @ApiOperation(value = "���������������������������������", notes = "���������������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "orgid", defaultValue = "5", value = "������id", required = true, paramType = "query", dataType = "Integer"), })
+ public ResultBean<Map> getMptAndDevSummary(@RequestParam("orgid") Integer organizationId) {
+ Map<String, Map> result = new HashMap<>(2);
+ Integer mptCount = monitorPointService.countOfSubOrgs(organizationId);
+ Map monitorPointSummary = new HashMap();
+ monitorPointSummary.put("all", mptCount);
+ Map deviceSummary = deviceService.queryDeviceStateSummary(organizationId);
+ result.put("monitorPoint", monitorPointSummary);
+ result.put("device", deviceSummary);
+ return new ResultBean<>(result);
+ }
+
+ @GetMapping("weather")
+ @ApiOperation(value = "������������������������", notes = "������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "organizationId", defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "String") })
+ public ResultBean<Map<String, Object>> getWeatherDataByRegion(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ Map<String, Object> map = weatherService.getWeatherDataByRegion(parameters);
+ return new ResultBean<Map<String, Object>>(map);
+ }
+
+ @GetMapping("actual")
+ @ApiOperation(value = "���������������������������������", notes = "���������������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "accountId", defaultValue = "1", value = "���������������id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", defaultValue = "e1,e2,e3", value = "���������key,���������������������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", defaultValue = "", value = "������(long������������)", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "interval", defaultValue = "30", value = "���������������������", required = true, paramType = "query", dataType = "Integer"), })
+ public ResultBean<Map<String, Object>> getActualDataByRegion(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ Map<String, Object> map = historyService.getActualDataByRegion(parameters);
+ return new ResultBean<Map<String, Object>>(map);
+ }
+
+ @GetMapping("quality")
+ @ApiOperation(value = "������������������", notes = "������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "organizationId", defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "String") })
+ public ResultBean<Map<String, Object>> getQualityCountDayByRegion(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ Map<String, Object> map = qualityDailyService.getQualityCountDayByRegion(parameters);
+ return new ResultBean<Map<String, Object>>(map);
+ }
+
+ @GetMapping("monitorpoints-devices")
+ @ApiOperation(value = "���������������������������", notes = "���������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "organizationId", defaultValue = "8", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "regionCode", defaultValue = "320583", value = "���������", required = true, paramType = "query", dataType = "String") })
+ public ResultBean<List<MonitorPoint>> getMonitorPointsAndDevicesByRegion(HttpServletRequest request)
+ throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);
+ return new ResultBean<List<MonitorPoint>>(monitorPoints);
+ }
+
+ @GetMapping("devices-state")
+ @ApiOperation(value = "������������������", notes = "������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "organizationId", defaultValue = "8", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "regionCode", defaultValue = "320583", value = "���������", required = true, paramType = "query", dataType = "String") })
+ public ResultBean<Collection<Object>> getDevicesStateByRegion(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ Collection<Object> monitorPoints = monitorPointService.getDevicesStateByRegion(parameters);
+ return new ResultBean<Collection<Object>>(monitorPoints);
+ }
+
+ @Resource
+ private HistoryDailyService historyDailyService;
+
+ @GetMapping("emissions")
+ @ApiOperation(value = "���������", notes = "���������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "organizationId", defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "time", defaultValue = "2019", value = "���������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", defaultValue = "e27", value = "������������������������key", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "regionCode", defaultValue = "130000", value = "���������", required = true, paramType = "query", dataType = "String") })
+ public ResultBean<List<Map<String, Object>>> getemissionsData(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ List<Map<String, Object>> result = historyDailyService.getEmissionsData(parameters);
+ return new ResultBean<List<Map<String, Object>>>(result);
+ }
+
+ @GetMapping("overproof")
+ @ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "organizationId", defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "time", defaultValue = "2019", value = "���������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", defaultValue = "e27", value = "������������������������key", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "overproofRatio", defaultValue = "0", value = "������������(0,1,2,3)(������,������100%,������200%,������300%)", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "regionCode", defaultValue = "130000", value = "���������", required = true, paramType = "query", dataType = "String") })
+ public ResultBean<Map> getOverproofData(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ Map result = historyDailyService.getOverproofData(parameters);
+ return new ResultBean<Map>(result);
+ }
+
+ @GetMapping("limit-device")
+ @ApiOperation(value = "���������������������������", notes = "���������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "mac", defaultValue = "p5dnd7a0391956", value = "������mac���", required = true, paramType = "query", dataType = "String") })
+ public ResultBean<List<Map<String, Object>>> getLimitDataByDevice(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String density = deviceService.getLimitDataByDevice(parameters);
+ JSONObject parseObject = JSONObject.parseObject(density);
+ List<Map<String, Object>> resuList = new ArrayList<Map<String, Object>>();
+ for (Map.Entry entry : parseObject.entrySet()) {
+ resuList.add(new HashMap<String, Object>() {
+ {
+ put("key", entry.getKey());
+ put("limit", entry.getValue());
+ }
+ });
+ }
+ return new ResultBean<List<Map<String, Object>>>(resuList);
+ }
+
+ /**
+ * @description ������������mac������������������������������������������
+ * @author ZhuDongming
+ * @date 2019-06-05 10:02:10
+ * @param model
+ * @param request
+ * @return
+ * @throws Exception
+ */
+ @GetMapping("/map-traceability")
+ @ApiOperation(value = "������������������", notes = "������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "monitorPointId", value = "���������id", required = true, paramType = "query", dataType = "int"),
+ @ApiImplicitParam(name = "mac", value = "������mac������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", value = "������������������������key", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "������������", required = true, paramType = "query", dataType = "String") })
+ public ModelAndView traceability(ModelAndView model, HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ Integer monitorPointId = Integer.parseInt(parameters.get("monitorPointId").toString());
+ MonitorPoint monitorPoint = monitorPointService.queryWithRelationById(monitorPointId);
+ String mac = parameters.get("mac").toString();
+ String sensorKey = parameters.get("sensorKey").toString();
+ String time = parameters.get("time").toString();
+ Long code = monitorPoint.getAreaCode().longValue();
+ String regionName = areaService.queryFullNameByCode(code);
+ Device device = deviceService.getDeviceByMac(mac, false);
+ if (monitorPoint != null && mac != null && sensorKey != null && time != null) {
+ Map<String, Double> resultMap = historyDailyService.getTraceabilityData(parameters);
+ JSONObject params = new JSONObject();
+ params.put("sensorInfo", resultMap);
+ params.put("regionCode", code);
+ params.put("regionName", regionName);
+ params.put("monitorPoint", monitorPoint);
+ params.put("device", device);
+ String paramsJson = params.toJSONString();
+ model.addObject("traceabilityParams", paramsJson);
+ model.setViewName("traceability");
+ return model;
+ } else {
+ StringBuilder msg = new StringBuilder();
+ msg.append(" param[0] monitorPointId:");
+ msg.append(monitorPointId.toString());
+ msg.append(" param[0] mac:");
+ msg.append(mac);
+ msg.append(" param[0] sensorKey:");
+ msg.append(sensorKey);
+ msg.append(" param[0] time:");
+ msg.append(time);
+ log.warn(msg);
+ model.setViewName("403");
+ return model;
+ }
+ }
}
--
Gitblit v1.8.0