Merge remote-tracking branch 'origin/develop_dl_3.7.1.0' into develop_dl_3.7.1.0

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

@@ -26,7 +26,6 @@ import com.yeejoin.equipmanage.utils.DcsUtil;
 import com.yeejoin.equipmanage.utils.SyncDataUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.nio.client.HttpAsyncClient;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -70,6 +69,9 @@ public class SyncDataServiceImpl implements ISyncDataService {
     @Value("${dcs.NRKJ.use}")
     private Boolean NRKJUse;
 
+    @Value("${dcs.source.type}")
+    private String sourceType;
+
     @Autowired
     private DcsUtil dcsUtil;
 
@@ -495,6 +497,7 @@ public class SyncDataServiceImpl implements ISyncDataService {
                                     AppAlarmVo appAlarmVo = new AppAlarmVo();
                                     BeanUtils.copyProperties(alarmVo, appAlarmVo);
                                     appAlarmVo.setClient_id(clientId);
+                                    appAlarmVo.setType(sourceType);
                                     map.put("alarm", appAlarmVo);
                                     if (isreport) {
                                         map.put("report", getAppAlarmRportVo(alarmVo));

amos-boot-system-equip/src/main/resources/application-dev.properties

@@ -80,6 +80,7 @@ dcs.x.hw.id=io.cs
 dcs.x.hw.appKey=i!YmnHgJ=Ysz8V+O@ZG237inQKfixkQ.-#-P3IlR8fO%.#F!g%35Z#@tp$6G+52v
 # \u7531\u4E8E\u76EE\u524D\u6709\u4E0D\u6B62\u4E00\u4E2A\u6570\u5B57\u7AD9\u5E73\u53F0\u5BF9\u5E94\u63A5\u53E3\u89C4\u8303\u4E0D\u4E00\u81F4\uFF0C\u6240\u4EE5\u6B64\u5904\u589E\u52A0\u914D\u7F6E\uFF0Ctrue\u8868\u793A\u9002\u7528\u4E8E\u5357\u745E\u79D1\u6280\u7684\u63A5\u53E3\u89C4\u8303
 dcs.NRKJ.use=false
+dcs.source.type=\u9ad8\u7ea7\u5e94\u7528
 dcs.url.token=http://172.21.101.123/udaap-ddis/v1/cs/auth-service/oauth/token
 dcs.url.sendalarm=http://172.21.101.101/v1/cs/alarm-service/appalarm/sendalarm
 #dcs.url.token=https://192.168.4.89/v1/cs/auth-service/oauth/token

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

@@ -29,7 +29,7 @@
             s.`name` AS devicename,
             sal.equipment_specific_code AS partid,
             sal.equipment_specific_name AS partname,
-            s.`system_type_code` AS type,
+            '高级应用' AS type,
             IF
             ( sal.confirm_type = 'FIREALARM', 0, 1 ) AS eventlevel,
             -- CONCAT( sal.equipment_specific_name, ' ', sal.equipment_specific_index_name ) AS eventdesc,
@@ -103,7 +103,7 @@
             s.`name` AS devicename,
             sal.equipment_specific_code AS partid,
             sal.equipment_specific_name AS partname,
-            s.`system_type_code` AS type,
+            '高级应用' AS type,
             IF
             ( sal.confirm_type = 'FIREALARM', 0, 1 ) AS eventlevel,
             CONCAT(sal.equipment_specific_name, '在',  sal.create_date, '发生', sal.equipment_specific_index_name, '事件，请相关人员进行核实确认现场情况！') AS eventdesc,