From b888331b6ba56caeeab12a4543fe81bac8854794 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 31 Aug 2021 17:09:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java | 73 ++++++++++++++
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java | 20 ++++
screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java | 3
screen-common/src/main/java/com/moral/constant/KafkaConstants.java | 32 +++++
screen-api/src/main/java/com/moral/api/service/HistorySecondUavService.java | 16 +++
screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java | 1
screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 2
screen-api/src/main/java/com/moral/api/mapper/HistorySecondUavMapper.java | 16 +++
screen-api/src/main/java/com/moral/api/entity/HistorySecondUav.java | 56 +++++++++++
screen-api/src/main/java/com/moral/api/controller/UAVController.java | 45 +++++++++
10 files changed, 258 insertions(+), 6 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/UAVController.java b/screen-api/src/main/java/com/moral/api/controller/UAVController.java
new file mode 100644
index 0000000..408ba94
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/controller/UAVController.java
@@ -0,0 +1,45 @@
+package com.moral.api.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.moral.api.entity.HistorySecondUav;
+import com.moral.api.mapper.HistorySecondUavMapper;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @ClassName UAVController
+ * @Description ������������������
+ * @Author ���������
+ * @Date 2021/8/31 15:08
+ * @Version TODO
+ **/
+@Slf4j
+@Api(tags = {"������������������"})
+@RestController
+@CrossOrigin(origins = "*", maxAge = 3600)
+@RequestMapping("/uav")
+public class UAVController {
+
+ @Autowired
+ HistorySecondUavMapper historySecondUavMapper;
+ /**
+ * @Description: ������������id���mac���������������������������������
+ * @Param: []
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2021/8/31
+ */
+ @RequestMapping("query")
+ public ResultMessage query(){
+ List<HistorySecondUav> historySecondUavs = historySecondUavMapper.selectList(new QueryWrapper<>());
+ return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),historySecondUavs);
+ }
+}
diff --git a/screen-api/src/main/java/com/moral/api/entity/HistorySecondUav.java b/screen-api/src/main/java/com/moral/api/entity/HistorySecondUav.java
new file mode 100644
index 0000000..74a3c76
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/entity/HistorySecondUav.java
@@ -0,0 +1,56 @@
+package com.moral.api.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * ���������������������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-08-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class HistorySecondUav extends Model<HistorySecondUav> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ������mac
+ */
+ private String mac;
+
+ /**
+ * ������������
+ */
+ private Date time;
+
+ /**
+ * ������
+ */
+ private String value;
+
+ /**
+ * ���������������������id
+ */
+ private Integer organizationId;
+
+ /**
+ * ������������
+ */
+ private Date batch;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return null;
+ }
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/mapper/HistorySecondUavMapper.java b/screen-api/src/main/java/com/moral/api/mapper/HistorySecondUavMapper.java
new file mode 100644
index 0000000..7ff7d65
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/mapper/HistorySecondUavMapper.java
@@ -0,0 +1,16 @@
+package com.moral.api.mapper;
+
+import com.moral.api.entity.HistorySecondUav;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * ��������������������� Mapper ������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-08-31
+ */
+public interface HistorySecondUavMapper extends BaseMapper<HistorySecondUav> {
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/service/HistorySecondUavService.java b/screen-api/src/main/java/com/moral/api/service/HistorySecondUavService.java
new file mode 100644
index 0000000..7814476
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/service/HistorySecondUavService.java
@@ -0,0 +1,16 @@
+package com.moral.api.service;
+
+import com.moral.api.entity.HistorySecondUav;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * ��������������������� ���������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-08-31
+ */
+public interface HistorySecondUavService extends IService<HistorySecondUav> {
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
new file mode 100644
index 0000000..c0da684
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
@@ -0,0 +1,20 @@
+package com.moral.api.service.impl;
+
+import com.moral.api.entity.HistorySecondUav;
+import com.moral.api.mapper.HistorySecondUavMapper;
+import com.moral.api.service.HistorySecondUavService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * ��������������������� ���������������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-08-31
+ */
+@Service
+public class HistorySecondUavServiceImpl extends ServiceImpl<HistorySecondUavMapper, HistorySecondUav> implements HistorySecondUavService {
+
+}
diff --git a/screen-common/src/main/java/com/moral/constant/KafkaConstants.java b/screen-common/src/main/java/com/moral/constant/KafkaConstants.java
index 534ff0c..3f58d3c 100644
--- a/screen-common/src/main/java/com/moral/constant/KafkaConstants.java
+++ b/screen-common/src/main/java/com/moral/constant/KafkaConstants.java
@@ -18,8 +18,34 @@
public static final String TOPIC_SECOND = "second_data";
/**
- * ���������������������������������������������������
+ * ������������������������
*/
- public static final String TOPIC_SECOND_SPECIAL = "second_data_special";
-
+ public static final String UAV_TOPIC_SECOND = "uav_second_data";
+
+ /*
+ * ���������������������������
+ * */
+ public static final String CRUISER_TOPIC_SECOND = "cruiser_second_data";
+
+ /*
+ * ���������������������������
+ * */
+ public static final String CRUISER_TOPIC_MINUTE = "cruiser_minute_data";
+
+ /*
+ * ���������������������������
+ * */
+ public static final String CRUISER_TOPIC_HOUR = "cruiser_hour_data";
+
+
+ /**
+ * ���������������������������
+ */
+ public static final String GROUP_INSERT = "insert";
+
+ /**
+ * ���������������������������������
+ */
+ public static final String GROUP_STATE = "state";
+
}
diff --git a/screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java b/screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java
index 5301f10..211b9f5 100644
--- a/screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java
+++ b/screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java
@@ -24,7 +24,6 @@
/*
* ������������������
* */
-@Component
@Slf4j
public class KafkaConsumer {
@@ -149,7 +148,7 @@
}
//���������������������
- @KafkaListener(topics = KafkaConstants.TOPIC_SECOND_SPECIAL, containerFactory = "insertListenerContainerFactory")
+ @KafkaListener(topics = KafkaConstants.UAV_TOPIC_SECOND, groupId = KafkaConstants.GROUP_INSERT, containerFactory = "kafkaListenerContainerFactory")
public void listenSecondSpecial(ConsumerRecord<String, String> record, Acknowledgment ack) {
String msg = record.value();
try {
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
index 0aa31ac..e351875 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
@@ -480,7 +480,7 @@
}
}
- String content = CompareFieldUtils.resultsConvertContent(results, "���������������");
+ String content = CompareFieldUtils.resultsConvertContent(results, "���������������;���������������"+oldOrganization.getName());
logUtils.saveOperationForManage(content, Constants.UPDATE_OPERATE_TYPE);
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java
index 08b24e5..102f116 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java
@@ -187,6 +187,7 @@
return datas;
}
+
@Override
public Map<String, SysDictData> getDictDatasByType(String type) {
Map<String, List<SysDictData>> allDictData = getAllDictData();
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java
index 1a73868..0c495db 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java
@@ -171,6 +171,8 @@
unitConversionMapper.updateById(unitConversion);
//������������
refreshCache();
+ //������������������
+ updateLog(oldUnitConversion,form.getFormula());
//������������������
dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
@@ -198,6 +200,8 @@
unitConversionMapper.update(null, deleteWrapper);
//������������
refreshCache();
+ //������������������
+ deleteLog(oldUnitConversion);
//������������������
dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
@@ -247,4 +251,73 @@
logUtils.saveOperationForManage(content.toString(),Constants.INSERT_OPERATE_TYPE);
}
+
+ /**
+ * @Description: ������������������������
+ * @Param: [unitConversion]
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/8/26
+ */
+ private void deleteLog(UnitConversion unitConversion){
+ //������������������������ ��������� ������������������
+ Map<String, SysDictData> units = sysDictDataService.getDictDatasByType("unit");
+ String originalUnitKey = unitConversion.getOriginalUnitKey();
+ String targetUnitKey = unitConversion.getTargetUnitKey();
+ SysDictData originalData = units.get(originalUnitKey);
+ SysDictData targetData = units.get(targetUnitKey);
+ //������������������
+ String formula = unitConversion.getFormula();
+ formula = formula.replace(Constants.FORMULA_PLACEHOLDER, "���������");
+ formula = "������������"+" = "+formula;
+
+ StringBuilder content = new StringBuilder("���������������������;");
+ content.append("������������"+originalData.getDataValue()+";");
+ content.append("���������������"+targetData.getDataValue()+";");
+ content.append("���������������"+formula+";");
+ //������������������������������������������������
+ String sensorCode = unitConversion.getSensorCode();
+ if(sensorCode!=null){
+ Sensor sensor = sensorService.getSensorByCode(sensorCode);
+ if(sensor!=null)
+ content.append("���������������"+sensor.getName()+";");
+ }
+ logUtils.saveOperationForManage(content.toString(),Constants.DELETE_OPERATE_TYPE);
+ }
+
+ /**
+ * @Description: ������������������������
+ * @Param: [unitConversion]
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/8/26
+ */
+ private void updateLog(UnitConversion oldUnitConversion,String newFormular){
+ StringBuilder content = new StringBuilder("���������������������������;");
+ //������������������������ ��������� ������������������
+ Map<String, SysDictData> units = sysDictDataService.getDictDatasByType("unit");
+ String originalUnitKey = oldUnitConversion.getOriginalUnitKey();
+ String targetUnitKey = oldUnitConversion.getTargetUnitKey();
+ SysDictData originalData = units.get(originalUnitKey);
+ SysDictData targetData = units.get(targetUnitKey);
+ //���������������������
+ newFormular = newFormular.replace(Constants.FORMULA_PLACEHOLDER, "���������");
+ newFormular = "������������"+" = "+newFormular;
+ //���������������
+ String oldFormula = oldUnitConversion.getFormula();
+ oldFormula = oldFormula.replace(Constants.FORMULA_PLACEHOLDER, "���������");
+ oldFormula = "������������"+" = "+oldFormula;
+
+ content.append("������������"+originalData.getDataValue()+";");
+ content.append("���������������"+targetData.getDataValue()+";");
+ content.append("���������������"+oldFormula+"->"+newFormular+";");
+ //������������������������������������������������
+ String sensorCode = oldUnitConversion.getSensorCode();
+ if(sensorCode!=null){
+ Sensor sensor = sensorService.getSensorByCode(sensorCode);
+ if(sensor!=null)
+ content.append("���������������"+sensor.getName()+";");
+ }
+ logUtils.saveOperationForManage(content.toString(),Constants.UPDATE_OPERATE_TYPE);
+ }
}
--
Gitblit v1.8.0