xiexiang 11/27

PCS/src/main/java/cn/cslg/permission/common/model/dto/AssoFunctionModuleDTO.java

@@ -13,7 +13,6 @@ import java.util.List;
  */
 @Data
 public class AssoFunctionModuleDTO {
-    private Integer id;
 
     private List<AssoFunctionCodeDTO> assoFunctionCodeDTOS;
 

PCS/src/main/java/cn/cslg/permission/common/model/dto/AssoFunctionModuleUpdateDTO.java

@@ -0,0 +1,34 @@
+package cn.cslg.permission.common.model.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author xiexiang
+ * @Date 2024/11/27
+ */
+@Data
+public class AssoFunctionModuleUpdateDTO {
+    private Integer id;
+    private Integer functionId;
+    private String code;
+    /**
+     * 创建人id
+     */
+    private Integer createUser;
+
+    /**
+     * 是否删除（1是 0否）
+     */
+    private Boolean isDelete;
+
+    /**
+     * 是否授权（1未授权 2授权）
+     */
+    private Integer authType;
+
+    private String versionNum;
+
+    private Integer appVipTypeId;
+}

PCS/src/main/java/cn/cslg/permission/common/model/dto/QueryAssoFunctionModuleDTO.java

@@ -0,0 +1,29 @@
+package cn.cslg.permission.common.model.dto;
+
+import lombok.Data;
+
+/**
+ * @Author xiexiang
+ * @Date 2024/11/20
+ */
+@Data
+public class QueryAssoFunctionModuleDTO {
+    /**
+     * 模糊查询检索条件
+     */
+    private String vipName;
+    /**
+     * 每页条数
+     */
+    private Long pageSize;
+
+    /**
+     * 当前页数
+     */
+    private Long pageNum;
+
+    /**
+     * 数据总数
+     */
+    private Integer total;
+}

PCS/src/main/java/cn/cslg/permission/common/model/vo/associate/AssoFunctionModuleVO.java

@@ -0,0 +1,38 @@
+package cn.cslg.permission.common.model.vo.associate;
+
+import cn.cslg.permission.common.model.dto.AssoFunctionCodeDTO;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author xiexiang
+ * @Date 2024/11/27
+ */
+@Data
+public class AssoFunctionModuleVO {
+    private Integer id;
+
+    private Integer functionId;
+
+    private String code;
+
+    /**
+     * 创建人id
+     */
+    private Integer createUser;
+
+    /**
+     * 是否删除（1是 0否）
+     */
+    private Boolean isDelete;
+
+    /**
+     * 是否授权（1未授权 2授权）
+     */
+    private Integer authType;
+
+    private String versionNum;
+
+    private Integer appVipTypeId;
+}

PCS/src/main/java/cn/cslg/permission/controller/AppVipTypeController.java

@@ -1,67 +0,0 @@
-package cn.cslg.permission.controller;
-
-import cn.cslg.permission.common.core.base.Constants;
-import cn.cslg.permission.common.model.Records;
-import cn.cslg.permission.common.model.dto.AppVipTypeDTO;
-import cn.cslg.permission.common.model.dto.QueryVipDTO;
-import cn.cslg.permission.common.utils.Response;
-import cn.cslg.permission.service.qiaobi.AppVipTypeService;
-import io.swagger.v3.oas.annotations.Operation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * @Author xiexiang
- * @Date 2024/11/19
- */
-@Slf4j
-@RestController
-@RequestMapping(Constants.PERMISSION_API + "/appVipType")
-public class AppVipTypeController {
-    @Autowired
-    private AppVipTypeService appVipTypeService;
-
-    @Operation(summary = "添加会员")
-    @PostMapping("/add")
-    public String add(@RequestBody AppVipTypeDTO appVipTypeDTO) {
-        Records records = appVipTypeService.add(appVipTypeDTO);
-        return Response.success(records);
-    }
-
-    @Operation(summary = "修改会员")
-    @PostMapping("/update")
-    public String update(@RequestBody AppVipTypeDTO appVipTypeDTO) {
-        Records records = appVipTypeService.update(appVipTypeDTO);
-        return Response.success(records);
-    }
-
-    @Operation(summary = "分页查询会员列表")
-    @PostMapping("/query")
-    public String query(@RequestBody QueryVipDTO queryVipDTO){
-        Records records = appVipTypeService.queryAppVipType(queryVipDTO);
-        return Response.success(records);
-    }
-
-    @Operation(summary = "根据id查询会员信息")
-    @GetMapping("/queryById")
-    public String queryById(Integer id){
-        Records records = new Records();
-        if (id != null) {
-            records = appVipTypeService.getVipById(id);
-        }
-        return Response.success(records);
-    }
-
-    @Operation(summary = "根据ids删除应用会员信息")
-    @PostMapping("/delete")
-    public String delete(@RequestBody List<Integer> ids) {
-        if (ids != null) {
-            appVipTypeService.delete(ids);
-            return Response.success("删除成功");
-        }
-        return Response.error("删除失败");
-    }
-}

PCS/src/main/java/cn/cslg/permission/controller/qiaobi/AssoFunctionModuleController.java

@@ -0,0 +1,20 @@
+package cn.cslg.permission.controller.qiaobi;
+
+import cn.cslg.permission.common.core.base.Constants;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author xiexiang
+ * @Date 2024/11/28
+ */
+@Tag(name = "功能模块关联")
+@RestController
+@RequestMapping(Constants.PERMISSION_API + "/assoFunctionModule")
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
+public class AssoFunctionModuleController {
+
+}

PCS/src/main/java/cn/cslg/permission/controller/qiaobi/VipTypeController.java

@@ -1,6 +1,9 @@
 package cn.cslg.permission.controller.qiaobi;
 
 import cn.cslg.permission.common.core.base.Constants;
+import cn.cslg.permission.common.model.Records;
+import cn.cslg.permission.common.model.dto.AppVipTypeDTO;
+import cn.cslg.permission.common.model.dto.QueryVipDTO;
 import cn.cslg.permission.common.model.qiaobi.QiaoBiVIPTypeVO;
 import cn.cslg.permission.common.model.qiaobi.QiaoBiVipTypeDTO;
 import cn.cslg.permission.common.utils.Response;
@@ -33,4 +36,45 @@ public class VipTypeController {
       return Response.success(qiaoBiVIPTypeVOList);
     }
 
+    @Operation(summary = "添加会员")
+    @PostMapping("/add")
+    public String add(@RequestBody AppVipTypeDTO appVipTypeDTO) {
+        Records records = appVipTypeService.add(appVipTypeDTO);
+        return Response.success(records);
+    }
+
+    @Operation(summary = "修改会员")
+    @PostMapping("/update")
+    public String update(@RequestBody AppVipTypeDTO appVipTypeDTO) {
+        Records records = appVipTypeService.update(appVipTypeDTO);
+        return Response.success(records);
+    }
+
+    @Operation(summary = "分页查询会员列表")
+    @PostMapping("/query")
+    public String query(@RequestBody QueryVipDTO queryVipDTO){
+        Records records = appVipTypeService.queryAppVipType(queryVipDTO);
+        return Response.success(records);
+    }
+
+    @Operation(summary = "根据id查询会员信息")
+    @GetMapping("/queryById")
+    public String queryById(Integer id){
+        Records records = new Records();
+        if (id != null) {
+            records = appVipTypeService.getVipById(id);
+        }
+        return Response.success(records);
+    }
+
+    @Operation(summary = "根据ids删除应用会员信息")
+    @PostMapping("/delete")
+    public String delete(@RequestBody List<Integer> ids) {
+        if (ids != null) {
+            appVipTypeService.delete(ids);
+            return Response.success("删除成功");
+        }
+        return Response.error("删除失败");
+    }
+
 }

PCS/src/main/java/cn/cslg/permission/domain/associate/AssoFunctionModule.java

@@ -40,6 +40,9 @@ public class AssoFunctionModule extends BaseEntity<AssoFunctionModule> {
     /**
      * 版本号
      */
-    @TableField(value = "VERSION")
+    @TableField(value = "VERSION_NUM")
     private String version;
+
+    @TableField(value = "APP_VIP_TYPE_ID")
+    private Integer appVipTypeId;
 }

PCS/src/main/java/cn/cslg/permission/service/associate/AssoFunctionModuleService.java

@@ -0,0 +1,77 @@
+package cn.cslg.permission.service.associate;
+
+import cn.cslg.permission.common.model.Records;
+import cn.cslg.permission.common.model.dto.*;
+import cn.cslg.permission.common.model.vo.AppVipTypeVO;
+import cn.cslg.permission.domain.TenantVipType;
+import cn.cslg.permission.domain.associate.AssoFunctionModule;
+import cn.cslg.permission.domain.qiaobi.AppVipType;
+import cn.cslg.permission.mapper.associate.AssoFunctionModuleMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @Author xiexiang
+ * @Date 2024/11/28
+ */
+@Service
+@RequiredArgsConstructor
+public class AssoFunctionModuleService extends ServiceImpl<AssoFunctionModuleMapper, AssoFunctionModule> {
+
+    /**
+     * 新增
+     */
+    public Records add(AssoFunctionModuleDTO assoFunctionModuleDTO) {
+        Records records = new Records();
+        List<Integer> ids = new ArrayList<>();
+        List<AssoFunctionModule> assoFunctionModules = new ArrayList<>();
+        List<AssoFunctionCodeDTO> codeDTOS = assoFunctionModuleDTO.getAssoFunctionCodeDTOS();
+        for (AssoFunctionCodeDTO codeDTO : codeDTOS) {
+            AssoFunctionModule assoFunctionModule = new AssoFunctionModule();
+            BeanUtils.copyProperties(assoFunctionModuleDTO, assoFunctionModule);
+            assoFunctionModule.setFunctionId(codeDTO.getFunctionId());
+            assoFunctionModule.setCode(codeDTO.getCode());
+            assoFunctionModules.add(assoFunctionModule);
+        }
+        if (!assoFunctionModules.isEmpty()) {
+            this.saveBatch(assoFunctionModules);
+            ids = assoFunctionModules.stream().map(AssoFunctionModule::getId).collect(Collectors.toList());
+        }
+        records.setRecords(ids);
+        return records;
+    }
+
+    /**
+     * 更新
+     */
+    public Records update(AssoFunctionModuleUpdateDTO updateDTO) {
+        Records records = new Records();
+        AssoFunctionModule assoFunctionModule = this.getById(updateDTO.getId());
+        BeanUtils.copyProperties(updateDTO, assoFunctionModule);
+        assoFunctionModule.updateById();
+        records.setRecords(assoFunctionModule.getId());
+        return records;
+    }
+
+    public Records queryAssoFunctionModules(QueryAssoFunctionModuleDTO queryDTO) {
+        Records records = new Records();
+        Long current = queryDTO.getPageNum();
+        Long size = queryDTO.getPageSize();
+        records.setCurrent(current);
+        records.setSize(size);
+        return records;
+    }
+
+
+
+    public void delete(List<Integer> ids){
+        this.removeByIds(ids);
+    }
+
+}