wenhongquan 2 лет назад
Родитель
Сommit
edabb8eacb

+ 1 - 1
ruoyi-modules/ruoyi-khy/src/main/java/jt809/common/Const.java

@@ -61,7 +61,7 @@ public class Const {
     /** 用户信息,以下信息请自定义*/
     /** 用户信息,以下信息请自定义*/
     public interface UserInfo{
     public interface UserInfo{
         int USER_ID = 6051;
         int USER_ID = 6051;
-        String PASSWORD = "iot2yun";
+        String PASSWORD = "6051";
         int MSG_GNSSCENTERID = 1001; // 1001
         int MSG_GNSSCENTERID = 1001; // 1001
     }
     }
 
 

+ 15 - 11
ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/service/impl/TblCarInfoServiceImpl.java

@@ -45,11 +45,13 @@ public class TblCarInfoServiceImpl implements ITblCarInfoService {
     @Override
     @Override
     public TblCarInfoVo queryById(Long id){
     public TblCarInfoVo queryById(Long id){
         TblCarInfoVo carInfoVo = baseMapper.selectVoById(id);
         TblCarInfoVo carInfoVo = baseMapper.selectVoById(id);
-        JSONUtil.parseArray(carInfoVo.getDeviceInfos()).toList(JSONObject.class).forEach(deviceInfo -> {
-            if(deviceInfo.getStr("type").equals("gps")){
-                carInfoVo.setLocation(RedisUtils.getCacheObject(StringUtils.format("gps_{}", deviceInfo.getStr("code"))));
-            }
-        });
+        try {
+            JSONUtil.parseArray(carInfoVo.getDeviceInfos()).toList(JSONObject.class).forEach(deviceInfo -> {
+                if(deviceInfo.getStr("type").equals("gps")){
+                    carInfoVo.setLocation(RedisUtils.getCacheObject(StringUtils.format("gps_{}", deviceInfo.getStr("code"))));
+                }
+            });
+        }catch (Exception e){}
         return carInfoVo;
         return carInfoVo;
     }
     }
 
 
@@ -60,14 +62,16 @@ public class TblCarInfoServiceImpl implements ITblCarInfoService {
     public TableDataInfo<TblCarInfoVo> queryPageList(TblCarInfoBo bo, PageQuery pageQuery) {
     public TableDataInfo<TblCarInfoVo> queryPageList(TblCarInfoBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<TblCarInfo> lqw = buildQueryWrapper(bo);
         LambdaQueryWrapper<TblCarInfo> lqw = buildQueryWrapper(bo);
         Page<TblCarInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         Page<TblCarInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        result.getRecords().forEach(carInfoVo -> {
-            JSONUtil.parseArray(carInfoVo.getDeviceInfos()).toList(JSONObject.class).forEach(deviceInfo -> {
-                if(deviceInfo.getStr("type").equals("gps")){
-                    carInfoVo.setLocation(RedisUtils.getCacheObject(StringUtils.format("gps_{}", deviceInfo.getStr("code"))));
-                }
+        try {
+            result.getRecords().forEach(carInfoVo -> {
+                JSONUtil.parseArray(carInfoVo.getDeviceInfos()).toList(JSONObject.class).forEach(deviceInfo -> {
+                    if(deviceInfo.getStr("type").equals("gps")){
+                        carInfoVo.setLocation(RedisUtils.getCacheObject(StringUtils.format("gps_{}", deviceInfo.getStr("code"))));
+                    }
+                });
             });
             });
+        }catch (Exception e){}
 
 
-        });
         return TableDataInfo.build(result);
         return TableDataInfo.build(result);
     }
     }