From 020a201381f9d80671d72732edc21abdfc520b4d Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Tue, 17 Aug 2021 11:23:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datareal/impl/DataRealServiceImpl.java    | 75 ++++++++++---------
 .../mapper/datareal/datareal-mapper.xml       |  6 --
 .../resources/templates/datareal/list.html    |  2 +-
 3 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/src/main/java/com/cm/tenlion/pollutantdata/service/datareal/impl/DataRealServiceImpl.java b/src/main/java/com/cm/tenlion/pollutantdata/service/datareal/impl/DataRealServiceImpl.java
index ac01b7c..cbd2535 100644
--- a/src/main/java/com/cm/tenlion/pollutantdata/service/datareal/impl/DataRealServiceImpl.java
+++ b/src/main/java/com/cm/tenlion/pollutantdata/service/datareal/impl/DataRealServiceImpl.java
@@ -158,41 +158,7 @@ public class DataRealServiceImpl extends AbstractService implements IDataRealSer
     @Override
     public List<DataRealDTO> list(Map<String, Object> params) {
         List<DataRealDTO> dataRealDTOs = dataMinuteDao.list(params);
-
-        Set<String> enterpriseIdSet = new HashSet<>();
-        Set<String> instrumentIdSet = new HashSet<>();
-
-        for (DataRealDTO dataRealDTO : dataRealDTOs) {
-            enterpriseIdSet.add(dataRealDTO.getEnterpriseId());
-            instrumentIdSet.add(dataRealDTO.getInstrumentId());
-        }
-
-        List<EnterprisePO> enterprisePOs = enterpriseService.listPO(new ArrayList<>(enterpriseIdSet));
-        List<InstrumentPO> instrumentPOs = instrumentService.listPO(new ArrayList<>(instrumentIdSet));
-        List<PollPO> pollPOs = pollService.listPO(new HashMap<>());
-
-        for (DataRealDTO dataRealDTO : dataRealDTOs) {
-            for (EnterprisePO enterprisePO : enterprisePOs) {
-                if (StringUtils.equals(dataRealDTO.getEnterpriseId(), enterprisePO.getEnterpriseId())) {
-                    dataRealDTO.setEnterpriseName(enterprisePO.getEnterpriseName());
-                    break;
-                }
-            }
-            for (InstrumentPO instrumentPO : instrumentPOs) {
-                if (StringUtils.equals(dataRealDTO.getInstrumentId(), instrumentPO.getInstrumentId())) {
-                    dataRealDTO.setInstrumentName(instrumentPO.getInstrumentName());
-                    break;
-                }
-            }
-            for (PollPO pollPO : pollPOs) {
-                if (StringUtils.equals(dataRealDTO.getPollId(), pollPO.getPollNo()) ||
-                        StringUtils.equals(dataRealDTO.getPollId(), pollPO.getPollNoOld())) {
-                    dataRealDTO.setPollName(pollPO.getPollName());
-                    break;
-                }
-            }
-        }
-
+        setDataRealInfo(dataRealDTOs);
         return dataRealDTOs;
     }
 
@@ -300,4 +266,43 @@ public class DataRealServiceImpl extends AbstractService implements IDataRealSer
         return listLastData;
     }
 
+    private void setDataRealInfo(List<DataRealDTO> dataRealDTOs) {
+        if (dataRealDTOs.isEmpty()) {
+            return;
+        }
+        Set<String> enterpriseIdSet = new HashSet<>();
+        Set<String> instrumentIdSet = new HashSet<>();
+
+        for (DataRealDTO dataRealDTO : dataRealDTOs) {
+            enterpriseIdSet.add(dataRealDTO.getEnterpriseId());
+            instrumentIdSet.add(dataRealDTO.getInstrumentId());
+        }
+
+        List<EnterprisePO> enterprisePOs = enterpriseService.listPO(new ArrayList<>(enterpriseIdSet));
+        List<InstrumentPO> instrumentPOs = instrumentService.listPO(new ArrayList<>(instrumentIdSet));
+        List<PollPO> pollPOs = pollService.listPO(new HashMap<>());
+
+        for (DataRealDTO dataRealDTO : dataRealDTOs) {
+            for (EnterprisePO enterprisePO : enterprisePOs) {
+                if (StringUtils.equals(dataRealDTO.getEnterpriseId(), enterprisePO.getEnterpriseId())) {
+                    dataRealDTO.setEnterpriseName(enterprisePO.getEnterpriseName());
+                    break;
+                }
+            }
+            for (InstrumentPO instrumentPO : instrumentPOs) {
+                if (StringUtils.equals(dataRealDTO.getInstrumentId(), instrumentPO.getInstrumentId())) {
+                    dataRealDTO.setInstrumentName(instrumentPO.getInstrumentName());
+                    break;
+                }
+            }
+            for (PollPO pollPO : pollPOs) {
+                if (StringUtils.equals(dataRealDTO.getPollId(), pollPO.getPollNo()) ||
+                        StringUtils.equals(dataRealDTO.getPollId(), pollPO.getPollNoOld())) {
+                    dataRealDTO.setPollName(pollPO.getPollName());
+                    break;
+                }
+            }
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/resources/mybatis/mapper/datareal/datareal-mapper.xml b/src/main/resources/mybatis/mapper/datareal/datareal-mapper.xml
index 4b7163e..f7ed8e6 100644
--- a/src/main/resources/mybatis/mapper/datareal/datareal-mapper.xml
+++ b/src/main/resources/mybatis/mapper/datareal/datareal-mapper.xml
@@ -263,12 +263,6 @@
         <if test="keywords != null and keywords != ''">
         AND (
             t1.poll_id LIKE CONCAT('%', #{keywords}, '%')
-            OR
-            jt1.enterprise_name LIKE CONCAT('%', #{keywords}, '%')
-            OR
-            jt2.instrument_name LIKE CONCAT('%', #{keywords}, '%')
-            OR
-            jt3.poll_name LIKE CONCAT('%', #{keywords}, '%')
         )
         </if>
         <if test="startTime != null and startTime != ''">
diff --git a/src/main/resources/templates/datareal/list.html b/src/main/resources/templates/datareal/list.html
index 5035d60..f0c460d 100644
--- a/src/main/resources/templates/datareal/list.html
+++ b/src/main/resources/templates/datareal/list.html
@@ -18,7 +18,7 @@
                 <div class="layui-card-body">
                     <div class="test-table-reload-btn" style="margin-bottom: 10px;">
                         <div class="layui-inline">
-                            <input type="text" id="keywords" class="layui-input search-item search-item-width-100" placeholder="输入关键字">
+                            <input type="text" id="keywords" class="layui-input search-item search-item-width-200" placeholder="输入污染物因子编码">
                         </div>
                         <div class="layui-inline">
                             <input type="text" id="startTime" class="layui-input search-item search-item-width-100" placeholder="开始时间" readonly>