部署资源添加分辨率字典

device-manager/src/main/java/com/mortals/xhx/common/key/Constant.java

@@ -84,10 +84,7 @@ public final class Constant {
      */
     public final static String PARAM_SERVER_HTTP_URL = "server_http_url";
 
-    /**
-     * 服务器http 映射外网可访问地址 php
-     */
-    public final static String PARAM_SERVER_PHP_HTTP_URL = "server_php_http_url";
+
 
     public final static String PARAM_SERVER_PHP_IN_HTTP_URL = "server_php_in_http_url";
 

device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceModuleDistributeServiceImpl.java

@@ -8,7 +8,6 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import com.mortals.xhx.base.system.upload.service.UploadService;
-import com.mortals.xhx.common.code.ImageReEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.key.Constant;
 import com.mortals.xhx.common.key.RedisKey;
@@ -67,7 +66,7 @@ public class DeviceModuleDistributeServiceImpl extends AbstractCRUDCacheServiceI
         ProductEntity productEntity = productService.get(entity.getProductId(), context);
         entity.setProductCode(productEntity.getProductCode());
         entity.setProductName(productEntity.getProductName());
-        //entity.setImageResolutionValue(ImageReEnum.getByValue(Integer.parseInt(entity.getImageResolution())).getDesc());
+        entity.setImageResolutionValue(entity.getImageResolution());
 
         super.updateBefore(entity, context);
     }

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

@@ -57,17 +57,7 @@ public class DeviceModuleDistributeController extends BaseCRUDJsonBodyMappingCon
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "distribute", YesNoEnum.getEnumMap());
         this.addDict(model, "productId", productService.find(new ProductEntity()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getProductName())));
-
-/*        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() == null ? "" : a.getImageResolution()+"", b -> b.getImageResolutionValue() == null ? "" : b.getImageResolutionValue(), (o, n) -> n)));
-            this.addDict(model, "imageResolution", skinProductCodeMap);
-        }*/
-
         this.addDict(model, "selected", YesNoEnum.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();
@@ -145,7 +135,7 @@ public class DeviceModuleDistributeController extends BaseCRUDJsonBodyMappingCon
         ProductEntity productEntity = productService.get(entity.getProductId(), context);
         entity.setProductCode(productEntity.getProductCode());
         entity.setProductName(productEntity.getProductName());
-       // entity.setImageResolutionValue(ImageReEnum.getByValue(Integer.parseInt(entity.getImageResolution())).getDesc());
+        entity.setImageResolutionValue(entity.getImageResolution());
 
         //查询新增的是否存在，如果存在 则更新，标准为分辨率+产品