forked from moral

blame | history | patch | commit | commitdiff | ignore whitespace
kaiyu
2021-10-08 93fe0b66e85e95e3a7e77a28504d6d289b6906b9 
 screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java


@@ -2,6 +2,8 @@




import com.alibaba.fastjson.JSONObject;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;




import com.moral.api.entity.Organization;


import com.moral.api.entity.SpecialDevice;


import com.moral.api.entity.SpecialDeviceHistory;


import com.moral.api.mapper.HistorySecondCruiserMapper;


@@ -12,7 +14,7 @@


import com.moral.api.service.SpecialDeviceService;


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;


@@ -27,6 +29,7 @@


import java.util.HashMap;


import java.util.List;


import java.util.Map;


import java.util.stream.Collectors;




/**


 * <p>


@@ -60,16 +63,20 @@


    private final static Double dis = 50d;




    @Override


    public List<Map<String, Object>> getCarsInfo() {


    public List<Map<String, Object>> selectCruisers() {


        //获取当前用户信息


        Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();


        Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");


        Integer orgId = (Integer) orgInfo.get("id");


        //获取所有子组织


        List<Organization> organizations = organizationService.getChildrenOrganizationsById(orgId);


        List<Integer> orgIds = organizations.stream().map(Organization::getId).collect(Collectors.toList());


        orgIds.add(orgId);


        QueryWrapper<SpecialDeviceHistory> queryWrapper = new QueryWrapper<>();


        queryWrapper.select("mac", "name")


                .eq("organization_id", orgId)


                .eq("special_type", Constants.SPECIAL_DEVICE_CAR)


                .eq("is_delete", Constants.NOT_DELETE);


                .eq("special_type", Constants.SPECIAL_DEVICE_CRUISER)


                .eq("is_delete", Constants.NOT_DELETE)


                .in("organization_id", orgIds);


        return specialDeviceHistoryService.listMaps(queryWrapper);


    }




@@ -104,14 +111,7 @@


    }




    @Override


    public Map<String, Object> getSpecialDeviceMapByMac(String mac) {


        //从缓存中获取


        Map<String, Object> specialDeviceMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, mac);


        return specialDeviceMap;


    }




    @Override


    public SpecialDevice getSpecialDeviceByMac(String mac) {


    public SpecialDevice getSpecialDeviceMapByMac(String mac) {


        QueryWrapper<SpecialDevice> queryWrapper = new QueryWrapper();


        queryWrapper.eq("mac", mac);


        queryWrapper.eq("is_delete", Constants.NOT_DELETE);


@@ -119,6 +119,7 @@


        return specialDevice;


    }






    @Override


    public List<String> getDatesByMac(String mac) {


        Map<String, Object> userInfo = (Map) TokenUtils.getUserInfo();