Merge branch 'master' of http://gitlab.scsmile.cn/zxf/device-new-platform

device-manager/src/main/java/com/mortals/xhx/base/system/message/impl/MessageServiceImpl.java

 package com.mortals.xhx.base.system.message.impl;
 
+import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -179,4 +180,21 @@ public class MessageServiceImpl implements MessageService {
         sendTaskThreadPool.execute(sendTask);
     }
 
+    public static void main(String[] args) {
+
+        try {
+            Integer a = 1;
+            Integer b = 0;
+            int i = a / b;
+
+        } catch (Exception e) {
+
+            String stacktrace = ExceptionUtil.stacktraceToString(e.fillInStackTrace());
+            System.out.println(stacktrace);
+
+        }
+
+
+    }
+
 }
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java

@@ -110,8 +110,9 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
         //返回产品列表及其样式
         //productService.find(new ProductEntity()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getProductName())).
         Rest<RespData<List<SkinBasePdu>>> resp = skinBaseFeign.list(new SkinBasePdu());
+        log.info("skinBaseFeignResp:{}",JSON.toJSONString(resp));
         if (resp.getCode() == YesNoEnum.YES.getValue()) {
-            Map<String, Map<String, String>> skinProductCodeMap = resp.getData().getData().stream().collect(Collectors.groupingBy(x -> x.getProductCode(), Collectors.toMap(a -> a.getImageResolution(), b -> b.getImageResolutionValue(),(o,n)->n)));
+            Map<String, Map<String, String>> skinProductCodeMap = resp.getData().getData().stream().collect(Collectors.groupingBy(x -> x.getProductCode(), Collectors.toMap(a -> a.getImageResolution()==null?"":a.getImageResolution(), b -> b.getImageResolutionValue(),(o,n)->n)));
             this.addDict(model, "skinProductCodeMap", skinProductCodeMap);
         }
         super.init(model, context);

device-manager/src/main/java/com/mortals/xhx/module/product/web/ProductController.java

@@ -45,7 +45,7 @@ public class ProductController extends BaseCRUDJsonBodyMappingController<Product
         //获取所有产品皮肤 分组显示
         Rest<RespData<List<SkinBasePdu>>> resp = skinBaseFeign.list(new SkinBasePdu());
         if (resp.getCode() == YesNoEnum.YES.getValue()) {
-            Map<String, Map<String, String>> skinProductCodeMap = resp.getData().getData().stream().collect(Collectors.groupingBy(x -> x.getProductCode(), Collectors.toMap(a -> a.getImageResolution(), b -> b.getImageResolutionValue(),(o,n)->n)));
+            Map<String, Map<String, String>> skinProductCodeMap = resp.getData().getData().stream().collect(Collectors.groupingBy(x -> x.getProductCode(), Collectors.toMap(a -> a.getImageResolution()==null?"":a.getImageResolution(), b -> b.getImageResolutionValue(),(o,n)->n)));
             this.addDict(model, "skinProductCodeMap", skinProductCodeMap);
         }