Merge remote-tracking branch 'origin/master'

base-manager/src/main/java/com/mortals/xhx/module/product/model/vo/ProductVo.java

@@ -14,4 +14,6 @@ import java.util.List;
 @Data
 public class ProductVo extends BaseEntityLong {
 
+
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/model/vo/SkinBaseVo.java

@@ -19,6 +19,8 @@ public class SkinBaseVo extends BaseEntityLong {
     /** 产品编码 */
     private String productCode;
 
+    private String imageResolutionValue;
+
 
     /** 属性列表 */
     private List<SkinFieldEntity> skinFieldList;

base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinBaseServiceImpl.java

@@ -5,6 +5,7 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.base.system.upload.service.UploadService;
 import com.mortals.xhx.common.key.Constant;
 import com.mortals.xhx.common.utils.BeanUtil;
@@ -53,6 +54,8 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
     private UploadService uploadService;
     @Autowired
     private ProductService productService;
+    @Autowired
+    private ParamService paramService;
 
     @Override
     protected void validData(SkinBaseEntity entity, Context context) throws AppException {
@@ -67,10 +70,13 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
 
     @Override
     protected void findAfter(SkinBaseEntity entity, PageInfo pageInfo, Context context, List<SkinBaseEntity> list) throws AppException {
+
+        Map<String, String> imageResolutionMap = paramService.getParamBySecondOrganize("SkinBase", "imageResolution");
         list.stream().forEach(item -> {
             List<SkinFieldEntity> skinFieldEntities = skinFieldService.find(new SkinFieldQuery().skinId(item.getId()));
             ProductEntity productEntity = productService.get(item.getProductId());
-            item.setProductCode(productEntity==null?"":productEntity.getProductCode());
+            item.setProductCode(productEntity == null ? "" : productEntity.getProductCode());
+            item.setImageResolutionValue(imageResolutionMap.get(entity.getImageResolution()==null?"1":entity.getImageResolution()));
             item.setSkinFieldList(skinFieldEntities);
 
             if (!ObjectUtils.isEmpty(item.getPreviewImagePath())) {
@@ -145,12 +151,12 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
         Map data = new HashMap();
         List<SkinFieldEntity> collect = entity.getSkinFieldList().stream().map(field -> {
             SkinFieldEntity skinFieldEntity = new SkinFieldEntity();
-            BeanUtils.copyProperties(field,skinFieldEntity, BeanUtil.getNullPropertyNames(field));
+            BeanUtils.copyProperties(field, skinFieldEntity, BeanUtil.getNullPropertyNames(field));
             updateUrl(skinFieldEntity);
             return skinFieldEntity;
         }).collect(Collectors.toList());
 
-        data.put("columns",collect);
+        data.put("columns", collect);
         String temp = "skin.css.ftl";
         try {
             FreeMarkerUtils.initFreeMarker(temp);

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinBaseController.java

@@ -73,6 +73,11 @@ public class SkinBaseController extends BaseCRUDJsonBodyMappingController<SkinBa
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
+
+        this.addDict(model, "imageResolution", paramService.getParamBySecondOrganize("SkinBase", "imageResolution"));
+
+
+
         super.init(model, context);
     }