From 947aaf8f45cfaa026b765259955257b3e656a308 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 31 May 2021 09:00:38 +0800
Subject: [PATCH] 站点返回数据添加省市区中文，组织信息
---
screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++----
screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java | 1 +
2 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
index c4a94b0..72b79bc 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
@@ -179,6 +179,7 @@
QueryWrapper<ManageRole> wrapper = new QueryWrapper();
wrapper.eq("is_delete",0);
wrapper.like("name",map.get("name"));
+ wrapper.orderByDesc("create_time");
com.baomidou.mybatisplus.extension.plugins.pagination.Page resultpage = manageRoleMapper.selectPage(page,wrapper);
List<ManageRole> manageRoles = resultpage.getRecords();
SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
index 0c047cd..b533329 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
@@ -6,8 +6,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.MonitorPoint;
import com.moral.api.entity.Organization;
+import com.moral.api.entity.SysArea;
import com.moral.api.mapper.MonitorPointMapper;
import com.moral.api.mapper.OrganizationMapper;
+import com.moral.api.mapper.SysAreaMapper;
import com.moral.api.service.MonitorPointService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.util.LogUtils;
@@ -21,10 +23,7 @@
import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* <p>
@@ -43,6 +42,9 @@
@Autowired(required = false)
private OrganizationMapper organizationMapper;
+
+ @Autowired(required = false)
+ private SysAreaMapper sysAreaMapper;
@Autowired
LogUtils logUtils;
@@ -115,6 +117,14 @@
monitorPointMap.put("createTime",createTime);
monitorPointMap.put("updateTime",updateTime);
monitorPointMap.put("key",monitorPoint.getId());
+ monitorPointMap.put("provinceCode",getAreaArr(monitorPointMap.get("provinceCode").toString()));
+ monitorPointMap.put("cityCode",getAreaArr(monitorPointMap.get("cityCode").toString()));
+ monitorPointMap.put("areaCode",getAreaArr(monitorPointMap.get("areaCode").toString()));
+ Organization organization = organizationMapper.selectById(Integer.parseInt(monitorPointMap.get("organizationId").toString()));
+ if (!ObjectUtils.isEmpty(organization)) {
+ String[] organizationArr = {monitorPointMap.get("organizationId").toString(),organization.getName()};
+ monitorPointMap.put("organizationId",organizationArr);
+ }
monitorPointtList.add(monitorPointMap);
}
resultMap.put("monitorPoints",monitorPointtList);
@@ -264,6 +274,11 @@
monitorPointMap.put("createTime",createTime);
monitorPointMap.put("updateTime",updateTime);
monitorPointMap.put("key",monitorPoint.getId());
+ Organization organization = organizationMapper.selectById(Integer.parseInt(monitorPointMap.get("organizationId").toString()));
+ if (!ObjectUtils.isEmpty(organization)) {
+ String[] organizationArr = {monitorPointMap.get("organizationId").toString(),organization.getName()};
+ monitorPointMap.put("organizationId",organizationArr);
+ }
monitorPointtList.add(monitorPointMap);
}
resultMap.put("monitorPoints",monitorPointtList);
@@ -276,4 +291,19 @@
resultMap.put("totalPageNumber",totalPageNumber);
return resultMap;
}
+
+ /**
+ * @Description: ���������������
+ * @Param: [areaArr, menu]menuMap���key���menuid���value���menu
+ * @return: Array
+ * @Author: lizijie
+ * @Date: 2021/4/7
+ */
+ private String[] getAreaArr(String areaCode) {
+ QueryWrapper<SysArea> wrapper = new QueryWrapper<>();
+ wrapper.eq("area_code",areaCode);
+ SysArea sysArea = sysAreaMapper.selectOne(wrapper);
+ String[] arr = {areaCode,sysArea.getAreaName()};
+ return arr;
+ }
}
--
Gitblit v1.8.0