删除historySecondSpecial相关类

jinpengyong

2021-10-13 0197c2fcac5fdb701ff91dcea0d98ec226bc008d

删除historySecondSpecial相关类

 screen-api/src/main/java/com/moral/api/entity/HistorySecondSpecial.java

File was deleted

 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);

}

 screen-api/src/main/java/com/moral/api/mapper/HistorySecondSpecialMapper.java

File was deleted

 screen-api/src/main/java/com/moral/api/service/HistorySecondSpecialService.java

File was deleted

 screen-api/src/main/java/com/moral/api/service/impl/HistorySecondSpecialServiceImpl.java

File was deleted

 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) {

 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>

 screen-api/src/main/resources/mapper/HistorySecondSpecialMapper.xml

File was deleted

 screen-manage/src/main/java/com/moral/api/entity/HistorySecondSpecial.java

File was deleted

 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

 screen-manage/src/main/java/com/moral/api/mapper/HistorySecondSpecialMapper.java

File was deleted

 screen-manage/src/main/java/com/moral/api/service/HistorySecondSpecialService.java

File was deleted

 screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondSpecialServiceImpl.java

File was deleted

 screen-manage/src/main/resources/mapper/HistorySecondSpecialMapper.xml

File was deleted