数据统计添加数据权限

business-service/src/main/java/com/ozs/service/service/MsgAlarmService.java

@@ -19,7 +19,7 @@ import java.util.Map;
  */
 public interface MsgAlarmService extends IService<MsgAlarm> {
     //web数据统计 报警数据详情
-    List<AlarmStatisticVo> list(AlarmStatisticResVo alarmStatisticResVo);
+    IPage<AlarmStatisticVo> list(AlarmStatisticResVo alarmStatisticResVo);
 
     IPage listToPage(List list, int pageNum, int pageSize);
 

business-service/src/main/java/com/ozs/service/service/impl/MsgAlarmServiceImpl.java

@@ -50,9 +50,16 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
 
     //web数据统计 报警数据详情
     @Override
-    public List<AlarmStatisticVo> list(AlarmStatisticResVo alarmStatisticResVo) {
-        List<AlarmStatisticVo> list = msgAlarmMapper.list(alarmStatisticResVo);
-        return list;
+    public IPage<AlarmStatisticVo> list(AlarmStatisticResVo alarmStatisticResVo) {
+        int pageNum = Integer.parseInt(alarmStatisticResVo.getPageNum().toString());
+        int pageSize = Integer.parseInt(alarmStatisticResVo.getPageSize().toString());
+        com.github.pagehelper.Page<AlarmStatisticVo> page = PageHelper.startPage(pageNum, pageSize)
+                .doSelectPage(() -> msgAlarmMapper.list(alarmStatisticResVo));
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<AlarmStatisticVo> pageR =
+                new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageNum, pageSize);
+        pageR.setRecords(page.getResult());
+        pageR.setTotal(page.getTotal());
+        return pageR;
     }
 
     @Override

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -527,42 +527,43 @@ public class MsgAlarmController extends BaseController {
             @ApiImplicitParam(paramType = "query", name = "alarmType", value = "灾害类型"),
     })
     public AjaxResult dataStatistic(@RequestBody AlarmStatisticResVo alarmStatisticResVo) {
-        Integer pageNum = alarmStatisticResVo.getPageNum().intValue();
-        Integer pageSize = alarmStatisticResVo.getPageSize().intValue();
-
         alarmStatisticResVo = (AlarmStatisticResVo) dataScoreUtil.setDataScore(getUserId(), alarmStatisticResVo);
-        List<AlarmStatisticVo> list = msgAlarmService.list(alarmStatisticResVo);
-        if (!ObjectUtils.isEmpty(list)) {
-            list.forEach(l -> {
-                if (!ObjectUtils.isEmpty(l.getAlarmMile())) {
-                    l.setAlarmMile(AppendUtils.stringAppend(Integer.valueOf(l.getAlarmMile())));
+        IPage<AlarmStatisticVo> page = msgAlarmService.list(alarmStatisticResVo);
+        page.setTotal(page.getTotal());
+        page.setCurrent(page.getCurrent());
+        page.setPages(page.getPages());
+        if (!ObjectUtils.isEmpty(page) && page.getRecords().size() > 0) {
+            List<AlarmStatisticVo> dto1 = page.getRecords().stream().map(o -> {
+                if (!ObjectUtils.isEmpty(o.getAlarmMile())) {
+                    o.setAlarmMile(AppendUtils.stringAppend(Integer.valueOf(o.getAlarmMile())));
                 }
-                if (StringUtils.isNotEmpty(l.getReleasedBy())) {
-                    BaseUser buser = baseUserService.getUser(l.getReleasedBy());
-                    l.setReleasedByName(buser.getNickName());
+                if (StringUtils.isNotEmpty(o.getReleasedBy())) {
+                    BaseUser buser = baseUserService.getUser(o.getReleasedBy());
+                    o.setReleasedByName(buser.getNickName());
                 }
-                if (!ObjectUtils.isEmpty(l.getReleasedType())) {
-                    l.setReleasedTypeName(l.getReleasedType() == 1 ? "实报" : "误报");
+                if (!ObjectUtils.isEmpty(o.getReleasedType())) {
+                    o.setReleasedTypeName(o.getReleasedType() == 1 ? "实报" : "误报");
                 }
-                if (!ObjectUtils.isEmpty(l.getLineDir())) {
-                    l.setLineDirName(l.getLineDir() == 1 ? "上行" : "下行");
+                if (!ObjectUtils.isEmpty(o.getLineDir())) {
+                    o.setLineDirName(o.getLineDir() == 1 ? "上行" : "下行");
                 }
-                if (!ObjectUtils.isEmpty(l.getAlarmType())) {
-                    l.setAlarmTypeName(dictDataService.selectDictLabel("sys_alarm_type", String.valueOf(l.getAlarmType())));
+                if (!ObjectUtils.isEmpty(o.getAlarmType())) {
+                    o.setAlarmTypeName(dictDataService.selectDictLabel("sys_alarm_type", String.valueOf(o.getAlarmType())));
                 }
-                if (!ObjectUtils.isEmpty(l.getIsLock())) {
-                    l.setIsLockName(l.getIsLock() == 1 ? "已解除" : "未解除");
+                if (!ObjectUtils.isEmpty(o.getIsLock())) {
+                    o.setIsLockName(o.getIsLock() == 1 ? "已解除" : "未解除");
                 }
-                if (!ObjectUtils.isEmpty(l.getAlarmAttr())) {
-                    String[] split1 = l.getAlarmAttr().split(",");
+                if (!ObjectUtils.isEmpty(o.getAlarmAttr())) {
+                    String[] split1 = o.getAlarmAttr().split(",");
                     String stringBuilder = "画面大小" + split1[0] + "×" + split1[1] + "," +
                             "泥石流范围为左上角坐标(" + split1[2] + "," + split1[3] + ")" +
                             "大小" + split1[4] + "×" + split1[5];
-                    l.setAlarmAttrString(stringBuilder);
+                    o.setAlarmAttrString(stringBuilder);
                 }
-            });
+                return o;
+            }).collect(Collectors.toList());
+                        page.setRecords(dto1);
         }
-        IPage page = msgAlarmService.listToPage(list, pageNum, pageSize);
         return AjaxResult.success(page);
     }