From c476e03205029771446bf723c71ccf9f04f0ef10 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 25 Sep 2020 16:52:48 +0800
Subject: [PATCH] BS获取风向以及站点信息Webscoket接口
---
src/main/java/com/moral/controller/WebController.java | 58 ----------------------------------------------------------
1 files changed, 0 insertions(+), 58 deletions(-)
diff --git a/src/main/java/com/moral/controller/WebController.java b/src/main/java/com/moral/controller/WebController.java
index 5fef648..c031c2a 100644
--- a/src/main/java/com/moral/controller/WebController.java
+++ b/src/main/java/com/moral/controller/WebController.java
@@ -136,64 +136,6 @@
return resultMap;
}
- //������
- @UserLoginToken
- @RequestMapping("getAccountInfoTest")
- public Map<String, Object> getAccountInfoTest(@RequestBody Map<String, Object> parameters) {
- Map<String, Object> resultMap = new HashMap<String, Object>();
- System.out.println(parameters);
- if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {
- resultMap.put("msg", "������������������������������������");
- resultMap.put("accountId", -1);
- } else {
- resultMap = accountService.screenLoginNew(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())) {
- //���������������������������������������������������
- 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());
- }
- resultMap.put("mapPath", areaNamesBuilder.toString());
- String accountId = String.valueOf(resultMap.get("accountId"));
- resultMap.put("token", webTokenService.getToken(accountId));
- }
- }
- return resultMap;
- }
-
@UserLoginToken
@GetMapping("report_avg_datas")
--
Gitblit v1.8.0