Merge branch 'developer' into develop_ccs

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

@@ -76,6 +76,10 @@ public class FireEquipment implements Serializable {
     @ApiModelProperty(value = "所属区域")
     @TableField("workarea")
     private String workArea;
+    
+    @ApiModelProperty(value = "所属区域id")
+    @TableField("areaid")
+    private String areaid;
 
     @ApiModelProperty(value = "所在建筑ID")
     @TableField("buildid")
@@ -87,23 +91,23 @@ public class FireEquipment implements Serializable {
 
     @ApiModelProperty(value = "所属消防系统Ids")
     @TableField("fightingsystemids")
-    private String fightingSystemIds;
+    private String fightingSystemIds = "";
 
     @ApiModelProperty(value = "位置")
     @TableField("position")
-    private String position;
+    private String position = "";
 
     @ApiModelProperty(value = "使用日期")
     @TableField("inusedate")
-    private LocalDateTime inUseDate;
+    private LocalDateTime inUseDate ;
 
     @ApiModelProperty(value = "状态")
     @TableField("status")
-    private String status;
+    private String status = "正常";
 
     @ApiModelProperty(value = "使用状态")
     @TableField("inusestate")
-    private String inUseState;
+    private String inUseState= "在位";
 
     @ApiModelProperty(value = "创建时间")
     @TableField("createdate")
@@ -115,23 +119,23 @@ public class FireEquipment implements Serializable {
 
     @ApiModelProperty(value = "别名")
     @TableField("aliasname")
-    private String aliasname;
+    private String aliasname = "";
 
     @ApiModelProperty(value = "描述")
     @TableField("description")
-    private String description;
+    private String description = "";
 
     @ApiModelProperty(value = "辅助监控设备类型")
     @TableField("kind")
-    private String kind;
+    private String kind = "";
 
     @ApiModelProperty(value = "资产性质")
     @TableField("assetsnature")
-    private String assetsnature;
+    private String assetsnature = "";
 
     @ApiModelProperty(value = "设备来源种类")
     @TableField("assetsource")
-    private String assetsource;
+    private String assetsource = "";
 
     @ApiModelProperty(value = "是否组合设备")
     @TableField("combinedequipment")
@@ -139,15 +143,15 @@ public class FireEquipment implements Serializable {
 
     @ApiModelProperty(value = "出厂编号")
     @TableField("factorynumber")
-    private String factorynumber;
+    private String factorynumber = "";
 
     @ApiModelProperty(value = "制造国家")
     @TableField("manufacturecountry")
-    private String manufacturecountry;
+    private String manufacturecountry = "";
 
     @ApiModelProperty(value = "经营方式")
     @TableField("operationmodel")
-    private String operationmodel;
+    private String operationmodel = "";
 
     @ApiModelProperty(value = "运行编号")
     @TableField("operationno")
@@ -155,11 +159,11 @@ public class FireEquipment implements Serializable {
 
     @ApiModelProperty(value = "验收测试的信息")
     @TableField("acceptancetest")
-    private String acceptancetest;
+    private String acceptancetest = "";
 
     @ApiModelProperty(value = "基线状态")
     @TableField("baselinecondition")
-    private String baselinecondition;
+    private String baselinecondition = "";
 
     @ApiModelProperty(value = "基线生命损耗")
     @TableField("baselinelossoflife")
@@ -175,39 +179,39 @@ public class FireEquipment implements Serializable {
 
     @ApiModelProperty(value = "资产生命周期日期")
     @TableField("lifecycledate")
-    private String lifecycledate;
+    private String lifecycledate = "";
 
     @ApiModelProperty(value = "资产生命周期状态")
     @TableField("lifecyclestate")
-    private String lifecyclestate;
+    private String lifecyclestate = "";
 
     @ApiModelProperty(value = "批号")
     @TableField("lotnumber")
-    private String lotnumber;
+    private String lotnumber = "";
 
     @ApiModelProperty(value = "采购价格")
     @TableField("purchaseprice")
-    private String purchaseprice;
+    private String purchaseprice = "";
 
     @ApiModelProperty(value = "退役原因")
     @TableField("retiredreason")
-    private String retiredreason;
+    private String retiredreason = "";
 
     @ApiModelProperty(value = "编号")
     @TableField("serialnumber")
-    private String serialnumber;
+    private String serialnumber = "";
 
     @ApiModelProperty(value = "类型")
     @TableField("type")
-    private String type;
+    private String type = "";
 
     @ApiModelProperty(value = "UTC编号")
     @TableField("utcnumber")
-    private String utcnumber;
+    private String utcnumber = "";
 
     @ApiModelProperty(value = "所关联的设备信息")
     @TableField("fireequipmentinfo")
-    private String fireequipmentinfo;
+    private String fireequipmentinfo = "";
     
     
     @ApiModelProperty(value = "二维码")

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

@@ -935,14 +935,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
         int res = this.baseMapper.deleteById(id);
         if (res > 0 && syncSwitch) {
             //数据同步
-            syncDataService.syncDeletedEquipmentSpecific(Arrays.asList(id));
-            List<EquipmentIndexVO> indexBySpecificIdIn = equipmentSpecificIndexSerivce.getEquipIndexBySpecificIdIn(Arrays.asList(String.valueOf(id)));
-            if (!indexBySpecificIdIn.isEmpty()) {
-                List<Long> fireEquipmentInfoCollect = indexBySpecificIdIn.stream().filter(vo -> 0 == vo.getIsIot()).map(EquipmentIndexVO::getId).collect(Collectors.toList());
-                List<Long> fireEquipMeasurementCollect = indexBySpecificIdIn.stream().filter(vo -> 1 == vo.getIsIot()).map(EquipmentIndexVO::getId).collect(Collectors.toList());
-                syncDataService.syncDeletedEquipmentSpecificInfo(fireEquipmentInfoCollect);
-                syncDataService.syncDeletedFireEquipMeasurement(fireEquipMeasurementCollect);
-            }
+        	delEquipmentSpecificSyncData(id);
         }
         //判断装备表剩余数量，无剩余删除模板
         QueryWrapper<EquipmentSpecific> wrapper = new QueryWrapper<>();
@@ -993,6 +986,18 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
         }
     }
 
+    
+    public void delEquipmentSpecificSyncData(Long id){
+    	 //数据同步
+        syncDataService.syncDeletedEquipmentSpecific(Arrays.asList(id));
+        List<EquipmentIndexVO> indexBySpecificIdIn = equipmentSpecificIndexSerivce.getEquipIndexBySpecificIdIn(Arrays.asList(String.valueOf(id)));
+        if (!indexBySpecificIdIn.isEmpty()) {
+            List<Long> fireEquipmentInfoCollect = indexBySpecificIdIn.stream().filter(vo -> 0 == vo.getIsIot()).map(EquipmentIndexVO::getId).collect(Collectors.toList());
+            List<Long> fireEquipMeasurementCollect = indexBySpecificIdIn.stream().filter(vo -> 1 == vo.getIsIot()).map(EquipmentIndexVO::getId).collect(Collectors.toList());
+            syncDataService.syncDeletedEquipmentSpecificInfo(fireEquipmentInfoCollect);
+            syncDataService.syncDeletedFireEquipMeasurement(fireEquipMeasurementCollect);
+        }
+    }
     @Override
     public Object getOneCard(Long id, String type) {
         if (BitmapEnum.video.getKey().equals(type)) {
@@ -1523,6 +1528,11 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             // 已入库
             this.baseMapper.deleteEquipDataByStockDetailId(stockDetail.getId(), specificId);
         }
+        
+        if (syncSwitch) {
+            //数据同步
+        	delEquipmentSpecificSyncData(specificId);
+        }
 
         return Boolean.TRUE;
     }

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

@@ -305,7 +305,7 @@ public class SyncDataUtil {
                     fireEquipMeasurement.setValue(i.getValue());
                     fireEquipMeasurement.setTypeCode(i.getTypeCode());
                     fireEquipMeasurement.setTypeName(i.getTypeName());
-                    fireEquipMeasurement.setMRid(i.getTypeCode());
+                    fireEquipMeasurement.setMRid(i.getIndexId());
                     return fireEquipMeasurement;
                 }
         ).collect(Collectors.toList());

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/VoiceRecordFileController.java

@@ -136,7 +136,7 @@ public class VoiceRecordFileController extends BaseController {
 				sortRule = "desc";
 			}
 		}else {
-			sortParam = "call_time";
+			sortParam = "tel_start_time";
 			sortRule = "desc";
 		}
 		Page<VoiceRecordFileDto> pageBean = voiceRecordFileServiceImpl.queryRecordListByQueryDto(page,

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

@@ -364,7 +364,7 @@ WHERE wles.id=#{id}
         si.update_date,
         ei.type_code AS typeCode,
         ei.type_name AS typeName,
-        es.`code` AS indexId
+        ei.`id` AS indexId
         FROM
         wl_equipment_specific_index si
         LEFT JOIN wl_equipment_index ei ON si.equipment_index_id = ei.id

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

@@ -738,6 +738,7 @@
          SELECT
             es.id,
             es.`code` AS mrid,
+            es.`code` AS materialObjectId,
             es.`name`,
             es.`name` AS aliasname,
             es.`code`,
@@ -771,17 +772,31 @@
     <select id="getEquipSpecificDetailsByEquipmentId"
             resultType="com.yeejoin.equipmanage.common.datasync.entity.FireEquipment">
         SELECT
-        es.id,
-        ed.`name`,
-        es.`code`,
-        es.`code` AS mRid,
-        es.system_id AS fightingSystemIds,
-        es.iot_code AS iotCode,
-        e.`name` AS categoryName,
-        e.`code` AS categoryCode,
-        ws.source_id AS buildId,
-        ws.`name` AS buildName,
-        TRIM( CONCAT( IFNULL( ws.full_name, '' ), ' ', IFNULL( sd.description, '' ) ) ) AS position
+	        es.id,
+	        ed.`name`,
+			ed.`name` as aliasname,
+	        IFNULL(es.`code`,'') as `code`,
+	        IFNULL(es.`code`,'') AS mRid,
+	        IFNULL(es.system_id,'') AS fightingSystemIds,
+	        IFNULL(es.iot_code,'') AS iotCode,
+	        e.`name` AS categoryName,
+	        e.`code` AS categoryCode,
+	        IFNULL(ws.source_id,'') AS buildId,
+	        IFNULL(ws.`name`,'') AS buildName,
+			IFNULL(a.`name`,'') as `workArea`,
+			IFNULL(a.`id`,'') as `areaid`,
+			(SELECT
+				`name`
+			FROM
+				f_station_info
+			LIMIT 1) as stationname,
+			(SELECT
+				station_code
+			FROM
+				f_station_info
+			LIMIT 1) as stationCode,
+			es.create_date as inUseDate,
+        	TRIM( CONCAT( IFNULL( ws.full_name, '' ), ' ', IFNULL( sd.description, '' ) ) ) AS position
         FROM
         wl_equipment_specific es
         LEFT JOIN wl_equipment_detail ed ON es.equipment_detail_id = ed.id
@@ -789,6 +804,7 @@
         LEFT JOIN f_fire_fighting_system fs ON fs.id = es.system_id
         LEFT JOIN wl_stock_detail sd ON sd.equipment_specific_id = es.id
         LEFT JOIN wl_warehouse_structure ws ON ws.id = sd.warehouse_structure_id
+        LEFT JOIN wl_area a ON a.id = es.area_id
         <where>
             <if test="equipmentId != null">
                 ed.equipment_id = #{equipmentId}