合并developer代码解决冲突

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

@@ -208,5 +208,10 @@ public class FireEquipment implements Serializable {
     @ApiModelProperty(value = "所关联的设备信息")
     @TableField("fireequipmentinfo")
     private String fireequipmentinfo;
+    
+    
+    @ApiModelProperty(value = "二维码")
+    @TableField(exist = false)
+    private String qrCode;
 
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/CarController.java

@@ -1152,7 +1152,7 @@ public class CarController extends AbstractBaseController {
                             + "&productKey=" + prefix + "&deviceName=" + suffix,
                     HttpMethod.GET, httpEntity, FeignClientResult.class);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage());
         }
         if (null != feignClientResult && feignClientResult.getBody().getStatus() == 200) {
             return CommonResponseUtil.success(feignClientResult.getBody().getResult());
@@ -1160,7 +1160,6 @@ public class CarController extends AbstractBaseController {
             log.error("注：iotCode为 (" + iotCode + ") 的车辆不存在于物联系统或物联系统车辆历史轨迹接口出错！");
             return CommonResponseUtil.success();
         }
-
     }
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java

@@ -509,6 +509,7 @@ public class FireFightingSystemController extends AbstractBaseController {
         try {
             return CommonResponseUtil.success(fireFightingSystemService.update(vo));
         } catch (Exception e) {
+            log.error(e.getMessage(),e);
             return CommonResponseUtil.failure(e.getMessage());
         }
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java

@@ -839,8 +839,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
         if (!StringUtil.isNotEmpty(SystemTypeEnum.getEnum(systemCode))) {
             return null;
         }
-        Map<String, Object> data = null;
-
+        Map<String, Object> data;
         if (isUpdate) {
             data = saveIntegrationPageSysData(systemCode);
         } else {

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java

@@ -771,9 +771,13 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                         action.setStatus(AlarmStatusEnum.HF.getCode());
                     }
                     action.setUpdateDate(new Date());
-                    // 更新所在系统,设备可能编辑过
+                    // 更新所在系统,设备可能编辑过,更新所在系统、装备名称、装备定义code
                     action.setSystemIds(equipmentSpcIndex.getSystemId());
                     action.setSystemCodes(this.getSystemCodeBySpeId(equipmentSpcIndex.getSystemId()));
+                    action.setEquipmentSpecificName(equipmentSpcIndex.getEquipmentSpecificName());
+                    action.setEquipmentCode(equipmentSpcIndex.getEquipmentCode());
+                    // 冗余字段，alarm_log表更新时使用
+                    action.setCode(equipmentSpcIndex.getEquipmentSpecificCode());
                     equipmentSpecificAlarms.add(action);
                 });
             }

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

@@ -757,7 +757,8 @@
             NOW( ) AS updatedate,
             es.area_id AS areaid,
             ws.`name` AS buildname,
-            a.`name` AS workarea
+            a.`name` AS workarea,
+            es.qr_code as qrCode
         FROM
             wl_equipment_specific es
             LEFT JOIN wl_equipment_detail ed ON es.equipment_detail_id = ed.id

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

@@ -796,6 +796,7 @@
     <select id="getFireFightingSystemDetail"
             resultType="com.yeejoin.equipmanage.common.datasync.entity.FireFightingSystem">
         SELECT
+
         fs.id,
         f.`name` AS stationname,
         f.`code` AS stationcode,
@@ -803,7 +804,7 @@
         fs.`name` AS aliasname,
         fs.`code`,
         fg.group_name AS systemtype,
-        IFNULL(fs.install_date,'') AS installdate,
+        fs.install_date AS installdate,
         IFNULL(p.`name`,'') AS chargeperson,
         IFNULL(fs.charge_person_phone,'') AS chargepersonphone,
         IFNULL(mi.`name`,'') AS constructionunit,
@@ -823,8 +824,8 @@
         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}
+            <if test="fireFightingSystemVo != null and fireFightingSystemVo.id != null and fireFightingSystemVo.id !=''">
+                fs.id = #{fireFightingSystemVo.id}
             </if>
         </where>
     </select>
@@ -962,7 +963,7 @@
         from
         `wl_equipment_specific_index` si
         where
-        si.equipment_index_key = 'FAS_AirSampler_FireAlarm') as sgbjqnum,
+        si.equipment_index_key = 'FAS_SoundLightAlarm_FireAlarm') as sgbjqnum,
         (SELECT
             count(1)
         from