|
@@ -10,6 +10,7 @@ import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
|
import cn.hutool.core.io.FileUtil;
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
|
import cn.hutool.json.JSONArray;
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
@@ -161,10 +162,11 @@ public class TblEventController extends BaseController {
|
|
|
}catch (Exception e) {}
|
|
|
try{
|
|
|
TblDeviceVo tblDeviceVo = tblDeviceService.queryById(JSONUtil.parseObj(tblEventVo.getExt2()).getJSONObject("deviceVo").getLong("id"));
|
|
|
- if(tblDeviceVo!=null){
|
|
|
- data.put("事件地点",JSONUtil.parseObj(tblDeviceVo.getExt1()).getStr("addr"));
|
|
|
+ if(tblDeviceVo!=null && tblDeviceVo.getExt1()!=null){
|
|
|
+ if(!StrUtil.isEmptyIfStr(JSONUtil.parseObj(tblDeviceVo.getExt1()).getStr("addr"))){
|
|
|
+ data.put("事件地点",JSONUtil.parseObj(tblDeviceVo.getExt1()).getStr("addr"));
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
}catch (Exception e) {}
|
|
|
|
|
|
|