From ca460ab06df279b3ca067d8defddf0c0a0a5ea7c Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 08 Oct 2021 11:43:56 +0800
Subject: [PATCH] 修改新增政府站点接口日志格式
---
screen-manage/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java
index add7e7a..b5353b3 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java
@@ -5,12 +5,17 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
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.GovMonitorPoint;
+import com.moral.api.entity.Organization;
import com.moral.api.entity.SysArea;
+import com.moral.api.mapper.DeviceMapper;
import com.moral.api.mapper.GovMonitorPointMapper;
import com.moral.api.mapper.SysAreaMapper;
+import com.moral.api.service.DeviceService;
import com.moral.api.service.GovMonitorPointService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.service.OrganizationService;
import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
@@ -24,10 +29,12 @@
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -51,6 +58,12 @@
@Autowired
private LogUtils logUtils;
+
+ @Resource
+ private OrganizationService organizationService;
+
+ @Autowired(required = false)
+ private DeviceMapper deviceMapper;
/*
* ���redis������������������
@@ -153,7 +166,7 @@
//������������������
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
StringBuilder content = new StringBuilder();
- content.append("������������������������").append("id:").append(govMonitorPoint.getId() + ";").append(govMonitorPoint.getName() + ";").append(":").append("guid���").append(govMonitorPoint.getGuid() + ";");
+ content.append("������������������������").append("id:").append(govMonitorPoint.getId() + ";").append("name:").append(govMonitorPoint.getName() + ";").append("guid���").append(govMonitorPoint.getGuid() + ";");
logUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
}
}
@@ -232,4 +245,22 @@
}
return govMonitorPointMapper.selectMaps(queryWrapper);
}
+
+ @Override
+ public List<GovMonitorPoint> selectGovMonitorPointsByOrgid(Map map) {
+ //������������id���������������
+ List<Organization> organizations = organizationService.getAllChildrenOrganization(Integer.parseInt(map.get("organization_id").toString()));
+ Set<Integer> organization_ids = organizations.stream().map(organization -> organization.getId()).collect(Collectors.toSet());
+ //������������������������������
+ QueryWrapper<Device> wrapper_device = new QueryWrapper<>();
+ wrapper_device.in("organization_id",organization_ids).eq("is_delete",Constants.NOT_DELETE);
+ List<Device> devices = deviceMapper.selectList(wrapper_device);
+ //������������������������������id
+ Set<String> guids = devices.stream().map(device -> device.getGuid()).collect(Collectors.toSet());
+ //������������������������������
+ QueryWrapper<GovMonitorPoint> wrapper_govMonitorPoint = new QueryWrapper<>();
+ wrapper_govMonitorPoint.eq("is_delete",Constants.NOT_DELETE).in("guid",guids);
+ List<GovMonitorPoint> govMonitorPointList = govMonitorPointMapper.selectList(wrapper_govMonitorPoint);
+ return govMonitorPointList;
+ }
}
--
Gitblit v1.8.0