From efaa96ca645875270668de1ec3a766900847732a Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 14 May 2021 17:30:47 +0800
Subject: [PATCH] 设备接口更新
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 198 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 183 insertions(+), 15 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index bb7f828..57be6cd 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -1,24 +1,36 @@
package com.moral.api.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.Device;
import com.moral.api.entity.ManageAccount;
+import com.moral.api.entity.MonitorPoint;
import com.moral.api.entity.Organization;
-import com.moral.api.entity.User;
+import com.moral.api.entity.SysDictData;
+import com.moral.api.entity.SysDictType;
+import com.moral.api.entity.Version;
import com.moral.api.mapper.DeviceMapper;
import com.moral.api.mapper.ManageAccountMapper;
+import com.moral.api.mapper.MonitorPointMapper;
import com.moral.api.mapper.OrganizationMapper;
+import com.moral.api.mapper.SysDictDataMapper;
+import com.moral.api.mapper.SysDictTypeMapper;
import com.moral.api.pojo.vo.device.DeviceVO;
import com.moral.api.service.DeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
+import com.moral.redis.RedisUtil;
+import com.moral.util.ConvertUtils;
+import com.moral.util.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.Date;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -42,34 +54,190 @@
@Autowired
private OrganizationMapper organizationMapper;
+ @Autowired
+ private MonitorPointMapper monitorPointMapper;
+
+ @Autowired
+ private SysDictTypeMapper sysDictTypeMapper;
+
+ @Autowired
+ private SysDictDataMapper sysDictDataMapper;
+
@Override
@Transactional
public void insert(Device device) {
deviceMapper.insert(device);
+ Map<String, Object> deviceInfo = selectDeviceInfoById(device.getId());
+ RedisUtil.set("device_" + device.getMac(), deviceInfo);
}
@Override
- public List<ManageAccount> selectAllOperator() {
- QueryWrapper<ManageAccount> queryWrapper = new QueryWrapper<>();
- queryWrapper.select("id", "user_name").eq("is_delete", Constants.NOT_DELETE);
- return manageAccountMapper.selectList(queryWrapper);
+ @Transactional
+ public void delete(Integer deviceId) {
+ UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("id", deviceId).set("is_delete", Constants.DELETE);
+ deviceMapper.update(null, updateWrapper);
+ String mac = deviceMapper.selectById(deviceId).getMac();
+ //������redis
+ RedisUtil.del("device_" + mac);
}
@Override
- public List<Organization> selectAllOrganization() {
- QueryWrapper<Organization> queryWrapper = new QueryWrapper<>();
- queryWrapper.select("id", "name").ge("expire_time", new Date()).eq("is_delete", Constants.NOT_DELETE);
- return organizationMapper.selectList(queryWrapper);
+ @Transactional
+ public void update(Device device) {
+ deviceMapper.updateById(device);
+ //������redis
+ Map<String, Object> deviceInfo = selectDeviceInfoById(device.getId());
+ RedisUtil.set("device_" + deviceInfo.get("mac"), deviceInfo);
}
@Override
- public Page<DeviceVO> selectDevices(Map<String, Object> parameters) {
- QueryWrapper<DeviceVO> queryWrapper = new QueryWrapper<>();
+ public List<Map<String, Object>> selectAllOperators() {
+ //���������������
+ QueryWrapper<ManageAccount> operatorWrapper = new QueryWrapper<>();
+ operatorWrapper.select("id", "user_name").eq("is_delete", Constants.NOT_DELETE);
+ return manageAccountMapper.selectMaps(operatorWrapper);
+ }
+
+ //������������������������������������
+ @Override
+ public List<Map<String, Object>> selectDeviceDictData(String dictType) {
+ QueryWrapper<SysDictType> typeQueryWrapper = new QueryWrapper<>();
+ typeQueryWrapper.select("id").eq("name", dictType);
+ SysDictType sysDictType = sysDictTypeMapper.selectOne(typeQueryWrapper);
+ QueryWrapper<SysDictData> dataQueryWrapper = new QueryWrapper<>();
+ dataQueryWrapper.select("dataKey", "dataValue").eq("dict_type_id", sysDictType.getId()).eq("is_delete", Constants.NOT_DELETE);
+ return sysDictDataMapper.selectMaps(dataQueryWrapper);
+ }
+
+ @Override
+ public List<Map<String, Object>> selectMonitorsByOrgId(Integer orgId) {
+ QueryWrapper<MonitorPoint> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("id", "name").eq("organization_id", orgId).eq("is_delete", Constants.NOT_DELETE);
+ return monitorPointMapper.selectMaps(queryWrapper);
+ }
+
+ @Override
+ public List<Map<String, Object>> selectDevicesByOrgId(Integer orgId) {
+ QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("is_delete", Constants.NOT_DELETE).eq("organization_id", orgId);
+ return deviceMapper.selectMaps(queryWrapper);
+ }
+
+ @Override
+ public List<Map<String, Object>> selectDevicesByMpId(Integer mpId) {
+ QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("is_delete", Constants.NOT_DELETE).eq("monitor_point_id", mpId);
+ return deviceMapper.selectMaps(queryWrapper);
+ }
+
+ @Override
+ public IPage<Device> selectDevices(Map<String, Object> parameters) {
+ QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
Integer page = (Integer) parameters.get("page");
Integer size = (Integer) parameters.get("size");
- Page<DeviceVO> pageData = new Page<>(page, size);
- deviceMapper.selectAllDeviceInfo(pageData, queryWrapper);
- return pageData;
+ Object order = parameters.get("order");
+ Object orderType = parameters.get("orderType");
+ Object name = parameters.get("name");
+ Object mac = parameters.get("mac");
+ if (name != null) {
+ queryWrapper.like("name", name);
+ }
+ if (mac != null) {
+ queryWrapper.like("mac", mac);
+ }
+
+ //������������,������create_time������
+ if (order != null && orderType != null) {
+ if (Constants.ORDER_ASC.equals(orderType)) {
+ queryWrapper.orderByAsc(ConvertUtils.toLine(order.toString()));
+ } else {
+ queryWrapper.orderByDesc(ConvertUtils.toLine(order.toString()));
+ }
+ } else {
+ queryWrapper.orderByDesc("create_time");
+ }
+ queryWrapper.eq("is_delete", Constants.NOT_DELETE);
+ Page<Device> devicePage = new Page<>(page, size);
+ deviceMapper.selectPage(devicePage, queryWrapper);
+ return devicePage;
+ }
+
+ @Override
+ public Map<String, Object> selectDeviceInfoById(Integer deviceId) {
+ Map<String, Object> result = new LinkedHashMap<>();
+ DeviceVO device = deviceMapper.selectDeviceInfoById(deviceId);
+ //������
+ result.put("id", device.getId());
+ result.put("name", device.getName());
+ result.put("mac", device.getMac());
+ result.put("address", device.getAddress());
+ result.put("longitude", device.getLongitude());
+ result.put("latitude", device.getLatitude());
+ result.put("createTime", DateUtils.dateToDateString(device.getCreateTime()));
+
+ //������
+ result.put("profession", device.getProfession());
+ result.put("professionName", device.getProfessionName());
+
+ //������
+ result.put("tech", device.getTech());
+ result.put("techName", device.getTechName());
+
+ //���������
+ result.put("detector", device.getDetector());
+ result.put("detectorName", device.getDetectorName());
+
+ //���������
+ result.put("purchaser", device.getPurchaser());
+ result.put("purchaserName", device.getPurchaserName());
+
+ //������
+ Map<String, Object> versionInfo = new LinkedHashMap<>();
+ Version version = device.getVersion();
+ versionInfo.put("id", version.getId());
+ versionInfo.put("name", version.getName());
+ result.put("version", versionInfo);
+
+ //���������
+ List<Map<String, Object>> operatorsInfo = new ArrayList<>();
+ List<ManageAccount> operators = device.getOperators();
+ for (ManageAccount operator : operators) {
+ Map<String, Object> operatorMap = new LinkedHashMap<>();
+ operatorMap.put("id", operator.getId());
+ operatorMap.put("name", operator.getUserName());
+ operatorsInfo.add(operatorMap);
+ }
+ result.put("operators", operatorsInfo);
+
+ //������
+ Map<String, Object> orgInfo = new LinkedHashMap<>();
+ Organization organization = device.getOrganization();
+ orgInfo.put("id", organization.getId());
+ orgInfo.put("name", organization.getName());
+ result.put("organization", orgInfo);
+
+ //������
+ Map<String, Object> mpInfo = new LinkedHashMap<>();
+ MonitorPoint monitorPoint = device.getMonitorPoint();
+ mpInfo.put("id", monitorPoint.getId());
+ mpInfo.put("name", monitorPoint.getName());
+ result.put("monitorPoint", mpInfo);
+ return result;
+ }
+
+ @Override
+ public List<Map<String, Object>> selectAllOrganization() {
+ QueryWrapper<Organization> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("id", "name").eq("is_delete", Constants.NOT_DELETE);
+ return organizationMapper.selectMaps(queryWrapper);
+ }
+
+ @Override
+ public List<Map<String, Object>> selectAllMonitorPoint() {
+ QueryWrapper<MonitorPoint> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("id", "name").eq("is_delete", Constants.NOT_DELETE);
+ return monitorPointMapper.selectMaps(queryWrapper);
}
}
--
Gitblit v1.8.0