Merge remote-tracking branch 'origin/dexing' into dexing

# Conflicts:
#	eladmin-system/src/main/resources/config/application-dev.yml

eladmin-system/src/main/java/me/zhengjie/gemho/mapper/tab/DrybeachequipinforMapper.java

@@ -78,12 +78,22 @@ public interface DrybeachequipinforMapper extends BaseMapper<Drybeachequipinfor>
     @Select(value = "select equipno as id ,equipname as name from tb_drybeachequipinfor where tailingid =#{tailno} and equipname !='基准点'")
     List<HashMap<String, Object>> getDevice(String tailingid);
 
-    @Select(value = "<script>" +
-            "select equipno, equipname, onelevelalarm, twolevelalarm, threelevelalarm, fourlevelalarm,eqdanwei as unit from tb_drybeachequipinfor where tailingid = #{tailingid}" +
-            " <if test='searchValue!=\"\" and searchValue!=null '>\n" +
-            "            and equipname like CONCAT('%',#{searchValue},'%')\n" +
-            "        </if>" +
-            "</script>")
+    @Select({
+            "<script>",
+            "SELECT equipno, equipname, onelevelalarm, twolevelalarm, threelevelalarm, fourlevelalarm, eqdanwei AS unit",
+            "FROM tb_drybeachequipinfor",
+            "WHERE tailingid = #{tailingid}",
+            // 干滩设备只保留干滩1、干滩6、干滩11
+            "AND (",
+            "   equipname NOT LIKE '干滩%' OR",
+            "   equipname IN ('干滩1', '干滩6', '干滩11')",
+            ")",
+            // 动态搜索条件
+            "<if test='searchValue != null and searchValue != \"\"'>",
+            "  AND equipname LIKE CONCAT('%', #{searchValue}, '%')",
+            "</if>",
+            "</script>"
+    })
     Page<LevelVo> level(Page page, String tailingid, String searchName, String searchValue);
 
     int dealLevel(@Param(value = "equipno") String equipno, @Param(value = "onelevelalarm") String onelevelalarm, @Param(value = "twolevelalarm") String twolevelalarm, @Param(value = "threelevelalarm") String threelevelalarm, @Param(value = "fourlevelalarm") String fourlevelalarm);

eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/DbDataServiceImpl.java

@@ -287,6 +287,7 @@ public class DbDataServiceImpl extends ServiceImpl<DbDataMapper, DbData> impleme
         Page<DbData> dbDataPage = new Page<>(page + 1, size);
         dbDataPage = dbDataMapper.selectPage(dbDataPage, dbDataQueryWrapper);
         List<DbData> records = dbDataPage.getRecords();
+
         long total = dbDataPage.getTotal();
         //获取编码-名字map
         HashMap<String, String> noName = ServiceUtil.getNoName(request);
@@ -344,6 +345,7 @@ public class DbDataServiceImpl extends ServiceImpl<DbDataMapper, DbData> impleme
                 record.setDanwei(noDan.get(record.getSensorid()));
             }
         }
+
         map.put("list", records);
         map.put("total", total);
         return map;

pom.xml

@@ -24,6 +24,7 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.6.7</version>
+        <relativePath/>
     </parent>
 
     <properties>