From 3689936045a84b2c29899bee8680b2129e8ef43a Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 25 May 2021 17:43:52 +0800
Subject: [PATCH] device操作日志
---
screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java | 10 -
screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java | 3
screen-manage/src/main/java/com/moral/api/service/DeviceService.java | 3
screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java | 9 +
screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java | 5
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 138 +++++++++++++++++++++-----
screen-manage/src/main/resources/mapper/DeviceMapper.xml | 1
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 9 +
screen-api/src/main/java/com/moral/api/service/impl/UserGroupServiceImpl.java | 5
screen-manage/src/main/java/com/moral/api/controller/DeviceController.java | 78 +++++++++++----
10 files changed, 192 insertions(+), 69 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java
index 18cecf2..7ddf506 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java
@@ -45,6 +45,9 @@
@Autowired
private MenuMapper menuMapper;
+ @Autowired
+ private OperationLogUtils operationLogUtils;
+
@Override
@Transactional
public void allotMenus(Map<String, Object> parameters) {
@@ -75,7 +78,7 @@
//������
String groupName = groupMapper.selectById((Integer) parameters.get("groupId")).getGroupName();
String content = "���������" + groupName + "������������������" + menus.toString();
- OperationLogUtils.insertLog(request, content, Constants.UPDATE_OPERATE_TYPE);
+ operationLogUtils.insertLog(request, content, Constants.UPDATE_OPERATE_TYPE);
}
@Override
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
index 3f6b6ba..f03442c 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
@@ -49,6 +49,9 @@
@Autowired
private UserGroupMapper userGroupMapper;
+ @Autowired
+ private OperationLogUtils operationLogUtils;
+
@Override
public Map<String, Object> addGroup(Group group) {
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
@@ -72,7 +75,7 @@
//������
String content = "���������������" + group.getGroupName();
- OperationLogUtils.insertLog(request, content, Constants.INSERT_OPERATE_TYPE);
+ operationLogUtils.insertLog(request, content, Constants.INSERT_OPERATE_TYPE);
return result;
}
@@ -92,7 +95,7 @@
//������
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
String content = "���������������" + group.getGroupName();
- OperationLogUtils.insertLog(request, content, Constants.DELETE_OPERATE_TYPE);
+ operationLogUtils.insertLog(request, content, Constants.DELETE_OPERATE_TYPE);
}
@Override
@@ -119,7 +122,7 @@
groupMapper.updateById(group);
//������
String content = "���������������" + before + "=>" + group.getGroupName();
- OperationLogUtils.insertLog(request, content, Constants.UPDATE_OPERATE_TYPE);
+ operationLogUtils.insertLog(request, content, Constants.UPDATE_OPERATE_TYPE);
return result;
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserGroupServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserGroupServiceImpl.java
index 66f03ef..4515798 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserGroupServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserGroupServiceImpl.java
@@ -45,6 +45,9 @@
@Autowired
private GroupMapper groupMapper;
+ @Autowired
+ private OperationLogUtils operationLogUtils;
+
@Override
@Transactional
public void allotGroups(Map<String, Object> parameters) {
@@ -73,7 +76,7 @@
//������
String account = userMapper.selectById((Integer) parameters.get("userId")).getAccount();
String content = "������������" + account + "���������������" + groups.toString();
- OperationLogUtils.insertLog(request, content, Constants.UPDATE_OPERATE_TYPE);
+ operationLogUtils.insertLog(request, content, Constants.UPDATE_OPERATE_TYPE);
}
@Override
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index ca8fb19..9a82667 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -71,6 +71,9 @@
@Autowired
private UserLogMapper userLogMapper;
+ @Autowired
+ private OperationLogUtils operationLogUtils;
+
@Value("${AES.KEY}")
private String AESKey;
@@ -295,7 +298,7 @@
userMapper.insert(user);
//������
String content = "������������������" + user.getAccount();
- OperationLogUtils.insertLog(request, content, Constants.INSERT_OPERATE_TYPE);
+ operationLogUtils.insertLog(request, content, Constants.INSERT_OPERATE_TYPE);
return result;
}
@@ -318,7 +321,7 @@
//������
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
String content = "������������������" + user.getAccount();
- OperationLogUtils.insertLog(request, content, Constants.DELETE_OPERATE_TYPE);
+ operationLogUtils.insertLog(request, content, Constants.DELETE_OPERATE_TYPE);
}
@Override
@@ -400,7 +403,7 @@
content.append(key).append(":").append(beforeValue).append("=>").append(afterValue).append(";");
}
}
- OperationLogUtils.insertLog(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
+ operationLogUtils.insertLog(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
return result;
}
diff --git a/screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java b/screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java
index 19c9cf4..9f9468c 100644
--- a/screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java
+++ b/screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java
@@ -8,6 +8,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
import com.moral.api.entity.UserLog;
import com.moral.api.service.UserLogService;
@@ -18,14 +19,11 @@
@Component
public class OperationLogUtils {
- private static UserLogService userLogService;
-
@Autowired
- public void setUserLogService(UserLogService userLogService) {
- this.userLogService = userLogService;
- }
+ private UserLogService userLogService;
- public static void insertLog(HttpServletRequest request, String content, String type) {
+ @Transactional
+ public void insertLog(HttpServletRequest request, String content, String type) {
String token = request.getHeader("token");
Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
UserLog userLog = new UserLog();
diff --git a/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java b/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
index ad7718b..02dd276 100644
--- a/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
+++ b/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
@@ -53,7 +53,8 @@
MONITOR_POINT_IS_EXIST(-39,"���������������"),
MONITOR_POINT_IS_NOT_EXIST(-40,"���������������"),
VERSION_NOT_EXIST(-41,"���������������"),
- VERSION_EXIST(-42,"������������������")
+ VERSION_EXIST(-42,"������������������"),
+ MAC_IS_EXIST(-42,"mac���������")
;
private final Integer code;
private final String msg;
diff --git a/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java b/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java
index 780deaa..27bef1f 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java
@@ -14,13 +14,18 @@
import java.util.List;
import java.util.Map;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import javax.servlet.http.HttpServletRequest;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.Device;
+import com.moral.api.entity.Version;
import com.moral.api.service.DeviceService;
+import com.moral.api.service.VersionService;
import com.moral.constant.Constants;
+import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
-import com.moral.util.PageResult;
+import com.moral.util.WebUtils;
@Slf4j
@Api(tags = {"������������"})
@@ -31,12 +36,29 @@
@Autowired
private DeviceService deviceService;
+ @Autowired
+ private VersionService versionService;
+
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "insert", method = RequestMethod.POST)
- public ResultMessage insert(Device device) {
+ public ResultMessage insert(@RequestBody Device device) {
+ String name = device.getName();
+ String mac = device.getMac();
+ Integer monitorPointId = device.getMonitorPointId();
+ Integer versionId = device.getDeviceVersionId();
+ if (name == null || mac == null || monitorPointId == null || versionId == null) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ //������mac���������������
+ QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("mac", device.getMac());
+ if (deviceService.getOne(queryWrapper) != null) {
+ return ResultMessage.fail(ResponseCodeEnum.MAC_IS_EXIST.getCode(), ResponseCodeEnum.MAC_IS_EXIST.getMsg());
+ }
deviceService.insert(device);
return ResultMessage.ok();
}
@@ -47,6 +69,10 @@
})
@RequestMapping(value = "delete", method = RequestMethod.GET)
public ResultMessage delete(Integer deviceId) {
+ if (deviceId == null) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
deviceService.delete(deviceId);
return ResultMessage.ok();
}
@@ -56,37 +82,37 @@
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "update", method = RequestMethod.POST)
- public ResultMessage update(Device device) {
+ public ResultMessage update(@RequestBody Device device) {
+ if (device.getId() == null) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ if (device.getMac() != null) {
+ //������mac���������������
+ QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("mac", device.getMac());
+ if (deviceService.getOne(queryWrapper) != null) {
+ return ResultMessage.fail(ResponseCodeEnum.MAC_IS_EXIST.getCode(), ResponseCodeEnum.MAC_IS_EXIST.getMsg());
+ }
+ }
deviceService.update(device);
return ResultMessage.ok();
}
@ApiOperation(value = "������������������", notes = "������������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "Integer"),
- @ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "int"),
+ @ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "int"),
@ApiImplicitParam(name = "order", value = "������������", required = false, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "orderType", value = "������������������������0������������1", required = false, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
@ApiImplicitParam(name = "name", value = "������������������������", required = false, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "mac", value = "mac������������", required = false, paramType = "query", dataType = "String"),
})
- @RequestMapping(value = "select", method = RequestMethod.POST)
- public ResultMessage select(@RequestBody Map<String, Object> parameters) {
- IPage<Device> page = deviceService.selectDevices(parameters);
- PageResult<Device> pageResult = new PageResult<>(
- page.getTotal(), page.getPages(), page.getRecords()
- );
- return ResultMessage.ok(pageResult);
- }
-
- @ApiOperation(value = "������������������", notes = "������������������")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
- })
- @RequestMapping(value = "deviceInfo", method = RequestMethod.GET)
- public ResultMessage selectDeviceInfoById(Integer deviceId) {
- Map<String, Object> result = deviceService.selectDeviceInfoById(deviceId);
+ @RequestMapping(value = "select", method = RequestMethod.GET)
+ public ResultMessage select(HttpServletRequest request) {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ Map<String, Object> result = deviceService.selectDevices(parameters);
return ResultMessage.ok(result);
}
@@ -141,9 +167,15 @@
}
@ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ })
@RequestMapping(value = "versions", method = RequestMethod.GET)
public ResultMessage selectVersions() {
- return null;
+ QueryWrapper<Version> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("id", "name").eq("is_delete", Constants.NOT_DELETE);
+ List<Map<String, Object>> maps = versionService.listMaps(queryWrapper);
+ return ResultMessage.ok(maps);
}
@ApiOperation(value = "���������������", notes = "���������������")
diff --git a/screen-manage/src/main/java/com/moral/api/service/DeviceService.java b/screen-manage/src/main/java/com/moral/api/service/DeviceService.java
index a6a8015..a377a42 100644
--- a/screen-manage/src/main/java/com/moral/api/service/DeviceService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/DeviceService.java
@@ -3,7 +3,6 @@
import java.util.List;
import java.util.Map;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.moral.api.entity.Device;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -48,7 +47,7 @@
List<Map<String, Object>> selectDevicesByMpId(Integer orgId);
//������������������������������
- IPage<Device> selectDevices(Map<String, Object> parameters);
+ Map<String, Object> selectDevices(Map<String, Object> parameters);
//������������id������������������������������������������������������������������������������������������������
Map<String, Object> selectDeviceInfoById(Integer deviceId);
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 57be6cd..c5573f4 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
@@ -2,7 +2,6 @@
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;
@@ -20,6 +19,8 @@
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.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.redis.RedisUtil;
import com.moral.util.ConvertUtils;
@@ -28,11 +29,19 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
+
+import javax.servlet.http.HttpServletRequest;
/**
* <p>
@@ -63,12 +72,23 @@
@Autowired
private SysDictDataMapper sysDictDataMapper;
+ @Autowired
+ private LogUtils logUtils;
+
@Override
@Transactional
public void insert(Device device) {
+ Integer orgId = monitorPointMapper.selectById(device.getMonitorPointId()).getOrganizationId();
+ device.setOrganizationId(orgId);
deviceMapper.insert(device);
Map<String, Object> deviceInfo = selectDeviceInfoById(device.getId());
+ //������������������������redis
RedisUtil.set("device_" + device.getMac(), deviceInfo);
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ StringBuilder content = new StringBuilder();
+ content.append("������������������").append(device.getName()).append("���").append("mac���").append(device.getMac());
+ logUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
}
@Override
@@ -77,18 +97,57 @@
UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("id", deviceId).set("is_delete", Constants.DELETE);
deviceMapper.update(null, updateWrapper);
- String mac = deviceMapper.selectById(deviceId).getMac();
+ Device device = deviceMapper.selectById(deviceId);
+ String mac = device.getMac();
//������redis
RedisUtil.del("device_" + mac);
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ StringBuilder content = new StringBuilder();
+ content.append("������������������").append(device.getName()).append(";").append("mac���").append(mac);
+ logUtils.saveOperationForManage(request, content.toString(), Constants.DELETE_OPERATE_TYPE);
}
@Override
@Transactional
public void update(Device device) {
+ Integer deviceId = device.getId();
+ Device oldDevice = deviceMapper.selectById(deviceId);
deviceMapper.updateById(device);
+ String mac = deviceMapper.selectById(deviceId).getMac();
//������redis
- Map<String, Object> deviceInfo = selectDeviceInfoById(device.getId());
- RedisUtil.set("device_" + deviceInfo.get("mac"), deviceInfo);
+ RedisUtil.del("device_" + mac);
+ Map<String, Object> deviceInfo = selectDeviceInfoById(deviceId);
+ RedisUtil.set("device_" + mac, deviceInfo);
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ StringBuilder content = new StringBuilder();
+ content.append("������������������").append(mac).append("���");
+ Field[] fields = Device.class.getDeclaredFields();
+ for (Field field : fields) {
+ if (field.getName().equals("id")) {
+ continue;
+ }
+ if ("serialVersionUID".equals(field.getName())) {
+ continue;
+ }
+ String fieldName = field.getName();
+ PropertyDescriptor pd = null;
+ try {
+ pd = new PropertyDescriptor(fieldName, Device.class);
+ Method method = pd.getReadMethod();
+ Object o1 = method.invoke(oldDevice);
+ Object o2 = method.invoke(device);
+ if (o2 != null) {
+ content.append(fieldName).append("���").append(o1).append("-->").append(o2).append("���");
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
+ logUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
}
@Override
@@ -132,10 +191,10 @@
}
@Override
- public IPage<Device> selectDevices(Map<String, Object> parameters) {
+ public Map<String, Object> selectDevices(Map<String, Object> parameters) {
QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
- Integer page = (Integer) parameters.get("page");
- Integer size = (Integer) parameters.get("size");
+ int page = Integer.parseInt(parameters.get("page").toString());
+ int size = Integer.parseInt(parameters.get("size").toString());
Object order = parameters.get("order");
Object orderType = parameters.get("orderType");
Object name = parameters.get("name");
@@ -160,44 +219,64 @@
queryWrapper.eq("is_delete", Constants.NOT_DELETE);
Page<Device> devicePage = new Page<>(page, size);
deviceMapper.selectPage(devicePage, queryWrapper);
- return devicePage;
+ List<Device> devices = devicePage.getRecords();
+ List<Map<String, Object>> items = new ArrayList<>();
+ for (Device device : devices) {
+ Map<String, Object> deviceInfo = selectDeviceInfoById(device.getId());
+ items.add(deviceInfo);
+ }
+ Map<String, Object> result = new LinkedHashMap<>();
+ result.put("total", devicePage.getTotal());
+ result.put("totalPage", devicePage.getPages());
+ result.put("current", devicePage.getCurrent());
+ result.put("pageSize", devicePage.getSize());
+ result.put("item", items);
+ return result;
}
+
@Override
public Map<String, Object> selectDeviceInfoById(Integer deviceId) {
- Map<String, Object> result = new LinkedHashMap<>();
+ String mac = deviceMapper.selectById(deviceId).getMac();
+ Map<String, Object> deviceInfo = (Map<String, Object>) RedisUtil.get("device_" + mac);
+ //������redis������
+ if (deviceInfo != null) {
+ return deviceInfo;
+ }
+ deviceInfo = 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()));
+ deviceInfo.put("id", device.getId());
+ deviceInfo.put("name", device.getName());
+ deviceInfo.put("mac", device.getMac());
+ deviceInfo.put("address", device.getAddress());
+ deviceInfo.put("longitude", device.getLongitude());
+ deviceInfo.put("latitude", device.getLatitude());
+ deviceInfo.put("createTime", DateUtils.dateToDateString(device.getCreateTime()));
+ deviceInfo.put("installTime", device.getInstallTime() == null ? null : DateUtils.dateToDateString(device.getInstallTime()));
//������
- result.put("profession", device.getProfession());
- result.put("professionName", device.getProfessionName());
+ deviceInfo.put("profession", device.getProfession());
+ deviceInfo.put("professionName", device.getProfessionName());
//������
- result.put("tech", device.getTech());
- result.put("techName", device.getTechName());
+ deviceInfo.put("tech", device.getTech());
+ deviceInfo.put("techName", device.getTechName());
//���������
- result.put("detector", device.getDetector());
- result.put("detectorName", device.getDetectorName());
+ deviceInfo.put("detector", device.getDetector());
+ deviceInfo.put("detectorName", device.getDetectorName());
//���������
- result.put("purchaser", device.getPurchaser());
- result.put("purchaserName", device.getPurchaserName());
+ deviceInfo.put("purchaser", device.getPurchaser());
+ deviceInfo.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);
+ deviceInfo.put("version", versionInfo);
//���������
List<Map<String, Object>> operatorsInfo = new ArrayList<>();
@@ -208,22 +287,23 @@
operatorMap.put("name", operator.getUserName());
operatorsInfo.add(operatorMap);
}
- result.put("operators", operatorsInfo);
+ deviceInfo.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);
+ deviceInfo.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;
+ deviceInfo.put("monitorPoint", mpInfo);
+ RedisUtil.set("device_" + mac, deviceInfo);
+ return deviceInfo;
}
@Override
diff --git a/screen-manage/src/main/resources/mapper/DeviceMapper.xml b/screen-manage/src/main/resources/mapper/DeviceMapper.xml
index ac23a91..c688634 100644
--- a/screen-manage/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-manage/src/main/resources/mapper/DeviceMapper.xml
@@ -82,6 +82,7 @@
d.detector,
d.purchaser,
d.create_time,
+ d.install_time,
d.extend,
o.id org_id,
o.`name` org_name,
--
Gitblit v1.8.0