From 53e7dce8d55487cbac64e4374ec9aa1b52a6c6ed Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: Thu, 09 Mar 2023 21:16:43 +0800
Subject: [PATCH] 解决npe问题
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentRepairDetailServiceImpl.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentRepairDetailServiceImpl.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentRepairDetailServiceImpl.java
index 0ad98d8..a97665e 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentRepairDetailServiceImpl.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentRepairDetailServiceImpl.java
@@ -2,20 +2,19 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gkhy.safePlatform.equipment.repository.EquipmentRepairDetailRepository;
-import com.gkhy.safePlatform.equipment.entity.EquipmentRepairDetail;
-import com.gkhy.safePlatform.equipment.service.EquipmentRepairDetailService;
-import org.springframework.stereotype.Service;
-import org.springframework.beans.factory.annotation.Autowired;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
+import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
+import com.gkhy.safePlatform.equipment.entity.EquipmentRepairDetail;
import com.gkhy.safePlatform.equipment.model.dto.req.EquipmentRepairDetailQueryCriteria;
import com.gkhy.safePlatform.equipment.model.dto.resp.EquipmentRepairDetailDto;
+import com.gkhy.safePlatform.equipment.service.EquipmentRepairDetailService;
+import com.gkhy.safePlatform.equipment.service.baseService.EquipmentRepairDetailBaseService;
import com.gkhy.safePlatform.equipment.utils.QueryHelpPlus;
-import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
import java.util.List;
@@ -26,10 +25,10 @@
* @since 2022-07-19 15:10:57
*/
@Service("equipmentRepairDetailService")
-public class EquipmentRepairDetailServiceImpl extends ServiceImpl<EquipmentRepairDetailRepository, EquipmentRepairDetail> implements EquipmentRepairDetailService {
+public class EquipmentRepairDetailServiceImpl implements EquipmentRepairDetailService {
@Autowired
- private EquipmentRepairDetailRepository equipmentRepairDetailRepository;
+ private EquipmentRepairDetailBaseService equipmentRepairDetailBaseService;
@@ -39,14 +38,14 @@
Long pageSize = pageQuery.getPageSize();
IPage<EquipmentRepairDetail> page = new Page<>(pageIndex, pageSize);
- page = baseMapper.selectPage(page,
+ page = equipmentRepairDetailBaseService.selectPage(page,
QueryHelpPlus.getPredicate(EquipmentRepairDetail.class, pageQuery.getSearchParams()));
List<EquipmentRepairDetailDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), EquipmentRepairDetailDto.class);
return new SearchResultVO<>(
true,
pageIndex,
- pageSize,
+ pageSize,page.getPages(),
page.getTotal(),
respList,
ResultCodes.OK
@@ -56,6 +55,6 @@
@Override
public List<EquipmentRepairDetail> queryAll(EquipmentRepairDetailQueryCriteria criteria) {
- return baseMapper.selectList(QueryHelpPlus.getPredicate(EquipmentRepairDetail.class, criteria));
+ return equipmentRepairDetailBaseService.queryAll(criteria);
}
}
\ No newline at end of file
--
Gitblit v1.9.2