From 657182c7989dc77b69bb3f9adaf6c75b6466ff95 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 09 Jun 2021 10:31:35 +0800
Subject: [PATCH] screen-manage 编辑账号接口删除分配角色功能，分配角色功能变为单独接口
---
screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 83 +++++++++++++++++++++++++++++++++++------
1 files changed, 71 insertions(+), 12 deletions(-)
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 18a3c5a..a589883 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
@@ -103,9 +103,9 @@
int totalNumber = monitorPointMapper.selectCount(wrapper);
String orderType = map.get("orderType").toString();
if (orderType.equals(Constants.ORDER_ASC)){
- wrapper.orderByAsc("create_time");
+ wrapper.orderByAsc("update_time");
}else {
- wrapper.orderByDesc("create_time");
+ wrapper.orderByDesc("update_time");
}
Page resultPage = monitorPointMapper.selectPage(page,wrapper);
List<MonitorPoint> monitorPoints = resultPage.getRecords();
@@ -118,13 +118,33 @@
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);
+ if (monitorPointMap.get("provinceCode")!=null&&monitorPointMap.get("provinceCode")!=""){
+ monitorPointMap.put("provinceCode",getAreaArr(monitorPointMap.get("provinceCode").toString()));
+ }else {
+ String[] arr = {null,null};
+ monitorPointMap.put("provinceCode",arr);
+ }
+ if (monitorPointMap.get("cityCode")!=null&&monitorPointMap.get("cityCode")!=""){
+ monitorPointMap.put("cityCode",getAreaArr(monitorPointMap.get("cityCode").toString()));
+ }else {
+ String[] arr = {null,null};
+ monitorPointMap.put("cityCode",arr);
+ }
+ if (monitorPointMap.get("areaCode")!=null&&monitorPointMap.get("areaCode")!=""){
+ monitorPointMap.put("areaCode",getAreaArr(monitorPointMap.get("areaCode").toString()));
+ }else {
+ String[] arr = {null,null};
+ monitorPointMap.put("areaCode",arr);
+ }
+ if (monitorPointMap.get("organizationId")!=null&&monitorPointMap.get("organizationId")!=""){
+ 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);
+ }
+ }else {
+ String[] arr = {null,null};
+ monitorPointMap.put("organizationId",arr);
}
monitorPointtList.add(monitorPointMap);
}
@@ -266,9 +286,9 @@
int totalNumber = monitorPointMapper.selectCount(wrapper);
String orderType = map.get("orderType").toString();
if (orderType.equals(Constants.ORDER_ASC)){
- wrapper.orderByAsc("create_time");
+ wrapper.orderByAsc("update_time");
}else {
- wrapper.orderByDesc("create_time");
+ wrapper.orderByDesc("update_time");
}
Page resultPage = monitorPointMapper.selectPage(page,wrapper);
List<MonitorPoint> monitorPoints = resultPage.getRecords();
@@ -281,10 +301,38 @@
monitorPointMap.put("createTime",createTime);
monitorPointMap.put("updateTime",updateTime);
monitorPointMap.put("key",monitorPoint.getId());
- Organization organization = organizationMapper.selectById(Integer.parseInt(monitorPointMap.get("organizationId").toString()));
+ if (monitorPointMap.get("provinceCode")!=null&&monitorPointMap.get("provinceCode")!=""){
+ monitorPointMap.put("provinceCode",getAreaArr(monitorPointMap.get("provinceCode").toString()));
+ }else {
+ String[] arr = {null,null};
+ monitorPointMap.put("provinceCode",arr);
+ }
+ if (monitorPointMap.get("cityCode")!=null&&monitorPointMap.get("cityCode")!=""){
+ monitorPointMap.put("cityCode",getAreaArr(monitorPointMap.get("cityCode").toString()));
+ }else {
+ String[] arr = {null,null};
+ monitorPointMap.put("cityCode",arr);
+ }
+ if (monitorPointMap.get("areaCode")!=null&&monitorPointMap.get("areaCode")!=""){
+ monitorPointMap.put("areaCode",getAreaArr(monitorPointMap.get("areaCode").toString()));
+ }else {
+ String[] arr = {null,null};
+ monitorPointMap.put("areaCode",arr);
+ }
+ /*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);
+ }*/
+ if (monitorPointMap.get("organizationId")!=null&&monitorPointMap.get("organizationId")!=""){
+ 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);
+ }
+ }else {
+ String[] arr = {null,null};
+ monitorPointMap.put("organizationId",arr);
}
monitorPointtList.add(monitorPointMap);
}
@@ -299,6 +347,17 @@
return resultMap;
}
+ @Override
+ public List<MonitorPoint> getMonitorPointsByOrganizationId(Integer organizationId) {
+ QueryWrapper<MonitorPoint> monitorPointQueryWrapper = new QueryWrapper<>();
+ MonitorPoint monitorPoint = new MonitorPoint();
+ monitorPoint.setOrganizationId(organizationId);
+ monitorPoint.setIsDelete(Constants.NOT_DELETE);
+ monitorPointQueryWrapper.setEntity(monitorPoint);
+ List<MonitorPoint> monitorPoints = monitorPointMapper.selectList(monitorPointQueryWrapper);
+ return monitorPoints;
+ }
+
/**
* @Description: ���������������
* @Param: [areaArr, menu]menuMap���key���menuid���value���menu
--
Gitblit v1.8.0