无人驿站包裹分页查询、告警设备总数查询

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/SpHj2017Service.java

@@ -17,5 +17,5 @@ import java.util.Map;
 public interface SpHj2017Service extends CrudService<SpHj2017> {
     List<Map<String, Object>> statusCount(String requestBody);
     List<Map<String, Object>> typeList(String requestBody);
-    Map<String, Object> countDevice (String requestBody);
+    Long countDevice (String requestBody);
 }

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/SpRtu2017Service.java

@@ -8,7 +8,7 @@ import java.util.Map;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author fu
@@ -16,6 +16,8 @@ import java.util.Map;
  */
 public interface SpRtu2017Service extends CrudService<SpRtu2017> {
     List<Map<String, Object>> statusCount(String requestBody);
+
     List<Map<String, Object>> typeList(String requestBody);
-    Map<String, Object> countDevice (String requestBody);
+
+    Long countDevice(String requestBody);
 }

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/SpSj2017Service.java

@@ -17,5 +17,5 @@ import java.util.Map;
 public interface SpSj2017Service extends CrudService<SpSj2017> {
     List<Map<String, Object>> statusCount(String requestBody);
     List<Map<String, Object>> typeList(String deviceCode);
-    Map<String, Object> countDevice(String requestBody);
+    Long countDevice(String requestBody);
 }

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/impl/SpHj2017ServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 
 import com.usky.common.core.exception.BusinessException;
 import com.usky.issue.domain.SpHj2017;
+import com.usky.issue.domain.SpRtu2017;
 import com.usky.issue.mapper.SpHj2017Mapper;
 import com.usky.issue.service.SpHj2017Service;
 import com.usky.common.mybatis.core.AbstractCrudService;
@@ -39,7 +40,7 @@ public class SpHj2017ServiceImpl extends AbstractCrudService<SpHj2017Mapper, SpH
         queryWrapper.select("DATE_FORMAT(time, '%Y-%m-%d %H:%i:%s') AS alarm_time", "data2 AS alarm_type", "data4 AS alarm_point", "device_code")
                 .inSql("device_code", "SELECT owner_code FROM sp_owner WHERE company = '" + companyCode + "' AND dwtype IN (1,3)");
         if (StringUtils.isBlank(startTimeString) && StringUtils.isBlank(endTimeString)) {
-        }else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isNotBlank(endTimeString)) {
+        } else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isNotBlank(endTimeString)) {
             // 如果同时传了 startTime 和 endTime
             queryWrapper.between("time", startTimeString, endTimeString);
         } else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isBlank(endTimeString)) {
@@ -52,7 +53,7 @@ public class SpHj2017ServiceImpl extends AbstractCrudService<SpHj2017Mapper, SpH
             throw new BusinessException("时间参数错误");
         }
         queryWrapper.last("LIMIT " + pageSize + " OFFSET " + startIndex)
-                    .orderByDesc("id");
+                .orderByDesc("id");
         List<Map<String, Object>> deviceStatusList = this.listMaps(queryWrapper);
 
         return deviceStatusList;
@@ -65,16 +66,16 @@ public class SpHj2017ServiceImpl extends AbstractCrudService<SpHj2017Mapper, SpH
         String endTimeString = requestVO.get("endTime").toString();
         QueryWrapper<SpHj2017> queryWrapper1 = Wrappers.query();
         queryWrapper1.select("COUNT(CASE WHEN clzt = 0 THEN 1 ELSE NULL END) AS untreated", "COUNT(CASE WHEN clzt = 1 THEN 1 ELSE NULL END) AS processed")
-                .inSql("device_code", "SELECT owner_code FROM sp_owner WHERE company = '" + companyCode + "'");
+                .inSql("device_code", "SELECT owner_code FROM sp_owner WHERE company = '" + companyCode + "' AND dwtype IN (1,3)");
         if (StringUtils.isBlank(startTimeString) && StringUtils.isBlank(endTimeString)) {
 
-        }else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isNotBlank(endTimeString)) {
+        } else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isNotBlank(endTimeString)) {
             // 如果同时传了 startTime 和 endTime
             queryWrapper1.between("time", startTimeString, endTimeString);
         } else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isBlank(endTimeString)) {
             // 如果只传了 startTime
             queryWrapper1.between("time", startTimeString, LocalDateTime.now().toString());
-        } else if (StringUtils.isNotBlank(endTimeString)  && StringUtils.isBlank(startTimeString)) {
+        } else if (StringUtils.isNotBlank(endTimeString) && StringUtils.isBlank(startTimeString)) {
             // 如果只传了 endTime
             queryWrapper1.le("time", endTimeString);
         } else {
@@ -83,14 +84,19 @@ public class SpHj2017ServiceImpl extends AbstractCrudService<SpHj2017Mapper, SpH
         List<Map<String, Object>> deviceStatusList1 = this.listMaps(queryWrapper1);
         return deviceStatusList1;
     }
-    public Map<String, Object> countDevice (String requestBody) {
+
+    public Long countDevice(String requestBody) {
         JSONObject requestVO = JSONObject.parseObject(requestBody);
         String companyCode = requestVO.get("companyCode").toString();
-        QueryWrapper<SpHj2017> queryWrapper2 = Wrappers.query();
-        queryWrapper2.select("COUNT(DISTINCT  device_code) AS alarmDeviceCountHj")
-                .inSql("device_code", "SELECT owner_code FROM sp_owner WHERE company = '" + companyCode + "'");
-        Map<String, Object> deviceStatusMap = this.getMap(queryWrapper2);
-        return deviceStatusMap;
+
+        QueryWrapper<SpHj2017> queryWrapper1 = Wrappers.query();
+        queryWrapper1.select("DISTINCT device_code")
+                .inSql("device_code", "SELECT device_code FROM yt_device_status WHERE company_code = '" + companyCode + "'");
+        List<SpHj2017> SpHj2017 = this.list(queryWrapper1);
+
+        Long deviceCount = Long.valueOf(SpHj2017.size());
+
+        return deviceCount;
     }
 
 }

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/impl/SpRtu2017ServiceImpl.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 
 import com.usky.common.core.exception.BusinessException;
-import com.usky.issue.domain.SpHj2017;
 import com.usky.issue.domain.SpRtu2017;
 import com.usky.issue.mapper.SpRtu2017Mapper;
 import com.usky.issue.service.SpRtu2017Service;
@@ -40,15 +39,15 @@ public class SpRtu2017ServiceImpl extends AbstractCrudService<SpRtu2017Mapper, S
         int startIndex = (currentPage - 1) * pageSize;
         QueryWrapper<SpRtu2017> queryWrapper = Wrappers.query();
         queryWrapper.select("DATE_FORMAT(time, '%Y-%m-%d %H:%i:%s') AS alarm_time", "data2 AS alarm_type", "data4 AS alarm_point", "device_code")
-                    .inSql("device_code", "SELECT owner_code FROM sp_owner WHERE company = '" + companyCode + "'");
+                .inSql("device_code", "SELECT owner_code FROM sp_owner WHERE company = '" + companyCode + "' AND dwtype = 6");
         if (StringUtils.isBlank(startTimeString) && StringUtils.isBlank(endTimeString)) {
 
-        }else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isNotBlank(endTimeString)) {
+        } else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isNotBlank(endTimeString)) {
             // 如果同时传了 startTime 和 endTime
             queryWrapper.between("time", startTimeString, endTimeString);
         } else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isBlank(endTimeString)) {
             // 如果只传了 startTime
-            queryWrapper.between("time", startTimeString,LocalDateTime.now().toString());
+            queryWrapper.between("time", startTimeString, LocalDateTime.now().toString());
         } else if (StringUtils.isNotBlank(endTimeString) && StringUtils.isBlank(startTimeString)) {
             // 如果只传了 endTime
             queryWrapper.le("time", endTimeString);
@@ -56,7 +55,7 @@ public class SpRtu2017ServiceImpl extends AbstractCrudService<SpRtu2017Mapper, S
             throw new BusinessException("时间参数错误");
         }
         queryWrapper.last("LIMIT " + pageSize + " OFFSET " + startIndex)
-                    .orderByDesc("id");
+                .orderByDesc("id");
         List<Map<String, Object>> deviceStatusList = this.listMaps(queryWrapper);
 
         return deviceStatusList;
@@ -69,16 +68,16 @@ public class SpRtu2017ServiceImpl extends AbstractCrudService<SpRtu2017Mapper, S
         String endTimeString = requestVO.get("endTime").toString();
         QueryWrapper<SpRtu2017> queryWrapper1 = Wrappers.query();
         queryWrapper1.select("COUNT(CASE WHEN clzt = 0 THEN 1 ELSE NULL END) AS untreated", "COUNT(CASE WHEN clzt = 1 THEN 1 ELSE NULL END) AS processed")
-                .inSql("device_code", "SELECT owner_code FROM sp_owner WHERE company = '" + companyCode + "'");
+                .inSql("device_code", "SELECT owner_code FROM sp_owner WHERE company = '" + companyCode + "' AND dwtype = 6");
         if (StringUtils.isBlank(startTimeString) && StringUtils.isBlank(endTimeString)) {
 
-        }else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isNotBlank(endTimeString)) {
+        } else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isNotBlank(endTimeString)) {
             // 如果同时传了 startTime 和 endTime
             queryWrapper1.between("time", startTimeString, endTimeString);
         } else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isBlank(endTimeString)) {
             // 如果只传了 startTime
             queryWrapper1.between("time", startTimeString, LocalDateTime.now().toString());
-        } else if (StringUtils.isNotBlank(endTimeString)  && StringUtils.isBlank(startTimeString)) {
+        } else if (StringUtils.isNotBlank(endTimeString) && StringUtils.isBlank(startTimeString)) {
             // 如果只传了 endTime
             queryWrapper1.le("time", endTimeString);
         } else {
@@ -88,14 +87,18 @@ public class SpRtu2017ServiceImpl extends AbstractCrudService<SpRtu2017Mapper, S
         return deviceStatusList1;
     }
 
-    public Map<String, Object> countDevice (String requestBody) {
+    public Long countDevice(String requestBody) {
         JSONObject requestVO = JSONObject.parseObject(requestBody);
         String companyCode = requestVO.get("companyCode").toString();
-        QueryWrapper<SpRtu2017> queryWrapper2 = Wrappers.query();
-        queryWrapper2.select("COUNT(DISTINCT  device_code)AS alarmDeviceCountRtu")
-                .inSql("device_code", "SELECT owner_code FROM sp_owner WHERE company = '" + companyCode + "'")
-                .groupBy("device_code");
-        Map<String, Object> deviceStatusMap = this.getMap(queryWrapper2);
-        return deviceStatusMap;
+
+        QueryWrapper<SpRtu2017> queryWrapper1 = Wrappers.query();
+        queryWrapper1.select("DISTINCT device_code")
+                .inSql("device_code", "SELECT device_code FROM yt_device_status WHERE company_code = '" + companyCode + "'");
+        List<SpRtu2017> SpRtu2017 = this.list(queryWrapper1);
+
+        Long deviceCount = Long.valueOf(SpRtu2017.size());
+
+        return deviceCount;
     }
+
 }

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/impl/SpSj2017ServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.common.core.exception.BusinessException;
+import com.usky.issue.domain.SpRtu2017;
 import com.usky.issue.domain.SpSj2017;
 import com.usky.issue.mapper.SpSj2017Mapper;
 import com.usky.issue.service.SpSj2017Service;
@@ -36,7 +37,7 @@ public class SpSj2017ServiceImpl extends AbstractCrudService<SpSj2017Mapper, SpS
         int startIndex = (currentPage - 1) * pageSize;
         QueryWrapper<SpSj2017> queryWrapper = Wrappers.query();
         queryWrapper.select("DATE_FORMAT(time, '%Y-%m-%d %H:%i:%s') AS alarm_time","data1 AS alarm_type","data4 AS alarm_point " ,"device_code")
-                .inSql("device_code", "SELECT owner_code FROM sp_owner WHERE company = '" + companyCode + "'");
+                .inSql("device_code", "SELECT owner_code FROM sp_owner WHERE company = '" + companyCode + "' AND dwtype IN (2,5)");
         if (StringUtils.isBlank(startTimeString) && StringUtils.isBlank(endTimeString)) {
 
         }else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isNotBlank(endTimeString)) {
@@ -64,7 +65,7 @@ public class SpSj2017ServiceImpl extends AbstractCrudService<SpSj2017Mapper, SpS
         String endTimeString = requestVO.get("endTime").toString();
         QueryWrapper<SpSj2017> queryWrapper1 = Wrappers.query();
         queryWrapper1.select("COUNT(CASE WHEN clzt = 0 THEN 1 ELSE NULL END) AS untreated", "COUNT(CASE WHEN clzt = 1 THEN 1 ELSE NULL END) AS processed")
-                .inSql("device_code", "SELECT owner_code FROM sp_owner WHERE company = '" + companyCode + "'");
+                .inSql("device_code", "SELECT owner_code FROM sp_owner WHERE company = '" + companyCode + "' AND dwtype IN (2,5)");
         if (StringUtils.isBlank(startTimeString) && StringUtils.isBlank(endTimeString)) {
 
         }else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isNotBlank(endTimeString)) {
@@ -82,13 +83,17 @@ public class SpSj2017ServiceImpl extends AbstractCrudService<SpSj2017Mapper, SpS
         List<Map<String, Object>> deviceStatusList1 = this.listMaps(queryWrapper1);
         return deviceStatusList1;
     }
-    public Map<String, Object> countDevice (String requestBody) {
+    public Long countDevice(String requestBody) {
         JSONObject requestVO = JSONObject.parseObject(requestBody);
         String companyCode = requestVO.get("companyCode").toString();
-        QueryWrapper<SpSj2017> queryWrapper2 = Wrappers.query();
-        queryWrapper2.select("COUNT(DISTINCT  device_code) AS alarmDeviceCountSj")
-                .inSql("device_code", "SELECT owner_code FROM sp_owner WHERE company = '" + companyCode + "'");
-        Map<String, Object> deviceStatusMap = this.getMap(queryWrapper2);
-        return deviceStatusMap;
+
+        QueryWrapper<SpSj2017> queryWrapper1 = Wrappers.query();
+        queryWrapper1.select("DISTINCT device_code")
+                .inSql("device_code", "SELECT device_code FROM yt_device_status WHERE company_code = '" + companyCode + "'");
+        List<SpSj2017> SpSj2017 = this.list(queryWrapper1);
+
+        Long deviceCount = Long.valueOf(SpSj2017.size());
+
+        return deviceCount;
     }
 }

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/impl/YtDeviceStatusServiceImpl.java

@@ -1,9 +1,7 @@
 package com.usky.issue.service.impl;
 
-
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.issue.domain.YtDeviceStatus;
@@ -92,33 +90,71 @@ public class YtDeviceStatusServiceImpl extends AbstractCrudService<YtDeviceStatu
     */
     @Override
     public List<Map<String, Object>> deviceList(String requestBody) {
-
         JSONObject requestVO = JSONObject.parseObject(requestBody);
         String companyCode = requestVO.get("companyCode").toString();
-        QueryWrapper<YtDeviceStatus> queryWrapper = Wrappers.query();
-        queryWrapper.select("device_type AS deviceType", "COUNT(*) AS deviceTypeCounts", "COUNT(difference < 48 OR " +
-                "NULL) AS onlineCount", "COUNT(difference >= 48 OR NULL) AS offlineCount")
-                .eq("company_code", companyCode)
-                .groupBy("device_type");
-        List<Map<String, Object>> deviceStatusList = this.listMaps(queryWrapper);;
-
-        if (deviceStatusList == null) {
+        QueryWrapper<YtDeviceStatus> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("device_type AS deviceType","COUNT(*) AS deviceTypeCounts",
+                    "COUNT(difference < 48 OR NULL) AS onlineCount",
+                    "COUNT(difference >= 48 OR NULL) AS offlineCount")
+                    .eq("company_code",companyCode)
+                    .groupBy("device_type");
+        List<Map<String, Object>> deviceStatusList = this.listMaps(queryWrapper);
+        if (deviceStatusList.size() == 0) {
             throw new BusinessException("暂无设备");
         }
-
-        Map<String, Object> mapHj = spHj2017Service.countDevice(requestBody);
-        Map<String, Object> mapSj = spSj2017Service.countDevice(requestBody);
-        Map<String, Object> mapRtu = spRtu2017Service.countDevice(requestBody);
-        Long countHj = mapHj != null ? (Long) mapHj.get("alarmDeviceCountHj") : 0;
-        Long countSj = mapSj != null ? (Long) mapSj.get("alarmDeviceCountSj") : 0;
-        Long countRtu = mapRtu != null ? (Long) mapRtu.get("alarmDeviceCountRtu") : 0;
-        Long totalCount = countHj + countSj + countRtu;
-
-/*        // 将相加后的值存入 deviceStatusList 中
-        Map<String, Object> totalMap = new HashMap<>();
-        totalMap.put("alarmDeviceSum", totalCount);
-        deviceStatusList.add(totalMap);*/
-
+        for (Map<String, Object> type : deviceStatusList) {
+            String dwtype = String.valueOf(type.get("deviceType"));
+            type.put("deviceType", dwtype);
+            switch (dwtype) {
+                case "火系统":
+                    // 1火系统
+                    Long countHj = (spHj2017Service.countDevice(requestBody)!= null)? spHj2017Service.countDevice(requestBody) : 0L;
+                    type.put("alarmDeviceSum", countHj);
+                    break;
+                case "水系统":
+                    // 2水系统
+                    Long countSj = (spSj2017Service.countDevice(requestBody) != null) ? spSj2017Service.countDevice(requestBody) : 0L;
+                    type.put("alarmDeviceSum", countSj);
+                    break;
+                case "烟感系统":
+                    // 3烟感系统
+                    break;
+                case "消防栓":
+                    // 4消防栓
+                    break;
+                case "液位":
+                    // 5液位
+                    Long countSjYw = (spSj2017Service.countDevice(requestBody) != null) ? spSj2017Service.countDevice(requestBody) : 0L;
+                    type.put("alarmDeviceSum", countSjYw);
+                    break;
+                case "rtu":
+                    // 6rtu
+                    Long countRtu = (spRtu2017Service.countDevice(requestBody) != null) ? spRtu2017Service.countDevice(requestBody) : 0L;
+                    type.put("alarmDeviceSum", countRtu);
+                    break;
+                case "电气火灾":
+                    // 7电气火灾
+                    break;
+                case "防火门":
+                    // 8防火门
+                    break;
+                case "气体灭火":
+                    // 9气体灭火
+                    break;
+                case "人脸识别":
+                    // 10人脸识别
+                    break;
+                case "视频监控":
+                    // 11视频监控
+                    break;
+                case "井盖":
+                    // 128井盖
+                    break;
+                default:
+                    // 处理未知类型
+                    break;
+            }
+        }
         return deviceStatusList;
     }
 

service-park/service-park-biz/src/main/java/com/usky/park/controller/web/DataStHistoryController.java

@@ -1,13 +1,15 @@
 package com.usky.park.controller.web;
 
 
+import com.alibaba.fastjson.JSONObject;
+import com.usky.common.core.bean.CommonPage;
 import com.usky.park.domain.DataStHistory;
-import com.usky.park.mapper.DataStHistoryMapper;
 import com.usky.park.service.DataStHistoryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -24,9 +26,6 @@ public class DataStHistoryController {
     @Autowired
     private DataStHistoryService dataStHistoryService;
 
-    @Autowired
-    private DataStHistoryMapper dataStHistoryMapper;
-
 
     /**
      * 新增
@@ -39,6 +38,17 @@ public class DataStHistoryController {
                     @RequestHeader("appKey") String appKey) {
         dataStHistoryService.add(dataStHistory, appKey);
     }
-
+    /**
+     * 分页查询
+     *
+     * @return
+     */
+    @PostMapping("/pageQuery")
+    public CommonPage<DataStHistory> pageQuery(@RequestBody String requestBody) {
+        JSONObject params = JSONObject.parseObject(requestBody);
+        Integer pageNum = (Integer) params.getOrDefault("pageNum", 1);
+        Integer pageSize = (Integer) params.getOrDefault("pageSize", 10);
+        return dataStHistoryService.pageList(pageNum, pageSize);
+    }
 }
 

service-park/service-park-biz/src/main/java/com/usky/park/service/DataStHistoryService.java

@@ -1,7 +1,9 @@
 package com.usky.park.service;
 
+import com.usky.common.core.bean.CommonPage;
 import com.usky.park.domain.DataStHistory;
 import com.usky.common.mybatis.core.CrudService;
+import com.usky.park.domain.EventEg;
 
 /**
  * <p>
@@ -13,4 +15,6 @@ import com.usky.common.mybatis.core.CrudService;
  */
 public interface DataStHistoryService extends CrudService<DataStHistory> {
     void add(DataStHistory dataStHistory,String appKey);
+
+    CommonPage<DataStHistory> pageList(Integer pageNum, Integer pageSize);
 }

service-park/service-park-biz/src/main/java/com/usky/park/service/impl/DataStHistoryServiceImpl.java

@@ -1,9 +1,18 @@
 package com.usky.park.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.CommonPage;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.park.domain.DataStHistory;
+import com.usky.park.domain.EventEg;
+import com.usky.common.security.utils.SecurityUtils;
 import com.usky.park.mapper.DataStHistoryMapper;
 import com.usky.park.service.DataStHistoryService;
 import com.usky.common.mybatis.core.AbstractCrudService;
@@ -12,6 +21,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 
+
 /**
  * <p>
  * 无人驿站历史数据 服务实现类
@@ -45,4 +55,14 @@ public class DataStHistoryServiceImpl extends AbstractCrudService<DataStHistoryM
 
         baseMapper.insert(dataStHistory);
     }
+
+    @Override
+    public CommonPage<DataStHistory> pageList(Integer pageNum, Integer pageSize){
+        IPage<DataStHistory> page = new Page<>(pageNum,pageSize);
+        LambdaQueryWrapper<DataStHistory> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(DataStHistory::getReceiverPhone,SecurityUtils.getLoginUser().getSysUser().getPhonenumber());
+        page = this.page(page,queryWrapper);
+        return new CommonPage<>(page.getRecords(),page.getTotal(),pageNum,pageSize);
+
+    }
 }