部署资源添加分辨率字典

device-manager/src/main/java/com/mortals/xhx/common/code/ImageReEnum.java

@@ -4,9 +4,9 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 public enum ImageReEnum {
-    RE_1920X1080(0, "1920x1080"),
-    RE_1080X1920(1, "1080x1920"),
-    RE_1280X1280(2, "1280x1280");
+    RE_1920X1080(1, "1920x1080"),
+    RE_1080X1920(2, "1080x1920"),
+    RE_1280X1280(3, "1280x1280");
     private Integer value;
     private String desc;
 

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

@@ -113,9 +113,6 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
         Rest<Map<String, String>> restDict = skinBaseFeign.dict("SkinBase", "imageResolution");
         if (restDict.getCode() == YesNoEnum.YES.getValue()) {
             Map<String, String> dict = restDict.getData();
-
-
-
             this.addDict(model, "resolution", dict);
         }
         //siteHallFeign.list(new SiteHallPdu().setSiteId(context.g);)

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

@@ -13,6 +13,7 @@ import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.ImageReEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.feign.skin.ISkinBaseFeign;
 import com.mortals.xhx.module.device.model.DeviceModuleDistributeEntity;
 import com.mortals.xhx.module.device.model.DeviceModuleDistributeQuery;
 import com.mortals.xhx.module.device.service.DeviceModuleDistributeService;
@@ -46,6 +47,8 @@ public class DeviceModuleDistributeController extends BaseCRUDJsonBodyMappingCon
     private ParamService paramService;
     @Autowired
     private ProductService productService;
+    @Autowired
+    private ISkinBaseFeign skinBaseFeign;
 
     public DeviceModuleDistributeController() {
         super.setModuleDesc("设备前端模块部署");
@@ -64,7 +67,14 @@ public class DeviceModuleDistributeController extends BaseCRUDJsonBodyMappingCon
 
         this.addDict(model, "selected", YesNoEnum.getEnumMap());
 
-        this.addDict(model, "imageResolution", ImageReEnum.getEnumMap());
+       // this.addDict(model, "imageResolution", ImageReEnum.getEnumMap());
+
+        Rest<Map<String, String>> restDict = skinBaseFeign.dict("SkinBase", "imageResolution");
+        if (restDict.getCode() == YesNoEnum.YES.getValue()) {
+            Map<String, String> dict = restDict.getData();
+            this.addDict(model, "imageResolution", dict);
+        }
+
         super.init(model, context);
     }