提交

zhongzheng-admin-saas/pom.xml

@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>zhongzheng</artifactId>
-        <groupId>com.zhongzheng</groupId>
-        <version>3.4.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>jar</packaging>
-    <artifactId>zhongzheng-admin-saas</artifactId>
-
-    <dependencies>
-        <!-- spring-boot-devtools -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <optional>true</optional> <!-- 表示依赖不会传递 -->
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-spring-boot-starter</artifactId>
-        </dependency>
-
-        <!-- Mysql驱动包 -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
-        <!-- 核心模块-->
-        <dependency>
-            <groupId>com.zhongzheng</groupId>
-            <artifactId>zhongzheng-framework</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.1.1.RELEASE</version>
-                <configuration>
-                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <warName>${project.artifactId}</warName>
-                </configuration>
-            </plugin>
-        </plugins>
-        <finalName>${project.artifactId}</finalName>
-    </build>
-
-</project>

zhongzheng-admin-saas/src/main/java/com/zhongzheng/AdminSaasApplication.java

@@ -1,19 +0,0 @@
-package com.zhongzheng;
-
-import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-
-
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class,DruidDataSourceAutoConfigure.class})
-public class AdminSaasApplication {
-
-    public static void main(String[] args)
-    {
-        System.setProperty("spring.devtools.restart.enabled", "false");
-        SpringApplication.run(AdminSaasApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  超级Admin启动成功   ლ(´ڡ`ლ)ﾞ"+"超级Admin");
-    }
-
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/AdminSaasServletInitializer.java

@@ -1,18 +0,0 @@
-package com.zhongzheng;
-
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-
-/**
- * web容器中进行部署
- *
- * @author zhongzheng
- */
-public class AdminSaasServletInitializer extends SpringBootServletInitializer
-{
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
-    {
-        return application.sources(AdminSaasApplication.class);
-    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/alioss/OssController.java

@@ -1,73 +0,0 @@
-package com.zhongzheng.controller.alioss;
-
-
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.modules.alioss.bo.OssRequest;
-import com.zhongzheng.modules.alioss.service.OssService;
-import com.zhongzheng.modules.alioss.vo.ResultBean;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * 阿里OSS
- *
- * @author change
- * @date 2021-05-17
- */
-@Api(value = "阿里OSS上传文件控制器", tags = {"阿里OSS上传文件"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/aliyun/oss")
-public class OssController extends BaseController {
-
-    private static Logger log = LoggerFactory.getLogger(OssController.class);
-
-    private final OssService ossService;
-
-    /**
-     * policy获得
-     */
-    @ApiOperation("policy获得")
-    @GetMapping("/policy")
-    public AjaxResult<ResultBean> policy(@Validated OssRequest ossRequest) {
-        ResultBean result = ossService.getPolicy(ossRequest);
-        log.info("服务端生成签名:{}",result);
-        return AjaxResult.success(result);
-    }
-
-    /**
-     * 阿里回调OSS返回参数到前端
-     */
-    @ApiOperation("回调")
-    @PostMapping("/callback")
-    public ResultBean callback(HttpServletRequest request) {
-        ResultBean ossCallbackResult = ossService.callback(request);
-        log.info("oss成功的回调:{}",ossCallbackResult);
-        return ossCallbackResult;
-    }
-
-
-    /**
-     * upload上传文件
-     */
-    @ApiOperation("上传file图片")
-    @PostMapping("/upload")
-    public AjaxResult<String> upload( OssRequest file) throws Exception {
-        String result = ossService.upload(file);
-        log.info("服务端生成签名:{}",result);
-        return AjaxResult.success("返回图片路径",result);
-    }
-
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/common/CaptchaController.java

@@ -1,136 +0,0 @@
-package com.zhongzheng.controller.common;
-
-import cn.hutool.captcha.AbstractCaptcha;
-import cn.hutool.captcha.CircleCaptcha;
-import cn.hutool.captcha.LineCaptcha;
-import cn.hutool.captcha.ShearCaptcha;
-import cn.hutool.captcha.generator.CodeGenerator;
-import cn.hutool.captcha.generator.MathGenerator;
-import cn.hutool.captcha.generator.RandomGenerator;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.StrUtil;
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-import com.github.xiaoymin.knife4j.annotations.DynamicParameter;
-import com.github.xiaoymin.knife4j.annotations.DynamicResponseParameters;
-import com.zhongzheng.common.constant.Constants;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.redis.RedisCache;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 验证码操作处理
- *
- * @author hjl
- */
-@Api(tags ="系统操作管理")
-@RestController
-public class CaptchaController {
-
-	// 圆圈干扰验证码
-	@Resource(name = "CircleCaptcha")
-	private CircleCaptcha circleCaptcha;
-	// 线段干扰的验证码
-	@Resource(name = "LineCaptcha")
-	private LineCaptcha lineCaptcha;
-	// 扭曲干扰验证码
-	@Resource(name = "ShearCaptcha")
-	private ShearCaptcha shearCaptcha;
-
-	@Autowired
-	private RedisCache redisCache;
-
-	// 验证码类型
-	@Value("${captcha.captchaType}")
-	private String captchaType;
-	// 验证码类别
-	@Value("${captcha.captchaCategory}")
-	private String captchaCategory;
-	// 数字验证码位数
-	@Value("${captcha.captchaNumberLength}")
-	private int numberLength;
-	// 字符验证码长度
-	@Value("${captcha.captchaCharLength}")
-	private int charLength;
-
-	/**
-	 * 生成验证码
-	 */
-	@ApiOperation("获取验证码")
-	@DynamicResponseParameters(name = "CodeMapModel",properties = {
-			@DynamicParameter(name = "uuid",value = "验证码uuid"),
-			@DynamicParameter(name = "img",value = "验证码图片base64"),
-	})
-	@GetMapping("/captchaImage")
-	public AjaxResult getCode() {
-		// 保存验证码信息
-		String uuid = IdUtil.simpleUUID();
-		String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
-		String code = null;
-		// 生成验证码
-		CodeGenerator codeGenerator;
-		AbstractCaptcha captcha;
-		switch (captchaType) {
-			case "math":
-				codeGenerator = new MathGenerator(numberLength);
-				break;
-			case "char":
-				codeGenerator = new RandomGenerator(charLength);
-				break;
-			default:
-				throw new IllegalArgumentException("验证码类型异常");
-		}
-		switch (captchaCategory) {
-			case "line":
-				captcha = lineCaptcha;
-				break;
-			case "circle":
-				captcha = circleCaptcha;
-				break;
-			case "shear":
-				captcha = shearCaptcha;
-				break;
-			default:
-				throw new IllegalArgumentException("验证码类别异常");
-		}
-		captcha.setGenerator(codeGenerator);
-		captcha.createCode();
-		if ("math".equals(captchaType)) {
-			code = getCodeResult(captcha.getCode());
-		} else if ("char".equals(captchaType)) {
-			code = captcha.getCode();
-		}
-		redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
-		Map<String,Object> map = new HashMap();
-		map.put("uuid", uuid);
-		map.put("img", captcha.getImageBase64());
-		return AjaxResult.success(map);
-	}
-
-	private String getCodeResult(String capStr) {
-		int a = Convert.toInt(StrUtil.sub(capStr, 0, numberLength).trim());
-		char operator = capStr.charAt(numberLength);
-		int b = Convert.toInt(StrUtil.sub(capStr, numberLength + 1, numberLength + 1 + numberLength).trim());
-		switch (operator) {
-			case '*':
-				return a * b + "";
-			case '+':
-				return a + b + "";
-			case '-':
-				return a - b + "";
-			default:
-				return "";
-		}
-	}
-
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/course/TopCourseBusinessController.java

@@ -1,42 +0,0 @@
-package com.zhongzheng.controller.course;
-
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.modules.top.goods.bo.TopCourseBusinessQueryBo;
-import com.zhongzheng.modules.top.goods.service.ITopCourseBusinessService;
-import com.zhongzheng.modules.top.goods.vo.TopCourseBusinessVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 业务层次Controller
- *
- * @author ruoyi
- * @date 2021-10-08
- */
-@Api(value = "业务层次控制器", tags = {"业务层次管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/course/business")
-public class TopCourseBusinessController extends BaseController {
-
-    private final ITopCourseBusinessService iCourseBusinessService;
-
-    /**
-     * 查询业务层次列表
-     */
-    @ApiOperation("查询业务层次列表")
-    @GetMapping("/list")
-    public TableDataInfo<TopCourseBusinessVo> list(TopCourseBusinessQueryBo bo) {
-        startPage();
-        List<TopCourseBusinessVo> list = iCourseBusinessService.queryList(bo);
-        return getDataTable(list);
-    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/course/TopCourseEducationTypeController.java

@@ -1,42 +0,0 @@
-package com.zhongzheng.controller.course;
-
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.modules.top.goods.bo.TopCourseEducationTypeQueryBo;
-import com.zhongzheng.modules.top.goods.service.ITopCourseEducationTypeService;
-import com.zhongzheng.modules.top.goods.vo.TopCourseEducationTypeVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 教育类型Controller
- * 
- * @author ruoyi
- * @date 2021-10-08
- */
-@Api(value = "教育类型控制器", tags = {"教育类型管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/course/educationType")
-public class TopCourseEducationTypeController extends BaseController {
-
-    private final ITopCourseEducationTypeService iCourseEducationTypeService;
-
-    /**
-     * 查询教育类型列表
-     */
-    @ApiOperation("查询教育类型列表")
-    @GetMapping("/list")
-    public TableDataInfo<TopCourseEducationTypeVo> list(TopCourseEducationTypeQueryBo bo) {
-        startPage();
-        List<TopCourseEducationTypeVo> list = iCourseEducationTypeService.queryList(bo);
-        return getDataTable(list);
-    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/course/TopCourseProjectTypeController.java

@@ -1,42 +0,0 @@
-package com.zhongzheng.controller.course;
-
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.modules.top.goods.bo.TopCourseProjectTypeQueryBo;
-import com.zhongzheng.modules.top.goods.service.ITopCourseProjectTypeService;
-import com.zhongzheng.modules.top.goods.vo.TopCourseProjectTypeVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 项目类型Controller
- * 
- * @author ruoyi
- * @date 2021-10-08
- */
-@Api(value = "项目类型控制器", tags = {"项目类型管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/course/projectType")
-public class TopCourseProjectTypeController extends BaseController {
-
-    private final ITopCourseProjectTypeService iCourseProjectTypeService;
-
-    /**
-     * 查询项目类型列表
-     */
-    @ApiOperation("查询项目类型列表")
-    @GetMapping("/list")
-    public TableDataInfo<TopCourseProjectTypeVo> list(TopCourseProjectTypeQueryBo bo) {
-        startPage();
-        List<TopCourseProjectTypeVo> list = iCourseProjectTypeService.queryList(bo);
-        return getDataTable(list);
-    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/course/TopCourseSubjectController.java

@@ -1,42 +0,0 @@
-package com.zhongzheng.controller.course;
-
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.modules.top.goods.bo.TopCourseSubjectQueryBo;
-import com.zhongzheng.modules.top.goods.service.ITopCourseSubjectService;
-import com.zhongzheng.modules.top.goods.vo.TopCourseSubjectVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 科目Controller
- * 
- * @author ruoyi
- * @date 2021-10-09
- */
-@Api(value = "科目控制器", tags = {"科目管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/course/subject")
-public class TopCourseSubjectController extends BaseController {
-
-    private final ITopCourseSubjectService iCourseSubjectService;
-
-    /**
-     * 查询科目列表
-     */
-    @ApiOperation("查询科目列表")
-    @GetMapping("/list")
-    public TableDataInfo<TopCourseSubjectVo> list(TopCourseSubjectQueryBo bo) {
-        startPage();
-        List<TopCourseSubjectVo> list = iCourseSubjectService.queryList(bo);
-        return getDataTable(list);
-    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/course/TopMajorController.java

@@ -1,42 +0,0 @@
-package com.zhongzheng.controller.course;
-
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.modules.top.goods.bo.TopMajorQueryBo;
-import com.zhongzheng.modules.top.goods.service.ITopMajorService;
-import com.zhongzheng.modules.top.goods.vo.TopMajorVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 专业Controller
- * 
- * @author ruoyi
- * @date 2021-10-09
- */
-@Api(value = "专业控制器", tags = {"专业管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/course/major")
-public class TopMajorController extends BaseController {
-
-    private final ITopMajorService iTopMajorService;
-
-    /**
-     * 查询专业列表
-     */
-    @ApiOperation("查询专业列表")
-    @GetMapping("/list")
-    public TableDataInfo<TopMajorVo> list(TopMajorQueryBo bo) {
-        startPage();
-        List<TopMajorVo> list = iTopMajorService.queryList(bo);
-        return getDataTable(list);
-    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/course/TopSchoolController.java

@@ -1,43 +0,0 @@
-package com.zhongzheng.controller.course;
-
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.modules.top.goods.bo.TopSchoolQueryBo;
-import com.zhongzheng.modules.top.goods.service.ITopSchoolService;
-import com.zhongzheng.modules.top.goods.vo.TopSchoolVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 高校Controller
- * 
- * @author ruoyi
- * @date 2021-10-09
- */
-@Api(value = "高校控制器", tags = {"高校管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/user/school")
-public class TopSchoolController extends BaseController {
-
-    private final ITopSchoolService iTopSchoolService;
-
-    /**
-     * 查询高校列表
-     */
-    @ApiOperation("查询高校列表")
-    @GetMapping("/list")
-    public TableDataInfo<TopSchoolVo> list(TopSchoolQueryBo bo) {
-        startPage();
-        List<TopSchoolVo> list = iTopSchoolService.queryList(bo);
-        return getDataTable(list);
-    }
-
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTemplateController.java

@@ -1,165 +0,0 @@
-package com.zhongzheng.controller.distribution;
-
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.domain.model.TopLoginUser;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.framework.web.service.TopTokenService;
-import com.zhongzheng.modules.distribution.bo.DistributionStatusEditBo;
-import com.zhongzheng.modules.distribution.vo.DistributionSellerVo;
-import com.zhongzheng.modules.top.distribution.bo.*;
-import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemplateService;
-import com.zhongzheng.modules.top.distribution.vo.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 【分销模板控制器】Controller
- * 
- * @author ruoyi
- * @date 2023-03-06
- */
-@Api("分销模板控制器")
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/distribution/temp")
-public class DistributionActivityTemplateController extends BaseController {
-
-    private final IDistributionActivityTemplateService iDistributionActivityTemplateService;
-
-    private final TopTokenService tokenService;
-
-    /**
-     * 查询【请填写功能名称】列表
-     */
-    @ApiOperation("查询分销活动模板列表")
-    @GetMapping("/list")
-    public TableDataInfo<DistributionActivityTemplateVo> list(DistributionActivityTemplateQueryBo bo) {
-        startPage();
-        List<DistributionActivityTemplateVo> list = iDistributionActivityTemplateService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出【请填写功能名称】列表
-     */
-    @ApiOperation("导出【请填写功能名称】列表")
-    @GetMapping("/export")
-    public AjaxResult<DistributionActivityTemplateVo> export(DistributionActivityTemplateQueryBo bo) {
-        List<DistributionActivityTemplateVo> list = iDistributionActivityTemplateService.queryList(bo);
-        ExcelUtil<DistributionActivityTemplateVo> util = new ExcelUtil<DistributionActivityTemplateVo>(DistributionActivityTemplateVo.class);
-        return util.exportExcel(list, "【请填写功能名称】");
-    }
-
-    /**
-     * 获取分销活动模板详细信息
-     */
-    @ApiOperation("获取分销活动模板详细信息")
-    @GetMapping("/{id}")
-    public AjaxResult<DistributionActivityTemplateVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iDistributionActivityTemplateService.queryById(id));
-    }
-
-    /**
-     * 新增【请填写功能名称】
-     */
-    @ApiOperation("新增分销活动模板")
-    @PostMapping("/save")
-    public AjaxResult<Void> add(@RequestBody DistributionActivityTemplateAddBo bo) {
-        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setCreateTopSysUserId(loginUser.getUser().getUserId());
-        return toAjax(iDistributionActivityTemplateService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改【请填写功能名称】
-     */
-    @ApiOperation("修改分销活动模板")
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody DistributionActivityTemplateEditBo bo) {
-        return toAjax(iDistributionActivityTemplateService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 启用/禁用
-     */
-    @ApiOperation("启用/禁用")
-    @PostMapping("/update/status")
-    public AjaxResult<Void> updateStatus(@RequestBody DistributionStatusEditBo bo) {
-        return toAjax(iDistributionActivityTemplateService.updateStatus(bo) ? 1 : 0);
-    }
-
-    /**
-     * 活动模板发布
-     */
-    @ApiOperation("活动模板发布")
-    @GetMapping("/publish/{templateId}")
-    public AjaxResult<Void> publishActivity(@PathVariable("templateId") Long templateId) {
-        return toAjax(iDistributionActivityTemplateService.publishActivity(templateId) ? 1 : 0);
-    }
-
-
-    /**
-     * 分销业务员列表
-     */
-    @ApiOperation("分销业务员列表")
-    @GetMapping("/seller/list")
-    public TableDataInfo<DistributionSellerVo> sellerList(DistributionSellerQuery query) {
-        startPage();
-        List<DistributionSellerVo> list = iDistributionActivityTemplateService.sellerList(query);
-        return getDataTable(list);
-    }
-
-    /**
-     * 机构分销排行榜
-     */
-    @ApiOperation("机构分销排行榜")
-    @GetMapping("/sort/notice")
-    public TableDataInfo<TenantSortNoticeVo> getTenantSortNotice(TenantSortNoticeQueryBo bo) {
-        startPage();
-        List<TenantSortNoticeVo> list = iDistributionActivityTemplateService.getTenantSortNotice(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 机构所有分销订单
-     */
-    @ApiOperation("机构所有分销订单")
-    @GetMapping("/org/order")
-    public TableDataInfo<TenantOrderVo> getOrgOrder(TenantOrderQueryBo bo) {
-        startPage();
-        List<TenantOrderVo> list = iDistributionActivityTemplateService.getOrgOrder(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 佣金列表
-     */
-    @ApiOperation("佣金列表")
-    @GetMapping("/cash/list")
-    public TableDataInfo<DistributionCashTopVo> getOrgCashList(DistributionCashTopQueryBo bo) {
-        startPage();
-        List<DistributionCashTopVo> list = iDistributionActivityTemplateService.getOrgCashList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 佣金详情
-     */
-    @ApiOperation("佣金详情")
-    @GetMapping("/cash/detail")
-    public TableDataInfo<TopSellerOrderVo> getOrgCashDetail(TopSellerOrderQueryBo bo) {
-        startPage();
-        List<TopSellerOrderVo> list = iDistributionActivityTemplateService.getOrgCashDetail(bo);
-        return getDataTable(list);
-    }
-
-
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTemplateGoodsController.java

@@ -1,92 +0,0 @@
-package com.zhongzheng.controller.distribution;
-
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateGoodsAddBo;
-import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateGoodsEditBo;
-import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateGoodsQueryBo;
-import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemplateGoodsService;
-import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTemplateGoodsVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 【请填写功能名称】Controller
- * 
- * @author ruoyi
- * @date 2023-03-06
- */
-@Api(value = "【请填写功能名称】控制器", tags = {"【请填写功能名称】管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/goods")
-public class DistributionActivityTemplateGoodsController extends BaseController {
-
-    private final IDistributionActivityTemplateGoodsService iDistributionActivityTemplateGoodsService;
-
-    /**
-     * 查询【请填写功能名称】列表
-     */
-    @ApiOperation("查询【请填写功能名称】列表")
-    @GetMapping("/list")
-    public TableDataInfo<DistributionActivityTemplateGoodsVo> list(DistributionActivityTemplateGoodsQueryBo bo) {
-        startPage();
-        List<DistributionActivityTemplateGoodsVo> list = iDistributionActivityTemplateGoodsService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出【请填写功能名称】列表
-     */
-    @ApiOperation("导出【请填写功能名称】列表")
-    @GetMapping("/export")
-    public AjaxResult<DistributionActivityTemplateGoodsVo> export(DistributionActivityTemplateGoodsQueryBo bo) {
-        List<DistributionActivityTemplateGoodsVo> list = iDistributionActivityTemplateGoodsService.queryList(bo);
-        ExcelUtil<DistributionActivityTemplateGoodsVo> util = new ExcelUtil<DistributionActivityTemplateGoodsVo>(DistributionActivityTemplateGoodsVo.class);
-        return util.exportExcel(list, "【请填写功能名称】");
-    }
-
-    /**
-     * 获取【请填写功能名称】详细信息
-     */
-    @ApiOperation("获取【请填写功能名称】详细信息")
-    @GetMapping("/{id}")
-    public AjaxResult<DistributionActivityTemplateGoodsVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iDistributionActivityTemplateGoodsService.queryById(id));
-    }
-
-    /**
-     * 新增【请填写功能名称】
-     */
-    @ApiOperation("新增【请填写功能名称】")
-    @PostMapping("/save")
-    public AjaxResult<Void> add(@RequestBody DistributionActivityTemplateGoodsAddBo bo) {
-        return toAjax(iDistributionActivityTemplateGoodsService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改【请填写功能名称】
-     */
-    @ApiOperation("修改【请填写功能名称】")
-    @PostMapping()
-    public AjaxResult<Void> edit(@RequestBody DistributionActivityTemplateGoodsEditBo bo) {
-        return toAjax(iDistributionActivityTemplateGoodsService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除【请填写功能名称】
-     */
-    @ApiOperation("删除【请填写功能名称】")
-    @DeleteMapping("/{ids}")
-    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iDistributionActivityTemplateGoodsService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTemplatePosterController.java

@@ -1,90 +0,0 @@
-package com.zhongzheng.controller.distribution;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplatePosterAddBo;
-import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplatePosterQueryBo;
-import com.zhongzheng.modules.top.distribution.bo.distributionActivityTemplatePosterEditBo;
-import com.zhongzheng.modules.top.distribution.domain.DistributionActivityTemplateImage;
-import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemplateImageService;
-import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemplatePosterService;
-import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTemplateImageVo;
-import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTemplatePosterVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 【分销海报模板控制器】Controller
- * 
- * @author ruoyi
- * @date 2023-03-06
- */
-@Api("分销海报模板控制器")
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/distribution/poster")
-public class DistributionActivityTemplatePosterController extends BaseController {
-
-    private final IDistributionActivityTemplatePosterService iDistributionActivityTemplatePosterService;
-
-    private final IDistributionActivityTemplateImageService iDistributionActivityTemplateImageService;
-
-    /**
-     * 查询海报模板列表
-     */
-    @ApiOperation("查询海报模板列表")
-    @GetMapping("/list")
-    public TableDataInfo<DistributionActivityTemplatePosterVo> list(DistributionActivityTemplatePosterQueryBo bo) {
-        startPage();
-        List<DistributionActivityTemplatePosterVo> list = iDistributionActivityTemplatePosterService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 获取模板底图列表
-     */
-    @ApiOperation("获取海报模板底图列表")
-    @GetMapping("/image/list")
-    public AjaxResult<List<DistributionActivityTemplateImageVo>> list() {
-        List<DistributionActivityTemplateImage> imageList = iDistributionActivityTemplateImageService.list(new LambdaQueryWrapper<DistributionActivityTemplateImage>().eq(DistributionActivityTemplateImage::getStatus,1));
-        List<DistributionActivityTemplateImageVo> voList = imageList.stream().map(item -> BeanUtil.toBean(item, DistributionActivityTemplateImageVo.class)).collect(Collectors.toList());
-        return AjaxResult.success(voList);
-    }
-
-    /**
-     * 获取【请填写功能名称】详细信息
-     */
-    @ApiOperation("获取海报模板详细信息")
-    @GetMapping("/{posterTempId}")
-    public AjaxResult<DistributionActivityTemplatePosterVo> getInfo(@PathVariable("posterTempId" ) Long posterTempId) {
-        return AjaxResult.success(iDistributionActivityTemplatePosterService.queryById(posterTempId));
-    }
-
-    /**
-     * 新增【请填写功能名称】
-     */
-    @ApiOperation("新增海报模板")
-    @PostMapping("/save")
-    public AjaxResult<Void> add(@RequestBody DistributionActivityTemplatePosterAddBo bo) {
-        return toAjax(iDistributionActivityTemplatePosterService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改【请填写功能名称】
-     */
-    @ApiOperation("修改海报模板")
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody distributionActivityTemplatePosterEditBo bo) {
-        return toAjax(iDistributionActivityTemplatePosterService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTemplateRelationController.java

@@ -1,92 +0,0 @@
-package com.zhongzheng.controller.distribution;
-
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateRelationAddBo;
-import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateRelationEditBo;
-import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateRelationQueryBo;
-import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemplateRelationService;
-import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTemplateRelationVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 【请填写功能名称】Controller
- * 
- * @author ruoyi
- * @date 2023-03-06
- */
-@Api(value = "【请填写功能名称】控制器", tags = {"【请填写功能名称】管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/relation")
-public class DistributionActivityTemplateRelationController extends BaseController {
-
-    private final IDistributionActivityTemplateRelationService iDistributionActivityTemplateRelationService;
-
-    /**
-     * 查询【请填写功能名称】列表
-     */
-    @ApiOperation("查询【请填写功能名称】列表")
-    @GetMapping("/list")
-    public TableDataInfo<DistributionActivityTemplateRelationVo> list(DistributionActivityTemplateRelationQueryBo bo) {
-        startPage();
-        List<DistributionActivityTemplateRelationVo> list = iDistributionActivityTemplateRelationService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出【请填写功能名称】列表
-     */
-    @ApiOperation("导出【请填写功能名称】列表")
-    @GetMapping("/export")
-    public AjaxResult<DistributionActivityTemplateRelationVo> export(DistributionActivityTemplateRelationQueryBo bo) {
-        List<DistributionActivityTemplateRelationVo> list = iDistributionActivityTemplateRelationService.queryList(bo);
-        ExcelUtil<DistributionActivityTemplateRelationVo> util = new ExcelUtil<DistributionActivityTemplateRelationVo>(DistributionActivityTemplateRelationVo.class);
-        return util.exportExcel(list, "【请填写功能名称】");
-    }
-
-    /**
-     * 获取【请填写功能名称】详细信息
-     */
-    @ApiOperation("获取【请填写功能名称】详细信息")
-    @GetMapping("/{id}")
-    public AjaxResult<DistributionActivityTemplateRelationVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iDistributionActivityTemplateRelationService.queryById(id));
-    }
-
-    /**
-     * 新增【请填写功能名称】
-     */
-    @ApiOperation("新增【请填写功能名称】")
-    @PostMapping("/save")
-    public AjaxResult<Void> add(@RequestBody DistributionActivityTemplateRelationAddBo bo) {
-        return toAjax(iDistributionActivityTemplateRelationService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改【请填写功能名称】
-     */
-    @ApiOperation("修改【请填写功能名称】")
-    @PostMapping()
-    public AjaxResult<Void> edit(@RequestBody DistributionActivityTemplateRelationEditBo bo) {
-        return toAjax(iDistributionActivityTemplateRelationService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除【请填写功能名称】
-     */
-    @ApiOperation("删除【请填写功能名称】")
-    @DeleteMapping("/{ids}")
-    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iDistributionActivityTemplateRelationService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/goods/TopGoodsController.java

@@ -1,62 +0,0 @@
-package com.zhongzheng.controller.goods;
-
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.modules.goods.vo.TopGoodsVo;
-import com.zhongzheng.modules.top.goods.bo.TopGoodsQueryBo;
-import com.zhongzheng.modules.top.goods.service.ITopGoodsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 商品Controller
- *
- * @author hjl
- * @date 2021-10-12
- */
-@Api(value = "商品控制器", tags = {"商品管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/goods")
-public class TopGoodsController extends BaseController {
-
-    private final ITopGoodsService iTopGoodsService;
-
-    /**
-     * 商品批量复制
-     */
-    @ApiOperation("商品批量复制（全量）")
-    @GetMapping("/batch/copy/all")
-    public AjaxResult<Void> goodsBatchCopyTenant() {
-        return toAjax(iTopGoodsService.goodsBatchCopyTenant() ? 1 : 0);
-    }
-
-    /**
-     * 商品关系ID处理（全量复制后的处理方法）
-     */
-    @ApiOperation("商品关系ID处理（全量复制后的处理方法）")
-    @GetMapping("/batch/copy/dispose")
-    public AjaxResult<Void> goodsBatchCopyDisposeTenant() {
-        return toAjax(iTopGoodsService.goodsBatchCopyDisposeTenant() ? 1 : 0);
-    }
-
-    /**
-     * 查询商品列表
-     */
-    @ApiOperation("查询商品列表")
-    @GetMapping("/list")
-    public TableDataInfo<TopGoodsVo> list(TopGoodsQueryBo bo) {
-        startPage();
-        List<TopGoodsVo> list = iTopGoodsService.selectList(bo);
-        return getDataTable(list);
-    }
-
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/system/SuperSysLoginController.java

@@ -1,134 +0,0 @@
-package com.zhongzheng.controller.system;
-
-import com.zhongzheng.common.constant.Constants;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.domain.entity.TopSysUser;
-import com.zhongzheng.common.core.domain.model.LoginBody;
-import com.zhongzheng.common.core.domain.model.TopLoginUser;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.framework.web.service.TokenService;
-import com.zhongzheng.framework.web.service.TopSysLoginService;
-import com.zhongzheng.framework.web.service.TopSysPermissionService;
-import com.zhongzheng.framework.web.service.TopTokenService;
-import com.zhongzheng.modules.top.user.domain.TopSysMenu;
-import com.zhongzheng.modules.top.user.service.ITopSysMenuService;
-import com.zhongzheng.modules.top.user.service.ITopSysUserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * 登录验证
- *
- * @author zhongzheng
- */
-@Api(tags ="登录用户操作管理")
-@RestController
-public class SuperSysLoginController
-{
-    @Autowired
-    private TopSysLoginService loginService;
-
-    @Autowired
-    private ITopSysMenuService menuService;
-
-    @Autowired
-    private TopSysPermissionService permissionService;
-
-    @Autowired
-    private TopTokenService topTokenService;
-
-
-
-    @Autowired
-    private TokenService tokenService;
-
-    @Autowired
-    private ITopSysUserService userService;
-    /**
-     * 登录方法
-     *
-     * @param loginBody 登录信息
-     * @return 结果
-     */
-    @ApiOperation("登录")
-    @PostMapping("/login")
-    public AjaxResult login(@RequestBody LoginBody loginBody)
-    {
-        AjaxResult ajax = AjaxResult.success();
-
-        // 生成令牌
-        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
-                loginBody.getUuid());
-        ajax.put(Constants.TOKEN, token);
-        return ajax;
-    }
-
-    /**
-     * 获取用户信息
-     *
-     * @return 用户信息
-     */
-    @ApiOperation("登录用户信息")
-    @GetMapping("getInfo")
-    public AjaxResult getInfo()
-    {
-        TopLoginUser loginUser = topTokenService.getLoginUser(ServletUtils.getRequest());
-        TopSysUser user = loginUser.getUser();
-
-        // 角色集合
-        Set<String> roles = permissionService.getRolePermission(user);
-        // 权限集合
-        Set<String> permissions = permissionService.getMenuPermission(user);
-        Map<String,Object> map = new HashMap<>();
-        map.put("user", user);
-        map.put("roles", roles);
-        map.put("permissions", permissions);
-
-        return AjaxResult.success(map);
-
-    }
-
-    /**
-     * 获取路由信息
-     *
-     * @return 路由信息
-     */
-    @ApiOperation("路由菜单信息")
-    @GetMapping("getRouters")
-    public AjaxResult getRouters()
-    {
-        TopLoginUser loginUser = topTokenService.getLoginUser(ServletUtils.getRequest());
-        // 用户信息
-        TopSysUser user = loginUser.getUser();
-        List<TopSysMenu> menus = menuService.selectMenuTreeByUserId(user.getUserId());
-        return AjaxResult.success(menuService.buildMenus(menus));
-    }
-
-//    /**
-//     * 获取子系统令牌
-//     *
-//     * @return 获取子系统令牌
-//     */
-//    @ApiOperation("获取子系统令牌")
-//    @GetMapping("getChildToken")
-//    public AjaxResult getChildToken()
-//    {
-//        //普通系统用户
-//        TopSysUser user = userService.selectUserByUserName("admin");
-//        TopLoginUser loginUser = new TopLoginUser(user, permissionService.getMenuPermission(user));
-//        String token = tokenService.createToken(loginUser);
-//        AjaxResult ajax = AjaxResult.success();
-//        ajax.put(Constants.TOKEN, token);
-//        return ajax;
-//    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/system/SysTenantController.java

@@ -1,113 +0,0 @@
-package com.zhongzheng.controller.system;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.system.bo.SysTenantAddBo;
-import com.zhongzheng.modules.system.bo.SysTenantEditBo;
-import com.zhongzheng.modules.system.bo.SysTenantQueryBo;
-import com.zhongzheng.modules.system.service.ISysTenantService;
-import com.zhongzheng.modules.system.vo.SysTenantVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 系统商户Controller
- *
- * @author hjl
- * @date 2021-08-03
- */
-@Api(value = "系统商户控制器", tags = {"系统商户管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/tenant")
-public class SysTenantController extends BaseController {
-
-    private final ISysTenantService iSysTenantService;
-
-    /**
-     * 查询系统商户列表
-     */
-    @ApiOperation("查询系统商户列表")
-    @PreAuthorize("@ss.hasPermi('system:tenant:list')")
-    @GetMapping("/list")
-    public TableDataInfo<SysTenantVo> list(SysTenantQueryBo bo) {
-        startPage();
-        List<SysTenantVo> list = iSysTenantService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出系统商户列表
-     */
-   /* @ApiOperation("导出系统商户列表")
-    @PreAuthorize("@ss.hasPermi('system:tenant:export')")
-    @Log(title = "系统商户", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<SysTenantVo> export(SysTenantQueryBo bo) {
-        List<SysTenantVo> list = iSysTenantService.queryList(bo);
-        ExcelUtil<SysTenantVo> util = new ExcelUtil<SysTenantVo>(SysTenantVo.class);
-        return util.exportExcel(list, "系统商户");
-    }*/
-
-    /**
-     * 获取系统商户详细信息
-     */
-    @ApiOperation("获取系统商户详细信息")
-    @PreAuthorize("@ss.hasPermi('system:tenant:query')")
-    @GetMapping("/{tenantId}")
-    public AjaxResult<SysTenantVo> getInfo(@PathVariable("tenantId" ) Long tenantId) {
-        return AjaxResult.success(iSysTenantService.queryById(tenantId));
-    }
-
-    /**
-     * 新增系统商户
-     */
-    @ApiOperation("新增系统商户")
-    @PreAuthorize("@ss.hasPermi('system:tenant:add')")
-    @Log(title = "系统商户", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@Validated @RequestBody SysTenantAddBo bo) {
-        return toAjax(iSysTenantService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改系统商户
-     */
-    @ApiOperation("修改系统商户")
-    @PreAuthorize("@ss.hasPermi('system:tenant:edit')")
-    @Log(title = "系统商户", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody SysTenantEditBo bo) {
-        return toAjax(iSysTenantService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除系统商户
-     */
-   /* @ApiOperation("删除系统商户")
-    @PreAuthorize("@ss.hasPermi('system:tenant:remove')")
-    @Log(title = "系统商户" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{tenantIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] tenantIds) {
-        return toAjax(iSysTenantService.deleteWithValidByIds(Arrays.asList(tenantIds), true) ? 1 : 0);
-    }*/
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysConfigController.java

@@ -1,140 +0,0 @@
-package com.zhongzheng.controller.top;
-
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.annotation.RepeatSubmit;
-import com.zhongzheng.common.constant.UserConstants;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.SecurityUtils;
-import com.zhongzheng.modules.top.user.service.ITopSysConfigService;
-import com.zhongzheng.modules.top.user.vo.TopSysConfigVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 【请填写功能名称】Controller
- * 
- * @author ruoyi
- * @date 2023-03-10
- */
-@Api(value = "【请填写功能名称】控制器", tags = {"【请填写功能名称】管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/config")
-public class TopSysConfigController extends BaseController {
-    @Autowired
-    private ITopSysConfigService topConfigService;
-
-    /**
-     * 获取参数配置列表
-     */
-    @ApiOperation("配置列表")
-    @PreAuthorize("@ss.hasPermi('system:config:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(TopSysConfigVo config)
-    {
-        startPage();
-        List<TopSysConfigVo> list = topConfigService.selectConfigList(config);
-        return getDataTable(list);
-    }
-
-    /*@Log(title = "参数管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:config:export')")
-    @GetMapping("/export")
-    public AjaxResult export(SysConfig config)
-    {
-        List<SysConfig> list = topConfigService.selectConfigList(config);
-        ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
-        return util.exportExcel(list, "参数数据");
-    }*/
-
-    /**
-     * 根据参数编号获取详细信息
-     */
-    @ApiOperation("通过ID配置详情")
-    @PreAuthorize("@ss.hasPermi('system:config:query')")
-    @GetMapping(value = "/{configId}")
-    public AjaxResult getInfo(@PathVariable Long configId)
-    {
-        return AjaxResult.success(topConfigService.selectConfigById(configId));
-    }
-
-    /**
-     * 根据参数键名查询参数值
-     */
-    @ApiOperation("通过KEY获取配置详情")
-    @GetMapping(value = "/configKey/{configKey}")
-    public AjaxResult getConfigKey(@PathVariable String configKey)
-    {
-        return AjaxResult.success("配置内容",topConfigService.selectConfigByKey(configKey));
-    }
-
-    /**
-     * 新增参数配置
-     */
-    @ApiOperation("新增配置")
-    @PreAuthorize("@ss.hasPermi('system:config:add')")
-    @Log(title = "参数管理", businessType = BusinessType.INSERT)
-    @PostMapping
-    @RepeatSubmit
-    public AjaxResult add(@Validated @RequestBody TopSysConfigVo config)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(topConfigService.checkConfigKeyUnique(config)))
-        {
-            return AjaxResult.error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
-        }
-        config.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(topConfigService.insertConfig(config));
-    }
-
-    /**
-     * 修改参数配置
-     */
-    @ApiOperation("修改配置")
-    @PreAuthorize("@ss.hasPermi('system:config:edit')")
-    @Log(title = "参数管理", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@Validated @RequestBody TopSysConfigVo config)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(topConfigService.checkConfigKeyUnique(config)))
-        {
-            return AjaxResult.error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
-        }
-        config.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(topConfigService.updateConfig(config));
-    }
-
-    /**
-     * 删除参数配置
-     */
-    @ApiOperation("删除配置")
-    @PreAuthorize("@ss.hasPermi('system:config:remove')")
-    @Log(title = "参数管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{configIds}")
-    public AjaxResult remove(@PathVariable Long[] configIds)
-    {
-        return toAjax(topConfigService.deleteConfigByIds(configIds));
-    }
-
-    /**
-     * 清空缓存
-     */
-    @ApiOperation("刷新配置缓存")
-    @PreAuthorize("@ss.hasPermi('system:config:remove')")
-    @Log(title = "参数管理", businessType = BusinessType.CLEAN)
-    @DeleteMapping("/clearCache")
-    public AjaxResult clearCache()
-    {
-        topConfigService.clearCache();
-        return AjaxResult.success();
-    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysDeptController.java

@@ -1,174 +0,0 @@
-package com.zhongzheng.controller.top;
-
-import cn.hutool.core.util.StrUtil;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.constant.UserConstants;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.SecurityUtils;
-import com.zhongzheng.modules.top.user.domain.TopSysDept;
-import com.zhongzheng.modules.top.user.service.ITopSysDeptService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 部门Controller
- * 
- * @author ruoyi
- * @date 2023-03-10
- */
-@Api(value = "部门控制器", tags = {"部门管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/dept")
-public class TopSysDeptController extends BaseController {
-    @Autowired
-    private ITopSysDeptService topDeptService;
-
-    /**
-     * 获取部门列表
-     */
-    @ApiOperation("部门列表")
-    @PreAuthorize("@ss.hasPermi('system:dept:list')")
-    @GetMapping("/list")
-    public AjaxResult list(TopSysDept dept)
-    {
-        List<TopSysDept> depts = topDeptService.selectDeptList(dept);
-        return AjaxResult.success(depts);
-    }
-
-    /**
-     * 查询部门列表（排除节点）
-     */
-    @ApiOperation("查询部门列表（节点）")
-    @PreAuthorize("@ss.hasPermi('system:dept:list')")
-    @GetMapping("/list/exclude/{deptId}")
-    public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
-    {
-        List<TopSysDept> depts = topDeptService.selectDeptList(new TopSysDept());
-        Iterator<TopSysDept> it = depts.iterator();
-        while (it.hasNext())
-        {
-            TopSysDept d = (TopSysDept) it.next();
-            if (d.getDeptId().intValue() == deptId
-                    || ArrayUtils.contains(StrUtil.split(d.getAncestors(), ","), deptId + ""))
-            {
-                it.remove();
-            }
-        }
-        return AjaxResult.success(depts);
-    }
-
-    /**
-     * 根据部门编号获取详细信息
-     */
-    @ApiOperation("根据部门编号获取详细信息")
-    @PreAuthorize("@ss.hasPermi('system:dept:query')")
-    @GetMapping(value = "/{deptId}")
-    public AjaxResult getInfo(@PathVariable Long deptId)
-    {
-        return AjaxResult.success(topDeptService.selectDeptById(deptId));
-    }
-
-    /**
-     * 获取部门下拉树列表
-     */
-    @ApiOperation("获取部门下拉树列表")
-    @GetMapping("/treeselect")
-    public AjaxResult treeselect(TopSysDept dept)
-    {
-        List<TopSysDept> depts = topDeptService.selectDeptList(dept);
-        return AjaxResult.success(topDeptService.buildDeptTreeSelect(depts));
-    }
-
-    /**
-     * 加载对应角色部门列表树
-     */
-    @ApiOperation("加载对应角色部门列表树")
-    @GetMapping(value = "/roleDeptTreeselect/{roleId}")
-    public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId)
-    {
-        List<TopSysDept> depts = topDeptService.selectDeptList(new TopSysDept());
-        Map<String,Object> map = new HashMap<>();
-        map.put("checkedKeys", topDeptService.selectDeptListByRoleId(roleId));
-        map.put("depts", topDeptService.buildDeptTreeSelect(depts));
-        return AjaxResult.success(map);
-    }
-
-    /**
-     * 新增部门
-     */
-    @ApiOperation("新增部门")
-    @ApiOperationSupport(includeParameters = {"deptName","parentId","orderNum","status"})
-    @PreAuthorize("@ss.hasPermi('system:dept:add')")
-    @Log(title = "部门管理", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@Validated @RequestBody TopSysDept dept)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(topDeptService.checkDeptNameUnique(dept)))
-        {
-            return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
-        }
-        dept.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(topDeptService.insertDept(dept));
-    }
-
-    /**
-     * 修改部门
-     */
-    @ApiOperation("修改部门")
-    @PreAuthorize("@ss.hasPermi('system:dept:edit')")
-    @Log(title = "部门管理", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult edit(@Validated @RequestBody TopSysDept dept)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(topDeptService.checkDeptNameUnique(dept)))
-        {
-            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
-        }
-        else if (dept.getParentId().equals(dept.getDeptId()))
-        {
-            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
-        }
-        else if (StrUtil.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
-                && topDeptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0)
-        {
-            return AjaxResult.error("该部门包含未停用的子部门！");
-        }
-        dept.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(topDeptService.updateDept(dept));
-    }
-
-    /**
-     * 删除部门
-     */
-    @ApiOperation("删除部门")
-    @PreAuthorize("@ss.hasPermi('system:dept:remove')")
-    @Log(title = "部门管理", businessType = BusinessType.DELETE)
-    @PostMapping("/delete")
-    public AjaxResult remove(@PathVariable Long deptId)
-    {
-        if (topDeptService.hasChildByDeptId(deptId))
-        {
-            return AjaxResult.error("存在下级部门,不允许删除");
-        }
-        if (topDeptService.checkDeptExistUser(deptId))
-        {
-            return AjaxResult.error("部门存在用户,不允许删除");
-        }
-        return toAjax(topDeptService.deleteDeptById(deptId));
-    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysDictDataController.java

@@ -1,125 +0,0 @@
-package com.zhongzheng.controller.top;
-
-import cn.hutool.core.lang.Validator;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.SecurityUtils;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.modules.top.user.domain.TopSysDictData;
-import com.zhongzheng.modules.top.user.service.ITopSysDictDataService;
-import com.zhongzheng.modules.top.user.service.ITopSysDictTypeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 【请填写功能名称】Controller
- * 
- * @author ruoyi
- * @date 2023-03-13
- */
-@Api(value = "【请填写功能名称】控制器", tags = {"【请填写功能名称】管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/dict/data")
-public class TopSysDictDataController extends BaseController {
-
-    private final ITopSysDictDataService dictDataService;
-
-    private final ITopSysDictTypeService dictTypeService;
-
-
-    @ApiOperation("获取字典数据列表")
-    //  @PreAuthorize("@ss.hasPermi('system:dict:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(TopSysDictData dictData)
-    {
-        startPage();
-        List<TopSysDictData> list = dictDataService.selectDictDataList(dictData);
-        return getDataTable(list);
-    }
-
-    @Log(title = "字典数据", businessType = BusinessType.EXPORT)
-    //  @PreAuthorize("@ss.hasPermi('system:dict:export')")
-    @GetMapping("/export")
-    public AjaxResult export(TopSysDictData dictData)
-    {
-        List<TopSysDictData> list = dictDataService.selectDictDataList(dictData);
-        ExcelUtil<TopSysDictData> util = new ExcelUtil<TopSysDictData>(TopSysDictData.class);
-        return util.exportExcel(list, "字典数据");
-    }
-
-    /**
-     * 查询字典数据详细
-     */
-    @ApiOperation("查询字典数据详细")
-    // @PreAuthorize("@ss.hasPermi('system:dict:query')")
-    @GetMapping(value = "/{dictCode}")
-    public AjaxResult getInfo(@PathVariable Long dictCode)
-    {
-        return AjaxResult.success(dictDataService.selectDictDataById(dictCode));
-    }
-
-    /**
-     * 根据字典类型查询字典数据信息
-     */
-    @ApiOperation("根据字典类型查询字典数据信息")
-    @GetMapping(value = "/type/{dictType}")
-    public AjaxResult dictType(@PathVariable String dictType)
-    {
-        List<TopSysDictData> data = dictTypeService.selectDictDataByType(dictType);
-        if (Validator.isNull(data))
-        {
-            data = new ArrayList<TopSysDictData>();
-        }
-        return AjaxResult.success(data);
-    }
-
-    /**
-     * 新增字典类型
-     */
-    @ApiOperation("新增字典数据")
-    @PreAuthorize("@ss.hasPermi('system:dict:add')")
-    @Log(title = "字典数据", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@Validated @RequestBody TopSysDictData dict)
-    {
-        dict.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(dictDataService.insertDictData(dict));
-    }
-
-    /**
-     * 修改保存字典类型
-     */
-    @ApiOperation("修改保存字典数据")
-    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
-    @Log(title = "字典数据", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult edit(@Validated @RequestBody TopSysDictData dict)
-    {
-        dict.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(dictDataService.updateDictData(dict));
-    }
-
-    /**
-     * 删除字典类型
-     */
-    @ApiOperation("删除字典数据")
-    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
-    @Log(title = "字典类型", businessType = BusinessType.DELETE)
-    @PostMapping("/delete/{dictCodes}")
-    public AjaxResult remove(@PathVariable Long[] dictCodes)
-    {
-        return toAjax(dictDataService.deleteDictDataByIds(dictCodes));
-    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysDictTypeController.java

@@ -1,117 +0,0 @@
-package com.zhongzheng.controller.top;
-
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.constant.UserConstants;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.SecurityUtils;
-import com.zhongzheng.modules.top.user.domain.TopSysDictType;
-import com.zhongzheng.modules.top.user.service.ITopSysDictTypeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 【请填写功能名称】Controller
- * 
- * @author ruoyi
- * @date 2023-03-13
- */
-@Api(value = "【请填写功能名称】控制器", tags = {"【请填写功能名称】管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/dict/type")
-public class TopSysDictTypeController extends BaseController {
-
-    private final ITopSysDictTypeService dictTypeService;
-
-    @ApiOperation("获取字典类型列表")
-    //   @PreAuthorize("@ss.hasPermi('system:dict:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(TopSysDictType dictType)
-    {
-        startPage();
-        List<TopSysDictType> list = dictTypeService.selectDictTypeList(dictType);
-        return getDataTable(list);
-    }
-    
-
-    /**
-     * 查询字典类型详细
-     */
-    @ApiOperation("查询字典类型详细")
-    //   @PreAuthorize("@ss.hasPermi('system:dict:query')")
-    @GetMapping(value = "/{dictId}")
-    public AjaxResult getInfo(@PathVariable Long dictId)
-    {
-        return AjaxResult.success(dictTypeService.selectDictTypeById(dictId));
-    }
-
-    /**
-     * 新增字典类型
-     */
-    @ApiOperation("新增字典类型")
-    @PreAuthorize("@ss.hasPermi('system:dict:add')")
-    @Log(title = "字典类型", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@Validated @RequestBody TopSysDictType dict)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
-        {
-            return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
-        }
-        dict.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(dictTypeService.insertDictType(dict));
-    }
-
-    /**
-     * 修改字典类型
-     */
-    @ApiOperation("修改字典类型")
-    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
-    @Log(title = "字典类型", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult edit(@Validated @RequestBody TopSysDictType dict)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
-        {
-            return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
-        }
-        dict.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(dictTypeService.updateDictType(dict));
-    }
-
-    /**
-     * 删除字典类型
-     */
-    @ApiOperation("删除字典类型")
-    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
-    @Log(title = "字典类型", businessType = BusinessType.DELETE)
-    @PostMapping("/delete/{dictIds}")
-    public AjaxResult remove(@PathVariable Long[] dictIds)
-    {
-        return toAjax(dictTypeService.deleteDictTypeByIds(dictIds));
-    }
-
-    /**
-     * 清空缓存
-     */
-
-    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
-    @Log(title = "字典类型", businessType = BusinessType.CLEAN)
-    @DeleteMapping("/clearCache")
-    public AjaxResult clearCache()
-    {
-        dictTypeService.clearCache();
-        return AjaxResult.success();
-    }
-
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysMenuController.java

@@ -1,169 +0,0 @@
-package com.zhongzheng.controller.top;
-
-import cn.hutool.core.util.StrUtil;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.constant.Constants;
-import com.zhongzheng.common.constant.UserConstants;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.domain.model.TopLoginUser;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.SecurityUtils;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.framework.web.service.TopTokenService;
-import com.zhongzheng.modules.top.user.domain.TopSysMenu;
-import com.zhongzheng.modules.top.user.service.ITopSysMenuService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 【请填写功能名称】Controller
- * 
- * @author ruoyi
- * @date 2023-03-10
- */
-@Api(value = "【请填写功能名称】控制器", tags = {"【请填写功能名称】管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/menu")
-public class TopSysMenuController extends BaseController {
-    @Autowired
-    private ITopSysMenuService topMenuService;
-
-    @Autowired
-    private TopTokenService tokenService;
-
-    /**
-     * 获取菜单列表
-     */
-    @ApiOperation("获取菜单列表")
-    @PreAuthorize("@ss.hasPermi('system:menu:list')")
-    @GetMapping("/list")
-    public AjaxResult list(TopSysMenu menu)
-    {
-        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = loginUser.getUser().getUserId();
-        List<TopSysMenu> menus = topMenuService.selectMenuList(menu, userId);
-        return AjaxResult.success(menus);
-    }
-
-    /**
-     * 根据菜单编号获取详细信息
-     */
-    @ApiOperation("根据菜单编号获取详细信息")
-    @PreAuthorize("@ss.hasPermi('system:menu:query')")
-    @GetMapping(value = "/{menuId}")
-    public AjaxResult getInfo(@PathVariable Long menuId)
-    {
-        return AjaxResult.success(topMenuService.selectMenuById(menuId));
-    }
-
-    /**
-     * 获取菜单下拉树列表
-     */
-    @ApiOperation("获取菜单下拉树列表")
-    @ApiOperationSupport(includeParameters = {})
-    @GetMapping("/treeselect")
-    public AjaxResult treeselect(TopSysMenu menu)
-    {
-        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = loginUser.getUser().getUserId();
-        List<TopSysMenu> menus = topMenuService.selectMenuList(menu, userId);
-        return AjaxResult.success(topMenuService.buildMenuTreeSelect(menus));
-    }
-
-    /**
-     * 加载对应角色菜单列表树
-     */
-    @ApiOperation("加载对应角色菜单列表树")
-    @GetMapping(value = "/roleMenuTreeselect/{roleId}")
-    public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
-    {
-        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        List<TopSysMenu> menus = topMenuService.selectMenuList(loginUser.getUser().getUserId());
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("checkedKeys", topMenuService.selectMenuListByRoleId(roleId));
-        ajax.put("menus", topMenuService.buildMenuTreeSelect(menus));
-        return ajax;
-    }
-
-    /**
-     * 新增菜单
-     */
-    @ApiOperation("新增菜单")
-    @ApiOperationSupport(ignoreParameters = {"children","createBy","createTime","menuId","params"
-            ,"parentName","remark","updateBy","updateTime"})
-    @PreAuthorize("@ss.hasPermi('system:menu:add')")
-    @Log(title = "菜单管理", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@Validated @RequestBody TopSysMenu menu)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(topMenuService.checkMenuNameUnique(menu)))
-        {
-            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
-        }
-        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
-                && !StrUtil.startWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
-        {
-            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
-        }
-        menu.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(topMenuService.insertMenu(menu));
-    }
-
-    /**
-     * 修改菜单
-     */
-    @ApiOperation("修改菜单")
-    @ApiOperationSupport(ignoreParameters = {"children","createBy","createTime","params"
-            ,"parentName","remark","updateBy","updateTime"})
-    @PreAuthorize("@ss.hasPermi('system:menu:edit')")
-    @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult edit(@Validated @RequestBody TopSysMenu menu)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(topMenuService.checkMenuNameUnique(menu)))
-        {
-            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
-        }
-        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
-                && !StrUtil.startWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
-        {
-            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
-        }
-        else if (menu.getMenuId().equals(menu.getParentId()))
-        {
-            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
-        }
-        menu.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(topMenuService.updateMenu(menu));
-    }
-
-    /**
-     * 删除菜单
-     */
-    @ApiOperation("删除菜单")
-    @PreAuthorize("@ss.hasPermi('system:menu:remove')")
-    @Log(title = "菜单管理", businessType = BusinessType.DELETE)
-    @PostMapping("/delete/{menuId}")
-    public AjaxResult remove(@PathVariable Long menuId)
-    {
-        if (topMenuService.hasChildByMenuId(menuId))
-        {
-            return AjaxResult.error("存在子菜单,不允许删除");
-        }
-        if (topMenuService.checkMenuExistRole(menuId))
-        {
-            return AjaxResult.error("菜单已分配,不允许删除");
-        }
-        return toAjax(topMenuService.deleteMenuById(menuId));
-    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysRoleController.java

@@ -1,192 +0,0 @@
-package com.zhongzheng.controller.top;
-
-import cn.hutool.core.lang.Validator;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.constant.UserConstants;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.domain.model.TopLoginUser;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.SecurityUtils;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.framework.web.service.TopSysPermissionService;
-import com.zhongzheng.framework.web.service.TopTokenService;
-import com.zhongzheng.modules.top.user.domain.TopSysRole;
-import com.zhongzheng.modules.top.user.service.ITopSysRoleService;
-import com.zhongzheng.modules.top.user.service.ITopSysUserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 角色信息Controller
- * 
- * @author ruoyi
- * @date 2023-03-10
- */
-@Api(value = "角色信息控制器", tags = {"角色信息管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("system/role")
-public class TopSysRoleController extends BaseController {
-    @Autowired
-    private ITopSysRoleService topSysRoleService;
-
-    @Autowired
-    private TopTokenService tokenService;
-
-    @Autowired
-    private TopSysPermissionService topSysPermissionService;
-
-    @Autowired
-    private ITopSysUserService topSysUserService;
-
-    @ApiOperation("角色列表")
-    @PreAuthorize("@ss.hasPermi('system:role:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(TopSysRole role)
-    {
-        startPage();
-        List<TopSysRole> list = topSysRoleService.selectRoleList(role);
-        return getDataTable(list);
-    }
-
-    @Log(title = "角色管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:role:export')")
-    @GetMapping("/export")
-    public AjaxResult export(TopSysRole role)
-    {
-        List<TopSysRole> list = topSysRoleService.selectRoleList(role);
-        ExcelUtil<TopSysRole> util = new ExcelUtil<TopSysRole>(TopSysRole.class);
-        return util.exportExcel(list, "角色数据");
-    }
-
-    /**
-     * 根据角色编号获取详细信息
-     */
-    @ApiOperation("根据角色编号获取详细信息")
-    @PreAuthorize("@ss.hasPermi('system:role:query')")
-    @GetMapping(value = "/{roleId}")
-    public AjaxResult getInfo(@PathVariable Long roleId)
-    {
-        return AjaxResult.success(topSysRoleService.selectRoleById(roleId));
-    }
-
-    /**
-     * 新增角色
-     */
-    @ApiOperation("新增角色")
-    @ApiOperationSupport(ignoreParameters = {"createBy","createTime","dataScope","delFlag","updateTime"
-            ,"flag","params","roleId","updateBy","deptIds","deptCheckStrictly","menuCheckStrictly"})
-    @PreAuthorize("@ss.hasPermi('system:role:add')")
-    @Log(title = "角色管理", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@Validated @RequestBody TopSysRole role)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(topSysRoleService.checkRoleNameUnique(role)))
-        {
-            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
-        }
-        else if (UserConstants.NOT_UNIQUE.equals(topSysRoleService.checkRoleKeyUnique(role)))
-        {
-            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
-        }
-        role.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(topSysRoleService.insertRole(role));
-
-    }
-
-    /**
-     * 修改保存角色
-     */
-    @ApiOperation("修改保存角色")
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
-    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult edit(@Validated @RequestBody TopSysRole role)
-    {
-        topSysRoleService.checkRoleAllowed(role);
-        if (UserConstants.NOT_UNIQUE.equals(topSysRoleService.checkRoleNameUnique(role)))
-        {
-            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
-        }
-        else if (UserConstants.NOT_UNIQUE.equals(topSysRoleService.checkRoleKeyUnique(role)))
-        {
-            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
-        }
-        role.setUpdateBy(SecurityUtils.getUsername());
-
-        if (topSysRoleService.updateRole(role) > 0)
-        {
-            // 更新缓存用户权限
-            TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-            if (Validator.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
-            {
-                loginUser.setPermissions(topSysPermissionService.getMenuPermission(loginUser.getUser()));
-                loginUser.setUser(topSysUserService.selectUserByUserName(loginUser.getUser().getUserName()));
-                tokenService.setLoginUser(loginUser);
-            }
-            return AjaxResult.success();
-        }
-        return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
-    }
-
-    /**
-     * 修改保存数据权限
-     */
-    @ApiOperation("修改保存数据权限")
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
-    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
-    @PostMapping("/dataScope")
-    public AjaxResult dataScope(@RequestBody TopSysRole role)
-    {
-        topSysRoleService.checkRoleAllowed(role);
-        return toAjax(topSysRoleService.authDataScope(role));
-    }
-
-    /**
-     * 状态修改
-     */
-    @ApiOperation("状态修改")
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
-    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
-    @PostMapping("/changeStatus")
-    public AjaxResult changeStatus(@RequestBody TopSysRole role)
-    {
-        topSysRoleService.checkRoleAllowed(role);
-        role.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(topSysRoleService.updateRoleStatus(role));
-    }
-
-    /**
-     * 删除角色
-     */
-    @ApiOperation("删除角色")
-    @PreAuthorize("@ss.hasPermi('system:role:remove')")
-    @Log(title = "角色管理", businessType = BusinessType.DELETE)
-    @PostMapping("/delete/{roleIds}")
-    public AjaxResult remove(@PathVariable Long[] roleIds)
-    {
-        return toAjax(topSysRoleService.deleteRoleByIds(roleIds));
-    }
-
-    /**
-     * 获取角色选择框列表
-     */
-    @ApiOperation("获取角色选择框列表")
-    @PreAuthorize("@ss.hasPermi('system:role:query')")
-    @GetMapping("/optionselect")
-    public AjaxResult optionselect()
-    {
-        return AjaxResult.success(topSysRoleService.selectRoleAll());
-    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysUserController.java

@@ -1,285 +0,0 @@
-package com.zhongzheng.controller.top;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.lang.Validator;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.constant.UserConstants;
-import com.zhongzheng.common.core.bo.SysUserEditBo;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.domain.entity.TopSysUser;
-import com.zhongzheng.common.core.domain.model.TopLoginUser;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.common.utils.SecurityUtils;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.common.utils.ToolsUtils;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.framework.web.service.TopTokenService;
-import com.zhongzheng.modules.course.bo.CourseBusinessQueryBo;
-import com.zhongzheng.modules.top.user.domain.TopSysRole;
-import com.zhongzheng.modules.top.user.service.ITopSysPostService;
-import com.zhongzheng.modules.top.user.service.ITopSysRoleService;
-import com.zhongzheng.modules.top.user.service.ITopSysUserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 用户信息
- *
- * @author zhongzheng
- */
-@Api(tags ="用户信息管理")
-@RestController
-@RequestMapping("/system/user")
-public class TopSysUserController extends BaseController
-{
-    @Autowired
-    private ITopSysUserService topSysUserService;
-
-    @Autowired
-    private ITopSysRoleService topSysRoleService;
-
-    @Autowired
-    private ITopSysPostService topSysPostService;
-
-    @Autowired
-    private TopTokenService tokenService;
-
-    @Resource
-    private AuthenticationManager authenticationManager;
-
-    /**
-     * 获取用户列表
-     */
-    @ApiOperation("获取用户列表")
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(TopSysUser user)
-    {
-        startPage();
-        List<TopSysUser> list = topSysUserService.selectUserList(user);
-        return getDataTable(list);
-    }
-
-    @Log(title = "用户管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:user:export')")
-    @GetMapping("/export")
-    public AjaxResult export(TopSysUser user)
-    {
-        List<TopSysUser> list = topSysUserService.selectUserList(user);
-        ExcelUtil<TopSysUser> util = new ExcelUtil<TopSysUser>(TopSysUser.class);
-        return util.exportExcel(list, "用户数据");
-    }
-
-    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
-    @PreAuthorize("@ss.hasPermi('system:user:import')")
-    @PostMapping("/importData")
-  /*  public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
-    {
-        ExcelUtil<TopSysUser> util = new ExcelUtil<TopSysUser>(TopSysUser.class);
-        List<TopSysUser> userList = util.importExcel(file.getInputStream());
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        String operName = loginUser.getUsername();
-        String message = topSysUserService.importUser(userList, updateSupport, operName);
-        return AjaxResult.success(message);
-    }*/
-
-    @GetMapping("/importTemplate")
-    public AjaxResult importTemplate()
-    {
-        ExcelUtil<TopSysUser> util = new ExcelUtil<TopSysUser>(TopSysUser.class);
-        return util.importTemplateExcel("用户数据");
-    }
-
-    /**
-     * 根据用户编号获取详细信息
-     */
-    @ApiOperation("获取用户详细")
-    @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path")
-    @PreAuthorize("@ss.hasPermi('system:user:query')")
-    @GetMapping(value = {  "/{userId}" })
-    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
-    {
-        AjaxResult ajax = AjaxResult.success();
-        List<TopSysRole> roles = topSysRoleService.selectRoleAll();
-        TopSysUser sysUser = topSysUserService.selectUserById(userId);
-        ajax.put("roles", TopSysUser.isAdmin(sysUser.getUserName()) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
-        ajax.put("posts", topSysPostService.selectPostAll());
-        if (Validator.isNotNull(userId))
-        {
-            ajax.put(AjaxResult.DATA_TAG, topSysUserService.selectUserById(userId));
-            ajax.put("postIds", topSysPostService.selectPostListByUserId(userId));
-            ajax.put("roleIds", topSysRoleService.selectRoleListByUserId(userId));
-        }
-        return ajax;
-    }
-
-    /**
-     * 新增用户
-     */
-    @ApiOperation("新增用户")
-    @ApiOperationSupport(ignoreParameters = {"id","orderDate.id"})
-    @PreAuthorize("@ss.hasPermi('system:user:add')")
-    @Log(title = "用户管理", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@Validated @RequestBody TopSysUser user)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(topSysUserService.checkUserNameUnique(user.getUserName())))
-        {
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
-        }
-        else if (Validator.isNotEmpty(user.getPhonenumber())
-                && UserConstants.NOT_UNIQUE.equals(topSysUserService.checkPhoneUnique(user)))
-        {
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
-        }
-        else if (Validator.isNotEmpty(user.getEmail())
-                && UserConstants.NOT_UNIQUE.equals(topSysUserService.checkEmailUnique(user)))
-        {
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
-        }
-        user.setCreateBy(SecurityUtils.getUsername());
-        if(!ToolsUtils.verifPwd(user.getPassword())){
-            throw new CustomException("密码应由8-16位数字、大小写字母、符号组成");
-        }
-        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
-        return toAjax(topSysUserService.insertUser(user));
-    }
-
-    /**
-     * 修改用户
-     */
-    @ApiOperation("更新用户")
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
-    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult edit(@Validated @RequestBody SysUserEditBo bo)
-    {
-        if (Validator.isNotEmpty(bo.getStatus())&&bo.getStatus().equals(-1)){
-            TopSysUser user = BeanUtil.toBean(bo, TopSysUser.class);
-            int result = topSysUserService.updateUser(user);
-            return toAjax(result);
-        }
-        TopSysUser user = BeanUtil.toBean(bo, TopSysUser.class);
-        topSysUserService.checkUserAllowed(user);
-        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        if(!loginUser.getUser().isAdmin()&& !loginUser.getUser().getUserId().equals(user.getUserId())){
-            return AjaxResult.error("您无权限修改本信息");
-        }
-
-        if (Validator.isNotEmpty(user.getPhonenumber())
-                && UserConstants.NOT_UNIQUE.equals(topSysUserService.checkPhoneUnique(user)))
-        {
-            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
-        }
-        else if (Validator.isNotEmpty(user.getEmail())
-                && UserConstants.NOT_UNIQUE.equals(topSysUserService.checkEmailUnique(user)))
-        {
-            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
-        }
-        if(Validator.isNotEmpty(user.getPassword())){
-            //重置密码
-            if(!loginUser.getUser().isAdmin()){
-                //普通用户需传入旧密码修改
-                // 旧密码用户验证
-                Authentication authentication = null;
-                try
-                {
-                    // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername
-                    authentication = authenticationManager
-                            .authenticate(new UsernamePasswordAuthenticationToken(loginUser.getUser().getUserName(), bo.getOldPassword()));
-                }
-                catch (Exception e)
-                {
-                    return AjaxResult.error("旧密码错误");
-                }
-
-            }
-            if(!ToolsUtils.verifPwd(user.getPassword())){
-                throw new CustomException("密码应由8-16位数字、大小写字母、符号组成");
-            }
-            user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
-        }
-        user.setUpdateBy(SecurityUtils.getUsername());
-        int result = topSysUserService.updateUser(user);
-        if(result>0){
-            TopSysUser newUser = topSysUserService.selectUserByUserName(loginUser.getUser().getUserName());
-            //同个用户ID则更新用户信息,admin操作其他用户则不更新
-            if(newUser.getUserId().equals(loginUser.getUser().getUserId())){
-                // 更新缓存用户
-                loginUser.setUser(newUser);
-            }
-            tokenService.setLoginUser(loginUser);
-        }
-        return toAjax(result);
-    }
-
-    /**
-     * 删除用户
-     */
-  /*  @ApiOperation("删除用户信息")
-    @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path")
-    @PreAuthorize("@ss.hasPermi('system:user:remove')")
-    @Log(title = "用户管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{userIds}")
-    public AjaxResult remove(@PathVariable Long[] userIds)
-    {
-        return toAjax(topSysUserService.deleteUserByIds(userIds));
-    }*/
-
-    /**
-     * 重置密码
-     */
-
-  /*  @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
-    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @PostMapping("/resetPwd")
-    public AjaxResult resetPwd(@RequestBody TopSysUser user)
-    {
-        topSysUserService.checkUserAllowed(user);
-        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
-        user.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(topSysUserService.resetPwd(user));
-    }*/
-
-    /**
-     * 状态修改
-     */
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
-    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @PutMapping("/changeStatus")
-    public AjaxResult changeStatus(@RequestBody TopSysUser user)
-    {
-        topSysUserService.checkUserAllowed(user);
-        user.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(topSysUserService.updateUserStatus(user));
-    }
-
-    /**
-     * 业务层次获取用户列表
-     */
-    @ApiOperation("业务层次获取用户列表")
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
-    @GetMapping("/businessPeopleList")
-    public TableDataInfo queryBusinessPeopleList(CourseBusinessQueryBo bo)
-    {
-        startPage();
-        List<TopSysUser> list = topSysUserService.queryBusinessPeopleList(bo);
-        return getDataTable(list);
-    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/core/config/SwaggerConfig.java

@@ -1,137 +0,0 @@
-package com.zhongzheng.core.config;
-
-import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
-import com.zhongzheng.common.config.RuoYiConfig;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.ParameterBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.schema.ModelRef;
-import springfox.documentation.service.*;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spi.service.contexts.SecurityContext;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Swagger2的接口配置
- *
- * @author zhongzheng
- */
-@Configuration
-@EnableSwagger2WebMvc
-@EnableKnife4j
-public class SwaggerConfig
-{
-    /** 系统基础配置 */
-    @Autowired
-    private RuoYiConfig ruoyiConfig;
-
-    /** 是否开启swagger */
-    @Value("${swagger.enabled}")
-    private boolean enabled;
-
-    /** 设置请求的统一前缀 */
-    @Value("${swagger.pathMapping}")
-    private String pathMapping;
-
-    /**
-     * 创建API
-     */
-    @Bean
-    public Docket createRestApi()
-    {
-        return new Docket(DocumentationType.SWAGGER_2)
-                // 是否启用Swagger
-                .enable(enabled)
-                // 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息）
-                .apiInfo(apiInfo())
-                // 设置哪些接口暴露给Swagger展示
-                .select()
-                // 扫描所有有注解的api，用这种方式更灵活
-                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
-                // 扫描指定包中的swagger注解
-                // .apis(RequestHandlerSelectors.basePackage("com.zhongzheng.project.tool.swagger"))
-                // 扫描所有 .apis(RequestHandlerSelectors.any())
-                .paths(PathSelectors.any())
-                .build()
-                /* 设置安全模式，swagger可以设置访问token */
-                //    .securitySchemes(securitySchemes())
-                .securityContexts(securityContexts())
-                .pathMapping(pathMapping)
-                .globalOperationParameters(getGlobalOperationParameters());
-    }
-
-    /**
-     * 安全模式，这里指定token通过AuthorizationToken头请求头传递
-     */
-    private List<ApiKey> securitySchemes()
-    {
-        List<ApiKey> apiKeyList = new ArrayList<ApiKey>();
-        apiKeyList.add(new ApiKey("AuthorizationToken", "AuthorizationToken", "header"));
-        return apiKeyList;
-    }
-
-    /**
-     * 安全上下文
-     */
-    private List<SecurityContext> securityContexts()
-    {
-        List<SecurityContext> securityContexts = new ArrayList<>();
-        securityContexts.add(
-                SecurityContext.builder()
-                        .securityReferences(defaultAuth())
-                        .forPaths(PathSelectors.regex("^(?!auth).*$"))
-                        .build());
-        return securityContexts;
-    }
-
-    /**
-     * 默认的安全上引用
-     */
-    private List<SecurityReference> defaultAuth()
-    {
-        AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
-        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
-        authorizationScopes[0] = authorizationScope;
-        List<SecurityReference> securityReferences = new ArrayList<>();
-        securityReferences.add(new SecurityReference("AuthorizationToken", authorizationScopes));
-        return securityReferences;
-    }
-
-    /**
-     * 添加摘要信息
-     */
-    private ApiInfo apiInfo()
-    {
-        // 用ApiInfoBuilder进行定制
-        return new ApiInfoBuilder()
-                // 设置标题
-                .title("标题：中正SAAS管理系统接口文档")
-                // 描述
-                .description("描述：用于中正SAAS管理系统接口文档")
-                // 作者信息
-                .contact(new Contact(ruoyiConfig.getName(), null, null))
-                // 版本
-                .version("版本号:" + ruoyiConfig.getVersion())
-                .build();
-    }
-
-    private List<Parameter> getGlobalOperationParameters() {
-        List<Parameter> pars = new ArrayList<>();
-        // header query cookie
-        // header query cookie
-        ParameterBuilder parameterBuilder = new ParameterBuilder();
-        parameterBuilder.name("X-Auth-Token").description("token").modelRef(new ModelRef("string")).parameterType("header").defaultValue("test").required(false);
-        pars.add(parameterBuilder.build());
-        return pars;
-    }
-}

zhongzheng-admin-saas/src/main/resources/META-INF/spring-devtools.properties

@@ -1 +0,0 @@
-restart.include.json=/com.alibaba.fastjson.*.jar

zhongzheng-admin-saas/src/main/resources/application-dev.yml

@@ -1,178 +0,0 @@
-# 数据源配置
-spring:
-    datasource:
-        #配置hikari连接池
-        hikari:
-            minimum-idle: 10
-            maximum-pool-size: 20
-            connection-timeout: 10000
-            idle-timeout: 30000
-            connection-init-sql: set names utf8mb4
-        #动态数据源配置
-        dynamic:
-            primary: master #设置默认的数据源或者数据源组,默认值即为master
-            strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
-            datasource:
-                #数据源
-                master:
-                    driver-class-name: com.mysql.cj.jdbc.Driver
-                    url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas_top?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                    username: root
-                    password: zhongzheng2021
-                #数据源
-                slave:
-                    driver-class-name: com.mysql.cj.jdbc.Driver
-                    url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                    username: root
-                    password: zhongzheng2021
-#    datasource:
-#        type: com.alibaba.druid.pool.DruidDataSource
-#        driverClassName: com.mysql.cj.jdbc.Driver
-#        druid:
-#            # 主库数据源
-#            master:
-#                url: jdbc:mysql://192.168.1.222:3306/zz_edu_sass_top?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-#                username: root
-#                password:  zhongzheng2021
-#            # 从库数据源
-#            slave:
-#                # 从数据源开关/默认关闭
-#                enabled: true
-#                url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-#                username: root
-#                password: zhongzheng2021
-#            # 初始连接数
-#            initialSize: 5
-#            # 最小连接池数量
-#            minIdle: 10
-#            # 最大连接池数量
-#            maxActive: 20
-#            # 配置获取连接等待超时的时间
-#            maxWait: 60000
-#            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-#            timeBetweenEvictionRunsMillis: 60000
-#            # 配置一个连接在池中最小生存的时间，单位是毫秒
-#            minEvictableIdleTimeMillis: 300000
-#            # 配置一个连接在池中最大生存的时间，单位是毫秒
-#            maxEvictableIdleTimeMillis: 900000
-#            # 配置检测连接是否有效
-#            validationQuery: SELECT 1 FROM DUAL
-#            testWhileIdle: true
-#            testOnBorrow: false
-#            testOnReturn: false
-#            webStatFilter:
-#                enabled: true
-#            statViewServlet:
-#                enabled: true
-#                # 设置白名单，不填则允许所有访问
-#                allow:
-#                url-pattern: /druid/*
-#                # 控制台管理用户名和密码
-#                login-username: ruoyi
-#                login-password: 123456
-#            filter:
-#                stat:
-#                    enabled: true
-#                    # 慢SQL记录
-#                    log-slow-sql: true
-#                    slow-sql-millis: 1000
-#                    merge-sql: true
-#                wall:
-#                    config:
-#                        multi-statement-allow: true
-    # redis 配置
-    redis:
-        # 地址
-        host: 192.168.1.222
-        # 端口，默认为6379
-        port: 6379
-        # 数据库索引
-        database: 0
-        # 密码
-        password: zhongzheng2021_redis
-        # 连接超时时间
-        timeout: 10s
-        lettuce:
-            pool:
-                # 连接池中的最小空闲连接
-                min-idle: 0
-                # 连接池中的最大空闲连接
-                max-idle: 8
-                # 连接池的最大数据库连接数
-                max-active: 8
-                # #连接池最大阻塞等待时间（使用负值表示没有限制）
-                max-wait: -1ms
-aliyun:
-    oss:
-        endpoint: https://file-dev.xyyxt.net # oss对外服务的访问域名
-        accessKeyId: LTAIgC8O2WUXvXuR  # 访问身份验证中用到用户标识
-        accessKeySecret: 1yyCazuT1M6MruBXzgFjP0p9gdMlwX # 用户用于加密签名字符串和oss用来验证签名字符串的密钥
-        bucketName: zhongzheng-test # oss的存储空间
-        policy:
-            expire: 30 # 签名有效期(S)
-        maxSize: 100 # 上传文件大小(M)
-        callback: http://120.79.166.78:19004/aliyun/oss/callback # 文件上传成功后的回调地址
-        dir:
-            prefix: oss/images/ # 上传文件夹路径前缀 `
-
-poliv:
-    token:
-        userid: d5f6d309fe
-        writetoken: 8f14a371-9d02-4ec1-922d-54d7b4f79dca
-        readtoken: f2c397b4-e2a3-46dc-9266-e6a43ac26a35
-        secretkey: xpPrYdcbA1
-
-wx:
-    small:
-        appid: wxd3c8ae80cf43a305
-        appsecret: 193a001ebfd46f227008a21e9d13e750
-    gzh:
-        appid: wx6f48f721d18244eb
-        appsecret: 2f8b2b4ff66e2f6adfb9f08ae22d7474
-        studyNoteTpId: DndIixcAp15Sqgb4KOGTMf73VLF09NlCUifPSel5Y_s
-        qdyTpId: s981yq3SyIODNUEXFzVSWn0OYj90E72aKdtKtSp05_E
-        qdySubTpId: gzE6zddD7OzDLUtOO4GfU-KPCxpMqWFhCj86uXExqB8
-        qdySubStatusTpId: 7oKaAHmc4P7jqfonuiM1wnjfNLh9T662Ywm1OAFaUFA
-        qdyExamTpId: 66LitnYp0AIWFclo0rLdyLQP4-_vVc4pM95fyFs6l-c
-        qdyExamStatusTpId: J7nNogGhD38OD20gI-3CzwawfEMu7lOjR8fsi4LgJ5g
-        signatureTpId: 66LitnYp0AIWFclo0rLdyLQP4-_vVc4pM95fyFs6l-c
-    wepay:
-        mchid: 1342013901
-        key: GdXyPxYjZx1234123yJzXgDxYpXyjpx9
-        appsecret: GdXyPxYjZx1234123yJzXgDxYpXyjpx9
-        notifyUrl: http://120.79.166.78:19012/wx/pay/callback
-    scanLogin:
-        host: https://testm.xyyxt.net/
-
-wisdomExamRoom:
-    mchid: 10001
-    appid: ZZ-YXT-GZ-20220820-0001
-    app_secret: mt70O1s/Xd5LwuH7yHLpj9R+tKUn5j9vTnCvmgBnbJDA11Hpl7+q4lEZliqPAjN+YHPn9bGmHkAbw5XwhhMiYg==
-    host:  http://bg.sam457.site:9020
-
-certificate:
-    host: http://192.168.1.38:8000/
-
-liveGotoURL: http://120.79.166.78:19014/
-
-enCodeVersion: develop
-
-oldStudySys:
-    syncPath: http://gdxypx.xy.com/System/BussinessApi/PostUserStudyRecords
-    sharePath: http://192.168.1.210:8086/witsystem/dataapi/SaleOrder
-    shareCanclePath: http://192.168.1.210:8086/witsystem/dataapi/ordercance
-    searchGradeCount: http://gdxypx.xy.com/System/BussinessApi/OfficialGradeCount
-    pushGradeCount: http://gdxypx.xy.com/System/BussinessApi/OfficialGradeCountAuto
-    educationalInspector: http://192.168.1.210/EduSystem/BusinessApi/NewYxtUserPrompt
-    classUserListPath: http://gdxypx.xy.com/System/BussinessApi/UserCourseCategoryListcno
-    classOpenPath: http://gdxypx.xy.com/System/BussinessApi/OpenClass
-    salePassword: http://gdxypx.xy.com/WitSystem/BussinessApi/GetSaleInfo
-
-officialPush:
-    infoPath: http://jypt-dev.gdcic.net/organjxjy/ShangBaoMingdan
-    periodPath: http://jypt-dev.gdcic.net/organjxjy/XueshiShenqing
-    infoAccount: peixunjigou
-    token: 0ca175b9c0f726a831d895e26933246
-
-distributionOldPay:
-    host: http://gdxypx.xy.com/System/BussinessApi/AddRedPackData

zhongzheng-admin-saas/src/main/resources/application-pre.yml

@@ -1,178 +0,0 @@
-# 数据源配置
-spring:
-    datasource:
-        #配置hikari连接池
-        hikari:
-            minimum-idle: 10
-            maximum-pool-size: 20
-            connection-timeout: 10000
-            idle-timeout: 30000
-            connection-init-sql: set names utf8mb4
-        #动态数据源配置
-        dynamic:
-            primary: master #设置默认的数据源或者数据源组,默认值即为master
-            strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
-            datasource:
-                #数据源
-                master:
-                    driver-class-name: com.mysql.cj.jdbc.Driver
-                    url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas_top?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                    username: root
-                    password: gdxy2021!@#zzjykj
-                #数据源
-                slave:
-                    driver-class-name: com.mysql.cj.jdbc.Driver
-                    url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                    username: root
-                    password: gdxy2021!@#zzjykj
-    #    datasource:
-    #        type: com.alibaba.druid.pool.DruidDataSource
-    #        driverClassName: com.mysql.cj.jdbc.Driver
-    #        druid:
-    #            # 主库数据源
-    #            master:
-    #                url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-    #                username: root
-    #                password: gdxy2021!@#zzjykj
-    #            # 从库数据源
-    #            slave:
-    #                # 从数据源开关/默认关闭
-    #                enabled: false
-    #                url:
-    #                username:
-    #                password:
-    #            # 初始连接数
-    #            initialSize: 5
-    #            # 最小连接池数量
-    #            minIdle: 10
-    #            # 最大连接池数量
-    #            maxActive: 20
-    #            # 配置获取连接等待超时的时间
-    #            maxWait: 60000
-    #            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-    #            timeBetweenEvictionRunsMillis: 60000
-    #            # 配置一个连接在池中最小生存的时间，单位是毫秒
-    #            minEvictableIdleTimeMillis: 300000
-    #            # 配置一个连接在池中最大生存的时间，单位是毫秒
-    #            maxEvictableIdleTimeMillis: 900000
-    #            # 配置检测连接是否有效
-    #            validationQuery: SELECT 1 FROM DUAL
-    #            testWhileIdle: true
-    #            testOnBorrow: false
-    #            testOnReturn: false
-    #            webStatFilter:
-    #                enabled: true
-    #            statViewServlet:
-    #                enabled: true
-    #                # 设置白名单，不填则允许所有访问
-    #                allow:
-    #                url-pattern: /druid/*
-    #                # 控制台管理用户名和密码
-    #                login-username: ruoyi
-    #                login-password: 123456
-    #            filter:
-    #                stat:
-    #                    enabled: true
-    #                    # 慢SQL记录
-    #                    log-slow-sql: true
-    #                    slow-sql-millis: 4000
-    #                    merge-sql: true
-    #                wall:
-    #                    config:
-    #                        multi-statement-allow: true
-    # redis 配置
-    redis:
-        # 地址
-        host: 172.18.19.227
-        # 端口，默认为6379
-        port: 6379
-        # 数据库索引
-        database: 0
-        # 密码
-        password: zhongzheng2021_redis
-        # 连接超时时间
-        timeout: 10s
-        lettuce:
-            pool:
-                # 连接池中的最小空闲连接
-                min-idle: 0
-                # 连接池中的最大空闲连接
-                max-idle: 8
-                # 连接池的最大数据库连接数
-                max-active: 8
-                # #连接池最大阻塞等待时间（使用负值表示没有限制）
-                max-wait: -1ms
-aliyun:
-    oss:
-        endpoint: https://file.xyyxt.net # oss对外服务的访问域名
-        accessKeyId: LTAIgC8O2WUXvXuR  # 访问身份验证中用到用户标识
-        accessKeySecret: 1yyCazuT1M6MruBXzgFjP0p9gdMlwX # 用户用于加密签名字符串和oss用来验证签名字符串的密钥
-        bucketName: zhongzheng-prod # oss的存储空间
-        policy:
-            expire: 30 # 签名有效期(S)
-        maxSize: 100 # 上传文件大小(M)
-        callback: https://cloud.xyyxt.net/aliyun/oss/callback # 文件上传成功后的回调地址
-        dir:
-            prefix: oss/images/ # 上传文件夹路径前缀 `
-
-poliv:
-    token:
-        userid: d5f6d309fe
-        writetoken: 8f14a371-9d02-4ec1-922d-54d7b4f79dca
-        readtoken: f2c397b4-e2a3-46dc-9266-e6a43ac26a35
-        secretkey: xpPrYdcbA1
-
-wx:
-    small:
-        appid: wxd3c8ae80cf43a305
-        appsecret: 193a001ebfd46f227008a21e9d13e750
-    gzh:
-        appid: wx6f48f721d18244eb
-        appsecret: 2f8b2b4ff66e2f6adfb9f08ae22d7474
-        studyNoteTpId: DndIixcAp15Sqgb4KOGTMf73VLF09NlCUifPSel5Y_s
-        qdyTpId: s981yq3SyIODNUEXFzVSWn0OYj90E72aKdtKtSp05_E
-        qdySubTpId: gzE6zddD7OzDLUtOO4GfU-KPCxpMqWFhCj86uXExqB8
-        qdySubStatusTpId: 7oKaAHmc4P7jqfonuiM1wnjfNLh9T662Ywm1OAFaUFA
-        qdyExamTpId: 66LitnYp0AIWFclo0rLdyLQP4-_vVc4pM95fyFs6l-c
-        qdyExamStatusTpId: J7nNogGhD38OD20gI-3CzwawfEMu7lOjR8fsi4LgJ5g
-        signatureTpId: 66LitnYp0AIWFclo0rLdyLQP4-_vVc4pM95fyFs6l-c
-    wepay:
-        mchid: 1342013901
-        key: GdXyPxYjZx1234123yJzXgDxYpXyjpx9
-        appsecret: GdXyPxYjZx1234123yJzXgDxYpXyjpx9
-        notifyUrl: https://api.xyyxt.net/wx/pay/callback
-    scanLogin:
-        host: https://m.xyyxt.net/
-
-wisdomExamRoom:
-    mchid: 10001
-    appid: ZZ-YXT-GZ-20220820-0001
-    app_secret: mt70O1s/Xd5LwuH7yHLpj9R+tKUn5j9vTnCvmgBnbJDA11Hpl7+q4lEZliqPAjN+YHPn9bGmHkAbw5XwhhMiYg==
-    host: http://bg.sam457.site:9020
-
-certificate:
-    host: https://m.xyyxt.net/
-
-liveGotoURL: https://
-
-enCodeVersion: release
-
-oldStudySys:
-    syncPath: https://www.xyyxt.net/System/BussinessApi/PostUserStudyRecords
-    sharePath: https://www.xyyxt.net/witsystem/dataapi/SaleOrder
-    shareCanclePath: https://www.xyyxt.net/witsystem/dataapi/ordercance
-    searchGradeCount: https://www.xyyxt.net/System/BussinessApi/OfficialGradeCount
-    pushGradeCount: https://www.xyyxt.net/System/BussinessApi/OfficialGradeCountAuto
-    educationalInspector: https://zs.gdzzkj.net/EduSystem/BusinessApi/NewYxtUserPrompt
-    classUserListPath: https://www.xyyxt.net/System/BussinessApi/UserCourseCategoryListcno
-    classOpenPath: https://www.xyyxt.net/System/BussinessApi/OpenClass
-    salePassword: http://www.xyyxt.net/WitSystem/BussinessApi/GetSaleInfo
-
-officialPush:
-    infoPath: https://jypt.gdcic.net/organjxjy/ShangBaoMingdan
-    periodPath: https://jypt.gdcic.net/organjxjy/XueshiShenqing
-    infoAccount: GDSXY
-    token: 01b5d9833987efdff54483cdc9720da6
-
-distributionOldPay:
-    host: https://www.xyyxt.net/System/BussinessApi/AddRedPackData

zhongzheng-admin-saas/src/main/resources/application-prod.yml

@@ -1,178 +0,0 @@
-# 数据源配置
-spring:
-    datasource:
-        #配置hikari连接池
-        hikari:
-            minimum-idle: 10
-            maximum-pool-size: 20
-            connection-timeout: 10000
-            idle-timeout: 30000
-            connection-init-sql: set names utf8mb4
-        #动态数据源配置
-        dynamic:
-            primary: master #设置默认的数据源或者数据源组,默认值即为master
-            strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
-            datasource:
-                #数据源
-                master:
-                    driver-class-name: com.mysql.cj.jdbc.Driver
-                    url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas_top?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                    username: root
-                    password: gdxy2021!@#zzjykj
-                #数据源
-                slave:
-                    driver-class-name: com.mysql.cj.jdbc.Driver
-                    url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                    username: root
-                    password: gdxy2021!@#zzjykj
-    #    datasource:
-    #        type: com.alibaba.druid.pool.DruidDataSource
-    #        driverClassName: com.mysql.cj.jdbc.Driver
-    #        druid:
-    #            # 主库数据源
-    #            master:
-    #                url: jdbc:mysql://rm-wz950fu2v70864v85.mysql.rds.aliyuncs.com/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-    #                username: root
-    #                password: gdxy2021!@#zzjykj
-    #            # 从库数据源
-    #            slave:
-    #                # 从数据源开关/默认关闭
-    #                enabled: false
-    #                url:
-    #                username:
-    #                password:
-    #            # 初始连接数
-    #            initialSize: 5
-    #            # 最小连接池数量
-    #            minIdle: 10
-    #            # 最大连接池数量
-    #            maxActive: 20
-    #            # 配置获取连接等待超时的时间
-    #            maxWait: 60000
-    #            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-    #            timeBetweenEvictionRunsMillis: 60000
-    #            # 配置一个连接在池中最小生存的时间，单位是毫秒
-    #            minEvictableIdleTimeMillis: 300000
-    #            # 配置一个连接在池中最大生存的时间，单位是毫秒
-    #            maxEvictableIdleTimeMillis: 900000
-    #            # 配置检测连接是否有效
-    #            validationQuery: SELECT 1 FROM DUAL
-    #            testWhileIdle: true
-    #            testOnBorrow: false
-    #            testOnReturn: false
-    #            webStatFilter:
-    #                enabled: true
-    #            statViewServlet:
-    #                enabled: true
-    #                # 设置白名单，不填则允许所有访问
-    #                allow:
-    #                url-pattern: /druid/*
-    #                # 控制台管理用户名和密码
-    #                login-username: ruoyi
-    #                login-password: 123456
-    #            filter:
-    #                stat:
-    #                    enabled: true
-    #                    # 慢SQL记录
-    #                    log-slow-sql: true
-    #                    slow-sql-millis: 4000
-    #                    merge-sql: true
-    #                wall:
-    #                    config:
-    #                        multi-statement-allow: true
-    # redis 配置
-    redis:
-        # 地址
-        host: 172.18.19.227
-        # 端口，默认为6379
-        port: 6379
-        # 数据库索引
-        database: 0
-        # 密码
-        password: zhongzheng2021_redis
-        # 连接超时时间
-        timeout: 10s
-        lettuce:
-            pool:
-                # 连接池中的最小空闲连接
-                min-idle: 0
-                # 连接池中的最大空闲连接
-                max-idle: 8
-                # 连接池的最大数据库连接数
-                max-active: 8
-                # #连接池最大阻塞等待时间（使用负值表示没有限制）
-                max-wait: -1ms
-aliyun:
-    oss:
-        endpoint: https://file.xyyxt.net # oss对外服务的访问域名
-        accessKeyId: LTAIgC8O2WUXvXuR  # 访问身份验证中用到用户标识
-        accessKeySecret: 1yyCazuT1M6MruBXzgFjP0p9gdMlwX # 用户用于加密签名字符串和oss用来验证签名字符串的密钥
-        bucketName: zhongzheng-prod # oss的存储空间
-        policy:
-            expire: 30 # 签名有效期(S)
-        maxSize: 100 # 上传文件大小(M)
-        callback: https://cloud.xyyxt.net/aliyun/oss/callback # 文件上传成功后的回调地址
-        dir:
-            prefix: oss/images/ # 上传文件夹路径前缀 `
-
-poliv:
-    token:
-        userid: d5f6d309fe
-        writetoken: 8f14a371-9d02-4ec1-922d-54d7b4f79dca
-        readtoken: f2c397b4-e2a3-46dc-9266-e6a43ac26a35
-        secretkey: xpPrYdcbA1
-
-wx:
-    small:
-        appid: wxd3c8ae80cf43a305
-        appsecret: 193a001ebfd46f227008a21e9d13e750
-    gzh:
-        appid: wx6f48f721d18244eb
-        appsecret: 2f8b2b4ff66e2f6adfb9f08ae22d7474
-        studyNoteTpId: DndIixcAp15Sqgb4KOGTMf73VLF09NlCUifPSel5Y_s
-        qdyTpId: s981yq3SyIODNUEXFzVSWn0OYj90E72aKdtKtSp05_E
-        qdySubTpId: gzE6zddD7OzDLUtOO4GfU-KPCxpMqWFhCj86uXExqB8
-        qdySubStatusTpId: 7oKaAHmc4P7jqfonuiM1wnjfNLh9T662Ywm1OAFaUFA
-        qdyExamTpId: 66LitnYp0AIWFclo0rLdyLQP4-_vVc4pM95fyFs6l-c
-        qdyExamStatusTpId: J7nNogGhD38OD20gI-3CzwawfEMu7lOjR8fsi4LgJ5g
-        signatureTpId: 66LitnYp0AIWFclo0rLdyLQP4-_vVc4pM95fyFs6l-c
-    wepay:
-        mchid: 1342013901
-        key: GdXyPxYjZx1234123yJzXgDxYpXyjpx9
-        appsecret: GdXyPxYjZx1234123yJzXgDxYpXyjpx9
-        notifyUrl: https://api.xyyxt.net/wx/pay/callback
-    scanLogin:
-        host: https://m.xyyxt.net/
-
-wisdomExamRoom:
-    mchid: 10001
-    appid: ZZ-YXT-GZ-20220820-0001
-    app_secret: mt70O1s/Xd5LwuH7yHLpj9R+tKUn5j9vTnCvmgBnbJDA11Hpl7+q4lEZliqPAjN+YHPn9bGmHkAbw5XwhhMiYg==
-    host: http://bg.sam457.site:9020
-
-certificate:
-    host: https://m.xyyxt.net/
-
-liveGotoURL: https://
-
-enCodeVersion: release
-
-oldStudySys:
-    syncPath: https://www.xyyxt.net/System/BussinessApi/PostUserStudyRecords
-    sharePath: https://www.xyyxt.net/witsystem/dataapi/SaleOrder
-    shareCanclePath: https://www.xyyxt.net/witsystem/dataapi/ordercance
-    searchGradeCount: https://www.xyyxt.net/System/BussinessApi/OfficialGradeCount
-    pushGradeCount: https://www.xyyxt.net/System/BussinessApi/OfficialGradeCountAuto
-    educationalInspector: https://zs.gdzzkj.net/EduSystem/BusinessApi/NewYxtUserPrompt
-    classUserListPath: https://www.xyyxt.net/System/BussinessApi/UserCourseCategoryListcno
-    classOpenPath: https://www.xyyxt.net/System/BussinessApi/OpenClass
-    salePassword: http://www.xyyxt.net/WitSystem/BussinessApi/GetSaleInfo
-
-officialPush:
-    infoPath: https://jypt.gdcic.net/organjxjy/ShangBaoMingdan
-    periodPath: https://jypt.gdcic.net/organjxjy/XueshiShenqing
-    infoAccount: GDSXY
-    token: 01b5d9833987efdff54483cdc9720da6
-
-distributionOldPay:
-    host: https://www.xyyxt.net/System/BussinessApi/AddRedPackData

zhongzheng-admin-saas/src/main/resources/application.yml

@@ -1,308 +0,0 @@
-# 项目相关配置
-zhongzheng:
-  # 名称
-  name: zhongzheng_saas
-  # 版本
-  version: 3.4.0
-  # 版权年份
-  copyrightYear: 2021
-  # 实例演示开关
-  demoEnabled: true
-  # 文件路径,使用jvm系统变量,兼容windows和linux;
-  profile: ${user.dir}/zhongzheng/uploadPath
-  # 获取ip地址开关
-  addressEnabled: false
-
-captcha:
-  # 验证码类型 math 数组计算 char 字符验证
-  captchaType: math
-  # line 线段干扰 circle 圆圈干扰 shear 扭曲干扰
-  captchaCategory: circle
-  # 数字验证码位数
-  captchaNumberLength: 1
-  # 字符验证码长度
-  captchaCharLength: 4
-
-# 开发环境配置
-server:
-  # 服务器的HTTP端口，默认为8080
-  port: 7077
-  servlet:
-    # 应用的访问路径
-    context-path: /
-  # undertow 配置
-  undertow:
-    # HTTP post内容的最大大小。当值为-1时，默认值为大小是无限的
-    max-http-post-size: -1
-    # 以下的配置会影响buffer,这些buffer会用于服务器连接的IO操作,有点类似netty的池化内存管理
-    # 每块buffer的空间大小,越小的空间被利用越充分
-    buffer-size: 512
-    # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程
-    io-threads: 8
-    # 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载
-    worker-threads: 256
-    # 是否分配的直接内存
-    direct-buffers: true
-#  # tomcat 配置
-#  tomcat:
-#    # tomcat的URI编码
-#    uri-encoding: UTF-8
-#    # tomcat最大线程数，默认为200
-#    max-threads: 500
-#    # Tomcat启动初始化的线程数，默认值25
-#    min-spare-threads: 30
-
-# 日志配置
-logging:
-  level:
-    com.zhongzheng: @logging.level@
-    org.springframework: warn
-  config: classpath:logback.xml
-
-# Spring配置
-spring:
-  mvc:
-    async:
-      request-timeout: 30000
-  main:
-    allow-bean-definition-overriding: true
-  # 资源信息
-  messages:
-    # 国际化资源文件路径
-    basename: i18n/messages
-  profiles:
-    active: @profiles.active@
-  # 文件上传
-  servlet:
-    multipart:
-      # 单个文件大小
-      max-file-size:  10MB
-      # 设置总上传的文件大小
-      max-request-size:  20MB
-  # 服务模块
-  devtools:
-    restart:
-      # 热部署开关
-      enabled: true
-  application:
-    name: zz_edu
-  boot:
-    admin:
-      # Spring Boot Admin Client 客户端的相关配置
-      client:
-        # 设置 Spring Boot Admin Server 地址
-        url: http://localhost:${server.port}${spring.boot.admin.context-path}
-        instance:
-          prefer-ip: true # 注册实例时，优先使用 IP
-      # Spring Boot Admin Server 服务端的相关配置
-      context-path: /admin # 配置 Spring
-
-# Actuator 监控端点的配置项
-management:
-  endpoints:
-    web:
-      # Actuator 提供的 API 接口的根目录。默认为 /actuator
-      base-path: /actuator
-      exposure:
-        # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。
-        include: '*'
-  endpoint:
-    logfile:
-      external-file: ./logs/sys-console.log
-
-# token配置
-token:
-  # 令牌自定义标识
-  header: AuthorizationToken
-  # 令牌密钥
-  secret: abcdefghijklmnopqrstuvwxyz
-  # 令牌有效期（默认30分钟）
-  expireTime: 360
-
-# MyBatis配置
-# https://baomidou.com/config/
-mybatis-plus:
-  # 对应的 XML 文件位置
-  mapperLocations: classpath*:mapper/**/*Mapper.xml
-  # 实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.zhongzheng.**.domain
-  # 针对 typeAliasesPackage，如果配置了该属性，则仅仅会扫描路径下以该类作为父类的域对象
-  #typeAliasesSuperType: Class<?>
-  # 如果配置了该属性，SqlSessionFactoryBean 会把该包下面的类注册为对应的 TypeHandler
-  #typeHandlersPackage: null
-  # 如果配置了该属性，会将路径下的枚举类进行注入，让实体类字段能够简单快捷的使用枚举属性
-  #typeEnumsPackage: null
-  # 启动时是否检查 MyBatis XML 文件的存在，默认不检查
-  checkConfigLocation: false
-  # 通过该属性可指定 MyBatis 的执行器，MyBatis 的执行器总共有三种：
-  # SIMPLE：该执行器类型不做特殊的事情，为每个语句的执行创建一个新的预处理语句（PreparedStatement）
-  # REUSE：该执行器类型会复用预处理语句（PreparedStatement）
-  # BATCH：该执行器类型会批量执行所有的更新语句
-  executorType: SIMPLE
-  # 指定外部化 MyBatis Properties 配置，通过该配置可以抽离配置，实现不同环境的配置部署
-  configurationProperties: null
-  typeHandlersPackage: com.zhongzheng.common.type
-  configuration:
-    # 自动驼峰命名规则（camel case）映射
-    # 如果您的数据库命名符合规则无需使用 @TableField 注解指定数据库字段名
-    mapUnderscoreToCamelCase: true
-    # 默认枚举处理类,如果配置了该属性,枚举将统一使用指定处理器进行处理
-    # org.apache.ibatis.type.EnumTypeHandler : 存储枚举的名称
-    # org.apache.ibatis.type.EnumOrdinalTypeHandler : 存储枚举的索引
-    # com.baomidou.mybatisplus.extension.handlers.MybatisEnumTypeHandler : 枚举类需要实现IEnum接口或字段标记@EnumValue注解.
-    defaultEnumTypeHandler: org.apache.ibatis.type.EnumTypeHandler
-    # 当设置为 true 的时候，懒加载的对象可能被任何懒属性全部加载，否则，每个属性都按需加载。需要和 lazyLoadingEnabled 一起使用。
-    aggressiveLazyLoading: true
-    # MyBatis 自动映射策略
-    # NONE：不启用自动映射
-    # PARTIAL：只对非嵌套的 resultMap 进行自动映射
-    # FULL：对所有的 resultMap 都进行自动映射
-    autoMappingBehavior: PARTIAL
-    # MyBatis 自动映射时未知列或未知属性处理策
-    # NONE：不做任何处理 (默认值)
-    # WARNING：以日志的形式打印相关警告信息
-    # FAILING：当作映射失败处理，并抛出异常和详细信息
-    autoMappingUnknownColumnBehavior: NONE
-    # Mybatis一级缓存，默认为 SESSION
-    # SESSION session级别缓存，同一个session相同查询语句不会再次查询数据库
-    # STATEMENT 关闭一级缓存
-    localCacheScope: SESSION
-    # 开启Mybatis二级缓存，默认为 true
-    cacheEnabled: true
-  global-config:
-    # 是否打印 Logo banner
-    banner: true
-    # 是否初始化 SqlRunner
-    enableSqlRunner: false
-    dbConfig:
-      # 主键类型
-      # AUTO 数据库ID自增
-      # NONE 空
-      # INPUT 用户输入ID
-      # ASSIGN_ID 全局唯一ID
-      # ASSIGN_UUID 全局唯一ID UUID
-      idType: AUTO
-      # 表名前缀
-      tablePrefix: null
-      # 字段 format,例: %s,(对主键无效)
-      columnFormat: null
-      # 表名是否使用驼峰转下划线命名,只对表名生效
-      tableUnderline: true
-      # 大写命名,对表名和字段名均生效
-      capitalMode: false
-      # 全局的entity的逻辑删除字段属性名
-      logicDeleteField: null
-      # 逻辑已删除值
-      logicDeleteValue: 2
-      # 逻辑未删除值
-      logicNotDeleteValue: 0
-      # 字段验证策略之 insert,在 insert 的时候的字段验证策略
-      # IGNORED 忽略判断
-      # NOT_NULL 非NULL判断
-      # NOT_EMPTY 非空判断(只对字符串类型字段,其他类型字段依然为非NULL判断)
-      # DEFAULT 默认的,一般只用于注解里
-      # NEVER 不加入 SQL
-      insertStrategy: NOT_EMPTY
-      # 字段验证策略之 update,在 update 的时候的字段验证策略
-      updateStrategy: NOT_EMPTY
-      # 字段验证策略之 select,在 select 的时候的字段验证策略既 wrapper 根据内部 entity 生成的 where 条件
-      selectStrategy: NOT_EMPTY
-  # 开启多租户
-  tenant:
-    enabled-tenant: false
-# PageHelper分页插件
-pagehelper:
-  helperDialect: mysql
-  reasonable: true
-  supportMethodsArguments: true
-  params: count=countSql
-# Swagger配置
-swagger:
-  # 是否开启swagger
-  enabled: true
-  # 请求前缀
-  pathMapping:
-knife4j:
-  enable: true
-  setting:
-    enableFooter: false
-
-# 防止XSS攻击
-xss:
-  # 过滤开关
-  enabled: true
-  # 排除链接（多个用逗号分隔）
-  excludes: /system/notice/*
-  # 匹配链接
-  urlPatterns: /system/*,/monitor/*,/tool/*
-
-feign:
-  # 开启压缩
-  compression:
-    request:
-      enabled: true
-    response:
-      enabled: true
-  okhttp:
-    enabled: true
-  hystrix:
-    enabled: true
-
-poliv:
-  sdk:
-    userid: egsxlptzdq
-    appId: ezl5uy4zei
-    appSecret: 2bf5bb3c31d34531943df10284edd50b
-
-tencent:
-  cloud:
-    SecretId: AKIDd6XkjTw9D1atwkJceS2NSIuHPK1ThfOr
-    SecretKey: GG2ZqrdCWcS6Yx72h6F7k7E4ey2qPnwq
-
-aliyun:
-  sms:
-    signName: 祥粤学校
-    registerTemplateCode: SMS_228670004
-    loginTemplateCode: SMS_228670005
-    forgetTemplateCode: SMS_228685033
-    pwdTemplateCode: SMS_230220381
-    bindNewTelCode: SMS_232178371
-    accessKeyId: LTAIgC8O2WUXvXuR
-    accessKeySecret: 1yyCazuT1M6MruBXzgFjP0p9gdMlwX
-    OpenTheGoodsCode: SMS_230970155     #商品开通提醒
-    informationNotificationCode: SMS_230965149  #完善报名资料通知
-    materialReviewCode: SMS_230980165         #报名资料审核通过通知
-    NotificationOfFailureCode: SMS_230980172  #报名资料审核不通过通知
-    remainingDaysValidityCode: SMS_236566823  #开通班级有效期还剩天数
-    completionReminderCode: SMS_230965157   #学时学习完成提醒
-    schoolHoursCode: SMS_230970166    #学时机构审核通过提醒
-    auditFailedCode: SMS_230970167  #学时机构审核不通过提醒
-    ReminderApproval: SMS_231200314 #学时机构审核通过提醒
-    passTheReminder: SMS_230980180  #学时机构审核不通过提醒
-    bookingReminder: SMS_230980181  #考试预约提醒
-    cancellationReminder: SMS_230980183 #考试预约取消提醒
-    reservationSuccess: SMS_230980186 #考试预约成功提醒
-    examinationRemind: SMS_230960195  #考试提醒
-    newExamPass: SMS_230970179  #七大员新考考试通过提醒
-    newExamFail: SMS_235491082  #七大员新考考试不通过提醒
-    openingReminder: SMS_230970209  #七大员题库开通提醒（12-22
-    classRemind: SMS_230965224  #二建继教开班提醒
-    OverdueReminder: SMS_230980259  #班级过期提醒
-    OverdueReminderHave: SMS_230965228  #班级过期提醒有学习次数
-    planReminder: SMS_230970248     #学习计划提醒
-    commitmentCode: SMS_231190546     #承诺书审核通过通知
-    commitmentFailsCode: SMS_231215516     #承诺书审核不通过通知
-    mockBookingReminder: SMS_243430276     #模考预约提醒
-    mockRemind: SMS_243355276      #模考开始提醒
-    liveStartRemind: SMS_243345514      #直播开课提醒
-    buyNotStudyStudentRemind : SMS_247745294  #学生购买未学习
-    buyNotStudyTeacherRemind : SMS_247935257  #学生购买未学习老师
-    longNotStudyStudentRemind: SMS_247910221  #学生长时间未学习
-    longNotStudyTeacherRemind: SMS_247765294  #学生长时间未学习老师
-    signCommitmentRemind: SMS_250390195  #签署承诺书提醒
-    todayExamNotRecordWarn: SMS_257713140  #学员打卡提醒（每日一练）
-    todayExamNotRecordTeachWarn: SMS_257702971  #学员打卡教务提醒（每日一练）
-    noFinishExamNoteCode: SMS_262460267  #未做完试卷通知
-
-distributionOldPay:
-      host: http://test.jqbao.net/System/BussinessApi/AddRedPackData

zhongzheng-admin-saas/src/main/resources/banner.txt

@@ -1,2 +0,0 @@
-Application Version: ${zhongzheng.version}
-Spring Boot Version: ${spring-boot.version}

zhongzheng-admin-saas/src/main/resources/i18n/messages.properties

@@ -1,36 +0,0 @@
-#错误消息
-not.null=* 必须填写
-user.jcaptcha.error=验证码错误
-user.jcaptcha.expire=验证码已失效
-user.not.exists=用户不存在/密码错误
-user.password.not.match=用户不存在/密码错误
-user.password.retry.limit.count=密码输入错误{0}次
-user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定10分钟
-user.password.delete=对不起，您的账号已被删除
-user.blocked=用户已封禁，请联系管理员
-role.blocked=角色已封禁，请联系管理员
-user.logout.success=退出成功
-
-length.not.valid=长度必须在{min}到{max}个字符之间
-
-user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
-user.password.not.valid=* 5-50个字符
- 
-user.email.not.valid=邮箱格式错误
-user.mobile.phone.number.not.valid=手机号格式错误
-user.login.success=登录成功
-user.notfound=请重新登录
-user.forcelogout=管理员强制退出，请重新登录
-user.unknown.error=未知错误，请重新登录
-
-##文件上传消息
-upload.exceed.maxSize=上传的文件大小超出限制的文件大小！<br/>允许的文件最大大小是：{0}MB！
-upload.filename.exceed.length=上传的文件名最长{0}个字符
-
-##权限
-no.permission=您没有数据的权限，请联系管理员添加权限 [{0}]
-no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}]
-no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}]
-no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}]
-no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}]
-no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]

zhongzheng-admin-saas/src/main/resources/logback.xml

@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <property name="log.path" value="./logs"/>
-    <property name="console.log.pattern"
-              value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
-    <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${console.log.pattern}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-    </appender>
-
-    <!-- 控制台输出 -->
-    <appender name="file_console" class="ch.qos.logback.core.FileAppender">
-        <file>${log.path}/sys-console.log</file>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-        </filter>
-    </appender>
-
-    <!-- 系统日志输出 -->
-    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/sys-info.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/sys-error.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>ERROR</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 用户访问日志输出  -->
-    <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/sys-user.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 按天回滚 daily -->
-            <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.zhongzheng" level="info" />
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn" />
-
-    <root level="info">
-        <appender-ref ref="console" />
-    </root>
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="file_info" />
-        <appender-ref ref="file_error" />
-        <appender-ref ref="file_console" />
-    </root>
-
-    <!--系统用户操作日志-->
-    <logger name="sys-user" level="info">
-        <appender-ref ref="sys-user"/>
-    </logger>
-</configuration>

zhongzheng-admin/src/main/java/com/zhongzheng/controller/activity/ActivityRecommendController.java

@@ -1,100 +0,0 @@
-package com.zhongzheng.controller.activity;
-
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.modules.activity.bo.ActivityRecommendAddBo;
-import com.zhongzheng.modules.activity.bo.ActivityRecommendEditBo;
-import com.zhongzheng.modules.activity.bo.ActivityRecommendQueryBo;
-import com.zhongzheng.modules.activity.service.IActivityRecommendService;
-import com.zhongzheng.modules.activity.vo.ActivityRecommendVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 商品推荐Controller
- *
- * @author hjl
- * @date 2022-04-13
- */
-@Api(value = "商品推荐控制器", tags = {"商品推荐管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/activity/recommend")
-public class ActivityRecommendController extends BaseController {
-
-    private final IActivityRecommendService iActivityRecommendService;
-
-
-
-
-    /**
-     * 查询商品推荐列表
-     */
-    @ApiOperation("查询商品推荐列表")
-    @PreAuthorize("@ss.hasPermi('system:recommend:list')")
-    @GetMapping("/list")
-    public TableDataInfo<ActivityRecommendVo> list(ActivityRecommendQueryBo bo) {
-        startPage();
-        List<ActivityRecommendVo> list = iActivityRecommendService.selectList(bo);
-        return getDataTable(list);
-    }
-
-
-
-    /**
-     * 获取商品推荐详细信息
-     */
-    @ApiOperation("获取商品推荐详细信息")
-    @PreAuthorize("@ss.hasPermi('system:recommend:query')")
-    @GetMapping("/{recommendId}")
-    public AjaxResult<ActivityRecommendVo> getInfo(@PathVariable("recommendId" ) Long recommendId) {
-        ActivityRecommendQueryBo bo = new ActivityRecommendQueryBo();
-        bo.setRecommendId(recommendId);
-        return AjaxResult.success(iActivityRecommendService.getDetail(bo));
-    }
-
-    /**
-     * 新增商品推荐
-     */
-    @ApiOperation("新增商品推荐")
-    @PreAuthorize("@ss.hasPermi('system:recommend:add')")
-    @Log(title = "商品推荐", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody ActivityRecommendAddBo bo) {
-        return toAjax(iActivityRecommendService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改商品推荐
-     */
-    @ApiOperation("修改商品推荐")
-    @PreAuthorize("@ss.hasPermi('system:recommend:edit')")
-    @Log(title = "商品推荐", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody ActivityRecommendEditBo bo) {
-        return toAjax(iActivityRecommendService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除推荐板块商品
-     */
-    @ApiOperation("删除推荐板块")
-    @PreAuthorize("@ss.hasPermi('system:goods:remove')")
-    @Log(title = "删除推荐板块" , businessType = BusinessType.DELETE)
-    @PostMapping("/remove")
-    public AjaxResult<Void> remove(@RequestBody ActivityRecommendEditBo bo) {
-        return toAjax(iActivityRecommendService.deleteWithValidByIds(new ArrayList<Long>(Arrays.asList(bo.getRecommendId())), true) ? 1 : 0);
-    }
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/alioss/OssController.java

@@ -1,73 +0,0 @@
-package com.zhongzheng.controller.alioss;
-
-
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.modules.alioss.bo.OssRequest;
-import com.zhongzheng.modules.alioss.service.OssService;
-import com.zhongzheng.modules.alioss.vo.ResultBean;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import java.io.FileNotFoundException;
-import java.util.Map;
-
-/**
- * 阿里OSS
- *
- * @author change
- * @date 2021-05-17
- */
-@Api(value = "阿里OSS上传文件控制器", tags = {"阿里OSS上传文件"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/aliyun/oss")
-public class OssController extends BaseController {
-
-    private static Logger log = LoggerFactory.getLogger(OssController.class);
-
-    private final OssService ossService;
-
-    /**
-     * policy获得
-     */
-    @ApiOperation("policy获得")
-    @GetMapping("/policy")
-    public AjaxResult<ResultBean> policy(@Validated OssRequest ossRequest) {
-        ResultBean result = ossService.getPolicy(ossRequest);
-        log.info("服务端生成签名:{}",result);
-        return AjaxResult.success(result);
-    }
-
-    /**
-     * 阿里回调OSS返回参数到前端
-     */
-    @ApiOperation("回调")
-    @PostMapping("/callback")
-    public ResultBean callback(HttpServletRequest request) {
-        ResultBean ossCallbackResult = ossService.callback(request);
-        log.info("oss成功的回调:{}",ossCallbackResult);
-        return ossCallbackResult;
-    }
-
-
-    /**
-     * upload上传文件
-     */
-    @ApiOperation("上传file图片")
-    @PostMapping("/upload")
-    public AjaxResult<String> upload( OssRequest file) throws Exception {
-        String result = ossService.upload(file);
-        log.info("服务端生成签名:{}",result);
-        return AjaxResult.success("返回图片路径",result);
-    }
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/bank/ExamController.java

@@ -1,162 +0,0 @@
-package com.zhongzheng.controller.bank;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.bank.bo.*;
-import com.zhongzheng.modules.bank.domain.QuestionBusiness;
-import com.zhongzheng.modules.bank.service.IExamQuestionService;
-import com.zhongzheng.modules.bank.service.IExamService;
-import com.zhongzheng.modules.bank.service.IQuestionBusinessService;
-import com.zhongzheng.modules.bank.vo.ExamQuestionVo;
-import com.zhongzheng.modules.bank.vo.ExamVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 试卷Controller
- *
- * @author hjl
- * @date 2021-10-22
- */
-@Api(value = "试卷控制器", tags = {"试卷管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/bank/exam")
-public class ExamController extends BaseController {
-
-    private final IExamService iExamService;
-
-    private final IQuestionBusinessService iQuestionBusinessService;
-
-    private final IExamQuestionService iExamQuestionService;
-
-    /**
-     * 查询试卷列表
-     */
-    @ApiOperation("查询试卷列表")
-    @PreAuthorize("@ss.hasPermi('system:exam:list')")
-    @GetMapping("/list")
-    public TableDataInfo<ExamVo> list(ExamQueryBo bo) {
-        startPage();
-        List<ExamVo> list = iExamService.getList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 试卷批量删除
-     */
-    @ApiOperation("试卷批量删除")
-    @PostMapping("/batch/del")
-    public AjaxResult<Void> batchDelExam(@RequestBody QuestionBatchDelBo bo) {
-        return toAjax(iExamService.batchDelExam(bo) ? 1 : 0);
-    }
-
-
-    /**
-     * 导出试卷列表
-     */
-   /* @ApiOperation("导出试卷列表")
-    @PreAuthorize("@ss.hasPermi('system:exam:export')")
-    @Log(title = "试卷", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<ExamVo> export(ExamQueryBo bo) {
-        List<ExamVo> list = iExamService.queryList(bo);
-        ExcelUtil<ExamVo> util = new ExcelUtil<ExamVo>(ExamVo.class);
-        return util.exportExcel(list, "试卷");
-    }*/
-
-    /**
-     * 获取试卷详细信息
-     */
-    @ApiOperation("获取试卷详细信息")
-    @PreAuthorize("@ss.hasPermi('system:exam:query')")
-    @GetMapping("/{examId}")
-    public AjaxResult<ExamVo> getInfo(@PathVariable("examId" ) Long examId) {
-        return AjaxResult.success(iExamService.queryById(examId));
-    }
-
-    /**
-     * 新增试卷
-     */
-    @ApiOperation("新增试卷")
-    @PreAuthorize("@ss.hasPermi('system:exam:add')")
-    @Log(title = "试卷", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<ExamVo> add(@RequestBody ExamAddBo bo) {
-        return AjaxResult.success(iExamService.insertByAddBo(bo));
-    }
-
-    /**
-     * 新增试卷
-     */
-    @ApiOperation("批量新增试卷")
-    @PreAuthorize("@ss.hasPermi('system:exam:add')")
-    @Log(title = "试卷", businessType = BusinessType.INSERT)
-    @PostMapping("/addMore")
-    public AjaxResult<List<Long>> addMore(@RequestBody List<ExamAddBo> list) {
-        return AjaxResult.success(iExamService.insertByAddBoMore(list));
-    }
-
-    /**
-     * 修改试卷
-     */
-    @ApiOperation("修改试卷")
-    @PreAuthorize("@ss.hasPermi('system:exam:edit')")
-    @Log(title = "试卷", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody ExamEditBo bo) {
-        return toAjax(iExamService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除试卷
-     */
-   /* @ApiOperation("删除试卷")
-    @PreAuthorize("@ss.hasPermi('system:exam:remove')")
-    @Log(title = "试卷" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{examIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] examIds) {
-        return toAjax(iExamService.deleteWithValidByIds(Arrays.asList(examIds), true) ? 1 : 0);
-    }*/
-    /**
-     * 查询题目业务层次关系列表
-     */
-    @ApiOperation("查询业务层次关系列表")
-    @PreAuthorize("@ss.hasPermi('system:business:list')")
-    @GetMapping("/business/list")
-    public TableDataInfo<QuestionBusiness> businessList(QuestionBusinessQueryBo bo) {
-        startPage();
-        bo.setType(QuestionBusiness.TYPE_EXAM);
-        List<QuestionBusiness> list = iQuestionBusinessService.getListById(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 查询题目业务层次关系列表
-     */
-    @ApiOperation("查询题目列表")
-    @PreAuthorize("@ss.hasPermi('system:business:list')")
-    @GetMapping("/question/list")
-    public AjaxResult<List<ExamQuestionVo>> questionList(ExamQuestionQueryBo bo) {
-        List<ExamQuestionVo> list = iExamQuestionService.getList(bo);
-        return AjaxResult.success(list);
-    }
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/bank/QuestionChapterController.java

@@ -1,162 +0,0 @@
-package com.zhongzheng.controller.bank;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.bank.bo.*;
-import com.zhongzheng.modules.bank.domain.QuestionBusiness;
-import com.zhongzheng.modules.bank.service.IQuestionBusinessService;
-import com.zhongzheng.modules.bank.service.IQuestionChapterExamService;
-import com.zhongzheng.modules.bank.service.IQuestionChapterService;
-import com.zhongzheng.modules.bank.vo.ExamQuestionVo;
-import com.zhongzheng.modules.bank.vo.ExamVo;
-import com.zhongzheng.modules.bank.vo.QuestionChapterVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 章卷Controller
- *
- * @author hjl
- * @date 2021-10-25
- */
-@Api(value = "章卷控制器", tags = {"章卷管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/bank/chapter")
-public class QuestionChapterController extends BaseController {
-
-    private final IQuestionChapterService iQuestionChapterService;
-
-    private final IQuestionBusinessService iQuestionBusinessService;
-
-    private final IQuestionChapterExamService iQuestionChapterExamService;
-
-    /**
-     * 查询章卷列表
-     */
-    @ApiOperation("查询章卷列表")
-    @PreAuthorize("@ss.hasPermi('system:chapter:list')")
-    @GetMapping("/list")
-    public TableDataInfo<QuestionChapterVo> list(QuestionChapterQueryBo bo) {
-        startPage();
-        List<QuestionChapterVo> list = iQuestionChapterService.getList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 章卷批量删除
-     */
-    @ApiOperation("章卷批量删除")
-    @PostMapping("/batch/del")
-    public AjaxResult<Void> batchDelChapterExam(@RequestBody QuestionBatchDelBo bo) {
-        return toAjax(iQuestionChapterService.batchDelChapterExam(bo) ? 1 : 0);
-    }
-
-    /**
-     * 导出章卷列表
-     */
-  /*  @ApiOperation("导出章卷列表")
-    @PreAuthorize("@ss.hasPermi('system:chapter:export')")
-    @Log(title = "章卷", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<QuestionChapterVo> export(QuestionChapterQueryBo bo) {
-        List<QuestionChapterVo> list = iQuestionChapterService.queryList(bo);
-        ExcelUtil<QuestionChapterVo> util = new ExcelUtil<QuestionChapterVo>(QuestionChapterVo.class);
-        return util.exportExcel(list, "章卷");
-    }*/
-
-    /**
-     * 获取章卷详细信息
-     */
-    @ApiOperation("获取章卷详细信息")
-    @PreAuthorize("@ss.hasPermi('system:chapter:query')")
-    @GetMapping("/{chapterExamId}")
-    public AjaxResult<QuestionChapterVo> getInfo(@PathVariable("chapterExamId" ) Long chapterExamId) {
-        return AjaxResult.success(iQuestionChapterService.getById(chapterExamId));
-    }
-
-    /**
-     * 新增章卷
-     */
-    @ApiOperation("新增章卷")
-    @PreAuthorize("@ss.hasPermi('system:chapter:add')")
-    @Log(title = "章卷", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody QuestionChapterAddBo bo) {
-        return toAjax(iQuestionChapterService.insertByAddBo(bo)>0 ? 1 : 0);
-    }
-
-    /**
-     * 新增章卷
-     */
-    @ApiOperation("批量新增章卷")
-    @PreAuthorize("@ss.hasPermi('system:chapter:add')")
-    @Log(title = "章卷", businessType = BusinessType.INSERT)
-    @PostMapping("/addMore")
-    public AjaxResult<List<Long>> addMore(@RequestBody List<QuestionChapterAddBo> list) {
-        return AjaxResult.success(iQuestionChapterService.insertByAddBoMore(list));
-    }
-
-    /**
-     * 修改章卷
-     */
-    @ApiOperation("修改章卷")
-    @PreAuthorize("@ss.hasPermi('system:chapter:edit')")
-    @Log(title = "章卷", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody QuestionChapterEditBo bo) {
-        return toAjax(iQuestionChapterService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除章卷
-     */
-    /*@ApiOperation("删除章卷")
-    @PreAuthorize("@ss.hasPermi('system:chapter:remove')")
-    @Log(title = "章卷" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{chapterExamIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] chapterExamIds) {
-        return toAjax(iQuestionChapterService.deleteWithValidByIds(Arrays.asList(chapterExamIds), true) ? 1 : 0);
-    }*/
-    /**
-     * 查询题目业务层次关系列表
-     */
-    @ApiOperation("查询业务层次关系列表")
-    @PreAuthorize("@ss.hasPermi('system:business:list')")
-    @GetMapping("/business/list")
-    public TableDataInfo<QuestionBusiness> businessList(QuestionBusinessQueryBo bo) {
-        startPage();
-        bo.setType(QuestionBusiness.TYPE_QUESTION_CHAPTER);
-        List<QuestionBusiness> list = iQuestionBusinessService.getListById(bo);
-        return getDataTable(list);
-    }
-    /**
-     * 查询关联试卷列表
-     */
-    @ApiOperation("查询关联试卷列表")
-    @PreAuthorize("@ss.hasPermi('system:business:list')")
-    @GetMapping("/exam/list")
-    public AjaxResult<List<ExamVo>> examList(QuestionChapterExamQueryBo bo) {
-        List<ExamVo> list = iQuestionChapterExamService.getList(bo);
-        return AjaxResult.success(list);
-    }
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/bank/QuestionController.java

@@ -1,282 +0,0 @@
-package com.zhongzheng.controller.bank;
-
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Arrays;
-import java.util.Map;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.lang.Validator;
-import cn.hutool.http.HttpStatus;
-import com.alibaba.fastjson.JSON;
-import com.github.pagehelper.PageInfo;
-import com.zhongzheng.common.core.domain.entity.SysUser;
-import com.zhongzheng.common.core.domain.model.LoginUser;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.common.utils.poi.EasyPoiUtil;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.framework.web.service.TokenService;
-import com.zhongzheng.modules.bank.bo.*;
-import com.zhongzheng.modules.bank.domain.Exam;
-import com.zhongzheng.modules.bank.domain.Question;
-import com.zhongzheng.modules.bank.domain.QuestionBusiness;
-import com.zhongzheng.modules.bank.service.IQuestionBusinessService;
-import com.zhongzheng.modules.bank.service.IQuestionService;
-import com.zhongzheng.modules.bank.vo.*;
-import com.zhongzheng.modules.course.bo.CourseSectionBusinessAddBo;
-import com.zhongzheng.modules.course.vo.CourseSectionImport;
-import com.zhongzheng.modules.goods.vo.GoodsVo;
-import com.zhongzheng.modules.user.vo.UserSubscribeErrorImport;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * 题库题目Controller
- *
- * @author hjl
- * @date 2021-10-21
- */
-@Api(value = "题库题目控制器", tags = {"题库题目管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/bank/question")
-public class QuestionController extends BaseController {
-
-    private final IQuestionService iQuestionService;
-
-    private final IQuestionBusinessService iQuestionBusinessService;
-
-    @Autowired
-    private TokenService tokenService;
-
-    /**
-     * 查询题库题目列表
-     */
-    @ApiOperation("查询题库题目列表")
-    @PreAuthorize("@ss.hasPermi('system:question:list')")
-    @GetMapping("/list")
-    public TableDataInfo<QuestionVo> list(QuestionQueryBo bo) {
-        startPage();
-        List<QuestionVo> list = iQuestionService.selectListByBo(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 题目批量删除
-     */
-    @ApiOperation("题目批量删除")
-    @PostMapping("/batch/del")
-    public AjaxResult<Void> batchDelQuestion(@RequestBody QuestionBatchDelBo bo) {
-        return toAjax(iQuestionService.batchDelQuestion(bo) ? 1 : 0);
-    }
-
-    /**
-     * 导出题库题目列表
-     */
-   /* @ApiOperation("导出题库题目列表")
-    @PreAuthorize("@ss.hasPermi('system:question:export')")
-    @Log(title = "题库题目", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<QuestionVo> export(QuestionQueryBo bo) {
-        List<QuestionVo> list = iQuestionService.queryList(bo);
-        ExcelUtil<QuestionVo> util = new ExcelUtil<QuestionVo>(QuestionVo.class);
-        return util.exportExcel(list, "题库题目");
-    }*/
-
-    /**
-     * 获取题库题目详细信息
-     */
-    @ApiOperation("获取题库题目详细信息")
-    @PreAuthorize("@ss.hasPermi('system:question:query')")
-    @GetMapping("/{questionId}")
-    public AjaxResult<QuestionVo> getInfo(@PathVariable("questionId" ) Long questionId) {
-        return AjaxResult.success(iQuestionService.queryById(questionId));
-    }
-
-    /**
-     * 新增题库题目
-     */
-    @ApiOperation("新增题库题目")
-    @PreAuthorize("@ss.hasPermi('system:question:add')")
-    @Log(title = "题库题目", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Question> add(@RequestBody QuestionAddBo bo) {
-        return AjaxResult.success(iQuestionService.insertByAddBo(bo));
-    }
-
-    /**
-     * 修改题库题目
-     */
-    @ApiOperation("修改题库题目")
-    @PreAuthorize("@ss.hasPermi('system:question:edit')")
-    @Log(title = "题库题目", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody QuestionEditBo bo) {
-        return toAjax(iQuestionService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除题库题目
-     */
-    /*@ApiOperation("删除题库题目")
-    @PreAuthorize("@ss.hasPermi('system:question:remove')")
-    @Log(title = "题库题目" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{questionIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] questionIds) {
-        return toAjax(iQuestionService.deleteWithValidByIds(Arrays.asList(questionIds), true) ? 1 : 0);
-    }*/
-
-    /**
-     * 查询题目业务层次关系列表
-     */
-    @ApiOperation("查询题目业务层次关系列表")
-    @PreAuthorize("@ss.hasPermi('system:business:list')")
-    @GetMapping("/business/list")
-    public TableDataInfo<QuestionBusiness> businessList(QuestionBusinessQueryBo bo) {
-        startPage();
-        bo.setType(QuestionBusiness.TYPE_QUESTION);
-        List<QuestionBusiness> list = iQuestionBusinessService.getListById(bo);
-        return getDataTable(list);
-    }
-
-    @Log(title = "题目管理", businessType = BusinessType.IMPORT)
-    @ApiOperation("导入题目模板")
-    @PreAuthorize("@ss.hasPermi('system:question:import')")
-    @PostMapping("/importData")
-    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
-    {
-        List<QuestionImportV2> questionList2 =EasyPoiUtil.importExcel(file,0,2,QuestionImportV2.class);
-        ExcelUtil<QuestionImportV2> util = new ExcelUtil<QuestionImportV2>(QuestionImportV2.class);
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        String operName = loginUser.getUsername();
-        List<QuestionImport> questionList = new ArrayList<>();
-        List<QuestionImportV2> errorList = iQuestionService.importExcelQuestionV2(questionList2, updateSupport, operName);
-        if(Validator.isNotEmpty(errorList)&&errorList.size()>0){
-            List<QuestionImportV2> errorListExport = new ArrayList<>();
-            for(QuestionImportV2 qi : errorList){
-                QuestionImportV2 item = BeanUtil.toBean(qi, QuestionImportV2.class);
-                errorListExport.add(item);
-            }
-            ExcelUtil<QuestionImportV2> util1 = new ExcelUtil<QuestionImportV2>(QuestionImportV2.class);
-            String timeStr= LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-            return util.exportEasyExcel(util1.exportEasyData(errorListExport), "导出错误数据"+timeStr);
-        }else{
-            return AjaxResult.success();
-        }
-    }
-
-    @Log(title = "题目管理", businessType = BusinessType.IMPORT)
-    @ApiOperation("导入题目模板返回数组")
-    @PreAuthorize("@ss.hasPermi('system:question:import')")
-    @PostMapping("/importDataBackList")
-    public AjaxResult<Map<String, Object>> importDataBackList(MultipartFile file) throws Exception
-    {
-        List<QuestionImportV2> questionList2 =EasyPoiUtil.importExcel(file,0,2,QuestionImportV2.class);
-
-        ExcelUtil<QuestionImportV2> util = new ExcelUtil<QuestionImportV2>(QuestionImportV2.class);
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        String operName = loginUser.getUsername();
-        //只返回数据不插入数据库
-        Map<String, Object> rs = iQuestionService.importExcelQuestionV2NotInBank(questionList2, false, operName);
-        List<QuestionImportV2> errorList = (List<QuestionImportV2>)rs.get("errorList");
-        List<QuestionAddBo> nqList = (List<QuestionAddBo>)rs.get("questionList");
-        if(Validator.isNotEmpty(errorList)&&errorList.size()>0){
-            List<QuestionImportV2> errorListExport = new ArrayList<>();
-            for(QuestionImportV2 qi : errorList){
-                QuestionImportV2 item = BeanUtil.toBean(qi, QuestionImportV2.class);
-                errorListExport.add(item);
-            }
-            ExcelUtil<QuestionImportV2> util1 = new ExcelUtil<QuestionImportV2>(QuestionImportV2.class);
-            String timeStr= LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-            rs.put("errorExcel",util.exportEasyExcel(util1.exportEasyData(errorListExport), "导出错误数据"+timeStr));
-            rs.remove("errorList");
-        }
-        if(questionList2.size()>0&&questionList2.size()>nqList.size()&&nqList.size()>0){
-            rs.put("fullStatus","部分成功");
-        }
-        else if(questionList2.size()==nqList.size()){
-            rs.put("fullStatus","全部成功");
-        }
-        else{
-            rs.put("fullStatus","失败");
-        }
-        return AjaxResult.success(rs);
-    }
-
-    @Log(title = "题目管理", businessType = BusinessType.IMPORT)
-    @ApiOperation("导入旧系统题目模板返回数组")
-    @PreAuthorize("@ss.hasPermi('system:question:import')")
-    @PostMapping("/importDataBackFromOldList")
-    public AjaxResult<Map<String, Object>> importDataBackFromOldList(MultipartFile file) throws Exception
-    {
-        List<QuestionImportV3> questionList2 =EasyPoiUtil.importExcel(file,0,1,QuestionImportV3.class);
-
-        ExcelUtil<QuestionImportV3> util = new ExcelUtil<QuestionImportV3>(QuestionImportV3.class);
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        String operName = loginUser.getUsername();
-        //只返回数据不插入数据库
-        Map<String, Object> rs = iQuestionService.importExcelQuestionV3NotInBankFromOld(questionList2, false, operName);
-        List<QuestionImportV3> errorList = (List<QuestionImportV3>)rs.get("errorList");
-        List<QuestionAddBo> nqList = (List<QuestionAddBo>)rs.get("questionList");
-        if(Validator.isNotEmpty(errorList)&&errorList.size()>0){
-            List<QuestionImportV3> errorListExport = new ArrayList<>();
-            for(QuestionImportV3 qi : errorList){
-                QuestionImportV3 item = BeanUtil.toBean(qi, QuestionImportV3.class);
-                errorListExport.add(item);
-            }
-            ExcelUtil<QuestionImportV3> util1 = new ExcelUtil<QuestionImportV3>(QuestionImportV3.class);
-            String timeStr= LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-            rs.put("errorExcel",util.exportEasyExcel(util1.exportEasyData(errorListExport), "导出错误数据"+timeStr));
-            rs.remove("errorList");
-        }
-        if(errorList.size()>0&&nqList.size()>0){
-            rs.put("fullStatus","部分成功");
-        }
-        else if(errorList.size()==0){
-            rs.put("fullStatus","全部成功");
-        }
-        else{
-            rs.put("fullStatus","失败");
-        }
-        return AjaxResult.success(rs);
-    }
-
-    @Log(title = "导入题目Word模板", businessType = BusinessType.IMPORT)
-    @ApiOperation("导入题目Word模板")
-    @PreAuthorize("@ss.hasPermi('system:question:import')")
-    @PostMapping("/importWordData")
-    public AjaxResult importWordData(MultipartFile file, Long eduId, Long projectId, Long businessId, Long subjectId) throws Exception
-    {
-        String errorLog = iQuestionService.importWordQuestion(file,  eduId,  projectId,  businessId, subjectId);
-        return AjaxResult.success(errorLog);
-    }
-
-    @Log(title = "" +"", businessType = BusinessType.IMPORT)
-    @ApiOperation("导入题目Word模板列表")
-    @PreAuthorize("@ss.hasPermi('system:question:import')")
-    @PostMapping("/importWordQuestionList")
-    public AjaxResult<Map<String,Object>> importWordQuestionList(MultipartFile file, Long eduId, Long projectId, Long businessId, Long subjectId) throws Exception
-    {
-        Map<String,Object> result = iQuestionService.importWordQuestionList(file,  eduId,  projectId,  businessId, subjectId);
-        return AjaxResult.success(result);
-    }
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/bank/QuestionModuleController.java

@@ -1,155 +0,0 @@
-package com.zhongzheng.controller.bank;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Arrays;
-
-import cn.hutool.core.lang.Validator;
-import com.zhongzheng.modules.bank.bo.*;
-import com.zhongzheng.modules.bank.domain.QuestionBusiness;
-import com.zhongzheng.modules.bank.service.IQuestionBusinessService;
-import com.zhongzheng.modules.bank.service.IQuestionModuleChapterService;
-import com.zhongzheng.modules.bank.service.IQuestionModuleService;
-import com.zhongzheng.modules.bank.vo.ExamQuestionVo;
-import com.zhongzheng.modules.bank.vo.QuestionChapterVo;
-import com.zhongzheng.modules.bank.vo.QuestionModuleVo;
-import com.zhongzheng.modules.goods.bo.GoodsBatchDelBo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 题目模块Controller
- *
- * @author hjl
- * @date 2021-10-25
- */
-@Api(value = "题目模块控制器", tags = {"题目模块管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/bank/module")
-public class QuestionModuleController extends BaseController {
-
-    private final IQuestionModuleService iQuestionModuleService;
-
-    private final IQuestionBusinessService iQuestionBusinessService;
-
-    private final IQuestionModuleChapterService iQuestionModuleChapterService;
-
-    /**
-     * 查询题目模块列表
-     */
-    @ApiOperation("查询题目模块列表")
-    @PreAuthorize("@ss.hasPermi('system:module:list')")
-    @GetMapping("/list")
-    public TableDataInfo<QuestionModuleVo> list(QuestionModuleQueryBo bo) {
-        startPage();
-        List<QuestionModuleVo> list = iQuestionModuleService.getList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 模块卷批量删除
-     */
-    @ApiOperation("模块卷批量删除")
-    @PostMapping("/batch/del")
-    public AjaxResult<Void> batchDelModuleExam(@RequestBody QuestionBatchDelBo bo) {
-        return toAjax(iQuestionModuleService.batchDelModuleExam(bo) ? 1 : 0);
-    }
-
-    /**
-     * 导出题目模块列表
-     */
-    /*@ApiOperation("导出题目模块列表")
-    @PreAuthorize("@ss.hasPermi('system:module:export')")
-    @Log(title = "题目模块", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<QuestionModuleVo> export(QuestionModuleQueryBo bo) {
-        List<QuestionModuleVo> list = iQuestionModuleService.queryList(bo);
-        ExcelUtil<QuestionModuleVo> util = new ExcelUtil<QuestionModuleVo>(QuestionModuleVo.class);
-        return util.exportExcel(list, "题目模块");
-    }*/
-
-    /**
-     * 获取题目模块详细信息
-     */
-    @ApiOperation("获取题目模块详细信息")
-    @PreAuthorize("@ss.hasPermi('system:module:query')")
-    @GetMapping("/{questionModuleId}")
-    public AjaxResult<QuestionModuleVo> getInfo(@PathVariable("questionModuleId" ) Long questionModuleId) {
-        return AjaxResult.success(iQuestionModuleService.queryById(questionModuleId));
-    }
-
-    /**
-     * 新增题目模块
-     */
-    @ApiOperation("新增题目模块")
-    @PreAuthorize("@ss.hasPermi('system:module:add')")
-    @Log(title = "题目模块", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody QuestionModuleAddBo bo) {
-        return toAjax(iQuestionModuleService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改题目模块
-     */
-    @ApiOperation("修改题目模块")
-    @PreAuthorize("@ss.hasPermi('system:module:edit')")
-    @Log(title = "题目模块", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody QuestionModuleEditBo bo) {
-        return toAjax(iQuestionModuleService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除题目模块
-     */
-   /* @ApiOperation("删除题目模块")
-    @PreAuthorize("@ss.hasPermi('system:module:remove')")
-    @Log(title = "题目模块" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{questionModuleIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] questionModuleIds) {
-        return toAjax(iQuestionModuleService.deleteWithValidByIds(Arrays.asList(questionModuleIds), true) ? 1 : 0);
-    }*/
-
-    /**
-     * 查询题目业务层次关系列表
-     */
-    @ApiOperation("查询业务层次关系列表")
-    @PreAuthorize("@ss.hasPermi('system:business:list')")
-    @GetMapping("/business/list")
-    public TableDataInfo<QuestionBusiness> businessList(QuestionBusinessQueryBo bo) {
-        startPage();
-        bo.setType(QuestionBusiness.TYPE_QUESTION_MODULE);
-        List<QuestionBusiness> list = iQuestionBusinessService.getListById(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 查询关联章卷列表
-     */
-    @ApiOperation("查询关联章卷列表")
-    @PreAuthorize("@ss.hasPermi('system:business:list')")
-    @GetMapping("/chapter/list")
-    public AjaxResult<List<QuestionChapterVo>> chapterList(QuestionModuleChapterQueryBo bo) {
-        List<QuestionChapterVo> list = iQuestionModuleChapterService.getList(bo);
-        return AjaxResult.success(list);
-    }
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/ActivityAdvertisingController.java

@@ -1,112 +0,0 @@
-package com.zhongzheng.controller.base;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.base.bo.ActivityAdvertisingAddBo;
-import com.zhongzheng.modules.base.bo.ActivityAdvertisingEditBo;
-import com.zhongzheng.modules.base.bo.ActivityAdvertisingQueryBo;
-import com.zhongzheng.modules.base.service.IActivityAdvertisingService;
-import com.zhongzheng.modules.base.vo.ActivityAdvertisingVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 广告发布储存Controller
- *
- * @author hjl
- * @date 2022-01-13
- */
-@Api(value = "广告发布储存控制器", tags = {"广告发布储存管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/base/advertising")
-public class ActivityAdvertisingController extends BaseController {
-
-    private final IActivityAdvertisingService iActivityAdvertisingService;
-
-    /**
-     * 查询广告发布储存列表
-     */
-    @ApiOperation("查询广告发布储存列表")
-    @PreAuthorize("@ss.hasPermi('system:advertising:list')")
-    @GetMapping("/list")
-    public TableDataInfo<ActivityAdvertisingVo> list(ActivityAdvertisingQueryBo bo) {
-        startPage();
-        List<ActivityAdvertisingVo> list = iActivityAdvertisingService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出广告发布储存列表
-     */
-   /* @ApiOperation("导出广告发布储存列表")
-    @PreAuthorize("@ss.hasPermi('system:advertising:export')")
-    @Log(title = "广告发布储存", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<ActivityAdvertisingVo> export(ActivityAdvertisingQueryBo bo) {
-        List<ActivityAdvertisingVo> list = iActivityAdvertisingService.queryList(bo);
-        ExcelUtil<ActivityAdvertisingVo> util = new ExcelUtil<ActivityAdvertisingVo>(ActivityAdvertisingVo.class);
-        return util.exportExcel(list, "广告发布储存");
-    }*/
-
-    /**
-     * 获取广告发布储存详细信息
-     */
-    @ApiOperation("获取广告发布储存详细信息")
-    @PreAuthorize("@ss.hasPermi('system:advertising:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<ActivityAdvertisingVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iActivityAdvertisingService.queryById(id));
-    }
-
-    /**
-     * 新增广告发布储存
-     */
-    @ApiOperation("新增广告发布储存")
-    @PreAuthorize("@ss.hasPermi('system:advertising:add')")
-    @Log(title = "广告发布储存", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody ActivityAdvertisingAddBo bo) {
-        return toAjax(iActivityAdvertisingService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改广告发布储存
-     */
-    @ApiOperation("修改广告发布储存")
-    @PreAuthorize("@ss.hasPermi('system:advertising:edit')")
-    @Log(title = "广告发布储存", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody ActivityAdvertisingEditBo bo) {
-        return toAjax(iActivityAdvertisingService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除广告发布储存
-     */
-   /* @ApiOperation("删除广告发布储存")
-    @PreAuthorize("@ss.hasPermi('system:advertising:remove')")
-    @Log(title = "广告发布储存" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iActivityAdvertisingService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }*/
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/ActivityAdvertisingLocationController.java

@@ -1,112 +0,0 @@
-package com.zhongzheng.controller.base;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.base.bo.ActivityAdvertisingLocationAddBo;
-import com.zhongzheng.modules.base.bo.ActivityAdvertisingLocationEditBo;
-import com.zhongzheng.modules.base.bo.ActivityAdvertisingLocationQueryBo;
-import com.zhongzheng.modules.base.service.IActivityAdvertisingLocationService;
-import com.zhongzheng.modules.base.vo.ActivityAdvertisingLocationVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 广告位Controller
- *
- * @author hjl
- * @date 2022-01-13
- */
-@Api(value = "广告位控制器", tags = {"广告位管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/base/adv/location")
-public class ActivityAdvertisingLocationController extends BaseController {
-
-    private final IActivityAdvertisingLocationService iActivityAdvertisingLocationService;
-
-    /**
-     * 查询广告位列表
-     */
-    @ApiOperation("查询广告位列表")
-    @PreAuthorize("@ss.hasPermi('system:location:list')")
-    @GetMapping("/list")
-    public TableDataInfo<ActivityAdvertisingLocationVo> list(ActivityAdvertisingLocationQueryBo bo) {
-        startPage();
-        List<ActivityAdvertisingLocationVo> list = iActivityAdvertisingLocationService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出广告位列表
-     */
-    /*@ApiOperation("导出广告位列表")
-    @PreAuthorize("@ss.hasPermi('system:location:export')")
-    @Log(title = "广告位", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<ActivityAdvertisingLocationVo> export(ActivityAdvertisingLocationQueryBo bo) {
-        List<ActivityAdvertisingLocationVo> list = iActivityAdvertisingLocationService.queryList(bo);
-        ExcelUtil<ActivityAdvertisingLocationVo> util = new ExcelUtil<ActivityAdvertisingLocationVo>(ActivityAdvertisingLocationVo.class);
-        return util.exportExcel(list, "广告位");
-    }*/
-
-    /**
-     * 获取广告位详细信息
-     */
-    @ApiOperation("获取广告位详细信息")
-    @PreAuthorize("@ss.hasPermi('system:location:query')")
-    @GetMapping("/{locationId}")
-    public AjaxResult<ActivityAdvertisingLocationVo> getInfo(@PathVariable("locationId" ) Long locationId) {
-        return AjaxResult.success(iActivityAdvertisingLocationService.queryById(locationId));
-    }
-
-    /**
-     * 新增广告位
-     */
-    @ApiOperation("新增广告位")
-    @PreAuthorize("@ss.hasPermi('system:location:add')")
-    @Log(title = "广告位", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody ActivityAdvertisingLocationAddBo bo) {
-        return toAjax(iActivityAdvertisingLocationService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改广告位
-     */
-    @ApiOperation("修改广告位")
-    @PreAuthorize("@ss.hasPermi('system:location:edit')")
-    @Log(title = "广告位", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody ActivityAdvertisingLocationEditBo bo) {
-        return toAjax(iActivityAdvertisingLocationService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除广告位
-     */
-   /* @ApiOperation("删除广告位")
-    @PreAuthorize("@ss.hasPermi('system:location:remove')")
-    @Log(title = "广告位" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{locationIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] locationIds) {
-        return toAjax(iActivityAdvertisingLocationService.deleteWithValidByIds(Arrays.asList(locationIds), true) ? 1 : 0);
-    }*/
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/ApplyAreasController.java

@@ -1,125 +0,0 @@
-package com.zhongzheng.controller.base;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.base.bo.ApplyAreasAddBo;
-import com.zhongzheng.modules.base.bo.ApplyAreasEditBo;
-import com.zhongzheng.modules.base.bo.ApplyAreasQueryBo;
-import com.zhongzheng.modules.base.domain.ApplyAreas;
-import com.zhongzheng.modules.base.service.IApplyAreasService;
-import com.zhongzheng.modules.base.vo.ApplyAreasVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 报考地区Controller
- *
- * @author hjl
- * @date 2021-10-08
- */
-@Api(value = "报考省市控制器", tags = {"报考省市管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/apply/areas")
-public class ApplyAreasController extends BaseController {
-
-    private final IApplyAreasService iApplyAreasService;
-
-    /**
-     * 查询报考省地区列表
-     */
-    @ApiOperation("查询报考省地区列表")
-    @PreAuthorize("@ss.hasPermi('system:areas:list')")
-    @GetMapping("/list")
-    public TableDataInfo<ApplyAreasVo> list(ApplyAreasQueryBo bo) {
-        startPage();
-        List<ApplyAreasVo> list = iApplyAreasService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 查询报考市地区列表
-     */
-    @ApiOperation("查询报考市地区列表")
-    @PreAuthorize("@ss.hasPermi('system:areas:city_list')")
-    @GetMapping("/cityList")
-    public TableDataInfo<ApplyAreas> cityList(ApplyAreasQueryBo bo) {
-        startPage();
-        List<ApplyAreas> list = iApplyAreasService.selectCityList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出报考地区列表
-     */
-   /* @ApiOperation("导出报考地区列表")
-    @PreAuthorize("@ss.hasPermi('system:areas:export')")
-    @Log(title = "报考地区", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<ApplyAreasVo> export(ApplyAreasQueryBo bo) {
-        List<ApplyAreasVo> list = iApplyAreasService.queryList(bo);
-        ExcelUtil<ApplyAreasVo> util = new ExcelUtil<ApplyAreasVo>(ApplyAreasVo.class);
-        return util.exportExcel(list, "报考地区");
-    }*/
-
-    /**
-     * 获取报考地区详细信息
-     */
-    @ApiOperation("获取报考地区详细信息")
-    @PreAuthorize("@ss.hasPermi('system:areas:query')")
-    @GetMapping("/{areaId}")
-    public AjaxResult<ApplyAreasVo> getInfo(@PathVariable("areaId" ) Long areaId) {
-        return AjaxResult.success(iApplyAreasService.queryById(areaId));
-    }
-
-    /**
-     * 新增报考地区
-     */
-    @ApiOperation("新增报考地区")
-    @PreAuthorize("@ss.hasPermi('system:areas:add')")
-    @Log(title = "报考地区", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody ApplyAreasAddBo bo) {
-        return toAjax(iApplyAreasService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改报考地区
-     */
-    @ApiOperation("修改报考地区")
-    @PreAuthorize("@ss.hasPermi('system:areas:edit')")
-    @Log(title = "报考地区", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody ApplyAreasEditBo bo) {
-        return toAjax(iApplyAreasService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除报考地区
-     */
-   /* @ApiOperation("删除报考地区")
-    @PreAuthorize("@ss.hasPermi('system:areas:remove')")
-    @Log(title = "报考地区" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{areaIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] areaIds) {
-        return toAjax(iApplyAreasService.deleteWithValidByIds(Arrays.asList(areaIds), true) ? 1 : 0);
-    }*/
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/BaseFilterController.java

@@ -1,91 +0,0 @@
-package com.zhongzheng.controller.base;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.base.bo.BaseFilterAddBo;
-import com.zhongzheng.modules.base.bo.BaseFilterEditBo;
-import com.zhongzheng.modules.base.bo.BaseFilterQueryBo;
-import com.zhongzheng.modules.base.service.IBaseFilterService;
-import com.zhongzheng.modules.base.vo.BaseFilterVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 业务层次过滤器Controller
- *
- * @author hjl
- * @date 2022-06-22
- */
-@Api(value = "业务层次过滤器控制器", tags = {"业务层次过滤器管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/base/filter")
-public class BaseFilterController extends BaseController {
-
-    private final IBaseFilterService iBaseFilterService;
-
-    /**
-     * 查询业务层次过滤器列表
-     */
-    @ApiOperation("查询业务层次过滤器列表")
-    @PreAuthorize("@ss.hasPermi('system:filter:list')")
-    @GetMapping("/list")
-    public TableDataInfo<BaseFilterVo> list(BaseFilterQueryBo bo) {
-        startPage();
-        List<BaseFilterVo> list = iBaseFilterService.queryList(bo);
-        return getDataTable(list);
-    }
-
-
-
-    /**
-     * 获取业务层次过滤器详细信息
-     */
-    @ApiOperation("获取业务层次过滤器详细信息")
-    @PreAuthorize("@ss.hasPermi('system:filter:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<BaseFilterVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iBaseFilterService.queryById(id));
-    }
-
-    /**
-     * 新增业务层次过滤器
-     */
-    @ApiOperation("新增业务层次过滤器")
-    @PreAuthorize("@ss.hasPermi('system:filter:add')")
-    @Log(title = "业务层次过滤器", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody List<BaseFilterAddBo> bo) {
-        return toAjax(iBaseFilterService.insertListByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改业务层次过滤器
-     */
-   /* @ApiOperation("修改业务层次过滤器")
-    @PreAuthorize("@ss.hasPermi('system:filter:edit')")
-    @Log(title = "业务层次过滤器", businessType = BusinessType.UPDATE)
-    @PutMapping()
-    public AjaxResult<Void> edit(@RequestBody BaseFilterEditBo bo) {
-        return toAjax(iBaseFilterService.updateByEditBo(bo) ? 1 : 0);
-    }*/
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/CertificateCommonController.java

@@ -1,90 +0,0 @@
-package com.zhongzheng.controller.base;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.base.bo.CertificateCommonAddBo;
-import com.zhongzheng.modules.base.bo.CertificateCommonEditBo;
-import com.zhongzheng.modules.base.bo.CertificateCommonQueryBo;
-import com.zhongzheng.modules.base.service.ICertificateCommonService;
-import com.zhongzheng.modules.base.vo.CertificateCommonVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 证书Controller
- *
- * @author hjl
- * @date 2022-06-07
- */
-@Api(value = "证书控制器", tags = {"证书管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/base/certificate/common")
-public class CertificateCommonController extends BaseController {
-
-    private final ICertificateCommonService iCertificateCommonService;
-
-    /**
-     * 查询证书列表
-     */
-    @ApiOperation("查询证书列表")
-    @PreAuthorize("@ss.hasPermi('system:common:list')")
-    @GetMapping("/list")
-    public TableDataInfo<CertificateCommonVo> list(CertificateCommonQueryBo bo) {
-        startPage();
-        List<CertificateCommonVo> list = iCertificateCommonService.getList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 获取证书详细信息
-     */
-    @ApiOperation("获取证书详细信息")
-    @PreAuthorize("@ss.hasPermi('system:common:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<CertificateCommonVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iCertificateCommonService.queryById(id));
-    }
-
-    /**
-     * 新增证书
-     */
-    @ApiOperation("新增证书")
-    @PreAuthorize("@ss.hasPermi('system:common:add')")
-    @Log(title = "证书", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody CertificateCommonAddBo bo) {
-        return toAjax(iCertificateCommonService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改证书
-     */
-    @ApiOperation("修改证书")
-    @PreAuthorize("@ss.hasPermi('system:common:edit')")
-    @Log(title = "证书", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody CertificateCommonEditBo bo) {
-        return toAjax(iCertificateCommonService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/CertificateController.java

@@ -1,112 +0,0 @@
-package com.zhongzheng.controller.base;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.base.bo.CertificateAddBo;
-import com.zhongzheng.modules.base.bo.CertificateEditBo;
-import com.zhongzheng.modules.base.bo.CertificateQueryBo;
-import com.zhongzheng.modules.base.service.ICertificateService;
-import com.zhongzheng.modules.base.vo.CertificateVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 证书Controller
- *
- * @author ruoyi
- * @date 2021-10-08
- */
-@Api(value = "证书类型控制器", tags = {"证书类型管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/base/certificate")
-public class CertificateController extends BaseController {
-
-    private final ICertificateService iCertificateService;
-
-    /**
-     * 查询证书列表
-     */
-    @ApiOperation("查询证书类型列表")
-    @PreAuthorize("@ss.hasPermi('system:certificate:list')")
-    @GetMapping("/list")
-    public TableDataInfo<CertificateVo> list(CertificateQueryBo bo) {
-        startPage();
-        List<CertificateVo> list = iCertificateService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出证书列表
-     */
-   /* @ApiOperation("导出证书列表")
-    @PreAuthorize("@ss.hasPermi('system:certificate:export')")
-    @Log(title = "证书", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<CertificateVo> export(CertificateQueryBo bo) {
-        List<CertificateVo> list = iCertificateService.queryList(bo);
-        ExcelUtil<CertificateVo> util = new ExcelUtil<CertificateVo>(CertificateVo.class);
-        return util.exportExcel(list, "证书");
-    }*/
-
-    /**
-     * 获取证书详细信息
-     */
-    @ApiOperation("获取证书类型详细信息")
-    @PreAuthorize("@ss.hasPermi('system:certificate:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<CertificateVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iCertificateService.queryById(id));
-    }
-
-    /**
-     * 新增证书
-     */
-    @ApiOperation("新增证书类型")
-    @PreAuthorize("@ss.hasPermi('system:certificate:add')")
-    @Log(title = "证书", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody CertificateAddBo bo) {
-        return toAjax(iCertificateService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改证书
-     */
-    @ApiOperation("修改证书类型")
-    @PreAuthorize("@ss.hasPermi('system:certificate:edit')")
-    @Log(title = "证书", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody CertificateEditBo bo) {
-        return toAjax(iCertificateService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除证书
-     */
-   /* @ApiOperation("删除证书")
-    @PreAuthorize("@ss.hasPermi('system:certificate:remove')")
-    @Log(title = "证书" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iCertificateService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }*/
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/CertificateTpController.java

@@ -1,113 +0,0 @@
-package com.zhongzheng.controller.base;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.base.bo.CertificateTpAddBo;
-import com.zhongzheng.modules.base.bo.CertificateTpEditBo;
-import com.zhongzheng.modules.base.bo.CertificateTpQueryBo;
-import com.zhongzheng.modules.base.service.ICertificateTpService;
-import com.zhongzheng.modules.base.vo.CertificateTpVo;
-import com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 证书模板Controller
- *
- * @author hjl
- * @date 2022-02-16
- */
-@Api(value = "证书模板控制器", tags = {"证书模板管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/certificate/tp")
-public class CertificateTpController extends BaseController {
-
-    private final ICertificateTpService iCertificateTpService;
-
-    /**
-     * 查询证书模板列表
-     */
-    @ApiOperation("查询证书模板列表")
-    @PreAuthorize("@ss.hasPermi('system:tp:list')")
-    @GetMapping("/list")
-    public TableDataInfo<CertificateTpVo> list(CertificateTpQueryBo bo) {
-        startPage();
-        List<CertificateTpVo> list = iCertificateTpService.selectListByBo(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出证书模板列表
-     */
-    /*@ApiOperation("导出证书模板列表")
-    @PreAuthorize("@ss.hasPermi('system:tp:export')")
-    @Log(title = "证书模板", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<CertificateTpVo> export(CertificateTpQueryBo bo) {
-        List<CertificateTpVo> list = iCertificateTpService.queryList(bo);
-        ExcelUtil<CertificateTpVo> util = new ExcelUtil<CertificateTpVo>(CertificateTpVo.class);
-        return util.exportExcel(list, "证书模板");
-    }*/
-
-    /**
-     * 获取证书模板详细信息
-     */
-    @ApiOperation("获取证书模板详细信息")
-    @PreAuthorize("@ss.hasPermi('system:tp:query')")
-    @GetMapping("/{tpId}")
-    public AjaxResult<CertificateTpVo> getInfo(@PathVariable("tpId" ) Long tpId) {
-        return AjaxResult.success(iCertificateTpService.queryById(tpId));
-    }
-
-    /**
-     * 新增证书模板
-     */
-    @ApiOperation("新增证书模板")
-    @PreAuthorize("@ss.hasPermi('system:tp:add')")
-    @Log(title = "证书模板", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody CertificateTpAddBo bo) {
-        return toAjax(iCertificateTpService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改证书模板
-     */
-    @ApiOperation("修改证书模板")
-    @PreAuthorize("@ss.hasPermi('system:tp:edit')")
-    @Log(title = "证书模板", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody CertificateTpEditBo bo) {
-        return toAjax(iCertificateTpService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除证书模板
-     */
-    @ApiOperation("生成证书图片")
-    @PreAuthorize("@ss.hasPermi('system:tp:remove')")
-    @Log(title = "证书模板" , businessType = BusinessType.DELETE)
-    @GetMapping("/makePhoto")
-    public AjaxResult<Void> makePhoto(ClassGradeUserQueryBo bo) {
-        return AjaxResult.success(iCertificateTpService.makeCertificatePhoto(bo));
-    }
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/ConsoleController.java

@@ -1,82 +0,0 @@
-package com.zhongzheng.controller.base;
-
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
-import com.zhongzheng.modules.base.domain.ApplyAreas;
-import com.zhongzheng.modules.base.service.IConsoleService;
-import com.zhongzheng.modules.user.service.IUserExamRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 控制台Controller
- *
- * @author hjl
- * @date 2022-05-05
- */
-@Api(value = "控制台控制器", tags = {"控制台控制器"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/base/console")
-public class ConsoleController extends BaseController {
-
-    private final IConsoleService iConsoleService;
-
-    @ApiOperation("控制台学员数据")
-    @GetMapping("/studentData")
-    public AjaxResult<Map<String,Object>> studentData(ConsoleQueryBo bo) {
-        Map<String,Object> numMap = iConsoleService.getStudentData(bo);
-        return AjaxResult.success(numMap);
-    }
-
-    @ApiOperation("控制台订单数据")
-    @GetMapping("/orderData")
-    public AjaxResult<Map<String,Object>> orderData(ConsoleQueryBo bo) {
-        Map<String,Object> numMap = iConsoleService.getOrderData(bo);
-        return AjaxResult.success(numMap);
-    }
-
-    @ApiOperation("控制台班级数据")
-    @GetMapping("/gradeData")
-    public AjaxResult<Map<String,Object>> gradeData(ConsoleQueryBo bo) {
-        Map<String,Object> numMap = iConsoleService.getGradeData(bo);
-        return AjaxResult.success(numMap);
-    }
-
-    @ApiOperation("控制台学时数据")
-    @GetMapping("/periodData")
-    public AjaxResult<Map<String,Object>> periodData(ConsoleQueryBo bo) {
-        Map<String,Object> numMap = iConsoleService.getPeriodData(bo);
-        return AjaxResult.success(numMap);
-    }
-
-    @ApiOperation("控制台考试数据")
-    @GetMapping("/testData")
-    public AjaxResult<Map<String,Object>> testData(ConsoleQueryBo bo) {
-        Map<String,Object> numMap = iConsoleService.getTestData(bo);
-        return AjaxResult.success(numMap);
-    }
-
-    @ApiOperation("控制台模考数据")
-    @GetMapping("/mockData")
-    public AjaxResult<Map<String,Object>> mockData(ConsoleQueryBo bo) {
-        Map<String,Object> numMap = iConsoleService.getMockData(bo);
-        return AjaxResult.success(numMap);
-    }
-
-    @ApiOperation("控制台填写资料审核数据")
-    @GetMapping("/profileData")
-    public AjaxResult<Map<String,Object>> profileData(ConsoleQueryBo bo) {
-        Map<String,Object> numMap = iConsoleService.getProfileData(bo);
-        return AjaxResult.success(numMap);
-    }
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/GoodsFieldController.java

@@ -1,56 +0,0 @@
-package com.zhongzheng.controller.base;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.base.bo.GoodsFieldQueryBo;
-import com.zhongzheng.modules.base.service.IGoodsFieldService;
-import com.zhongzheng.modules.base.vo.GoodsFieldVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 商品字段Controller
- *
- * @author hjl
- * @date 2022-06-06
- */
-@Api(value = "商品字段控制器", tags = {"商品字段管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/base/goods/field")
-public class GoodsFieldController extends BaseController {
-
-    private final IGoodsFieldService iGoodsFieldService;
-
-    /**
-     * 查询商品字段列表
-     */
-    @ApiOperation("查询商品字段列表")
-    @PreAuthorize("@ss.hasPermi('system:field:list')")
-    @GetMapping("/list")
-    public TableDataInfo<GoodsFieldVo> list(GoodsFieldQueryBo bo) {
-        startPage();
-        bo.setStatus(1);
-        List<GoodsFieldVo> list = iGoodsFieldService.queryList(bo);
-        return getDataTable(list);
-    }
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/ProfileFieldController.java

@@ -1,112 +0,0 @@
-package com.zhongzheng.controller.base;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.base.bo.ProfileFieldAddBo;
-import com.zhongzheng.modules.base.bo.ProfileFieldEditBo;
-import com.zhongzheng.modules.base.bo.ProfileFieldQueryBo;
-import com.zhongzheng.modules.base.service.IProfileFieldService;
-import com.zhongzheng.modules.base.vo.ProfileFieldVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 资料字段Controller
- *
- * @author hjl
- * @date 2021-11-19
- */
-@Api(value = "资料字段控制器", tags = {"资料字段管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/base/profile/field")
-public class ProfileFieldController extends BaseController {
-
-    private final IProfileFieldService iProfileFieldService;
-
-    /**
-     * 查询资料字段列表
-     */
-    @ApiOperation("查询资料字段列表")
-    @PreAuthorize("@ss.hasPermi('system:field:list')")
-    @GetMapping("/list")
-    public TableDataInfo<ProfileFieldVo> list(ProfileFieldQueryBo bo) {
-        startPage();
-        List<ProfileFieldVo> list = iProfileFieldService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出资料字段列表
-     */
-  /*  @ApiOperation("导出资料字段列表")
-    @PreAuthorize("@ss.hasPermi('system:field:export')")
-    @Log(title = "资料字段", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<ProfileFieldVo> export(ProfileFieldQueryBo bo) {
-        List<ProfileFieldVo> list = iProfileFieldService.queryList(bo);
-        ExcelUtil<ProfileFieldVo> util = new ExcelUtil<ProfileFieldVo>(ProfileFieldVo.class);
-        return util.exportExcel(list, "资料字段");
-    }*/
-
-    /**
-     * 获取资料字段详细信息
-     */
-    @ApiOperation("获取资料字段详细信息")
-    @PreAuthorize("@ss.hasPermi('system:field:query')")
-    @GetMapping("/{fieldId}")
-    public AjaxResult<ProfileFieldVo> getInfo(@PathVariable("fieldId" ) Long fieldId) {
-        return AjaxResult.success(iProfileFieldService.queryById(fieldId));
-    }
-
-    /**
-     * 新增资料字段
-     */
-    /*@ApiOperation("新增资料字段")
-    @PreAuthorize("@ss.hasPermi('system:field:add')")
-    @Log(title = "资料字段", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody ProfileFieldAddBo bo) {
-        return toAjax(iProfileFieldService.insertByAddBo(bo) ? 1 : 0);
-    }*/
-
-    /**
-     * 修改资料字段
-     */
-   /* @ApiOperation("修改资料字段")
-    @PreAuthorize("@ss.hasPermi('system:field:edit')")
-    @Log(title = "资料字段", businessType = BusinessType.UPDATE)
-    @PutMapping()
-    public AjaxResult<Void> edit(@RequestBody ProfileFieldEditBo bo) {
-        return toAjax(iProfileFieldService.updateByEditBo(bo) ? 1 : 0);
-    }*/
-
-    /**
-     * 删除资料字段
-     */
-    /*@ApiOperation("删除资料字段")
-    @PreAuthorize("@ss.hasPermi('system:field:remove')")
-    @Log(title = "资料字段" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{fieldIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] fieldIds) {
-        return toAjax(iProfileFieldService.deleteWithValidByIds(Arrays.asList(fieldIds), true) ? 1 : 0);
-    }*/
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/ProfileTpController.java

@@ -1,131 +0,0 @@
-package com.zhongzheng.controller.base;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.stream.Collectors;
-
-import com.zhongzheng.modules.base.bo.ProfileTpAddBo;
-import com.zhongzheng.modules.base.bo.ProfileTpEditBo;
-import com.zhongzheng.modules.base.bo.ProfileTpQueryBo;
-import com.zhongzheng.modules.base.service.IProfileTpService;
-import com.zhongzheng.modules.base.vo.ProfileTpVo;
-import lombok.RequiredArgsConstructor;
-import net.polyv.common.v1.util.StringUtils;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 资料模板Controller
- *
- * @author hjl
- * @date 2021-11-19
- */
-@Api(value = "资料模板控制器", tags = {"资料模板管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/base/profile/tp")
-public class ProfileTpController extends BaseController {
-
-    private final IProfileTpService iProfileTpService;
-
-    /**
-     * 查询资料模板列表
-     */
-    @ApiOperation("查询资料模板列表")
-    @PreAuthorize("@ss.hasPermi('system:tp:list')")
-    @GetMapping("/list")
-    public TableDataInfo<ProfileTpVo> list(ProfileTpQueryBo bo) {
-        startPage();
-        if (StringUtils.isNotBlank(bo.getStatus())){
-            List<Integer> collect = Arrays.asList(bo.getStatus().split(",")).stream().map(x -> Integer.valueOf(x)).collect(Collectors.toList());
-            bo.setStatusList(collect);
-        }
-        List<ProfileTpVo> list = iProfileTpService.selectList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 获取所有使用商品ID
-     */
-    @ApiOperation("获取所有使用商品ID")
-    @PreAuthorize("@ss.hasPermi('system:tp:list')")
-    @GetMapping("/goods_list")
-    public AjaxResult<List<String>> goods_list(ProfileTpQueryBo bo) {
-        List<String> list = iProfileTpService.selectAllUseGoods(bo);
-        return AjaxResult.success(list);
-    }
-
-    /**
-     * 导出资料模板列表
-     */
-   /* @ApiOperation("导出资料模板列表")
-    @PreAuthorize("@ss.hasPermi('system:tp:export')")
-    @Log(title = "资料模板", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<ProfileTpVo> export(ProfileTpQueryBo bo) {
-        List<ProfileTpVo> list = iProfileTpService.queryList(bo);
-        ExcelUtil<ProfileTpVo> util = new ExcelUtil<ProfileTpVo>(ProfileTpVo.class);
-        return util.exportExcel(list, "资料模板");
-    }*/
-
-    /**
-     * 获取资料模板详细信息
-     */
-    @ApiOperation("获取资料模板详细信息")
-    @PreAuthorize("@ss.hasPermi('system:tp:query')")
-    @GetMapping("/{profileTpId}")
-    public AjaxResult<ProfileTpVo> getInfo(@PathVariable("profileTpId" ) Long profileTpId) {
-        return AjaxResult.success(iProfileTpService.queryById(profileTpId));
-    }
-
-    /**
-     * 新增资料模板
-     */
-    @ApiOperation("新增资料模板")
-    @PreAuthorize("@ss.hasPermi('system:tp:add')")
-    @Log(title = "资料模板", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody ProfileTpAddBo bo) {
-        return toAjax(iProfileTpService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改资料模板
-     */
-    @ApiOperation("修改资料模板")
-    @PreAuthorize("@ss.hasPermi('system:tp:edit')")
-    @Log(title = "资料模板", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody ProfileTpEditBo bo) {
-        return toAjax(iProfileTpService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除资料模板
-     */
-   /* @ApiOperation("删除资料模板")
-    @PreAuthorize("@ss.hasPermi('system:tp:remove')")
-    @Log(title = "资料模板" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{profileTpIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] profileTpIds) {
-        return toAjax(iProfileTpService.deleteWithValidByIds(Arrays.asList(profileTpIds), true) ? 1 : 0);
-    }*/
-
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/UserProfileController.java

@@ -1,170 +0,0 @@
-package com.zhongzheng.controller.base;
-
-import java.io.IOException;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-
-import cn.afterturn.easypoi.excel.entity.ExportParams;
-import cn.hutool.core.lang.Validator;
-import com.zhongzheng.common.core.domain.model.LoginUser;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.framework.web.service.TokenService;
-import com.zhongzheng.modules.base.vo.UserProfileExportGaiVo;
-import com.zhongzheng.modules.base.vo.UserProfileExportVo;
-import com.zhongzheng.modules.grade.vo.ClassPeriodStudentExportVo;
-import com.zhongzheng.modules.user.bo.UserQueryBo;
-import com.zhongzheng.modules.user.vo.UserVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.modules.base.vo.UserProfileVo;
-import com.zhongzheng.modules.base.bo.UserProfileQueryBo;
-import com.zhongzheng.modules.base.bo.UserProfileAddBo;
-import com.zhongzheng.modules.base.bo.UserProfileEditBo;
-import com.zhongzheng.modules.base.service.IUserProfileService;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 填写资料审核Controller
- *
- * @author ruoyi
- * @date 2021-12-20
- */
-@Api(value = "填写资料审核控制器", tags = {"填写资料审核管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/base/profile")
-public class UserProfileController extends BaseController {
-
-    private final IUserProfileService iUserProfileService;
-
-    private final TokenService tokenService;
-    /**
-     * 查询填写资料审核列表
-     */
-    @ApiOperation("查询填写资料审核列表")
-    @PreAuthorize("@ss.hasPermi('system:profile:list')")
-    @GetMapping("/list")
-    public TableDataInfo<UserProfileVo> list(UserProfileQueryBo bo) {
-        startPage();
-        //1为资料审核
-        bo.setTypeStatus(1L);
-        List<UserProfileVo> list = iUserProfileService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 查询填写资料审核列表
-     */
-    @ApiOperation("查询填写资料审记录列表")
-    @PreAuthorize("@ss.hasPermi('system:profile:list')")
-    @GetMapping("/listRecord")
-    public TableDataInfo<UserProfileVo> listRecord(UserProfileQueryBo bo) {
-        startPage();
-        //1为资料审核
-        bo.setTypeStatus(1L);
-        List<UserProfileVo> list = iUserProfileService.listRecord(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 获取填写资料审核详细信息
-     */
-    @ApiOperation("获取填写资料审核详细信息")
-    @PreAuthorize("@ss.hasPermi('system:profile:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<UserProfileVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iUserProfileService.queryById(id));
-    }
-
-    /**
-     * 修改填写资料审核
-     */
-    @ApiOperation("审核资料")
-    @PreAuthorize("@ss.hasPermi('system:profile:edit')")
-    @Log(title = "审核资料", businessType = BusinessType.UPDATE)
-    @PostMapping()
-    public AjaxResult<Void> edit(@RequestBody UserProfileEditBo bo) {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        return toAjax(iUserProfileService.updateAuditByEditBo(bo,loginUser) ? 1 : 0);
-    }
-
-
-
-    /**
-     * 导出资料审核列表
-     */
-    @ApiOperation("导出资料审核列表")
-    @PreAuthorize("@ss.hasPermi('system:profile:export')")
-    @Log(title = "客户端用户", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<Map<String,Object>> export(UserProfileQueryBo bo) {
-        String fileName = "";
-        if(Validator.isEmpty(bo.getStatus())){
-            bo.setStatus(new ArrayList<Integer>(Arrays.asList(0)));
-            fileName="全部";
-        }else {
-            if(bo.getStatus().get(0)==0){
-                fileName="全部";
-            }
-            if(bo.getStatus().get(0)==1){
-                fileName="通过";
-            }
-            if(bo.getStatus().get(0)==2){
-                fileName="待审";
-            }
-            if(bo.getStatus().get(0)==3){
-                fileName="不通过";
-            }
-        }
-        startPage();
-        //1为资料审核
-        bo.setTypeStatus(1L);
-        if(bo.getStatus().get(0)==0){
-            bo.getStatus().remove(0);
-            bo.setStatus(bo.getStatus());
-        }
-        Map<String,Object> map = iUserProfileService.export(bo);
-        List<UserProfileExportVo> list = (List<UserProfileExportVo>)map.get("list");
-        ExcelUtil<UserProfileExportVo> util = new ExcelUtil<UserProfileExportVo>(UserProfileExportVo.class);
-
-        String timeStr= LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-        ExportParams deptExportParams = new ExportParams();
-        // 设置sheet得名称
-        deptExportParams.setSheetName("表1");
-        Map<String, Object> deptExportMap = new HashMap<>();
-        deptExportMap.put("title", deptExportParams);
-        deptExportMap.put("entity", UserProfileExportVo.class);
-        // sheet中要填充得数据
-        deptExportMap.put("data", list);
-        List<Map<String, Object>> sheetsList = new ArrayList<>();
-        sheetsList.add(deptExportMap);
-        map.put("excel",util.exportEasyExcel(sheetsList, "填写资料审核-"+fileName+"-学员数据-"+timeStr));
-        map.remove("list");
-        return AjaxResult.success(map);
-    }
-
-    /*@ApiOperation("审核资料测试")
-    @PreAuthorize("@ss.hasPermi('system:profile:edit')")
-    @Log(title = "填写资料审核", businessType = BusinessType.UPDATE)
-    @PostMapping("/test")
-    public AjaxResult test(@RequestBody UserProfileAddBo bo) throws IOException {
-        return AjaxResult.success(iUserProfileService.testWord(bo));
-    }*/
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/UserProfileStampController.java

@@ -1,145 +0,0 @@
-package com.zhongzheng.controller.base;
-
-import cn.afterturn.easypoi.excel.entity.ExportParams;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.domain.model.LoginUser;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.framework.web.service.TokenService;
-import com.zhongzheng.modules.base.bo.UserProfileEditBo;
-import com.zhongzheng.modules.base.bo.UserProfileQueryBo;
-import com.zhongzheng.modules.base.service.IUserProfileService;
-import com.zhongzheng.modules.base.vo.UserProfileExportGaiVo;
-import com.zhongzheng.modules.base.vo.UserProfileExportVo;
-import com.zhongzheng.modules.base.vo.UserProfileVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 填写资料审核Controller
- *
- * @author ruoyi
- * @date 2021-12-20
- */
-@Api(value = "填写盖章审核控制器", tags = {"填写盖章审核控制器"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/base/profileStamp")
-public class UserProfileStampController extends BaseController {
-
-    private final IUserProfileService iUserProfileService;
-
-    private final TokenService tokenService;
-    /**
-     * 查询填写资料审核列表
-     */
-    @ApiOperation("查询填写盖章审核列表")
-    @PreAuthorize("@ss.hasPermi('system:profile:list')")
-    @GetMapping("/list")
-    public TableDataInfo<UserProfileVo> list(UserProfileQueryBo bo) {
-        startPage();
-        //2为承诺书审核
-        bo.setTypeStatus(2L);
-        List<UserProfileVo> list = iUserProfileService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 查询填写资料审核列表
-     */
-    @ApiOperation("查询填写盖章审记录列表")
-    @PreAuthorize("@ss.hasPermi('system:profile:list')")
-    @GetMapping("/listRecord")
-    public TableDataInfo<UserProfileVo> listRecord(UserProfileQueryBo bo) {
-        startPage();
-        bo.setTypeStatus(2L);
-        List<UserProfileVo> list = iUserProfileService.listRecord(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 获取填写资料审核详细信息
-     */
-    @ApiOperation("获取填写盖章审核详细信息")
-    @PreAuthorize("@ss.hasPermi('system:profile:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<UserProfileVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iUserProfileService.queryById(id));
-    }
-
-    /**
-     * 修改填写资料审核
-     */
-    @ApiOperation("审核盖章")
-    @PreAuthorize("@ss.hasPermi('system:profile:edit')")
-    @Log(title = "填写盖章审核", businessType = BusinessType.UPDATE)
-    @PostMapping()
-    public AjaxResult<Void> edit(@RequestBody UserProfileEditBo bo) {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        return toAjax(iUserProfileService.updateAuditByEditBo(bo,loginUser) ? 1 : 0);
-    }
-
-
-    /**
-     * 导出资料审核列表
-     */
-    @ApiOperation("导出盖章审核列表")
-    @PreAuthorize("@ss.hasPermi('system:profile:export')")
-    @Log(title = "客户端用户", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<Map<String,Object>> export(UserProfileQueryBo bo) {
-        String fileName = "";
-        if(bo.getStatus().get(0)==0){
-            fileName="全部";
-        }
-        if(bo.getStatus().get(0)==1){
-            fileName="通过";
-        }
-        if(bo.getStatus().get(0)==2){
-            fileName="待审";
-        }
-        if(bo.getStatus().get(0)==3){
-            fileName="不通过";
-        }
-        startPage();
-        //2为资料审核
-        bo.setTypeStatus(2L);
-        if(bo.getStatus().get(0)==0){
-            bo.getStatus().remove(0);
-            bo.setStatus(bo.getStatus());
-        }
-        Map<String,Object> map = iUserProfileService.exportPo(bo);
-        List<UserProfileExportGaiVo> list = (List<UserProfileExportGaiVo>)map.get("list");
-        ExcelUtil<UserProfileExportGaiVo> util = new ExcelUtil<UserProfileExportGaiVo>(UserProfileExportGaiVo.class);
-
-        String timeStr= LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-        ExportParams deptExportParams = new ExportParams();
-        // 设置sheet得名称
-        deptExportParams.setSheetName("表1");
-        Map<String, Object> deptExportMap = new HashMap<>();
-        deptExportMap.put("title", deptExportParams);
-        deptExportMap.put("entity", UserProfileExportGaiVo.class);
-        // sheet中要填充得数据
-        deptExportMap.put("data", list);
-        List<Map<String, Object>> sheetsList = new ArrayList<>();
-        sheetsList.add(deptExportMap);
-        map.put("excel",util.exportEasyExcel(sheetsList, "填写盖章审核-"+fileName+"-学员数据-"+timeStr));
-        map.remove("list");
-        return AjaxResult.success(map);
-    }
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CaptchaController.java

@@ -1,141 +0,0 @@
-package com.zhongzheng.controller.common;
-
-import cn.hutool.captcha.AbstractCaptcha;
-import cn.hutool.captcha.CircleCaptcha;
-import cn.hutool.captcha.LineCaptcha;
-import cn.hutool.captcha.ShearCaptcha;
-import cn.hutool.captcha.generator.CodeGenerator;
-import cn.hutool.captcha.generator.MathGenerator;
-import cn.hutool.captcha.generator.RandomGenerator;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.StrUtil;
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-import com.github.xiaoymin.knife4j.annotations.DynamicParameter;
-import com.github.xiaoymin.knife4j.annotations.DynamicResponseParameters;
-import com.zhongzheng.common.constant.Constants;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.redis.RedisCache;
-import com.zhongzheng.modules.order.bo.OrderAddBo;
-import com.zhongzheng.modules.order.service.IOrderGoodsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 验证码操作处理
- *
- * @author hjl
- */
-@Api(tags ="系统操作管理")
-@ApiSupport(order = 1)
-@RestController
-public class CaptchaController {
-
-	// 圆圈干扰验证码
-	@Resource(name = "CircleCaptcha")
-	private CircleCaptcha circleCaptcha;
-	// 线段干扰的验证码
-	@Resource(name = "LineCaptcha")
-	private LineCaptcha lineCaptcha;
-	// 扭曲干扰验证码
-	@Resource(name = "ShearCaptcha")
-	private ShearCaptcha shearCaptcha;
-
-	@Autowired
-	private RedisCache redisCache;
-
-	// 验证码类型
-	@Value("${captcha.captchaType}")
-	private String captchaType;
-	// 验证码类别
-	@Value("${captcha.captchaCategory}")
-	private String captchaCategory;
-	// 数字验证码位数
-	@Value("${captcha.captchaNumberLength}")
-	private int numberLength;
-	// 字符验证码长度
-	@Value("${captcha.captchaCharLength}")
-	private int charLength;
-
-	/**
-	 * 生成验证码
-	 */
-	@ApiOperation("获取验证码")
-	@DynamicResponseParameters(name = "CodeMapModel",properties = {
-			@DynamicParameter(name = "uuid",value = "验证码uuid"),
-			@DynamicParameter(name = "img",value = "验证码图片base64"),
-	})
-	@GetMapping("/captchaImage")
-	public AjaxResult getCode() {
-		// 保存验证码信息
-		String uuid = IdUtil.simpleUUID();
-		String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
-		String code = null;
-		// 生成验证码
-		CodeGenerator codeGenerator;
-		AbstractCaptcha captcha;
-		switch (captchaType) {
-			case "math":
-				codeGenerator = new MathGenerator(numberLength);
-				break;
-			case "char":
-				codeGenerator = new RandomGenerator(charLength);
-				break;
-			default:
-				throw new IllegalArgumentException("验证码类型异常");
-		}
-		switch (captchaCategory) {
-			case "line":
-				captcha = lineCaptcha;
-				break;
-			case "circle":
-				captcha = circleCaptcha;
-				break;
-			case "shear":
-				captcha = shearCaptcha;
-				break;
-			default:
-				throw new IllegalArgumentException("验证码类别异常");
-		}
-		captcha.setGenerator(codeGenerator);
-		captcha.createCode();
-		if ("math".equals(captchaType)) {
-			code = getCodeResult(captcha.getCode());
-		} else if ("char".equals(captchaType)) {
-			code = captcha.getCode();
-		}
-		redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
-		Map<String,Object> map = new HashMap();
-		map.put("uuid", uuid);
-		map.put("img", captcha.getImageBase64());
-		return AjaxResult.success(map);
-	}
-
-	private String getCodeResult(String capStr) {
-		int a = Convert.toInt(StrUtil.sub(capStr, 0, numberLength).trim());
-		char operator = capStr.charAt(numberLength);
-		int b = Convert.toInt(StrUtil.sub(capStr, numberLength + 1, numberLength + 1 + numberLength).trim());
-		switch (operator) {
-			case '*':
-				return a * b + "";
-			case '+':
-				return a + b + "";
-			case '-':
-				return a - b + "";
-			default:
-				return "";
-		}
-	}
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -1,68 +1,21 @@
 package com.zhongzheng.controller.common;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.zhongzheng.common.annotation.Log;
 import com.zhongzheng.common.config.RuoYiConfig;
 import com.zhongzheng.common.constant.Constants;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.type.EncryptHandler;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.common.utils.ToolsUtils;
+import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.file.FileUploadUtils;
 import com.zhongzheng.common.utils.file.FileUtils;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.framework.config.ServerConfig;
-import com.zhongzheng.framework.web.service.WxLoginService;
-import com.zhongzheng.modules.activity.vo.ActivityGoodsPriceVo;
-import com.zhongzheng.modules.base.bo.ConfigQueryBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityGoodsQueryBo;
-import com.zhongzheng.modules.distribution.bo.DistributionCashWithdrawalPayBo;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityGoodsService;
-import com.zhongzheng.modules.distribution.service.IDistributionCashWithdrawalService;
-import com.zhongzheng.modules.distribution.service.IDistributionSellerService;
-import com.zhongzheng.modules.distribution.vo.DistributionSellerVo;
-import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
-import com.zhongzheng.modules.goods.bo.GoodsStudyUrlBo;
-import com.zhongzheng.modules.goods.bo.UserGoodsListBo;
-import com.zhongzheng.modules.goods.service.IGoodsService;
-import com.zhongzheng.modules.goods.vo.GoodsJzsVo;
-import com.zhongzheng.modules.goods.vo.UserGoodsListVo;
-import com.zhongzheng.modules.grade.bo.*;
-import com.zhongzheng.modules.grade.service.IClassGradeService;
-import com.zhongzheng.modules.grade.service.IUserPeriodService;
-import com.zhongzheng.modules.grade.vo.SyncGoodsExport;
-import com.zhongzheng.modules.order.domain.Order;
-import com.zhongzheng.modules.order.domain.OrderGoods;
-import com.zhongzheng.modules.order.service.IOrderGoodsService;
-import com.zhongzheng.modules.order.service.IOrderService;
-import com.zhongzheng.modules.system.bo.SysTenantAdminBo;
-import com.zhongzheng.modules.system.bo.SysTenantAdminOldBo;
-import com.zhongzheng.modules.system.bo.SysTenantQueryBo;
-import com.zhongzheng.modules.system.domain.SysTenant;
-import com.zhongzheng.modules.system.service.ISysConfigService;
-import com.zhongzheng.modules.system.service.ISysTenantService;
-import com.zhongzheng.modules.system.service.ISysWebService;
-import com.zhongzheng.modules.system.vo.SysTenantVo;
-import com.zhongzheng.modules.top.user.bo.TopSysTenantRegisterAddBo;
-import com.zhongzheng.modules.top.user.service.ITopSysTenantRegisterService;
-import com.zhongzheng.modules.user.service.IUserService;
-import com.zhongzheng.modules.wx.bo.WxShareGoodsBo;
-import com.zhongzheng.modules.wx.service.IWxPayService;
-import io.swagger.annotations.ApiOperation;
+import com.zhongzheng.modules.alioss.bo.FileHandleBo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -71,10 +24,9 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.HashMap;
+import java.io.File;
+import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -83,59 +35,22 @@ import java.util.stream.Collectors;
  * @author zhongzheng
  */
 @RestController
-public class CommonController extends BaseController
-{
+public class CommonController extends BaseController {
     private static final Logger log = LoggerFactory.getLogger(CommonController.class);
 
     @Autowired
     private ServerConfig serverConfig;
 
-    @Autowired
-    private IGoodsService iGoodsService;
-    @Autowired
-    private IUserPeriodService iUserPeriodService;
-    @Autowired
-    private IOrderService iOrderService;
-
-    @Autowired
-    private WxLoginService wxLoginService;
-
-    @Autowired
-    private IOrderGoodsService iOrderGoodsService;
-
-    @Autowired
-    private IWxPayService iWxPayService;
-    @Autowired
-    private  IClassGradeService iClassGradeService;
-    @Autowired
-    private ISysTenantService iSysTenantService;
-    @Autowired
-    private IUserService iUserService;
-    @Autowired
-    private  ITopSysTenantRegisterService iTopSysTenantRegisterService;
-    @Autowired
-    private  ISysWebService webService;
-    @Autowired
-    private ISysConfigService configService;
-    @Autowired
-    private IDistributionCashWithdrawalService iDistributionCashWithdrawalService;
-    @Autowired
-    private  IDistributionSellerService iDistributionSellerService;
-    @Autowired
-    private  IDistributionActivityGoodsService iDistributionActivityGoodsService;
     /**
      * 通用下载请求
      *
      * @param fileName 文件名称
-     * @param delete 是否删除
+     * @param delete   是否删除
      */
     @GetMapping("common/download")
-    public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request)
-    {
-        try
-        {
-            if (!FileUtils.checkAllowDownload(fileName))
-            {
+    public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request) {
+        try {
+            if (!FileUtils.checkAllowDownload(fileName)) {
                 throw new Exception(StrUtil.format("文件名称({})非法，不允许下载。 ", fileName));
             }
             String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
@@ -149,9 +64,7 @@ public class CommonController extends BaseController
                 FileUtils.deleteFile(filePath);
             }*/
             FileUtils.deleteFile(filePath);
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             log.error("下载文件失败", e);
         }
     }
@@ -160,10 +73,8 @@ public class CommonController extends BaseController
      * 通用上传请求
      */
     @PostMapping("/common/upload")
-    public AjaxResult uploadFile(MultipartFile file) throws Exception
-    {
-        try
-        {
+    public AjaxResult uploadFile(MultipartFile file) throws Exception {
+        try {
             // 上传文件路径
             String filePath = RuoYiConfig.getUploadPath();
             // 上传并返回新文件名称
@@ -173,357 +84,95 @@ public class CommonController extends BaseController
             ajax.put("fileName", fileName);
             ajax.put("url", url);
             return ajax;
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             return AjaxResult.error(e.getMessage());
         }
     }
 
     /**
-     * 本地资源通用下载
+     * 文件分片处理
      */
-    @GetMapping("/common/download/resource")
-    public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response)
-            throws Exception
-    {
-        try
-        {
-            if (!FileUtils.checkAllowDownload(resource))
-            {
-                throw new Exception(StrUtil.format("资源文件({})非法，不允许下载。 ", resource));
-            }
-            // 本地资源路径
-            String localPath = RuoYiConfig.getProfile();
-            // 数据库资源地址
-            String downloadPath = localPath + StrUtil.subAfter(resource, Constants.RESOURCE_PREFIX,false);
-            // 下载名称
-            String downloadName = StrUtil.subAfter(downloadPath, "/",true);
-            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
-            FileUtils.setAttachmentResponseHeader(response, downloadName);
-            FileUtils.writeBytes(downloadPath, response.getOutputStream());
-        }
-        catch (Exception e)
-        {
-            log.error("下载文件失败", e);
-        }
+    @PostMapping("/common/decompression")
+    public AjaxResult<List<String>> uploadDecompression(MultipartFile file, String param) throws Exception {
+        String zhiyuan = System.getProperty("user.dir");
+        String path = zhiyuan + "/zhongzheng-admin/src/main/resources/fenpian";
+        FileHandleBo bo = JSONObject.parseObject(param, FileHandleBo.class);
+        String[] split = bo.getName().split("\\.");
+        String fileName = bo.getFileMd5() + "_" + bo.getIndex()+"."+ split[split.length - 1];
+        FileUploadUtils.uploadFragment(path, file, fileName);
+        File file2 = new File(path);
+        List<String> fileNameList = Arrays.stream(file2.listFiles()).map(File::getName).collect(Collectors.toList());
+        return AjaxResult.success(fileNameList);
     }
 
-    @ApiOperation("获取继教二建的商品结构列表")
-    @GetMapping("common/jzs/goodsList")
-    public AjaxResult<GoodsJzsVo> goodsList()
-    {
-        GoodsQueryBo queryBo = new GoodsQueryBo();
-        List<SyncGoodsExport> goodsJzsVoList = iGoodsService.selectRjJzsList(queryBo);
-        ExcelUtil<SyncGoodsExport> util = new ExcelUtil<SyncGoodsExport>(SyncGoodsExport.class);
-  //      ExcelUtil<SyncGoodsExport> util = new ExcelUtil<>(SyncGoodsExport.class);
-        return util.exportEasyExcel(util.exportEasyData(goodsJzsVoList), "继建商品");
-    }
-
-
-
-    @ApiOperation("测试列表")
-    @PostMapping("common/jzs/test")
-    public AjaxResult<Void> testList(@RequestBody UserPeriodEditBo bo)
-    {
-        UserPeriodEditBo queryBo = new UserPeriodEditBo();
-        queryBo.setGoodsId(1085L);
-        queryBo.setGradeId(978L);
-        queryBo.setUserId(114L);
-        iUserPeriodService.syncStudyLogToOld(bo);
-        return AjaxResult.success();
-    }
-
-    @ApiOperation("旧系统打回重审")
-    @PostMapping("common/rollback/period")
-    public AjaxResult<Void> rollbackPeriod(@RequestBody RollBackPeriodBo bo)
-    {
-        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
-            return AjaxResult.error("签名错误");
-        }
-        UserPeriodEditBo queryBo = new UserPeriodEditBo();
-        queryBo.setRollBackPlat(2);
-        queryBo.setOrderGoodsId(bo.getOrderGoodsId());
-        iUserPeriodService.confirmRollbackPeriod(queryBo);
-        return AjaxResult.success();
-    }
-
-    @ApiOperation("旧系统获取用户商品信息")
-    @PostMapping("common/get/goods")
-    public AjaxResult getUserGoodsList(@RequestBody UserGoodsListBo bo)
-    {
-        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
-            return AjaxResult.error("签名错误");
-        }
-        List<UserGoodsListVo> voList = iGoodsService.getUserGoodsList(bo);
-
-        return AjaxResult.success(voList);
-    }
-
-    @ApiOperation("旧系统获取商品学习中心路径")
-    @PostMapping("common/get/goods/studyUrl")
-    public AjaxResult getGoodsStudyUrl(@RequestBody GoodsStudyUrlBo bo)
-    {
-        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
-            return AjaxResult.error("签名错误");
-        }
-        String studyUrl = iGoodsService.getGoodsStudyUrl(bo);
-        return AjaxResult.success(studyUrl);
-    }
-
-    @ApiOperation("批量查询官方班级人数")
-    @PostMapping("common/free/batch/officialGradeCount")
-    public AjaxResult batchOfficialGradeCount(@RequestBody ClassGradeBatchQueryBo bo)
-    {
-        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
-            return AjaxResult.error("签名错误");
-        }
-        String[] list = bo.getOfficialNameStr().split(",");
-        List<Map<String,Object>> numList = new ArrayList<>();
-        for(String officialName : list){
-            Map<String,Object> map = new HashMap<>();
-            ClassGradeQueryBo queryBo = new ClassGradeQueryBo();
-            queryBo.setOfficialName(officialName);
-            map.put("officialName",officialName);
-            Integer num = iClassGradeService.queryOfficialGradeCount(queryBo);
-            map.put("num",num);
-            numList.add(map);
-        }
-        return AjaxResult.success(numList);
-    }
-
-    @ApiOperation("查询官方班级详情")
-    @PostMapping("common/free/officialGradeDetail")
-    public AjaxResult officialGradeDetail(@RequestBody ClassNpUserInfoBo bo) {
-        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
-            return AjaxResult.error("签名错误");
-        }
-        return AjaxResult.success(iClassGradeService.officialGradeDetail(bo));
-    }
-
-    @ApiOperation("查询预开班官方班级编号")
-    @PostMapping("common/free/officialGrade/num")
-    public AjaxResult getOfficialGradeNum(@RequestBody ClassOfficialNumBo bo) {
-        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
-            return AjaxResult.error("签名错误");
-        }
-        return AjaxResult.success(iClassGradeService.getOfficialGradeNum(bo));
-    }
-
-    @ApiOperation("预报名班级开班")
-    @PostMapping("common/free/open/class")
-    public AjaxResult openOfficialGrade(@RequestBody ClassGradeOpenBo bo) {
-        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
-            return AjaxResult.error("签名错误");
+    /**
+     * 文件分片处理
+     */
+    @PostMapping("/common/merge/file")
+    public AjaxResult uploadDecompression(@RequestBody FileHandleBo bo) throws Exception {
+        String zhiyuan = System.getProperty("user.dir");
+        String path = zhiyuan + "/zhongzheng-admin/src/main/resources/fenpian";
+        //全部上传完成 合并文件返回文件名称
+        String toPath = zhiyuan + "/zhongzheng-admin/src/main/resources/zhiyuan";
+        File file1 = new File(toPath);
+        if (!file1.exists()) {
+            file1.mkdirs();
+        }
+        File ToFile = new File(toPath + "/" + bo.getName());
+        if (ToFile.createNewFile()) {
+            FileUploadUtils.merge(bo.getFileMd5(), path, ToFile.getPath());
+            //校验文件MD5值
+            if (!bo.getFileMd5().equals(FileUtils.md5HashCode(ToFile.getPath()))) {
+                //文件不一致，删除文件
+                ToFile.delete();
+                //删除分片资源
+                FileUtils.deleteFilePackage(zhiyuan + "/zhongzheng-admin/src/main/resources/fenpian");
+                throw new CustomException("文件上传失败！请重新上传");
+            }
         }
-        iClassGradeService.openOfficialGrade(bo);
-        return AjaxResult.success();
-    }
-
-    @ApiOperation("测试分班")
-    @GetMapping("common/jzs/grade")
-    public AjaxResult<Void> testGrade()
-    {
-     //   iClassGradeService.checkEjjjPeopleNumLimit(195L,984L);
-     //   iUserService.batchUpdateTelId();
-        return AjaxResult.success();
-    }
-
-
-    @ApiOperation("获取商品分享码")
-    @PostMapping("/shareGoodsCode")
-    public AjaxResult getWxSmallAccessToken(@RequestBody WxShareGoodsBo bo)
-    {
-        String token = wxLoginService.shareGoodsCode(bo);
-        return AjaxResult.success(token);
-    }
-
-    @ApiOperation("推送分销商品")
-    @PostMapping("/toshareGoods")
-    public AjaxResult toshareGoods(@RequestBody WxShareGoodsBo bo)
-    {
-        String out_trade_no = "22110210122554298238";
-        Map<String, Object> map = new HashMap<>();
-        map.put("order_sn", out_trade_no);
-        List<OrderGoods> goodsList = iOrderGoodsService.listByMap(map);
-        Order order = iOrderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderSn, out_trade_no));
-        iWxPayService.shareToOldSys(order,goodsList);
-        return AjaxResult.success();
-    }
-
-    @ApiOperation("创建新机构后台")
-    @PostMapping("common/create/tenant/admin")
-    public AjaxResult createTenantAdmin(@RequestBody SysTenantAdminBo bo) {
-        iSysTenantService.createTenantAdmin(bo);
-        return AjaxResult.success();
-    }
-
-    @ApiOperation("创建新机构后台(旧系统)")
-    @PostMapping("common/create/tenant/admin/old")
-    public AjaxResult createTenantAdminOld(@RequestBody SysTenantAdminOldBo bo) {
-        iSysTenantService.createTenantAdminOld(bo);
+        //删除分片资源
+        FileUtils.deleteFilePackage(zhiyuan + "/zhongzheng-admin/src/main/resources/fenpian");
         return AjaxResult.success();
     }
 
-    @ApiOperation("同步其他机构角色菜单")
-    @PostMapping("common/update/role")
-    public AjaxResult updateRoleTenant(@RequestBody List<Long> tenantIds) {
-        iSysTenantService.updateRoleTenant(tenantIds);
-        return AjaxResult.success();
-    }
-
-    @ApiOperation("同步其他机构字典")
-    @PostMapping("common/update/dict")
-    public AjaxResult updateDictTenant(@RequestBody List<Long> tenantIds) {
-        iSysTenantService.updateDictTenant(tenantIds);
-        return AjaxResult.success();
-    }
-
-    @ApiOperation("获取企业列表")
-    @GetMapping("common/tenant/list")
-    public AjaxResult<List<SysTenantVo>> getTenantList() {
-        String tenant = ServletUtils.getRequest().getHeader("TenantId");
-        List<SysTenant> list = iSysTenantService.list();
-        if (CollectionUtils.isEmpty(list)){
-            return AjaxResult.success(new ArrayList<>());
-        }
-        List<SysTenantVo> collect = list.stream().filter(x -> !x.getTenantId().equals(Long.valueOf(tenant)))
-                .map(item -> BeanUtil.toBean(item, SysTenantVo.class)).collect(Collectors.toList());
-        return AjaxResult.success(collect);
-    }
-
-    @ApiOperation("机构注册开通")
-    @PostMapping("common/free/tenant/register")
-    public AjaxResult tenantRegister(@RequestBody TopSysTenantRegisterAddBo bo) {
-        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
-            return AjaxResult.error("签名错误");
-        }
-        return AjaxResult.success("成功",iTopSysTenantRegisterService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    @ApiOperation("重启服务restart")
-    @PostMapping("common/free/webRestart")
-    public AjaxResult<Void> webRestart(@RequestBody ConfigQueryBo bo) {
-        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
-            return AjaxResult.error("签名错误");
+    @PostMapping("/common/delete/file")
+    public AjaxResult deleteDecompression(@RequestBody FileHandleBo bo) throws Exception {
+        //删除合并文件
+        String zhiyuan = System.getProperty("user.dir");
+        String toPath = zhiyuan + "/zhongzheng-admin/src/main/resources/zhiyuan";
+        File file = new File(toPath);
+        List<File> files = Arrays.stream(file.listFiles()).collect(Collectors.toList());
+        if (!CollectionUtils.isEmpty(files)){
+            files.stream().filter(item -> item.getName().equals(bo.getName())).forEach(x -> {
+                x.delete();
+            });
         }
-        webService.restartWebService();
         return AjaxResult.success();
     }
 
-   /* @ApiOperation("nginx配置")
-    @PostMapping("common/free/configNginxFile")
-    public AjaxResult<Void> configNginxFile(@RequestBody SysNginxConfigAddBo bo) {
-        iTopSysTenantRegisterService.test(new TopSysTenantRegisterAddBo());
-        return AjaxResult.success();
-    }*/
-
-    @ApiOperation("登录双重验证")
-    @GetMapping("common/free/dual_auth")
-    public AjaxResult<String> dual_auth() {
-        String dualAuth = configService.selectConfigByKey("login.dual.auth");
-        return AjaxResult.success("成功",dualAuth);
-    }
-
-    @ApiOperation("decodeTel")
-    @GetMapping("common/free/decodeTel")
-    public AjaxResult<String> decodeTel(String key) {
-        return AjaxResult.success("成功", EncryptHandler.decrypt(key));
-    }
-
-    @ApiOperation("分销打款结果回调")
-    @PreAuthorize("@ss.hasPermi('system:withdrawal:add')")
-    @Log(title = "打款", businessType = BusinessType.INSERT)
-    @PostMapping("/common/free/payCashCallBack")
-    public AjaxResult payCashCallBack(@RequestBody DistributionCashWithdrawalPayBo bo) {
-        if(!ToolsUtils.checkSignCwSnFromOldSys(bo.getCwSn(),bo.getStamp().toString(),bo.getSign())){
-            return AjaxResult.error("签名错误");
-        }
-        return AjaxResult.success("成功", iDistributionCashWithdrawalService.payCashCallBack(bo) ? 1 : 0);
-    }
 
     /**
-     * 获取企业ID
+     * 本地资源通用下载
      */
-    @ApiOperation("获取企业ID")
-    @GetMapping("common/free/findTenantId")
-    public AjaxResult<String> findTenantId(SysTenantQueryBo bo) {
-        Long tenantId = iSysTenantService.findTenantId(bo);
-        if(Validator.isNotEmpty(tenantId)){
-            return AjaxResult.success("成功",tenantId.toString());
-        }else{
-            if(Validator.isNotEmpty(bo.getHostH5())&&bo.getHostH5().equals("120.79.166.78:19012")){
-                return AjaxResult.success("成功","867735392558919680");
-            }
-            if(Validator.isNotEmpty(bo.getHostLive())&&bo.getHostLive().equals("120.79.166.78:19012")){
-                return AjaxResult.success("成功","867735392558919680");
-            }
-            if(Validator.isNotEmpty(bo.getHostPc())&&bo.getHostPc().equals("120.79.166.78:19012")){
-                return AjaxResult.success("成功","867735392558919680");
-            }
-            if(Validator.isNotEmpty(bo.getHostAdmin())&&bo.getHostAdmin().equals("120.79.166.78:19012")){
-                return AjaxResult.success("成功","867735392558919680");
-            }
-            if(Validator.isNotEmpty(bo.getHostH5Seller())&&bo.getHostH5Seller().equals("120.79.166.78:19012")){
-                return AjaxResult.success("成功","867735392558919680");
+    @GetMapping("/common/download/resource")
+    public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response)
+            throws Exception {
+        try {
+            if (!FileUtils.checkAllowDownload(resource)) {
+                throw new Exception(StrUtil.format("资源文件({})非法，不允许下载。 ", resource));
             }
-            return AjaxResult.error(511,"失败",null);
+            // 本地资源路径
+            String localPath = RuoYiConfig.getProfile();
+            // 数据库资源地址
+            String downloadPath = localPath + StrUtil.subAfter(resource, Constants.RESOURCE_PREFIX, false);
+            // 下载名称
+            String downloadName = StrUtil.subAfter(downloadPath, "/", true);
+            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+            FileUtils.setAttachmentResponseHeader(response, downloadName);
+            FileUtils.writeBytes(downloadPath, response.getOutputStream());
+        } catch (Exception e) {
+            log.error("下载文件失败", e);
         }
     }
 
-    /**
-     * 获取企业ID
-     */
-    @ApiOperation("获取系统配置")
-    @GetMapping("common/free/config")
-    public AjaxResult<Map<String,Object>> findConfig(SysTenantQueryBo bo) {
-        Map<String,Object> map = new HashMap<>();
-        String jsonStr = configService.selectConfigByKey("home.header");
-        JSONObject objectJson = JSON.parseObject(jsonStr);
-        map.put("companyName",String.valueOf(objectJson.get("companyName")));
-        return AjaxResult.success(map);
-    }
-
-    @ApiOperation("获取微信参数")
-    @GetMapping("app/common/wx/config")
-    public AjaxResult<Map<String,Object>> wxConfig() {
-        Map<String,Object> map = new HashMap<>();
-        String smallAppId = configService.selectConfigByKey("wx.small.appid");
-        String gzhAppId = configService.selectConfigByKey("wx.gzh.appid");
-        map.put("smallAppId",smallAppId);
-        map.put("gzhAppId",gzhAppId);
-        return AjaxResult.success(map);
-    }
-
-    @ApiOperation("移动端配置参数")
-    @GetMapping("app/common/mobileConfig")
-    public AjaxResult<Map<String,Object>> mobileConfig(ConfigQueryBo bo) {
-        Map<String,Object> map = new HashMap<>();
-        String json = configService.selectConfigByKey("home.mobile");
-        map.put("mobileConfig",json);
-        return AjaxResult.success(map);
-    }
-
-
-    @ApiOperation("通过分享code查询业务员用户信息")
-    @GetMapping("app/common/distribution/getInfoByShareCode")
-    public AjaxResult<DistributionSellerVo> getInfoByShareCode(String shareCode)
-    {
-        DistributionSellerVo vo = iDistributionSellerService.queryByShareCode(shareCode);
-        vo.setNull();
-        String jsonStr = configService.selectConfigByKey("home.header");
-        JSONObject objectJson = JSON.parseObject(jsonStr);
-        vo.setTenantName(String.valueOf(objectJson.get("companyName")));
-        return AjaxResult.success(vo);
-    }
-
-
-    @ApiOperation("获取分销活动商品列表")
-    @GetMapping("app/common/distribution/getGoodsList")
-    public TableDataInfo<ActivityGoodsPriceVo> distributionGoodsList(DistributionActivityGoodsQueryBo bo)
-    {
-        startPage();
-        List<ActivityGoodsPriceVo> list = iDistributionActivityGoodsService.getGoodsList(bo);
-        return getDataTable(list);
-    }
 }

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseBusinessController.java

@@ -1,171 +0,0 @@
-package com.zhongzheng.controller.course;
-
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.modules.course.bo.CourseBusinessAddBo;
-import com.zhongzheng.modules.course.bo.CourseBusinessEditBo;
-import com.zhongzheng.modules.course.bo.CourseBusinessQueryBo;
-import com.zhongzheng.modules.course.service.ICourseBusinessService;
-import com.zhongzheng.modules.course.vo.CourseBusinessVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 业务层次Controller
- *
- * @author ruoyi
- * @date 2021-10-08
- */
-@Api(value = "业务层次控制器", tags = {"业务层次管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/course/business")
-public class CourseBusinessController extends BaseController {
-
-    private final ICourseBusinessService iCourseBusinessService;
-
-    /**
-     * 查询业务层次列表
-     */
-    @ApiOperation("查询业务层次列表")
-    @PreAuthorize("@ss.hasPermi('course:business:list')")
-    @GetMapping("/list")
-    public TableDataInfo<CourseBusinessVo> list(CourseBusinessQueryBo bo) {
-        startPage();
-        List<CourseBusinessVo> list = iCourseBusinessService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出业务层次列表
-     */
- /*   @ApiOperation("导出业务层次列表")
-    @PreAuthorize("@ss.hasPermi('modules.course:business:export')")
-    @Log(title = "业务层次", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<CourseBusinessVo> export(CourseBusinessQueryBo bo) {
-        List<CourseBusinessVo> list = iCourseBusinessService.queryList(bo);
-        ExcelUtil<CourseBusinessVo> util = new ExcelUtil<CourseBusinessVo>(CourseBusinessVo.class);
-        return util.exportExcel(list, "业务层次");
-    }*/
-
-    /**
-     * 获取业务层次详细信息
-     */
-    @ApiOperation("获取业务层次详细信息")
-    @PreAuthorize("@ss.hasPermi('course:business:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<CourseBusinessVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iCourseBusinessService.queryById(id));
-    }
-
-    /**
-     * 新增业务层次
-     */
-    @ApiOperation("新增业务层次")
-    @PreAuthorize("@ss.hasPermi('course:business:add')")
-    @Log(title = "业务层次", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody CourseBusinessAddBo bo) {
-        return toAjax(iCourseBusinessService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改业务层次
-     */
-    @ApiOperation("修改业务层次")
-    @PreAuthorize("@ss.hasPermi('course:business:edit')")
-    @Log(title = "业务层次", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody CourseBusinessEditBo bo) {
-        return toAjax(iCourseBusinessService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改业务层次
-     */
-    @ApiOperation("批量更改业务层次得模板")
-    @PreAuthorize("@ss.hasPermi('course:business:edit')")
-    @Log(title = "业务层次", businessType = BusinessType.UPDATE)
-    @PostMapping("/editModel")
-    public AjaxResult<Void> editModel(@RequestBody CourseBusinessEditBo bo) {
-        return toAjax(iCourseBusinessService.editModel(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改业务层次学习顺序
-     */
-    @ApiOperation("批量更改业务层次学习顺序的模板")
-    @PreAuthorize("@ss.hasPermi('course:business:edit')")
-    @Log(title = "业务层次", businessType = BusinessType.UPDATE)
-    @PostMapping("/editLearningOrder")
-    public AjaxResult<Void> editLearningOrder(@RequestBody CourseBusinessEditBo bo) {
-        return toAjax(iCourseBusinessService.editLearningOrder(bo) ? 1 : 0);
-    }
-
-
-    /**
-     * 删除业务层次
-     */
-/*    @ApiOperation("删除业务层次")
-    @PreAuthorize("@ss.hasPermi('modules.course:business:remove')")
-    @Log(title = "业务层次" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iCourseBusinessService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }*/
-
-    /**
-     * 修改业务层次学习顺序
-     */
-    @ApiOperation("更改审核资料模板用户ID")
-    @PreAuthorize("@ss.hasPermi('course:business:edit')")
-    @Log(title = "更改审核资料模板用户ID", businessType = BusinessType.UPDATE)
-    @PostMapping("/editProfileTpUserIds")
-    public AjaxResult<Void> editProfileTpUserIds(@RequestBody CourseBusinessEditBo bo) {
-        return toAjax(iCourseBusinessService.editProfileTpUserIds(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改业务层次学习顺序
-     */
-    @ApiOperation("更改学时审核用户ID")
-    @PreAuthorize("@ss.hasPermi('course:business:edit')")
-    @Log(title = "更改学时审核用户ID", businessType = BusinessType.UPDATE)
-    @PostMapping("/editPeriodUserIds")
-    public AjaxResult<Void> editPeriodUserIds(@RequestBody CourseBusinessEditBo bo) {
-        return toAjax(iCourseBusinessService.editPeriodUserIds(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改业务层次学习顺序
-     */
-    @ApiOperation("更改退款审核用户ID")
-    @PreAuthorize("@ss.hasPermi('course:business:edit')")
-    @Log(title = "更改退款审核用户ID", businessType = BusinessType.UPDATE)
-    @PostMapping("/editRefundPeriodUserIds")
-    public AjaxResult<Void> editRefundPeriodUserIds(@RequestBody CourseBusinessEditBo bo) {
-        return toAjax(iCourseBusinessService.editRefundPeriodUserIds(bo) ? 1 : 0);
-    }
-
-
-    /**
-     * 根据名称查找业务层ID
-     */
-    @ApiOperation("根据名称查找业务层ID")
-    @PreAuthorize("@ss.hasPermi('course:business:list')")
-    @GetMapping("/queryFullId")
-    public AjaxResult<CourseBusinessVo> queryFullId(CourseBusinessQueryBo bo) {
-        CourseBusinessVo vo = iCourseBusinessService.queryFullId(bo);
-        return AjaxResult.success(vo);
-    }
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseChapterController.java

@@ -1,150 +0,0 @@
-package com.zhongzheng.controller.course;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.course.bo.CourseChapterAddBo;
-import com.zhongzheng.modules.course.bo.CourseChapterEditBo;
-import com.zhongzheng.modules.course.bo.CourseChapterQueryBo;
-import com.zhongzheng.modules.course.domain.CourseChapterBusiness;
-import com.zhongzheng.modules.course.domain.CourseSectionBusiness;
-import com.zhongzheng.modules.course.service.ICourseChapterBusinessService;
-import com.zhongzheng.modules.course.service.ICourseChapterService;
-import com.zhongzheng.modules.course.service.ICourseSectionBusinessService;
-import com.zhongzheng.modules.course.vo.CourseChapterVo;
-import com.zhongzheng.modules.goods.bo.GoodsBatchDelBo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 课程大章Controller
- *
- * @author hjl
- * @date 2021-10-09
- */
-@Api(value = "课程大章控制器", tags = {"课程大章管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/course/chapter")
-public class CourseChapterController extends BaseController {
-
-    private final ICourseChapterService iCourseChapterService;
-
-    private final ICourseChapterBusinessService iCourseChapterBusinessService;
-
-    /**
-     * 查询课程大章列表
-     */
-    @ApiOperation("查询课程大章列表")
-    @PreAuthorize("@ss.hasPermi('system:chapter:list')")
-    @GetMapping("/list")
-    public TableDataInfo<CourseChapterVo> list(CourseChapterQueryBo bo) {
-        startPage();
-        List<CourseChapterVo> list = iCourseChapterService.selectListByBo(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 章批量删除
-     */
-    @ApiOperation("章批量删除")
-    @PostMapping("/batch/del")
-    public AjaxResult<Void> batchDelChapter(@RequestBody GoodsBatchDelBo bo) {
-        return toAjax(iCourseChapterService.batchDelChapter(bo) ? 1 : 0);
-    }
-
-    /**
-     * 导出课程大章列表
-     */
-   /* @ApiOperation("导出课程大章列表")
-    @PreAuthorize("@ss.hasPermi('system:chapter:export')")
-    @Log(title = "课程大章", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<CourseChapterVo> export(CourseChapterQueryBo bo) {
-        List<CourseChapterVo> list = iCourseChapterService.queryList(bo);
-        ExcelUtil<CourseChapterVo> util = new ExcelUtil<CourseChapterVo>(CourseChapterVo.class);
-        return util.exportExcel(list, "课程大章");
-    }*/
-
-    /**
-     * 获取课程大章详细信息
-     */
-    @ApiOperation("获取课程大章详细信息")
-    @PreAuthorize("@ss.hasPermi('system:chapter:query')")
-    @GetMapping("/{chapterId}")
-    public AjaxResult<CourseChapterVo> getInfo(@PathVariable("chapterId" ) Long chapterId) {
-        return AjaxResult.success(iCourseChapterService.queryById(chapterId));
-    }
-
-    /**
-     * 新增课程大章
-     */
-    @ApiOperation("新增课程大章")
-    @PreAuthorize("@ss.hasPermi('system:chapter:add')")
-    @Log(title = "课程大章", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Long> add(@RequestBody CourseChapterAddBo bo) {
-        return AjaxResult.success(iCourseChapterService.insertByAddBo(bo));
-    }
-
-    /**
-     * 新增课程大章
-     */
-    @ApiOperation("批量新增课程大章")
-    @PreAuthorize("@ss.hasPermi('system:chapter:add')")
-    @Log(title = "课程大章", businessType = BusinessType.INSERT)
-    @PostMapping("/addMore")
-    public AjaxResult<List<Long>> addMore(@RequestBody List<CourseChapterAddBo> list) {
-        return AjaxResult.success(iCourseChapterService.insertByAddBoMore(list));
-    }
-
-    /**
-     * 修改课程大章
-     */
-    @ApiOperation("修改课程大章")
-    @PreAuthorize("@ss.hasPermi('system:chapter:edit')")
-    @Log(title = "课程大章", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody CourseChapterEditBo bo) {
-        return toAjax(iCourseChapterService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除课程大章
-     */
-    /*@ApiOperation("删除课程大章")
-    @PreAuthorize("@ss.hasPermi('system:chapter:remove')")
-    @Log(title = "课程大章" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{chapterIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] chapterIds) {
-        return toAjax(iCourseChapterService.deleteWithValidByIds(Arrays.asList(chapterIds), true) ? 1 : 0);
-    }*/
-
-    /**
-     * 获取课程小节业务层次列表
-     */
-    @ApiOperation("获取课程大章业务层次列表")
-    @PreAuthorize("@ss.hasPermi('system:section:query')")
-    @GetMapping("/business/{chapterId}")
-    public AjaxResult<List<CourseChapterBusiness>> getBusinessList(@PathVariable("chapterId" ) Long chapterId) {
-        List<CourseChapterBusiness> list = iCourseChapterBusinessService.getListById(chapterId);
-        return AjaxResult.success(list);
-    }
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseChapterSectionController.java

@@ -1,117 +0,0 @@
-package com.zhongzheng.controller.course;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Arrays;
-import java.util.Map;
-
-import cn.hutool.http.HttpStatus;
-import com.github.pagehelper.PageInfo;
-import com.zhongzheng.modules.course.bo.CourseChapterSectionAddBo;
-import com.zhongzheng.modules.course.bo.CourseChapterSectionEditBo;
-import com.zhongzheng.modules.course.bo.CourseChapterSectionQueryBo;
-import com.zhongzheng.modules.course.service.ICourseChapterSectionService;
-import com.zhongzheng.modules.course.vo.CourseChapterSectionVo;
-import com.zhongzheng.modules.course.vo.CourseModuleChapterVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 章与节关系Controller
- *
- * @author hjl
- * @date 2021-10-12
- */
-@Api(value = "章与节关系控制器", tags = {"章与节关系管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/course/chapter/section")
-public class CourseChapterSectionController extends BaseController {
-
-    private final ICourseChapterSectionService iCourseChapterSectionService;
-
-    /**
-     * 查询章与节关系列表
-     */
-    @ApiOperation("查询章与节关系列表")
-    @PreAuthorize("@ss.hasPermi('system:section:list')")
-    @GetMapping("/list/{id}")
-    public AjaxResult<List<CourseChapterSectionVo>> list(@PathVariable("id" ) Long id) {
-
-        List<CourseChapterSectionVo> list = iCourseChapterSectionService.getListById(id);
-        return AjaxResult.success(list);
-    }
-
-    /**
-     * 导出章与节关系列表
-     */
-   /* @ApiOperation("导出章与节关系列表")
-    @PreAuthorize("@ss.hasPermi('system:section:export')")
-    @Log(title = "章与节关系", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<CourseChapterSectionVo> export(CourseChapterSectionQueryBo bo) {
-        List<CourseChapterSectionVo> list = iCourseChapterSectionService.queryList(bo);
-        ExcelUtil<CourseChapterSectionVo> util = new ExcelUtil<CourseChapterSectionVo>(CourseChapterSectionVo.class);
-        return util.exportExcel(list, "章与节关系");
-    }*/
-
-    /**
-     * 获取章与节关系详细信息
-     */
-   /* @ApiOperation("获取章与节关系详细信息")
-    @PreAuthorize("@ss.hasPermi('system:section:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<CourseChapterSectionVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iCourseChapterSectionService.queryById(id));
-    }*/
-
-    /**
-     * 新增章与节关系
-     */
-    /*@ApiOperation("新增章与节关系")
-    @PreAuthorize("@ss.hasPermi('system:section:add')")
-    @Log(title = "章与节关系", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody CourseChapterSectionAddBo bo) {
-        return toAjax(iCourseChapterSectionService.insertByAddBo(bo) ? 1 : 0);
-    }*/
-
-    /**
-     * 修改章与节关系
-     */
-   /* @ApiOperation("修改章与节关系")
-    @PreAuthorize("@ss.hasPermi('system:section:edit')")
-    @Log(title = "章与节关系", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody CourseChapterSectionEditBo bo) {
-        return toAjax(iCourseChapterSectionService.updateByEditBo(bo) ? 1 : 0);
-    }*/
-
-    /**
-     * 删除章与节关系
-     */
-   /* @ApiOperation("删除章与节关系")
-    @PreAuthorize("@ss.hasPermi('system:section:remove')")
-    @Log(title = "章与节关系" , businessType = BusinessType.DELETE)
-    @PostMapping("/del/{ids}")
-    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iCourseChapterSectionService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }*/
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseController.java

@@ -1,250 +0,0 @@
-package com.zhongzheng.controller.course;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.lang.Validator;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.common.type.EncryptHandler;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.modules.course.bo.*;
-import com.zhongzheng.modules.course.service.ICourseService;
-import com.zhongzheng.modules.course.vo.CourseVo;
-import com.zhongzheng.modules.course.vo.GoodsBatchListVo;
-import com.zhongzheng.modules.goods.bo.GoodsBatchDelBo;
-import com.zhongzheng.modules.goods.vo.ExportLiveGoodsVo;
-import com.zhongzheng.modules.goods.vo.GoodsUserVo;
-import com.zhongzheng.modules.order.vo.OrderGoodsLiveExportVo;
-import com.zhongzheng.modules.order.vo.OrderGoodsVo;
-import com.zhongzheng.modules.user.domain.User;
-import com.zhongzheng.modules.user.entity.ClientLoginUser;
-import com.zhongzheng.modules.user.service.IUserService;
-import com.zhongzheng.modules.user.service.IUserStudyRecordService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 课程Controller
- *
- * @author hjl
- * @date 2021-10-09
- */
-@Api(value = "课程控制器", tags = {"课程管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/course")
-public class CourseController extends BaseController {
-
-    private final ICourseService iCourseService;
-    private final IUserStudyRecordService iUserStudyRecordService;
-    private final IUserService iUserService;
-
-    /**
-     * 查询课程列表
-     */
-    @ApiOperation("查询课程列表")
-    @PreAuthorize("@ss.hasPermi('system:course:list')")
-    @GetMapping("/list")
-    public TableDataInfo<CourseVo> list(CourseQueryBo bo) {
-        startPage();
-        List<CourseVo> list = iCourseService.selectList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 课程批量删除
-     */
-    @ApiOperation("课程批量删除")
-    @PostMapping("/batch/del")
-    public AjaxResult<Void> batchDelCourse(@RequestBody GoodsBatchDelBo bo) {
-        return toAjax(iCourseService.batchDelCourse(bo) ? 1 : 0);
-    }
-
-    /**
-     * 导出课程列表
-     */
-   /* @ApiOperation("导出课程列表")
-    @PreAuthorize("@ss.hasPermi('system:course:export')")
-    @Log(title = "课程", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<CourseVo> export(CourseQueryBo bo) {
-        List<CourseVo> list = iCourseService.queryList(bo);
-        ExcelUtil<CourseVo> util = new ExcelUtil<CourseVo>(CourseVo.class);
-        return util.exportExcel(list, "课程");
-    }*/
-
-    /**
-     * 获取课程详细信息
-     */
-    @ApiOperation("获取课程详细信息")
-    @PreAuthorize("@ss.hasPermi('system:course:query')")
-    @GetMapping("/{courseId}")
-    public AjaxResult<CourseVo> getInfo(@PathVariable("courseId" ) Long courseId) {
-        return AjaxResult.success(iCourseService.selectById(courseId));
-    }
-
-    /**
-     * 新增课程
-     */
-    @ApiOperation("新增课程")
-    @PreAuthorize("@ss.hasPermi('system:course:add')")
-    @Log(title = "课程", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Long> add(@RequestBody CourseAddBo bo) {
-        return AjaxResult.success(iCourseService.insertByAddBo(bo));
-    }
-
-    /**
-     * 修改课程
-     */
-    @ApiOperation("修改课程")
-    @PreAuthorize("@ss.hasPermi('system:course:edit')")
-    @Log(title = "课程", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody CourseEditBo bo) {
-        return toAjax(iCourseService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 课程统计报表
-     */
-    @ApiOperation("课程统计报表")
-    @GetMapping("/statement")
-    public TableDataInfo<CourseStatementVo> getCourseStatement(CourseStatementBo bo) {
-        startPage();
-        List<CourseStatementVo> list = iUserStudyRecordService.getCourseStatement(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 课程统计报表导出
-     */
-    @ApiOperation("课程统计报表导出")
-    @GetMapping("/statement/export")
-    public AjaxResult<CourseStatementVo> exportCourseStatement(CourseStatementBo bo) {
-        List<CourseStatementVo> list = iUserStudyRecordService.getCourseStatement(bo);
-        if (CollectionUtils.isNotEmpty(list)){
-            list = list.stream().map(item -> CourseStatementVo.createExportVo(item)).collect(Collectors.toList());
-        }
-        ExcelUtil<CourseStatementVo> util = new ExcelUtil<>(CourseStatementVo.class);
-        return util.exportExcel(list,"课程学习统计");
-    }
-
-    /**
-     * 课程详情统计
-     */
-    @ApiOperation("课程详情统计")
-    @GetMapping("/detail/statistics")
-    public TableDataInfo<CourseSectionDetailVo> getCourseDetailStatistics(CourseSectionDetailBo bo) {
-        startPage();
-        List<CourseSectionDetailVo> list = iUserStudyRecordService.getCourseDetailStatistics(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 课程详情统计导出
-     */
-    @ApiOperation("课程详情统计导出")
-    @GetMapping("/detail/statistics/export")
-    public AjaxResult<CourseSectionDetailVo> exportCourseDetailStatistics(CourseSectionDetailBo bo) {
-        List<CourseSectionDetailVo> list = iUserStudyRecordService.getCourseDetailStatistics(bo);
-        if (CollectionUtils.isNotEmpty(list)){
-            list.forEach(item -> {
-                item.setPurchaseStatusStr(ObjectUtils.isNotNull(item.getPurchaseStatus()) && item.getPurchaseStatus() == 1?"已开课":"未开课");
-            });
-        }
-        ExcelUtil<CourseSectionDetailVo> util = new ExcelUtil<>(CourseSectionDetailVo.class);
-        return util.exportExcel(list,"课程学员学习统计");
-    }
-
-    /**
-     * 学员观看记录
-     */
-    @ApiOperation("学员观看记录")
-    @GetMapping("/user/watch")
-    public AjaxResult<List<UserWatchStatisticsVo>> getUserWatchStatistics(CourseSectionDetailBo bo) {
-        List<UserWatchStatisticsVo> list = iUserStudyRecordService.getUserWatchStatistics(bo);
-        return AjaxResult.success(list);
-    }
-
-    /**
-     * 删除课程
-     */
-   /* @ApiOperation("删除课程")
-    @PreAuthorize("@ss.hasPermi('system:course:remove')")
-    @Log(title = "课程" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{courseIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] courseIds) {
-        return toAjax(iCourseService.deleteWithValidByIds(Arrays.asList(courseIds), true) ? 1 : 0);
-    }*/
-
-    /**
-     * 查询课程列表
-     */
-    @ApiOperation("查询用户拥有的商品")
-    @GetMapping("/goodsList")
-    public TableDataInfo<GoodsUserVo> goodsList(CourseQueryBo bo) {
-        User user = iUserService.getOne(new LambdaQueryWrapper<User>()
-                .eq(User::getTelphone, EncryptHandler.encrypt(bo.getTelphone())).last("limit 1"));
-        if(Validator.isEmpty(user)){
-            throw new CustomException("该用户不存在");
-        }
-        startPage();
-        bo.setUserId(user.getUserId());
-        List<GoodsUserVo> list = iCourseService.goodsList(bo);
-        return getDataTable(list);
-    }
-
-    @ApiOperation("批量查询用户拥有的商品进度")
-    @PostMapping("/goodsBatchList")
-    public AjaxResult<List<GoodsBatchListVo>> goodsBatchList(@RequestBody CourseQueryBo bo) {
-        List<GoodsBatchListVo> listVos = new ArrayList<>();
-        if (CollectionUtils.isEmpty(bo.getTelphoneList())){
-            return  AjaxResult.success(listVos);
-        }
-        for(CourseProgressQueryBo queryBo : bo.getTelphoneList()){
-            User user = iUserService.getOne(new LambdaQueryWrapper<User>()
-                    .eq(User::getTelphone, EncryptHandler.encrypt(queryBo.getTelphone())).last("limit 1"));
-            if(Validator.isEmpty(user)){
-                continue;
-            }
-            bo.setUserId(user.getUserId());
-            bo.setGoodsId(queryBo.getGoodsId());
-            List<GoodsUserVo> list = iCourseService.goodsProgressList(bo);
-            if (CollectionUtils.isNotEmpty(list)){
-                GoodsBatchListVo vo = new GoodsBatchListVo();
-                vo.setUserId(user.getUserId());
-                vo.setGoodsId(queryBo.getGoodsId());
-                vo.setTelphone(queryBo.getTelphone());
-                vo.setList(list);
-                listVos.add(vo);
-            }
-        }
-        if (CollectionUtils.isEmpty(listVos)){
-            return AjaxResult.success(listVos);
-        }
-        return AjaxResult.success(listVos);
-    }
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseEducationTypeController.java

@@ -1,112 +0,0 @@
-package com.zhongzheng.controller.course;
-
-import java.util.List;
-import java.util.Arrays;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.modules.course.vo.CourseEducationTypeVo;
-import com.zhongzheng.modules.course.bo.CourseEducationTypeQueryBo;
-import com.zhongzheng.modules.course.bo.CourseEducationTypeAddBo;
-import com.zhongzheng.modules.course.bo.CourseEducationTypeEditBo;
-import com.zhongzheng.modules.course.service.ICourseEducationTypeService;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 教育类型Controller
- * 
- * @author ruoyi
- * @date 2021-10-08
- */
-@Api(value = "教育类型控制器", tags = {"教育类型管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/course/educationType")
-public class CourseEducationTypeController extends BaseController {
-
-    private final ICourseEducationTypeService iCourseEducationTypeService;
-
-    /**
-     * 查询教育类型列表
-     */
-    @ApiOperation("查询教育类型列表")
-    @PreAuthorize("@ss.hasPermi('course:type:list')")
-    @GetMapping("/list")
-    public TableDataInfo<CourseEducationTypeVo> list(CourseEducationTypeQueryBo bo) {
-        startPage();
-        List<CourseEducationTypeVo> list = iCourseEducationTypeService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出教育类型列表
-     */
-/*    @ApiOperation("导出教育类型列表")
-    @PreAuthorize("@ss.hasPermi('course:type:export')")
-    @Log(title = "教育类型", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<CourseEducationTypeVo> export(CourseEducationTypeQueryBo bo) {
-        List<CourseEducationTypeVo> list = iCourseEducationTypeService.queryList(bo);
-        ExcelUtil<CourseEducationTypeVo> util = new ExcelUtil<CourseEducationTypeVo>(CourseEducationTypeVo.class);
-        return util.exportExcel(list, "教育类型");
-    }*/
-
-    /**
-     * 获取教育类型详细信息
-     */
-    @ApiOperation("获取教育类型详细信息")
-    @PreAuthorize("@ss.hasPermi('course:type:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<CourseEducationTypeVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iCourseEducationTypeService.queryById(id));
-    }
-
-    /**
-     * 新增教育类型
-     */
-    @ApiOperation("新增教育类型")
-    @PreAuthorize("@ss.hasPermi('course:type:add')")
-    @Log(title = "教育类型", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody CourseEducationTypeAddBo bo) {
-        return toAjax(iCourseEducationTypeService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改教育类型
-     */
-    @ApiOperation("修改教育类型")
-    @PreAuthorize("@ss.hasPermi('course:type:edit')")
-    @Log(title = "教育类型", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody CourseEducationTypeEditBo bo) {
-        return toAjax(iCourseEducationTypeService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除教育类型
-     */
-/*    @ApiOperation("删除教育类型")
-    @PreAuthorize("@ss.hasPermi('course:type:remove')")
-    @Log(title = "教育类型" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iCourseEducationTypeService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }*/
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseHandoutsController.java

@@ -1,32 +1,18 @@
 package com.zhongzheng.controller.course;
 
-import java.util.List;
-import java.util.Arrays;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.modules.course.vo.CourseHandoutsVo;
-import com.zhongzheng.modules.course.bo.CourseHandoutsQueryBo;
 import com.zhongzheng.modules.course.bo.CourseHandoutsAddBo;
 import com.zhongzheng.modules.course.bo.CourseHandoutsEditBo;
-import com.zhongzheng.modules.course.service.ICourseHandoutsService;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.modules.course.service.ICourseFileService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 讲义列Controller
@@ -40,73 +26,25 @@ import io.swagger.annotations.ApiOperation;
 @RequestMapping("/course/handouts")
 public class CourseHandoutsController extends BaseController {
 
-    private final ICourseHandoutsService iCourseHandoutsService;
 
-    /**
-     * 查询讲义列列表
-     */
-    @ApiOperation("查询讲义列列表")
-    @PreAuthorize("@ss.hasPermi('course:handouts:list')")
-    @GetMapping("/list")
-    public TableDataInfo<CourseHandoutsVo> list(CourseHandoutsQueryBo bo) {
-        startPage();
-        List<CourseHandoutsVo> list = iCourseHandoutsService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出讲义列列表
-     */
-/*    @ApiOperation("导出讲义列列表")
-    @PreAuthorize("@ss.hasPermi('course:handouts:export')")
-    @Log(title = "讲义列", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<CourseHandoutsVo> export(CourseHandoutsQueryBo bo) {
-        List<CourseHandoutsVo> list = iCourseHandoutsService.queryList(bo);
-        ExcelUtil<CourseHandoutsVo> util = new ExcelUtil<CourseHandoutsVo>(CourseHandoutsVo.class);
-        return util.exportExcel(list, "讲义列");
-    }*/
-
-    /**
-     * 获取讲义列详细信息
-     */
-    @ApiOperation("获取讲义列详细信息")
-    @PreAuthorize("@ss.hasPermi('course:handouts:query')")
-    @GetMapping("/{handoutsId}")
-    public AjaxResult<CourseHandoutsVo> getInfo(@PathVariable("handoutsId" ) Long handoutsId) {
-        return AjaxResult.success(iCourseHandoutsService.queryById(handoutsId));
-    }
+    private final ICourseFileService iCourseFileService;
 
     /**
      * 新增讲义列
      */
     @ApiOperation("新增讲义列")
-    @PreAuthorize("@ss.hasPermi('course:handouts:add')")
-    @Log(title = "讲义列", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody CourseHandoutsAddBo bo) {
-        return toAjax(iCourseHandoutsService.insertByAddBo(bo) ? 1 : 0);
+    @PostMapping("/save")
+    public AjaxResult<Void> addHandouts(@RequestBody CourseHandoutsAddBo bo) {
+        return toAjax(iCourseFileService.addHandouts(bo) ? 1 : 0);
     }
 
     /**
      * 修改讲义列
      */
     @ApiOperation("修改讲义列")
-    @PreAuthorize("@ss.hasPermi('course:handouts:edit')")
-    @Log(title = "讲义列", businessType = BusinessType.UPDATE)
-    @PostMapping("edit")
-    public AjaxResult<Void> edit(@RequestBody CourseHandoutsEditBo bo) {
-        return toAjax(iCourseHandoutsService.updateByEditBo(bo) ? 1 : 0);
+    @PostMapping("/edit")
+    public AjaxResult<Void> editHandouts(@RequestBody CourseHandoutsEditBo bo) {
+        return toAjax(iCourseFileService.editHandouts(bo) ? 1 : 0);
     }
 
-    /**
-     * 删除讲义列
-     */
-/*    @ApiOperation("删除讲义列")
-    @PreAuthorize("@ss.hasPermi('course:handouts:remove')")
-    @Log(title = "讲义列" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{handoutsIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] handoutsIds) {
-        return toAjax(iCourseHandoutsService.deleteWithValidByIds(Arrays.asList(handoutsIds), true) ? 1 : 0);
-    }*/
 }

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseMenuController.java

@@ -1,126 +0,0 @@
-package com.zhongzheng.controller.course;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.course.bo.CourseMenuAddBo;
-import com.zhongzheng.modules.course.bo.CourseMenuEditBo;
-import com.zhongzheng.modules.course.bo.CourseMenuListAddBo;
-import com.zhongzheng.modules.course.bo.CourseMenuQueryBo;
-import com.zhongzheng.modules.course.service.ICourseMenuService;
-import com.zhongzheng.modules.course.vo.CourseMenuVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 课程目录结构Controller
- *
- * @author hjl
- * @date 2021-10-12
- */
-@Api(value = "课程目录结构控制器", tags = {"课程目录结构管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/course/menu")
-public class CourseMenuController extends BaseController {
-
-    private final ICourseMenuService iCourseMenuService;
-
-    /**
-     * 查询课程目录结构列表
-     */
-    @ApiOperation("查询课程目录结构列表")
-    @PreAuthorize("@ss.hasPermi('system:menu:list')")
-    @GetMapping("/list")
-    public TableDataInfo<CourseMenuVo> list(CourseMenuQueryBo bo) {
-        startPage();
-        List<CourseMenuVo> list = iCourseMenuService.selectList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出课程目录结构列表
-     */
-   /* @ApiOperation("导出课程目录结构列表")
-    @PreAuthorize("@ss.hasPermi('system:menu:export')")
-    @Log(title = "课程目录结构", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<CourseMenuVo> export(CourseMenuQueryBo bo) {
-        List<CourseMenuVo> list = iCourseMenuService.queryList(bo);
-        ExcelUtil<CourseMenuVo> util = new ExcelUtil<CourseMenuVo>(CourseMenuVo.class);
-        return util.exportExcel(list, "课程目录结构");
-    }*/
-
-    /**
-     * 获取课程目录结构详细信息
-     */
-    @ApiOperation("获取课程目录结构详细信息")
-    @PreAuthorize("@ss.hasPermi('system:menu:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<CourseMenuVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iCourseMenuService.queryById(id));
-    }
-
-
-
-    /**
-     * 新增商品-模块章目录结构
-     */
-    @ApiOperation("新增商品-模块章目录结构")
-    @PreAuthorize("@ss.hasPermi('system:menu:add')")
-    @Log(title = "课程目录结构", businessType = BusinessType.INSERT)
-    @PostMapping("/bindGoods")
-    public AjaxResult<Void> bindGoods(@RequestBody CourseMenuListAddBo bo) {
-        return toAjax(iCourseMenuService.insertByGoodsAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 新增课程目录结构
-     */
-    @ApiOperation("新增课程目录结构")
-    @PreAuthorize("@ss.hasPermi('system:menu:add')")
-    @Log(title = "课程目录结构", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody CourseMenuListAddBo bo) {
-        return toAjax(iCourseMenuService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改课程目录结构
-     */
-    @ApiOperation("修改课程目录结构")
-    @PreAuthorize("@ss.hasPermi('system:menu:edit')")
-    @Log(title = "课程目录结构", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody CourseMenuListAddBo bo) {
-        return toAjax(iCourseMenuService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除课程目录结构
-     */
-/*    @ApiOperation("删除课程目录结构")
-    @PreAuthorize("@ss.hasPermi('system:menu:remove')")
-    @Log(title = "课程目录结构" , businessType = BusinessType.DELETE)
-    @PostMapping("/del/{ids}")
-    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iCourseMenuService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }*/
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseMenuExamController.java

@@ -1,112 +0,0 @@
-package com.zhongzheng.controller.course;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.course.bo.CourseMenuExamAddBo;
-import com.zhongzheng.modules.course.bo.CourseMenuExamEditBo;
-import com.zhongzheng.modules.course.bo.CourseMenuExamQueryBo;
-import com.zhongzheng.modules.course.service.ICourseMenuExamService;
-import com.zhongzheng.modules.course.vo.CourseMenuExamVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 课程目录关联卷Controller
- *
- * @author hjl
- * @date 2021-11-17
- */
-@Api(value = "课程目录关联卷控制器", tags = {"课程目录关联卷管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/course/menu/exam")
-public class CourseMenuExamController extends BaseController {
-
-    private final ICourseMenuExamService iCourseMenuExamService;
-
-    /**
-     * 查询课程目录关联卷列表
-     */
-    @ApiOperation("查询课程目录关联卷列表")
-    @PreAuthorize("@ss.hasPermi('system:exam:list')")
-    @GetMapping("/list")
-    public TableDataInfo<CourseMenuExamVo> list(CourseMenuExamQueryBo bo) {
-        startPage();
-        List<CourseMenuExamVo> list = iCourseMenuExamService.getList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出课程目录关联卷列表
-     */
-   /* @ApiOperation("导出课程目录关联卷列表")
-    @PreAuthorize("@ss.hasPermi('system:exam:export')")
-    @Log(title = "课程目录关联卷", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<CourseMenuExamVo> export(CourseMenuExamQueryBo bo) {
-        List<CourseMenuExamVo> list = iCourseMenuExamService.queryList(bo);
-        ExcelUtil<CourseMenuExamVo> util = new ExcelUtil<CourseMenuExamVo>(CourseMenuExamVo.class);
-        return util.exportExcel(list, "课程目录关联卷");
-    }*/
-
-    /**
-     * 获取课程目录关联卷详细信息
-     */
- /*   @ApiOperation("获取课程目录关联卷详细信息")
-    @PreAuthorize("@ss.hasPermi('system:exam:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<CourseMenuExamVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iCourseMenuExamService.queryById(id));
-    }*/
-
-    /**
-     * 新增课程目录关联卷
-     */
-   /* @ApiOperation("新增课程目录关联卷")
-    @PreAuthorize("@ss.hasPermi('system:exam:add')")
-    @Log(title = "课程目录关联卷", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody CourseMenuExamAddBo bo) {
-        return toAjax(iCourseMenuExamService.insertByAddBo(bo) ? 1 : 0);
-    }*/
-
-    /**
-     * 修改课程目录关联卷
-     */
-   /* @ApiOperation("修改课程目录关联卷")
-    @PreAuthorize("@ss.hasPermi('system:exam:edit')")
-    @Log(title = "课程目录关联卷", businessType = BusinessType.UPDATE)
-    @PutMapping()
-    public AjaxResult<Void> edit(@RequestBody CourseMenuExamEditBo bo) {
-        return toAjax(iCourseMenuExamService.updateByEditBo(bo) ? 1 : 0);
-    }*/
-
-    /**
-     * 删除课程目录关联卷
-     */
-   /* @ApiOperation("删除课程目录关联卷")
-    @PreAuthorize("@ss.hasPermi('system:exam:remove')")
-    @Log(title = "课程目录关联卷" , businessType = BusinessType.DELETE)
-    @PostMapping("/delete/{ids}")
-    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iCourseMenuExamService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }*/
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseModuleChapterController.java

@@ -1,121 +0,0 @@
-package com.zhongzheng.controller.course;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.course.bo.CourseModuleChapterAddBo;
-import com.zhongzheng.modules.course.bo.CourseModuleChapterEditBo;
-import com.zhongzheng.modules.course.bo.CourseModuleChapterQueryBo;
-import com.zhongzheng.modules.course.service.ICourseModuleChapterService;
-import com.zhongzheng.modules.course.vo.CourseMenuVo;
-import com.zhongzheng.modules.course.vo.CourseModuleChapterVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 模块与章关系Controller
- *
- * @author hjl
- * @date 2021-10-11
- */
-@Api(value = "模块与章关系控制器", tags = {"模块与章关系管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/course/module/chapter")
-public class CourseModuleChapterController extends BaseController {
-
-    private final ICourseModuleChapterService iCourseModuleChapterService;
-
-    /**
-     * 查询模块与章关系列表
-     */
-   /* @ApiOperation("查询模块与章关系列表")
-    @PreAuthorize("@ss.hasPermi('system:chapter:list')")
-    @GetMapping("/list")
-    public TableDataInfo<CourseModuleChapterVo> list(CourseModuleChapterQueryBo bo) {
-        startPage();
-        List<CourseModuleChapterVo> list = iCourseModuleChapterService.queryList(bo);
-        return getDataTable(list);
-    }*/
-
-    @ApiOperation("查询模块与章关系列表")
-    @PreAuthorize("@ss.hasPermi('system:chapter:list')")
-    @GetMapping("/allList/{id}")
-    public AjaxResult<List<CourseModuleChapterVo>> all_list(@PathVariable("id" ) Long id) {
-        List<CourseModuleChapterVo> list = iCourseModuleChapterService.getListById(id);
-        return AjaxResult.success(list);
-    }
-
-    /**
-     * 导出模块与章关系列表
-     */
-   /* @ApiOperation("导出模块与章关系列表")
-    @PreAuthorize("@ss.hasPermi('system:chapter:export')")
-    @Log(title = "模块与章关系", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<CourseModuleChapterVo> export(CourseModuleChapterQueryBo bo) {
-        List<CourseModuleChapterVo> list = iCourseModuleChapterService.queryList(bo);
-        ExcelUtil<CourseModuleChapterVo> util = new ExcelUtil<CourseModuleChapterVo>(CourseModuleChapterVo.class);
-        return util.exportExcel(list, "模块与章关系");
-    }*/
-
-    /**
-     * 获取模块与章关系详细信息
-     */
-   /* @ApiOperation("获取模块与章关系详细信息")
-    @PreAuthorize("@ss.hasPermi('system:chapter:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<CourseModuleChapterVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iCourseModuleChapterService.queryById(id));
-    }*/
-
-    /**
-     * 新增模块与章关系
-     */
-    /*@ApiOperation("新增模块与章关系")
-    @PreAuthorize("@ss.hasPermi('system:chapter:add')")
-    @Log(title = "模块与章关系", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody CourseModuleChapterAddBo bo) {
-        return toAjax(iCourseModuleChapterService.insertByAddBo(bo) ? 1 : 0);
-    }*/
-
-    /**
-     * 修改模块与章关系
-     */
-   /* @ApiOperation("修改模块与章关系")
-    @PreAuthorize("@ss.hasPermi('system:chapter:edit')")
-    @Log(title = "模块与章关系", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody CourseModuleChapterEditBo bo) {
-        return toAjax(iCourseModuleChapterService.updateByEditBo(bo) ? 1 : 0);
-    }*/
-
-    /**
-     * 删除模块与章关系
-     */
-   /* @ApiOperation("删除模块与章关系")
-    @PreAuthorize("@ss.hasPermi('system:chapter:remove')")
-    @Log(title = "模块与章关系" , businessType = BusinessType.DELETE)
-    @PostMapping("/del/{ids}")
-    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iCourseModuleChapterService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }*/
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseModuleController.java

@@ -1,171 +0,0 @@
-package com.zhongzheng.controller.course;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Arrays;
-import java.util.Map;
-
-import com.alibaba.fastjson.JSON;
-import com.zhongzheng.common.core.domain.model.LoginUser;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.common.utils.poi.EasyPoiUtil;
-import com.zhongzheng.framework.web.service.TokenService;
-import com.zhongzheng.modules.bank.vo.QuestionImportV2;
-import com.zhongzheng.modules.course.bo.CourseModuleAddBo;
-import com.zhongzheng.modules.course.bo.CourseModuleEditBo;
-import com.zhongzheng.modules.course.bo.CourseModuleQueryBo;
-import com.zhongzheng.modules.course.bo.CourseSectionBusinessAddBo;
-import com.zhongzheng.modules.course.domain.CourseChapterBusiness;
-import com.zhongzheng.modules.course.domain.CourseModuleBusiness;
-import com.zhongzheng.modules.course.service.ICourseModuleBusinessService;
-import com.zhongzheng.modules.course.service.ICourseModuleService;
-import com.zhongzheng.modules.course.service.ICourseSectionService;
-import com.zhongzheng.modules.course.vo.CourseChapterSectionImport;
-import com.zhongzheng.modules.course.vo.CourseModuleVo;
-import com.zhongzheng.modules.course.vo.CourseSectionImport;
-import com.zhongzheng.modules.goods.bo.GoodsBatchDelBo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * 课程模块Controller
- *
- * @author hjl
- * @date 2021-10-09
- */
-@Api(value = "课程模块控制器", tags = {"课程模块管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/course/module")
-public class CourseModuleController extends BaseController {
-
-    private final ICourseModuleService iCourseModuleService;
-
-    private final ICourseModuleBusinessService iCourseModuleBusinessService;
-
-    private final TokenService tokenService;
-
-    private final ICourseSectionService iCourseSectionService;
-
-
-    /**
-     * 查询课程模块列表
-     */
-    @ApiOperation("查询课程模块列表")
-    @PreAuthorize("@ss.hasPermi('system:module:list')")
-    @GetMapping("/list")
-    public TableDataInfo<CourseModuleVo> list(CourseModuleQueryBo bo) {
-        startPage();
-        List<CourseModuleVo> list = iCourseModuleService.selectList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 模块批量删除
-     */
-    @ApiOperation("模块批量删除")
-    @PostMapping("/batch/del")
-    public AjaxResult<Void> batchDelModule(@RequestBody GoodsBatchDelBo bo) {
-        return toAjax(iCourseModuleService.batchDelModule(bo) ? 1 : 0);
-    }
-
-    /**
-     * 导出课程模块列表
-     */
-   /* @ApiOperation("导出课程模块列表")
-    @PreAuthorize("@ss.hasPermi('system:module:export')")
-    @Log(title = "课程模块", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<CourseModuleVo> export(CourseModuleQueryBo bo) {
-        List<CourseModuleVo> list = iCourseModuleService.queryList(bo);
-        ExcelUtil<CourseModuleVo> util = new ExcelUtil<CourseModuleVo>(CourseModuleVo.class);
-        return util.exportExcel(list, "课程模块");
-    }*/
-
-    /**
-     * 获取课程模块详细信息
-     */
-    @ApiOperation("获取课程模块详细信息")
-    @PreAuthorize("@ss.hasPermi('system:module:query')")
-    @GetMapping("/{moduleId}")
-    public AjaxResult<CourseModuleVo> getInfo(@PathVariable("moduleId" ) Long moduleId) {
-        return AjaxResult.success(iCourseModuleService.queryById(moduleId));
-    }
-
-    /**
-     * 新增课程模块
-     */
-    @ApiOperation("新增课程模块")
-    @PreAuthorize("@ss.hasPermi('system:module:add')")
-    @Log(title = "课程模块", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody CourseModuleAddBo bo) {
-        return toAjax(iCourseModuleService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改课程模块
-     */
-    @ApiOperation("修改课程模块")
-    @PreAuthorize("@ss.hasPermi('system:module:edit')")
-    @Log(title = "课程模块", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody CourseModuleEditBo bo) {
-        return toAjax(iCourseModuleService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除课程模块
-     */
-   /* @ApiOperation("删除课程模块")
-    @PreAuthorize("@ss.hasPermi('system:module:remove')")
-    @Log(title = "课程模块" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{moduleIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] moduleIds) {
-        return toAjax(iCourseModuleService.deleteWithValidByIds(Arrays.asList(moduleIds), true) ? 1 : 0);
-    }*/
-
-    /**
-     * 获取课程小节业务层次列表
-     */
-    @ApiOperation("获取课程模块业务层次列表")
-    @PreAuthorize("@ss.hasPermi('system:section:query')")
-    @GetMapping("/business/{moduleId}")
-    public AjaxResult<List<CourseModuleBusiness>> getBusinessList(@PathVariable("moduleId" ) Long moduleId) {
-        List<CourseModuleBusiness> list = iCourseModuleBusinessService.getListById(moduleId);
-        return AjaxResult.success(list);
-    }
-
-    @ApiOperation("导入章节模板")
-    @Log(title = "导入节模板", businessType = BusinessType.IMPORT)
-    @PreAuthorize("@ss.hasPermi('system:section:import')")
-    @PostMapping("/importData")
-    public AjaxResult<Map<String,Object>> importData(MultipartFile file,String businessJson) throws Exception
-    {
-        List<CourseSectionBusinessAddBo> businessList = JSON.parseArray(businessJson, CourseSectionBusinessAddBo.class);
-        List<CourseChapterSectionImport> sectionList = EasyPoiUtil.importExcel(file,0,2,CourseChapterSectionImport.class);
-        Collections.reverse(sectionList);
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        String operName = loginUser.getUsername();
-        Map<String,Object> message = iCourseSectionService.importChapterSection(sectionList, businessList, operName);
-        return AjaxResult.success(message);
-    }
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseProjectTypeController.java

@@ -1,112 +0,0 @@
-package com.zhongzheng.controller.course;
-
-import java.util.List;
-import java.util.Arrays;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
-import com.zhongzheng.modules.course.bo.CourseProjectTypeQueryBo;
-import com.zhongzheng.modules.course.bo.CourseProjectTypeAddBo;
-import com.zhongzheng.modules.course.bo.CourseProjectTypeEditBo;
-import com.zhongzheng.modules.course.service.ICourseProjectTypeService;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 项目类型Controller
- * 
- * @author ruoyi
- * @date 2021-10-08
- */
-@Api(value = "项目类型控制器", tags = {"项目类型管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/course/projectType")
-public class CourseProjectTypeController extends BaseController {
-
-    private final ICourseProjectTypeService iCourseProjectTypeService;
-
-    /**
-     * 查询项目类型列表
-     */
-    @ApiOperation("查询项目类型列表")
-    @PreAuthorize("@ss.hasPermi('course:type:list')")
-    @GetMapping("/list")
-    public TableDataInfo<CourseProjectTypeVo> list(CourseProjectTypeQueryBo bo) {
-        startPage();
-        List<CourseProjectTypeVo> list = iCourseProjectTypeService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出项目类型列表
-     */
-/*    @ApiOperation("导出项目类型列表")
-    @PreAuthorize("@ss.hasPermi('modules.course:type:export')")
-    @Log(title = "项目类型", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<CourseProjectTypeVo> export(CourseProjectTypeQueryBo bo) {
-        List<CourseProjectTypeVo> list = iCourseProjectTypeService.queryList(bo);
-        ExcelUtil<CourseProjectTypeVo> util = new ExcelUtil<CourseProjectTypeVo>(CourseProjectTypeVo.class);
-        return util.exportExcel(list, "项目类型");
-    }*/
-
-    /**
-     * 获取项目类型详细信息
-     */
-    @ApiOperation("获取项目类型详细信息")
-    @PreAuthorize("@ss.hasPermi('course:type:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<CourseProjectTypeVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iCourseProjectTypeService.queryById(id));
-    }
-
-    /**
-     * 新增项目类型
-     */
-    @ApiOperation("新增项目类型")
-    @PreAuthorize("@ss.hasPermi('course:type:add')")
-    @Log(title = "项目类型", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody CourseProjectTypeAddBo bo) {
-        return toAjax(iCourseProjectTypeService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改项目类型
-     */
-    @ApiOperation("修改项目类型")
-    @PreAuthorize("@ss.hasPermi('course:type:edit')")
-    @Log(title = "项目类型", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody CourseProjectTypeEditBo bo) {
-        return toAjax(iCourseProjectTypeService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除项目类型
-     */
-/*    @ApiOperation("删除项目类型")
-    @PreAuthorize("@ss.hasPermi('modules.course:type:remove')")
-    @Log(title = "项目类型" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iCourseProjectTypeService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }*/
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseSectionController.java

@@ -1,219 +0,0 @@
-package com.zhongzheng.controller.course;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Arrays;
-import java.util.Map;
-
-import cn.hutool.core.lang.Validator;
-import com.alibaba.fastjson.JSON;
-import com.zhongzheng.common.core.domain.model.LoginUser;
-import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.framework.web.service.TokenService;
-import com.zhongzheng.modules.bank.vo.QuestionImport;
-import com.zhongzheng.modules.course.bo.*;
-import com.zhongzheng.modules.course.domain.CourseSectionBusiness;
-import com.zhongzheng.modules.course.service.ICourseSectionBusinessService;
-import com.zhongzheng.modules.course.service.ICourseSectionService;
-import com.zhongzheng.modules.course.service.ICourseSectionWatchPerService;
-import com.zhongzheng.modules.course.vo.CourseSectionImport;
-import com.zhongzheng.modules.course.vo.CourseSectionVo;
-import com.zhongzheng.modules.course.vo.CourseSectionWatchPerVo;
-import com.zhongzheng.modules.goods.bo.GoodsBatchDelBo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * 课程小节Controller
- *
- * @author hjl
- * @date 2021-10-11
- */
-@Api(value = "课程小节控制器", tags = {"课程小节管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/course/section")
-public class CourseSectionController extends BaseController {
-
-    private final ICourseSectionService iCourseSectionService;
-
-    private final ICourseSectionBusinessService iCourseSectionBusinessService;
-
-    private final ICourseSectionWatchPerService iCourseSectionWatchPerService;
-
-    @Autowired
-    private TokenService tokenService;
-
-    /**
-     * 查询课程小节列表
-     */
-    @ApiOperation("查询课程小节列表")
-    @PreAuthorize("@ss.hasPermi('system:section:list')")
-    @GetMapping("/list")
-    public TableDataInfo<CourseSectionVo> list(CourseSectionQueryBo bo) {
-        startPage();
-        List<CourseSectionVo> list = iCourseSectionService.selectSectionList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 节批量删除
-     */
-    @ApiOperation("节批量删除")
-    @PostMapping("/batch/del")
-    public AjaxResult<Void> batchDelSection(@RequestBody GoodsBatchDelBo bo) {
-        return toAjax(iCourseSectionService.batchDelSection(bo) ? 1 : 0);
-    }
-
-    /**
-     * 导出课程小节列表
-     */
-    /*@ApiOperation("导出课程小节列表")
-    @PreAuthorize("@ss.hasPermi('system:section:export')")
-    @Log(title = "课程小节", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<CourseSectionVo> export(CourseSectionQueryBo bo) {
-        List<CourseSectionVo> list = iCourseSectionService.queryList(bo);
-        ExcelUtil<CourseSectionVo> util = new ExcelUtil<CourseSectionVo>(CourseSectionVo.class);
-        return util.exportExcel(list, "课程小节");
-    }*/
-
-    /**
-     * 获取课程小节详细信息
-     */
-    @ApiOperation("获取课程小节详细信息")
-    @PreAuthorize("@ss.hasPermi('system:section:query')")
-    @GetMapping("/{sectionId}")
-    public AjaxResult<CourseSectionVo> getInfo(@PathVariable("sectionId" ) Long sectionId) {
-        return AjaxResult.success(iCourseSectionService.queryById(sectionId));
-    }
-
-    /**
-     * 新增课程小节
-     */
-    @ApiOperation("新增课程小节")
-    @PreAuthorize("@ss.hasPermi('system:section:add')")
-    @Log(title = "课程小节", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody CourseSectionAddBo bo) {
-        return toAjax(iCourseSectionService.insertByAddBo(bo)>0? 1 : 0);
-    }
-
-    @ApiOperation("批量新增课程小节")
-    @PreAuthorize("@ss.hasPermi('system:section:add')")
-    @Log(title = "课程小节", businessType = BusinessType.INSERT)
-    @PostMapping("/addMore")
-    public AjaxResult<List<Long>> addMore(@RequestBody List<CourseSectionAddBo> list) {
-        return AjaxResult.success(iCourseSectionService.insertByAddBoMore(list));
-    }
-
-    /**
-     * 修改课程小节
-     */
-    @ApiOperation("修改课程小节")
-    @PreAuthorize("@ss.hasPermi('system:section:edit')")
-    @Log(title = "课程小节", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody CourseSectionEditBo bo) {
-        return toAjax(iCourseSectionService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    @ApiOperation("导入节模板")
-    @Log(title = "导入节模板", businessType = BusinessType.IMPORT)
-    @PreAuthorize("@ss.hasPermi('system:section:import')")
-    @PostMapping("/importData")
-    public AjaxResult<Map<String,Object>> importData(MultipartFile file, boolean updateSupport) throws Exception
-    {
-        ExcelUtil<CourseSectionImport> util = new ExcelUtil<CourseSectionImport>(CourseSectionImport.class);
-        List<CourseSectionImport> sectionList = util.importExcel(file.getInputStream());
-        Collections.reverse(sectionList);
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        String operName = loginUser.getUsername();
-        Map<String,Object> message = iCourseSectionService.importSection(sectionList, updateSupport, operName);
-
-        return AjaxResult.success(message);
-    }
-
-    @ApiOperation("导入节模板带业务层次")
-    @Log(title = "导入节模板", businessType = BusinessType.IMPORT)
-    @PreAuthorize("@ss.hasPermi('system:section:import')")
-    @PostMapping("/importDataBusiness")
-    public AjaxResult<Map<String,Object>> importDataBusiness(MultipartFile file,String businessJson) throws Exception
-    {
-        List<CourseSectionBusinessAddBo> businessList = JSON.parseArray(businessJson, CourseSectionBusinessAddBo.class);
-        ExcelUtil<CourseSectionImport> util = new ExcelUtil<CourseSectionImport>(CourseSectionImport.class);
-        if(Validator.isEmpty(file)){
-            throw new CustomException("文件错误");
-        }
-        List<CourseSectionImport> sectionList = util.importExcel(file.getInputStream());
-        Collections.reverse(sectionList);
-        for(CourseSectionImport sectionImport : sectionList){
-            sectionImport.setBusinessList(businessList);
-        }
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        String operName = loginUser.getUsername();
-        Map<String,Object> message = iCourseSectionService.importSection(sectionList, false, operName);
-
-        return AjaxResult.success(message);
-    }
-
-    /**
-     * 删除课程小节
-     */
-   /* @ApiOperation("删除课程小节")
-    @PreAuthorize("@ss.hasPermi('system:section:remove')")
-    @Log(title = "课程小节" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{sectionIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] sectionIds) {
-        return toAjax(iCourseSectionService.deleteWithValidByIds(Arrays.asList(sectionIds), true) ? 1 : 0);
-    }*/
-
-    /**
-     * 获取课程小节业务层次列表
-     */
-    @ApiOperation("获取课程小节业务层次列表")
-    @PreAuthorize("@ss.hasPermi('system:section:query')")
-    @GetMapping("/business/{sectionId}")
-    public AjaxResult<List<CourseSectionBusiness>> getBusinessList(@PathVariable("sectionId" ) Long sectionId) {
-        List<CourseSectionBusiness> list = iCourseSectionBusinessService.getListById(sectionId);
-        return AjaxResult.success(list);
-    }
-
-    /**
-     * 获取课程小节观看权限
-     */
-    @ApiOperation("获取课程小节观看权限")
-    @GetMapping("/watch/per")
-    public AjaxResult<CourseSectionWatchPerVo> getSectionWatchPer(SectionWatchPerBo bo) {
-        CourseSectionWatchPerVo vo = iCourseSectionWatchPerService.getSectionWatchPer(bo);
-        return AjaxResult.success(vo);
-    }
-
-    /**
-     * 保存课程小节观看权限
-     */
-    @ApiOperation("保存课程小节观看权限")
-    @PostMapping("/add/watch/per")
-    public AjaxResult<Void> addSectionWatchPer(@RequestBody SectionWatchPerAddBo bo) {
-        return toAjax(iCourseSectionWatchPerService.insertByAddBo(bo));
-    }
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseStreamingController.java

@@ -1,129 +0,0 @@
-package com.zhongzheng.controller.course;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.course.bo.CourseStreamingAddBo;
-import com.zhongzheng.modules.course.bo.CourseStreamingEditBo;
-import com.zhongzheng.modules.course.bo.CourseStreamingQueryBo;
-import com.zhongzheng.modules.course.domain.CourseSectionBusiness;
-import com.zhongzheng.modules.course.domain.CourseStreamingBusiness;
-import com.zhongzheng.modules.course.service.ICourseStreamingBusinessService;
-import com.zhongzheng.modules.course.service.ICourseStreamingService;
-import com.zhongzheng.modules.course.vo.CourseStreamingVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 课程流媒体Controller
- *
- * @author hjl
- * @date 2021-10-11
- */
-@Api(value = "课程流媒体控制器", tags = {"课程流媒体管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/course/streaming")
-public class CourseStreamingController extends BaseController {
-
-    private final ICourseStreamingService iCourseStreamingService;
-
-    private final ICourseStreamingBusinessService iCourseStreamingBusinessService;
-
-    /**
-     * 查询课程流媒体列表
-     */
-    @ApiOperation("查询课程流媒体列表")
-    @PreAuthorize("@ss.hasPermi('system:streaming:list')")
-    @GetMapping("/list")
-    public TableDataInfo<CourseStreamingVo> list(CourseStreamingQueryBo bo) {
-        startPage();
-        List<CourseStreamingVo> list = iCourseStreamingService.selectList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出课程流媒体列表
-     */
-   /* @ApiOperation("导出课程流媒体列表")
-    @PreAuthorize("@ss.hasPermi('system:streaming:export')")
-    @Log(title = "课程流媒体", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<CourseStreamingVo> export(CourseStreamingQueryBo bo) {
-        List<CourseStreamingVo> list = iCourseStreamingService.queryList(bo);
-        ExcelUtil<CourseStreamingVo> util = new ExcelUtil<CourseStreamingVo>(CourseStreamingVo.class);
-        return util.exportExcel(list, "课程流媒体");
-    }*/
-
-    /**
-     * 获取课程流媒体详细信息
-     */
-    @ApiOperation("获取课程流媒体详细信息")
-    @PreAuthorize("@ss.hasPermi('system:streaming:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<CourseStreamingVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iCourseStreamingService.queryById(id));
-    }
-
-    /**
-     * 新增课程流媒体
-     */
-    @ApiOperation("新增课程流媒体")
-    @PreAuthorize("@ss.hasPermi('system:streaming:add')")
-    @Log(title = "课程流媒体", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody CourseStreamingAddBo bo) {
-        return toAjax(iCourseStreamingService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改课程流媒体
-     */
-    @ApiOperation("修改课程流媒体")
-    @PreAuthorize("@ss.hasPermi('system:streaming:edit')")
-    @Log(title = "课程流媒体", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody CourseStreamingEditBo bo) {
-        return toAjax(iCourseStreamingService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除课程流媒体
-     */
-  /*  @ApiOperation("删除课程流媒体")
-    @PreAuthorize("@ss.hasPermi('system:streaming:remove')")
-    @Log(title = "课程流媒体" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iCourseStreamingService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }*/
-
-    /**
-     * 获取课程小节业务层次列表
-     */
-    @ApiOperation("获取课程小节业务层次列表")
-    @PreAuthorize("@ss.hasPermi('system:section:query')")
-    @GetMapping("/business/{id}")
-    public AjaxResult<List<CourseStreamingBusiness>> getBusinessList(@PathVariable("id" ) Long id) {
-        List<CourseStreamingBusiness> list = iCourseStreamingBusinessService.getListById(id);
-        return AjaxResult.success(list);
-    }
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseSubjectController.java

@@ -1,124 +0,0 @@
-package com.zhongzheng.controller.course;
-
-import java.util.List;
-import java.util.Arrays;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.modules.course.vo.CourseSubjectVo;
-import com.zhongzheng.modules.course.bo.CourseSubjectQueryBo;
-import com.zhongzheng.modules.course.bo.CourseSubjectAddBo;
-import com.zhongzheng.modules.course.bo.CourseSubjectEditBo;
-import com.zhongzheng.modules.course.service.ICourseSubjectService;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 科目Controller
- * 
- * @author ruoyi
- * @date 2021-10-09
- */
-@Api(value = "科目控制器", tags = {"科目管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/course/subject")
-public class CourseSubjectController extends BaseController {
-
-    private final ICourseSubjectService iCourseSubjectService;
-
-    /**
-     * 查询科目列表
-     */
-    @ApiOperation("查询科目列表")
-    @PreAuthorize("@ss.hasPermi('course:subject:list')")
-    @GetMapping("/list")
-    public TableDataInfo<CourseSubjectVo> list(CourseSubjectQueryBo bo) {
-        startPage();
-        List<CourseSubjectVo> list = iCourseSubjectService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出科目列表
-     */
-/*    @ApiOperation("导出科目列表")
-    @PreAuthorize("@ss.hasPermi('course:subject:export')")
-    @Log(title = "科目", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<CourseSubjectVo> export(CourseSubjectQueryBo bo) {
-        List<CourseSubjectVo> list = iCourseSubjectService.queryList(bo);
-        ExcelUtil<CourseSubjectVo> util = new ExcelUtil<CourseSubjectVo>(CourseSubjectVo.class);
-        return util.exportExcel(list, "科目");
-    }*/
-
-    /**
-     * 获取科目详细信息
-     */
-    @ApiOperation("获取科目详细信息")
-    @PreAuthorize("@ss.hasPermi('course:subject:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<CourseSubjectVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iCourseSubjectService.queryById(id));
-    }
-
-    /**
-     * 新增科目
-     */
-    @ApiOperation("新增科目")
-    @PreAuthorize("@ss.hasPermi('course:subject:add')")
-    @Log(title = "科目", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody CourseSubjectAddBo bo) {
-        return toAjax(iCourseSubjectService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改科目
-     */
-    @ApiOperation("修改科目")
-    @PreAuthorize("@ss.hasPermi('course:subject:edit')")
-    @Log(title = "科目", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody CourseSubjectEditBo bo) {
-        return toAjax(iCourseSubjectService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除科目
-     */
-/*    @ApiOperation("删除科目")
-    @PreAuthorize("@ss.hasPermi('course:subject:remove')")
-    @Log(title = "科目" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iCourseSubjectService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }*/
-
-    /**
-     * 查询科目列表
-     */
-    @ApiOperation("查询科目下拉框")
-    @PreAuthorize("@ss.hasPermi('course:subject:list')")
-    @GetMapping("/listAll")
-    public TableDataInfo<CourseSubjectVo> listAll(CourseSubjectQueryBo bo) {
-        startPage();
-        List<CourseSubjectVo> list = iCourseSubjectService.queryListAll(bo);
-        return getDataTable(list);
-    }
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseTopicController.java

@@ -1,65 +0,0 @@
-package com.zhongzheng.controller.course;
-
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.modules.course.bo.*;
-import com.zhongzheng.modules.course.service.ICourseBusinessService;
-import com.zhongzheng.modules.course.service.ICourseTopicService;
-import com.zhongzheng.modules.course.vo.CourseBusinessVo;
-import com.zhongzheng.modules.course.vo.CourseTopicVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 业务层次Controller
- *
- * @author ruoyi
- * @date 2021-10-08
- */
-@Api(value = "业务层次控制器", tags = {"业务层次管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/course/topic")
-public class CourseTopicController extends BaseController {
-
-    private final ICourseTopicService iCourseTopicService;
-
-    /**
-     * 新增商品专题页
-     */
-    @ApiOperation("新增商品专题页")
-    @PostMapping("/add")
-    public AjaxResult<Void> add(@RequestBody CourseTopicAddBo bo) {
-        return toAjax(iCourseTopicService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 新增专题页组合班级商品
-     */
-    @ApiOperation("新增专题页组合班级商品")
-    @PostMapping("/addGoods")
-    public AjaxResult<Void> addGoods(@RequestBody List<CourseTopicGoodsAddBo> bo) {
-        return toAjax(iCourseTopicService.addGoods(bo) ? 1 : 0);
-    }
-
-    /**
-     * 商品专题页列表
-     */
-    @ApiOperation("商品专题页列表")
-    @GetMapping("/list")
-    public TableDataInfo<CourseTopicVo> list(CourseTopicQueryBo bo) {
-        startPage();
-        List<CourseTopicVo> list = iCourseTopicService.queryList(bo);
-        return getDataTable(list);
-    }
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/MajorController.java

@@ -1,112 +0,0 @@
-package com.zhongzheng.controller.course;
-
-import java.util.List;
-import java.util.Arrays;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.modules.course.vo.MajorVo;
-import com.zhongzheng.modules.course.bo.MajorQueryBo;
-import com.zhongzheng.modules.course.bo.MajorAddBo;
-import com.zhongzheng.modules.course.bo.MajorEditBo;
-import com.zhongzheng.modules.course.service.IMajorService;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 专业Controller
- * 
- * @author ruoyi
- * @date 2021-10-09
- */
-@Api(value = "专业控制器", tags = {"专业管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/course/major")
-public class MajorController extends BaseController {
-
-    private final IMajorService iMajorService;
-
-    /**
-     * 查询专业列表
-     */
-    @ApiOperation("查询专业列表")
-    @PreAuthorize("@ss.hasPermi('course:major:list')")
-    @GetMapping("/list")
-    public TableDataInfo<MajorVo> list(MajorQueryBo bo) {
-        startPage();
-        List<MajorVo> list = iMajorService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出专业列表
-     */
- /*   @ApiOperation("导出专业列表")
-    @PreAuthorize("@ss.hasPermi('course:major:export')")
-    @Log(title = "专业", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<MajorVo> export(MajorQueryBo bo) {
-        List<MajorVo> list = iMajorService.queryList(bo);
-        ExcelUtil<MajorVo> util = new ExcelUtil<MajorVo>(MajorVo.class);
-        return util.exportExcel(list, "专业");
-    }*/
-
-    /**
-     * 获取专业详细信息
-     */
-    @ApiOperation("获取专业详细信息")
-    @PreAuthorize("@ss.hasPermi('course:major:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<MajorVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iMajorService.queryById(id));
-    }
-
-    /**
-     * 新增专业
-     */
-    @ApiOperation("新增专业")
-    @PreAuthorize("@ss.hasPermi('course:major:add')")
-    @Log(title = "专业", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody MajorAddBo bo) {
-        return toAjax(iMajorService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改专业
-     */
-    @ApiOperation("修改专业")
-    @PreAuthorize("@ss.hasPermi('course:major:edit')")
-    @Log(title = "专业", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody MajorEditBo bo) {
-        return toAjax(iMajorService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除专业
-     */
-/*    @ApiOperation("删除专业")
-    @PreAuthorize("@ss.hasPermi('course:major:remove')")
-    @Log(title = "专业" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iMajorService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }*/
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/MajorExamineController.java

@@ -1,112 +0,0 @@
-package com.zhongzheng.controller.course;
-
-import java.util.List;
-import java.util.Arrays;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.modules.course.vo.MajorExamineVo;
-import com.zhongzheng.modules.course.bo.MajorExamineQueryBo;
-import com.zhongzheng.modules.course.bo.MajorExamineAddBo;
-import com.zhongzheng.modules.course.bo.MajorExamineEditBo;
-import com.zhongzheng.modules.course.service.IMajorExamineService;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 考期Controller
- * 
- * @author ruoyi
- * @date 2021-10-09
- */
-@Api(value = "考期控制器", tags = {"考期管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/course/examine")
-public class MajorExamineController extends BaseController {
-
-    private final IMajorExamineService iMajorExamineService;
-
-    /**
-     * 查询考期列表
-     */
-    @ApiOperation("查询考期列表")
-    @PreAuthorize("@ss.hasPermi('course:examine:list')")
-    @GetMapping("/list")
-    public TableDataInfo<MajorExamineVo> list(MajorExamineQueryBo bo) {
-        startPage();
-        List<MajorExamineVo> list = iMajorExamineService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出考期列表
-     */
-/*    @ApiOperation("导出考期列表")
-    @PreAuthorize("@ss.hasPermi('course:examine:export')")
-    @Log(title = "考期", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<MajorExamineVo> export(MajorExamineQueryBo bo) {
-        List<MajorExamineVo> list = iMajorExamineService.queryList(bo);
-        ExcelUtil<MajorExamineVo> util = new ExcelUtil<MajorExamineVo>(MajorExamineVo.class);
-        return util.exportExcel(list, "考期");
-    }*/
-
-    /**
-     * 获取考期详细信息
-     */
-    @ApiOperation("获取考期详细信息")
-    @PreAuthorize("@ss.hasPermi('course:examine:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<MajorExamineVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iMajorExamineService.queryById(id));
-    }
-
-    /**
-     * 新增考期
-     */
-    @ApiOperation("新增考期")
-    @PreAuthorize("@ss.hasPermi('course:examine:add')")
-    @Log(title = "考期", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody MajorExamineAddBo bo) {
-        return toAjax(iMajorExamineService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改考期
-     */
-    @ApiOperation("修改考期")
-    @PreAuthorize("@ss.hasPermi('course:examine:edit')")
-    @Log(title = "考期", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody MajorExamineEditBo bo) {
-        return toAjax(iMajorExamineService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除考期
-     */
- /*   @ApiOperation("删除考期")
-    @PreAuthorize("@ss.hasPermi('course:examine:remove')")
-    @Log(title = "考期" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iMajorExamineService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }*/
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/MajorLabelController.java

@@ -1,135 +0,0 @@
-package com.zhongzheng.controller.course;
-
-import java.util.List;
-import java.util.Arrays;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.modules.course.vo.MajorLabelVo;
-import com.zhongzheng.modules.course.bo.MajorLabelQueryBo;
-import com.zhongzheng.modules.course.bo.MajorLabelAddBo;
-import com.zhongzheng.modules.course.bo.MajorLabelEditBo;
-import com.zhongzheng.modules.course.service.IMajorLabelService;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 标签Controller
- * 
- * @author ruoyi
- * @date 2021-10-09
- */
-@Api(value = "标签控制器", tags = {"标签管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/course/label")
-public class MajorLabelController extends BaseController {
-
-    private final IMajorLabelService iMajorLabelService;
-
-    /**
-     * 查询标签列表
-     */
-    @ApiOperation("查询标签列表")
-    @PreAuthorize("@ss.hasPermi('course:label:list')")
-    @GetMapping("/list")
-    public TableDataInfo<MajorLabelVo> list(MajorLabelQueryBo bo) {
-        startPage();
-        List<MajorLabelVo> list = iMajorLabelService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 查询标签关联专业列表
-     */
-    @ApiOperation("查询标签关联专业列表")
-    @PreAuthorize("@ss.hasPermi('course:label:list')")
-    @GetMapping("/listMajor")
-    public TableDataInfo<MajorLabelVo> listMajor(MajorLabelQueryBo bo) {
-        startPage();
-        List<MajorLabelVo> list = iMajorLabelService.listMajor(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出标签列表
-     */
-/*    @ApiOperation("导出标签列表")
-    @PreAuthorize("@ss.hasPermi('course:label:export')")
-    @Log(title = "标签", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<MajorLabelVo> export(MajorLabelQueryBo bo) {
-        List<MajorLabelVo> list = iMajorLabelService.queryList(bo);
-        ExcelUtil<MajorLabelVo> util = new ExcelUtil<MajorLabelVo>(MajorLabelVo.class);
-        return util.exportExcel(list, "标签");
-    }*/
-
-    /**
-     * 获取标签详细信息
-     */
-    @ApiOperation("获取标签详细信息")
-    @PreAuthorize("@ss.hasPermi('course:label:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<MajorLabelVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iMajorLabelService.queryById(id));
-    }
-
-    /**
-     * 新增标签
-     */
-    @ApiOperation("新增标签")
-    @PreAuthorize("@ss.hasPermi('course:label:add')")
-    @Log(title = "标签", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody MajorLabelAddBo bo) {
-        return toAjax(iMajorLabelService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改标签
-     */
-    @ApiOperation("修改标签")
-    @PreAuthorize("@ss.hasPermi('course:label:edit')")
-    @Log(title = "标签", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody MajorLabelEditBo bo) {
-        return toAjax(iMajorLabelService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除关联标签
-     */
-    @ApiOperation("删除关联标签")
-    @PreAuthorize("@ss.hasPermi('course:label:edit')")
-    @Log(title = "删除关联标签", businessType = BusinessType.UPDATE)
-    @PostMapping("/editMajor")
-    public AjaxResult<Void> editMajor(@RequestBody MajorLabelEditBo bo) {
-        return toAjax(iMajorLabelService.editMajor(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除标签
-     */
-/*    @ApiOperation("删除标签")
-    @PreAuthorize("@ss.hasPermi('course:label:remove')")
-    @Log(title = "标签" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iMajorLabelService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }*/
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/TeacherController.java

@@ -1,90 +0,0 @@
-package com.zhongzheng.controller.course;
-
-import java.util.List;
-import java.util.Arrays;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.modules.course.vo.TeacherVo;
-import com.zhongzheng.modules.course.bo.TeacherQueryBo;
-import com.zhongzheng.modules.course.bo.TeacherAddBo;
-import com.zhongzheng.modules.course.bo.TeacherEditBo;
-import com.zhongzheng.modules.course.service.ITeacherService;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 名师Controller
- * 
- * @author ruoyi
- * @date 2021-11-29
- */
-@Api(value = "名师控制器", tags = {"名师管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/teacher")
-public class TeacherController extends BaseController {
-
-    private final ITeacherService iTeacherService;
-
-    /**
-     * 查询名师列表
-     */
-    @ApiOperation("查询名师列表")
-    @PreAuthorize("@ss.hasPermi('system:teacher:list')")
-    @GetMapping("/list")
-    public TableDataInfo<TeacherVo> list(TeacherQueryBo bo) {
-        startPage();
-        List<TeacherVo> list = iTeacherService.queryList(bo);
-        return getDataTable(list);
-    }
-
-
-    /**
-     * 获取名师详细信息
-     */
-    @ApiOperation("获取名师详细信息")
-    @PreAuthorize("@ss.hasPermi('system:teacher:query')")
-    @GetMapping("/{teacherId}")
-    public AjaxResult<TeacherVo> getInfo(@PathVariable("teacherId" ) Long teacherId) {
-        return AjaxResult.success(iTeacherService.queryById(teacherId));
-    }
-
-    /**
-     * 新增名师
-     */
-    @ApiOperation("新增名师")
-    @PreAuthorize("@ss.hasPermi('system:teacher:add')")
-    @Log(title = "名师", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody TeacherAddBo bo) {
-        return toAjax(iTeacherService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改名师
-     */
-    @ApiOperation("修改名师")
-    @PreAuthorize("@ss.hasPermi('system:teacher:edit')")
-    @Log(title = "名师", businessType = BusinessType.UPDATE)
-    @PostMapping("edit")
-    public AjaxResult<Void> edit(@RequestBody TeacherEditBo bo) {
-        return toAjax(iTeacherService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/CommonDistributionController.java

@@ -1,51 +0,0 @@
-package com.zhongzheng.controller.distribution;
-
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.framework.web.service.WxLoginService;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityPosterQueryBo;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityPosterService;
-import com.zhongzheng.modules.distribution.vo.SellerWxVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-
-/**
- * 商品Controller
- *
- * @author hjl
- * @date 2021-10-12
- */
-@Api(value = "游客商品管理", tags = {"游客商品管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/app/common/distribution")
-public class CommonDistributionController extends BaseController {
-
-    private final IDistributionActivityPosterService iDistributionActivityPosterService;
-
-    private final WxLoginService wxLoginService;
-
-    @ApiOperation("获取分享页面参数")
-    @PreAuthorize("@ss.hasPermi('system:poster:query')")
-    @GetMapping("/sharePoster")
-    public AjaxResult<Map<String,Object>> sharePoster(DistributionActivityPosterQueryBo bo) {
-
-        return AjaxResult.success("成功",iDistributionActivityPosterService.sharePoster(bo));
-    }
-
-    @ApiOperation("获取公众号openid")
-    @GetMapping("/gzh_openid")
-    public AjaxResult<SellerWxVo> gzh_openid(@RequestParam("code") String code) {
-        return AjaxResult.success("成功",wxLoginService.getGzhOpenId(code));
-    }
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityController.java

@@ -1,161 +0,0 @@
-package com.zhongzheng.controller.distribution;
-
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.utils.SecurityUtils;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.modules.distribution.bo.*;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityGoodsService;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityService;
-import com.zhongzheng.modules.distribution.vo.*;
-import com.zhongzheng.modules.distribution.bo.DistributionOrderQueryBo;
-import com.zhongzheng.modules.distribution.vo.DistributionOrderVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 【请填写功能名称】Controller
- *
- * @author ruoyi
- * @date 2023-03-06
- */
-@Api(value = "分销活动控制器", tags = {"分销活动管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/distribution/activity")
-public class DistributionActivityController extends BaseController {
-
-    private final IDistributionActivityService iDistributionActivityService;
-
-    private final IDistributionActivityGoodsService iDistributionActivityGoodsService;
-    /**
-     * 查询【请填写功能名称】列表
-     */
-    @ApiOperation("查询【请填写功能名称】列表")
-    @GetMapping("/list")
-    public TableDataInfo<DistributionActivityVo> list(DistributionActivityQueryBo bo) {
-        startPage();
-        List<DistributionActivityVo> list = iDistributionActivityService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出【请填写功能名称】列表
-     */
-    @ApiOperation("导出【请填写功能名称】列表")
-    @GetMapping("/export")
-    public AjaxResult<DistributionActivityVo> export(DistributionActivityQueryBo bo) {
-        List<DistributionActivityVo> list = iDistributionActivityService.queryList(bo);
-        ExcelUtil<DistributionActivityVo> util = new ExcelUtil<DistributionActivityVo>(DistributionActivityVo.class);
-        return util.exportExcel(list, "【请填写功能名称】");
-    }
-
-    /**
-     * 获取【请填写功能名称】详细信息
-     */
-    @ApiOperation("获取【请填写功能名称】详细信息")
-    @GetMapping("/{distributionId}")
-    public AjaxResult<DistributionActivityVo> getInfo(@PathVariable("distributionId" ) Long distributionId) {
-        return AjaxResult.success(iDistributionActivityService.queryById(distributionId));
-    }
-
-    /**
-     * 新增【请填写功能名称】
-     */
-    @ApiOperation("新增【请填写功能名称】")
-    @PostMapping("/save")
-    public AjaxResult<Void> add(@RequestBody DistributionActivityAddBo bo) {
-        bo.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(iDistributionActivityService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改【请填写功能名称】
-     */
-    @ApiOperation("修改【请填写功能名称】")
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody DistributionActivityEditBo bo) {
-        return toAjax(iDistributionActivityService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 启用/禁用分销活动
-     */
-    @ApiOperation("启用/禁用分销活动")
-    @PostMapping("/edit/status")
-    public AjaxResult<Void> editStatus(@RequestBody DistributionStatusEditBo bo) {
-        return toAjax(iDistributionActivityService.editStatus(bo) ? 1 : 0);
-    }
-
-    /**
-     * 拉取商品信息
-     */
-    @ApiOperation("拉取商品信息")
-    @GetMapping("/pull/goods/{distributionId}")
-    public AjaxResult<Void> pullGoods(@PathVariable("distributionId") Long distributionId) {
-        return toAjax(iDistributionActivityService.pullGoods(distributionId) ? 1 : 0);
-    }
-
-    /**
-     * 查询【请填写功能名称】列表
-     */
-    @ApiOperation("查询活动详情商品列表")
-    @GetMapping("/goodsList")
-    public TableDataInfo<DistributionActivityGoodsVo> getDetailGoodsList(DistributionActivityGoodsQueryBo bo) {
-        startPage();
-        List<DistributionActivityGoodsVo> list = iDistributionActivityGoodsService.getDetailGoodsList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 查询业务员分销排行榜
-     */
-    @ApiOperation("查询业务员分销排行榜")
-    @GetMapping("/seller/sort/notice")
-    public TableDataInfo<SellerSortNoticeVo> getSellerSortNotice(SellerSortNoticeQueryBo bo) {
-        startPage();
-        List<SellerSortNoticeVo> list = iDistributionActivityGoodsService.getSellerSortNotice(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 业务员所有分销订单
-     */
-    @ApiOperation("业务员所有分销订单")
-    @GetMapping("/seller/order")
-    public TableDataInfo<SellerOrderVo> getSellerOrder(SellerOrderQueryBo bo) {
-        startPage();
-        List<SellerOrderVo> list = iDistributionActivityService.getSellerOrder(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 佣金列表
-     */
-    @ApiOperation("佣金列表")
-    @GetMapping("/cash/list")
-    public TableDataInfo<DistributionCashVo> getCashList(DistributionCashQueryBo bo) {
-        startPage();
-        List<DistributionCashVo> list = iDistributionActivityService.getCashList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 分销订单列表
-     */
-    @ApiOperation("分销订单列表")
-    @GetMapping("/order/list")
-    public TableDataInfo<DistributionOrderVo> getOrderList(DistributionOrderQueryBo bo) {
-        startPage();
-        List<DistributionOrderVo> list = iDistributionActivityService.getOrderList(bo);
-        return getDataTable(list);
-    }
-
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityGoodsController.java

@@ -1,36 +0,0 @@
-package com.zhongzheng.controller.distribution;
-
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityGoodsAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityGoodsEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityGoodsQueryBo;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityGoodsService;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityGoodsVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 【请填写功能名称】Controller
- * 
- * @author ruoyi
- * @date 2023-03-06
- */
-@Api(value = "【请填写功能名称】控制器", tags = {"【请填写功能名称】管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/goods")
-public class DistributionActivityGoodsController extends BaseController {
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityPosterController.java

@@ -1,145 +0,0 @@
-package com.zhongzheng.controller.distribution;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.domain.model.LoginUser;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.framework.web.service.TokenService;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityPosterAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityPosterEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityPosterQueryBo;
-import com.zhongzheng.modules.distribution.domain.DistributionActivityImage;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityImageService;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityPosterService;
-import com.zhongzheng.modules.distribution.service.IDistributionSellerService;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityImageVo;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityPosterVo;
-import com.zhongzheng.modules.distribution.vo.DistributionSellerVo;
-import com.zhongzheng.modules.user.entity.ClientLoginSeller;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * 【请填写功能名称】Controller
- *
- * @author ruoyi
- * @date 2023-03-06
- */
-@Api(value = "分销活动海报控制器", tags = {"分销活动海报控制器管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/distribution/poster")
-public class DistributionActivityPosterController extends BaseController {
-
-    private final IDistributionActivityPosterService iDistributionActivityPosterService;
-
-    private final IDistributionActivityImageService iDistributionImageService;
-
-    private final TokenService tokenService;
-
-    private final IDistributionSellerService iDistributionSellerService;
-    /**
-     * 查询海报列表
-     */
-    @ApiOperation("查询海报列表")
-    @GetMapping("/list")
-    public TableDataInfo<DistributionActivityPosterVo> list(DistributionActivityPosterQueryBo bo) {
-        startPage();
-        List<DistributionActivityPosterVo> list = iDistributionActivityPosterService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 获取底图列表
-     */
-    @ApiOperation("获取海报底图列表")
-    @GetMapping("/image/list")
-    public AjaxResult<List<DistributionActivityImageVo>> list() {
-        List<DistributionActivityImage> imageList = iDistributionImageService.list(new LambdaQueryWrapper<DistributionActivityImage>().eq(DistributionActivityImage::getStatus,1));
-        List<DistributionActivityImageVo> voList = imageList.stream().map(item -> BeanUtil.toBean(item, DistributionActivityImageVo.class)).collect(Collectors.toList());
-        return AjaxResult.success(voList);
-    }
-
-    /**
-     * 导出【请填写功能名称】列表
-     */
-    @ApiOperation("导出【请填写功能名称】列表")
-    @GetMapping("/export")
-    public AjaxResult<DistributionActivityPosterVo> export(DistributionActivityPosterQueryBo bo) {
-        List<DistributionActivityPosterVo> list = iDistributionActivityPosterService.queryList(bo);
-        ExcelUtil<DistributionActivityPosterVo> util = new ExcelUtil<DistributionActivityPosterVo>(DistributionActivityPosterVo.class);
-        return util.exportExcel(list, "【请填写功能名称】");
-    }
-
-    /**
-     * 获取海报详细信息
-     */
-    @ApiOperation("获取海报详细信息")
-    @GetMapping("/{posterId}")
-    public AjaxResult<DistributionActivityPosterVo> getInfo(@PathVariable("posterId" ) Long posterId) {
-        return AjaxResult.success(iDistributionActivityPosterService.queryById(posterId));
-    }
-
-    /**
-     * 新增海报
-     */
-    @ApiOperation("新增海报")
-    @PostMapping("/save")
-    public AjaxResult<Void> add(@RequestBody DistributionActivityPosterAddBo bo) {
-        return toAjax(iDistributionActivityPosterService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改海报
-     */
-    @ApiOperation("修改海报")
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody DistributionActivityPosterEditBo bo) {
-        return toAjax(iDistributionActivityPosterService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 获取分销海报详细信息
-     */
-    @ApiOperation("生成业务员海报")
-    @PreAuthorize("@ss.hasPermi('system:poster:query')")
-    @GetMapping("/makePoster")
-    public AjaxResult<String> makePoster(DistributionActivityPosterQueryBo bo) {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setSellerId(loginUser.getUser().getSellerId());
-        return AjaxResult.success("成功",iDistributionActivityPosterService.makePoster(bo));
-    }
-
-    @ApiOperation("获取分享链条码")
-    @PreAuthorize("@ss.hasPermi('system:poster:query')")
-    @GetMapping("/linkCode")
-    public AjaxResult<Map<String,String>> linkCode(DistributionActivityPosterQueryBo bo) {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setSellerId(loginUser.getUser().getSellerId());
-        Map<String,String> map = new HashMap<>();
-        map.put("linkCode",iDistributionActivityPosterService.getLinkCode(bo));
-        DistributionSellerVo vo = iDistributionSellerService.queryById(loginUser.getUser().getSellerId());
-        map.put("shareCode",vo.getShareCode());
-        return AjaxResult.success("成功",map);
-    }
-
-
-    @ApiOperation("获取微信授权路径")
-    @GetMapping("/wxCodeUrl")
-    public AjaxResult<String> getWxCodeUrl() {
-        return AjaxResult.success("成功",iDistributionActivityPosterService.getWxCodeUrl());
-    }
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/DistributionAdminCashWithdrawalController.java

@@ -1,79 +0,0 @@
-package com.zhongzheng.controller.distribution;
-
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.domain.model.LoginUser;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.utils.SecurityUtils;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.framework.web.service.TokenService;
-import com.zhongzheng.modules.distribution.bo.DistributionCheckHandleBo;
-import com.zhongzheng.modules.distribution.bo.DistributionCheckQueryBo;
-import com.zhongzheng.modules.distribution.service.IDistributionCashWithdrawalService;
-import com.zhongzheng.modules.distribution.vo.DistributionCheckDetailVo;
-import com.zhongzheng.modules.distribution.vo.DistributionCheckVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 分销业务员提现申请Controller
- *
- * @author ruoyi
- * @date 2023-03-25
- */
-
-@Api(value = "分销业务员提现申请控制器", tags = {"分销业务员提现申请管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/distribution/check")
-
-public class DistributionAdminCashWithdrawalController extends BaseController {
-
-    private final IDistributionCashWithdrawalService iDistributionCashWithdrawalService;
-
-    private final TokenService tokenService;
-
-    /**
-     * 审核列表
-     */
-    @ApiOperation("审核列表")
-    @GetMapping("/list")
-    public TableDataInfo<DistributionCheckVo> list(DistributionCheckQueryBo bo) {
-        startPage();
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setAuditorId(loginUser.getUser().getUserId());
-        bo.setAuditor(SecurityUtils.getUsername());
-        List<DistributionCheckVo> list = iDistributionCashWithdrawalService.queryCheckList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 审核
-     */
-    @ApiOperation("审核")
-    @PostMapping("/handle")
-    public AjaxResult<Void> checkHandle(@RequestBody DistributionCheckHandleBo bo) {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setAuditorId(loginUser.getUser().getUserId());
-        bo.setAuditor(SecurityUtils.getUsername());
-        return toAjax(iDistributionCashWithdrawalService.checkHandle(bo)? 1 : 0);
-    }
-
-    /**
-     * 审核详情
-     */
-    @ApiOperation("审核详情")
-    @GetMapping("/detail/{id}")
-    public AjaxResult<List<DistributionCheckDetailVo>> checkDetail(@PathVariable("id") Long id) {
-        List<DistributionCheckDetailVo> detailVos = iDistributionCashWithdrawalService.checkDetail(id);
-        return AjaxResult.success(detailVos);
-    }
-
-
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/DistributionCashLogController.java

@@ -1,55 +0,0 @@
-package com.zhongzheng.controller.distribution;
-
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.model.LoginUser;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.framework.web.service.TokenService;
-import com.zhongzheng.modules.distribution.bo.DistributionCashLogQueryBo;
-import com.zhongzheng.modules.distribution.service.IDistributionCashLogService;
-import com.zhongzheng.modules.distribution.vo.DistributionCashLogVo;
-import com.zhongzheng.modules.user.entity.ClientLoginSeller;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 业务员金额操作日志Controller
- *
- * @author ruoyi
- * @date 2023-03-25
- */
-@Api(value = "业务员金额操作日志控制器", tags = {"业务员金额操作日志管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/distribution/cash/log")
-public class DistributionCashLogController extends BaseController {
-
-    private final IDistributionCashLogService iDistributionCashLogService;
-
-    private final TokenService tokenService;
-
-    /**
-     * 查询业务员金额操作日志列表
-     */
-    @ApiOperation("查询业务员佣金列表")
-    @PreAuthorize("@ss.hasPermi('system:log:list')")
-    @GetMapping("/fromOrderCashList")
-    public TableDataInfo<DistributionCashLogVo> fromOrderCashList(DistributionCashLogQueryBo bo) {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setSellerId(loginUser.getUser().getSellerId());
-        startPage();
-        List<DistributionCashLogVo> list = iDistributionCashLogService.fromOrderCashList(bo);
-        return getDataTable(list);
-    }
-
-
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/DistributionCashWithdrawalController.java

@@ -1,115 +0,0 @@
-package com.zhongzheng.controller.distribution;
-
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.domain.model.LoginUser;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.SecurityUtils;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.framework.web.service.TokenService;
-import com.zhongzheng.modules.distribution.bo.DistributionCashWithdrawalAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionCashWithdrawalEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionCashWithdrawalQueryBo;
-import com.zhongzheng.modules.distribution.bo.DistributionCheckQueryBo;
-import com.zhongzheng.modules.distribution.service.IDistributionCashWithdrawalService;
-import com.zhongzheng.modules.distribution.vo.DistributionCashWithdrawalVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 分销业务员提现申请Controller
- *
- * @author ruoyi
- * @date 2023-03-25
- */
-
-@Api(value = "分销业务员提现申请控制器", tags = {"分销业务员提现申请管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/distribution/withdrawal")
-public class DistributionCashWithdrawalController extends BaseController {
-
-    private final IDistributionCashWithdrawalService iDistributionCashWithdrawalService;
-
-    private final TokenService tokenService;
-
-    /**
-     * 查询分销业务员提现申请列表
-     */
-    @ApiOperation("查询分销业务员提现申请列表")
-    @PreAuthorize("@ss.hasPermi('system:withdrawal:list')")
-    @GetMapping("/list")
-    public TableDataInfo<DistributionCashWithdrawalVo> list(DistributionCashWithdrawalQueryBo bo) {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setSellerId(loginUser.getUser().getSellerId());
-        startPage();
-        List<DistributionCashWithdrawalVo> list = iDistributionCashWithdrawalService.queryList(bo);
-        return getDataTable(list);
-    }
-
-
-    /**
-     * 获取分销业务员提现申请详细信息
-     */
-    @ApiOperation("获取分销业务员提现申请详细信息")
-    @PreAuthorize("@ss.hasPermi('system:withdrawal:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<DistributionCashWithdrawalVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iDistributionCashWithdrawalService.queryById(id));
-    }
-
-    /**
-     * 新增分销业务员提现申请
-     */
-    @ApiOperation("新增分销业务员提现申请")
-    @PreAuthorize("@ss.hasPermi('system:withdrawal:add')")
-    @Log(title = "分销业务员提现申请", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody DistributionCashWithdrawalAddBo bo) {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setSellerId(loginUser.getUser().getSellerId());
-        return toAjax(iDistributionCashWithdrawalService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    @ApiOperation("打款")
-    @PreAuthorize("@ss.hasPermi('system:withdrawal:add')")
-    @Log(title = "打款", businessType = BusinessType.INSERT)
-    @PostMapping("/payCash")
-    public AjaxResult<Void> payCash(@RequestBody DistributionCheckQueryBo bo) {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setAuditorId(loginUser.getUser().getUserId());
-        bo.setAuditor(SecurityUtils.getUsername());
-        return toAjax(iDistributionCashWithdrawalService.payCash(bo) ? 1 : 0);
-    }
-
-    @ApiOperation("重新发起打款")
-    @PreAuthorize("@ss.hasPermi('system:withdrawal:add')")
-    @Log(title = "打款", businessType = BusinessType.INSERT)
-    @PostMapping("/rePayCash")
-    public AjaxResult<Void> rePayCash(@RequestBody DistributionCheckQueryBo bo) {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setAuditorId(loginUser.getUser().getUserId());
-        bo.setAuditor(SecurityUtils.getUsername());
-        return toAjax(iDistributionCashWithdrawalService.rePayCash(bo) ? 1 : 0);
-    }
-
-    @ApiOperation("取消打款申请")
-    @PreAuthorize("@ss.hasPermi('system:withdrawal:add')")
-    @Log(title = "取消打款申请", businessType = BusinessType.INSERT)
-    @PostMapping("/cancelApply")
-    public AjaxResult<Void> cancelApply(@RequestBody DistributionCashWithdrawalEditBo bo) {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setSellerId(loginUser.getUser().getSellerId());
-        return toAjax(iDistributionCashWithdrawalService.cancelApply(bo) ? 1 : 0);
-    }
-
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/DistributionLinkController.java

@@ -1,57 +0,0 @@
-package com.zhongzheng.controller.distribution;
-
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.domain.model.LoginUser;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.framework.web.service.TokenService;
-import com.zhongzheng.modules.distribution.bo.DistributionLinkAddBo;
-import com.zhongzheng.modules.distribution.service.IDistributionLinkService;
-import com.zhongzheng.modules.goods.service.impl.GoodsServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 分销链路Controller
- *
- * @author ruoyi
- * @date 2023-03-23
- */
-@Api(value = "分销链路控制器", tags = {"分销链路管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/link")
-public class DistributionLinkController extends BaseController {
-
-    private final IDistributionLinkService iDistributionLinkService;
-
-    private final TokenService tokenService;
-    /**
-     * 新增分销链路
-     */
-    @ApiOperation("绑定分销链路")
-    @PreAuthorize("@ss.hasPermi('system:link:add')")
-    @Log(title = "分销链路", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody DistributionLinkAddBo bo) {
-
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setSellerId(loginUser.getUser().getSellerId());
-        return toAjax(iDistributionLinkService.bindLink(bo) ? 1 : 0);
-    }
-
-
-
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/DistributionSellerController.java

@@ -1,177 +0,0 @@
-package com.zhongzheng.controller.distribution;
-
-import cn.hutool.core.lang.Validator;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.domain.model.LoginUser;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.framework.web.service.TokenService;
-import com.zhongzheng.framework.web.service.WxLoginService;
-import com.zhongzheng.modules.distribution.bo.DistributionSellerAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionSellerEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionSellerQueryBo;
-import com.zhongzheng.modules.distribution.bo.SellerOrderQueryBo;
-import com.zhongzheng.modules.distribution.service.IDistributionSellerService;
-import com.zhongzheng.modules.distribution.vo.DistributionSellerVo;
-import com.zhongzheng.modules.distribution.vo.SellerOrderVo;
-import com.zhongzheng.modules.wx.bo.WxLoginBody;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 分销业务员Controller
- *
- * @author hjl
- * @date 2023-03-13
- */
-@Api(value = "分销业务员控制器", tags = {"分销业务员管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/distribution/seller")
-public class DistributionSellerController extends BaseController {
-
-    private final IDistributionSellerService iDistributionSellerService;
-
-    private final TokenService tokenService;
-
-    private final WxLoginService wxLoginService;
-
-    /**
-     * 查询分销业务员列表
-     */
-    @ApiOperation("查询分销业务员列表")
-    @PreAuthorize("@ss.hasPermi('system:seller:list')")
-    @GetMapping("/list")
-    public TableDataInfo<DistributionSellerVo> list(DistributionSellerQueryBo bo) {
-        startPage();
-        List<DistributionSellerVo> list = iDistributionSellerService.findList(bo);
-        return getDataTable(list);
-    }
-
-
-    /**
-     * 获取分销业务员详细信息
-     */
-    @ApiOperation("获取分销业务员详细信息")
-    @PreAuthorize("@ss.hasPermi('system:seller:query')")
-    @GetMapping("/{salerId}")
-    public AjaxResult<DistributionSellerVo> getInfo(@PathVariable("salerId" ) Long salerId) {
-        return AjaxResult.success(iDistributionSellerService.findDetail(salerId));
-    }
-
-    /**
-     * 新增分销业务员
-     */
-    @ApiOperation("新增分销业务员")
-    @PreAuthorize("@ss.hasPermi('system:seller:add')")
-    @Log(title = "分销业务员", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody DistributionSellerAddBo bo) {
-        return toAjax(iDistributionSellerService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改分销业务员
-     */
-    @ApiOperation("修改分销业务员")
-    @PreAuthorize("@ss.hasPermi('system:seller:edit')")
-    @Log(title = "分销业务员", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody DistributionSellerEditBo bo) {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setSysUserId(loginUser.getUser().getUserId());
-        return toAjax(iDistributionSellerService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 管理员修改分销业务员
-     */
-    @ApiOperation("管理员修改分销业务员")
-    @PreAuthorize("@ss.hasPermi('system:seller:edit')")
-    @Log(title = "分销业务员", businessType = BusinessType.UPDATE)
-    @PostMapping("/sysEdit")
-    public AjaxResult<Void> sysEdit(@RequestBody DistributionSellerEditBo bo) {
-        return toAjax(iDistributionSellerService.updateBySysEditBo(bo) ? 1 : 0);
-    }
-
-
-    /**
-     * 新增分销业务员
-     */
-    @ApiOperation("批量新增关联分销业务员")
-    @PreAuthorize("@ss.hasPermi('system:seller:add')")
-    @Log(title = "分销业务员", businessType = BusinessType.INSERT)
-    @PostMapping("/batchAdd")
-    public AjaxResult<Void> batchAdd(@RequestBody DistributionSellerAddBo bo) {
-        return toAjax(iDistributionSellerService.insertBatchByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 获取用户信息
-     *
-     * @return 用户信息
-     */
-    @ApiOperation("登录业务员用户信息")
-    @GetMapping("getInfo")
-    public AjaxResult<DistributionSellerVo> getInfo()
-    {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        DistributionSellerVo vo = iDistributionSellerService.findDetail(loginUser.getUser().getSellerId());
-        if(Validator.isEmpty(vo)){
-            throw new CustomException("非法用户");
-        }
-        vo.setSelfNull();
-        return AjaxResult.success(vo);
-    }
-
-    @ApiOperation("业务员检查是否绑定公众号")
-    @GetMapping("/checkBindGzh")
-    public AjaxResult<String> checkBindGzh()
-    {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        DistributionSellerVo vo = iDistributionSellerService.queryById(loginUser.getUser().getSellerId());
-        return AjaxResult.success("成功",vo.getGzhOpenId());
-    }
-
-    @ApiOperation("提现前绑定公众号openid")
-    @PostMapping("/gzh_bind")
-    public AjaxResult gzh_bind(@RequestBody WxLoginBody loginBody)
-    {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        loginBody.setSellerId(loginUser.getUser().getSellerId());
-        if(Validator.isNotEmpty(loginBody.getGzhOpenid())){
-            wxLoginService.bindWxGzhOpenIdSeller(loginBody);
-        }
-        else if(Validator.isNotEmpty(loginBody.getCode())){
-            wxLoginService.bindWxGzhUnionIdSeller(loginBody);
-        }
-        return AjaxResult.success();
-    }
-
-    @ApiOperation("业务员佣金")
-    @GetMapping("/cash/list")
-    public TableDataInfo<SellerOrderVo> getCashList(SellerOrderQueryBo bo) {
-        startPage();
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setSellerId(loginUser.getUser().getSellerId());
-        List<SellerOrderVo> list = iDistributionSellerService.getCashList(bo);
-        return getDataTable(list);
-    }
-
-    @ApiOperation("业务员佣金详情")
-    @GetMapping("/cash/detail/{id}")
-    public AjaxResult<SellerOrderVo> getCashDetail(@PathVariable("id") Long id) {
-        return AjaxResult.success(iDistributionSellerService.getCashDetail(id));
-    }
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/SellerLoginController.java

@@ -1,81 +0,0 @@
-package com.zhongzheng.controller.distribution;
-
-import com.zhongzheng.common.constant.Constants;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.modules.distribution.bo.SellerAppAccountLoginBo;
-import com.zhongzheng.modules.distribution.bo.SellerAppOpenidLoginBo;
-import com.zhongzheng.modules.distribution.bo.SellerAppRegisterBo;
-import com.zhongzheng.modules.distribution.service.IDistributionSellerService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 客户端用户Controller
- *
- * @author hjl
- * @date 2021-06-08
- */
-@Api(value = "业务员登录控制器", tags = {"业务员登录控制器"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/app/common/seller")
-public class SellerLoginController extends BaseController {
-
-    private final IDistributionSellerService iDistributionSellerService;
-
-
-    /**
-     * 用户注册
-     */
-    @ApiOperation("业务员客户端注册")
-    @PostMapping("/register")
-    public AjaxResult<Void> register(@RequestBody SellerAppRegisterBo bo) {
-        return toAjax(iDistributionSellerService.registerSeller(bo) ? 1 : 0);
-    }
-
-    @ApiOperation("业务员忘记密码")
-    @PostMapping("/register_forget")
-    public AjaxResult<Void> register_forget(@RequestBody SellerAppRegisterBo bo) {
-        return toAjax(iDistributionSellerService.forgetUser(bo) ? 1 : 0);
-    }
-
-    @ApiOperation("业务员短信登录")
-    @PostMapping("/sms_login")
-    public AjaxResult sms_login(@RequestBody SellerAppAccountLoginBo bo) {
-        Map<String,Object> map = iDistributionSellerService.smsLogin(bo);
-        return AjaxResult.success(map);
-    }
-
-    @ApiOperation("业务员账号登录")
-    @PostMapping("/account_login")
-    public AjaxResult account_login(@RequestBody SellerAppAccountLoginBo bo) {
-        Map<String,Object> map = iDistributionSellerService.accountLogin(bo);
-        return AjaxResult.success(map);
-    }
-
-    @ApiOperation("业务员openid登录")
-    @PostMapping("/openid_login")
-    public AjaxResult openid_login(@RequestBody SellerAppOpenidLoginBo bo) {
-        Map<String,Object> map = iDistributionSellerService.openidLogin(bo);
-        return AjaxResult.success(map);
-    }
-
-    @ApiOperation("刷新业务员登录令牌")
-    @GetMapping("/refreshToken/{userAccount}")
-    public AjaxResult refreshToken(@PathVariable("userAccount") String userAccount)
-    {
-        String token = iDistributionSellerService.refreshSellerToken(userAccount);
-        Map<String,Object> map = new HashMap<>();
-        map.put(Constants.TOKEN, token);
-        return AjaxResult.success(map);
-    }
-
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/SellerSmsController.java

@@ -1,54 +0,0 @@
-package com.zhongzheng.controller.distribution;
-
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.modules.alisms.bo.SmsAddBo;
-import com.zhongzheng.modules.alisms.service.IAliSmsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 客户端用户Controller
- *
- * @author hjl
- * @date 2021-06-08
- */
-@Api(value = "短信控制器", tags = {"短信控制器"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/app/common/seller/sms")
-public class SellerSmsController extends BaseController {
-
-    private final IAliSmsService iSmsService;
-
-
-    @ApiOperation("获取业务员注册短信")
-    @PostMapping("/register")
-    public AjaxResult register(@RequestBody SmsAddBo bo) {
-        iSmsService.sendSellerRegisterSms(bo.getTel());
-        return AjaxResult.success();
-    }
-
-
-    @ApiOperation("获取业务员登录短信")
-    @PostMapping("/login")
-    public AjaxResult login(@RequestBody SmsAddBo bo) {
-        iSmsService.sendSellerLoginSms(bo.getTel());
-        return AjaxResult.success();
-    }
-
-    @ApiOperation("获取业务员忘记短信")
-    @PostMapping("/forget")
-    public AjaxResult forget(@RequestBody SmsAddBo bo) {
-        iSmsService.sendSellerForgetSms(bo.getTel());
-        return AjaxResult.success();
-    }
-
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/exam/ExamActivityController.java

@@ -1,111 +0,0 @@
-package com.zhongzheng.controller.exam;
-
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.modules.exam.bo.*;
-import com.zhongzheng.modules.exam.service.*;
-import com.zhongzheng.modules.exam.vo.*;
-import com.zhongzheng.modules.goods.vo.ExportLiveGoodsVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 考试活动Controller
- *
- * @author ruoyi
- * @date 2021-12-07
- */
-@Api(value = "考试活动控制器", tags = {"考试活动管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/exam/activity")
-public class ExamActivityController extends BaseController {
-
-    private final IExamActivityService iExamActivityService;
-    private final IExamActivityGoodsService iExamActivityGoodsService;
-
-    /**
-     * 新增活动
-     */
-    @ApiOperation("新增新增活动")
-    @PostMapping("/add")
-    public AjaxResult<Void> add(@RequestBody ExamActivityAddBo bo) {
-        return toAjax(iExamActivityService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 获取活动列表
-     */
-    @ApiOperation("获取活动列表")
-    @GetMapping("/list")
-    public TableDataInfo<ExamActivityVo> getActivityList(ExamActivityQueryBo bo) {
-        startPage();
-        List<ExamActivityVo> list = iExamActivityService.getActivityList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 修改活动
-     */
-    @ApiOperation("修改活动")
-    @PostMapping("/update")
-    public AjaxResult<Void> update(@RequestBody ExamActivityUpdateBo bo) {
-        return toAjax(iExamActivityService.updateByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 获取活动用户列表
-     */
-    @ApiOperation("获取活动用户列表")
-    @GetMapping("/user/list/{activityId}")
-    public TableDataInfo<ExamActivityUserVo> getActivityUserList(@PathVariable("activityId" ) Long activityId) {
-        startPage();
-        List<ExamActivityUserVo> list = iExamActivityService.getActivityUserList(activityId);
-        return getDataTable(list);
-    }
-
-    /**
-     * 获取活动报名二维码
-     */
-    @ApiOperation("获取活动报名二维码")
-    @GetMapping("/apply/code/{activityId}")
-    public AjaxResult<String> getActivityApplyCode(@PathVariable("activityId" ) Long activityId) {
-        String result = iExamActivityService.getActivityApplyCode(activityId);
-        return AjaxResult.success("成功",result);
-    }
-
-    /**
-     * 导出活动用户
-     */
-    @ApiOperation("导出活动用户")
-    @GetMapping("/export/{activityId}")
-    public AjaxResult<ExamActivityUserVo> exportActivityUserList(@PathVariable("activityId" ) Long activityId) {
-        List<ExamActivityUserVo> list = iExamActivityService.getActivityUserList(activityId);
-        list.forEach(item -> {
-            item.setUserSexStr(ObjectUtils.isNotNull(item.getUserSex()) && item.getUserSex() == 2?"女":"男");
-        });
-        ExcelUtil<ExamActivityUserVo> util = new ExcelUtil<>(ExamActivityUserVo.class);
-        return util.exportExcel(list,"模考活动用户");
-    }
-
-    /**
-     * 新增活动商品
-     */
-    @ApiOperation("新增活动商品")
-    @PostMapping("/add/goodsList")
-    public AjaxResult<Void> addActivityGoods(@RequestBody List<ExamActivityGoodsAddBo> goodsList) {
-        return toAjax(iExamActivityGoodsService.addActivityGoods(goodsList) ? 1 : 0);
-    }
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/exam/ExamApplyController.java

@@ -1,188 +0,0 @@
-package com.zhongzheng.controller.exam;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.exam.bo.*;
-import com.zhongzheng.modules.exam.service.IExamApplyGoodsService;
-import com.zhongzheng.modules.exam.service.IExamApplySiteService;
-import com.zhongzheng.modules.exam.service.IExamApplyUserService;
-import com.zhongzheng.modules.exam.vo.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.modules.exam.service.IExamApplyService;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 考试安排Controller
- *
- * @author ruoyi
- * @date 2021-12-07
- */
-@Api(value = "考试安排控制器", tags = {"考试安排管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/apply")
-public class ExamApplyController extends BaseController {
-
-    private final IExamApplyService iExamApplyService;
-
-    private final IExamApplySiteService iExamApplySiteService;
-
-    private final IExamApplyGoodsService iExamApplyGoodsService;
-
-    private final IExamApplyUserService iExamApplyUserService;
-
-    /**
-     * 查询考试安排列表
-     */
-    @ApiOperation("查询考试安排列表")
-    @PreAuthorize("@ss.hasPermi('system:apply:list')")
-    @GetMapping("/list")
-    public TableDataInfo<ExamApplyVo> list(ExamApplyQueryBo bo) {
-        startPage();
-        List<ExamApplyVo> list = iExamApplyService.queryList(bo);
-        return getDataTable(list);
-    }
-
-
-    /**
-     * 获取考试安排详细信息
-     */
-    @ApiOperation("获取考试安排详细信息")
-    @PreAuthorize("@ss.hasPermi('system:apply:query')")
-    @GetMapping("/{applyId}")
-    public AjaxResult<ExamApplyVo> getInfo(@PathVariable("applyId" ) Long applyId) {
-        return AjaxResult.success(iExamApplyService.queryById(applyId));
-    }
-
-    /**
-     * 获取考试地点 考培地点
-     */
-    @ApiOperation("获取考试地点 考培地点")
-    @PreAuthorize("@ss.hasPermi('system:apply:query')")
-    @GetMapping("/siteInfo")
-    public TableDataInfo<ExamApplySiteVo> getSiteInfo(ExamApplyQueryBo bo) {
-        List<ExamApplySiteVo> examApplySiteVo = iExamApplyService.getSiteInfo(bo);
-        return getDataTable(examApplySiteVo);
-    }
-
-    /**
-     * 新增考试安排
-     */
-    @ApiOperation("新增考试安排")
-    @PreAuthorize("@ss.hasPermi('system:apply:add')")
-    @Log(title = "考试安排", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody ExamApplyAddBo bo) {
-        return toAjax(iExamApplyService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改考试安排
-     */
-    @ApiOperation("修改考试安排")
-    @PreAuthorize("@ss.hasPermi('system:apply:edit')")
-    @Log(title = "考试安排", businessType = BusinessType.UPDATE)
-    @PostMapping("edit")
-    public AjaxResult<Void> edit(@RequestBody ExamApplyEditBo bo) {
-        return toAjax(iExamApplyService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 新增考试安排地点
-     */
-    @ApiOperation("新增考试安排地点")
-    @PreAuthorize("@ss.hasPermi('system:site:add')")
-    @Log(title = "考试安排地点", businessType = BusinessType.INSERT)
-    @PostMapping("addSite")
-    public AjaxResult<Void> addSite(@RequestBody List<ExamApplySiteAddBo> bo) {
-        return toAjax(iExamApplySiteService.addSite(bo) ? 1 : 0);
-    }
-
-
-    /**
-     * 新增考试安排绑定商品
-     */
-    @ApiOperation("新增考试安排绑定商品")
-    @PreAuthorize("@ss.hasPermi('system:goods:add')")
-    @Log(title = "考试安排绑定商品", businessType = BusinessType.INSERT)
-    @PostMapping("addGoods")
-    public AjaxResult<Void> addGoods(@RequestBody ExamApplyGoodsAddBo bo) {
-        return toAjax(iExamApplyGoodsService.addGoods(bo) ? 1 : 0);
-    }
-
-    /**
-     * 获取考试地点 考培地点
-     */
-    @ApiOperation("查看考试安排绑定商品")
-    @PreAuthorize("@ss.hasPermi('system:apply:query')")
-    @GetMapping("/goodsInfo")
-    public AjaxResult<ExamApplyVo> getGoodsInfo(ExamApplyQueryBo bo) {
-        ExamApplyVo examApplyVos = iExamApplyService.getGoodsInfo(bo);
-        return  AjaxResult.success(examApplyVos);
-    }
-
-
-    /**
-     * 查看考试安排被预约数量
-     */
-    @ApiOperation("查看考试安排被预约数量")
-    @PreAuthorize("@ss.hasPermi('system:apply:query')")
-    @GetMapping("/countApplySubscribe")
-    public AjaxResult<Integer> countApplySubscribe(ExamApplyQueryBo bo) {
-        Integer subNum = iExamApplyService.countApplySubscribe(bo);
-        return  AjaxResult.success(subNum);
-    }
-
-    /**
-     * 查询考试配置绑定商品列表
-     */
-    @ApiOperation("查询考试安排商品列表")
-    @PreAuthorize("@ss.hasPermi('system:goods:list')")
-    @GetMapping("/listGoods")
-    public TableDataInfo<ExamNumberGoodsVo> listGoods(ExamNumberGoodsQueryBo bo) {
-        startPage();
-        List<ExamNumberGoodsVo> list = iExamApplyService.listGoods(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 查询考试配置绑定用户列表
-     */
-    @ApiOperation("查询考试配置绑定用户列表")
-    @PreAuthorize("@ss.hasPermi('system:goods:list')")
-    @GetMapping("/listUser")
-    public TableDataInfo<ExamApplyUserVo> listUser(ExamApplyUserQueryBo bo) {
-        startPage();
-        List<ExamApplyUserVo> list = iExamApplyUserService.listUser(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 获取考试关联的前培安排
-     */
-    @ApiOperation("获取考试关联的前培安排")
-    @GetMapping("/getBefore/{applyId}")
-    public AjaxResult<ExamBeforeVo> getBeforeByApplyId(@PathVariable("applyId" ) Long applyId) {
-        ExamBeforeVo vo = iExamApplyUserService.getBeforeByApplyId(applyId);
-        return AjaxResult.success(vo);
-    }
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/exam/ExamBeforeApplyController.java

@@ -1,71 +0,0 @@
-package com.zhongzheng.controller.exam;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.exam.bo.ExamBeforeApplyAddBo;
-import com.zhongzheng.modules.exam.bo.ExamBeforeApplyQueryBo;
-import com.zhongzheng.modules.exam.service.IExamBeforeApplyService;
-import com.zhongzheng.modules.exam.vo.ExamBeforeApplyVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 前培绑定考试计划Controller
- *
- * @author hjl
- * @date 2022-05-19
- */
-@Api(value = "前培绑定考试计划控制器", tags = {"前培绑定考试计划管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/exam/apply")
-public class ExamBeforeApplyController extends BaseController {
-
-    private final IExamBeforeApplyService iExamBeforeApplyService;
-
-    /**
-     * 查询前培绑定考试计划列表
-     */
-    @ApiOperation("查询前培绑定考试计划列表")
-    @PreAuthorize("@ss.hasPermi('system:apply:list')")
-    @GetMapping("/list")
-    public TableDataInfo<ExamBeforeApplyVo> list(ExamBeforeApplyQueryBo bo) {
-        startPage();
-        List<ExamBeforeApplyVo> list = iExamBeforeApplyService.getList(bo);
-        return getDataTable(list);
-    }
-
-
-
-    /**
-     * 新增前培绑定考试计划
-     */
-    @ApiOperation("批量新增前培绑定考试计划")
-    @PreAuthorize("@ss.hasPermi('system:apply:add')")
-    @Log(title = "前培绑定考试计划", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody ExamBeforeApplyAddBo bo) {
-        return toAjax(iExamBeforeApplyService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/exam/ExamBeforeController.java

@@ -1,142 +0,0 @@
-package com.zhongzheng.controller.exam;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.exam.bo.*;
-import com.zhongzheng.modules.exam.service.IExamBeforeGoodsService;
-import com.zhongzheng.modules.exam.service.IExamBeforeUrlService;
-import com.zhongzheng.modules.exam.vo.ExamApplyVo;
-import com.zhongzheng.modules.exam.vo.ExamBeforeUrlVo;
-import com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.modules.exam.vo.ExamBeforeVo;
-import com.zhongzheng.modules.exam.service.IExamBeforeService;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 前培安排Controller
- * 
- * @author ruoyi
- * @date 2021-12-07
- */
-@Api(value = "前培安排控制器", tags = {"前培安排管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/before")
-public class ExamBeforeController extends BaseController {
-
-    private final IExamBeforeService iExamBeforeService;
-    private final IExamBeforeUrlService iExamBeforeUrlService;
-    private final IExamBeforeGoodsService iExamBeforeGoodsService;
-
-    /**
-     * 查询前培安排列表
-     */
-    @ApiOperation("查询前培安排列表")
-    @PreAuthorize("@ss.hasPermi('system:before:list')")
-    @GetMapping("/list")
-    public TableDataInfo<ExamBeforeVo> list(ExamBeforeQueryBo bo) {
-        startPage();
-        List<ExamBeforeVo> list = iExamBeforeService.queryList(bo);
-        return getDataTable(list);
-    }
-
-
-    /**
-     * 获取前培安排详细信息
-     */
-    @ApiOperation("获取前培安排详细信息")
-    @PreAuthorize("@ss.hasPermi('system:before:query')")
-    @GetMapping("/{beforeId}")
-    public AjaxResult<ExamBeforeVo> getInfo(@PathVariable("beforeId" ) Long beforeId) {
-        return AjaxResult.success(iExamBeforeService.queryById(beforeId));
-    }
-
-    /**
-     * 新增前培安排
-     */
-    @ApiOperation("新增前培安排")
-    @PreAuthorize("@ss.hasPermi('system:before:add')")
-    @Log(title = "前培安排", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody ExamBeforeAddBo bo) {
-        return toAjax(iExamBeforeService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改前培安排
-     */
-    @ApiOperation("修改前培安排")
-    @PreAuthorize("@ss.hasPermi('system:before:edit')")
-    @Log(title = "前培安排", businessType = BusinessType.UPDATE)
-    @PostMapping("edit")
-    public AjaxResult<Void> edit(@RequestBody ExamBeforeEditBo bo) {
-        return toAjax(iExamBeforeService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 查询前培url列表
-     */
-    @ApiOperation("查询前培url列表")
-    @PreAuthorize("@ss.hasPermi('system:url:list')")
-    @GetMapping("/listUrl")
-    public TableDataInfo<ExamBeforeUrlVo> list(ExamBeforeUrlQueryBo bo) {
-        startPage();
-        List<ExamBeforeUrlVo> list = iExamBeforeUrlService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 查询考试配置绑定商品列表
-     */
-    @ApiOperation("查询前培商品列表")
-    @PreAuthorize("@ss.hasPermi('system:goods:list')")
-    @GetMapping("/listGoods")
-    public TableDataInfo<ExamNumberGoodsVo> listGoods(ExamNumberGoodsQueryBo bo) {
-        startPage();
-        List<ExamNumberGoodsVo> list = iExamBeforeService.listGoods(bo);
-        return getDataTable(list);
-    }
-
-
-    /**
-     * 新增前培绑定商品
-     */
-    @ApiOperation("新增前培绑定商品")
-    @PreAuthorize("@ss.hasPermi('system:goods:add')")
-    @Log(title = "前培绑定商品", businessType = BusinessType.INSERT)
-    @PostMapping("addGoods")
-    public AjaxResult<Void> addGoods(@RequestBody ExamBeforeGoodsAddBo bo) {
-        return toAjax(iExamBeforeGoodsService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 获取考试地点 考培地点
-     */
-    @ApiOperation("查看前陪绑定商品")
-    @PreAuthorize("@ss.hasPermi('system:apply:query')")
-    @GetMapping("/goodsInfo")
-    public AjaxResult<ExamBeforeVo> getGoodsInfo(ExamBeforeQueryBo bo) {
-        ExamBeforeVo examBeforeVo = iExamBeforeService.getGoodsInfo(bo);
-        return  AjaxResult.success(examBeforeVo);
-    }
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/exam/ExamKnowledgeController.java

@@ -1,114 +0,0 @@
-package com.zhongzheng.controller.exam;
-
-import java.util.List;
-import java.util.Arrays;
-
-import cn.hutool.http.HttpStatus;
-import com.github.pagehelper.PageInfo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.modules.exam.vo.ExamKnowledgeVo;
-import com.zhongzheng.modules.exam.bo.ExamKnowledgeQueryBo;
-import com.zhongzheng.modules.exam.bo.ExamKnowledgeAddBo;
-import com.zhongzheng.modules.exam.bo.ExamKnowledgeEditBo;
-import com.zhongzheng.modules.exam.service.IExamKnowledgeService;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 知识点Controller
- * 
- * @author ruoyi
- * @date 2021-10-18
- */
-@Api(value = "知识点控制器", tags = {"知识点管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/exam/knowledge")
-public class ExamKnowledgeController extends BaseController {
-
-    private final IExamKnowledgeService iExamKnowledgeService;
-
-    /**
-     * 查询知识点列表
-     */
-    @ApiOperation("查询知识点列表")
-    @PreAuthorize("@ss.hasPermi('exam:knowledge:list')")
-    @GetMapping("/list")
-    public TableDataInfo<ExamKnowledgeVo> list(ExamKnowledgeQueryBo bo) {
-        startPage();
-        List<ExamKnowledgeVo> list = iExamKnowledgeService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出知识点列表
-     */
-/*    @ApiOperation("导出知识点列表")
-    @PreAuthorize("@ss.hasPermi('exam:knowledge:export')")
-    @Log(title = "知识点", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<ExamKnowledgeVo> export(ExamKnowledgeQueryBo bo) {
-        List<ExamKnowledgeVo> list = iExamKnowledgeService.queryList(bo);
-        ExcelUtil<ExamKnowledgeVo> util = new ExcelUtil<ExamKnowledgeVo>(ExamKnowledgeVo.class);
-        return util.exportExcel(list, "知识点");
-    }*/
-
-    /**
-     * 获取知识点详细信息
-     */
-    @ApiOperation("获取知识点详细信息")
-    @PreAuthorize("@ss.hasPermi('exam:knowledge:query')")
-    @GetMapping("/{knowledgeId}")
-    public AjaxResult<ExamKnowledgeVo> getInfo(@PathVariable("knowledgeId" ) Long knowledgeId) {
-        return AjaxResult.success(iExamKnowledgeService.queryById(knowledgeId));
-    }
-
-    /**
-     * 新增知识点
-     */
-    @ApiOperation("新增知识点")
-    @PreAuthorize("@ss.hasPermi('exam:knowledge:add')")
-    @Log(title = "知识点", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody ExamKnowledgeAddBo bo) {
-        return toAjax(iExamKnowledgeService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改知识点
-     */
-    @ApiOperation("修改知识点")
-    @PreAuthorize("@ss.hasPermi('exam:knowledge:edit')")
-    @Log(title = "知识点", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody ExamKnowledgeEditBo bo) {
-        return toAjax(iExamKnowledgeService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除知识点
-     */
-/*    @ApiOperation("删除知识点")
-    @PreAuthorize("@ss.hasPermi('exam:knowledge:remove')")
-    @Log(title = "知识点" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{knowledgeIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] knowledgeIds) {
-        return toAjax(iExamKnowledgeService.deleteWithValidByIds(Arrays.asList(knowledgeIds), true) ? 1 : 0);
-    }*/
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/exam/ExamNumberController.java

@@ -1,106 +0,0 @@
-package com.zhongzheng.controller.exam;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.exam.bo.ExamNumberGoodsQueryBo;
-import com.zhongzheng.modules.exam.service.IExamNumberGoodsService;
-import com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.modules.exam.vo.ExamNumberVo;
-import com.zhongzheng.modules.exam.bo.ExamNumberQueryBo;
-import com.zhongzheng.modules.exam.bo.ExamNumberAddBo;
-import com.zhongzheng.modules.exam.bo.ExamNumberEditBo;
-import com.zhongzheng.modules.exam.service.IExamNumberService;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 考试次数配置Controller
- * 
- * @author ruoyi
- * @date 2021-12-06
- */
-@Api(value = "考试次数配置控制器", tags = {"考试次数配置管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/number")
-public class ExamNumberController extends BaseController {
-
-    private final IExamNumberService iExamNumberService;
-    private final IExamNumberGoodsService iExamNumberGoodsService;
-
-    /**
-     * 查询考试次数配置列表
-     */
-    @ApiOperation("查询考试次数配置列表")
-    @PreAuthorize("@ss.hasPermi('system:number:list')")
-    @GetMapping("/list")
-    public TableDataInfo<ExamNumberVo> list(ExamNumberQueryBo bo) {
-        startPage();
-        List<ExamNumberVo> list = iExamNumberService.ListExamNumber(bo);
-        return getDataTable(list);
-    }
-
-
-    /**
-     * 获取考试次数配置详细信息
-     */
-    @ApiOperation("获取考试次数配置详细信息")
-    @PreAuthorize("@ss.hasPermi('system:number:query')")
-    @GetMapping("/{examNumberId}")
-    public AjaxResult<ExamNumberVo> getInfo(@PathVariable("examNumberId" ) Long examNumberId) {
-        return AjaxResult.success(iExamNumberService.queryById(examNumberId));
-    }
-
-    /**
-     * 新增考试次数配置
-     */
-    @ApiOperation("新增考试次数配置")
-    @PreAuthorize("@ss.hasPermi('system:number:add')")
-    @Log(title = "考试次数配置", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody ExamNumberAddBo bo) {
-        return toAjax(iExamNumberService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改考试次数配置
-     */
-    @ApiOperation("修改考试次数配置")
-    @PreAuthorize("@ss.hasPermi('system:number:edit')")
-    @Log(title = "考试次数配置", businessType = BusinessType.UPDATE)
-    @PostMapping("edit")
-    public AjaxResult<Void> edit(@RequestBody ExamNumberEditBo bo) {
-        return toAjax(iExamNumberService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 查询考试配置绑定商品列表
-     */
-    @ApiOperation("查询考试配置商品列表")
-    @PreAuthorize("@ss.hasPermi('system:goods:list')")
-    @GetMapping("/listGoods")
-    public TableDataInfo<ExamNumberGoodsVo> listGoods(ExamNumberGoodsQueryBo bo) {
-        startPage();
-        List<ExamNumberGoodsVo> list = iExamNumberGoodsService.listGoods(bo);
-        return getDataTable(list);
-    }
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/exam/ExamPaperController.java

@@ -1,112 +0,0 @@
-package com.zhongzheng.controller.exam;
-
-import java.util.List;
-import java.util.Arrays;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.modules.exam.vo.ExamPaperVo;
-import com.zhongzheng.modules.exam.bo.ExamPaperQueryBo;
-import com.zhongzheng.modules.exam.bo.ExamPaperAddBo;
-import com.zhongzheng.modules.exam.bo.ExamPaperEditBo;
-import com.zhongzheng.modules.exam.service.IExamPaperService;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 试卷类型Controller
- * 
- * @author ruoyi
- * @date 2021-10-18
- */
-@Api(value = "试卷类型控制器", tags = {"试卷类型管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/exam/paper")
-public class ExamPaperController extends BaseController {
-
-    private final IExamPaperService iExamPaperService;
-
-    /**
-     * 查询试卷类型列表
-     */
-    @ApiOperation("查询试卷类型列表")
-    @PreAuthorize("@ss.hasPermi('exam:paper:list')")
-    @GetMapping("/list")
-    public TableDataInfo<ExamPaperVo> list(ExamPaperQueryBo bo) {
-        startPage();
-        List<ExamPaperVo> list = iExamPaperService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出试卷类型列表
-     */
- /*   @ApiOperation("导出试卷类型列表")
-    @PreAuthorize("@ss.hasPermi('exam:paper:export')")
-    @Log(title = "试卷类型", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<ExamPaperVo> export(ExamPaperQueryBo bo) {
-        List<ExamPaperVo> list = iExamPaperService.queryList(bo);
-        ExcelUtil<ExamPaperVo> util = new ExcelUtil<ExamPaperVo>(ExamPaperVo.class);
-        return util.exportExcel(list, "试卷类型");
-    }*/
-
-    /**
-     * 获取试卷类型详细信息
-     */
-    @ApiOperation("获取试卷类型详细信息")
-    @PreAuthorize("@ss.hasPermi('exam:paper:query')")
-    @GetMapping("/{paperId}")
-    public AjaxResult<ExamPaperVo> getInfo(@PathVariable("paperId" ) Long paperId) {
-        return AjaxResult.success(iExamPaperService.queryById(paperId));
-    }
-
-    /**
-     * 新增试卷类型
-     */
-    @ApiOperation("新增试卷类型")
-    @PreAuthorize("@ss.hasPermi('exam:paper:add')")
-    @Log(title = "试卷类型", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody ExamPaperAddBo bo) {
-        return toAjax(iExamPaperService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改试卷类型
-     */
-    @ApiOperation("修改试卷类型")
-    @PreAuthorize("@ss.hasPermi('exam:paper:edit')")
-    @Log(title = "试卷类型", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody ExamPaperEditBo bo) {
-        return toAjax(iExamPaperService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除试卷类型
-     */
-/*    @ApiOperation("删除试卷类型")
-    @PreAuthorize("@ss.hasPermi('exam:paper:remove')")
-    @Log(title = "试卷类型" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{paperIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] paperIds) {
-        return toAjax(iExamPaperService.deleteWithValidByIds(Arrays.asList(paperIds), true) ? 1 : 0);
-    }*/
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/exam/ExamSiteController.java

@@ -1,90 +0,0 @@
-package com.zhongzheng.controller.exam;
-
-import java.util.List;
-import java.util.Arrays;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.modules.exam.vo.ExamSiteVo;
-import com.zhongzheng.modules.exam.bo.ExamSiteQueryBo;
-import com.zhongzheng.modules.exam.bo.ExamSiteAddBo;
-import com.zhongzheng.modules.exam.bo.ExamSiteEditBo;
-import com.zhongzheng.modules.exam.service.IExamSiteService;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 考试地点Controller
- * 
- * @author ruoyi
- * @date 2021-12-06
- */
-@Api(value = "考试地点控制器", tags = {"考试地点管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/site")
-public class ExamSiteController extends BaseController {
-
-    private final IExamSiteService iExamSiteService;
-
-    /**
-     * 查询考试地点列表
-     */
-    @ApiOperation("查询考试地点列表")
-    @PreAuthorize("@ss.hasPermi('system:site:list')")
-    @GetMapping("/list")
-    public TableDataInfo<ExamSiteVo> list(ExamSiteQueryBo bo) {
-        startPage();
-        List<ExamSiteVo> list = iExamSiteService.queryList(bo);
-        return getDataTable(list);
-    }
-
-
-    /**
-     * 获取考试地点详细信息
-     */
-    @ApiOperation("获取考试地点详细信息")
-    @PreAuthorize("@ss.hasPermi('system:site:query')")
-    @GetMapping("/{siteId}")
-    public AjaxResult<ExamSiteVo> getInfo(@PathVariable("siteId" ) Long siteId) {
-        return AjaxResult.success(iExamSiteService.queryById(siteId));
-    }
-
-    /**
-     * 新增考试地点
-     */
-    @ApiOperation("新增考试地点")
-    @PreAuthorize("@ss.hasPermi('system:site:add')")
-    @Log(title = "考试地点", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody ExamSiteAddBo bo) {
-        return toAjax(iExamSiteService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改考试地点
-     */
-    @ApiOperation("修改考试地点")
-    @PreAuthorize("@ss.hasPermi('system:site:edit')")
-    @Log(title = "考试地点", businessType = BusinessType.UPDATE)
-    @PostMapping("edit")
-    public AjaxResult<Void> edit(@RequestBody ExamSiteEditBo bo) {
-        return toAjax(iExamSiteService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/goods/GoodsController.java

@@ -1,370 +0,0 @@
-package com.zhongzheng.controller.goods;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Arrays;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.lang.Validator;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.modules.bank.bo.ExamQuestionQueryBo;
-import com.zhongzheng.modules.bank.service.IQuestionService;
-import com.zhongzheng.modules.bank.vo.ExamQuestionVo;
-import com.zhongzheng.modules.bank.vo.ExamVo;
-import com.zhongzheng.modules.exam.bo.ExamNumberGoodsQueryBo;
-import com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo;
-import com.zhongzheng.modules.goods.bo.*;
-import com.zhongzheng.modules.goods.domain.Goods;
-import com.zhongzheng.modules.goods.service.IGoodsAttachedService;
-import com.zhongzheng.modules.goods.service.IGoodsAuditionConfigService;
-import com.zhongzheng.modules.goods.service.IGoodsService;
-import com.zhongzheng.modules.goods.vo.*;
-import com.zhongzheng.modules.grade.vo.StudyAccountStatusExportVo;
-import com.zhongzheng.modules.order.vo.OrderVo;
-import com.zhongzheng.modules.user.bo.UserExamRecordQueryBo;
-import com.zhongzheng.modules.user.entity.ClientLoginUser;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 商品Controller
- *
- * @author hjl
- * @date 2021-10-12
- */
-@Api(value = "商品控制器", tags = {"商品管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/goods")
-public class GoodsController extends BaseController {
-
-    private final IGoodsService iGoodsService;
-
-    private final IGoodsAttachedService iGoodsAttachedService;
-
-    private final IQuestionService iQuestionService;
-
-    /**
-     * 查询商品列表
-     */
-    @ApiOperation("查询商品列表")
-    @PreAuthorize("@ss.hasPermi('system:goods:list')")
-    @GetMapping("/list")
-    public TableDataInfo<GoodsVo> list(GoodsQueryBo bo) {
-      /*  bo.setStatus(new ArrayList<Integer>(){{
-            add(1);
-        }});*/
-        startPage();
-        List<GoodsVo> list = iGoodsService.selectList(bo);
-        return getDataTable(list);
-    }
-
-    @ApiOperation("导出直播商品列表")
-    @PreAuthorize("@ss.hasPermi('system:goods:list')")
-    @GetMapping("/export_list")
-    public AjaxResult<ExportLiveGoodsVo> export_list(GoodsQueryBo bo) {
-        List<GoodsVo> list = iGoodsService.selectList(bo);
-        List<ExportLiveGoodsVo> list1 = new ArrayList<>();
-        for(GoodsVo vo : list){
-            ExportLiveGoodsVo goodsVo = BeanUtil.toBean(vo, ExportLiveGoodsVo.class);
-            goodsVo.setBusinessName(vo.getEducationName()+"-"+vo.getProjectName()+"-"+vo.getBusinessName());
-            if(Validator.isEmpty(vo.getPeriod())){
-                goodsVo.setPeriod(0L);
-            }
-            list1.add(goodsVo);
-        }
-        ExcelUtil<ExportLiveGoodsVo> util = new ExcelUtil<>(ExportLiveGoodsVo.class);
-        return util.exportExcel(list1,"直播学习记录");
-    }
-
-
-    @ApiOperation("查询商品列表To录单")
-    @PreAuthorize("@ss.hasPermi('system:goods:list')")
-    @GetMapping("/listToInput")
-    public TableDataInfo<GoodsVo> listToInput(GoodsQueryBo bo) {
-        startPage();
-        List<GoodsVo> list = iGoodsService.selectListToInput(bo);
-        return getDataTable(list);
-    }
-
-    @ApiOperation("获取商品规格模板列表")
-    @GetMapping("/spec/list/{goodsId}")
-    public AjaxResult<List<GoodsSpecTemplateVo>> getSpecTemplateList(@PathVariable("goodsId") Long goodsId) {
-        List<GoodsSpecTemplateVo> list = iGoodsService.getSpecTemplateList(goodsId);
-        return AjaxResult.success(list);
-    }
-
-    @ApiOperation("修改商品默认规格模板")
-    @PostMapping("/update/spec")
-    public AjaxResult<Void> updateSpecTemplate(@RequestBody GoodsSpecTempEditBo bo) {
-        return toAjax(iGoodsService.updateSpecTemplate(bo) ? 1 : 0);
-    }
-
-    @ApiOperation("取消商品默认规格模板")
-    @PostMapping("/cancel/spec")
-    public AjaxResult<Void> cancelSpecTemplate(@RequestBody GoodsSpecTempEditBo bo) {
-        return toAjax(iGoodsService.cancelSpecTemplate(bo) ? 1 : 0);
-    }
-
-    /**
-     * 导出商品列表
-     */
-    /*selectList*/
-
-    /**
-     * 获取商品详细信息
-     */
-    @ApiOperation("获取商品详细信息")
-    @PreAuthorize("@ss.hasPermi('system:goods:query')")
-    @GetMapping("/{goodsId}")
-    public AjaxResult<GoodsVo> getInfo(@PathVariable("goodsId" ) Long goodsId) {
-        return AjaxResult.success(iGoodsService.selectDetail(goodsId));
-    }
-
-    /**
-     * 新增课程商品
-     */
-    @ApiOperation("新增课程商品")
-    @PreAuthorize("@ss.hasPermi('system:goods:add')")
-    @Log(title = "商品", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody GoodsAddBo bo) {
-        return toAjax(iGoodsService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改商品
-     */
-    @ApiOperation("修改商品")
-    @PreAuthorize("@ss.hasPermi('system:goods:edit')")
-    @Log(title = "商品", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody GoodsEditBo bo) {
-        return toAjax(iGoodsService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 商品批量上下架
-     */
-    @ApiOperation("商品批量上下架")
-    @PostMapping("/batch/updateStatus")
-    public AjaxResult<Void> batchUpdateStatus(@RequestBody GoodsBatchUpdateStatusBo bo) {
-        return toAjax(iGoodsService.GoodsBatchUpdateStatusBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 商品批量删除
-     */
-    @ApiOperation("商品批量删除")
-    @PostMapping("/batch/del")
-    public AjaxResult<Void> batchDelGoods(@RequestBody GoodsBatchDelBo bo) {
-        return toAjax(iGoodsService.batchDelGoods(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除商品
-     */
-   /* @ApiOperation("删除商品")
-    @PreAuthorize("@ss.hasPermi('system:goods:remove')")
-    @Log(title = "商品" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{goodsIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] goodsIds) {
-        return toAjax(iGoodsService.deleteWithValidByIds(Arrays.asList(goodsIds), true) ? 1 : 0);
-    }*/
-
-    /**
-     * 新增题库商品
-     */
-    @ApiOperation("新增题库商品")
-    @PreAuthorize("@ss.hasPermi('system:goods:add')")
-    @Log(title = "商品", businessType = BusinessType.INSERT)
-    @PostMapping("/bank")
-    public AjaxResult<Void> addBank(@RequestBody GoodsBankAddBo bo) {
-        return toAjax(iGoodsService.insertBankByAddBo(bo)>0 ? 1 : 0);
-    }
-
-    /**
-     * 修改商品
-     */
-    @ApiOperation("修改题库商品")
-    @PreAuthorize("@ss.hasPermi('system:goods:edit')")
-    @Log(title = "题库商品", businessType = BusinessType.UPDATE)
-    @PostMapping("/bank/edit")
-    public AjaxResult<Void> editBank(@RequestBody GoodsBankEditBo bo) {
-        return toAjax(iGoodsService.updateBankByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 查询题目业务层次关系列表
-     */
-    @ApiOperation("查询题库商品试卷列表")
-    @PreAuthorize("@ss.hasPermi('system:business:list')")
-    @GetMapping("/bank/list")
-    public AjaxResult<List<GoodsAttachedVo>> bankList(GoodsAttachedQueryBo bo) {
-        List<GoodsAttachedVo> list = iGoodsAttachedService.getList(bo);
-        return AjaxResult.success(list);
-    }
-
-
-    /**
-     * 新增课程商品
-     */
-    @ApiOperation("新增补考商品")
-    @PreAuthorize("@ss.hasPermi('system:goods:add')")
-    @Log(title = "商品", businessType = BusinessType.INSERT)
-    @PostMapping("/make")
-    public AjaxResult<Void> addMake(@RequestBody GoodsAddBo bo) {
-        return toAjax(iGoodsService.insertMakeByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改商品
-     */
-    @ApiOperation("修改补考商品")
-    @PreAuthorize("@ss.hasPermi('system:goods:edit')")
-    @Log(title = "商品", businessType = BusinessType.UPDATE)
-    @PostMapping("/make/edit")
-    public AjaxResult<Void> editMake(@RequestBody GoodsEditBo bo) {
-        return toAjax(iGoodsService.updateMakeByEditBo(bo) ? 1 : 0);
-    }
-
-
-    /**
-     * 新增课程商品
-     */
-    @ApiOperation("新增前培商品")
-    @PreAuthorize("@ss.hasPermi('system:goods:add')")
-    @Log(title = "商品", businessType = BusinessType.INSERT)
-    @PostMapping("/front")
-    public AjaxResult<Void> addFront(@RequestBody GoodsAddBo bo) {
-        return toAjax(iGoodsService.insertFrontByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改商品
-     */
-    @ApiOperation("修改前培商品")
-    @PreAuthorize("@ss.hasPermi('system:goods:edit')")
-    @Log(title = "商品", businessType = BusinessType.UPDATE)
-    @PostMapping("/front/edit")
-    public AjaxResult<Void> editFront(@RequestBody GoodsEditBo bo) {
-        return toAjax(iGoodsService.updateFrontByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 查询考试配置绑定商品列表
-     */
-    @ApiOperation("查询前培或补考商品列表")
-    @PreAuthorize("@ss.hasPermi('system:goods:list')")
-    @GetMapping("/listGoods")
-    public TableDataInfo<ExamNumberGoodsVo> listGoods(ExamNumberGoodsQueryBo bo) {
-        startPage();
-        List<ExamNumberGoodsVo> list = iGoodsService.listGoods(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 查询免费题库商品列表
-     */
-    @ApiOperation("查询免费题库商品列表")
-    @GetMapping("/listFreeGoodsList")
-    public TableDataInfo<GoodsUserQuestionVo> listFreeGoodsList(GoodsQueryBo bo) {
-        startPage();
-        List<GoodsUserQuestionVo> list = iQuestionService.listFreeGoodsList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 查询免费题库商品列表
-     */
-    @ApiOperation("查询用户题库商品列表")
-    @GetMapping("/listBankGoodsList")
-    public TableDataInfo<GoodsUserQuestionVo> listBankGoodsList(GoodsQueryBo bo) {
-        startPage();
-        List<GoodsUserQuestionVo> list = iQuestionService.listBankGoodsList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 获取题库商品每日一练试卷列表
-     */
-    @ApiOperation("获取题库商品每日一练试卷列表")
-    @GetMapping("/getBankGoodsExamList/{goodsId}")
-    public AjaxResult<List<BankGoodsExamVo>> getBankGoodsExamList(@PathVariable("goodsId") Long goodsId) {
-        List<BankGoodsExamVo> list = iQuestionService.getBankGoodsExamList(goodsId);
-        return AjaxResult.success(list);
-    }
-
-    /**
-     * 新增每日一练试卷时间
-     */
-    @ApiOperation("新增每日一练试卷时间")
-    @PostMapping("/addExamTime")
-    public AjaxResult<Void> addGoodsExamTime(@RequestBody List<BankGoodsExamAddBo> addBo) {
-        return toAjax(iQuestionService.addGoodsExamTime(addBo) ? 1 : 0);
-    }
-
-    /**
-     * 商品批量复制（新机构）
-     */
-    @ApiOperation("商品批量复制（全量）")
-    @PostMapping("/batch/copy/all")
-    public AjaxResult<Void> goodsBatchCopyTenant(@RequestBody GoodsBatchCopyTenantBo bo) {
-        return toAjax(iGoodsService.goodsBatchCopyTenant(bo) ? 1 : 0);
-    }
-
-    /**
-     * 商品批量复制（新机构）
-     */
-    @ApiOperation("商品批量复制（增量）")
-    @PostMapping("/batch/copy/add")
-    public AjaxResult<Void> goodsBatchCopyAddTenant(@RequestBody GoodsBatchCopyTenantBo bo) {
-        return toAjax(iGoodsService.goodsBatchCopyIncrementTenant(bo) ? 1 : 0);
-    }
-
-    /**
-     * 商品关系ID处理（全量复制后的处理方法）
-     */
-    @ApiOperation("商品关系ID处理（全量复制后的处理方法）")
-    @GetMapping("/batch/copy/dispose")
-    public AjaxResult<Void> goodsBatchCopyDisposeTenant() {
-        return toAjax(iGoodsService.goodsBatchCopyDisposeTenant() ? 1 : 0);
-    }
-
-    /**
-     * 修改商品课程关联
-     */
-    @ApiOperation("修改商品课程关联")
-    @PostMapping("/update/course")
-    public AjaxResult<Void> updateCourse() {
-        return toAjax(iGoodsService.goodsBatchCopyDisposeTenant() ? 1 : 0);
-    }
-
-
-    /**
-     * 修复二建/二造商品(注意不接页面，自己使用)
-     */
-    @ApiOperation("修复二建/二造商品")
-    @PostMapping("/update/goods/repair")
-    public AjaxResult<Void> updateGoodsRepair(@RequestBody UpdateGoodsRepairBo bo) {
-        return toAjax(iGoodsService.updateGoodsRepair(bo) ? 1 : 0);
-    }
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/goods/GoodsCourseController.java

@@ -1,140 +0,0 @@
-package com.zhongzheng.controller.goods;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.course.vo.CourseVo;
-import com.zhongzheng.modules.goods.bo.GoodsCourseAddBo;
-import com.zhongzheng.modules.goods.bo.GoodsCourseEditBo;
-import com.zhongzheng.modules.goods.bo.GoodsCourseQueryBo;
-import com.zhongzheng.modules.goods.service.IGoodsCourseService;
-import com.zhongzheng.modules.goods.vo.GoodsCourseMoreVo;
-import com.zhongzheng.modules.goods.vo.GoodsCourseVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 商品课程关系Controller
- *
- * @author hjl
- * @date 2021-10-12
- */
-@Api(value = "商品课程关系控制器", tags = {"商品课程关系管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/goods/course")
-public class GoodsCourseController extends BaseController {
-
-    private final IGoodsCourseService iGoodsCourseService;
-
-    /**
-     * 查询商品课程关系列表
-     */
-    @ApiOperation("查询商品课程关系列表")
-    @PreAuthorize("@ss.hasPermi('system:course:list')")
-    @GetMapping("/getList")
-    public TableDataInfo<CourseVo> getList(GoodsCourseQueryBo bo) {
-        startPage();
-        List<CourseVo> list = iGoodsCourseService.selectList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 查询商品课程关系列表
-     */
-    @ApiOperation("ID查询商品课程关系列表")
-    @PreAuthorize("@ss.hasPermi('system:course:list')")
-    @GetMapping("/list/{id}")
-    public TableDataInfo<CourseVo> list(@PathVariable("id" ) Long id) {
-        startPage();
-        GoodsCourseQueryBo courseQueryBo = new GoodsCourseQueryBo();
-        courseQueryBo.setGoodsId(id);
-        List<CourseVo> list = iGoodsCourseService.selectList(courseQueryBo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 查询商品课程关系列表
-     */
-    @ApiOperation("批量查询商品课程关系列表")
-    @PreAuthorize("@ss.hasPermi('system:course:list')")
-    @GetMapping("/listMore/{ids}")
-    public TableDataInfo<GoodsCourseMoreVo> listMore(@PathVariable Long[] ids) {
-        startPage();
-        List<GoodsCourseMoreVo> list = iGoodsCourseService.selectListMore(Arrays.asList(ids));
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出商品课程关系列表
-     */
-    /*@ApiOperation("导出商品课程关系列表")
-    @PreAuthorize("@ss.hasPermi('system:course:export')")
-    @Log(title = "商品课程关系", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<GoodsCourseVo> export(GoodsCourseQueryBo bo) {
-        List<GoodsCourseVo> list = iGoodsCourseService.queryList(bo);
-        ExcelUtil<GoodsCourseVo> util = new ExcelUtil<GoodsCourseVo>(GoodsCourseVo.class);
-        return util.exportExcel(list, "商品课程关系");
-    }*/
-
-    /**
-     * 获取商品课程关系详细信息
-     */
-   /* @ApiOperation("获取商品课程关系详细信息")
-    @PreAuthorize("@ss.hasPermi('system:course:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<GoodsCourseVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iGoodsCourseService.queryById(id));
-    }*/
-
-    /**
-     * 新增商品课程关系
-     */
-    @ApiOperation("新增商品课程关系")
-    @PreAuthorize("@ss.hasPermi('system:course:add')")
-    @Log(title = "商品课程关系", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody GoodsCourseAddBo bo) {
-        return toAjax(iGoodsCourseService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改商品课程关系
-     */
-   /* @ApiOperation("修改商品课程关系")
-    @PreAuthorize("@ss.hasPermi('system:course:edit')")
-    @Log(title = "商品课程关系", businessType = BusinessType.UPDATE)
-    @PostMapping()
-    public AjaxResult<Void> edit(@RequestBody GoodsCourseEditBo bo) {
-        return toAjax(iGoodsCourseService.updateByEditBo(bo) ? 1 : 0);
-    }*/
-
-    /**
-     * 删除商品课程关系
-     */
-    @ApiOperation("删除商品课程关系")
-    @PreAuthorize("@ss.hasPermi('system:course:remove')")
-    @Log(title = "商品课程关系" , businessType = BusinessType.DELETE)
-    @PostMapping("/del/{ids}")
-    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iGoodsCourseService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/goods/GoodsCourseTeacherController.java

@@ -1,92 +0,0 @@
-package com.zhongzheng.controller.goods;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.goods.bo.GoodsCourseTeacherAddBo;
-import com.zhongzheng.modules.goods.bo.GoodsCourseTeacherEditBo;
-import com.zhongzheng.modules.goods.bo.GoodsCourseTeacherQueryBo;
-import com.zhongzheng.modules.goods.service.IGoodsCourseTeacherService;
-import com.zhongzheng.modules.goods.vo.GoodsCourseTeacherVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 商品课程双师资绑定Controller
- *
- * @author hjl
- * @date 2022-09-14
- */
-@Api(value = "商品课程双师资绑定控制器", tags = {"商品课程双师资绑定管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/goods/course/teacher")
-public class GoodsCourseTeacherController extends BaseController {
-
-    private final IGoodsCourseTeacherService iGoodsCourseTeacherService;
-
-    /**
-     * 查询商品课程双师资绑定列表
-     */
-    @ApiOperation("查询商品课程双师资绑定列表")
-    @PreAuthorize("@ss.hasPermi('system:teacher:list')")
-    @GetMapping("/list")
-    public AjaxResult<List<GoodsCourseTeacherVo>> list(GoodsCourseTeacherQueryBo bo) {
-        bo.setStatus(1);
-        List<GoodsCourseTeacherVo> list = iGoodsCourseTeacherService.queryList(bo);
-        return AjaxResult.success(list);
-    }
-
-
-
-    /**
-     * 获取商品课程双师资绑定详细信息
-     */
-    @ApiOperation("获取商品课程双师资绑定详细信息")
-    @PreAuthorize("@ss.hasPermi('system:teacher:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<GoodsCourseTeacherVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iGoodsCourseTeacherService.queryById(id));
-    }
-
-    /**
-     * 新增商品课程双师资绑定
-     */
-    @ApiOperation("新增商品课程双师资绑定")
-    @PreAuthorize("@ss.hasPermi('system:teacher:add')")
-    @Log(title = "商品课程双师资绑定", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody GoodsCourseTeacherAddBo bo) {
-        return toAjax(iGoodsCourseTeacherService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改商品课程双师资绑定
-     */
-    @ApiOperation("修改商品课程双师资绑定")
-    @PreAuthorize("@ss.hasPermi('system:teacher:edit')")
-    @Log(title = "商品课程双师资绑定", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody GoodsCourseTeacherEditBo bo) {
-        return toAjax(iGoodsCourseTeacherService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/goods/GoodsSpecAttributeController.java

@@ -1,112 +0,0 @@
-package com.zhongzheng.controller.goods;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.goods.bo.GoodsSpecAttributeAddBo;
-import com.zhongzheng.modules.goods.bo.GoodsSpecAttributeEditBo;
-import com.zhongzheng.modules.goods.bo.GoodsSpecAttributeQueryBo;
-import com.zhongzheng.modules.goods.service.IGoodsSpecAttributeService;
-import com.zhongzheng.modules.goods.vo.GoodsSpecAttributeVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 【请填写功能名称】Controller
- * 
- * @author ruoyi
- * @date 2022-09-29
- */
-@Api(value = "【请填写功能名称】控制器", tags = {"【请填写功能名称】管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/attribute")
-public class GoodsSpecAttributeController extends BaseController {
-
-    private final IGoodsSpecAttributeService iGoodsSpecAttributeService;
-
-    /**
-     * 查询【请填写功能名称】列表
-     */
-    @ApiOperation("查询【请填写功能名称】列表")
-    @PreAuthorize("@ss.hasPermi('system:attribute:list')")
-    @GetMapping("/list")
-    public TableDataInfo<GoodsSpecAttributeVo> list(GoodsSpecAttributeQueryBo bo) {
-        startPage();
-        List<GoodsSpecAttributeVo> list = iGoodsSpecAttributeService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出【请填写功能名称】列表
-     */
-    @ApiOperation("导出【请填写功能名称】列表")
-    @PreAuthorize("@ss.hasPermi('system:attribute:export')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<GoodsSpecAttributeVo> export(GoodsSpecAttributeQueryBo bo) {
-        List<GoodsSpecAttributeVo> list = iGoodsSpecAttributeService.queryList(bo);
-        ExcelUtil<GoodsSpecAttributeVo> util = new ExcelUtil<GoodsSpecAttributeVo>(GoodsSpecAttributeVo.class);
-        return util.exportExcel(list, "【请填写功能名称】");
-    }
-
-    /**
-     * 获取【请填写功能名称】详细信息
-     */
-    @ApiOperation("获取【请填写功能名称】详细信息")
-    @PreAuthorize("@ss.hasPermi('system:attribute:query')")
-    @GetMapping("/{specAttributeId}")
-    public AjaxResult<GoodsSpecAttributeVo> getInfo(@PathVariable("specAttributeId" ) Long specAttributeId) {
-        return AjaxResult.success(iGoodsSpecAttributeService.queryById(specAttributeId));
-    }
-
-    /**
-     * 新增【请填写功能名称】
-     */
-    @ApiOperation("新增【请填写功能名称】")
-    @PreAuthorize("@ss.hasPermi('system:attribute:add')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody GoodsSpecAttributeAddBo bo) {
-        return toAjax(iGoodsSpecAttributeService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改【请填写功能名称】
-     */
-    @ApiOperation("修改【请填写功能名称】")
-    @PreAuthorize("@ss.hasPermi('system:attribute:edit')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
-    @PutMapping()
-    public AjaxResult<Void> edit(@RequestBody GoodsSpecAttributeEditBo bo) {
-        return toAjax(iGoodsSpecAttributeService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除【请填写功能名称】
-     */
-    @ApiOperation("删除【请填写功能名称】")
-    @PreAuthorize("@ss.hasPermi('system:attribute:remove')")
-    @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{specAttributeIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] specAttributeIds) {
-        return toAjax(iGoodsSpecAttributeService.deleteWithValidByIds(Arrays.asList(specAttributeIds), true) ? 1 : 0);
-    }
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/goods/GoodsSpecAttributeRelationController.java

@@ -1,108 +0,0 @@
-package com.zhongzheng.controller.goods;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.goods.bo.GoodsSpecAttributeRelationAddBo;
-import com.zhongzheng.modules.goods.bo.GoodsSpecAttributeRelationEditBo;
-import com.zhongzheng.modules.goods.bo.GoodsSpecAttributeRelationQueryBo;
-import com.zhongzheng.modules.goods.service.IGoodsSpecAttributeRelationService;
-import com.zhongzheng.modules.goods.vo.GoodsSpecAttributeRelationVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 【请填写功能名称】Controller
- * 
- * @author ruoyi
- * @date 2022-09-29
- */
-@Api(value = "规格属性关联控制器", tags = {"规格属性关联管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/relation")
-public class GoodsSpecAttributeRelationController extends BaseController {
-
-    private final IGoodsSpecAttributeRelationService iGoodsSpecAttributeRelationService;
-
-    /**
-     * 查询【请填写功能名称】列表
-     */
-    @ApiOperation("查询【请填写功能名称】列表")
-    @PreAuthorize("@ss.hasPermi('system:relation:list')")
-    @GetMapping("/list")
-    public TableDataInfo<GoodsSpecAttributeRelationVo> list(GoodsSpecAttributeRelationQueryBo bo) {
-        startPage();
-        List<GoodsSpecAttributeRelationVo> list = iGoodsSpecAttributeRelationService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出【请填写功能名称】列表
-     */
-    @ApiOperation("导出【请填写功能名称】列表")
-    @PreAuthorize("@ss.hasPermi('system:relation:export')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<GoodsSpecAttributeRelationVo> export(GoodsSpecAttributeRelationQueryBo bo) {
-        List<GoodsSpecAttributeRelationVo> list = iGoodsSpecAttributeRelationService.queryList(bo);
-        ExcelUtil<GoodsSpecAttributeRelationVo> util = new ExcelUtil<GoodsSpecAttributeRelationVo>(GoodsSpecAttributeRelationVo.class);
-        return util.exportExcel(list, "【请填写功能名称】");
-    }
-
-    /**
-     * 获取【请填写功能名称】详细信息
-     */
-    @ApiOperation("获取【请填写功能名称】详细信息")
-    @PreAuthorize("@ss.hasPermi('system:relation:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<GoodsSpecAttributeRelationVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iGoodsSpecAttributeRelationService.queryById(id));
-    }
-
-    /**
-     * 新增规格属性关联
-     */
-    @ApiOperation("新增规格属性关联")
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody GoodsSpecAttributeRelationAddBo bo) {
-        return toAjax(iGoodsSpecAttributeRelationService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改规格属性关联
-     */
-    @ApiOperation("修改规格属性关联")
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody GoodsSpecAttributeRelationEditBo bo) {
-        return toAjax(iGoodsSpecAttributeRelationService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除【请填写功能名称】
-     */
-    @ApiOperation("删除【请填写功能名称】")
-    @PreAuthorize("@ss.hasPermi('system:relation:remove')")
-    @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iGoodsSpecAttributeRelationService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }
-}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/goods/GoodsSpecController.java

@@ -1,115 +0,0 @@
-package com.zhongzheng.controller.goods;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.goods.bo.GoodsSpecAddBo;
-import com.zhongzheng.modules.goods.bo.GoodsSpecEditBo;
-import com.zhongzheng.modules.goods.bo.GoodsSpecQueryBo;
-import com.zhongzheng.modules.goods.service.IGoodsSpecService;
-import com.zhongzheng.modules.goods.vo.GoodsSpecAttrDetailVo;
-import com.zhongzheng.modules.goods.vo.GoodsSpecVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 【请填写功能名称】Controller
- * 
- * @author ruoyi
- * @date 2022-09-29
- */
-@Api(value = "【请填写功能名称】控制器", tags = {"【请填写功能名称】管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/spec")
-public class GoodsSpecController extends BaseController {
-
-    private final IGoodsSpecService iGoodsSpecService;
-
-    /**
-     * 查询【请填写功能名称】列表
-     */
-    @ApiOperation("查询【请填写功能名称】列表")
-    @PreAuthorize("@ss.hasPermi('system:spec:list')")
-    @GetMapping("/list")
-    public TableDataInfo<GoodsSpecVo> list(GoodsSpecQueryBo bo) {
-        startPage();
-        List<GoodsSpecVo> list = iGoodsSpecService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出【请填写功能名称】列表
-     */
-    @ApiOperation("导出【请填写功能名称】列表")
-    @PreAuthorize("@ss.hasPermi('system:spec:export')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<GoodsSpecVo> export(GoodsSpecQueryBo bo) {
-        List<GoodsSpecVo> list = iGoodsSpecService.queryList(bo);
-        ExcelUtil<GoodsSpecVo> util = new ExcelUtil<GoodsSpecVo>(GoodsSpecVo.class);
-        return util.exportExcel(list, "【请填写功能名称】");
-    }
-
-    /**
-     * 获取【请填写功能名称】详细信息
-     */
-    @ApiOperation("获取【请填写功能名称】详细信息")
-    @PreAuthorize("@ss.hasPermi('system:spec:query')")
-    @GetMapping("/{specId}")
-    public AjaxResult<GoodsSpecVo> getInfo(@PathVariable("specId" ) Long specId) {
-        return AjaxResult.success(iGoodsSpecService.queryById(specId));
-    }
-
-    /**
-     * 新增【请填写功能名称】
-     */
-    @ApiOperation("新增【请填写功能名称】")
-    @PreAuthorize("@ss.hasPermi('system:spec:add')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody GoodsSpecAddBo bo) {
-        return toAjax(iGoodsSpecService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-
-
-    /**
-     * 修改【请填写功能名称】
-     */
-    @ApiOperation("修改【请填写功能名称】")
-    @PreAuthorize("@ss.hasPermi('system:spec:edit')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
-    @PutMapping()
-    public AjaxResult<Void> edit(@RequestBody GoodsSpecEditBo bo) {
-        return toAjax(iGoodsSpecService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除【请填写功能名称】
-     */
-    @ApiOperation("删除【请填写功能名称】")
-    @PreAuthorize("@ss.hasPermi('system:spec:remove')")
-    @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{specIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] specIds) {
-        return toAjax(iGoodsSpecService.deleteWithValidByIds(Arrays.asList(specIds), true) ? 1 : 0);
-    }
-}