素材分组接口修改

eas-manager/doc/api.md

@@ -3152,14 +3152,12 @@ dict|object|字典对象
 
 参数名称|类型|必填|描述
 :---|:---|:---|:-------
-paramKey|String|是|图片分组（系统参数中获取，字典数据）
-paramValue|String|是|图片分组描述
+groupName|String|是|图片分组描述
 
 **请求样例:**
 ```
 {
-    "paramKey":"4",
-    "paramValue":"测试数据"
+    "groupName":"测试数据"
 }
 
 ```

eas-manager/src/main/java/com/mortals/xhx/base/system/param/model/ParamEntity.java

@@ -21,7 +21,7 @@ import java.util.Date;
  * @author 
  * @version 1.0.0
  */
-public class ParamEntity extends BaseEntityLong implements IParam {
+public class ParamEntity extends ParamEntityExt implements IParam {
 	private static final long serialVersionUID = 1536307966363L;
 	
 	/** 参数名称 */

eas-manager/src/main/java/com/mortals/xhx/base/system/param/model/ParamEntityExt.java

+package com.mortals.xhx.base.system.param.model;
+
+import com.mortals.framework.model.BaseEntityLong;
+import lombok.Data;
+
+@Data
+public class ParamEntityExt extends BaseEntityLong {
+    /** 素材分组名称 */
+    private String groupName;
+}

eas-manager/src/main/java/com/mortals/xhx/module/picture/web/PictureGroupController.java

@@ -11,6 +11,7 @@ import com.mortals.xhx.base.system.param.model.ParamEntity;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.base.system.param.web.ParamForm;
 import com.mortals.xhx.common.code.PictureTypeEnum;
+import com.mortals.xhx.common.utils.StringUtils;
 import com.mortals.xhx.module.picture.model.vo.PictureGroupCountVo;
 import com.mortals.xhx.module.picture.service.PictureMaterialService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +38,17 @@ public class PictureGroupController extends BaseCRUDJsonBodyMappingController<Pa
 
     @Override
     protected void saveBefore(ParamEntity entity, Map<String, Object> model, Context context) throws AppException {
+        if(StringUtils.isEmpty(entity.getGroupName())){
+            throw new AppException("分组名称不能为空");
+        }
+        ParamEntity query = new ParamEntity();
+        query.setFirstOrganize("PictureMaterial");
+        query.setSecondOrganize("pictureGroupId");
+        List<ParamEntity> paramEntities = this.service.find(query);
+        int size = (paramEntities==null?0:paramEntities.size()) + 1;
+        entity.setParamKey(size+"");
         entity.setName("素材分组");
+        entity.setParamValue(entity.getGroupName());
         entity.setFirstOrganize("PictureMaterial");
         entity.setSecondOrganize("pictureGroupId");
     }