Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

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

@@ -205,6 +205,9 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     @Value("${systemctl.amos.switch}")
     private Boolean amosSwitch;
 
+    @Value("${isSendApp}")
+    private Boolean isSendApp;
+
     private static final String A = "A";
 
     private final static Map staticMap = new HashMap();
@@ -754,9 +757,14 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                     DateUtils.date2LongStr(equipmentSpecificAlarmLog.getCreateDate()));
             model.setBody(body);
             model.setMsgType("iotMonitor");
-            model.setIsSendApp(true);
+            if (isSendApp){
+                model.setIsSendApp(true);
+                model.setTerminal("APP/WEB");
+            } else {
+                model.setIsSendApp(false);
+                model.setTerminal("WEB");
+            }
             model.setIsSendWeb(true);
-            model.setTerminal("APP/WEB");
             model.setCategory(1);
             model.setRelationId(String.valueOf(equipmentSpecificAlarmLog.getId()));
             Token token = remoteSecurityService.getServerToken();

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

@@ -51,6 +51,7 @@ systemctl.sync.switch=false
 systemctl.jcs.switch=false
 #平台数据开关
 systemctl.amos.switch=false
+isSendApp=false
 
 #报表数据地址
 equip.report.url=/fire-fighting-system/ureport/preview?_u=file:

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

@@ -51,6 +51,7 @@ systemctl.sync.switch=false
 systemctl.jcs.switch=false
 #平台数据开关
 systemctl.amos.switch=false
+isSendApp=false
 
 #报表数据地址
 equip.report.url=/fire-fighting-system/ureport/preview?_u=file:

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

@@ -58,6 +58,7 @@ systemctl.sync.switch=false
 systemctl.jcs.switch=true
 #平台数据开关
 systemctl.amos.switch=true
+isSendApp=true
 
 #报表数据地址
 equip.report.url=/fire-fighting-system/ureport/preview?_u=file: