|
@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.ozs.common.core.controller.BaseController;
|
|
import com.ozs.common.core.controller.BaseController;
|
|
import com.ozs.common.core.domain.AjaxResult;
|
|
import com.ozs.common.core.domain.AjaxResult;
|
|
import com.ozs.common.core.domain.entity.SysDept;
|
|
import com.ozs.common.core.domain.entity.SysDept;
|
|
|
|
+import com.ozs.common.core.domain.entity.SysUser;
|
|
|
|
+import com.ozs.common.core.domain.model.LoginUser;
|
|
import com.ozs.common.utils.AppendUtils;
|
|
import com.ozs.common.utils.AppendUtils;
|
|
import com.ozs.common.utils.StringUtils;
|
|
import com.ozs.common.utils.StringUtils;
|
|
import com.ozs.common.utils.poi.ExcelUtil;
|
|
import com.ozs.common.utils.poi.ExcelUtil;
|
|
@@ -284,8 +286,9 @@ public class MsgAlarmController extends BaseController {
|
|
public AjaxResult dataStatistic(@RequestBody AlarmStatisticResVo alarmStatisticResVo) {
|
|
public AjaxResult dataStatistic(@RequestBody AlarmStatisticResVo alarmStatisticResVo) {
|
|
Integer pageNum = alarmStatisticResVo.getPageNum().intValue();
|
|
Integer pageNum = alarmStatisticResVo.getPageNum().intValue();
|
|
Integer pageSize = alarmStatisticResVo.getPageSize().intValue();
|
|
Integer pageSize = alarmStatisticResVo.getPageSize().intValue();
|
|
|
|
+ SysUser user = getLoginUser().getUser();
|
|
String userId = getUserId();
|
|
String userId = getUserId();
|
|
- if ("1".equals(userId)) {
|
|
|
|
|
|
+ if (user.isAdmin(user.getId())) {
|
|
userId = "";
|
|
userId = "";
|
|
}
|
|
}
|
|
IPage<AlarmStatisticVo> page = msgAlarmService.list(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getStartMonth(),
|
|
IPage<AlarmStatisticVo> page = msgAlarmService.list(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getStartMonth(),
|
|
@@ -308,8 +311,10 @@ public class MsgAlarmController extends BaseController {
|
|
@ApiImplicitParam(paramType = "query", name = "alarmType", value = "灾害类型"),
|
|
@ApiImplicitParam(paramType = "query", name = "alarmType", value = "灾害类型"),
|
|
})
|
|
})
|
|
public AjaxResult alarmMonthStatistic(@RequestBody AlarmStatisticResVo alarmStatisticResVo) {
|
|
public AjaxResult alarmMonthStatistic(@RequestBody AlarmStatisticResVo alarmStatisticResVo) {
|
|
|
|
+ SysUser user = getLoginUser().getUser();
|
|
String userId = getUserId();
|
|
String userId = getUserId();
|
|
- if ("1".equals(userId)) {
|
|
|
|
|
|
+ ;
|
|
|
|
+ if (user.isAdmin(user.getId())) {
|
|
userId = "";
|
|
userId = "";
|
|
}
|
|
}
|
|
List<AlarmStatisticMonthDto> list = msgAlarmService.getCount(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getStartMonth(),
|
|
List<AlarmStatisticMonthDto> list = msgAlarmService.getCount(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getStartMonth(),
|
|
@@ -333,8 +338,10 @@ public class MsgAlarmController extends BaseController {
|
|
@ApiImplicitParam(paramType = "query", name = "alarmType", value = "灾害类型"),
|
|
@ApiImplicitParam(paramType = "query", name = "alarmType", value = "灾害类型"),
|
|
})
|
|
})
|
|
public void exportDataStatistic(HttpServletResponse response, @RequestBody AlarmStatisticResVo alarmStatisticResVo) {
|
|
public void exportDataStatistic(HttpServletResponse response, @RequestBody AlarmStatisticResVo alarmStatisticResVo) {
|
|
|
|
+ SysUser user = getLoginUser().getUser();
|
|
String userId = getUserId();
|
|
String userId = getUserId();
|
|
- if ("1".equals(userId)) {
|
|
|
|
|
|
+ ;
|
|
|
|
+ if (user.isAdmin(user.getId())) {
|
|
userId = "";
|
|
userId = "";
|
|
}
|
|
}
|
|
try {
|
|
try {
|
|
@@ -371,8 +378,9 @@ public class MsgAlarmController extends BaseController {
|
|
@ApiImplicitParam(paramType = "query", name = "alarmType", value = "灾害类型"),
|
|
@ApiImplicitParam(paramType = "query", name = "alarmType", value = "灾害类型"),
|
|
})
|
|
})
|
|
public void exportDataStatisticMonth(HttpServletResponse response, @RequestBody AlarmStatisticResVo alarmStatisticResVo) {
|
|
public void exportDataStatisticMonth(HttpServletResponse response, @RequestBody AlarmStatisticResVo alarmStatisticResVo) {
|
|
|
|
+ SysUser user = getLoginUser().getUser();
|
|
String userId = getUserId();
|
|
String userId = getUserId();
|
|
- if ("1".equals(userId)) {
|
|
|
|
|
|
+ if (user.isAdmin(user.getId())) {
|
|
userId = "";
|
|
userId = "";
|
|
}
|
|
}
|
|
try {
|
|
try {
|