fix: 物联日志接口SQL问题处理

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/FireSourceController.java

 package com.yeejoin.amos.fas.business.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import com.yeejoin.amos.fas.business.service.intfc.IEquipmentService;
 import com.yeejoin.amos.fas.business.service.intfc.IFireCarService;
@@ -29,6 +30,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping(value = "/api/fireSource")
@@ -199,8 +201,9 @@ public class FireSourceController extends BaseController {
             @ApiParam(value = "设备名称", required = false) @RequestParam(required = false) String fireEquipmentName,
             @ApiParam(value = "按保护对象名称", required = false) @RequestParam(required = false) String equipmentName,
             @ApiParam(value = "开始日期", required = false) @RequestParam(required = false) String startTime,
-            @ApiParam(value = "结束日期", required = false) @RequestParam(required = false) String endTime, int pageNumber,
-            int pageSize) {
+            @ApiParam(value = "结束日期", required = false) @RequestParam(required = false) String endTime,
+            @ApiParam(value = "当前页码", required = false) @RequestParam(required = true) int pageNumber,
+            @ApiParam(value = "每页大小", required = false) @RequestParam(required = true) int pageSize) {
         if (pageNumber >= 1) {
             --pageNumber;
         }

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_fire_equip.xml

@@ -144,9 +144,12 @@
 	        <if test="equipmentName!=null">
 	            AND d.equipmentName LIKE '%${equipmentName}%'
 	        </if>
-	        <if test="startTime!=null">
-	            AND d.update_date  BETWEEN '${startTime}' AND '${endTime}'
-	        </if>
+            <if test="startTime != null and startTime != ''">
+                AND d.update_date &gt;= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND d.update_date &lt;= #{endTime}
+            </if>
         </where>
     </select>
 
@@ -196,9 +199,12 @@
 	        <if test="equipmentName!=null">
 	            AND d.equipmentName LIKE '%${equipmentName}%'
 	        </if>
-	        <if test="startTime!=null">
-	            AND d.create_date BETWEEN '${startTime}' AND '${endTime}'
-	        </if>
+            <if test="startTime != null and startTime != ''">
+                AND d.create_date &gt;= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND d.create_date &lt;= #{endTime}
+             </if>
       </where>
         ORDER BY d.create_date desc
         LIMIT ${start},${length}
@@ -289,8 +295,8 @@
 <!--				AND se.fire_equipment_id = fe.id-->
 <!--			)-->
 <!--	</select>-->
-	
-	
+
+
 
 <!--    <select id="findEquipDetailsById" resultType="com.yeejoin.amos.fas.core.common.response.EquipDetailsResponse">-->
 <!--        SELECT-->
@@ -306,7 +312,7 @@
 <!--        <if test="id!=null">AND eq.id = #{id}</if>-->
 <!--        </where>-->
 <!--    </select>-->
- 
+
     <select id="queryStorageEquips" resultType="map">
         SELECT
         wed.id,
@@ -554,7 +560,7 @@
         detail.creator_id AS create_by,
         spec.create_date AS create_date,
         (
-			CASE 
+			CASE
 			WHEN (
 				SELECT
 					count(1)
@@ -632,9 +638,9 @@
             video.id = #{id}
         </if>
        </where>
-       
+
     </select>
-    
+
 <!--    <select id="findFireStationById" resultType="com.yeejoin.amos.fas.dao.entity.FireStation">-->
 <!--        SELECT-->
 <!--            *-->