moral.git - Gitblit

			@@ -2,8 +2,7 @@

			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;
			@@ -14,7 +13,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;
			@@ -62,7 +61,7 @@
			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");
			@@ -70,7 +69,7 @@
			QueryWrapper<SpecialDeviceHistory> queryWrapper = new QueryWrapper<>();
			queryWrapper.select("mac", "name")
			.eq("organization_id", orgId)
			.eq("special_type", Constants.SPECIAL_DEVICE_CAR)
			.eq("special_type", Constants.SPECIAL_DEVICE_CRUISER)
			.eq("is_delete", Constants.NOT_DELETE);
			return specialDeviceHistoryService.listMaps(queryWrapper);
			}
			@@ -108,8 +107,8 @@
			@Override
			public SpecialDevice getSpecialDeviceMapByMac(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;
			}