From 6bdf0e83906004b11558b8f6a72643d7837c7afb Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 28 Jun 2021 11:18:34 +0800
Subject: [PATCH] screen-manage 修复查询型号对应因子分页BUG
---
screen-api/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java | 82 +++++
screen-api/src/main/java/com/moral/api/entity/Version.java | 72 +++++
screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java | 16 +
screen-api/src/main/resources/mapper/SensorMapper.xml | 19 +
screen-api/src/main/java/com/moral/api/pojo/vo/alarm/AlarmLevelVO.java | 30 ++
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 20 +
screen-api/src/main/java/com/moral/api/service/DeviceService.java | 16 +
screen-api/src/main/java/com/moral/api/service/SensorService.java | 16 +
screen-api/src/main/java/com/moral/api/controller/AlarmController.java | 41 ++
screen-api/src/main/java/com/moral/api/entity/Device.java | 145 ++++++++++
screen-api/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java | 20 +
screen-api/src/main/java/com/moral/api/service/VersionService.java | 16 +
screen-api/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java | 20 +
screen-api/src/main/resources/mapper/VersionMapper.xml | 15 +
screen-api/src/main/resources/mapper/DeviceMapper.xml | 29 ++
screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java | 3
screen-api/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java | 39 ++
screen-api/src/main/java/com/moral/api/entity/Sensor.java | 99 +++++++
screen-api/src/main/resources/mapper/OrganizationUnitAlarmMapper.xml | 19 +
screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java | 3
screen-api/src/main/java/com/moral/api/mapper/OrganizationUnitAlarmMapper.java | 16 +
screen-api/src/main/java/com/moral/api/mapper/SensorMapper.java | 16 +
screen-api/src/main/java/com/moral/api/mapper/VersionMapper.java | 16 +
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java | 4
screen-api/src/main/java/com/moral/api/service/OrganizationUnitAlarmService.java | 19 +
25 files changed, 789 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AlarmController.java b/screen-api/src/main/java/com/moral/api/controller/AlarmController.java
new file mode 100644
index 0000000..889c653
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/controller/AlarmController.java
@@ -0,0 +1,41 @@
+package com.moral.api.controller;
+
+import com.moral.api.entity.Sensor;
+import com.moral.api.pojo.vo.alarm.AlarmLevelVO;
+import com.moral.api.service.OrganizationUnitAlarmService;
+import com.moral.constant.ResponseCodeEnum;
+import com.moral.constant.ResultMessage;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @ClassName AlarmController
+ * @Description TODO
+ * @Author ���������
+ * @Date 2021/6/28 10:30
+ * @Version TODO
+ **/
+@Slf4j
+@Api(tags = {"������������"})
+@RestController
+@CrossOrigin(origins = "*", maxAge = 3600)
+@RequestMapping("/deviceInfo")
+public class AlarmController {
+
+ @Autowired
+ OrganizationUnitAlarmService organizationUnitAlarmService;
+
+ @GetMapping("queryAlarmByMac")
+ public ResultMessage queryByMac(String mac){
+ List<Sensor> sensors = organizationUnitAlarmService.queryAlarmLevel(mac);
+ AlarmLevelVO vo = AlarmLevelVO.convert(sensors);
+ return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), vo);
+ }
+}
diff --git a/screen-api/src/main/java/com/moral/api/entity/Device.java b/screen-api/src/main/java/com/moral/api/entity/Device.java
new file mode 100644
index 0000000..63226a2
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/entity/Device.java
@@ -0,0 +1,145 @@
+package com.moral.api.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * ���������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-06-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class Device extends Model<Device> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ������id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * ������������
+ */
+ private String name;
+
+ /**
+ * mac���
+ */
+ private String mac;
+
+ /**
+ * ������������
+ */
+ private String address;
+
+ /**
+ * ������
+ */
+ private Double longitude;
+
+ /**
+ * ������
+ */
+ private Double latitude;
+
+ /**
+ * ���������������������������������
+ */
+ private String state;
+
+ /**
+ * ���������id���������������������������������manage_account
+ */
+ private String operateIds;
+
+ /**
+ * ������id
+ */
+ private Integer monitorPointId;
+
+ /**
+ * ������id
+ */
+ private Integer organizationId;
+
+ /**
+ * ������������id
+ */
+ private Integer deviceVersionId;
+
+ /**
+ * ���������������������������
+ */
+ private String profession;
+
+ /**
+ * ���������������1������������2������������3������������������������������������
+ */
+ private String tech;
+
+ /**
+ * ������������������������������������
+ */
+ private String detector;
+
+ /**
+ * ������������������������������
+ */
+ private String purchaser;
+
+ /**
+ * ������(������)������
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ /**
+ * ������������
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+ /**
+ * ������������
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date installTime;
+
+ /**
+ * ������������,0���������������1���������
+ */
+ private String isDelete;
+
+ /**
+ * ������������������������
+ */
+ private String extend;
+
+ /*
+ * ������������
+ * */
+ @TableField(exist = false)
+ private Version version;
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java b/screen-api/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java
new file mode 100644
index 0000000..d76bb32
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java
@@ -0,0 +1,82 @@
+package com.moral.api.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * ���������������������������������������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-06-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class OrganizationUnitAlarm extends Model<OrganizationUnitAlarm> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ������
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * ������id
+ */
+ private Integer organizationId;
+
+ /**
+ * ������id
+ */
+ private Integer versionId;
+
+ /**
+ * ������code
+ */
+ private String sensorCode;
+
+ /**
+ * ���������������������
+ */
+ private String unitKey;
+
+ /**
+ * ���������������������key
+ */
+ private String showUnitKey;
+
+ /**
+ * ������������
+ */
+ private String alarmLevel;
+
+ /**
+ * ������������
+ */
+ private LocalDateTime createTime;
+
+ /**
+ * ������������
+ */
+ private LocalDateTime updateTime;
+
+ /**
+ * ������������
+ */
+ private String isDelete;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/entity/Sensor.java b/screen-api/src/main/java/com/moral/api/entity/Sensor.java
new file mode 100644
index 0000000..88c238c
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/entity/Sensor.java
@@ -0,0 +1,99 @@
+package com.moral.api.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author moral
+ * @since 2021-06-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class Sensor extends Model<Sensor> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ������
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * ������������
+ */
+ private String name;
+
+ /**
+ * ���������������������������
+ */
+ @TableField(value = "`desc`")
+ private String desc;
+
+ /**
+ * ������������������
+ */
+ @TableField(value = "`code`")
+ private String code;
+
+ /**
+ * ������
+ */
+ private Double upper;
+
+ /**
+ * ������
+ */
+ private Double lower;
+
+ /**
+ * ������������
+ */
+ private String defaultUnitKey;
+
+ /**
+ * ������������
+ */
+ private Date createTime;
+
+ /**
+ * ������������
+ */
+ private Date updateTime;
+
+ /**
+ * ������������
+ */
+ private String isDelete;
+
+ @TableField(exist = false)
+ private String unit;
+
+ @TableField(exist = false)
+ private String unitKey;
+
+ @TableField(exist = false)
+ private String showUnit;
+
+ @TableField(exist = false)
+ private String showUnitKey;
+
+ @TableField(exist = false)
+ private String alarmLevel;
+
+ @TableField(exist = false)
+ private String formula;
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/entity/Version.java b/screen-api/src/main/java/com/moral/api/entity/Version.java
new file mode 100644
index 0000000..91e74d8
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/entity/Version.java
@@ -0,0 +1,72 @@
+package com.moral.api.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * ���������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-06-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class Version extends Model<Version> {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ������
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * ������
+ */
+ private String name;
+
+ /**
+ * ������������
+ */
+ private Date createTime;
+
+ /**
+ * ������������
+ */
+ private Date updateTime;
+
+ /**
+ * ������������
+ */
+ private String isDelete;
+
+ /**
+ * ������
+ */
+ @TableField(value = "`desc`")
+ private String desc;
+
+ /*
+ * ���������������������
+ * */
+ @TableField(exist = false)
+ private List<Sensor> sensors;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondsDataConsumer.java b/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java
similarity index 92%
rename from screen-api/src/main/java/com/moral/api/kafka/consumer/SecondsDataConsumer.java
rename to screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java
index 6b412cd..6865acf 100644
--- a/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondsDataConsumer.java
+++ b/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java
@@ -20,9 +20,9 @@
* @Version TODO
**/
//@Component
-public class SecondsDataConsumer implements ConsumerSeekAware {
+public class SecondDataConsumer implements ConsumerSeekAware {
- @KafkaListener(topics = "test",groupId = "SecondsDataGroup3")
+ @KafkaListener(topics = "second_data",groupId = "SecondsDataGroup3")
public void listen(ConsumerRecord<String, String> record , Consumer consumer) throws Exception {
String messageStr = record.value();
Map<String,String> message = (Map<String,String>)JSON.parse(messageStr);
diff --git a/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java b/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java
new file mode 100644
index 0000000..f49f9df
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java
@@ -0,0 +1,16 @@
+package com.moral.api.mapper;
+
+import com.moral.api.entity.Device;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * ��������� Mapper ������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-06-28
+ */
+public interface DeviceMapper extends BaseMapper<Device> {
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/mapper/OrganizationUnitAlarmMapper.java b/screen-api/src/main/java/com/moral/api/mapper/OrganizationUnitAlarmMapper.java
new file mode 100644
index 0000000..eb72b17
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/mapper/OrganizationUnitAlarmMapper.java
@@ -0,0 +1,16 @@
+package com.moral.api.mapper;
+
+import com.moral.api.entity.OrganizationUnitAlarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * ��������������������������������������� Mapper ������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-06-28
+ */
+public interface OrganizationUnitAlarmMapper extends BaseMapper<OrganizationUnitAlarm> {
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/mapper/SensorMapper.java b/screen-api/src/main/java/com/moral/api/mapper/SensorMapper.java
new file mode 100644
index 0000000..1aa3233
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/mapper/SensorMapper.java
@@ -0,0 +1,16 @@
+package com.moral.api.mapper;
+
+import com.moral.api.entity.Sensor;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper ������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-06-28
+ */
+public interface SensorMapper extends BaseMapper<Sensor> {
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/mapper/VersionMapper.java b/screen-api/src/main/java/com/moral/api/mapper/VersionMapper.java
new file mode 100644
index 0000000..4176c6c
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/mapper/VersionMapper.java
@@ -0,0 +1,16 @@
+package com.moral.api.mapper;
+
+import com.moral.api.entity.Version;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * ��������� Mapper ������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-06-28
+ */
+public interface VersionMapper extends BaseMapper<Version> {
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/alarm/AlarmLevelVO.java b/screen-api/src/main/java/com/moral/api/pojo/vo/alarm/AlarmLevelVO.java
new file mode 100644
index 0000000..b1e2481
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/alarm/AlarmLevelVO.java
@@ -0,0 +1,30 @@
+package com.moral.api.pojo.vo.alarm;
+
+import com.moral.api.entity.Sensor;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName AlarmLevelVO
+ * @Description TODO
+ * @Author ���������
+ * @Date 2021/6/28 11:07
+ * @Version TODO
+ **/
+@Data
+public class AlarmLevelVO {
+ private Map<String,String> alarmLevel;
+
+ public static AlarmLevelVO convert(List<Sensor> sensors){
+ AlarmLevelVO alarmLevelVO = new AlarmLevelVO();
+ Map<String,String> alarmLevel = new HashMap<>();
+ for (Sensor sensor : sensors) {
+ alarmLevel.put(sensor.getCode(),sensor.getAlarmLevel());
+ }
+ alarmLevelVO.setAlarmLevel(alarmLevel);
+ return alarmLevelVO;
+ }
+}
diff --git a/screen-api/src/main/java/com/moral/api/service/DeviceService.java b/screen-api/src/main/java/com/moral/api/service/DeviceService.java
new file mode 100644
index 0000000..2a674b4
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/service/DeviceService.java
@@ -0,0 +1,16 @@
+package com.moral.api.service;
+
+import com.moral.api.entity.Device;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * ��������� ���������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-06-28
+ */
+public interface DeviceService extends IService<Device> {
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/service/OrganizationUnitAlarmService.java b/screen-api/src/main/java/com/moral/api/service/OrganizationUnitAlarmService.java
new file mode 100644
index 0000000..9b027c1
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/service/OrganizationUnitAlarmService.java
@@ -0,0 +1,19 @@
+package com.moral.api.service;
+
+import com.moral.api.entity.OrganizationUnitAlarm;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.moral.api.entity.Sensor;
+
+import java.util.List;
+
+/**
+ * <p>
+ * ��������������������������������������� ���������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-06-28
+ */
+public interface OrganizationUnitAlarmService extends IService<OrganizationUnitAlarm> {
+ List<Sensor> queryAlarmLevel(String mac);
+}
diff --git a/screen-api/src/main/java/com/moral/api/service/SensorService.java b/screen-api/src/main/java/com/moral/api/service/SensorService.java
new file mode 100644
index 0000000..704fcb4
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/service/SensorService.java
@@ -0,0 +1,16 @@
+package com.moral.api.service;
+
+import com.moral.api.entity.Sensor;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * ���������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-06-28
+ */
+public interface SensorService extends IService<Sensor> {
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/service/VersionService.java b/screen-api/src/main/java/com/moral/api/service/VersionService.java
new file mode 100644
index 0000000..25d0867
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/service/VersionService.java
@@ -0,0 +1,16 @@
+package com.moral.api.service;
+
+import com.moral.api.entity.Version;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * ��������� ���������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-06-28
+ */
+public interface VersionService extends IService<Version> {
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
new file mode 100644
index 0000000..db46dc3
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -0,0 +1,20 @@
+package com.moral.api.service.impl;
+
+import com.moral.api.entity.Device;
+import com.moral.api.mapper.DeviceMapper;
+import com.moral.api.service.DeviceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * ��������� ���������������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-06-28
+ */
+@Service
+public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements DeviceService {
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java
new file mode 100644
index 0000000..761a62b
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java
@@ -0,0 +1,39 @@
+package com.moral.api.service.impl;
+
+import com.moral.api.entity.Device;
+import com.moral.api.entity.OrganizationUnitAlarm;
+import com.moral.api.entity.Sensor;
+import com.moral.api.entity.Version;
+import com.moral.api.mapper.OrganizationUnitAlarmMapper;
+import com.moral.api.service.OrganizationUnitAlarmService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.constant.RedisConstants;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * ��������������������������������������� ���������������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-06-28
+ */
+@Service
+public class OrganizationUnitAlarmServiceImpl extends ServiceImpl<OrganizationUnitAlarmMapper, OrganizationUnitAlarm> implements OrganizationUnitAlarmService {
+
+ @Autowired
+ RedisTemplate redisTemplate;
+
+ @Override
+ public List<Sensor> queryAlarmLevel(String mac) {
+ Device device = (Device) redisTemplate.opsForHash().get(RedisConstants.DEVICE_INFO, mac);
+ Version version = device.getVersion();
+ List<Sensor> sensors = version.getSensors();
+ return sensors;
+ }
+}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
new file mode 100644
index 0000000..6ecb7ea
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
@@ -0,0 +1,20 @@
+package com.moral.api.service.impl;
+
+import com.moral.api.entity.Sensor;
+import com.moral.api.mapper.SensorMapper;
+import com.moral.api.service.SensorService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * ���������������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-06-28
+ */
+@Service
+public class SensorServiceImpl extends ServiceImpl<SensorMapper, Sensor> implements SensorService {
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java
new file mode 100644
index 0000000..efc5568
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java
@@ -0,0 +1,20 @@
+package com.moral.api.service.impl;
+
+import com.moral.api.entity.Version;
+import com.moral.api.mapper.VersionMapper;
+import com.moral.api.service.VersionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * ��������� ���������������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-06-28
+ */
+@Service
+public class VersionServiceImpl extends ServiceImpl<VersionMapper, Version> implements VersionService {
+
+}
diff --git a/screen-api/src/main/resources/mapper/DeviceMapper.xml b/screen-api/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..493dc7b
--- /dev/null
+++ b/screen-api/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.moral.api.mapper.DeviceMapper">
+
+ <!-- ������������������������ -->
+ <resultMap id="BaseResultMap" type="com.moral.api.entity.Device">
+ <id column="id" property="id" />
+ <result column="name" property="name" />
+ <result column="mac" property="mac" />
+ <result column="address" property="address" />
+ <result column="longitude" property="longitude" />
+ <result column="latitude" property="latitude" />
+ <result column="state" property="state" />
+ <result column="operate_ids" property="operateIds" />
+ <result column="monitor_point_id" property="monitorPointId" />
+ <result column="organization_id" property="organizationId" />
+ <result column="device_version_id" property="deviceVersionId" />
+ <result column="profession" property="profession" />
+ <result column="tech" property="tech" />
+ <result column="detector" property="detector" />
+ <result column="purchaser" property="purchaser" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="install_time" property="installTime" />
+ <result column="is_delete" property="isDelete" />
+ <result column="extend" property="extend" />
+ </resultMap>
+
+</mapper>
\ No newline at end of file
diff --git a/screen-api/src/main/resources/mapper/OrganizationUnitAlarmMapper.xml b/screen-api/src/main/resources/mapper/OrganizationUnitAlarmMapper.xml
new file mode 100644
index 0000000..61a8a0d
--- /dev/null
+++ b/screen-api/src/main/resources/mapper/OrganizationUnitAlarmMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.moral.api.mapper.OrganizationUnitAlarmMapper">
+
+ <!-- ������������������������ -->
+ <resultMap id="BaseResultMap" type="com.moral.api.entity.OrganizationUnitAlarm">
+ <id column="id" property="id" />
+ <result column="organization_id" property="organizationId" />
+ <result column="version_id" property="versionId" />
+ <result column="sensor_code" property="sensorCode" />
+ <result column="unit_key" property="unitKey" />
+ <result column="show_unit_key" property="showUnitKey" />
+ <result column="alarm_level" property="alarmLevel" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="is_delete" property="isDelete" />
+ </resultMap>
+
+</mapper>
\ No newline at end of file
diff --git a/screen-api/src/main/resources/mapper/SensorMapper.xml b/screen-api/src/main/resources/mapper/SensorMapper.xml
new file mode 100644
index 0000000..88523d6
--- /dev/null
+++ b/screen-api/src/main/resources/mapper/SensorMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.moral.api.mapper.SensorMapper">
+
+ <!-- ������������������������ -->
+ <resultMap id="BaseResultMap" type="com.moral.api.entity.Sensor">
+ <id column="id" property="id" />
+ <result column="name" property="name" />
+ <result column="desc" property="desc" />
+ <result column="code" property="code" />
+ <result column="upper" property="upper" />
+ <result column="lower" property="lower" />
+ <result column="default_unit_key" property="defaultUnitKey" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="is_delete" property="isDelete" />
+ </resultMap>
+
+</mapper>
\ No newline at end of file
diff --git a/screen-api/src/main/resources/mapper/VersionMapper.xml b/screen-api/src/main/resources/mapper/VersionMapper.xml
new file mode 100644
index 0000000..b1581d7
--- /dev/null
+++ b/screen-api/src/main/resources/mapper/VersionMapper.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.moral.api.mapper.VersionMapper">
+
+ <!-- ������������������������ -->
+ <resultMap id="BaseResultMap" type="com.moral.api.entity.Version">
+ <id column="id" property="id" />
+ <result column="name" property="name" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="is_delete" property="isDelete" />
+ <result column="desc" property="desc" />
+ </resultMap>
+
+</mapper>
\ No newline at end of file
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java
index f44c16b..1a8aa11 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java
@@ -10,6 +10,7 @@
import com.moral.api.pojo.form.organizationUnitAlarm.OrganizationUnitAlarmUpdateForm;
import com.moral.api.service.OrganizationUnitAlarmService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.util.CacheUtils;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import org.springframework.beans.factory.annotation.Autowired;
@@ -76,6 +77,8 @@
organizationUnitAlarmMapper.updateById(organizationUnitAlarm);
//������������������������������������������
OrganizationUnitAlarm newRecord = organizationUnitAlarmMapper.selectById(organizationUnitAlarm.getId());
+ //������deviceInfo������
+ CacheUtils.flushDeviceAlarmInfo();
//������������������
dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
index 23301f1..a8323c5 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
@@ -10,6 +10,7 @@
import com.moral.api.mapper.VersionSensorUnitMapper;
import com.moral.api.service.SensorService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.util.CacheUtils;
import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
@@ -139,6 +140,8 @@
OrganizationUnitAlarm organizationUnitAlarm = new OrganizationUnitAlarm();
organizationUnitAlarm.setSensorCode(updateSensorMap.get("code").toString());
organizationUnitAlarmMapper.update(organizationUnitAlarm,wrapper_OUA);
+ //������deviceInfo������
+ CacheUtils.flushDeviceAlarmInfo();
}
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String content = "������������:"+oldSensor.getName()+";";
--
Gitblit v1.8.0