获取有走航车数据日期，device修改，绑定国控站

jinpengyong

2021-09-14 db2b30bbe239427a89521cd858b2b191d56086ef

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

@@ -2,10 +2,9 @@

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.HistorySecondSpecial;
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;
@@ -14,6 +13,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;
import com.moral.util.GeodesyUtils;
import com.moral.util.TokenUtils;

@@ -23,6 +23,8 @@
import org.springframework.util.ObjectUtils;

import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@@ -48,6 +50,10 @@

    @Autowired
    SpecialDeviceMapper specialDeviceMapper;

    @Autowired
    private HistorySecondCruiserMapper historySecondCruiserMapper;

    @Autowired
    RedisTemplate redisTemplate;

@@ -98,21 +104,35 @@
    }

    @Override
    public Map<String,Object> getSpecialDeviceMapByMac(String mac) {
    public Map<String, Object> getSpecialDeviceMapByMac(String mac) {
        //从缓存中获取
        Map<String,Object> specialDeviceMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE,mac);
       return specialDeviceMap;
        Map<String, Object> specialDeviceMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, mac);
        return specialDeviceMap;
    }

    @Override
    public SpecialDevice getSpecialDeviceByMac(String mac) {
        QueryWrapper<SpecialDevice> queryWrapper = new QueryWrapper();
        queryWrapper.eq("mac",mac);
        queryWrapper.eq("is_delete",Constants.NOT_DELETE);
        queryWrapper.eq("mac", mac);
        queryWrapper.eq("is_delete", Constants.NOT_DELETE);
        SpecialDevice specialDevice = specialDeviceMapper.selectOne(queryWrapper);
        return specialDevice;
    }

    @Override
    public List<String> getDatesByMac(String mac) {
        Map<String, Object> userInfo = (Map) TokenUtils.getUserInfo();
        Map<String, Object> orgInfo = (Map) userInfo.get("organization");
        Integer orgId = (Integer) orgInfo.get("id");

        Map<String, Object> params = new HashMap<>();
        params.put("orgId", orgId);
        params.put("mac", mac);
        Date start = DateUtils.addMonths(new Date(), -6);
        params.put("start", DateUtils.dateToDateString(start));
        return historySecondCruiserMapper.getDates(params);
    }


    //根据距离筛选数据
    private List<Map<String, Object>> filterData(List<Map<String, Object>> data) {