fix:修复小程序搜索功能失效bug

fix:修复小程序搜索后设备统计不正确bug

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/app/controller/AppController.java

@@ -60,10 +60,10 @@ public class AppController {
     @Deprecated
     public CommonResult<Page<AppDevice>> deviceSearchPage(AppDevicePageParam appDevicePageParam) {
         // 关键字为空，调用原来的接口
-        if (StrUtil.isBlank(appDevicePageParam.getSearchKey())) {
-            return devicePage(appDevicePageParam);
-        }
-        return CommonResult.data(appDeviceService.pageSearchDevices(appDevicePageParam));
+//        if (StrUtil.isBlank(appDevicePageParam.getSearchKey())) {
+//            return devicePage(appDevicePageParam);
+//        }
+        return CommonResult.data(appDeviceService.pageDevices(appDevicePageParam));
     }
 
     /**

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/mapper/mapping/MonitorTargetMapper.xml

@@ -12,7 +12,7 @@
         FROM monitor_target t
         LEFT JOIN monitor_target_region r ON r.monitor_target_id = t.id
         WHERE t.DELETE_FLAG = 'NOT_DELETE'
-        AND r.DELETE_FLAG = 'NOT_DELETE'
+--         AND r.DELETE_FLAG = 'NOT_DELETE'
 <!--        &lt;!&ndash; 动态条件：仅在 r 存在时检查 r 的 DELETE_FLAG &ndash;&gt;-->
 <!--        AND (r.DELETE_FLAG = 'NOT_DELETE' OR r.id IS NULL)-->
         <!-- 动态条件：按房间ID查询 -->
@@ -47,17 +47,16 @@
         FROM monitor_target t
         LEFT JOIN monitor_target_region r ON r.monitor_target_id = t.id
         WHERE t.DELETE_FLAG = 'NOT_DELETE'
-        AND r.DELETE_FLAG = 'NOT_DELETE'
         <!-- 动态条件：按名称或 sensor_code 或 name 模糊查询 -->
         <if test="param.type != null and param.type.trim() != ''">
-            <if test="param.name != null and param.name.trim() != '' and searchFlag == null">
+            <if test="param.searchKey != null and param.searchKey.trim() != '' and searchFlag == 'false'">
                 AND (
-                t.name LIKE CONCAT('%', #{param.name}, '%')
-                OR r.name LIKE CONCAT('%', #{param.name}, '%')
+                t.name LIKE CONCAT('%', #{param.searchKey}, '%')
+                OR r.name LIKE CONCAT('%', #{param.searchKey}, '%')
                 )
             </if>
-            <if test="param.name != null and param.name.trim() != '' and searchFlag != null">
-                AND  r.sensor_code LIKE CONCAT('%', #{param.name}, '%')
+            <if test="param.searchKey != null and param.searchKey.trim() != '' and searchFlag == 'true'">
+                AND  r.sensor_code LIKE CONCAT('%', #{param.searchKey}, '%')
             </if>
         </if>
         <!-- 动态条件：按创建用户查询 -->

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/service/impl/MonitorTargetServiceImpl.java

@@ -250,7 +250,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
         Page<MonitorTarget> page = new Page<>(monitorTargetPageParam.getCurrent(), monitorTargetPageParam.getSize());
         Page<MonitorTarget> monitorTargetPage;
         if (StrUtil.isNotBlank(monitorTargetPageParam.getType()) && monitorTargetPageParam.getType().equals("1")) {
-            monitorTargetPage = (Page<MonitorTarget>) monitorTargetMapper.selectMonitorTargetByPage(page, monitorTargetPageParam, null);
+            monitorTargetPage = (Page<MonitorTarget>) monitorTargetMapper.selectMonitorTargetByPage(page, monitorTargetPageParam, "false");
         } else {
             monitorTargetPage = (Page<MonitorTarget>) monitorTargetMapper.selectMonitorTargetByPage(page, monitorTargetPageParam, "true");
         }

snowy-web-app/src/main/resources/application.properties

@@ -39,8 +39,9 @@ spring.data.influxdb.url=${INFLUXDB_URL:http://jfcloud-k6-influxdb:8086}
 ## 10.0.1.200
 #spring.data.influxdb.token=${INFLUXDB_TOKEN:1NdDyN3LCKIEBFkQ1AqAmRSitZGfdCs0nuF11nLQbTcnN_5mp_asnfFnmAXTvDDQXGr83llxuXJu5wNTPtrsIw==}
 # \u516C\u7F51\u7684
-#spring.data.influxdb.token=${INFLUXDB_TOKEN:g2gXWbSJar3fmUKFkv4SVtTzPE-rX0-6aW5bDwgNOZXsD3tWL2PgAcCneH5WYcE9OmrMvLbvR-TMZrtX2d8ihQ==}
-spring.data.influxdb.token=${INFLUXDB_TOKEN:6mBMH_7mHmJlenBRJbuStVoV0VQ1Fo4-b_P9TQZcEIleClqmfKg6NySY4opsbHf5saEvzOgkEIIM6Zi1xJmL4w==}
+spring.data.influxdb.token=${INFLUXDB_TOKEN:g2gXWbSJar3fmUKFkv4SVtTzPE-rX0-6aW5bDwgNOZXsD3tWL2PgAcCneH5WYcE9OmrMvLbvR-TMZrtX2d8ihQ==}
+# \u4E2D\u5357\u7684
+#spring.data.influxdb.token=${INFLUXDB_TOKEN:4ibpm6V1YF0HGuEQymw4_sOnQhwIHnT7hlvGxRzKHsxOw1WnCgHEksqI2JF23RfvSME6M9ILS6Nvx81Lu-aG2Q==}
 spring.data.influxdb.org=${INFLUXDB_ORG:coldchain}
 spring.data.influxdb.bucket=${INFLUXDB_BUCKET:coldchain}