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

amos-boot-system-equip/src/main/resources/mapper/EquipmentIndexMapper.xml

@@ -17,7 +17,7 @@
 		    SELECT
 				wei.id AS id,
 				we.id AS equipDefId,
-				'' AS perfQuotaStr,
+				NULL AS perfQuotaStr,
 				wei.unit AS measureUnitName,
 				wei.name AS performanceIndexName,
 				'true' AS isImportentParameter 
@@ -29,10 +29,10 @@
 			UNION ALL
 			SELECT
 				equipment.id AS id,
-				'' AS perfQuotaDefinitionId,
+				NULL AS perfQuotaDefinitionId,
 				equipment.id AS equipDefId,
 				equipment.pref_quota AS perfQuotaStr,
-				'' AS measureUnitName,
+				NULL AS measureUnitName,
 				equipment.pref_quota AS performanceIndexName,
 				'false' AS isImportentParameter 
 			FROM
@@ -49,7 +49,7 @@
 		    SELECT
 				wei.id AS id,
 				we.id AS equipDefId,
-				'' AS perfQuotaStr,
+				NULL AS perfQuotaStr,
 				wei.unit AS measureUnitName,
 				wei.name AS performanceIndexName,
 				'true' AS isImportentParameter 
@@ -61,10 +61,10 @@
 			UNION ALL
 			SELECT
 				equipment.id AS id,
-				'' AS perfQuotaDefinitionId,
+				NULL AS perfQuotaDefinitionId,
 				equipment.id AS equipDefId,
 				equipment.pref_quota AS perfQuotaStr,
-				'' AS measureUnitName,
+				NULL AS measureUnitName,
 				equipment.pref_quota AS performanceIndexName,
 				'false' AS isImportentParameter 
 			FROM

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmLogMapper.xml

@@ -198,7 +198,7 @@
         sa.`status`,
         sa.type,
         IFNULL(es.code,'') AS fireEquipmentMRid,
-        '' AS equipmentMeasurementMRid,
+        NULL AS equipmentMeasurementMRid,
         ed.`name` AS fireEquipmentName,
         sa.recovery_date,
         sal.create_date,

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml

@@ -385,7 +385,7 @@
             WHERE
             fefe.fire_equipment_id = wlesal.equipment_specific_id
             )  页面未使用该字段返回值，不进行查询，该字段查询影响查询效率-->
-            '' AS equipmentName,
+            NULL AS equipmentName,
             wlesal.equipment_code AS equipmentCode
         FROM
             wl_equipment_specific_alarm_log wlesal

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml

@@ -199,7 +199,7 @@
 					SELECT
 						wc.id,
                         wc.iot_code AS iotCode,
-                        '' as ecode,
+                        NULL AS ecode,
                         'car' AS type,
                         wc.car_num AS `code`,
                          '' systemId,
@@ -861,8 +861,8 @@
 			ed.`code` AS categorycode,
             ( SELECT GROUP_CONCAT( url ) FROM wl_upload_file WHERE file_type = 'image' AND object_type = 'equipment' AND object_id = ed.id ) AS img,
             es.iot_code AS iotcode,
-            '' AS stationname,
-            '' AS stationcode,
+            NULL AS stationname,
+            NULL AS stationcode,
             ws.source_id AS buildid,
             es.system_id AS fightingsystemids,
             TRIM(CONCAT_WS(' ',ws.full_name,sd.description)) AS position,
@@ -1848,7 +1848,7 @@
             `si`.`equipment_index_key` AS `equipmentIndexKey`,
             (CASE si.`value` WHEN 'true' THEN '是' WHEN 'false' THEN '否' ELSE concat(si.`value`, IFNULL(wei.unit, '')) END) AS `value`,
 --             (CONCAT((SELECT field_value FROM wl_form_instance_equip fie WHERE fie.instance_id = s.id AND fie.field_name like 'min%'),'-',(SELECT field_value FROM wl_form_instance_equip fie WHERE fie.instance_id = s.id AND fie.field_name like 'max%'), IFNULL(wei.unit, ''))) AS standardValue,
-            '' AS standardValue,
+            NULL AS standardValue,
             si.update_date AS `time`,
             `si`.`equipment_index_name` AS `equipmentIndexName`,
             `s`.`code` AS `code`,
@@ -1905,7 +1905,7 @@
         END
         ) AS `value`,
         si.unit,
-        '' AS standardValue,
+        NULL AS standardValue,
         DATE_FORMAT(
         si.update_date,
         '%Y-%m-%d %H:%i:%s'

amos-boot-system-equip/src/main/resources/mapper/FaultCaseMapper.xml

@@ -30,7 +30,7 @@
     <select id="getFaultCaseList" resultType="Map">
         SELECT
             count(1) AS `value`,
-            '' AS unit,
+            NULL AS unit,
             wfc.system_name AS `name`,
             wfc.id AS `key`,
             wfc.system_id AS systemId,

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -296,9 +296,9 @@
         spe.iot_code as iotCode,
         equ.id as groupId,
         equ.name as groupName,
-        '' as ip,
-        '' as token,
-        '' as address
+        NULL AS ip,
+        NULL AS token,
+        NULL AS address
         from wl_stock_detail as det
         join wl_warehouse_structure as stru on det.warehouse_structure_id = stru.id
         join wl_equipment_specific as spe on det.qr_code = spe.qr_code
@@ -338,8 +338,8 @@
             vid.id AS equipId,
             vid.CODE AS categoryCode,
             vid.NAME AS equipName,
-            '' AS equipSyetemId,
-            '' AS iotCode,
+            NULL AS equipSyetemId,
+            NULL AS iotCode,
             '1000000000000000' AS groupId,
             '监控摄像' AS groupName,
             url AS ip,
@@ -384,9 +384,9 @@
         spe.iot_code as iotCode,
         equ.id as groupId,
         equ.name as groupName,
-        '' as ip,
-        '' as token,
-        '' as address
+        NULL AS ip,
+        NULL AS token,
+        NULL AS address
         from wl_stock_detail as det
         join wl_warehouse_structure as stru on det.warehouse_structure_id = stru.id
         join wl_equipment_specific as spe on det.qr_code = spe.qr_code
@@ -432,8 +432,8 @@
                     vid.id AS equipId,
                     vid.CODE AS categoryCode,
                     vid.NAME AS equipName,
-                    '' AS equipSyetemId,
-                    '' AS iotCode,
+                    NULL AS equipSyetemId,
+                    NULL AS iotCode,
                     '1000000000000000' AS groupId,
                     '监控摄像' AS groupName,
                     url AS ip,
@@ -504,8 +504,8 @@
             vid.id AS equipId,
             vid.type_code AS categoryCode,
             vid.NAME AS equipName,
-            '' AS equipSyetemId,
-            '' AS iotCode,
+            NULL AS equipSyetemId,
+            NULL AS iotCode,
             vid.type_code AS groupId,
             vid.type AS groupName
         FROM
@@ -524,8 +524,8 @@
             p.id AS equipId,
             '99999999' AS categoryCode,
             p.NAME AS equipName,
-            '' AS equipSyetemId,
-            '' AS iotCode,
+            NULL AS equipSyetemId,
+            NULL AS iotCode,
             '99999999' AS groupId,
             '巡检点' AS groupName
         FROM
@@ -935,7 +935,7 @@
             wlun.NAME unitName,
             NULL AS systemName,
             1 AS amount,
-            '' as stockDetailId,
+            NULL AS stockDetailId,
             'car' as type,
             wlai.`name` manufacturerName,
             wlc.car_num as code,
@@ -1886,7 +1886,7 @@
         wlun.NAME unitName,
         NULL AS systemName,
         1 AS amount,
-        '' as stockDetailId,
+        NULL AS stockDetailId,
         'car' as type,
         wlai.`name` manufacturerName,
         wlc.car_num as code,
@@ -1981,7 +1981,7 @@
         wlun.NAME unitName,
         NULL AS systemName,
         1 AS amount,
-        '' as stockDetailId,
+        NULL AS stockDetailId,
         'car' as type,
         wlai.`name` manufacturerName,
         wlc.car_num as code,

amos-boot-system-equip/src/main/resources/mapper/MaintenanceResourceDataMapper.xml

@@ -258,7 +258,7 @@
                 m.fire_fight_sys_id,
             </when>
             <otherwise>
-                '' as fire_fight_sys_id,
+                NULL AS fire_fight_sys_id,
             </otherwise>
         </choose>
 

amos-boot-system-equip/src/main/resources/mapper/VideoMapper.xml

@@ -612,7 +612,7 @@
         v.CODE AS CODE,
         v.address,
         v.longitude,
-        '' as distance,
+        NULL AS distance,
         v.latitude
         FROM wl_video v
         JOIN wl_video_source vc ON vc.video_id = v.id
@@ -702,7 +702,7 @@
         v.CODE AS CODE,
         v.address,
         v.longitude,
-        '' as distance,
+        NULL AS distance,
         v.latitude
         FROM wl_video v
         JOIN wl_video_source vc ON vc.video_id = v.id