|
|
@@ -8,6 +8,8 @@ import com.ozs.common.annotation.Log;
|
|
|
import com.ozs.common.core.controller.BaseController;
|
|
|
import com.ozs.common.core.domain.AjaxResult;
|
|
|
import com.ozs.common.core.domain.entity.SysDept;
|
|
|
+import com.ozs.common.core.domain.entity.SysDictData;
|
|
|
+import com.ozs.common.core.domain.entity.SysDictType;
|
|
|
import com.ozs.common.core.domain.entity.SysUser;
|
|
|
import com.ozs.common.core.domain.model.LoginUser;
|
|
|
import com.ozs.common.enums.BusinessType;
|
|
|
@@ -22,6 +24,7 @@ import com.ozs.service.service.*;
|
|
|
import com.ozs.system.service.DataScoreUtil;
|
|
|
import com.ozs.system.service.ISysDeptService;
|
|
|
import com.ozs.system.service.ISysDictDataService;
|
|
|
+import com.ozs.system.service.ISysDictTypeService;
|
|
|
import com.ozs.web.core.util.CameraUtil;
|
|
|
import io.swagger.annotations.ApiImplicitParam;
|
|
|
import io.swagger.annotations.ApiImplicitParams;
|
|
|
@@ -282,7 +285,11 @@ public class MsgAlarmController extends BaseController {
|
|
|
}
|
|
|
msgAlarm.setLineDirName(msgAlarm.getLineDir() == 1 ? "上行" : "下行");
|
|
|
msgAlarm.setIsLockName(msgAlarm.getIsLock() == 1 ? "已解除" : "未解除");
|
|
|
- msgAlarm.setAlarmTypeName("泥石流");
|
|
|
+ LambdaQueryWrapper<SysDictData> dict=new LambdaQueryWrapper<>();
|
|
|
+ dict.eq(SysDictData::getDictType,"sys_alarm_type");
|
|
|
+ dict.eq(SysDictData::getDictValue,msgAlarm.getAlarmType());
|
|
|
+ SysDictData one = dictDataService.getOne(dict);
|
|
|
+ msgAlarm.setAlarmTypeName(one.getDictLabel());
|
|
|
String[] split1 = msgAlarm.getAlarmAttr().split(",");
|
|
|
String stringBuilder = "画面,大小为" + split1[0] + "×" + split1[1] + "," +
|
|
|
"泥石流范围为左上角坐标(" + split1[2] + "," + split1[3] + ")" +
|
gao.qiang