item：数据同步属性非空修改

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/datasync/entity/FireEquipment.java

@@ -135,7 +135,7 @@ public class FireEquipment implements Serializable {
 
     @ApiModelProperty(value = "是否组合设备")
     @TableField("combinedequipment")
-    private String combinedequipment;
+    private Boolean combinedequipment = false;
 
     @ApiModelProperty(value = "出厂编号")
     @TableField("factorynumber")
@@ -167,7 +167,7 @@ public class FireEquipment implements Serializable {
 
     @ApiModelProperty(value = "重要性")
     @TableField("critical")
-    private String critical;
+    private Boolean critical = false;
 
     @ApiModelProperty(value = "电子地址")
     @TableField("electronicaddress")

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/CarPropertyVo.java

@@ -68,4 +68,10 @@ public class CarPropertyVo {
     @ApiModelProperty(value = "创建日期")
     private Date createDate;
 
+    /**
+     * 单位名称
+     */
+    @ApiModelProperty(value = "mRid")
+    private String mRid;
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/utils/SyncDataUtil.java

@@ -362,6 +362,7 @@ public class SyncDataUtil {
                     fireVehicleInfo.setUpdateDate(new Date());
                     fireVehicleInfo.setValue(i.getValue());
                     fireVehicleInfo.setAliasname(i.getName());
+                    fireVehicleInfo.setMrid(i.getMRid());
                     return fireVehicleInfo;
                 }
         ).collect(Collectors.toList());

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

@@ -22,16 +22,18 @@
         SELECT
         cp.id,
         cp.car_id,
-        ei.`name`,
+        IFNULL(ei.`name`,'') AS `name`,
         ei.name_key AS nameKey,
         cp.`value`,
         ei.unit,
         ei.is_iot AS isIot,
         ei.sort_num AS sort,
-        cp.create_date
+        cp.create_date ,
+        IFNULL(c.qr_code,'') AS mRid
         FROM
         wl_car_property cp
         LEFT JOIN wl_equipment_index ei ON ei.id = cp.equipment_index_id
+        LEFT JOIN wl_car c ON c.id = cp.car_id
         <where>
             <if test="id != null">
                 cp.car_id = #{id}

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

@@ -649,19 +649,19 @@
         si.id AS equipmentMeasurementId,
         ei.name_key AS fieldName,
         ei.`name` AS fieldLabel,
-        si.`value`,
+        IFNULL(si.`value`,'') AS `value`,
         sa.frequency,
         sa.`status`,
         sa.type,
-        es.CODE AS fireEquipmentMRid,
+        IFNULL(es.CODE,'') AS fireEquipmentMRid,
         NULL AS equipmentMeasurementMRid,
         ed.`name` AS fireEquipmentName,
         sa.recovery_date,
         sal.create_date,
         sal.update_date,
         sal.alarm_reason AS description,
-        sal.equipment_specific_name AS `name`,
-        sal.equipment_specific_code AS mrid
+        IFNULL(sal.equipment_specific_name,'') AS `name`,
+        IFNULL(sal.equipment_specific_code,'') AS mrid
         FROM
         wl_equipment_specific_alarm_log sal
         LEFT JOIN wl_equipment_specific_alarm sa ON sal.equipment_specific_alarm_id = sa.id

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

@@ -714,32 +714,32 @@
     <select id="getFireFightingSystemDetail"
             resultType="com.yeejoin.equipmanage.common.datasync.entity.FireFightingSystem">
         SELECT
-            fs.id,
-            f.`name` AS stationname,
-            f.`code` AS stationcode,
-            fs.`name`,
-            fs.`name` AS aliasname,
-            fs.`code`,
-            fg.group_name AS systemtype,
-            fs.install_date AS installdate,
-            p.`name` AS chargeperson,
-            fs.charge_person_phone AS chargepersonphone,
-            mi.`name` AS constructionunit,
-            mi1.`name` AS maintenanceunit,
-            fs.first_maintenance_date AS firstmaintenancedate,
-            fs.maintenance_frequency AS maintenancefrequency,
-            fs.maintenance_phone AS maintenancephone,
-            fs.rec_date AS createdate,
-            NOW( ) AS updatedate,
-            fs.`code` AS mrid,
-            fs.remark AS description
+        fs.id,
+        f.`name` AS stationname,
+        f.`code` AS stationcode,
+        fs.`name`,
+        fs.`name` AS aliasname,
+        fs.`code`,
+        fg.group_name AS systemtype,
+        IFNULL(fs.install_date,'') AS installdate,
+        IFNULL(p.`name`,'') AS chargeperson,
+        IFNULL(fs.charge_person_phone,'') AS chargepersonphone,
+        IFNULL(mi.`name`,'') AS constructionunit,
+        mi1.`name` AS maintenanceunit,
+        fs.first_maintenance_date AS firstmaintenancedate,
+        fs.maintenance_frequency AS maintenancefrequency,
+        fs.maintenance_phone AS maintenancephone,
+        fs.rec_date AS createdate,
+        NOW( ) AS updatedate,
+        fs.`code` AS mrid,
+        fs.remark AS description
         FROM
-            f_fire_fighting_system fs
-            LEFT JOIN wl_dynamic_form_group fg ON fg.relation_id = fs.system_type
-            LEFT JOIN wl_manufacturer_info mi ON mi.id = fs.construction_unit
-            LEFT JOIN wl_manufacturer_info mi1 ON mi1.id = fs.maintenance_unit
-            LEFT JOIN rpm_person p ON p.id = fs.charge_person,
-            f_station_info f
+        f_fire_fighting_system fs
+        LEFT JOIN wl_dynamic_form_group fg ON fg.relation_id = fs.system_type
+        LEFT JOIN wl_manufacturer_info mi ON mi.id = fs.construction_unit
+        LEFT JOIN wl_manufacturer_info mi1 ON mi1.id = fs.maintenance_unit
+        LEFT JOIN rpm_person p ON p.id = fs.charge_person,
+        f_station_info f
         <where>
             <if test="id != null and id !=''">
                 fs.id = #{id}