Merge commit '471e11b5df1507f26cc87649487dc0579b13c109' into pro

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabExitLineVertexController.java

@@ -7,6 +7,7 @@ import com.zd.common.core.annotation.Log;
 import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.redis.RedisService;
+import com.zd.common.core.utils.StringUtils;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.laboratory.domain.LabExitLineVertex;
@@ -130,8 +131,9 @@ public class LabExitLineVertexController extends BaseController {
     @PostMapping("/getRedisEvacuation")
     @ApiOperation(value = "获取redis的疏散数据")
     public ResultData getRedisEvacuation(@RequestBody LabExitLineEvacuationVo labExitLineEvacuationVo) {
-        if(redisService.getCacheObject("exitLineBy"+labExitLineEvacuationVo.getBuildId()+""+labExitLineEvacuationVo.getFloorId())!=null){
-            String joinPointVOSStr = redisService.getCacheObject("exitLineBy"+labExitLineEvacuationVo.getBuildId()+""+labExitLineEvacuationVo.getFloorId());
+        String joinPointVOSStr = redisService.getCacheObject("exitLineBy"+labExitLineEvacuationVo.getBuildId()+""+labExitLineEvacuationVo.getFloorId());
+        if(StringUtils.isNotNull(joinPointVOSStr)){
+//            String joinPointVOSStr = redisService.getCacheObject("exitLineBy"+labExitLineEvacuationVo.getBuildId()+""+labExitLineEvacuationVo.getFloorId());
             Map <String, Object> joinPointVOS = (Map <String, Object>) JSON.parseObject(joinPointVOSStr, Object.class, Feature.OrderedField);
             return ResultData.success(joinPointVOS);
         }