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

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

 package com.yeejoin.amos.fas.business.controller;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
+import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.component.robot.BadRequest;
 import com.yeejoin.amos.fas.business.util.ExcelUtils;
 import com.yeejoin.amos.fas.core.util.*;
@@ -139,6 +138,21 @@ public class EquipmentController extends BaseController {
         return CommonResponseUtil.success(list);
     }
 
+    /**
+     * 保护对象查询查询，不分页
+     * @return
+     */
+    @Permission
+    @ApiOperation(httpMethod = "GET", value = "保护对象查询不分页", notes = "保护对象查询不分页")
+    @RequestMapping(value = "/all-list-for-studio", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+    public ResponseModel queryImpEquipNoPageForStudio() {
+        List<Equipment> list = iEquipService.queryEquipNoPage();
+
+        List<Equipment> result = Objects.isNull(list) ? Collections.emptyList() : list;
+
+        return CommonResponseUtil2.success(result);
+    }
+
 
     /**
      * 绑定消防设备

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;
@@ -12,6 +14,8 @@ import com.yeejoin.amos.fas.core.common.request.CommonRequest;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil2;
+import com.yeejoin.amos.fas.core.util.ResponseModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -23,8 +27,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 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")
@@ -189,6 +195,37 @@ public class FireSourceController extends BaseController {
     }
 
     @Permission
+    @ApiOperation(httpMethod = "GET", value = "查询消防设备历史数据", notes = "查询消防设备历史数据")
+    @RequestMapping(value = "/data/history-for-studio", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+    public ResponseModel queryForFireEquipmentHistoryForStudio(
+            @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,
+            @ApiParam(value = "当前页码", required = false) @RequestParam(required = true) int pageNumber,
+            @ApiParam(value = "每页大小", required = false) @RequestParam(required = true) int pageSize) {
+        if (pageNumber >= 1) {
+            --pageNumber;
+        }
+        Page page;
+        try {
+            CommonPageable commonPageable = new CommonPageable(pageNumber, pageSize);
+            page = iFireEquipService.queryForFireEquipmentHistory(
+                    StringUtils.trimToNull(fireEquipmentName), StringUtils.trimToNull(equipmentName),
+                    StringUtils.trimToNull(startTime), StringUtils.trimToNull(endTime), commonPageable);
+        } catch (Exception e) {
+            return CommonResponseUtil2.failure(e.getMessage());
+        }
+
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<Object> objectPage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>();
+        objectPage.setCurrent(page.getNumber());
+        objectPage.setRecords(page.getContent());
+        objectPage.setTotal(page.getTotalElements());
+        objectPage.setPages(page.getTotalPages());
+        return CommonResponseUtil2.success(objectPage);
+    }
+
+    @Permission
     @ApiOperation(httpMethod = "GET", value = "查询消防设备列表", notes = "查询消防设备列表")
     @RequestMapping(value = "/info/page", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse queryForEquipmentList(

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

@@ -144,8 +144,11 @@
 	        <if test="equipmentName!=null">
 	            AND d.equipmentName LIKE '%${equipmentName}%'
 	        </if>
-	        <if test="startTime!=null">
-	            AND d.update_date  BETWEEN '${startTime}' AND '${endTime}'
+            <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,8 +199,11 @@
 	        <if test="equipmentName!=null">
 	            AND d.equipmentName LIKE '%${equipmentName}%'
 	        </if>
-	        <if test="startTime!=null">
-	            AND d.create_date BETWEEN '${startTime}' AND '${endTime}'
+            <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