From 23e43d94105c6f3676e879d2cc271d0bec63f081 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 31 Aug 2021 13:13:41 +0800
Subject: [PATCH] screen-manage kafka消费者更换主题名称
---
screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 104 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 92 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..18f9d76 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
@@ -4,9 +4,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.moral.api.entity.Device;
import com.moral.api.entity.MonitorPoint;
import com.moral.api.entity.Organization;
import com.moral.api.entity.SysArea;
+import com.moral.api.mapper.DeviceMapper;
import com.moral.api.mapper.MonitorPointMapper;
import com.moral.api.mapper.OrganizationMapper;
import com.moral.api.mapper.SysAreaMapper;
@@ -46,6 +48,9 @@
@Autowired(required = false)
private SysAreaMapper sysAreaMapper;
+
+ @Autowired(required = false)
+ private DeviceMapper deviceMapper;
@Autowired
LogUtils logUtils;
@@ -103,9 +108,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 +123,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);
}
@@ -178,6 +203,21 @@
}
}
monitorPointMapper.updateMonitorPoint(updateMap);
+ String deviceContent = "";
+ if (!ObjectUtils.isEmpty(parameterMap.get("organizationId")) && parameterMap.get("organizationId") != null){
+ Device device = new Device();
+ device.setOrganizationId(Integer.parseInt(parameterMap.get("organizationId").toString()));
+ QueryWrapper<Device> deviceWrapper = new QueryWrapper();
+ deviceWrapper.eq("monitor_point_id",oldMonitorPoint.getId());
+ deviceWrapper.eq("is_delete",Constants.NOT_DELETE);
+ List<Device> devices = deviceMapper.selectList(deviceWrapper);
+ deviceMapper.update(device, deviceWrapper);
+ if (devices.size()>0){
+ for (Device dev:devices) {
+ deviceContent = deviceContent+"������������������"+dev.getName()+";organizationId���"+dev.getOrganizationId()+"->"+parameterMap.get("organizationId");
+ }
+ }
+ }
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String content = "���������������:"+oldMonitorPoint.getName()+";";
for (Object key:updateMap.keySet()) {
@@ -209,6 +249,7 @@
content = content+"������:"+oldMonitorPoint.getDesc()+"->"+updateMap.get(key)+";";
}
}
+ content = content+deviceContent;
logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
@@ -266,9 +307,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 +322,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 +368,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