【7.2.2】【expand】更新查看详情接口

kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/controller/SysExpandDataController.java

@@ -8,9 +8,7 @@ import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
 import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
 import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
 import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
-import cn.stylefeng.roses.kernel.scanner.api.annotation.PostResource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -29,42 +27,6 @@ public class SysExpandDataController {
     @Resource
     private SysExpandDataService sysExpandDataService;
 
-    /**
-     * 添加
-     *
-     * @author fengshuonan
-     * @date 2022/03/29 23:47
-     */
-    @PostResource(name = "添加", path = "/sysExpandData/add")
-    public ResponseData<SysExpandData> add(@RequestBody @Validated(SysExpandDataRequest.add.class) SysExpandDataRequest sysExpandDataRequest) {
-        sysExpandDataService.add(sysExpandDataRequest);
-        return new SuccessResponseData<>();
-    }
-
-    /**
-     * 删除
-     *
-     * @author fengshuonan
-     * @date 2022/03/29 23:47
-     */
-    @PostResource(name = "删除", path = "/sysExpandData/delete")
-    public ResponseData<?> delete(@RequestBody @Validated(SysExpandDataRequest.delete.class) SysExpandDataRequest sysExpandDataRequest) {
-        sysExpandDataService.del(sysExpandDataRequest);
-        return new SuccessResponseData<>();
-    }
-
-    /**
-     * 编辑
-     *
-     * @author fengshuonan
-     * @date 2022/03/29 23:47
-     */
-    @PostResource(name = "编辑", path = "/sysExpandData/edit")
-    public ResponseData<?> edit(@RequestBody @Validated(SysExpandDataRequest.edit.class) SysExpandDataRequest sysExpandDataRequest) {
-        sysExpandDataService.edit(sysExpandDataRequest);
-        return new SuccessResponseData<>();
-    }
-
     /**
      * 查看详情
      *

kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/entity/SysExpandData.java

@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * 业务拓展-具体数据实例类
  *
@@ -48,4 +50,16 @@ public class SysExpandData extends BaseEntity {
     @ChineseDescription("拓展业务具体数据")
     private String expandData;
 
+    /**
+     * 拓展业务信息
+     */
+    @ChineseDescription("拓展业务信息")
+    private transient SysExpand expandInfo;
+
+    /**
+     * 字段元数据信息列表
+     */
+    @ChineseDescription("字段元数据信息列表")
+    private transient List<SysExpandField> fieldInfoList;
+
 }

kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/pojo/request/SysExpandDataRequest.java

@@ -20,7 +20,7 @@ public class SysExpandDataRequest extends BaseRequest {
     /**
      * 主键id
      */
-    @NotNull(message = "主键id不能为空", groups = {edit.class, delete.class})
+    @NotNull(message = "主键id不能为空", groups = {edit.class, delete.class, detail.class})
     @ChineseDescription("主键id")
     private Long expandDataId;
 

kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/service/impl/SysExpandDataServiceImpl.java

@@ -5,17 +5,24 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.stylefeng.roses.kernel.db.api.factory.PageFactory;
 import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory;
 import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
+import cn.stylefeng.roses.kernel.expand.modular.modular.entity.SysExpand;
 import cn.stylefeng.roses.kernel.expand.modular.modular.entity.SysExpandData;
+import cn.stylefeng.roses.kernel.expand.modular.modular.entity.SysExpandField;
 import cn.stylefeng.roses.kernel.expand.modular.modular.enums.SysExpandDataExceptionEnum;
 import cn.stylefeng.roses.kernel.expand.modular.modular.mapper.SysExpandDataMapper;
 import cn.stylefeng.roses.kernel.expand.modular.modular.pojo.request.SysExpandDataRequest;
+import cn.stylefeng.roses.kernel.expand.modular.modular.pojo.request.SysExpandFieldRequest;
+import cn.stylefeng.roses.kernel.expand.modular.modular.pojo.request.SysExpandRequest;
 import cn.stylefeng.roses.kernel.expand.modular.modular.service.SysExpandDataService;
+import cn.stylefeng.roses.kernel.expand.modular.modular.service.SysExpandFieldService;
+import cn.stylefeng.roses.kernel.expand.modular.modular.service.SysExpandService;
 import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -27,7 +34,13 @@ import java.util.List;
 @Service
 public class SysExpandDataServiceImpl extends ServiceImpl<SysExpandDataMapper, SysExpandData> implements SysExpandDataService {
 
-	@Override
+    @Resource
+    private SysExpandService sysExpandService;
+
+    @Resource
+    private SysExpandFieldService sysExpandFieldService;
+
+    @Override
     public void add(SysExpandDataRequest sysExpandDataRequest) {
         SysExpandData sysExpandData = new SysExpandData();
         BeanUtil.copyProperties(sysExpandDataRequest, sysExpandData);
@@ -49,7 +62,23 @@ public class SysExpandDataServiceImpl extends ServiceImpl<SysExpandDataMapper, S
 
     @Override
     public SysExpandData detail(SysExpandDataRequest sysExpandDataRequest) {
-        return this.querySysExpandData(sysExpandDataRequest);
+        // 获取拓展数据详情
+        SysExpandData sysExpandData = this.querySysExpandData(sysExpandDataRequest);
+
+        // 获取拓展业务信息
+        SysExpandRequest sysExpandRequest = new SysExpandRequest();
+        sysExpandRequest.setExpandId(sysExpandData.getExpandId());
+        SysExpand detail = sysExpandService.detail(sysExpandRequest);
+
+        // 获取拓展业务的字段信息
+        SysExpandFieldRequest sysExpandFieldRequest = new SysExpandFieldRequest();
+        sysExpandFieldRequest.setExpandId(sysExpandData.getExpandId());
+        List<SysExpandField> list = sysExpandFieldService.findList(sysExpandFieldRequest);
+
+        // 设置返回结果的元数据字段信息
+        sysExpandData.setExpandInfo(detail);
+        sysExpandData.setFieldInfoList(list);
+        return sysExpandData;
     }
 
     @Override