sql修改

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/mq/WebMqttSubscribe.java

@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.integration.annotation.IntegrationComponentScan;
 import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.integration.channel.DirectChannel;
@@ -47,7 +48,7 @@ public class WebMqttSubscribe {
 
     public MqttPahoMessageDrivenChannelAdapter adapter;
 
-    @Autowired
+    @Autowired @Lazy
     IEquipmentHandlerService equipmentHandlerService;
 
     @Bean

YeeAmosFireAutoSysStart/src/main/resources/application.properties

@@ -53,12 +53,10 @@ equipManage.fegin.isSyn=false
 #jpush 服务名称
 Push.fegin.name=APPMESSAGEPUSHSERVICE
 
-#值班系统服务名
-dutyMode.fegin.name=AMOSDUTYMODE
 
 spring.http.multipart.maxFileSize = 10480000
 spring.http.multipart.MaxRequestSize = 50480000
-windows.img.path = F:\\
+windows.img.path = E:\\
 linux.img.path = /
 
 param.safetyIndexChange.cron = 0 0 2 * * ?

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

@@ -1235,7 +1235,7 @@
 		-- 消防车
 		select
 		car.name ,
-		substr(cat.code ,1,4) as code,
+		car_num as code,
 		'fireEquipment' as typeCode,
 		car.org_code as orgCode,
 		#{riskSourceId} as riskSourceId
@@ -1247,7 +1247,7 @@
 		UNION all
 		select
 		vi.name,
-		'xfsp' as code,
+		vi.code as code,
 		'video' as typeCode,
 		vi.org_code as orgCode,
 		visou.source_id as risk_source_id
@@ -1260,7 +1260,7 @@
 		UNION all
 		select
 		bu.name,
-		substr(cat.code ,1,4) as code ,
+		bu.code as code ,
 		'fireEquipment' as typeCode,
 		bu.org_code as orgCode,
 		bu.region_id as risk_source_id
@@ -1272,7 +1272,7 @@
 		UNION all
 		select
 		det.name,
-		substr(cat.code ,1,4) as code,
+		spe.code as code,
 		'monitorEquipment' as typeCode,
 		spe.org_code as  orgCode,
 		str.source_id as risk_source_id
@@ -1291,7 +1291,7 @@
 		UNION all
 		select
 		det.name,
-		substr(cat.code ,1,4) as code,
+		spe.code as code,
 		'fireEquipment' as typeCode,
 		spe.org_code as  orgCode,
 		str.source_id as risk_source_id
@@ -1428,7 +1428,7 @@
 		e.risk_source_id as riskSourceId
 		from f_equipment e
 		UNION all
-		select concat('monitorEquipment-',m.id) as id,m.id as originId,det.name,substr(cat.code ,1,4),'' as ue4Location,'' as ue4Rotation ,'monitorEquipment' as type,m.org_code as orgCode,
+		select concat('monitorEquipment-',m.id) as id,m.id as originId,det.name,m.code as code,'' as ue4Location,'' as ue4Rotation ,'monitorEquipment' as type,m.org_code as orgCode,
 		null as level , concat('level_',null) as levelStr,null as isIndoor,'探测器' as typeName,'monitorEquipment' as typeCode,
 		CASE
 		WHEN (
@@ -1505,7 +1505,7 @@
 		left join f_risk_source as sou on sou.id = vis.source_id
 
 		UNION all
-		select concat('hydrant-',spe.id) as id,spe.id as originId,det.name,substr(cat.code ,1,4) as code,null as ue4Location,null as ue4Rotation ,'hydrant' as type,spe.org_code as orgCode,
+		select concat('hydrant-',spe.id) as id,spe.id as originId,det.name,spe.code as code,null as ue4Location,null as ue4Rotation ,'hydrant' as type,spe.org_code as orgCode,
 		0 as level , 'level_0' as levelStr,null as isIndoor,'消防栓' as typeName,'fireEquipment' as typeCode,
 		CASE
 		WHEN (
@@ -1609,7 +1609,7 @@
 		left join wl_equipment as equ on car.equipment_id = equ.id
 		left join wl_equipment_category as cat on equ.category_id = cat.id
 		UNION all
-		select concat('fireEquipment-',spe.id) as id,spe.id as originId,det.name,substr(cat.code ,1,4) as code,null as ue4Location,null as ue4Rotation,'fireEquipment' as type,spe.org_code as orgCode,
+		select concat('fireEquipment-',spe.id) as id,spe.id as originId,det.name,spe.code  as code,null as ue4Location,null as ue4Rotation,'fireEquipment' as type,spe.org_code as orgCode,
 		null as level , concat('level_',null) as levelStr,null as isIndoor,'灭火器' as typeName,'fireEquipment' as typeCode,
 		CASE
 		WHEN (