From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFaultDescribeDicServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFaultDescribeDicServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFaultDescribeDicServiceImpl.java
new file mode 100644
index 0000000..0f99d3e
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFaultDescribeDicServiceImpl.java
@@ -0,0 +1,51 @@
+package com.ruoyi.system.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.system.mapper.TFaultAreaDicMapper;
+import com.ruoyi.system.mapper.TFaultDescribeDicMapper;
+import com.ruoyi.system.model.TFaultAreaDic;
+import com.ruoyi.system.model.TFaultDescribeDic;
+import com.ruoyi.system.query.TFaultAreaDicQuery;
+import com.ruoyi.system.query.TFaultDescribeDicQuery;
+import com.ruoyi.system.service.TFaultDescribeDicService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.vo.TFaultDescribeDicVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 故障描述 服务实现类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-01-17
+ */
+@Service
+public class TFaultDescribeDicServiceImpl extends ServiceImpl<TFaultDescribeDicMapper, TFaultDescribeDic> implements TFaultDescribeDicService {
+
+ @Autowired
+ private TFaultAreaDicMapper faultAreaDicMapper;
+
+ @Override
+ public PageInfo<TFaultDescribeDicVO> pageList(TFaultDescribeDicQuery query) {
+ PageInfo<TFaultDescribeDicVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TFaultDescribeDicVO> list = this.baseMapper.pageList(query,pageInfo);
+ if(!CollectionUtils.isEmpty(list)){
+ List<String> areaIds = list.stream().map(TFaultDescribeDicVO::getFaultId).collect(Collectors.toList());
+ List<TFaultAreaDic> tFaultAreaDicList = faultAreaDicMapper.selectList(Wrappers.lambdaQuery(TFaultAreaDic.class)
+ .in(TFaultAreaDic::getId, areaIds));
+ for (TFaultDescribeDicVO tFaultDescribeDicVO : list) {
+ tFaultDescribeDicVO.setFaultAreaName(tFaultAreaDicList.stream().filter(t -> t.getId().equals(tFaultDescribeDicVO.getFaultId()))
+ .findFirst().orElse(new TFaultAreaDic()).getFaultAreaName());
+ }
+ }
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+}
--
Gitblit v1.7.1