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

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

@@ -195,6 +195,20 @@ public class FireSourceController extends BaseController {
     }
 
     @Permission
+    @ApiOperation(httpMethod = "GET", value = "中心级查询消防设备历史数据", notes = "中心级查询消防设备历史数据")
+    @RequestMapping(value = "/zxj/data/history", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+    public CommonResponse queryForZXJFireEquipmentHistory(
+            @ApiParam(value = "设备名称", required = false) @RequestParam(required = false) String fireEquipmentName,
+            @ApiParam(value = "开始日期", required = false) @RequestParam(required = false) String startTime,
+            @ApiParam(value = "结束日期", required = false) @RequestParam(required = false) String endTime, int pageNumber,
+            int pageSize) {
+
+        CommonPageable commonPageable = new CommonPageable(pageNumber, pageSize);
+        return CommonResponseUtil.success(iFireEquipService.queryForZXJFireEquipmentHistory(
+                StringUtils.trimToNull(fireEquipmentName), StringUtils.trimToNull(startTime), StringUtils.trimToNull(endTime), commonPageable));
+    }
+
+    @Permission
     @ApiOperation(httpMethod = "GET", value = "查询消防设备历史数据", notes = "查询消防设备历史数据")
     @RequestMapping(value = "/data/history-for-studio", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public ResponseModel queryForFireEquipmentHistoryForStudio(

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/FireEquipMapper.java

@@ -29,6 +29,19 @@ public interface FireEquipMapper extends BaseMapper {
                                            @Param("startTime") String startTime,
                                            @Param("endTime") String endTime);
 
+    long queryForZXJFireEquipmentHistoryCount(@Param("fireEquipmentName") String fireEquipmentName,
+                                           @Param("startTime") String startTime,
+                                           @Param("endTime") String endTime);
+
+    //查询 消防设备历史数据
+    List<Map> queryForZXJFireEquipmentHistory(
+            @Param("fireEquipmentName") String fireEquipmentName,
+            @Param("startTime") String startTime,
+            @Param("endTime") String endTime,
+            @Param("start") long start,
+            @Param("length") int length
+    );
+
     //查询 消防设备历史数据
     List<Map> queryForFireEquipmentHistory(
             @Param("fireEquipmentName") String fireEquipmentName,

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/FireEquipServiceImpl.java

@@ -106,6 +106,17 @@ public class FireEquipServiceImpl implements IFireEquipService {
         return result;
     }
 
+    public Page queryForZXJFireEquipmentHistory(String fireEquipmentName,
+                                             String startTime,
+                                             String endTime,
+                                             CommonPageable commonPageable) {
+
+        long total = fireEquipMapper.queryForZXJFireEquipmentHistoryCount(fireEquipmentName, startTime, endTime);
+        List<Map> content = fireEquipMapper.queryForZXJFireEquipmentHistory(fireEquipmentName, startTime, endTime, commonPageable.getOffset(), commonPageable.getPageSize());
+        Page result = new CommonPage(content, commonPageable, total);
+        return result;
+    }
+
 
     public Page queryForEquipmentList(String name, String code, String equipClassify, CommonPageable commonPageable, String bindStation) {
         long total = fireEquipMapper.queryForEquipmentPageCount(name, code, equipClassify, bindStation);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IFireEquipService.java

@@ -32,6 +32,11 @@ public interface IFireEquipService {
 												  String endTime,
 												  CommonPageable commonPageable);
 
+	Page queryForZXJFireEquipmentHistory(String fireEquipmentName,
+									  String startTime,
+									  String endTime,
+									  CommonPageable commonPageable);
+
 	Page queryForEquipmentList(String name, String code,String equipClassify,CommonPageable commonPageable,String bindStation);
 
 	//查询设备明细

YeeAmosFireAutoSysStart/src/main/resources/db/changelog/fas-2.0.1.xml

@@ -1009,11 +1009,13 @@
     </changeSet>
     <changeSet author="litengwei" id="20240425-1">
         <preConditions onFail="MARK_RAN">
+            <not>
                 <columnExists tableName="c_plan_classify_tree" columnName="plan_type" />
+            </not>
         </preConditions>
         <comment>c_plan_classify_tree</comment>
         <sql>
-            ALTER TABLE `c_plan_classify_tree` MODIFY COLUMN plan_type varchar(100) NULL COMMENT '分类TYPE';
+            ALTER TABLE `c_plan_classify_tree` ADD COLUMN plan_type varchar(100) NULL COMMENT '分类TYPE';
         </sql>
     </changeSet>
 </databaseChangeLog>
\ No newline at end of file

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

@@ -156,10 +156,19 @@
 
     <select id="queryForFireEquipmentHistory" resultType="map">
         SELECT
-        d.*
+            d.bizOrgName,
+            d.fireEquipmentCode,
+            d.fireEquipmentName,
+            d.eq_point_name,
+            d.e_value,
+            d.eq_point_unit,
+            d.source_name,
+            d.equipmentName,
+            d.create_date
         FROM
         (
         SELECT
+        spe.biz_org_name AS bizOrgName,
         det.`name` as fireEquipmentName,
         spe.`code` as fireEquipmentCode,
         ein.name as eq_point_name,
@@ -691,4 +700,88 @@
 		WHERE
 			wb.id = #{id}
     </select> -->
+    <select id="queryForZXJFireEquipmentHistoryCount" resultType="long">
+        SELECT
+            COUNT(1)
+        FROM
+        (
+            SELECT
+            spe.biz_org_name AS bizOrgName,
+            det.`name` as fireEquipmentName,
+            spe.`code` as fireEquipmentCode,
+            ein.name as eq_point_name,
+            CASE ind.value WHEN 'true' THEN '是'
+            WHEN 'false' THEN '否'
+            ELSE FORMAT(IFNULL(ind.value, 0), 2) END 'e_value',
+            ein.unit as eq_point_unit,
+            CONCAT(IFNULL(str.full_name,''),' ',IFNULL(sto.description,'')) as source_name,
+            ind.update_date as create_date
+            FROM
+            wl_equipment_specific_index as ind
+            left join wl_equipment_specific as spe on spe.id = ind.equipment_specific_id
+            left join wl_equipment_detail as det on spe.equipment_detail_id = det.id
+            left join wl_equipment_index as ein on ind.equipment_index_id = ein.id
+            left join wl_stock_detail as sto on  sto.equipment_specific_id = spe.id
+            left join wl_warehouse_structure as str on sto.warehouse_structure_id = str.source_id
+            WHERE det.`name` IS NOT NULL AND ind.`value` IS NOT NULL AND ind.`value` != '' AND ein.is_iot = 1
+        ) d
+        <where>
+            <if test="fireEquipmentName!=null">
+                AND d.fireEquipmentName LIKE '%${fireEquipmentName}%'
+            </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>
+    </select>
+
+    <select id="queryForZXJFireEquipmentHistory" resultType="map">
+        SELECT
+            d.bizOrgName,
+            d.fireEquipmentCode,
+            d.fireEquipmentName,
+            d.eq_point_name,
+            d.e_value,
+            d.eq_point_unit,
+            d.source_name,
+            d.create_date
+        FROM
+        (
+            SELECT
+            spe.biz_org_name AS bizOrgName,
+            det.`name` as fireEquipmentName,
+            spe.`code` as fireEquipmentCode,
+            ein.name as eq_point_name,
+            CASE ind.value WHEN 'true' THEN '是'
+            WHEN 'false' THEN '否'
+            ELSE FORMAT(IFNULL(ind.value, 0), 2) END 'e_value',
+            ein.unit as eq_point_unit,
+            CONCAT(IFNULL(str.full_name,''),' ',IFNULL(sto.description,'')) as source_name,
+            ind.update_date as create_date
+            FROM
+            wl_equipment_specific_index as ind
+            left join wl_equipment_specific as spe on spe.id = ind.equipment_specific_id
+            left join wl_equipment_detail as det on spe.equipment_detail_id = det.id
+            left join wl_equipment_index as ein on ind.equipment_index_id = ein.id
+            left join wl_stock_detail as sto on  sto.equipment_specific_id = spe.id
+            left join wl_warehouse_structure as str on sto.warehouse_structure_id = str.source_id
+            WHERE det.`name` IS NOT NULL AND ind.`value` IS NOT NULL AND ind.`value` != '' AND ein.is_iot = 1
+        ) d
+        <where>
+            <if test="fireEquipmentName!=null">
+                AND d.fireEquipmentName LIKE '%${fireEquipmentName}%'
+            </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}
+    </select>
 </mapper>
\ No newline at end of file