From 0197c2fcac5fdb701ff91dcea0d98ec226bc008d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 13 Oct 2021 15:21:08 +0800
Subject: [PATCH] 删除historySecondSpecial相关类
---
/dev/null | 14 --------------
screen-api/src/main/java/com/moral/api/mapper/HistorySecondCruiserMapper.java | 2 ++
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 11 +++++------
screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java | 3 ---
screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml | 10 ++++++++++
5 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/HistorySecondSpecial.java b/screen-api/src/main/java/com/moral/api/entity/HistorySecondSpecial.java
deleted file mode 100644
index e422fdb..0000000
--- a/screen-api/src/main/java/com/moral/api/entity/HistorySecondSpecial.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.moral.api.entity;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.io.Serializable;
-import java.util.Date;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * ������������������������
- * </p>
- *
- * @author moral
- * @since 2021-08-18
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class HistorySecondSpecial extends Model<HistorySecondSpecial> {
-
- 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/HistorySecondCruiserMapper.java b/screen-api/src/main/java/com/moral/api/mapper/HistorySecondCruiserMapper.java
index e8feb8d..ab010b5 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/HistorySecondCruiserMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/HistorySecondCruiserMapper.java
@@ -16,6 +16,8 @@
*/
public interface HistorySecondCruiserMapper extends BaseMapper<HistorySecondCruiser> {
+ List<Map<String,Object>> getCruiserData(Map<String,Object> params);
+
List<String> getDates(Map<String,Object> params);
}
diff --git a/screen-api/src/main/java/com/moral/api/mapper/HistorySecondSpecialMapper.java b/screen-api/src/main/java/com/moral/api/mapper/HistorySecondSpecialMapper.java
deleted file mode 100644
index c35423e..0000000
--- a/screen-api/src/main/java/com/moral/api/mapper/HistorySecondSpecialMapper.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.moral.api.mapper;
-
-import java.util.List;
-import java.util.Map;
-
-import com.moral.api.entity.HistorySecondSpecial;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * ������������������������ Mapper ������
- * </p>
- *
- * @author moral
- * @since 2021-08-18
- */
-public interface HistorySecondSpecialMapper extends BaseMapper<HistorySecondSpecial> {
-
- List<Map<String, Object>> getSpecialDeviceData(Map<String, Object> params);
-
-}
diff --git a/screen-api/src/main/java/com/moral/api/service/HistorySecondSpecialService.java b/screen-api/src/main/java/com/moral/api/service/HistorySecondSpecialService.java
deleted file mode 100644
index 91be635..0000000
--- a/screen-api/src/main/java/com/moral/api/service/HistorySecondSpecialService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.moral.api.service;
-
-import com.moral.api.entity.HistorySecondSpecial;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * ������������������������ ���������
- * </p>
- *
- * @author moral
- * @since 2021-08-18
- */
-public interface HistorySecondSpecialService extends IService<HistorySecondSpecial> {
-
-}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondSpecialServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondSpecialServiceImpl.java
deleted file mode 100644
index 52b80c0..0000000
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondSpecialServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.moral.api.service.impl;
-
-import com.moral.api.entity.HistorySecondSpecial;
-import com.moral.api.mapper.HistorySecondSpecialMapper;
-import com.moral.api.service.HistorySecondSpecialService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * ������������������������ ���������������
- * </p>
- *
- * @author moral
- * @since 2021-08-18
- */
-@Service
-public class HistorySecondSpecialServiceImpl extends ServiceImpl<HistorySecondSpecialMapper, HistorySecondSpecial> implements HistorySecondSpecialService {
-
-}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
index 0a0e66c..99b8bef 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
@@ -3,11 +3,11 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.moral.api.entity.HistorySecondCruiser;
import com.moral.api.entity.Organization;
import com.moral.api.entity.SpecialDevice;
import com.moral.api.entity.SpecialDeviceHistory;
import com.moral.api.mapper.HistorySecondCruiserMapper;
-import com.moral.api.mapper.HistorySecondSpecialMapper;
import com.moral.api.mapper.SpecialDeviceMapper;
import com.moral.api.service.OrganizationService;
import com.moral.api.service.SpecialDeviceHistoryService;
@@ -43,7 +43,7 @@
public class SpecialDeviceServiceImpl extends ServiceImpl<SpecialDeviceMapper, SpecialDevice> implements SpecialDeviceService {
@Autowired
- private HistorySecondSpecialMapper historySecondSpecialMapper;
+ private HistorySecondCruiserMapper HistorySecondCruiserMapper;
@Autowired
private SpecialDeviceHistoryService specialDeviceHistoryService;
@@ -88,14 +88,14 @@
Integer orgId = (Integer) orgInfo.get("id");
params.put("orgId", orgId);
//������������������������������������
- List<Map<String, Object>> data = historySecondSpecialMapper.getSpecialDeviceData(params);
+ List<Map<String, Object>> data = HistorySecondCruiserMapper.getCruiserData(params);
if (ObjectUtils.isEmpty(data)) {
return data;
}
data.removeIf(o -> {
Map<String, Object> value = JSONObject.parseObject(o.remove("value").toString(), Map.class);
- Object flylon = value.get("flylon");
- Object flylat = value.get("flylat");
+ Object flylon = value.get(Constants.SENSOR_CODE_LON);
+ Object flylat = value.get(Constants.SENSOR_CODE_LAT);
if (ObjectUtils.isEmpty(flylon) || ObjectUtils.isEmpty(flylat)) {
return true;
}
@@ -118,7 +118,6 @@
SpecialDevice specialDevice = specialDeviceMapper.selectOne(queryWrapper);
return specialDevice;
}
-
@Override
public List<String> getDatesByMac(String mac) {
diff --git a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
index 49a6cbc..41b2d2f 100644
--- a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
@@ -20,4 +20,14 @@
ORDER BY `time`
</select>
+ <select id="getCruiserData" resultType="java.util.Map">
+ SELECT
+ DATE_FORMAT(`time`, #{dateFormat}) AS `time`,
+ `value`
+ FROM `history_second_cruiser`
+ WHERE mac = #{mac}
+ AND `time` LIKE #{time}"%"
+ AND organization_id = #{orgId}
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/screen-api/src/main/resources/mapper/HistorySecondSpecialMapper.xml b/screen-api/src/main/resources/mapper/HistorySecondSpecialMapper.xml
deleted file mode 100644
index 989922f..0000000
--- a/screen-api/src/main/resources/mapper/HistorySecondSpecialMapper.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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.HistorySecondSpecialMapper">
-
- <!-- ������������������������ -->
- <resultMap id="BaseResultMap" type="com.moral.api.entity.HistorySecondSpecial">
- <result column="mac" property="mac"/>
- <result column="time" property="time"/>
- <result column="value" property="value"/>
- <result column="organization_id" property="organizationId"/>
- <result column="batch" property="batch"/>
- </resultMap>
-
- <select id="getSpecialDeviceData" resultType="java.util.Map">
- SELECT
- DATE_FORMAT(`time`, #{dateFormat}) AS `time`,
- `value`
- FROM `history_second_special`
- WHERE mac = #{mac}
- AND `time` LIKE #{time}"%"
- AND organization_id = #{orgId}
- </select>
-
-</mapper>
\ No newline at end of file
diff --git a/screen-manage/src/main/java/com/moral/api/entity/HistorySecondSpecial.java b/screen-manage/src/main/java/com/moral/api/entity/HistorySecondSpecial.java
deleted file mode 100644
index d173893..0000000
--- a/screen-manage/src/main/java/com/moral/api/entity/HistorySecondSpecial.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.moral.api.entity;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.io.Serializable;
-import java.util.Date;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * ������������������������
- * </p>
- *
- * @author moral
- * @since 2021-08-12
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class HistorySecondSpecial extends Model<HistorySecondSpecial> {
-
- 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-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java b/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
index 7196145..4c8f423 100644
--- a/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
+++ b/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
@@ -38,9 +38,6 @@
private RedisTemplate redisTemplate;
@Autowired
- private HistorySecondSpecialService historySecondSpecialService;
-
- @Autowired
private HistorySecondCruiserService historySecondCruiserService;
@Autowired
diff --git a/screen-manage/src/main/java/com/moral/api/mapper/HistorySecondSpecialMapper.java b/screen-manage/src/main/java/com/moral/api/mapper/HistorySecondSpecialMapper.java
deleted file mode 100644
index ebd2af7..0000000
--- a/screen-manage/src/main/java/com/moral/api/mapper/HistorySecondSpecialMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.moral.api.mapper;
-
-import com.moral.api.entity.HistorySecondSpecial;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * ������������������������ Mapper ������
- * </p>
- *
- * @author moral
- * @since 2021-08-12
- */
-public interface HistorySecondSpecialMapper extends BaseMapper<HistorySecondSpecial> {
-
-}
diff --git a/screen-manage/src/main/java/com/moral/api/service/HistorySecondSpecialService.java b/screen-manage/src/main/java/com/moral/api/service/HistorySecondSpecialService.java
deleted file mode 100644
index 97fb89c..0000000
--- a/screen-manage/src/main/java/com/moral/api/service/HistorySecondSpecialService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.moral.api.service;
-
-import java.util.Map;
-
-import com.moral.api.entity.HistorySecondSpecial;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * ������������������������ ���������
- * </p>
- *
- * @author moral
- * @since 2021-08-12
- */
-public interface HistorySecondSpecialService extends IService<HistorySecondSpecial> {
-
- //���������insert
- void insertHistorySecond(Map<String, Object> data);
-
-}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondSpecialServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondSpecialServiceImpl.java
deleted file mode 100644
index 366e784..0000000
--- a/screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondSpecialServiceImpl.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.moral.api.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.moral.api.entity.Device;
-import com.moral.api.entity.HistorySecondSpecial;
-import com.moral.api.entity.Sensor;
-import com.moral.api.entity.SpecialDevice;
-import com.moral.api.mapper.HistorySecondSpecialMapper;
-import com.moral.api.service.DeviceService;
-import com.moral.api.service.HistorySecondSpecialService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.moral.constant.Constants;
-import com.moral.constant.RedisConstants;
-import com.moral.util.DateUtils;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * ������������������������ ���������������
- * </p>
- *
- * @author moral
- * @since 2021-08-12
- */
-@Service
-public class HistorySecondSpecialServiceImpl extends ServiceImpl<HistorySecondSpecialMapper, HistorySecondSpecial> implements HistorySecondSpecialService {
-
- @Autowired
- private HistorySecondSpecialMapper historySecondSpecialMapper;
-
- @Autowired
- private DeviceService deviceService;
-
- @Autowired
- private RedisTemplate redisTemplate;
-
- @Override
- public void insertHistorySecond(Map<String, Object> data) {
- Date batchTime = DateUtils.getDate((String) data.remove(Constants.SENSOR_CODE_SPECIAL_BATCH), DateUtils.yyyyMMddHHmmss_EN);
- Date time = DateUtils.getDate((String) data.get("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
- String mac = data.get("mac").toString();
-
- //������mac���redis���������������
- SpecialDevice specialDevice = (SpecialDevice) redisTemplate.opsForHash().get(RedisConstants.SPECIAL_DEVICE_INFO, mac);
- List<Sensor> sensors = specialDevice.getVersion().getSensors();
- //������������
- data = data.entrySet().stream()
- .filter(m -> {
- boolean flag = false;
- String key = m.getKey();
- if (!"mac".equals(key) && !"DataTime".equals(key)) {
- for (Sensor sensor : sensors) {
- if (sensor.getCode().equals(key)) {
- flag = true;
- break;
- }
- }
- return flag;
- }
- return true;
- }).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-
- //������������
- data = deviceService.adjustSpecialDeviceData(data);
-
- HistorySecondSpecial historySecondSpecial = new HistorySecondSpecial();
- historySecondSpecial.setMac(mac);
- historySecondSpecial.setTime(time);
- historySecondSpecial.setValue(JSONObject.toJSONString(data));
- historySecondSpecial.setOrganizationId(specialDevice.getOrganizationId());
- historySecondSpecial.setBatch(batchTime);
- historySecondSpecialMapper.insert(historySecondSpecial);
- }
-}
diff --git a/screen-manage/src/main/resources/mapper/HistorySecondSpecialMapper.xml b/screen-manage/src/main/resources/mapper/HistorySecondSpecialMapper.xml
deleted file mode 100644
index 059231b..0000000
--- a/screen-manage/src/main/resources/mapper/HistorySecondSpecialMapper.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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.HistorySecondSpecialMapper">
-
- <!-- ������������������������ -->
- <resultMap id="BaseResultMap" type="com.moral.api.entity.HistorySecondSpecial">
- <result column="mac" property="mac"/>
- <result column="time" property="time"/>
- <result column="value" property="value"/>
- <result column="organization_id" property="organizationId"/>
- <result column="batch" property="batch"/>
- </resultMap>
-
-</mapper>
\ No newline at end of file
--
Gitblit v1.8.0