修改物联监控日志

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

@@ -194,7 +194,7 @@ public class FireSourceController extends BaseController {
                 StringUtils.trimToNull(startTime), StringUtils.trimToNull(endTime), commonPageable));
     }
 
-    @Permission
+//    @Permission
     @ApiOperation(httpMethod = "GET", value = "中心级查询消防设备历史数据", notes = "中心级查询消防设备历史数据")
     @RequestMapping(value = "/zxj/data/history", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse queryForZXJFireEquipmentHistory(

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

@@ -712,12 +712,13 @@
         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_index as ein on ind.equipment_index_id = ein.id
         left join wl_equipment_detail as det on spe.equipment_detail_id = det.id
-        WHERE ind.`value` IS NOT NULL AND ind.`value` != ''
+        WHERE ind.`value` IS NOT NULL AND ind.`value` != '' AND ein.is_iot = 1
         ) d
         <where>
             <if test="fireEquipmentName!=null">
-                AND d.fireEquipmentName LIKE '%#{fireEquipmentName}%'
+                AND d.fireEquipmentName LIKE concat('%', #{fireEquipmentName}, '%')
             </if>
             <if test="startTime != null and startTime != ''">
                 AND d.update_date &gt;= #{startTime}