From eccde23ea401394aed432865bfbbbcb89539ba20 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 18 Aug 2021 15:33:45 +0800
Subject: [PATCH] 特殊设备历史表数据查询、删除，校准接口判断特殊设备表
---
screen-manage/src/main/java/com/moral/api/controller/SpecialDeviceHistoryController.java | 45 +++++++++++
screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceHistoryServiceImpl.java | 158 +++++++++++++++++++++++++++++++++++++++
screen-manage/src/main/java/com/moral/api/service/SpecialDeviceHistoryService.java | 8 ++
screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java | 10 ++
4 files changed, 218 insertions(+), 3 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/SpecialDeviceHistoryController.java b/screen-manage/src/main/java/com/moral/api/controller/SpecialDeviceHistoryController.java
new file mode 100644
index 0000000..7b41a82
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/controller/SpecialDeviceHistoryController.java
@@ -0,0 +1,45 @@
+package com.moral.api.controller;
+
+import com.moral.api.service.SpecialDeviceHistoryService;
+import com.moral.constant.ResponseCodeEnum;
+import com.moral.constant.ResultMessage;
+import com.moral.util.WebUtils;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+@Slf4j
+@Api(tags = {"������������������"})
+@RestController
+@RequestMapping("/specialDeviceHistory")
+public class SpecialDeviceHistoryController {
+
+ @Resource
+ private SpecialDeviceHistoryService specialDeviceHistoryService;
+
+ @RequestMapping(value = "getSpecialDeviceHistoryByCondition",method = RequestMethod.GET)
+ @ResponseBody
+ public ResultMessage getSpecialDeviceHistoryByCondition(HttpServletRequest request){
+ Map<String,Object> parameters = WebUtils.getParametersStartingWith(request,null);
+ Map resultMap = specialDeviceHistoryService.getDataByCondition(parameters);
+ if (!resultMap.containsKey("code")){
+ return ResultMessage.ok(resultMap);
+ }
+ return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
+ }
+
+ @RequestMapping(value = "delete", method = RequestMethod.POST)
+ @ResponseBody
+ public ResultMessage delete(@RequestBody Map map){
+ if (map.get("id") == null){
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ specialDeviceHistoryService.delete(Integer.parseInt(map.get("id").toString()));
+ return ResultMessage.ok();
+ }
+}
diff --git a/screen-manage/src/main/java/com/moral/api/service/SpecialDeviceHistoryService.java b/screen-manage/src/main/java/com/moral/api/service/SpecialDeviceHistoryService.java
index 2aef4f1..d88a65f 100644
--- a/screen-manage/src/main/java/com/moral/api/service/SpecialDeviceHistoryService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/SpecialDeviceHistoryService.java
@@ -2,6 +2,9 @@
import com.moral.api.entity.SpecialDeviceHistory;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Map;
/**
* <p>
@@ -13,4 +16,9 @@
*/
public interface SpecialDeviceHistoryService extends IService<SpecialDeviceHistory> {
+ Map<String,Object> getDataByCondition(Map map);
+
+ @Transactional
+ void delete(Integer specialDeviceHistoryId);
+
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
index 5a343e6..cbf5672 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
@@ -7,9 +7,11 @@
import com.moral.api.entity.Device;
import com.moral.api.entity.DeviceAdjustValue;
import com.moral.api.entity.Sensor;
+import com.moral.api.entity.SpecialDevice;
import com.moral.api.mapper.DeviceAdjustValueMapper;
import com.moral.api.mapper.DeviceMapper;
import com.moral.api.mapper.SensorMapper;
+import com.moral.api.mapper.SpecialDeviceMapper;
import com.moral.api.service.DeviceAdjustValueService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.util.LogUtils;
@@ -47,6 +49,9 @@
private DeviceMapper deviceMapper;
@Autowired(required = false)
+ private SpecialDeviceMapper specialDeviceMapper;
+
+ @Autowired(required = false)
private SensorMapper sensorMapper;
@Autowired
@@ -72,7 +77,10 @@
QueryWrapper<Device> wrapper_device = new QueryWrapper<>();
wrapper_device.eq("is_delete",Constants.NOT_DELETE);
wrapper_device.eq("mac",deviceAdjustValue.getMac());
- if (deviceMapper.selectCount(wrapper_device)==0){
+ QueryWrapper<SpecialDevice> wrapper_specialDevice = new QueryWrapper<>();
+ wrapper_specialDevice.eq("is_delete",Constants.NOT_DELETE);
+ wrapper_specialDevice.eq("mac",deviceAdjustValue.getMac());
+ if (deviceMapper.selectCount(wrapper_device)==0 && specialDeviceMapper.selectCount(wrapper_specialDevice)==0){
resultMap.put("code",ResponseCodeEnum.DEVICE_IS_NULL.getCode());
resultMap.put("msg",ResponseCodeEnum.DEVICE_IS_NULL.getMsg());
return resultMap;
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceHistoryServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceHistoryServiceImpl.java
index cd44849..2c884a9 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceHistoryServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceHistoryServiceImpl.java
@@ -1,10 +1,25 @@
package com.moral.api.service.impl;
-import com.moral.api.entity.SpecialDeviceHistory;
-import com.moral.api.mapper.SpecialDeviceHistoryMapper;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.*;
+import com.moral.api.mapper.*;
import com.moral.api.service.SpecialDeviceHistoryService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.util.LogUtils;
+import com.moral.constant.Constants;
+import com.moral.constant.ResponseCodeEnum;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* <p>
@@ -17,4 +32,143 @@
@Service
public class SpecialDeviceHistoryServiceImpl extends ServiceImpl<SpecialDeviceHistoryMapper, SpecialDeviceHistory> implements SpecialDeviceHistoryService {
+ @Autowired(required = false)
+ private SpecialDeviceHistoryMapper specialDeviceHistoryMapper;
+
+ @Autowired(required = false)
+ private ManageAccountMapper manageAccountMapper;
+
+ @Autowired(required = false)
+ private VersionMapper versionMapper;
+
+ @Autowired(required = false)
+ private SysDictDataMapper sysDictDataMapper;
+
+ @Autowired(required = false)
+ private OrganizationMapper organizationMapper;
+
+ @Autowired
+ LogUtils logUtils;
+
+ @Override
+ public Map<String, Object> getDataByCondition(Map map) {
+ Map<String,Object> resultMap = new HashMap<>();
+ if (!map.containsKey("current")||!map.containsKey("size")){
+ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ return resultMap;
+ }
+ int current = Integer.parseInt(map.get("current").toString());
+ int size = Integer.parseInt(map.get("size").toString());
+ Page<SpecialDeviceHistory> page = new Page<>(current,size);
+ QueryWrapper<SpecialDeviceHistory> wrapper_Condition = new QueryWrapper<>();
+ wrapper_Condition.eq("is_delete",Constants.NOT_DELETE);
+ if (!ObjectUtils.isEmpty(map.get("organization_id"))){
+ wrapper_Condition.eq("organization_id",map.get("organization_id").toString());
+ }
+ if (!ObjectUtils.isEmpty(map.get("keyword"))){
+ wrapper_Condition.and(wc -> wc.like("name",map.get("keyword").toString()).or().like("mac",map.get("keyword").toString()));
+ //wrapper_Condition.like("name",map.get("keyword").toString()).or().like("mac",map.get("keyword").toString());
+ }
+ wrapper_Condition.orderByDesc("create_time");
+ Page resultPage = specialDeviceHistoryMapper.selectPage(page,wrapper_Condition);
+ int totalNumber = specialDeviceHistoryMapper.selectCount(wrapper_Condition);
+ List<SpecialDeviceHistory> specialDeviceHistories = resultPage.getRecords();
+ SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ List<Map<String,Object>> specialDeviceList = new ArrayList<>();
+ for (SpecialDeviceHistory specialDeviceHistory:specialDeviceHistories) {
+ Map specialDeviceHistoryMap = JSON.parseObject(JSON.toJSONString(specialDeviceHistory),Map.class);
+ String createTime = SDF.format(specialDeviceHistory.getCreateTime());
+ String updateTime = SDF.format(specialDeviceHistory.getUpdateTime());
+ specialDeviceHistoryMap.put("createTime",createTime);
+ specialDeviceHistoryMap.put("updateTime",updateTime);
+ List<Map<String,Object>> operateList = new ArrayList<>();
+ if (!ObjectUtils.isEmpty(specialDeviceHistory.getOperateIds()) && specialDeviceHistory.getOperateIds()!=null){
+ String operateIds = specialDeviceHistory.getOperateIds();
+ String[] operateIdArr = operateIds.split(",");
+ if (operateIdArr.length>0){
+ List<Integer> operateIdList = new ArrayList<>();
+ for (int i = 0; i < operateIdArr.length; i++){
+ operateIdList.add(Integer.parseInt(operateIdArr[i]));
+ }
+ QueryWrapper<ManageAccount> wapper_manageAccount = new QueryWrapper<>();
+ wapper_manageAccount.eq("is_delete",Constants.NOT_DELETE);
+ wapper_manageAccount.in("id",operateIdList);
+ List<ManageAccount> manageAccounts = manageAccountMapper.selectList(wapper_manageAccount);
+ for (ManageAccount manageAccount:manageAccounts) {
+ Map<String,Object> operateMap = new HashMap<>();
+ operateMap.put("id",manageAccount.getId());
+ operateMap.put("name",manageAccount.getUserName());
+ operateList.add(operateMap);
+ }
+ }
+ }
+ specialDeviceHistoryMap.put("operates",operateList);
+ Map<String,Object> deviceVersionMap = new HashMap<>();
+ if (!ObjectUtils.isEmpty(specialDeviceHistory.getDeviceVersionId()) && specialDeviceHistory.getDeviceVersionId()!=null && !"".equals(specialDeviceHistory.getDeviceVersionId())){
+ int versionId = Integer.parseInt(specialDeviceHistory.getDeviceVersionId().toString());
+ QueryWrapper<Version> wapper_version = new QueryWrapper<>();
+ wapper_version.eq("is_delete",Constants.NOT_DELETE);
+ wapper_version.eq("id",versionId);
+ Version version = versionMapper.selectOne(wapper_version);
+ if (!ObjectUtils.isEmpty(version)){
+ deviceVersionMap.put("id",version.getId());
+ deviceVersionMap.put("name",version.getName());
+ }
+ }
+ specialDeviceHistoryMap.put("version",deviceVersionMap);
+ Map<String,Object> specialTypeMap = new HashMap<>();
+ if (!ObjectUtils.isEmpty(specialDeviceHistory.getSpecialType()) && specialDeviceHistory.getSpecialType()!=null && !"".equals(specialDeviceHistory.getSpecialType())){
+ int specialTypeId = Integer.parseInt(specialDeviceHistory.getSpecialType().toString());
+ QueryWrapper<SysDictData> wapper_sysDictData = new QueryWrapper<>();
+ wapper_sysDictData.eq("is_delete",Constants.NOT_DELETE);
+ wapper_sysDictData.eq("dict_type_id",27);
+ wapper_sysDictData.eq("dataKey",specialTypeId);
+ SysDictData sysDictData = sysDictDataMapper.selectOne(wapper_sysDictData);
+ if (!ObjectUtils.isEmpty(sysDictData)){
+ specialTypeMap.put("id",sysDictData.getId());
+ specialTypeMap.put("dataKey",sysDictData.getDataKey());
+ specialTypeMap.put("name",sysDictData.getDataValue());
+ }
+ }
+ specialDeviceHistoryMap.put("specialType",specialTypeMap);
+ Map<String,Object> organizationMap = new HashMap<>();
+ if (!ObjectUtils.isEmpty(specialDeviceHistory.getOrganizationId()) && specialDeviceHistory.getOrganizationId()!=null && !"".equals(specialDeviceHistory.getOrganizationId())){
+ int organizationId = Integer.parseInt(specialDeviceHistory.getOrganizationId().toString());
+ QueryWrapper<Organization> wapper_organization = new QueryWrapper<>();
+ wapper_organization.eq("is_delete",Constants.NOT_DELETE);
+ wapper_organization.eq("id",organizationId);
+ Organization organization = organizationMapper.selectOne(wapper_organization);
+ if (!ObjectUtils.isEmpty(organization)){
+ organizationMap.put("id",organization.getId());
+ organizationMap.put("name",organization.getName());
+ }
+ }
+ specialDeviceHistoryMap.put("organization",organizationMap);
+ specialDeviceList.add(specialDeviceHistoryMap);
+ }
+ resultMap.put("specialDevices",specialDeviceList);
+ resultMap.put("totalNumber",totalNumber);
+ resultMap.put("current",current);
+ int totalPageNumber = totalNumber/size;
+ if(totalNumber%size != 0){
+ totalPageNumber += 1;
+ }
+ resultMap.put("totalPageNumber",totalPageNumber);
+ return resultMap;
+ }
+
+ @Override
+ public void delete(Integer specialDeviceHistoryId) {
+ SpecialDeviceHistory specialDeviceHistory = specialDeviceHistoryMapper.selectById(specialDeviceHistoryId);
+ UpdateWrapper<SpecialDeviceHistory> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("id",specialDeviceHistoryId).set("is_delete",Constants.DELETE);
+ specialDeviceHistoryMapper.update(null,updateWrapper);
+ String mac = specialDeviceHistory.getMac();
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ StringBuilder content = new StringBuilder();
+ content.append("������������������������������").append(specialDeviceHistory.getName()).append(";").append("mac���").append(mac);
+ logUtils.saveOperationForManage(request, content.toString(), Constants.DELETE_OPERATE_TYPE);
+ }
}
--
Gitblit v1.8.0