Merge remote-tracking branch 'origin/dev' into dev

xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/resource/feign/RemoteH5ConfigService.java

@@ -11,4 +11,7 @@ public interface RemoteH5ConfigService {
 
     @GetMapping("/h5config/inner/syncH5Config")
     R<String> syncH5Config(@RequestParam(value = "tId",required = false) String tId);
+
+    @GetMapping("/h5config/inner/syncH5Config")
+    public R<String> syncH5Config(@RequestParam(value = "tId", required = false) String tId, @RequestParam(value = "manCode", required = false) String manCode);
 }

xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/resource/feign/factory/RemoteH5ConfigFallbackFactory.java

@@ -16,6 +16,10 @@ public class RemoteH5ConfigFallbackFactory implements FallbackFactory<RemoteH5Co
             public R<String> syncH5Config(String tId) {
                 return R.fail("同步配置文件失败");
             }
+
+            public R<String> syncH5Config(String tId, String manCode) {
+                return R.fail("同步配置文件失败");
+            }
         };
     }
 }

xueyi-modules/xueyi-message/src/main/java/com/xueyi/message/transfer/controller/ApiController.java

@@ -226,7 +226,7 @@ public class ApiController {
 //                    jsObject.put("msg","success");
                     return AjaxResult.success(receptionVo.getData());
                 case 4:
-                    R<String> propertyR = remoteH5ConfigService.syncH5Config(manDeviceDtoR.getData().getTId().toString());
+                    R<String> propertyR = remoteH5ConfigService.syncH5Config(manDeviceDtoR.getData().getTId().toString(), manDeviceDtoR.getData().getManCode().toString());
                     if (propertyR.isFail()) {
                         return AjaxResult.warn("配置同步失败，请检查");
                     }
@@ -429,10 +429,12 @@ public class ApiController {
         // 根据设备id获取租户信息
         R<DmManDeviceDto> manDeviceDtoR = manDeviceService.manDeviceInfoInner(deviceId);
         String tenantId = null;
+        String manCode = null;
         if (manDeviceDtoR.isOk() && manDeviceDtoR.getData() != null) {
             tenantId = manDeviceDtoR.getData().getTId().toString();
+            manCode = manDeviceDtoR.getData().getManCode().toString();
         }
-        R<String> propertyR = remoteH5ConfigService.syncH5Config(tenantId);
+        R<String> propertyR = remoteH5ConfigService.syncH5Config(tenantId, manCode);
         if (propertyR.isFail()) {
             return AjaxResult.warn("配置同步失败，请检查");
         }

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/resource/service/impl/DmH5ConfigServiceImpl.java

@@ -78,9 +78,9 @@ public class DmH5ConfigServiceImpl extends BaseServiceImpl<DmH5ConfigQuery, DmH5
                         try {
                             String property = nacosConfigManager.getConfigService().getConfig(item.getName(), NacosConstants.DEFAULT_GROUP, 5000);
                             JSONObject jo = JSON.parseObject(property);
-                            if (jo.containsKey("system")) {
+                            if (jo != null && jo.containsKey("system")) {
                                 JSONObject sys = jo.getJSONObject("system");
-                                if (sys.containsKey("H5")) {
+                                if (sys != null && sys.containsKey("H5")) {
                                     JSONObject H5 = sys.getJSONObject("H5");
                                     H5.put("streamUrl", streamUrl);
                                 }
@@ -144,9 +144,9 @@ public class DmH5ConfigServiceImpl extends BaseServiceImpl<DmH5ConfigQuery, DmH5
             try {
                 String property = nacosConfigManager.getConfigService().getConfig(dto.getName(), NacosConstants.DEFAULT_GROUP, 5000);
                 JSONObject jo = JSON.parseObject(property);
-                if (jo.containsKey("system")) {
+                if (jo != null && jo.containsKey("system")) {
                     JSONObject sys = jo.getJSONObject("system");
-                    if (sys.containsKey("H5")) {
+                    if (sys != null && sys.containsKey("H5")) {
                         JSONObject H5 = sys.getJSONObject("H5");
                         String streamUrl = H5.getString("streamUrl");
                         target.setStreamUrl(streamUrl);
@@ -178,20 +178,16 @@ public class DmH5ConfigServiceImpl extends BaseServiceImpl<DmH5ConfigQuery, DmH5
         List<DmManDeviceDto> mdList = dmManDeviceManager.selectList(query);
         if (mdList != null && mdList.size() > 0) {
             DmManDeviceDto target = mdList.get(0);
-            try {
-                String property = nacosConfigManager.getConfigService().getConfig(dto.getName(), NacosConstants.DEFAULT_GROUP, 5000);
-                JSONObject jo = JSON.parseObject(property);
-                if (jo.containsKey("system")) {
-                    JSONObject sys = jo.getJSONObject("system");
-                    if (sys.containsKey("H5")) {
-                        JSONObject H5 = sys.getJSONObject("H5");
-                        String streamUrl = H5.getString("streamUrl");
-                        target.setStreamUrl(streamUrl);
-                        dmManDeviceManager.update(target);
-                    }
+            String property = dto.getProperty();
+            JSONObject jo = JSON.parseObject(property);
+            if (jo != null && jo.containsKey("system")) {
+                JSONObject sys = jo.getJSONObject("system");
+                if (sys != null && sys.containsKey("H5")) {
+                    JSONObject H5 = sys.getJSONObject("H5");
+                    String streamUrl = H5.getString("streamUrl");
+                    target.setStreamUrl(streamUrl);
+                    dmManDeviceManager.update(target);
                 }
-            } catch (NacosException ne) {
-                log.error("H5配置表上传nacos-更新配置文件失败：{}", ne.getMessage());
             }
         }
         return super.update(dto);
@@ -226,9 +222,9 @@ public class DmH5ConfigServiceImpl extends BaseServiceImpl<DmH5ConfigQuery, DmH5
                 return null;
             }
             JSONObject jo = JSON.parseObject(result);
-            if (jo.containsKey("system")) {
+            if (jo != null && jo.containsKey("system")) {
                 JSONObject sys = jo.getJSONObject("system");
-                if (sys.containsKey("H5")) {
+                if (sys != null && sys.containsKey("H5")) {
                     JSONObject H5 = sys.getJSONObject("H5");
                     H5.put("streamUrl", streamUrl);
                 }
@@ -268,9 +264,9 @@ public class DmH5ConfigServiceImpl extends BaseServiceImpl<DmH5ConfigQuery, DmH5
                             String streamUrl = extList.get(0).getStreamUrl();
                             if (!StringUtils.isEmpty(streamUrl)) {
                                 JSONObject jo = JSON.parseObject(result);
-                                if (jo.containsKey("system")) {
+                                if (jo != null && jo.containsKey("system")) {
                                     JSONObject sys = jo.getJSONObject("system");
-                                    if (sys.containsKey("H5")) {
+                                    if (sys != null && sys.containsKey("H5")) {
                                         JSONObject H5 = sys.getJSONObject("H5");
                                         H5.put("streamUrl", streamUrl);
                                     }