修改现场相关bug

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

@@ -215,7 +215,7 @@ public class FireSourceController extends BaseController {
                                                 @ApiParam(value = "设备编号", required = true) @RequestParam String type) throws Exception {
 
     	try{
-    		 return CommonResponseUtil.success(iFireEquipService.queryForDetail(type, Long.valueOf(StringUtil.isNotEmpty(id) ? id : "0")));
+    		 return CommonResponseUtil.success(iFireEquipService.queryForDetail(type, StringUtil.isNotEmpty(id) ? Long.valueOf(id) : null));
     	}catch (Exception e) {
 			log.error(e.getMessage(),e);
 			return CommonResponseUtil.failure("消防装备明细查询失败" + e.getMessage());

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

@@ -555,10 +555,11 @@
         LEFT JOIN wl_equipment equipment ON equipment.id = detail.equipment_id
         LEFT JOIN wl_unit unit ON equipment.unit_id = unit.id
         LEFT JOIN wl_warehouse_structure warehouse ON warehouse.id = sd.warehouse_structure_id
-        WHERE
-        <if test="id != null">
-            spec.id = #{id}
-        </if>
+        <where>
+            <if test="id != null">
+                spec.id = #{id}
+            </if>
+        </where>
     </select>
     <select id="findVideoById" resultType="com.yeejoin.amos.fas.dao.entity.FireEquipment">
         SELECT

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

@@ -1507,7 +1507,8 @@
 		left join wl_warehouse_structure as str on sto.warehouse_structure_id = str.id
 		left join f_equipment_fire_equipment fe on fe.fire_equipment_id = m.id
 		left join f_equipment f on f.id = fe.equipment_id
-		where   substr(cat.code ,1,4) = '8501'
+		-- 韶山现场问题查出结果缺失数据所以修改此处添加3101
+		where   substr(cat.code ,1,4) = '8501' OR substr( cat.CODE, 1, 4 ) = '3101'
 		<if test="protectObjName != null and protectObjName != ''">
 			AND f.name = #{protectObjName}
 		</if>