submit

pom.xml

@@ -164,19 +164,6 @@
                 <artifactId>spring-boot-starter-actuator</artifactId>
             </dependency>
 
-            <!-- 定时任务-->
-            <dependency>
-                <groupId>com.zhongzheng</groupId>
-                <artifactId>zhongzheng-quartz</artifactId>
-                <version>${zhongzheng.version}</version>
-            </dependency>
-
-            <!-- 代码生成-->
-            <dependency>
-                <groupId>com.zhongzheng</groupId>
-                <artifactId>zhongzheng-generator</artifactId>
-                <version>${zhongzheng.version}</version>
-            </dependency>
 
             <!-- 核心模块-->
             <dependency>
@@ -199,13 +186,6 @@
                 <version>${zhongzheng.version}</version>
             </dependency>
 
-            <!-- demo模块 -->
-            <dependency>
-                <groupId>com.zhongzheng</groupId>
-                <artifactId>zhongzheng-demo</artifactId>
-                <version>${zhongzheng.version}</version>
-            </dependency>
-
         </dependencies>
     </dependencyManagement>
 
@@ -214,10 +194,7 @@
         <module>zhongzheng-api</module>
         <module>zhongzheng-framework</module>
         <module>zhongzheng-system</module>
-        <module>zhongzheng-quartz</module>
-        <module>zhongzheng-generator</module>
         <module>zhongzheng-common</module>
-        <module>zhongzheng-admin-saas</module>
     </modules>
     <packaging>pom</packaging>
 

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,20 +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;
-import org.springframework.scheduling.annotation.EnableScheduling;
-
-
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
-@EnableScheduling
-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/common/CommonController.java

@@ -1,305 +0,0 @@
-package com.zhongzheng.controller.common;
-
-import cn.hutool.core.util.StrUtil;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.config.RuoYiConfig;
-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.exception.CustomException;
-import com.zhongzheng.common.utils.ToolsUtils;
-import com.zhongzheng.common.utils.file.FileUtils;
-import com.zhongzheng.modules.order.bo.TopOrderInvoiceBack;
-import com.zhongzheng.modules.sdk.bo.TopNuoMplatformLogAddBo;
-import com.zhongzheng.modules.sdk.service.ITopNuoMplatformLogService;
-import com.zhongzheng.modules.top.financial.bo.*;
-import com.zhongzheng.modules.top.financial.vo.TopOrderLogVo;
-import com.zhongzheng.modules.top.financial.vo.TopOrderOrgVo;
-import com.zhongzheng.modules.top.financial.vo.TopOrderRevocationVo;
-import com.zhongzheng.modules.top.financial.vo.TopSellerDiscountVo;
-import com.zhongzheng.modules.top.goods.bo.*;
-import com.zhongzheng.modules.top.goods.service.ITopOldOrderService;
-import com.zhongzheng.modules.top.order.bo.PayOrderCallBackBo;
-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.http.MediaType;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 课程Controller
- *
- * @author hjl
- * @date 2021-10-09
- */
-@Api(value = "游客访问接口", tags = {"游客访问接口"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/sys/common/")
-public class CommonController extends BaseController {
-
-    private static final Logger log = LoggerFactory.getLogger(CommonController.class);
-
-    private final ITopNuoMplatformLogService iTopNuoMplatformLogService;
-
-    private final ITopOldOrderService iTopOldOrderService;
-
-    /**
-     * 通用下载请求
-     *
-     * @param fileName 文件名称
-     * @param delete   是否删除
-     */
-    @GetMapping("/download")
-    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);
-            String filePath = RuoYiConfig.getDownloadPath() + fileName;
-
-            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
-            FileUtils.setAttachmentResponseHeader(response, realFileName);
-            FileUtils.writeBytes(filePath, response.getOutputStream());
-           /* if (delete)
-            {
-                FileUtils.deleteFile(filePath);
-            }*/
-            FileUtils.deleteFile(filePath);
-        } catch (Exception e) {
-            log.error("下载文件失败", e);
-        }
-    }
-
-    /**
-     * 新增诺税通开单记录
-     */
-    @ApiOperation("新增诺税通开单记录")
-    @PreAuthorize("@ss.hasPermi('system:log:add')")
-    @Log(title = "诺税通开单记录", businessType = BusinessType.INSERT)
-    @PostMapping("/openMplatform/log")
-    public AjaxResult<Map<String, String>> add(@RequestBody TopNuoMplatformLogAddBo bo) {
-        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
-            throw new CustomException("签名错误");
-        }
-        return AjaxResult.success(iTopNuoMplatformLogService.insertByAddBo(bo));
-    }
-
-
-    /**
-     * 业务系统发票回传
-     */
-    @ApiOperation("业务系统发票回传")
-    @PostMapping("/order/invoice/back")
-    public AjaxResult<Void> orderInvoiceBack(@RequestBody TopOrderInvoiceBack bo) {
-        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
-
-            throw new CustomException("签名错误");
-        }
-        return toAjax(iTopNuoMplatformLogService.orderInvoiceBack(bo) ? 1 : 0);
-    }
-
-    /**
-     * B端订单退款申请
-     */
-    @ApiOperation("B端订单退款申请")
-    @PostMapping("/refund/apply")
-    public AjaxResult<Void> orderRefundApply(@RequestBody TopOrderRefundApplyBo bo) {
-        if(!ToolsUtils.checkOrderSignFromOldSys(bo.getOrderSn(),bo.getStamp().toString(),bo.getSign())){
-            throw new CustomException("签名错误");
-        }
-        return toAjax(iTopOldOrderService.orderRefundApply(bo) ? 1 : 0);
-    }
-
-    /**
-     * B端订单新增订单
-     */
-    @ApiOperation("新增订单")
-    @PostMapping("/save/order")
-    public AjaxResult<Void> saveOrder(@RequestBody TopOldOrderAddBo bo) {
-        if(!ToolsUtils.checkOrderSignFromOldSys(bo.getOrderSn(),bo.getStamp().toString(),bo.getSign())){
-            throw new CustomException("签名错误");
-        }
-        return toAjax(iTopOldOrderService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-
-    /**
-     * B端订单回款
-     */
-    @ApiOperation("B端订单回款")
-    @PostMapping("/proceeds")
-    public AjaxResult<Void> orderProceeds(@RequestBody TopOrderProceedsBo bo) {
-        if(!ToolsUtils.checkOrderSignFromOldSys(bo.getOrderSn(),bo.getStamp().toString(),bo.getSign())){
-            throw new CustomException("签名错误");
-        }
-        return toAjax(iTopOldOrderService.orderProceeds(bo) ? 1 : 0);
-    }
-
-    /**
-     * 新增诺税通开单记录
-     */
-    @ApiOperation("付款企业网银")
-    @PreAuthorize("@ss.hasPermi('system:log:add')")
-    @Log(title = "付款企业网银", businessType = BusinessType.INSERT)
-    @PostMapping("/payToCompany")
-    public AjaxResult<Void> payToCompany(@RequestBody TopOldOrderQueryBo bo) {
-        return toAjax(iTopOldOrderService.payToCompany(bo) ? 1 : 0);
-    }
-
-    @ApiOperation("付款企业网银支付回调")
-    @PreAuthorize("@ss.hasPermi('system:log:add')")
-    @Log(title = "付款企业网银支付回调", businessType = BusinessType.INSERT)
-    @PostMapping("/payToCompanyCallBack")
-    public AjaxResult<Void> payToCompanyCallBack(@RequestBody PayOrderCallBackBo bo) {
-        if(!ToolsUtils.checkSignCwSnFromOldSys(bo.getMainUniqueId(),bo.getStamp().toString(),bo.getSign())){
-            throw new CustomException("签名错误");
-        }
-        return toAjax(iTopOldOrderService.payToCompanyCallBack(bo) ? 1 : 0);
-    }
-
-    /**
-     * B端订单修改
-     */
-    @ApiOperation("B端订单修改")
-    @PostMapping("/edit/order")
-    public AjaxResult<Void> editOrder(@RequestBody TopOldOrderAddBo bo) {
-        if(!ToolsUtils.checkOrderSignFromOldSys(bo.getOrderSn(),bo.getStamp().toString(),bo.getSign())){
-            throw new CustomException("签名错误");
-        }
-        return toAjax(iTopOldOrderService.editOrder(bo) ? 1 : 0);
-    }
-
-    /**
-     * B端订单审核修改
-     */
-    @ApiOperation("B端订单审核修改")
-    @PostMapping("/edit/order/check")
-    public AjaxResult<Void> editOrderCheck(@RequestBody TopOldOrderAddBo bo) {
-        if(!ToolsUtils.checkOrderSignFromOldSys(bo.getOrderSn(),bo.getStamp().toString(),bo.getSign())){
-            throw new CustomException("签名错误");
-        }
-        return toAjax(iTopOldOrderService.editOrderCheck(bo) ? 1 : 0);
-    }
-
-    /**
-     * B端订单佣金修改
-     */
-    @ApiOperation("B端订单佣金修改")
-    @PostMapping("/edit/order/brokerage")
-    public AjaxResult<Void> editOrderBrokerage(@RequestBody OrderBrokerageBo bo) {
-        if(!ToolsUtils.checkOrderSignFromOldSys(bo.getOrderSn(),bo.getStamp().toString(),bo.getSign())){
-            throw new CustomException("签名错误");
-        }
-        return toAjax(iTopOldOrderService.editOrderBrokerage(bo) ? 1 : 0);
-    }
-
-    /**
-     * 批量修改订单备注
-     */
-    @ApiOperation("批量修改订单备注")
-    @PostMapping("/update/order/remark")
-    public AjaxResult<Void> updateRemark(@RequestBody TopUpdateRemarkBo bo) {
-        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
-            throw new CustomException("签名错误");
-        }
-        return toAjax(iTopOldOrderService.updateRemark(bo) ? 1 : 0);
-    }
-
-    /**
-     * 订单修改(不审核)
-     */
-    @ApiOperation("订单修改(不审核)")
-    @PostMapping("/update/order/info")
-    public AjaxResult<Void> updateOrderInfo(@RequestBody TopOldOrderAddBo bo) {
-        if(!ToolsUtils.checkOrderSignFromOldSys(bo.getOrderSn(),bo.getStamp().toString(),bo.getSign())){
-            throw new CustomException("签名错误");
-        }
-        return toAjax(iTopOldOrderService.updateOrderInfo(bo) ? 1 : 0);
-    }
-
-    /**
-     * B端订单审核修改通知
-     */
-    @ApiOperation("B端订单审核修改通知")
-    @PostMapping("/edit/order/remind")
-    public AjaxResult<Void> editOrderRemind(@RequestBody TopOrderRemindBo bo) {
-        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
-            throw new CustomException("签名错误");
-        }
-        return toAjax(iTopOldOrderService.editOrderRemind(bo) ? 1 : 0);
-    }
-
-    /**
-     * B端订单批量完单
-     */
-    @ApiOperation("B端订单批量完单")
-    @PostMapping("/order/finish")
-    public AjaxResult<Void> finishOrder(@RequestBody TopFinishOrderBo bo) {
-        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
-            throw new CustomException("签名错误");
-        }
-        return toAjax(iTopOldOrderService.finishOrder(bo) ? 1 : 0);
-    }
-
-    /**
-     * B端订单获取业务员优惠额度
-     */
-    @ApiOperation("B端订单获取业务员优惠额度")
-    @PostMapping("/seller/discount")
-    public AjaxResult<TopSellerDiscountVo> getSellerDiscount(@RequestBody TopSellerDiscountBo bo) {
-        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
-            throw new CustomException("签名错误");
-        }
-        return AjaxResult.success(iTopOldOrderService.getSellerDiscount(bo));
-    }
-
-    /**
-     * B端订单撤销
-     */
-    @ApiOperation("B端订单撤销")
-    @PostMapping("/order/revocation")
-    public AjaxResult<TopOrderRevocationVo> orderRevocation(@RequestBody TopOrderRevocationBo bo) {
-        if(!ToolsUtils.checkOrderSignFromOldSys(bo.getOrderSn(),bo.getStamp().toString(),bo.getSign())){
-            throw new CustomException("签名错误");
-        }
-        return AjaxResult.success(iTopOldOrderService.orderRevocation(bo));
-    }
-
-    /**
-     * B端订单操作历史记录
-     */
-    @ApiOperation("B端订单操作历史记录")
-    @PostMapping("/order/record")
-    public TableDataInfo<TopOrderLogVo> orderRevocation(@RequestBody TopOldOrderQueryBo bo) {
-        if(!ToolsUtils.checkOrderSignFromOldSys(bo.getOrderSn(),bo.getStamp().toString(),bo.getSign())){
-            throw new CustomException("签名错误");
-        }
-        startPage();
-        List<TopOrderLogVo> list = iTopOldOrderService.logList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 获取订单商品信息
-     */
-    @ApiOperation("获取订单商品信息")
-    @PostMapping("/order/goods/list")
-    public AjaxResult<TopOrderOrgVo> getOrderGoodsList(@RequestBody TopOldOrderQueryBo bo) {
-        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
-            throw new CustomException("签名错误");
-        }
-        return AjaxResult.success(iTopOldOrderService.getTopOrderGoodsList(bo));
-    }
-}

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

@@ -1,71 +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.top.goods.bo.TopCourseBusinessAddBo;
-import com.zhongzheng.modules.top.goods.bo.TopCourseBusinessEditBo;
-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.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 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);
-    }
-
-    /**
-     * 新增业务层次
-     */
-    @ApiOperation("新增总平台业务层次")
-    @PreAuthorize("@ss.hasPermi('course:business:add')")
-    @Log(title = "业务层次", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody TopCourseBusinessAddBo 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 TopCourseBusinessEditBo bo) {
-        return toAjax(iCourseBusinessService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-}

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

@@ -1,86 +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.CourseEducationTypeAddBo;
-import com.zhongzheng.modules.course.bo.CourseEducationTypeEditBo;
-import com.zhongzheng.modules.top.goods.bo.TopCourseEducationTypeAddBo;
-import com.zhongzheng.modules.top.goods.bo.TopCourseEducationTypeEditBo;
-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.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-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);
-    }
-
-    /**
-     * 查询教育类型列表
-     */
-    @ApiOperation("查询所有业务层次列表")
-    @GetMapping("/allList")
-    public TableDataInfo<TopCourseEducationTypeVo> allList(TopCourseEducationTypeQueryBo bo) {
-        startPage();
-        List<Integer> statusList = new ArrayList<>();
-        statusList.add(1);
-        statusList.add(0);
-        bo.setStatusList(statusList);
-        List<TopCourseEducationTypeVo> list = iCourseEducationTypeService.queryAllList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 新增教育类型
-     */
-    @ApiOperation("新增总平台教育类型")
-    @PreAuthorize("@ss.hasPermi('course:type:add')")
-    @Log(title = "教育类型", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody TopCourseEducationTypeAddBo 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 TopCourseEducationTypeEditBo bo) {
-        return toAjax(iCourseEducationTypeService.updateByEditBo(bo) ? 1 : 0);
-    }
-}

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

@@ -1,70 +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.CourseProjectTypeAddBo;
-import com.zhongzheng.modules.course.bo.CourseProjectTypeEditBo;
-import com.zhongzheng.modules.top.goods.bo.TopCourseProjectTypeAddBo;
-import com.zhongzheng.modules.top.goods.bo.TopCourseProjectTypeEditBo;
-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.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/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);
-    }
-
-    /**
-     * 新增项目类型
-     */
-    @ApiOperation("新增总平台项目类型")
-    @PreAuthorize("@ss.hasPermi('course:type:add')")
-    @Log(title = "项目类型", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody TopCourseProjectTypeAddBo 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 TopCourseProjectTypeEditBo bo) {
-        return toAjax(iCourseProjectTypeService.updateByEditBo(bo) ? 1 : 0);
-    }
-}

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/financial/ReceiveOrderController.java

@@ -1,62 +0,0 @@
-package com.zhongzheng.controller.financial;
-
-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.grade.vo.SyncUserChapterExport;
-import com.zhongzheng.modules.top.financial.bo.TopCostTpAddBo;
-import com.zhongzheng.modules.top.financial.bo.TopCostTpEditBo;
-import com.zhongzheng.modules.top.financial.bo.TopCostTpQueryBo;
-import com.zhongzheng.modules.top.financial.service.ITopCostTpService;
-import com.zhongzheng.modules.top.financial.vo.TopCostTpVo;
-import com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo;
-import com.zhongzheng.modules.top.goods.service.ITopOldOrderService;
-import com.zhongzheng.modules.top.goods.vo.TopOldOrderVo;
-import com.zhongzheng.modules.top.order.vo.TopOldOrderExportVo;
-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.List;
-
-/**
- * 成本模板Controller
- *
- * @author ruoyi
- * @date 2023-04-20
- */
-@Api(value = "应收订单控制器", tags = {"成本模板管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/receive/order")
-public class ReceiveOrderController extends BaseController {
-
-    private final ITopOldOrderService iTopOldOrderService;
-
-
-    @ApiOperation("应收订单列表")
-    @PreAuthorize("@ss.hasPermi('system:tp:list')")
-    @GetMapping("/list")
-    public TableDataInfo<TopOldOrderVo> list(TopOldOrderQueryBo bo) {
-        startPage();
-        List<TopOldOrderVo> list = iTopOldOrderService.queryReceiveList(bo);
-        return getDataTable(list);
-    }
-
-    @ApiOperation("应收订单列表导出")
-    @PreAuthorize("@ss.hasPermi('system:tp:list')")
-    @GetMapping("/listExport")
-    public AjaxResult<List<TopOldOrderExportVo>> listExport(TopOldOrderQueryBo bo) {
-        List<TopOldOrderExportVo> list = iTopOldOrderService.queryReceiveListExport(bo);
-        ExcelUtil<TopOldOrderExportVo> util = new ExcelUtil<TopOldOrderExportVo>(TopOldOrderExportVo.class);
-        return util.exportExcel(list, "应收订单列表");
-    }
-
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/financial/TopCostInstTpController.java

@@ -1,119 +0,0 @@
-package com.zhongzheng.controller.financial;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.top.financial.bo.*;
-import com.zhongzheng.modules.top.financial.service.ITopCostInstTpItemService;
-import com.zhongzheng.modules.top.financial.service.ITopCostInstTpService;
-import com.zhongzheng.modules.top.financial.vo.TopCostInstTpVo;
-import com.zhongzheng.modules.top.goods.vo.TopCourseEducationTypeVo;
-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 2023-07-21
- */
-@Api(value = "供应商成本模板控制器", tags = {"供应商成本模板管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/top/cost/inst/tp")
-public class TopCostInstTpController extends BaseController {
-
-    private final ITopCostInstTpService iTopCostInstTpService;
-
-    private final ITopCostInstTpItemService iTopCostInstTpItemService;
-
-    /**
-     * 查询供应商成本模板列表
-     */
-    @ApiOperation("查询供应商成本模板列表")
-    @PreAuthorize("@ss.hasPermi('system:tp:list')")
-    @GetMapping("/list")
-    public TableDataInfo<TopCostInstTpVo> list(TopCostInstTpQueryBo bo) {
-        startPage();
-        List<Integer> statusList = new ArrayList<>();
-        statusList.add(1);
-        bo.setStatusList(statusList);
-        List<TopCostInstTpVo> list = iTopCostInstTpService.selectList(bo);
-        return getDataTable(list);
-    }
-
-    @ApiOperation("查询供应商成本模板所有业务层次列表")
-    @PreAuthorize("@ss.hasPermi('system:tp:list')")
-    @GetMapping("/businessList")
-    public AjaxResult<List<TopCourseEducationTypeVo>> businessList(TopCostInstTpItemQueryBo bo) {
-        List<TopCourseEducationTypeVo> list = iTopCostInstTpItemService.queryEduList(bo);
-        return AjaxResult.success(list);
-    }
-
-
-    /**
-     * 获取供应商成本模板详细信息
-     */
-    @ApiOperation("获取供应商成本模板详细信息")
-    @PreAuthorize("@ss.hasPermi('system:tp:query')")
-    @GetMapping("/{tpId}")
-    public AjaxResult<TopCostInstTpVo> getInfo(@PathVariable("tpId" ) Long tpId) {
-        return AjaxResult.success(iTopCostInstTpService.queryById(tpId));
-    }
-
-    /**
-     * 新增供应商成本模板
-     */
-    @ApiOperation("新增供应商成本模板")
-    @PreAuthorize("@ss.hasPermi('system:tp:add')")
-    @Log(title = "供应商成本模板", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody TopCostInstTpAddBo bo) {
-        return toAjax(iTopCostInstTpService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改供应商成本模板
-     */
-    @ApiOperation("修改供应商成本模板")
-    @PreAuthorize("@ss.hasPermi('system:tp:edit')")
-    @Log(title = "供应商成本模板", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody TopCostInstTpEditBo bo) {
-        return toAjax(iTopCostInstTpService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    @ApiOperation("供应商成本模板批量删除")
-    @PreAuthorize("@ss.hasPermi('system:tp:edit')")
-    @Log(title = "供应商成本模板批量删除", businessType = BusinessType.UPDATE)
-    @PostMapping("/deleteBatch")
-    public AjaxResult<Void> deleteBatch(@RequestBody TopCostInstTpQueryBo bo) {
-        return toAjax(iTopCostInstTpService.deleteBatch(bo) ? 1 : 0);
-    }
-
-    @ApiOperation("修改供应商成本模板默认状态")
-    @PreAuthorize("@ss.hasPermi('system:tp:edit')")
-    @Log(title = "修改供应商成本模板默认状态", businessType = BusinessType.UPDATE)
-    @PostMapping("/editDefaultStatus")
-    public AjaxResult<Void> editDefaultStatus(@RequestBody TopCostInstTpEditBo bo) {
-        return toAjax(iTopCostInstTpService.updateDefaultStatus(bo) ? 1 : 0);
-    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/financial/TopCostTpController.java

@@ -1,114 +0,0 @@
-package com.zhongzheng.controller.financial;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Arrays;
-
-
-import com.zhongzheng.modules.top.financial.bo.TopCostTpAddBo;
-import com.zhongzheng.modules.top.financial.bo.TopCostTpEditBo;
-import com.zhongzheng.modules.top.financial.bo.TopCostTpQueryBo;
-import com.zhongzheng.modules.top.financial.service.ITopCostTpService;
-import com.zhongzheng.modules.top.financial.vo.TopCostTpVo;
-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 2023-04-20
- */
-@Api(value = "成本模板控制器", tags = {"成本模板管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/financial/tp")
-public class TopCostTpController extends BaseController {
-
-    private final ITopCostTpService iTopCostTpService;
-
-    /**
-     * 查询成本模板列表
-     */
-    @ApiOperation("查询成本模板列表")
-    @PreAuthorize("@ss.hasPermi('system:tp:list')")
-    @GetMapping("/list")
-    public TableDataInfo<TopCostTpVo> list(TopCostTpQueryBo bo) {
-        startPage();
-        List<Integer> statusList = new ArrayList<>();
-        statusList.add(0);
-        statusList.add(1);
-        bo.setStatusList(statusList);
-        List<TopCostTpVo> list = iTopCostTpService.selectList(bo);
-        return getDataTable(list);
-    }
-
-
-
-    /**
-     * 获取成本模板详细信息
-     */
-    @ApiOperation("获取成本模板详细信息")
-    @PreAuthorize("@ss.hasPermi('system:tp:query')")
-    @GetMapping("/{tpId}")
-    public AjaxResult<TopCostTpVo> getInfo(@PathVariable("tpId" ) Long tpId) {
-        return AjaxResult.success(iTopCostTpService.queryById(tpId));
-    }
-
-    /**
-     * 新增成本模板
-     */
-    @ApiOperation("新增成本模板")
-    @PreAuthorize("@ss.hasPermi('system:tp:add')")
-    @Log(title = "成本模板", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody TopCostTpAddBo bo) {
-        return toAjax(iTopCostTpService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改成本模板
-     */
-    @ApiOperation("修改成本模板")
-    @PreAuthorize("@ss.hasPermi('system:tp:edit')")
-    @Log(title = "成本模板", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody TopCostTpEditBo bo) {
-        return toAjax(iTopCostTpService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-
-    @ApiOperation("修改成本模板默认状态")
-    @PreAuthorize("@ss.hasPermi('system:tp:edit')")
-    @Log(title = "成本模板", businessType = BusinessType.UPDATE)
-    @PostMapping("/editDefaultStatus")
-    public AjaxResult<Void> editDefaultStatus(@RequestBody TopCostTpEditBo bo) {
-        return toAjax(iTopCostTpService.updateDefaultStatus(bo) ? 1 : 0);
-    }
-
-
-    @ApiOperation("成本模板批量删除")
-    @PreAuthorize("@ss.hasPermi('system:tp:edit')")
-    @Log(title = "成本模板批量删除", businessType = BusinessType.UPDATE)
-    @PostMapping("/deleteBatch")
-    public AjaxResult<Void> deleteBatch(@RequestBody TopCostTpQueryBo bo) {
-        return toAjax(iTopCostTpService.deleteBatch(bo) ? 1 : 0);
-    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/financial/TopDivideLogController.java

@@ -1,169 +0,0 @@
-package com.zhongzheng.controller.financial;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.Map;
-
-import com.zhongzheng.common.constant.UserConstants;
-import com.zhongzheng.common.utils.SecurityUtils;
-import com.zhongzheng.modules.system.bo.SysTenantBadBillConfigBo;
-import com.zhongzheng.modules.top.financial.bo.TopDivideLogEditBo;
-import com.zhongzheng.modules.top.financial.bo.TopDivideLogQueryBo;
-import com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo;
-import com.zhongzheng.modules.top.financial.service.ITopDivideLogService;
-import com.zhongzheng.modules.top.financial.service.ITopDivideOrderService;
-import com.zhongzheng.modules.top.financial.vo.TopDivideLogVo;
-import com.zhongzheng.modules.top.financial.vo.TopDivideOrderVo;
-import com.zhongzheng.modules.top.goods.bo.TopOldOrderEditBo;
-import com.zhongzheng.modules.top.user.vo.TopSysConfigVo;
-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 ruoyi
- * @date 2023-05-09
- */
-@Api(value = "分成记录控制器", tags = {"分成记录管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/divide/log")
-public class TopDivideLogController extends BaseController {
-
-    private final ITopDivideLogService iTopDivideLogService;
-
-    private final ITopDivideOrderService iTopDivideOrderService;
-
-    /**
-     * 查询分成记录列表
-     */
-    @ApiOperation("查询机构分成记录列表")
-    @PreAuthorize("@ss.hasPermi('system:log:list')")
-    @PostMapping("/companyList")
-    public TableDataInfo<TopDivideLogVo> getCompanyList(@RequestBody TopDivideLogQueryBo bo) {
-        startPage();
-        List<TopDivideLogVo> list = iTopDivideLogService.getCompanyList(bo);
-        return getDataTable(list);
-    }
-
-
-    /**
-     * 分成记录修改备注
-     */
-    @ApiOperation("分成记录修改备注")
-    @PostMapping("/updateRemark")
-    public AjaxResult<Void> updateRemark(@RequestBody TopDivideLogEditBo bo) {
-        return toAjax(iTopDivideLogService.updateRemark(bo) ? 1 : 0);
-    }
-
-
-    @ApiOperation("查询业务员提成列表")
-    @PreAuthorize("@ss.hasPermi('system:log:list')")
-    @PostMapping("/sellerList")
-    public TableDataInfo<TopDivideLogVo> getSellerList(@RequestBody TopDivideLogQueryBo bo) {
-        startPage();
-        List<TopDivideLogVo> list = iTopDivideLogService.getSellerList(bo);
-        return getDataTable(list);
-    }
-
-    @ApiOperation("查询佣金列表")
-    @PreAuthorize("@ss.hasPermi('system:log:list')")
-    @PostMapping("/commissionList")
-    public TableDataInfo<TopDivideOrderVo> getCommissionList(@RequestBody TopDivideOrderQueryBo bo) {
-        startPage();
-        List<TopDivideOrderVo> list = iTopDivideLogService.getCommissionList(bo);
-        return getDataTable(list);
-    }
-
-    @ApiOperation("查询佣金打印")
-    @PreAuthorize("@ss.hasPermi('system:log:list')")
-    @PostMapping("/commissionPrint")
-    public AjaxResult<TopDivideOrderVo> getCommissionPrint(@RequestBody TopDivideOrderQueryBo bo) {
-        TopDivideOrderVo vo = iTopDivideLogService.getCommissionDetail(bo);
-        return AjaxResult.success(vo);
-    }
-
-    @ApiOperation("查询佣金结算列表统计")
-    @PreAuthorize("@ss.hasPermi('system:log:list')")
-    @GetMapping("/commissionOrderCount")
-    public AjaxResult<Map<String,Object>> commissionOrderCount(TopDivideOrderQueryBo bo) {
-        Map<String,Object> map = iTopDivideLogService.getCommissionOrderCount(bo);
-        return AjaxResult.success(map);
-    }
-
-    @ApiOperation("通过坏账配置详情")
-    @GetMapping(value = "/configKey/badBill")
-    public AjaxResult getBadBill()
-    {
-        return AjaxResult.success("配置内容",iTopDivideLogService.getBadBillConfig());
-    }
-
-    @ApiOperation("修改坏账配置")
-    @PostMapping("/updateBadBill")
-    public AjaxResult editBadBill(@Validated @RequestBody List<SysTenantBadBillConfigBo> bo)
-    {
-        return toAjax(iTopDivideLogService.updateBadBillConfig(bo));
-    }
-
-    @ApiOperation("查询月份订单列表")
-    @PreAuthorize("@ss.hasPermi('system:log:list')")
-    @GetMapping("/monthOrderList")
-    public AjaxResult<List<TopDivideOrderVo>> getMonthOrderList(TopDivideOrderQueryBo bo) {
-        List<TopDivideOrderVo> list = iTopDivideOrderService.getMonthOrderList(bo);
-        return AjaxResult.success(list);
-    }
-
-    @ApiOperation("查询月份订单统计")
-    @PreAuthorize("@ss.hasPermi('system:log:list')")
-    @GetMapping("/monthOrderCount")
-    public AjaxResult<Map<String,Object>> getMonthOrderCount(TopDivideOrderQueryBo bo) {
-        Map<String,Object> map = iTopDivideOrderService.getMonthOrderCount(bo);
-        return AjaxResult.success(map);
-    }
-
-    @ApiOperation("查询打印月份订单列表")
-    @PreAuthorize("@ss.hasPermi('system:log:list')")
-    @GetMapping("/monthOrderListWithPrint")
-    public AjaxResult<List<TopDivideOrderVo>> getMonthOrderListWithPrint(TopDivideOrderQueryBo bo) {
-        List<TopDivideOrderVo> list = iTopDivideOrderService.getMonthOrderListWithPrint(bo);
-        return AjaxResult.success(list);
-    }
-
-
-
-    /**
-     * 获取分成记录详细信息
-     */
-    @ApiOperation("获取分成记录详细信息")
-    @PreAuthorize("@ss.hasPermi('system:log:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<TopDivideLogVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iTopDivideLogService.queryById(id));
-    }
-
-    @ApiOperation("获取分成记录单据打印详细信息")
-    @PreAuthorize("@ss.hasPermi('system:log:query')")
-    @GetMapping("/withPrint/{id}")
-    public AjaxResult<TopDivideLogVo> getInfoWithPrint(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iTopDivideLogService.queryByIdWithPrint(id));
-    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/financial/TopOrderRecNoteController.java

@@ -1,86 +0,0 @@
-package com.zhongzheng.controller.financial;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.top.order.bo.TopOrderRecNoteAddBo;
-import com.zhongzheng.modules.top.order.bo.TopOrderRecNoteEditBo;
-import com.zhongzheng.modules.top.order.bo.TopOrderRecNoteQueryBo;
-import com.zhongzheng.modules.top.order.service.ITopOrderRecNoteService;
-import com.zhongzheng.modules.top.order.vo.TopOrderRecNoteVo;
-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 2023-04-24
- */
-@Api(value = "订单收款提醒控制器", tags = {"订单收款提醒管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/receive/order/note")
-public class TopOrderRecNoteController extends BaseController {
-
-    private final ITopOrderRecNoteService iTopOrderRecNoteService;
-
-
-
-    /**
-     * 获取订单收款提醒详细信息
-     */
-    @ApiOperation("获取订单收款提醒详细信息")
-    @PreAuthorize("@ss.hasPermi('system:note:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<TopOrderRecNoteVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iTopOrderRecNoteService.queryById(id));
-    }
-
-    /**
-     * 新增订单收款提醒
-     */
-    @ApiOperation("新增订单收款提醒")
-    @PreAuthorize("@ss.hasPermi('system:note:add')")
-    @Log(title = "订单收款提醒", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody TopOrderRecNoteAddBo bo) {
-        return toAjax(iTopOrderRecNoteService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改订单收款提醒
-     */
-    @ApiOperation("修改订单收款提醒")
-    @PreAuthorize("@ss.hasPermi('system:note:edit')")
-    @Log(title = "订单收款提醒", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody TopOrderRecNoteEditBo bo) {
-        return toAjax(iTopOrderRecNoteService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    @ApiOperation("批量修改订单收款提醒")
-    @PreAuthorize("@ss.hasPermi('system:note:edit')")
-    @Log(title = "批量修改订单收款提醒", businessType = BusinessType.UPDATE)
-    @PostMapping("/editBatch")
-    public AjaxResult<Void> editBatch(@RequestBody List<TopOrderRecNoteEditBo> bo) {
-        return toAjax(iTopOrderRecNoteService.updateByBatchEditBo(bo) ? 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/inform/TopInformSysUserController.java

@@ -1,112 +0,0 @@
-package com.zhongzheng.controller.inform;
-
-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.TopLoginUser;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.framework.web.service.TopTokenService;
-import com.zhongzheng.modules.top.financial.bo.TopInformSysUserAddBo;
-import com.zhongzheng.modules.top.financial.bo.TopInformSysUserEditBo;
-import com.zhongzheng.modules.top.financial.bo.TopInformSysUserQueryBo;
-import com.zhongzheng.modules.top.financial.service.ITopInformSysUserService;
-import com.zhongzheng.modules.top.financial.vo.TopInformSysUserVo;
-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 2022-08-04
- */
-@Api(value = "通知绑定系统用户控制器", tags = {"通知绑定系统用户管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/inform/sys_user")
-public class TopInformSysUserController extends BaseController {
-
-    private final ITopInformSysUserService iInformSysUserService;
-
-    private final TopTokenService tokenService;
-
-    /**
-     * 查询通知绑定系统用户列表
-     */
-    @ApiOperation("查询通知绑定系统用户列表")
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
-    @GetMapping("/list")
-    public TableDataInfo<TopInformSysUserVo> list(TopInformSysUserQueryBo bo) {
-        TopLoginUser TopLoginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setUserId(TopLoginUser.getUser().getUserId());
-        startPage();
-        List<TopInformSysUserVo> list = iInformSysUserService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 获取通知绑定系统用户详细信息
-     */
-    @ApiOperation("获取通知绑定教务用户未读消息数量")
-    @PreAuthorize("@ss.hasPermi('system:user:query')")
-    @GetMapping("/informUnReadSum")
-    public AjaxResult<Integer> informUnReadSum() {
-        TopLoginUser TopLoginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        return AjaxResult.success(iInformSysUserService.informUnReadSum(TopLoginUser.getUser().getUserId()));
-    }
-
-
-
-    /**
-     * 获取通知绑定系统用户详细信息
-     */
-    @ApiOperation("获取通知绑定系统用户详细信息")
-    @PreAuthorize("@ss.hasPermi('system:user:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<TopInformSysUserVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iInformSysUserService.queryById(id));
-    }
-
-    /**
-     * 新增通知绑定系统用户
-     */
-    @ApiOperation("新增通知绑定系统用户")
-    @PreAuthorize("@ss.hasPermi('system:user:add')")
-    @Log(title = "通知绑定系统用户", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody TopInformSysUserAddBo bo) {
-        return toAjax(iInformSysUserService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改通知绑定系统用户
-     */
-    @ApiOperation("修改通知绑定系统用户")
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
-    @Log(title = "通知绑定系统用户", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody TopInformSysUserEditBo bo) {
-        return toAjax(iInformSysUserService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-
-    /**
-     * 修改通知绑定系统用户
-     */
-    @ApiOperation("批量修改通知绑定系统用户状态")
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
-    @Log(title = "批量修改通知绑定系统用户状态", businessType = BusinessType.UPDATE)
-    @PostMapping("/updateReadStatusBatch")
-    public AjaxResult<Void> updateReadStatusBatch(@RequestBody TopInformSysUserEditBo bo) {
-        return toAjax(iInformSysUserService.updateReadStatusBatch(bo) ? 1 : 0);
-    }
-
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/mall/TopStoreController.java

@@ -1,112 +0,0 @@
-package com.zhongzheng.controller.mall;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.top.mall.bo.TopStoreAddBo;
-import com.zhongzheng.modules.top.mall.bo.TopStoreEditBo;
-import com.zhongzheng.modules.top.mall.bo.TopStoreQueryBo;
-import com.zhongzheng.modules.top.mall.service.ITopStoreService;
-import com.zhongzheng.modules.top.mall.vo.TopStoreVo;
-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 2023-05-18
- */
-@Api(value = "商户店铺管理控制器", tags = {"商户店铺管理管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/mall/store")
-public class TopStoreController extends BaseController {
-
-    private final ITopStoreService iTopStoreService;
-
-    /**
-     * 查询商户店铺管理列表
-     */
-    @ApiOperation("查询商户店铺管理列表")
-    @PreAuthorize("@ss.hasPermi('system:store:list')")
-    @GetMapping("/list")
-    public TableDataInfo<TopStoreVo> list(TopStoreQueryBo bo) {
-        startPage();
-        List<TopStoreVo> list = iTopStoreService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出商户店铺管理列表
-     */
-    @ApiOperation("导出商户店铺管理列表")
-    @PreAuthorize("@ss.hasPermi('system:store:export')")
-    @Log(title = "商户店铺管理", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<TopStoreVo> export(TopStoreQueryBo bo) {
-        List<TopStoreVo> list = iTopStoreService.queryList(bo);
-        ExcelUtil<TopStoreVo> util = new ExcelUtil<TopStoreVo>(TopStoreVo.class);
-        return util.exportExcel(list, "商户店铺管理");
-    }
-
-    /**
-     * 获取商户店铺管理详细信息
-     */
-    @ApiOperation("获取商户店铺管理详细信息")
-    @PreAuthorize("@ss.hasPermi('system:store:query')")
-    @GetMapping("/{storeId}")
-    public AjaxResult<TopStoreVo> getInfo(@PathVariable("storeId" ) Long storeId) {
-        return AjaxResult.success(iTopStoreService.queryById(storeId));
-    }
-
-    /**
-     * 新增商户店铺管理
-     */
-    @ApiOperation("新增商户店铺管理")
-    @PreAuthorize("@ss.hasPermi('system:store:add')")
-    @Log(title = "商户店铺管理", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody TopStoreAddBo bo) {
-        return toAjax(iTopStoreService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改商户店铺管理
-     */
-    @ApiOperation("修改商户店铺管理")
-    @PreAuthorize("@ss.hasPermi('system:store:edit')")
-    @Log(title = "商户店铺管理", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody TopStoreEditBo bo) {
-        return toAjax(iTopStoreService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除商户店铺管理
-     */
-    @ApiOperation("删除商户店铺管理")
-    @PreAuthorize("@ss.hasPermi('system:store:remove')")
-    @Log(title = "商户店铺管理" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{storeIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] storeIds) {
-        return toAjax(iTopStoreService.deleteWithValidByIds(Arrays.asList(storeIds), true) ? 1 : 0);
-    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOldOrderCheckLogController.java

@@ -1,125 +0,0 @@
-package com.zhongzheng.controller.order;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.common.core.domain.model.TopLoginUser;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.framework.web.service.TopTokenService;
-import com.zhongzheng.modules.top.goods.bo.TopOldOrderCheckLogAddBo;
-import com.zhongzheng.modules.top.goods.bo.TopOldOrderCheckLogEditBo;
-import com.zhongzheng.modules.top.goods.bo.TopOldOrderCheckLogQueryBo;
-import com.zhongzheng.modules.top.goods.service.ITopOldOrderCheckLogService;
-import com.zhongzheng.modules.top.goods.vo.TopOldOrderCheckLogVo;
-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 2023-04-26
- */
-@Api(value = "订单退款审核记录控制器", tags = {"订单退款审核记录管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/check/order/log")
-public class TopOldOrderCheckLogController extends BaseController {
-
-    private final ITopOldOrderCheckLogService iTopOldOrderCheckLogService;
-
-    private final TopTokenService tokenService;
-
-    /**
-     * 查询订单退款审核记录列表
-     */
-    @ApiOperation("查询审核记录列表")
-    @PreAuthorize("@ss.hasPermi('system:log:list')")
-    @GetMapping("/list")
-    public TableDataInfo<TopOldOrderCheckLogVo> list(TopOldOrderCheckLogQueryBo bo) {
-        startPage();
-        List<TopOldOrderCheckLogVo> list = iTopOldOrderCheckLogService.getCheckList(bo);
-        return getDataTable(list);
-    }
-
-
-
-    /**
-     * 获取订单退款审核记录详细信息
-     */
-    @ApiOperation("获取订单退款审核记录详细信息")
-    @PreAuthorize("@ss.hasPermi('system:log:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<TopOldOrderCheckLogVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iTopOldOrderCheckLogService.queryById(id));
-    }
-
-    /**
-     * 新增订单退款审核记录
-     */
-    @ApiOperation("新增订单退款审核记录")
-    @PreAuthorize("@ss.hasPermi('system:log:add')")
-    @Log(title = "订单退款审核记录", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody TopOldOrderCheckLogAddBo bo) {
-        return toAjax(iTopOldOrderCheckLogService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改订单退款审核记录
-     */
-    @ApiOperation("修改订单分成审核记录")
-    @PreAuthorize("@ss.hasPermi('system:log:edit')")
-    @Log(title = "订单退款审核记录", businessType = BusinessType.UPDATE)
-    @PostMapping("/editDivide")
-    public AjaxResult<Void> editDivide(@RequestBody TopOldOrderCheckLogEditBo bo) {
-        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setLoginId(loginUser.getUser().getUserId());
-        bo.setLoginName(loginUser.getUser().getUserName());
-        return toAjax(iTopOldOrderCheckLogService.updateDivideByEditBo(bo) ? 1 : 0);
-    }
-
-
-    @ApiOperation("批量修改订单分成审核记录")
-    @PreAuthorize("@ss.hasPermi('system:log:edit')")
-    @Log(title = "批量修改订单分成审核记录", businessType = BusinessType.UPDATE)
-    @PostMapping("/updateBatchDivideByEditBo")
-    public AjaxResult<Void> updateBatchDivideByEditBo(@RequestBody List<TopOldOrderCheckLogEditBo> bo) {
-        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        for(TopOldOrderCheckLogEditBo editBo : bo){
-            editBo.setLoginId(loginUser.getUser().getUserId());
-            editBo.setLoginName(loginUser.getUser().getUserName());
-        }
-        return toAjax(iTopOldOrderCheckLogService.updateBatchDivideByEditBo(bo) ? 1 : 0);
-    }
-
-    @ApiOperation("批量修改月份分成审核记录")
-    @PreAuthorize("@ss.hasPermi('system:log:edit')")
-    @Log(title = "批量修改月份分成审核记录", businessType = BusinessType.UPDATE)
-    @PostMapping("/updateBatchDivideByMonthEditBo")
-    public AjaxResult<Void> updateBatchDivideByMonthEditBo(@RequestBody List<TopOldOrderCheckLogEditBo> bo) {
-        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        for(TopOldOrderCheckLogEditBo editBo : bo){
-            editBo.setLoginId(loginUser.getUser().getUserId());
-            editBo.setLoginName(loginUser.getUser().getUserName());
-        }
-        return toAjax(iTopOldOrderCheckLogService.updateBatchDivideByMonthEditBo(bo) ? 1 : 0);
-    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOldOrderController.java

@@ -1,362 +0,0 @@
-package com.zhongzheng.controller.order;
-
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-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.EasyPoiUtil;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.framework.web.service.TopTokenService;
-import com.zhongzheng.modules.bank.vo.QuestionImportV2;
-import com.zhongzheng.modules.top.financial.bo.OrderRefundPayBo;
-import com.zhongzheng.modules.top.financial.bo.TopDivideLogQueryBo;
-import com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo;
-import com.zhongzheng.modules.top.financial.vo.OrderRefundPayDetailVo;
-import com.zhongzheng.modules.top.financial.vo.TopCostTpVo;
-import com.zhongzheng.modules.top.financial.vo.TopOrderLogVo;
-import com.zhongzheng.modules.top.goods.bo.*;
-import com.zhongzheng.modules.top.goods.service.ITopOldOrderService;
-import com.zhongzheng.modules.top.goods.vo.*;
-import com.zhongzheng.modules.top.order.bo.TopOldOrderCustomerBo;
-import com.zhongzheng.modules.top.order.vo.TopOldOrderCommissionExportVo;
-import com.zhongzheng.modules.top.order.vo.TopOldOrderCompanyExportVo;
-import com.zhongzheng.modules.top.order.vo.TopOldOrderSellerExportVo;
-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 org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 订单Controller
- *
- * @author ruoyi
- * @date 2023-04-20
- */
-@Api(value = "订单控制器", tags = {"订单管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/top/order")
-public class TopOldOrderController extends BaseController {
-
-    private final ITopOldOrderService iTopOldOrderService;
-
-    private final TopTokenService tokenService;
-
-    /**
-     * 查询订单列表
-     */
-    @ApiOperation("查询订单列表")
-    @GetMapping("/list")
-    public TableDataInfo<TopOldOrderVo> list(TopOldOrderQueryBo bo) {
-        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setLoginId(loginUser.getUser().getUserId());
-        startPage();
-        List<TopOldOrderVo> list = iTopOldOrderService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出订单列表
-     */
-    @ApiOperation("导出订单列表")
-    @GetMapping("/export")
-    public AjaxResult<TopOldOrderVo> export(TopOldOrderQueryBo bo) {
-
-        List<TopOldOrderVo> list = iTopOldOrderService.queryList(bo);
-        ExcelUtil<TopOldOrderVo> util = new ExcelUtil<TopOldOrderVo>(TopOldOrderVo.class);
-        return util.exportExcel(list, "订单信息");
-    }
-
-    /**
-     * 获取订单详细信息
-     */
-    @ApiOperation("获取订单详细信息")
-    @GetMapping("/{orderSn}")
-    public AjaxResult<TopOldOrderVo> getInfo(@PathVariable("orderSn" ) String orderSn) {
-        return AjaxResult.success(iTopOldOrderService.queryById(orderSn));
-    }
-
-    /**
-     * 获取订单商品信息
-     */
-    @ApiOperation("获取订单商品信息")
-    @GetMapping("/goods/list")
-    public TableDataInfo<TopOldOrderGoodsListVo> getOrderGoodsList(TopOldOrderGoodsQuery query) {
-        startPage();
-        List<TopOldOrderGoodsListVo> list = iTopOldOrderService.getOrderGoodsList(query);
-        return getDataTable(list);
-    }
-
-    /**
-     * 订单学员审核列表
-     */
-    @ApiOperation("订单学员审核列表")
-    @GetMapping("/goods/apply/list/{orderSn}")
-    public AjaxResult<TopOldOrderUpVo> getOrderGoodsApplyList(@PathVariable("orderSn" ) String orderSn) {
-        return AjaxResult.success(iTopOldOrderService.getOrderGoodsApplyList(orderSn));
-    }
-
-    /**
-     * 订单发票信息
-     */
-    @ApiOperation("订单发票信息")
-    @GetMapping("/invoice/list/{orderSn}")
-    public AjaxResult<List<TopOldOrderInvoiceVo>> getOrderInvoiceList(@PathVariable("orderSn" ) String orderSn) {
-        return AjaxResult.success(iTopOldOrderService.getOrderInvoiceList(orderSn));
-    }
-
-    /**
-     * 订单学员信息导出
-     */
-    @ApiOperation("订单学员信息导出")
-    @GetMapping("/student/export")
-    public AjaxResult<TopOldOrderGoodsListVo> exportStudent(TopOldOrderGoodsQuery bo) {
-        List<TopOldOrderGoodsListVo> list = iTopOldOrderService.getOrderGoodsList(bo);
-        ExcelUtil<TopOldOrderGoodsListVo> util = new ExcelUtil<TopOldOrderGoodsListVo>(TopOldOrderGoodsListVo.class);
-        return util.exportExcel(list, "订单学员信息");
-    }
-
-    /**
-     * 新增订单
-     */
-    @ApiOperation("新增订单")
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody TopOldOrderAddBo bo) {
-        return toAjax(iTopOldOrderService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改订单
-     */
-    @ApiOperation("修改订单")
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody TopOldOrderEditBo bo) {
-        return toAjax(iTopOldOrderService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 订单审核
-     */
-    @ApiOperation("订单审核")
-    @PostMapping("/check")
-    public AjaxResult<Void> checkOrder(@RequestBody TopOldOrderCheckBo bo) {
-        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setLoginId(loginUser.getUser().getUserId());
-        bo.setLoginName(loginUser.getUser().getUserName());
-        return toAjax(iTopOldOrderService.checkOrder(bo) ? 1 : 0);
-    }
-
-    /**
-     * 订单学员审核
-     */
-    @ApiOperation("订单学员审核")
-    @PostMapping("/check/student")
-    public AjaxResult<Void> checkOrderStudent(@RequestBody TopOldOrderCheckBo bo) {
-        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setLoginId(loginUser.getUser().getUserId());
-        bo.setLoginName(loginUser.getUser().getUserName());
-        return toAjax(iTopOldOrderService.checkOrderStudent(bo) ? 1 : 0);
-    }
-
-
-    @ApiOperation("业务员提成列表")
-    @PreAuthorize("@ss.hasPermi('system:tp:list')")
-    @GetMapping("/divSellerList")
-    public TableDataInfo<TopOldOrderVo> divSellerList(TopOldOrderQueryBo bo) {
-        startPage();
-        List<TopOldOrderVo> list = iTopOldOrderService.queryDivSellerList(bo);
-        return getDataTable(list);
-    }
-
-    @ApiOperation("业务员提成列表导出")
-    @PreAuthorize("@ss.hasPermi('system:tp:list')")
-    @GetMapping("/sellerListExport")
-    public AjaxResult<List<TopOldOrderSellerExportVo>> sellerListExport(TopDivideLogQueryBo bo) {
-        List<TopOldOrderSellerExportVo> list = iTopOldOrderService.sellerListExport(bo);
-        ExcelUtil<TopOldOrderSellerExportVo> util = new ExcelUtil<TopOldOrderSellerExportVo>(TopOldOrderSellerExportVo.class);
-        return util.exportExcel(list, "机构分成列表");
-    }
-
-    @ApiOperation("佣金结算列表导出")
-    @PreAuthorize("@ss.hasPermi('system:tp:list')")
-    @GetMapping("/commissionListExport")
-    public AjaxResult<List<TopOldOrderSellerExportVo>> commissionListExport(TopDivideOrderQueryBo bo) {
-        List<TopOldOrderCommissionExportVo> list = iTopOldOrderService.commissionListExport(bo);
-
-        ExcelUtil<TopOldOrderCommissionExportVo> util = new ExcelUtil<TopOldOrderCommissionExportVo>(TopOldOrderCommissionExportVo.class);
-        return util.exportExcel(list, "佣金结算列表");
-    }
-
-
-
-    @ApiOperation("机构分成列表")
-    @PreAuthorize("@ss.hasPermi('system:tp:list')")
-    @GetMapping("/queryTenantList")
-    public TableDataInfo<TopOldOrderVo> queryTenantList(TopOldOrderQueryBo bo) {
-        startPage();
-        List<TopOldOrderVo> list = iTopOldOrderService.queryTenantList(bo);
-        return getDataTable(list);
-    }
-
-    @ApiOperation("机构分成列表导出")
-    @PreAuthorize("@ss.hasPermi('system:tp:list')")
-    @GetMapping("/tenantListExport")
-    public AjaxResult<List<TopOldOrderCompanyExportVo>> tenantListExport(TopDivideLogQueryBo bo) {
-        List<TopOldOrderCompanyExportVo> list = iTopOldOrderService.tenantListExport(bo);
-        ExcelUtil<TopOldOrderCompanyExportVo> util = new ExcelUtil<TopOldOrderCompanyExportVo>(TopOldOrderCompanyExportVo.class);
-        return util.exportExcel(list, "机构分成列表");
-    }
-
-    /**
-     * 订单修改备注
-     */
-    @ApiOperation("订单修改备注")
-    @PostMapping("/updateRemark")
-    public AjaxResult<Void> updateRemark(@RequestBody TopOldOrderEditBo bo) {
-        return toAjax(iTopOldOrderService.updateRemark(bo) ? 1 : 0);
-    }
-
-    /**
-     * 订单退款审核详情
-     */
-    @ApiOperation("订单退款审核详情")
-    @GetMapping("/refund/detail/{orderSn}")
-    public AjaxResult<TopRefundOrderDetailVo> refundOrderDetail(@PathVariable("orderSn") String orderSn) {
-        return AjaxResult.success(iTopOldOrderService.refundOrderDetail(orderSn));
-    }
-
-
-    /**
-     * 订单退款审核
-     */
-    @ApiOperation("订单退款审核")
-    @PostMapping("/refund/check")
-    public AjaxResult<Void> refundOrderCheck(@RequestBody TopRefundOrderCheckBo bo) {
-        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setLoginId(loginUser.getUser().getUserId());
-        bo.setLoginName(loginUser.getUser().getUserName());
-        return toAjax(iTopOldOrderService.refundOrderCheck(bo) ? 1 : 0);
-    }
-
-    /**
-     * 批量修改订单备注
-     */
-    @ApiOperation("批量修改订单备注")
-    @PostMapping("/update/remark")
-    public AjaxResult<Void> updateRemark(@RequestBody TopUpdateRemarkBo bo) {
-        return toAjax(iTopOldOrderService.updateFinanceRemark(bo) ? 1 : 0);
-    }
-
-    /**
-     * 批量完单
-     */
-    @ApiOperation("批量完单")
-    @PostMapping("/finish")
-    public AjaxResult<Void> finishOrder(@RequestBody TopFinishOrderBo bo) {
-        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setLoginId(loginUser.getUser().getUserId());
-        bo.setLoginName(loginUser.getUser().getUserName());
-        return toAjax(iTopOldOrderService.finishOrder(bo) ? 1 : 0);
-    }
-
-    /**
-     * 订单统计
-     */
-    @ApiOperation("订单统计")
-    @GetMapping("/statistics")
-    public AjaxResult<TopOrderStatisticsVo> statisticsOrder(TopOldOrderQueryBo bo) {
-        return AjaxResult.success(iTopOldOrderService.statisticsOrder(bo));
-    }
-
-    @ApiOperation("订单应收应付统计")
-    @PostMapping("/countOrderNum")
-    public AjaxResult<Map<String, Object>> countOrderNum(@RequestBody TopOldOrderQueryBo bo) {
-        return AjaxResult.success(iTopOldOrderService.countOrderNum(bo));
-    }
-
-    /**
-     * 订单成本
-     */
-    @ApiOperation("获取订单成本设置")
-    @GetMapping("/cost/{orderSn}")
-    public AjaxResult<TopCostTpVo> getOrderCost(@PathVariable("orderSn") String orderSn) {
-        return AjaxResult.success(iTopOldOrderService.getOrderCost(orderSn));
-    }
-
-    /**
-     * 订单成本修改
-     */
-    @ApiOperation("批量订单成本修改")
-    @PostMapping("/update/cost")
-    public AjaxResult<Void> updateOrderCost(@RequestBody TopUpdateCostBo bo) {
-        return toAjax(iTopOldOrderService.updateOrderCost(bo) ? 1 : 0);
-    }
-
-
-    @ApiOperation("订单分成审核详情")
-    @GetMapping("/divide/detail")
-    public AjaxResult<TopOldOrderVo> divideOrderDetail(TopOldOrderCheckLogQueryBo bo) {
-        return AjaxResult.success(iTopOldOrderService.divideOrderDetail(bo));
-    }
-
-    /**
-     * 订单操作记录
-     */
-    @ApiOperation("订单操作记录")
-    @GetMapping("/log")
-    public TableDataInfo<TopOrderLogVo> logList(TopOldOrderQueryBo bo) {
-        startPage();
-        List<TopOrderLogVo> list = iTopOldOrderService.logList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 订单退款支付
-     */
-    @ApiOperation("订单退款支付")
-    @PostMapping("/refund/pay")
-    public AjaxResult<Void> orderRefundPay(@RequestBody OrderRefundPayBo bo) {
-        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setLoginId(loginUser.getUser().getUserId());
-        bo.setLoginName(loginUser.getUser().getUserName());
-        return toAjax(iTopOldOrderService.orderRefundPay(bo) ? 1 : 0);
-    }
-
-    /**
-     * 机构账号信息
-     */
-    @ApiOperation("机构账号信息")
-    @GetMapping("/refund/pay/detail/{orderSn}")
-    public AjaxResult<OrderRefundPayDetailVo> getOrderRefundPayDetail(@PathVariable("orderSn")String orderSn) {
-        return AjaxResult.success(iTopOldOrderService.getOrderRefundPayDetail(orderSn));
-    }
-
-    /**
-     * 订单导入
-     */
-    @ApiOperation("订单导入")
-    @PostMapping("/customer/import")
-    public AjaxResult importOldOrderCustomer(MultipartFile file) {
-        List<TopOldOrderCustomerBo> customerBos = EasyPoiUtil.importExcel(file,0,1,TopOldOrderCustomerBo.class);
-        iTopOldOrderService.importOldOrderCustomer(customerBos);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 订单发票上传
-     */
-    @ApiOperation("订单发票上传")
-    @PostMapping("/invoice/upload")
-    public AjaxResult<Void> invoiceUpload(@RequestBody TopInvoiceUploadBo bo) {
-        return toAjax(iTopOldOrderService.invoiceUpload(bo) ? 1 : 0);
-    }
-
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOldOrderGoodsController.java

@@ -1,105 +0,0 @@
-package com.zhongzheng.controller.order;
-
-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.top.goods.bo.TopOldOrderGoodsAddBo;
-import com.zhongzheng.modules.top.goods.bo.TopOldOrderGoodsEditBo;
-import com.zhongzheng.modules.top.goods.bo.TopOldOrderGoodsQueryBo;
-import com.zhongzheng.modules.top.goods.service.ITopOldOrderGoodsService;
-import com.zhongzheng.modules.top.goods.vo.TopOldOrderGoodsVo;
-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-04-20
- */
-@Api(value = "订单商品控制器", tags = {"订单商品管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/order/goods")
-public class TopOldOrderGoodsController extends BaseController {
-
-    private final ITopOldOrderGoodsService iTopOldOrderGoodsService;
-
-    /**
-     * 查询订单商品列表
-     */
-    @ApiOperation("查询订单商品列表")
-    @PreAuthorize("@ss.hasPermi('system:goods:list')")
-    @GetMapping("/list")
-    public TableDataInfo<TopOldOrderGoodsVo> list(TopOldOrderGoodsQueryBo bo) {
-        startPage();
-        List<TopOldOrderGoodsVo> list = iTopOldOrderGoodsService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出订单商品列表
-     */
-    @ApiOperation("导出订单商品列表")
-    @PreAuthorize("@ss.hasPermi('system:goods:export')")
-    @Log(title = "订单商品", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<TopOldOrderGoodsVo> export(TopOldOrderGoodsQueryBo bo) {
-        List<TopOldOrderGoodsVo> list = iTopOldOrderGoodsService.queryList(bo);
-        ExcelUtil<TopOldOrderGoodsVo> util = new ExcelUtil<TopOldOrderGoodsVo>(TopOldOrderGoodsVo.class);
-        return util.exportExcel(list, "订单商品");
-    }
-
-    /**
-     * 获取订单商品详细信息
-     */
-    @ApiOperation("获取订单商品详细信息")
-    @PreAuthorize("@ss.hasPermi('system:goods:query')")
-    @GetMapping("/{orderGoodsId}")
-    public AjaxResult<TopOldOrderGoodsVo> getInfo(@PathVariable("orderGoodsId" ) Long orderGoodsId) {
-        return AjaxResult.success(iTopOldOrderGoodsService.queryById(orderGoodsId));
-    }
-
-    /**
-     * 新增订单商品
-     */
-    @ApiOperation("新增订单商品")
-    @PreAuthorize("@ss.hasPermi('system:goods:add')")
-    @Log(title = "订单商品", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody TopOldOrderGoodsAddBo bo) {
-        return toAjax(iTopOldOrderGoodsService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改订单商品
-     */
-    @ApiOperation("修改订单商品")
-    @PreAuthorize("@ss.hasPermi('system:goods:edit')")
-    @Log(title = "订单商品", businessType = BusinessType.UPDATE)
-    @PutMapping()
-    public AjaxResult<Void> edit(@RequestBody TopOldOrderGoodsEditBo bo) {
-        return toAjax(iTopOldOrderGoodsService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除订单商品
-     */
-    @ApiOperation("删除订单商品")
-    @PreAuthorize("@ss.hasPermi('system:goods:remove')")
-    @Log(title = "订单商品" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{orderGoodsIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] orderGoodsIds) {
-        return toAjax(iTopOldOrderGoodsService.deleteWithValidByIds(Arrays.asList(orderGoodsIds), true) ? 1 : 0);
-    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOldOrderRepController.java

@@ -1,159 +0,0 @@
-package com.zhongzheng.controller.order;
-
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-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.exception.CustomException;
-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.TopTokenService;
-import com.zhongzheng.modules.top.goods.service.ITopOldOrderService;
-import com.zhongzheng.modules.top.order.bo.*;
-import com.zhongzheng.modules.top.order.vo.TopOldOrderQuestionVo;
-import com.zhongzheng.modules.top.order.vo.TopOldOrderRepDetailVo;
-import com.zhongzheng.modules.top.order.vo.TopOldOrderRepVo;
-import com.zhongzheng.modules.top.order.vo.TopQuestionImportVo;
-import com.zhongzheng.modules.user.bo.UserDataImportBo;
-import com.zhongzheng.modules.user.vo.UserExportVo;
-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 org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-
-/**
- * 订单Controller
- *
- * @author ruoyi
- * @date 2023-04-20
- */
-@Api(value = "订单明细控制器", tags = {"订单明细控制器"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/top/order/rep")
-public class TopOldOrderRepController extends BaseController {
-
-    private final ITopOldOrderService iTopOldOrderService;
-
-    private final TopTokenService tokenService;
-    /**
-     * 查询订单列表
-     */
-    @ApiOperation("查询订单列表")
-    @GetMapping("/list")
-    public TableDataInfo<TopOldOrderRepVo> list(TopOrderRepQueryBo bo) {
-        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setLoginId(loginUser.getUser().getUserId());
-        startPage();
-        List<TopOldOrderRepVo> list = iTopOldOrderService.queryOrderRepList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 查询订单列表
-     */
-    @ApiOperation("查询订单详情")
-    @GetMapping("/goods/detail")
-    public TableDataInfo<TopOldOrderRepDetailVo> getOrderDetailList(TopOrderRepGoodsQueryBo queryBo) {
-        startPage();
-        List<TopOldOrderRepDetailVo> orderDetailList = iTopOldOrderService.getOrderDetailList(queryBo);
-        return getDataTable(orderDetailList);
-    }
-
-    /**
-     * 订单明细修改
-     */
-    @ApiOperation("订单明细修改")
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody TopOrderRepEditBo editBo) {
-        return toAjax(iTopOldOrderService.editOrderRepList(editBo) ? 1 : 0);
-    }
-
-    /**
-     * 订单明细修改
-     */
-    @ApiOperation("订单明细详情修改")
-    @PostMapping("/detail/edit")
-    public AjaxResult<Void> editOrderRepDetail(@RequestBody TopOrderRepDetailEditBo editBo) {
-        return toAjax(iTopOldOrderService.editOrderRepDetail(editBo) ? 1 : 0);
-    }
-
-    /**
-     * 订单题库开通列表
-     */
-    @ApiOperation("订单题库开通列表")
-    @GetMapping("/question/list")
-    public AjaxResult<List<TopOldOrderQuestionVo>> getOrderQuestionList(TopRepQuestionQueryBo queryBo) {
-        List<TopOldOrderQuestionVo> list =  iTopOldOrderService.getOrderQuestionList(queryBo);
-        return AjaxResult.success(list);
-    }
-
-    /**
-     * 订单题库开通详情
-     */
-    @ApiOperation("订单题库开通详情")
-    @GetMapping("/question/detail")
-    public AjaxResult<TopOldOrderQuestionVo> getOrderQuestionDetail(TopRepQuestionQueryBo queryBo) {
-        TopOldOrderQuestionVo vo =  iTopOldOrderService.getOrderQuestionDetail(queryBo);
-        return AjaxResult.success(vo);
-    }
-
-    /**
-     * 新增订单题库开通记录
-     */
-    @ApiOperation("新增订单题库开通记录")
-    @PostMapping("/save/question")
-    public AjaxResult<Void> saveOrderQuestion(@RequestBody TopOrderRepQuestionBo bo) {
-        return toAjax(iTopOldOrderService.saveOrderQuestion(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除订单题库开通记录
-     */
-    @ApiOperation("删除订单题库开通记录")
-    @GetMapping("/del/question/{id}")
-    public AjaxResult<Void> delOrderQuestion(@PathVariable("id") Long id) {
-        return toAjax(iTopOldOrderService.delOrderQuestion(id) ? 1 : 0);
-    }
-
-    /**
-     * 账单记录
-     */
-    @ApiOperation("账单记录")
-    @GetMapping("/bill/export")
-    public AjaxResult<Void> billExport(TopOrderRepQueryBo queryBo) {
-        List<TopOrderBillExportVo> list = iTopOldOrderService.billExportList(queryBo);
-        ExcelUtil<TopOrderBillExportVo> util = new ExcelUtil<TopOrderBillExportVo>(TopOrderBillExportVo.class);
-        return util.exportExcel(list,"账单明细");
-    }
-
-    /**
-     * 订单题库开通记录导入
-     */
-    @ApiOperation("订单题库开通记录导入")
-    @PostMapping("/import/question")
-    public AjaxResult<TopQuestionImportVo> importOrderQuestion(MultipartFile file) {
-        List<TopOrderQuestionImportBo> questionImportBos = EasyPoiUtil.importExcel(file,0,1,TopOrderQuestionImportBo.class);
-        if (CollectionUtils.isEmpty(questionImportBos)){
-            throw new CustomException("导入文件格式不正确或文件为空，请检查文件!");
-        }
-        TopQuestionImportVo vo = iTopOldOrderService.importOrderQuestion(questionImportBos);
-        return AjaxResult.success(vo);
-    }
-
-    /**
-     * 批量新增订单题库开通记录
-     */
-    @ApiOperation("批量新增订单题库开通记录")
-    @PostMapping("/batch/save/question")
-    public AjaxResult<Void> batchSaveOrderQuestion(@RequestBody List<TopOrderRepQuestionBo> bos) {
-        return toAjax(iTopOldOrderService.batchSaveOrderQuestion(bos) ? 1 : 0);
-    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOrderAcceptanceController.java

@@ -1,152 +0,0 @@
-package com.zhongzheng.controller.order;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.fastjson.JSON;
-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.domain.model.TopLoginUser;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.common.utils.poi.EasyPoiUtil;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.modules.course.bo.CourseSectionBusinessAddBo;
-import com.zhongzheng.modules.course.vo.CourseChapterSectionImport;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityPosterQueryBo;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityPosterVo;
-import com.zhongzheng.modules.top.goods.bo.TopOldOrderAddBo;
-import com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo;
-import com.zhongzheng.modules.top.goods.vo.TopOldOrderVo;
-import com.zhongzheng.modules.top.order.bo.*;
-import com.zhongzheng.modules.top.order.service.ITopOrderAcceptanceService;
-import com.zhongzheng.modules.top.order.vo.TopOrderAcceptanceStatisticsVo;
-import com.zhongzheng.modules.top.order.vo.TopOrderAcceptanceVo;
-import com.zhongzheng.modules.user.bo.UserImportAddBo;
-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 org.springframework.web.multipart.MultipartFile;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * 订单认款Controller
- *
- * @author ruoyi
- * @date 2023-04-20
- */
-@Api(value = "订单认款", tags = {"订单认款"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/top/acceptance")
-public class TopOrderAcceptanceController extends BaseController {
-
-    private final ITopOrderAcceptanceService iTopOrderAcceptanceService;
-
-    /**
-     * 查询认款列表
-     */
-    @ApiOperation("查询认款列表")
-    @GetMapping("/list")
-    public TableDataInfo<TopOrderAcceptanceVo> list(TopOrderAcceptanceBo bo) {
-        startPage();
-        List<TopOrderAcceptanceVo> list = iTopOrderAcceptanceService.queryAcceptanceList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 查询认款统计
-     */
-    @ApiOperation("查询认款统计")
-    @GetMapping("/statistics")
-    public AjaxResult<TopOrderAcceptanceStatisticsVo> statistics() {
-        TopOrderAcceptanceStatisticsVo vo = iTopOrderAcceptanceService.statistics();
-        return AjaxResult.success(vo);
-    }
-
-    /**
-     * 认款订单列表
-     */
-    @ApiOperation("认款订单列表")
-    @GetMapping("/order/list")
-    public TableDataInfo<TopOldOrderVo> getAcceptanceOrderList(TopAcceptanceOrderBo bo) {
-        startPage();
-        List<TopOldOrderVo> list = iTopOrderAcceptanceService.getAcceptanceOrderList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 认款关联订单列表
-     */
-    @ApiOperation("认款关联订单列表")
-    @GetMapping("/order/rel/{acceptanceId}")
-    public AjaxResult<List<TopOldOrderVo>> getAcceptanceOrderRelList(@PathVariable("acceptanceId")Long acceptanceId) {
-        List<TopOldOrderVo> list = iTopOrderAcceptanceService.getAcceptanceOrderRelList(acceptanceId);
-        return AjaxResult.success(list);
-    }
-
-    /**
-     * 订单认款
-     */
-    @ApiOperation("订单认款")
-    @PostMapping("/rel")
-    public AjaxResult<Void> addOrderAcceptanceRel(@RequestBody TopOrderAcceptanceRelBo bo) {
-        return toAjax(iTopOrderAcceptanceService.addOrderAcceptanceRel(bo) ? 1 : 0);
-    }
-
-
-    /**
-     * 新增认款记录
-     */
-    @ApiOperation("新增认款记录")
-    @PostMapping("/save")
-    public AjaxResult<Void> add(@RequestBody TopOrderAcceptanceAddBo bo) {
-        return toAjax(iTopOrderAcceptanceService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除认款记录
-     */
-    @ApiOperation("删除认款记录")
-    @PostMapping("/delete")
-    public AjaxResult<Void> add(@RequestBody TopOrderAcceptanceBo bo) {
-        return toAjax(iTopOrderAcceptanceService.deleteByAddBo(bo) ? 1 : 0);
-    }
-
-    @ApiOperation("认款记录导入")
-    @PostMapping("/importData")
-    public AjaxResult<Void> importData(MultipartFile files) {
-        ExcelUtil<TopOrderAcceptanceExportBo> util = new ExcelUtil<TopOrderAcceptanceExportBo>(TopOrderAcceptanceExportBo.class);
-        List<TopOrderAcceptanceExportBo> acceptanceExportBos;
-        try {
-            acceptanceExportBos = util.importExcel(files.getInputStream());
-        }catch (Exception e){
-            e.printStackTrace();
-            throw new IllegalArgumentException("模板格式不正确,请重新下载模板");
-        }
-        return toAjax(iTopOrderAcceptanceService.importData(acceptanceExportBos)? 1 : 0);
-    }
-
-    /**
-     * 导出【请填写功能名称】列表
-     */
-    @ApiOperation("认款记录导出")
-    @GetMapping("/export")
-    public AjaxResult<DistributionActivityPosterVo> export(TopOrderAcceptanceBo bo) {
-        List<TopOrderAcceptanceVo> list = iTopOrderAcceptanceService.queryAcceptanceList(bo);
-        List<TopOrderAcceptanceExportBo> collect = list.stream().map(item -> {
-            TopOrderAcceptanceExportBo exportBo = BeanUtil.toBean(item, TopOrderAcceptanceExportBo.class);
-            exportBo.setIncomeTimeStr(DateUtils.timestampToDateFormat(item.getIncomeTime(),"yyyy/MM/dd"));
-            return exportBo;
-        }).collect(Collectors.toList());
-        ExcelUtil<TopOrderAcceptanceExportBo> util = new ExcelUtil<TopOrderAcceptanceExportBo>(TopOrderAcceptanceExportBo.class);
-        return util.exportExcel(collect, "认款记录表");
-    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOrderBankPayController.java

@@ -1,64 +0,0 @@
-package com.zhongzheng.controller.order;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.common.core.domain.model.TopLoginUser;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.framework.web.service.TopTokenService;
-import com.zhongzheng.modules.top.order.bo.TopOrderBankPayAddBo;
-import com.zhongzheng.modules.top.order.bo.TopOrderBankPayEditBo;
-import com.zhongzheng.modules.top.order.bo.TopOrderBankPayQueryBo;
-import com.zhongzheng.modules.top.order.service.ITopOrderBankPayService;
-import com.zhongzheng.modules.top.order.vo.TopOrderBankPayVo;
-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 2023-05-08
- */
-@Api(value = "订单网银打款控制器", tags = {"订单网银打款管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/order/bank/pay")
-public class TopOrderBankPayController extends BaseController {
-
-    private final ITopOrderBankPayService iTopOrderBankPayService;
-
-    private final TopTokenService tokenService;
-
-    /**
-     * 新增订单网银打款
-     */
-    @ApiOperation("新增订单网银打款")
-    @PreAuthorize("@ss.hasPermi('system:pay:add')")
-    @Log(title = "订单网银打款", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody TopOrderBankPayAddBo bo) {
-        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setLoginId(loginUser.getUser().getUserId());
-        bo.setLoginName(loginUser.getUser().getUserName());
-        return toAjax(iTopOrderBankPayService.payToCompany(bo) ? 1 : 0);
-    }
-
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOrderStatisticsController.java

@@ -1,167 +0,0 @@
-package com.zhongzheng.controller.order;
-
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.framework.web.service.TopTokenService;
-import com.zhongzheng.modules.top.goods.service.ITopOldOrderService;
-import com.zhongzheng.modules.top.order.bo.TopOrderStatisticsBo;
-import com.zhongzheng.modules.top.order.bo.TopOrderStatisticsViewBo;
-import com.zhongzheng.modules.top.order.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-04-20
- */
-@Api(value = "订单统计控制器", tags = {"订单统计控制器"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/top/order/statistics")
-public class TopOrderStatisticsController extends BaseController {
-
-    private final ITopOldOrderService iTopOldOrderService;
-
-    private final TopTokenService tokenService;
-
-    /**
-     * 下单客户订单金额统计
-     */
-    @ApiOperation("下单客户订单金额统计")
-    @GetMapping("/money")
-    public TableDataInfo<TopOrderStatisticsMoneyVo> orderMoneyStatisticsList(TopOrderStatisticsBo bo) {
-        startPage();
-        List<TopOrderStatisticsMoneyVo> list = iTopOldOrderService.orderMoneyStatisticsList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 下单客户订单数量统计
-     */
-    @ApiOperation("下单客户订单数量统计")
-    @GetMapping("/num")
-    public TableDataInfo<TopOrderStatisticsNumVo> orderNumStatisticsList(TopOrderStatisticsBo bo) {
-        startPage();
-        List<TopOrderStatisticsNumVo> list = iTopOldOrderService.orderNumStatisticsList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 下单客户订单走势图
-     */
-    @ApiOperation("下单客户订单走势图")
-    @GetMapping("/view")
-    public AjaxResult<TopOrderStatisticsViewVo> orderStatisticsView(TopOrderStatisticsViewBo bo) {
-        return AjaxResult.success(iTopOldOrderService.orderStatisticsView(bo));
-    }
-
-    /**
-     * 下单客户订单详情
-     */
-    @ApiOperation("下单客户订单详情")
-    @GetMapping("/detail")
-    public TableDataInfo<TopOrderStatisticsDetailVo> orderStatisticsDetail(TopOrderStatisticsBo bo) {
-        startPage();
-        List<TopOrderStatisticsDetailVo> list = iTopOldOrderService.orderStatisticsDetail(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 下单客户订单金额统计
-     */
-    @ApiOperation("机构订单金额统计")
-    @GetMapping("/moneyByTenant")
-    public TableDataInfo<TopOrderStatisticsMoneyVo> orderMoneyTenantStatistics(TopOrderStatisticsBo bo) {
-        startPage();
-        List<TopOrderStatisticsMoneyVo> list = iTopOldOrderService.orderMoneyTenantStatistics(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 下单客户订单数量统计
-     */
-    @ApiOperation("机构订单数量统计")
-    @GetMapping("/numByTenant")
-    public TableDataInfo<TopOrderStatisticsNumVo> orderNumTenantStatistics(TopOrderStatisticsBo bo) {
-        startPage();
-        List<TopOrderStatisticsNumVo> list = iTopOldOrderService.orderNumTenantStatistics(bo);
-        return getDataTable(list);
-    }
-
-    @ApiOperation("业务层次订单金额统计")
-    @GetMapping("/moneyByBusiness")
-    public TableDataInfo<TopOrderStatisticsMoneyVo> businessOrderMoney(TopOrderStatisticsBo bo) {
-        startPage();
-        List<TopOrderStatisticsMoneyVo> list = iTopOldOrderService.getBusinessOrderMoney(bo);
-        return getDataTable(list);
-    }
-
-    @ApiOperation("业务层次订单数量统计")
-    @GetMapping("/numByBusiness")
-    public TableDataInfo<TopOrderStatisticsNumVo> businessOrderNum(TopOrderStatisticsBo bo) {
-        startPage();
-        List<TopOrderStatisticsNumVo> list = iTopOldOrderService.getBusinessOrderNum(bo);
-        return getDataTable(list);
-    }
-
-    @ApiOperation("数据分析业务层次列表")
-    @GetMapping("/businessList")
-    public AjaxResult<List<String>> businessList(TopOrderStatisticsBo bo) {
-        List<String> list = iTopOldOrderService.getBusinessList(bo);
-        return AjaxResult.success(list);
-    }
-
-    @ApiOperation("下单客户")
-    @GetMapping("/customer")
-    public AjaxResult<List<TopOrderCustomerVo>> getCustomerList() {
-        return AjaxResult.success(iTopOldOrderService.getCustomerList());
-    }
-
-    @ApiOperation("订单总计")
-    @GetMapping("/total")
-    public AjaxResult<TopOrderTotalVo> getOrderTotal(TopOrderStatisticsBo bo) {
-        return AjaxResult.success(iTopOldOrderService.getOrderTotal(bo));
-    }
-
-    @ApiOperation("下单机构订单详情列表")
-    @GetMapping("/tenantDetailList")
-    public TableDataInfo<TopOrderStatisticsDetailVo> getTenantDetailList(TopOrderStatisticsBo bo) {
-        startPage();
-        List<TopOrderStatisticsDetailVo> list = iTopOldOrderService.getTenantDetailList(bo);
-        return getDataTable(list);
-    }
-
-    @ApiOperation("下单业务层次详情列表")
-    @GetMapping("/businessDetailList")
-    public TableDataInfo<TopOrderStatisticsDetailVo> getBusinessDetailList(TopOrderStatisticsBo bo) {
-        startPage();
-        List<TopOrderStatisticsDetailVo> list = iTopOldOrderService.getBusinessDetailList(bo);
-        return getDataTable(list);
-    }
-
-    @ApiOperation("机构走势图")
-    @GetMapping("/tenantView")
-    public AjaxResult<TopOrderStatisticsViewVo> getStatisticsTenantView(TopOrderStatisticsViewBo bo) {
-        return AjaxResult.success(iTopOldOrderService.getStatisticsTenantView(bo));
-    }
-
-    @ApiOperation("业务层次走势图")
-    @GetMapping("/businessView")
-    public AjaxResult<TopOrderStatisticsViewVo> getStatisticsBusinessView(TopOrderStatisticsViewBo bo) {
-        return AjaxResult.success(iTopOldOrderService.getStatisticsBusinessView(bo));
-    }
-
-    @ApiOperation("机构业务员列表")
-    @GetMapping("/tenantCreateList")
-    public AjaxResult<List<TopOrderStatisticsTwoVo>> getTenantCreateList(TopOrderStatisticsViewBo bo) {
-        return AjaxResult.success(iTopOldOrderService.getTenantCreateList(bo));
-    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopSharedCustomerController.java

@@ -1,115 +0,0 @@
-package com.zhongzheng.controller.order;
-
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.framework.web.service.TopTokenService;
-import com.zhongzheng.modules.top.goods.service.ITopOldOrderService;
-import com.zhongzheng.modules.top.order.bo.TopOrderStatisticsBo;
-import com.zhongzheng.modules.top.order.bo.TopOrderStatisticsViewBo;
-import com.zhongzheng.modules.top.order.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.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 订单Controller
- *
- * @author ruoyi
- * @date 2023-04-20
- */
-@Api(value = "公海控制器", tags = {"公海控制器"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/top/order/shared")
-public class TopSharedCustomerController extends BaseController {
-
-    private final ITopOldOrderService iTopOldOrderService;
-
-    /**
-     * 公海客户统计
-     */
-    @ApiOperation("公海客户统计")
-    @GetMapping("/statistics")
-    public AjaxResult<TopSharedCustomerTotalVo> getSharedStatistics(TopOrderStatisticsBo bo) {
-        return AjaxResult.success(iTopOldOrderService.getSharedStatistics(bo));
-    }
-
-    /**
-     * 公海总客户
-     */
-    @ApiOperation("公海总客户")
-    @GetMapping("/customer/stats")
-    public AjaxResult<TopCustomerStatsVo> getCustomerStatsData(TopOrderStatisticsBo bo) {
-        return AjaxResult.success(iTopOldOrderService.getCustomerStatsData(bo));
-    }
-
-    /**
-     * 公海过期预警
-     */
-    @ApiOperation("公海过期预警")
-    @GetMapping("/cert/stats")
-    public AjaxResult<TopCertStatsVo> getCertStatsData(TopOrderStatisticsBo bo) {
-        return AjaxResult.success(iTopOldOrderService.getCertStatsData(bo));
-    }
-
-    /**
-     * 城市转化排行
-     */
-    @ApiOperation("城市转化排行")
-    @GetMapping("/order/area")
-    public TableDataInfo<TopOrderAreaDataVo> getOrderAreaData(TopOrderStatisticsBo bo) {
-        return iTopOldOrderService.getOrderAreaData(bo);
-    }
-
-    /**
-     * 客户转化排名
-     */
-    @ApiOperation("客户转化排名")
-    @GetMapping("/conversion/rate")
-    public TableDataInfo<TopConversionRateDataVo> getConversionRateData(TopOrderStatisticsBo bo) {
-        return iTopOldOrderService.getConversionRateData(bo);
-    }
-
-    /**
-     * 公海客户走势图
-     */
-    @ApiOperation("公海客户走势图")
-    @GetMapping("/customer/list")
-    public AjaxResult<List<TopConversionRateTrendVo>> getCustomerListData(TopOrderStatisticsBo bo) {
-        return AjaxResult.success(iTopOldOrderService.getCustomerListData(bo));
-    }
-
-    /**
-     * 公海客户详情
-     */
-    @ApiOperation("公海客户详情")
-    @GetMapping("/customer/order")
-    public TableDataInfo<TopConversionRateDataVo> getCustomerOrderData(TopOrderStatisticsBo bo) {
-        return iTopOldOrderService.getCustomerOrderData(bo);
-    }
-
-    /**
-     * 公海客户机构列表
-     */
-    @ApiOperation("公海客户机构列表")
-    @GetMapping("/tenant")
-    public AjaxResult<List<TopTenantDataVo>> getTenantListData() {
-        return AjaxResult.success(iTopOldOrderService.getTenantListData());
-    }
-
-    /**
-     * 公海客户业务员列表
-     */
-    @ApiOperation("公海客户业务员列表")
-    @GetMapping("/sale")
-    public AjaxResult<List<TopTenantDataVo>> getSaleListData(TopOrderStatisticsBo bo) {
-        return AjaxResult.success(iTopOldOrderService.getSaleListData(bo));
-    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/schedule/ScheduleController.java

@@ -1,94 +0,0 @@
-package com.zhongzheng.controller.schedule;
-
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.framework.web.service.AsyncService;
-import com.zhongzheng.framework.web.service.WxLoginService;
-import com.zhongzheng.modules.exam.bo.ExamApplyQueryBo;
-import com.zhongzheng.modules.polyv.service.IPolyvLiveService;
-import com.zhongzheng.modules.schedule.service.IScheduleService;
-import com.zhongzheng.modules.sdk.service.ITopNuoMplatformLogService;
-import com.zhongzheng.modules.top.order.service.ITopOrderRecNoteService;
-import com.zhongzheng.modules.user.bo.UserQueryBo;
-import com.zhongzheng.modules.user.bo.UserWxFollowQueryBo;
-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.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.text.ParseException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 定时任务
- *
- * @author ruoyi
- * @date 2021-11-10
- */
-@Api(value = "定时任务", tags = {"定时任务管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/sys/common")
-public class ScheduleController extends BaseController {
-
-    private final ITopNuoMplatformLogService iTopNuoMplatformLogService;
-
-    private final ITopOrderRecNoteService iTopOrderRecNoteService;
-
-    private final IScheduleService iScheduleService;
-
-    @ApiOperation("发票开票结果更新")
-    @GetMapping("/distributionRebate")
-    public AjaxResult distributionRebate(UserQueryBo bo){
-        iTopNuoMplatformLogService.updateByBatch();
-        return AjaxResult.success();
-    }
-
-    @ApiOperation("重开发票开票")
-    @GetMapping("/reOpenMplatform")
-    public AjaxResult reOpenMplatform(){
-        iTopNuoMplatformLogService.reOpenMplatform();
-        return AjaxResult.success();
-    }
-
-    @ApiOperation("催款提醒")
-    @GetMapping("/recTimeNoteBatchPush")
-    public AjaxResult recTimeNoteBatchPush(){
-        iTopOrderRecNoteService.timeNoteBatchPush();
-        return AjaxResult.success();
-    }
-
-    @ApiOperation("应收应付机构分成月度账单")
-    @GetMapping("/makeDivideMonthBill")
-    public AjaxResult makeDivideMonthBill(){
-        iScheduleService.makeDivideMonthBill();
-        return AjaxResult.success();
-    }
-
-    @ApiOperation("应收应付机构佣金月度账单")
-    @GetMapping("/makeDivideBrokerageMonthBill")
-    public AjaxResult makeDivideBrokerageMonthBill(){
-        iScheduleService.makeDivideBrokerageMonthBill();
-        return AjaxResult.success();
-    }
-
-    @ApiOperation("应收应付业务员提成月度账单")
-    @GetMapping("/makeDivideSellerMonthBill")
-    public AjaxResult makeDivideSellerMonthBill(){
-        iScheduleService.makeDivideSellerMonthBill();
-        return AjaxResult.success();
-    }
-
-    @ApiOperation("更新机构分成，业务提成应付时间")
-    @GetMapping("/updateCompanyPredictPayTime")
-    public AjaxResult updateCompanyPredictPayTime(){
-        iScheduleService.updatePredictPayTime();
-        return AjaxResult.success();
-    }
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/sdk/TopNuoMplatformLogController.java

@@ -1,72 +0,0 @@
-package com.zhongzheng.controller.sdk;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.Map;
-
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.common.utils.ToolsUtils;
-import com.zhongzheng.modules.sdk.bo.TopNuoMplatformLogAddBo;
-import com.zhongzheng.modules.sdk.bo.TopNuoMplatformLogEditBo;
-import com.zhongzheng.modules.sdk.bo.TopNuoMplatformLogQueryBo;
-import com.zhongzheng.modules.sdk.service.ITopNuoMplatformLogService;
-import com.zhongzheng.modules.sdk.vo.TopNuoMplatformLogVo;
-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;
-
-/**
- * 诺税通开单记录Controller
- *
- * @author ruoyi
- * @date 2023-04-18
- */
-@Api(value = "诺税通开单记录控制器", tags = {"诺税通开单记录管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/openMplatform/log")
-public class TopNuoMplatformLogController extends BaseController {
-
-    private final ITopNuoMplatformLogService iTopNuoMplatformLogService;
-
-    /**
-     * 查询诺税通开单记录列表
-     */
-    @ApiOperation("查询诺税通开单记录列表")
-    @PreAuthorize("@ss.hasPermi('system:log:list')")
-    @GetMapping("/list")
-    public TableDataInfo<TopNuoMplatformLogVo> list(TopNuoMplatformLogQueryBo bo) {
-        startPage();
-        List<TopNuoMplatformLogVo> list = iTopNuoMplatformLogService.queryList(bo);
-        return getDataTable(list);
-    }
-
-
-
-    /**
-     * 获取诺税通开单记录详细信息
-     */
-    @ApiOperation("获取诺税通开单记录详细信息")
-    @PreAuthorize("@ss.hasPermi('system:log:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<TopNuoMplatformLogVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iTopNuoMplatformLogService.queryById(id));
-    }
-
-
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/settle/TopInstSettleController.java

@@ -1,246 +0,0 @@
-package com.zhongzheng.controller.settle;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-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.exception.CustomException;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.framework.web.service.TopTokenService;
-import com.zhongzheng.modules.top.settle.bo.*;
-import com.zhongzheng.modules.top.settle.service.ITopInstSettleService;
-import com.zhongzheng.modules.top.settle.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 org.springframework.web.multipart.MultipartFile;
-
-import java.math.BigDecimal;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author yangdamao
- * @date 2023年07月24日 11:19
- */
-@Api(value = "供应商结算", tags = {"供应商结算管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/settle")
-public class TopInstSettleController extends BaseController {
-
-    private final ITopInstSettleService ITopInstSettleService;
-    private final TopTokenService tokenService;
-
-    /**
-     * 获取订单详情信息
-     */
-    @ApiOperation("获取订单详细信息")
-    @GetMapping("/order/info")
-    public AjaxResult<TopOrderInfoVo> getOrderInfo(SettleOrderInfoBo bo) {
-        return AjaxResult.success(ITopInstSettleService.getOrderInfo(bo));
-    }
-
-    /**
-     * 结算金额计算
-     */
-    @ApiOperation("结算金额计算")
-    @GetMapping("/money")
-    public AjaxResult<BigDecimal> getSettleMoney(SettleMoneyBo bo) {
-        return AjaxResult.success(ITopInstSettleService.getSettleMoney(bo));
-    }
-
-    /**
-     * 订单批量导入
-     */
-    @ApiOperation("订单批量导入")
-    @PostMapping("/order/import")
-    public AjaxResult<List<SettleOrderImportVo>> batchOrderImport(MultipartFile file,String param) {
-        if (StringUtils.isBlank(param)){
-            throw new CustomException("参数不能未空");
-        }
-        ExcelUtil<SettleOrderImportBo> util = new ExcelUtil<SettleOrderImportBo>(SettleOrderImportBo.class);
-        List<SettleOrderImportBo> orderImportBo = null;
-        try{
-            orderImportBo = util.importExcel(file.getInputStream());
-        }catch (Exception e){
-            e.printStackTrace();
-            throw new IllegalArgumentException("模板格式不正确,请重新下载模板");
-        }
-        Collections.reverse(orderImportBo);
-        if (orderImportBo.stream().allMatch(item -> ObjectUtils.isNull(item))){
-            throw new IllegalArgumentException("模板格式不正确,请重新下载模板");
-        }
-        SettleOrderImportParamBo paramBo = JSON.parseObject(param, SettleOrderImportParamBo.class);
-        return AjaxResult.success(ITopInstSettleService.batchOrderImport(orderImportBo,paramBo));
-    }
-
-    /**
-     * 按数量保存结算订单
-     */
-    @ApiOperation("按数量保存结算订单")
-    @PostMapping("/num/save")
-    public AjaxResult<Void> numSettleOrderSave(@RequestBody NumSettleBo bo) {
-        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setLoginId(loginUser.getUser().getUserId());
-        bo.setLoginName(loginUser.getUser().getUserName());
-        return toAjax(ITopInstSettleService.numSettleOrderSave(bo) ? 1 : 0);
-    }
-
-    /**
-     * 按时间保存结算订单
-     */
-    @ApiOperation("按时间保存结算订单")
-    @PostMapping("/time/save")
-    public AjaxResult<Void> timeSettleOrderSave(@RequestBody TimeSettleBo bo) {
-        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setLoginId(loginUser.getUser().getUserId());
-        bo.setLoginName(loginUser.getUser().getUserName());
-        return toAjax(ITopInstSettleService.timeSettleOrderSave(bo) ? 1 : 0);
-    }
-
-    /**
-     * 结算订单列表
-     */
-    @ApiOperation("结算订单列表")
-    @GetMapping("/list")
-    public TableDataInfo<SettleVo> list(SettleQueryBo bo) {
-        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setLoginId(loginUser.getUser().getUserId());
-        bo.setLoginName(loginUser.getUser().getUserName());
-        startPage();
-        List<SettleVo> list = ITopInstSettleService.getSettleList(bo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 获取时间结算单详情信息
-     */
-    @ApiOperation("获取时间结算单详情信息")
-    @GetMapping("/time/detail/{settleId}")
-    public AjaxResult<TimeSettleDetailVo> getTimeSettleDetail(@PathVariable("settleId") Long settleId) {
-        return AjaxResult.success(ITopInstSettleService.getTimeSettleDetail(settleId));
-    }
-
-    /**
-     * 获取数量结算单详情信息
-     */
-    @ApiOperation("获取数量结算单详情信息")
-    @GetMapping("/num/detail/{settleId}")
-    public AjaxResult<NumSettleDetailVo> getNumSettleDetail(@PathVariable("settleId") Long settleId) {
-        return AjaxResult.success(ITopInstSettleService.getNumSettleDetail(settleId));
-    }
-
-    /**
-     * 时间结算单修改
-     */
-    @ApiOperation("时间结算单修改")
-    @PostMapping("/time/update")
-    public AjaxResult<Void> updateTimeSettle(@RequestBody TimeSettleBo bo) {
-        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setLoginId(loginUser.getUser().getUserId());
-        bo.setLoginName(loginUser.getUser().getUserName());
-        return toAjax(ITopInstSettleService.updateTimeSettle(bo) ? 1 : 0);
-    }
-
-    /**
-     * 数量结算单修改
-     */
-    @ApiOperation("数量结算单修改")
-    @PostMapping("/num/update")
-    public AjaxResult<Void> updateNumSettle(@RequestBody NumSettleBo bo) {
-        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setLoginId(loginUser.getUser().getUserId());
-        bo.setLoginName(loginUser.getUser().getUserName());
-        return toAjax(ITopInstSettleService.updateNumSettle(bo) ? 1 : 0);
-    }
-
-    /**
-     * 结算单批量提交审核
-     */
-    @ApiOperation("结算单批量提交审核")
-    @PostMapping("/batch/submit/check")
-    public AjaxResult<Void> batchSubmitCheck(@RequestBody List<Long> settleIds) {
-        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        return toAjax(ITopInstSettleService.batchSubmitCheck(settleIds,loginUser.getUser().getUserId(),loginUser.getUser().getUserName()) ? 1 : 0);
-    }
-
-    /**
-     * 结算单批量删除
-     */
-    @ApiOperation("结算单批量删除")
-    @PostMapping("/batch/delete")
-    public AjaxResult<Void> batchDeleteSettle(@RequestBody List<Long> settleIds) {
-        return toAjax(ITopInstSettleService.batchDeleteSettle(settleIds) ? 1 : 0);
-    }
-
-    /**
-     * 结算单审核
-     */
-    @ApiOperation("结算单审核")
-    @PostMapping("/check")
-    public AjaxResult<Void> checkSettle(@RequestBody CheckSettleBo bo) {
-        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setLoginId(loginUser.getUser().getUserId());
-        bo.setLoginName(loginUser.getUser().getUserName());
-        return toAjax(ITopInstSettleService.checkSettle(bo) ? 1 : 0);
-    }
-
-    /**
-     * 结算单总金额
-     */
-    @ApiOperation("结算单总金额")
-    @PostMapping("/total/money")
-    public AjaxResult<TopOrderSettleVo> getSettleTotalMoney(SettleQueryBo bo) {
-        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setLoginId(loginUser.getUser().getUserId());
-        bo.setLoginName(loginUser.getUser().getUserName());
-        return AjaxResult.success(ITopInstSettleService.getSettleTotalMoney(bo));
-    }
-
-    /**
-     * 结算单支付信息
-     */
-    @ApiOperation("结算单支付信息")
-    @GetMapping("/pay/info/{settleId}")
-    public AjaxResult<SettleVo> getSettlePayInfo(@PathVariable("settleId") Long settleId) {
-        return AjaxResult.success(ITopInstSettleService.getSettlePayInfo(settleId));
-    }
-
-    /**
-     * 结算单支付
-     */
-    @ApiOperation("结算单支付")
-    @PostMapping("/pay")
-    public AjaxResult<Void> settlePay(@RequestBody SettlePayBo bo) {
-        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setLoginId(loginUser.getUser().getUserId());
-        bo.setLoginName(loginUser.getUser().getUserName());
-        return toAjax(ITopInstSettleService.settlePay(bo) ? 1 : 0);
-    }
-
-    /**
-     * 结算单据打印信息
-     */
-    @ApiOperation("结算单据打印信息")
-    @GetMapping("/receipts/{settleId}")
-    public AjaxResult<SettleReceiptsVo> getSettleReceipts(@PathVariable("settleId") Long settleId) {
-        return AjaxResult.success(ITopInstSettleService.getSettleReceipts(settleId));
-    }
-
-    /**
-     * 结算单据打印明细信息
-     */
-    @ApiOperation("结算单据打印明细信息")
-    @GetMapping("/receipts/detail/{settleId}")
-    public AjaxResult<List<NumSettleOrderVo>> getSettleReceiptsDetail(@PathVariable("settleId") Long settleId) {
-        return AjaxResult.success(ITopInstSettleService.getSettleReceiptsDetail(settleId));
-    }
-
-}

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

@@ -1,140 +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.ITopSysRoleService;
-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;
-
-    @Autowired
-    private ITopSysRoleService iTopSysRoleService;
-    /**
-     * 登录方法
-     *
-     * @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);
-        List<Integer> rolesId = iTopSysRoleService.selectRoleListByUserId(user.getUserId());
-        Map<String,Object> map = new HashMap<>();
-        map.put("user", user);
-        map.put("roles", roles);
-        map.put("permissions", permissions);
-        map.put("rolesId", rolesId);
-
-        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/SysProfileController.java

@@ -1,144 +0,0 @@
-package com.zhongzheng.controller.system;
-
-import cn.hutool.core.util.StrUtil;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.config.RuoYiConfig;
-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.entity.SysUser;
-import com.zhongzheng.common.core.domain.entity.TopSysUser;
-import com.zhongzheng.common.core.domain.model.LoginUser;
-import com.zhongzheng.common.core.domain.model.TopLoginUser;
-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.file.FileUploadUtils;
-import com.zhongzheng.framework.web.service.TokenService;
-import com.zhongzheng.framework.web.service.TopTokenService;
-import com.zhongzheng.modules.system.service.ISysUserService;
-import com.zhongzheng.modules.top.user.service.ITopSysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-
-/**
- * 个人信息 业务处理
- *
- * @author zhongzheng
- */
-@RestController
-@RequestMapping("/system/user/profile")
-public class SysProfileController extends BaseController
-{
-    @Autowired
-    private ITopSysUserService userService;
-
-
-    @Autowired
-    private TopTokenService topTokenService;
-
-    /**
-     * 个人信息
-     */
-    @GetMapping
-    public AjaxResult profile()
-    {
-        TopLoginUser loginUser = topTokenService.getLoginUser(ServletUtils.getRequest());
-        TopSysUser user = loginUser.getUser();
-        AjaxResult ajax = AjaxResult.success(user);
-        ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
-        ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
-        return ajax;
-    }
-
-    /**
-     * 修改用户
-     */
-    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult updateProfile(@RequestBody TopSysUser user)
-    {
-        if (StrUtil.isNotEmpty(user.getPhonenumber())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
-        {
-            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
-        }
-        if (StrUtil.isNotEmpty(user.getEmail())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-        {
-            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
-        }
-        if (userService.updateUserProfile(user) > 0)
-        {
-            TopLoginUser loginUser = topTokenService.getLoginUser(ServletUtils.getRequest());
-            // 更新缓存用户信息
-            loginUser.getUser().setNickName(user.getNickName());
-            loginUser.getUser().setPhonenumber(user.getPhonenumber());
-            loginUser.getUser().setEmail(user.getEmail());
-            loginUser.getUser().setSex(user.getSex());
-            topTokenService.setLoginUser(loginUser);
-            return AjaxResult.success();
-        }
-        return AjaxResult.error("修改个人信息异常，请联系管理员");
-    }
-
-    /**
-     * 重置密码
-     */
-    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
-    @PutMapping("/updatePwd")
-    public AjaxResult updatePwd(String oldPassword, String newPassword)
-    {
-        TopLoginUser loginUser = topTokenService.getLoginUser(ServletUtils.getRequest());
-        String userName = loginUser.getUsername();
-        String password = loginUser.getPassword();
-        if (!SecurityUtils.matchesPassword(oldPassword, password))
-        {
-            return AjaxResult.error("修改密码失败，旧密码错误");
-        }
-        if(!ToolsUtils.verifEasyPwd(newPassword)){
-            throw new CustomException("密码应由8-16位数字、大小写字母、符号组成");
-        }
-        if (SecurityUtils.matchesPassword(newPassword, password))
-        {
-            return AjaxResult.error("新密码不能与旧密码相同");
-        }
-        if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)
-        {
-            // 更新缓存用户密码
-            loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));
-            topTokenService.setLoginUser(loginUser);
-            return AjaxResult.success();
-        }
-        return AjaxResult.error("修改密码异常，请联系管理员");
-    }
-
-    /**
-     * 头像上传
-     */
-    @Log(title = "用户头像", businessType = BusinessType.UPDATE)
-    @PostMapping("/avatar")
-    public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws IOException
-    {
-        if (!file.isEmpty())
-        {
-            TopLoginUser loginUser = topTokenService.getLoginUser(ServletUtils.getRequest());
-            String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file);
-            if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
-            {
-                AjaxResult ajax = AjaxResult.success();
-                ajax.put("imgUrl", avatar);
-                // 更新缓存用户头像
-                loginUser.getUser().setAvatar(avatar);
-                topTokenService.setLoginUser(loginUser);
-                return ajax;
-            }
-        }
-        return AjaxResult.error("上传图片异常，请联系管理员");
-    }
-}

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

@@ -1,158 +0,0 @@
-package com.zhongzheng.controller.system;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.system.bo.*;
-import com.zhongzheng.modules.system.service.ISysTenantService;
-import com.zhongzheng.modules.system.vo.SysTenantBankAccountVo;
-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("获取系统商户银行账号信息")
-    @GetMapping("/bank/{tenantId}")
-    public AjaxResult<List<SysTenantBankAccountVo>> getBankAccountList(@PathVariable("tenantId" ) String tenantId) {
-        return AjaxResult.success(iSysTenantService.getBankAccountList(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("总平台新增系统商户")
-    @PostMapping("/add")
-    public AjaxResult<Void> addTopTenant(@Validated @RequestBody SysTopTenantAddBo bo) {
-        return toAjax(iSysTenantService.addTopTenant(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("总平台修改系统商户")
-    @PostMapping("/edit/top")
-    public AjaxResult<Void> editTopTenant(@RequestBody SysTopTenantEditBo bo) {
-        return toAjax(iSysTenantService.editTopTenant(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除机构
-     */
-    @ApiOperation("删除机构")
-    @PostMapping("/delete/top")
-    public AjaxResult<Void> deleteTopTenant(@RequestBody SysTopTenantEditBo bo) {
-        return toAjax(iSysTenantService.deleteTopTenant(bo) ? 1 : 0);
-    }
-
-    /**
-     * 查询系统商户列表
-     */
-    @ApiOperation("查询系统商户列表")
-    @GetMapping("/top/list")
-    public AjaxResult<List<SysTenantVo>> getTopListAll(SysTenantQueryBo bo) {
-        List<SysTenantVo> list = iSysTenantService.queryList(bo);
-        return AjaxResult.success(list);
-    }
-
-    /**
-     * 删除系统商户
-     */
-   /* @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/TopCostCategoryController.java

@@ -1,99 +0,0 @@
-package com.zhongzheng.controller.top;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.top.system.bo.TopCostCategoryAddBo;
-import com.zhongzheng.modules.top.system.bo.TopCostCategoryEditBo;
-import com.zhongzheng.modules.top.system.bo.TopCostCategoryQueryBo;
-import com.zhongzheng.modules.top.system.service.ITopCostCategoryService;
-import com.zhongzheng.modules.top.system.vo.TopCostCategoryVo;
-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 2023-07-27
- */
-@Api(value = "机构成本类别控制器", tags = {"机构成本类别管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/top/category")
-public class TopCostCategoryController extends BaseController {
-
-    private final ITopCostCategoryService iTopCostCategoryService;
-
-    /**
-     * 查询机构成本类别列表
-     */
-    @ApiOperation("查询机构成本类别列表")
-    @PreAuthorize("@ss.hasPermi('system:category:list')")
-    @GetMapping("/list")
-    public TableDataInfo<TopCostCategoryVo> list(TopCostCategoryQueryBo bo) {
-        startPage();
-        List<TopCostCategoryVo> list = iTopCostCategoryService.queryList(bo);
-        return getDataTable(list);
-    }
-
-
-
-    /**
-     * 获取机构成本类别详细信息
-     */
-    @ApiOperation("获取机构成本类别详细信息")
-    @PreAuthorize("@ss.hasPermi('system:category:query')")
-    @GetMapping("/{categoryId}")
-    public AjaxResult<TopCostCategoryVo> getInfo(@PathVariable("categoryId" ) Long categoryId) {
-        return AjaxResult.success(iTopCostCategoryService.queryById(categoryId));
-    }
-
-    /**
-     * 新增机构成本类别
-     */
-    @ApiOperation("新增机构成本类别")
-    @PreAuthorize("@ss.hasPermi('system:category:add')")
-    @Log(title = "机构成本类别", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody TopCostCategoryAddBo bo) {
-        return toAjax(iTopCostCategoryService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改机构成本类别
-     */
-    @ApiOperation("修改机构成本类别")
-    @PreAuthorize("@ss.hasPermi('system:category:edit')")
-    @Log(title = "机构成本类别", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody TopCostCategoryEditBo bo) {
-        return toAjax(iTopCostCategoryService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    @ApiOperation("机构成本类别批量删除")
-    @PreAuthorize("@ss.hasPermi('system:tp:edit')")
-    @Log(title = "机构成本类别批量删除", businessType = BusinessType.UPDATE)
-    @PostMapping("/deleteBatch")
-    public AjaxResult<Void> deleteBatch(@RequestBody TopCostCategoryEditBo bo) {
-        return toAjax(iTopCostCategoryService.deleteBatch(bo) ? 1 : 0);
-    }
-
-}

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

@@ -1,101 +0,0 @@
-package com.zhongzheng.controller.top;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.top.financial.bo.TopCostInstTpQueryBo;
-import com.zhongzheng.modules.top.system.bo.TopInstCategoryAddBo;
-import com.zhongzheng.modules.top.system.bo.TopInstCategoryEditBo;
-import com.zhongzheng.modules.top.system.bo.TopInstCategoryQueryBo;
-import com.zhongzheng.modules.top.system.service.ITopInstCategoryService;
-import com.zhongzheng.modules.top.system.vo.TopInstCategoryVo;
-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 2023-07-20
- */
-@Api(value = "供应商成本分类控制器", tags = {"供应商成本分类管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/top/inst/category")
-public class TopInstCategoryController extends BaseController {
-
-    private final ITopInstCategoryService iTopInstCategoryService;
-
-    /**
-     * 查询供应商成本分类列表
-     */
-    @ApiOperation("查询供应商成本分类列表")
-    @PreAuthorize("@ss.hasPermi('system:category:list')")
-    @GetMapping("/list")
-    public TableDataInfo<TopInstCategoryVo> list(TopInstCategoryQueryBo bo) {
-        startPage();
-        bo.setStatus(1);
-        List<TopInstCategoryVo> list = iTopInstCategoryService.queryList(bo);
-        return getDataTable(list);
-    }
-
-
-
-    /**
-     * 获取供应商成本分类详细信息
-     */
-    @ApiOperation("获取供应商成本分类详细信息")
-    @PreAuthorize("@ss.hasPermi('system:category:query')")
-    @GetMapping("/{costCatId}")
-    public AjaxResult<TopInstCategoryVo> getInfo(@PathVariable("costCatId" ) Long costCatId) {
-        return AjaxResult.success(iTopInstCategoryService.queryById(costCatId));
-    }
-
-    /**
-     * 新增供应商成本分类
-     */
-    @ApiOperation("新增供应商成本分类")
-    @PreAuthorize("@ss.hasPermi('system:category:add')")
-    @Log(title = "供应商成本分类", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody TopInstCategoryAddBo bo) {
-        return toAjax(iTopInstCategoryService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改供应商成本分类
-     */
-    @ApiOperation("修改供应商成本分类")
-    @PreAuthorize("@ss.hasPermi('system:category:edit')")
-    @Log(title = "供应商成本分类", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody TopInstCategoryEditBo bo) {
-        return toAjax(iTopInstCategoryService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    @ApiOperation("供应商成本分类批量删除")
-    @PreAuthorize("@ss.hasPermi('system:tp:edit')")
-    @Log(title = "供应商成本分类批量删除", businessType = BusinessType.UPDATE)
-    @PostMapping("/deleteBatch")
-    public AjaxResult<Void> deleteBatch(@RequestBody TopInstCategoryEditBo bo) {
-        return toAjax(iTopInstCategoryService.deleteBatch(bo) ? 1 : 0);
-    }
-}

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

@@ -1,121 +0,0 @@
-package com.zhongzheng.controller.top;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.top.financial.bo.TopCostInstTpQueryBo;
-import com.zhongzheng.modules.top.system.bo.TopInstitutionAddBo;
-import com.zhongzheng.modules.top.system.bo.TopInstitutionEditBo;
-import com.zhongzheng.modules.top.system.bo.TopInstitutionQueryBo;
-import com.zhongzheng.modules.top.system.service.ITopInstitutionService;
-import com.zhongzheng.modules.top.system.vo.TopInstitutionVo;
-import com.zhongzheng.modules.user.bo.UserQueryBo;
-import com.zhongzheng.modules.user.vo.UserExportVo;
-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 2023-07-17
- */
-@Api(value = "职能机构控制器", tags = {"职能机构管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/top/institution")
-public class TopInstitutionController extends BaseController {
-
-    private final ITopInstitutionService iTopInstitutionService;
-
-    /**
-     * 查询职能机构列表
-     */
-    @ApiOperation("查询职能机构列表")
-    @PreAuthorize("@ss.hasPermi('system:institution:list')")
-    @GetMapping("/list")
-    public TableDataInfo<TopInstitutionVo> list(TopInstitutionQueryBo bo) {
-        startPage();
-        bo.setStatus(1);
-        List<TopInstitutionVo> list = iTopInstitutionService.queryList(bo);
-        return getDataTable(list);
-    }
-
-    @ApiOperation("导出职能机构列表")
-    @PreAuthorize("@ss.hasPermi('app:user:list')")
-    @GetMapping("/listExport")
-    public AjaxResult<TopInstitutionVo> listExport(TopInstitutionQueryBo bo) {
-        List<TopInstitutionVo> list = iTopInstitutionService.queryList(bo);
-        ExcelUtil<TopInstitutionVo> util = new ExcelUtil<>(TopInstitutionVo.class);
-        return util.exportExcel(list,"导出职能机构列表");
-    }
-
-    @ApiOperation("成本分类查询职能机构列表")
-    @PreAuthorize("@ss.hasPermi('system:institution:list')")
-    @GetMapping("/listByCat")
-    public TableDataInfo<TopInstitutionVo> listByCat(TopInstitutionQueryBo bo) {
-        startPage();
-        List<TopInstitutionVo> list = iTopInstitutionService.listByCat(bo);
-        return getDataTable(list);
-    }
-
-
-
-    /**
-     * 获取职能机构详细信息
-     */
-    @ApiOperation("获取职能机构详细信息")
-    @PreAuthorize("@ss.hasPermi('system:institution:query')")
-    @GetMapping("/{instId}")
-    public AjaxResult<TopInstitutionVo> getInfo(@PathVariable("instId" ) Long instId) {
-        return AjaxResult.success(iTopInstitutionService.queryById(instId));
-    }
-
-    /**
-     * 新增职能机构
-     */
-    @ApiOperation("新增职能机构")
-    @PreAuthorize("@ss.hasPermi('system:institution:add')")
-    @Log(title = "职能机构", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody TopInstitutionAddBo bo) {
-        return toAjax(iTopInstitutionService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改职能机构
-     */
-    @ApiOperation("修改职能机构")
-    @PreAuthorize("@ss.hasPermi('system:institution:edit')")
-    @Log(title = "职能机构", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody TopInstitutionEditBo bo) {
-        return toAjax(iTopInstitutionService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    @ApiOperation("职能机构批量删除")
-    @PreAuthorize("@ss.hasPermi('system:tp:edit')")
-    @Log(title = "职能机构批量删除", businessType = BusinessType.UPDATE)
-    @PostMapping("/deleteBatch")
-    public AjaxResult<Void> deleteBatch(@RequestBody TopInstitutionQueryBo bo) {
-        return toAjax(iTopInstitutionService.deleteBatch(bo) ? 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.entity.TopSysRole;
-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.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.TopSysRole;
-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.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.verifEasyPwd(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.verifEasyPwd(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,217 +0,0 @@
-# 数据源配置
-spring:
-    datasource:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: com.mysql.cj.jdbc.Driver
-        druid:
-            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: LTAI5tDbpYmpifZYNX8S3kt1  # 访问身份验证中用到用户标识
-        accessKeySecret: jCdSPAj58ZXOLsWpV8bCgNOYrEK0de # 用户用于加密签名字符串和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
-    updateInvoicePath: http://gdxypx.xy.com/system/BussinessApi/UpdateInvoiceData
-    createExamPath: http://gdxypx.xy.com/system/BussinessApi/CreateSameClass
-    saveInvoice: http://gdxypx.xy.com/WitSystem/BussinessApi/InvoiceUpdate
-
-officialPush:
-    infoPath: http://jypt-dev.gdcic.net/organjxjy/ShangBaoMingdan
-    periodPath: http://jypt-dev.gdcic.net/organjxjy/XueshiShenqing
-    infoAccount: peixunjigou
-    token: 0ca175b9c0f726a831d895e26933246
-    sevenInfoPath: http://sgry.gdcic.net/organjxjy/ShangBaoMingdan
-    sevenPeriodPath: http://sgry.gdcic.net/organjxjy/XueshiShenqing
-
-distributionOldPay:
-    host: http://gdxypx.xy.com/System/BussinessApi/AddRedPackData
-
-handouts:
-    savePath: http://192.168.1.7:9090/course/handouts/save
-    updatePath: http://192.168.1.7:9090/course/handouts/edit
-
-Nuonuo:
-    host: https://sdk.nuonuo.com/open/v1/services
-    APPkey: SD39149760
-    APPSecret: 07168A248B2844E0
-
-oldOrder:
-    studyRecord: http://gdxypx.xy.com/WitSystem/BussinessApi/GetStudyRecord
-    orderCheck: http://gdxypx.xy.com/WitSystem/BussinessApi/AuditUnderOrder
-    finishOrder: http://gdxypx.xy.com/WitSystem/BussinessApi/CompleteOrder
-    refuseCheck: http://gdxypx.xy.com/WitSystem/BussinessApi/ReFundAuditResult
-    inputOrderSn: http://gdxypx.xy.com/WitSystem/BussinessApi/GetNewYxtinputOrderSn
-    checkOrderStudent: http://gdxypx.xy.com/WitSystem/BussinessApi/ReAuditUnderOrder
-    checkOrderBrokerage: http://gdxypx.xy.com/WitSystem/BussinessApi/CommissionRate
-    refundPay: http://192.168.1.222:5030/common/platform/pay
-    refundPayHandle: http://192.168.1.222:5030/common/platform/pay/handle
-    updateRemark: http://gdxypx.xy.com/WitSystem/BussinessApi/UpdateOrderAuditRemark
-    getResitTimes: http://gdxypx.xy.com/System/BussinessApi/GetResitTimes
-    classEndSaleTipMsg: http://gdxypx.xy.com/WitSystem/BussinessApi/ClassEndSaleTipMsg
-oldSys:
-    host: http://gdxypx.xy.com
-    goods: http://gdxypx.xy.com/WitSystem/BussinessApi/NewYxtLogin
-    question: http://192.168.1.121:8057/WordData/GetMeasureList
-    questionDetail: http://192.168.1.121:8057/WordData/GetTopicList
-    studyCheck: http://gdxypx.xy.com/System/BussinessApi/EjStudyCheck
-
-invoice:
-    host: http://192.168.1.222:7077/sys/common/openMplatform/log
-
-liveHost: http://192.168.1.222:6009
-
-fileHost: http://39.108.7.155:9099
-
-exam:
-    applySave: http://192.168.1.7:9099/cd/exam/save
-    applyUpdate: http://192.168.1.7:9099/cd/exam/update
-    applyDelete: http://192.168.1.7:9099/cd/exam/delete
-    subscribeSave: http://192.168.1.7:9099/cd/subscribe/save
-    subscribeSaveExam: http://192.168.1.7:9099/cd/subscribe/save/exam
-    subscribeUpdateExam: http://192.168.1.7:9099/cd/subscribe/update/exam
-    subscribeAddExamNum: http://192.168.1.7:9099/cd/subscribe/add/num
-    subscribeAddExamResult: http://192.168.1.7:9099/cd/exam/add/exam/result
-    subscribeAddCertificate: http://192.168.1.7:9099/cd/exam/add/exam/result/certificate
-    question: http://120.79.166.78:19013/common/question/getMeasureList
-    questionDetail: http://120.79.166.78:19013/common/question/getTopicList
-
-shared:
-    statistics: http://gdxypx.xy.com/WitSystem/BussinessApi/HighSeasData
-    customer: http://gdxypx.xy.com/WitSystem/BussinessApi/CustomerStatsData
-    cert: http://gdxypx.xy.com/WitSystem/BussinessApi/CertStatsData
-    orderArea: http://gdxypx.xy.com/WitSystem/BussinessApi/OrderAreaData
-    rateData: http://gdxypx.xy.com//WitSystem/BussinessApi/CustomerConversionRateData
-    rateTrend: http://gdxypx.xy.com/WitSystem/BussinessApi/CustomerConversionRateTrendData
-    customerOrder: http://gdxypx.xy.com/WitSystem/BussinessApi/CustomerOrderData
-    tenantData: http://gdxypx.xy.com/witsystem/bussinessapi/GetOrgList
-    saleData: http://gdxypx.xy.com/witsystem/bussinessapi/GetSaleListByOrgId
-
-ZsBank:
-    publickey: BNsIe9U0x8IeSe4h/dxUzVEz9pie0hDSfMRINRXc7s1UIXfkExnYECF4QqJ2SnHxLv3z/99gsfDQrQ6dzN5lZj0=
-    privatekey: NBtl7WnuUtA2v5FaebEkU0/Jj1IodLGT6lQqwkzmd2E=
-    sm4key: VuAzSWQhsoNqzn0K
-
-record:
-    downloadPath: http://192.168.1.7:9090/common/user/data/download

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

@@ -1,194 +0,0 @@
-# 数据源配置
-spring:
-    datasource:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: com.mysql.cj.jdbc.Driver
-        druid:
-            url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas_pre?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: 1
-        # 密码
-        password: zhongzheng@@2024
-        # 连接超时时间
-        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: LTAI5tDbpYmpifZYNX8S3kt1  # 访问身份验证中用到用户标识
-        accessKeySecret: jCdSPAj58ZXOLsWpV8bCgNOYrEK0de # 用户用于加密签名字符串和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
-    updateInvoicePath: http://gdxypx.xy.com/system/BussinessApi/UpdateInvoiceData
-    createExamPath: http://gdxypx.xy.com/system/BussinessApi/CreateSameClass
-
-officialPush:
-    infoPath: https://jypt.gdcic.net/organjxjy/ShangBaoMingdan
-    periodPath: https://jypt.gdcic.net/organjxjy/XueshiShenqing
-    infoAccount: GDSXY
-    token: 01b5d9833987efdff54483cdc9720da6
-    sevenInfoPath: http://sgry.gdcic.net/organjxjy/ShangBaoMingdan
-    sevenPeriodPath: http://sgry.gdcic.net/organjxjy/XueshiShenqing
-
-distributionOldPay:
-    host: https://www.xyyxt.net/System/BussinessApi/AddRedPackData
-
-handouts:
-    savePath: https://attach.xyyxt.net/course/handouts/save
-    updatePath: https://attach.xyyxt.net/course/handouts/edit
-
-Nuonuo:
-    host: https://sdk.nuonuo.com/open/v1/services
-    APPkey: 39149760
-    APPSecret: 07168A248B2844E0
-
-oldOrder:
-    studyRecord: http://test.jqbao.net/WitSystem/BussinessApi/GetStudyRecord
-    orderCheck: http://test.jqbao.net/WitSystem/BussinessApi/AuditUnderOrder
-    finishOrder: http://test.jqbao.net/WitSystem/BussinessApi/CompleteOrder
-    refuseCheck: http://test.jqbao.net/WitSystem/BussinessApi/ReFundAuditResult
-    inputOrderSn: http://test.jqbao.net/WitSystem/BussinessApi/GetNewYxtinputOrderSn
-    checkOrderStudent: http://test.jqbao.net/WitSystem/BussinessApi/ReAuditUnderOrder
-    checkOrderBrokerage: http://test.jqbao.net/WitSystem/BussinessApi/CommissionRate
-    refundPay: http://192.168.1.222:6030/common/platform/pay
-    refundPayHandle: http://192.168.1.222:6030/common/platform/pay/handle
-    updateRemark: http://test.jqbao.net/WitSystem/BussinessApi/UpdateOrderAuditRemark
-
-oldSys:
-    host: http://test.jqbao.net
-
-invoice:
-    host: http://192.168.1.222:8077/sys/common/openMplatform/log
-
-liveHost: http://192.168.1.222:6009
-
-fileHost: http://39.108.7.155:9099
-
-exam:
-    applySave: http://192.168.1.7:9099/cd/exam/save
-    applyUpdate: http://192.168.1.7:9099/cd/exam/update
-    applyDelete: http://192.168.1.7:9099/cd/exam/delete
-    subscribeSave: http://192.168.1.7:9099/cd/subscribe/save
-    subscribeSaveExam: http://192.168.1.7:9099/cd/subscribe/save/exam
-    subscribeUpdateExam: http://192.168.1.7:9099/cd/subscribe/update/exam
-    subscribeAddExamNum: http://192.168.1.7:9099/cd/subscribe/add/num
-    subscribeAddExamResult: http://192.168.1.7:9099/cd/exam/add/exam/result
-
-ZsBank:
-    publickey: BNsIe9U0x8IeSe4h/dxUzVEz9pie0hDSfMRINRXc7s1UIXfkExnYECF4QqJ2SnHxLv3z/99gsfDQrQ6dzN5lZj0=
-    privatekey: NBtl7WnuUtA2v5FaebEkU0/Jj1IodLGT6lQqwkzmd2E=
-    sm4key: VuAzSWQhsoNqzn0K

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

@@ -1,217 +0,0 @@
-# 数据源配置
-spring:
-    datasource:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: com.mysql.cj.jdbc.Driver
-        druid:
-            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
-            # 初始连接数
-            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: 172.18.19.227
-        # 端口，默认为6379
-        port: 6379
-        # 数据库索引
-        database: 0
-        # 密码
-        password: zhongzheng@@2024
-        # 连接超时时间
-        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: LTAI5tDbpYmpifZYNX8S3kt1  # 访问身份验证中用到用户标识
-        accessKeySecret: jCdSPAj58ZXOLsWpV8bCgNOYrEK0de # 用户用于加密签名字符串和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
-    updateInvoicePath: http://www.xyyxt.net/system/BussinessApi/UpdateInvoiceData
-    createExamPath: http://www.xyyxt.net/system/BussinessApi/CreateSameClass
-    saveInvoice: https://www.xyyxt.net/WitSystem/BussinessApi/InvoiceUpdate
-
-officialPush:
-    infoPath: https://jypt.gdcic.net/organjxjy/ShangBaoMingdan
-    periodPath: https://jypt.gdcic.net/organjxjy/XueshiShenqing
-    infoAccount: GDSXY
-    token: 01b5d9833987efdff54483cdc9720da6
-    sevenInfoPath: https://sgry.gdcic.net/organjxjy/ShangBaoMingdan
-    sevenPeriodPath: https://sgry.gdcic.net/organjxjy/XueshiShenqing
-
-distributionOldPay:
-    host: https://www.xyyxt.net/System/BussinessApi/AddRedPackData
-
-handouts:
-    savePath: https://attach.xyyxt.net/course/handouts/save
-    updatePath: https://attach.xyyxt.net/course/handouts/edit
-
-Nuonuo:
-    host: https://sdk.nuonuo.com/open/v1/services
-    APPkey: 39149760
-    APPSecret: 07168A248B2844E0
-
-oldOrder:
-    studyRecord: http://www.xyyxt.net/WitSystem/BussinessApi/GetStudyRecord
-    orderCheck: http://www.xyyxt.net/WitSystem/BussinessApi/AuditUnderOrder
-    finishOrder: http://www.xyyxt.net/WitSystem/BussinessApi/CompleteOrder
-    refuseCheck: http://www.xyyxt.net/WitSystem/BussinessApi/ReFundAuditResult
-    inputOrderSn: http://www.xyyxt.net/WitSystem/BussinessApi/GetNewYxtinputOrderSn
-    checkOrderStudent: http://www.xyyxt.net/WitSystem/BussinessApi/ReAuditUnderOrder
-    checkOrderBrokerage: http://www.xyyxt.net/WitSystem/BussinessApi/CommissionRate
-    refundPay: https://cloud.xyyxt.net/common/platform/pay
-    refundPayHandle: https://cloud.xyyxt.net/common/platform/pay/handle
-    updateRemark: http://www.xyyxt.net/WitSystem/BussinessApi/UpdateOrderAuditRemark
-    getResitTimes: http://www.xyyxt.net/System/BussinessApi/GetResitTimes
-    classEndSaleTipMsg: http://www.xyyxt.net/WitSystem/BussinessApi/ClassEndSaleTipMsg
-oldSys:
-    host: https://www.xyyxt.net
-    goods: http://www.xyyxt.net/system/BussinessApi/NewYxtLogin
-    question: http://192.168.1.121:8057/WordData/GetMeasureList
-    questionDetail: http://192.168.1.121:8057/WordData/GetTopicList
-    studyCheck: http://www.xyyxt.net/System/BussinessApi/EjStudyCheck
-
-invoice:
-    host: https://ptapi.gdzzkj.net/sys/common/openMplatform/log
-
-liveHost: https://sso.xyyxt.net
-
-fileHost: http://39.108.7.155:9099
-
-exam:
-    applySave: http://39.108.7.155:9099/cd/exam/save
-    applyUpdate: http://39.108.7.155:9099/cd/exam/update
-    applyDelete: http://39.108.7.155:9099/cd/exam/delete
-    subscribeSave: http://39.108.7.155:9099/cd/subscribe/save
-    subscribeSaveExam: http://39.108.7.155:9099/cd/subscribe/save/exam
-    subscribeUpdateExam: http://39.108.7.155:9099/cd/subscribe/update/exam
-    subscribeAddExamNum: http://39.108.7.155:9099/cd/subscribe/add/num
-    subscribeAddExamResult: http://39.108.7.155:9099/cd/exam/add/exam/result
-    subscribeAddCertificate: http://39.108.7.155:9099/cd/exam/add/exam/result/certificate
-    question: http://120.79.166.78:19013/common/question/getMeasureList
-    questionDetail: http://120.79.166.78:19013/common/question/getTopicList
-
-shared:
-    statistics: http://www.xyyxt.net/WitSystem/BussinessApi/HighSeasData
-    customer: http://www.xyyxt.net/WitSystem/BussinessApi/CustomerStatsData
-    cert: http://www.xyyxt.net/WitSystem/BussinessApi/CertStatsData
-    orderArea: http://www.xyyxt.net/WitSystem/BussinessApi/OrderAreaData
-    rateData: http://www.xyyxt.net//WitSystem/BussinessApi/CustomerConversionRateData
-    rateTrend: http://www.xyyxt.net/WitSystem/BussinessApi/CustomerConversionRateTrendData
-    customerOrder: http://www.xyyxt.net/WitSystem/BussinessApi/CustomerOrderData
-    tenantData: http://www.xyyxt.net/witsystem/bussinessapi/GetOrgList
-    saleData: http://www.xyyxt.net/witsystem/bussinessapi/GetSaleListByOrgId
-
-ZsBank:
-    publickey: BNsIe9U0x8IeSe4h/dxUzVEz9pie0hDSfMRINRXc7s1UIXfkExnYECF4QqJ2SnHxLv3z/99gsfDQrQ6dzN5lZj0=
-    privatekey: NBtl7WnuUtA2v5FaebEkU0/Jj1IodLGT6lQqwkzmd2E=
-    sm4key: VuAzSWQhsoNqzn0K
-
-record:
-    downloadPath: http://39.108.7.155:9090/common/user/data/download

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

@@ -1,313 +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
-
-phone:
-  conceal: false
-
-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: LTAI5tDbpYmpifZYNX8S3kt1
-    accessKeySecret: jCdSPAj58ZXOLsWpV8bCgNOYrEK0de
-    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  #未做完试卷通知
-    orderServiceEndRemind : SMS_465555251  #学生购买未学习
-    classEndRemind : SMS_465955572
-
-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/pom.xml

@@ -66,21 +66,6 @@
             <groupId>com.zhongzheng</groupId>
             <artifactId>zhongzheng-framework</artifactId>
         </dependency>
-
-        <!-- 定时任务-->
-        <dependency>
-            <groupId>com.zhongzheng</groupId>
-            <artifactId>zhongzheng-quartz</artifactId>
-        </dependency>
-
-        <!-- 代码生成-->
-        <dependency>
-            <groupId>com.zhongzheng</groupId>
-            <artifactId>zhongzheng-generator</artifactId>
-        </dependency>
-
-
-
     </dependencies>
 
     <build>

zhongzheng-admin/src/main/java/com/zhongzheng/ZhongZhengApplication.java

@@ -19,6 +19,6 @@ public class ZhongZhengApplication
     public static void main(String[] args)
     {
         SpringApplication.run(ZhongZhengApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  中正启动成功   ლ(´ڡ`ლ)ﾞ"+"ZSADMIN");
+        System.out.println("(♥◠‿◠)ﾉﾞ  中正题库启动成功   ლ(´ڡ`ლ)ﾞ"+"ZSADMIN");
     }
 }

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

@@ -4,7 +4,7 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
-            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
+            url: jdbc:mysql://192.168.1.222:3306/zz_edu_question?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
             username: root
             password: zhongzheng2021
             # 初始连接数

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

@@ -26,7 +26,7 @@ captcha:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 5030
+  port: 5099
   servlet:
     # 应用的访问路径
     context-path: /
@@ -41,7 +41,7 @@ server:
     io-threads: 8
     # 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载
     worker-threads: 256
-    # 是否分配的直接内存
+    # 是否分配的直接内存servlet
     direct-buffers: true
 #  # tomcat 配置
 #  tomcat:

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/LoginController.java

@@ -80,4 +80,11 @@ public class LoginController extends BaseController {
         iUserService.account_loginOutRecord(bo);
         return AjaxResult.success();
     }
+
+    @ApiOperation("题库系统账号登录")
+    @PostMapping("/question/account_login")
+    public AjaxResult questionAccount_login(@RequestBody UserAppAccountLoginBo bo) {
+        Map<String,Object> map = iUserService.questionAccount_login(bo);
+        return AjaxResult.success(map);
+    }
 }

zhongzheng-api/src/main/java/com/zhongzheng/controller/wx/WxLoginController.java

@@ -80,6 +80,20 @@ public class WxLoginController
         return AjaxResult.success(map);
     }
 
+    /**
+     * 题库系统公众号登录
+     *
+     * @param loginBody 登公众号录信息
+     * @return 结果
+     */
+    @ApiOperation("题库系统公众号登录")
+    @PostMapping("/app/common/question/gzh_login")
+    public AjaxResult questionGzh_login(@RequestBody WxLoginBody loginBody)
+    {
+        Map<String,String> map = wxLoginService.questionGzh_login(loginBody);
+        return AjaxResult.success(map);
+    }
+
     /**
      * 登录方法
      *

zhongzheng-common/pom.xml

@@ -248,7 +248,6 @@
             <artifactId>mail</artifactId>
             <version>1.4.7</version>
         </dependency>
-
     </dependencies>
 
 </project>

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/file/FileUtils.java

@@ -270,7 +270,6 @@ public class FileUtils extends org.apache.commons.io.FileUtils
 
         return new CommonsMultipartFile(item);
     }
-
     /**
      * 获取文件md5值
      */

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -132,6 +132,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Autowired
     private WxTokenService wxTokenService;
 
+    @Autowired
+    private WxLoginService wxLoginService;
+
     @Autowired
     private IUserService userService;
 
@@ -2345,6 +2348,67 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
     }
 
+    @Override
+    public User queryByOpenId(String openId) {
+        return baseMapper.queryByOpenId(openId);
+    }
+
+    @Override
+    public Map<String, Object> questionAccount_login(UserAppAccountLoginBo bo) {
+        if(Validator.isEmpty(bo.getAccount())){
+            throw new CustomException("账号不能为空");
+        }
+        iUserLoginErrorService.checkLimit(bo.getAccount());
+        LambdaQueryWrapper<User> queryWrapper =new LambdaQueryWrapper<User>();
+        queryWrapper.and(wq -> wq
+                .eq(User::getTelphone,EncryptHandler.encrypt(bo.getAccount()))
+                .or()
+                .eq(User::getIdCard,EncryptHandler.encrypt(bo.getAccount())));
+        User user = getOne(queryWrapper);
+        if(Validator.isEmpty(user)){
+            iUserLoginErrorService.saveErrorLog(bo.getAccount());
+            throw new CustomException("登录信息错误");
+        }
+        else if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
+        {
+            throw new CustomException("对不起，您的账号：已停用");
+        }
+        String password = null;
+        if(bo.getPwd().length()>20){
+            String rsaPrivate = null;
+            try {
+                InputStream certStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("config/pri.key");
+                rsaPrivate = AES.getStringByInputStream_1(certStream);
+                certStream.close();
+                password = AES.decrypt(bo.getPwd(),rsaPrivate);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }else{
+            password = bo.getPwd();
+        }
+        if (!SecurityUtils.matchesPassword(password,user.getPassword()))
+        {
+            iUserLoginErrorService.saveErrorLog(bo.getAccount());
+            throw new CustomException("密码错误");
+        }
+
+        //判断用户公众号openId
+        String openIdQuestion = bo.getOpenId();
+        if (StringUtils.isNotBlank(user.getGzhOpenId()) && user.getGzhOpenId() != openIdQuestion){
+            throw new CustomException("当前账号已绑定其他微信，换绑请联系客服");
+        }
+        //保存openId
+        update(new LambdaUpdateWrapper<User>().eq(User::getUserId,user.getUserId()).set(User::getGzhOpenId,openIdQuestion));
+
+        ClientLoginUser loginUser = new ClientLoginUser();
+        loginUser.setUser(user);
+        Map<String,Object> map = new HashMap<>();
+        map.put(Constants.TOKEN,wxTokenService.createToken(loginUser));
+        map.put("user_account",user.getUserAccount());
+        return map;
+    }
+
     private String getTelPhone(){
         String mobile = TelPhoneUtils.createMobile();
         int count = count(new LambdaQueryWrapper<User>().eq(User::getIdCard, EncryptHandler.encrypt(mobile)));

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/WxLoginService.java

@@ -1280,6 +1280,30 @@ public class WxLoginService implements IWxLoginService {
         return jsonObject.get("url_link").toString();
     }
 
+    @Override
+    public Map<String, String> questionGzh_login(WxLoginBody loginBody) {
+        initData();
+//        String param = String.format(gzh_wxAuthParam, gzh_appid, gzh_appsrcret, loginBody.getCode());
+//        String resultString = HttpUtils.sendGet(gzh_wxAuthUrl, param);
+//        //解析json
+//        JSONObject jsonObject = (JSONObject) JSONObject.parse(resultString);
+//        String openId = String.valueOf(jsonObject.get("openid"));
+        String openId = "openId123";
+        User user = iUserService.queryByOpenId(openId);;
+        Map<String, String> map = new HashMap<>();
+        if (user == null) {
+            map.put("isUser","1");
+            map.put("openId",openId);
+            return map;
+        }
+        ClientLoginUser loginUser = new ClientLoginUser();
+        loginUser.setUser(user);
+        map.put("openId",openId);
+        map.put("isUser","0");
+        map.put(Constants.TOKEN, wxTokenService.createToken(loginUser));
+        return map;
+    }
+
     public Boolean subGzh(String openId) {
         String unionId = getWxGzhUserCgiInfo(openId);
         if (Validator.isNotEmpty(unionId)) {
@@ -1326,6 +1350,7 @@ public class WxLoginService implements IWxLoginService {
         return user;
     }
 
+
     //公众号获取用户信息
     public User bindWxGzhUnionIdUser(WxLoginBody loginBody) {
         if(Validator.isEmpty(loginBody.getCode())){

zhongzheng-generator/pom.xml

@@ -1,34 +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>
-
-    <artifactId>zhongzheng-generator</artifactId>
-
-    <description>
-        generator代码生成
-    </description>
-
-    <dependencies>
-
-        <!--velocity代码生成使用模板 -->
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity</artifactId>
-        </dependency>
-
-        <!-- 通用工具-->
-        <dependency>
-            <groupId>com.zhongzheng</groupId>
-            <artifactId>zhongzheng-common</artifactId>
-        </dependency>
-
-    </dependencies>
-
-</project>

zhongzheng-generator/src/main/java/com/zhongzheng/generator/config/GenConfig.java

@@ -1,73 +0,0 @@
-package com.zhongzheng.generator.config;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.stereotype.Component;
-
-/**
- * 读取代码生成相关配置
- * 
- * @author zhongzheng
- */
-@Component
-@ConfigurationProperties(prefix = "gen")
-@PropertySource(value = { "classpath:generator.yml" })
-public class GenConfig
-{
-    /** 作者 */
-    public static String author;
-
-    /** 生成包路径 */
-    public static String packageName;
-
-    /** 自动去除表前缀，默认是false */
-    public static boolean autoRemovePre;
-
-    /** 表前缀(类名不会包含表前缀) */
-    public static String tablePrefix;
-
-    public static String getAuthor()
-    {
-        return author;
-    }
-
-    @Value("${author}")
-    public void setAuthor(String author)
-    {
-        GenConfig.author = author;
-    }
-
-    public static String getPackageName()
-    {
-        return packageName;
-    }
-
-    @Value("${packageName}")
-    public void setPackageName(String packageName)
-    {
-        GenConfig.packageName = packageName;
-    }
-
-    public static boolean getAutoRemovePre()
-    {
-        return autoRemovePre;
-    }
-
-    @Value("${autoRemovePre}")
-    public void setAutoRemovePre(boolean autoRemovePre)
-    {
-        GenConfig.autoRemovePre = autoRemovePre;
-    }
-
-    public static String getTablePrefix()
-    {
-        return tablePrefix;
-    }
-
-    @Value("${tablePrefix}")
-    public void setTablePrefix(String tablePrefix)
-    {
-        GenConfig.tablePrefix = tablePrefix;
-    }
-}

zhongzheng-generator/src/main/java/com/zhongzheng/generator/controller/FilterController.java

@@ -1,20 +0,0 @@
-package com.zhongzheng.generator.controller;
-
-import com.zhongzheng.common.exception.CustomException;
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-
-@RequestMapping("/filter")
-@RestController
-public class FilterController {
-
-    @RequestMapping("/token_auth_fail")
-    public void loginAuthFail(HttpServletRequest request) {
-        throw new AccessDeniedException("用户验证错误");
-    }
-
-
-}

zhongzheng-generator/src/main/java/com/zhongzheng/generator/controller/GenController.java

@@ -1,216 +0,0 @@
-package com.zhongzheng.generator.controller;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
-
-import com.zhongzheng.generator.domain.GenTable;
-import com.zhongzheng.generator.domain.GenTableColumn;
-import com.zhongzheng.generator.service.IGenTableColumnService;
-import com.zhongzheng.generator.service.IGenTableService;
-import org.apache.commons.io.IOUtils;
-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.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-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.core.page.TableDataInfo;
-import cn.hutool.core.convert.Convert;
-import com.zhongzheng.common.enums.BusinessType;
-
-/**
- * 代码生成 操作处理
- *
- * @author zhongzheng
- */
-@RestController
-@RequestMapping("/tool/gen")
-public class GenController extends BaseController
-{
-    @Autowired
-    private IGenTableService genTableService;
-
-    @Autowired
-    private IGenTableColumnService genTableColumnService;
-
-    /**
-     * 查询代码生成列表
-     */
-    @PreAuthorize("@ss.hasPermi('tool:gen:list')")
-    @GetMapping("/list")
-    public TableDataInfo genList(GenTable genTable)
-    {
-        startPage();
-        List<GenTable> list = genTableService.selectGenTableList(genTable);
-        return getDataTable(list);
-    }
-
-    /**
-     * 修改代码生成业务
-     */
-    @PreAuthorize("@ss.hasPermi('tool:gen:query')")
-    @GetMapping(value = "/{talbleId}")
-    public AjaxResult getInfo(@PathVariable Long talbleId)
-    {
-        GenTable table = genTableService.selectGenTableById(talbleId);
-        List<GenTable> tables = genTableService.selectGenTableAll();
-        List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(talbleId);
-        Map<String, Object> map = new HashMap<String, Object>();
-        map.put("info", table);
-        map.put("rows", list);
-        map.put("tables", tables);
-        return AjaxResult.success(map);
-    }
-
-    /**
-     * 查询数据库列表
-     */
-    @PreAuthorize("@ss.hasPermi('tool:gen:list')")
-    @GetMapping("/db/list")
-    public TableDataInfo dataList(GenTable genTable)
-    {
-        startPage();
-        List<GenTable> list = genTableService.selectDbTableList(genTable);
-        return getDataTable(list);
-    }
-
-    /**
-     * 查询数据表字段列表
-     */
-    @PreAuthorize("@ss.hasPermi('tool:gen:list')")
-    @GetMapping(value = "/column/{talbleId}")
-    public TableDataInfo columnList(Long tableId)
-    {
-        TableDataInfo dataInfo = new TableDataInfo();
-        List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(tableId);
-        dataInfo.setRows(list);
-        dataInfo.setTotal(list.size());
-        return dataInfo;
-    }
-
-    /**
-     * 导入表结构（保存）
-     */
-    @PreAuthorize("@ss.hasPermi('tool:gen:list')")
-    @Log(title = "代码生成", businessType = BusinessType.IMPORT)
-    @PostMapping("/importTable")
-    public AjaxResult importTableSave(String tables)
-    {
-        String[] tableNames = Convert.toStrArray(tables);
-        // 查询表信息
-        List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames);
-        genTableService.importGenTable(tableList);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 修改保存代码生成业务
-     */
-    @PreAuthorize("@ss.hasPermi('tool:gen:edit')")
-    @Log(title = "代码生成", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult editSave(@Validated @RequestBody GenTable genTable)
-    {
-        genTableService.validateEdit(genTable);
-        genTableService.updateGenTable(genTable);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 删除代码生成
-     */
-    @PreAuthorize("@ss.hasPermi('tool:gen:remove')")
-    @Log(title = "代码生成", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{tableIds}")
-    public AjaxResult remove(@PathVariable Long[] tableIds)
-    {
-        genTableService.deleteGenTableByIds(tableIds);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 预览代码
-     */
-    @PreAuthorize("@ss.hasPermi('tool:gen:preview')")
-    @GetMapping("/preview/{tableId}")
-    public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException
-    {
-        Map<String, String> dataMap = genTableService.previewCode(tableId);
-        return AjaxResult.success(dataMap);
-    }
-
-    /**
-     * 生成代码（下载方式）
-     */
-    @PreAuthorize("@ss.hasPermi('tool:gen:code')")
-    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
-    @GetMapping("/download/{tableName}")
-    public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException
-    {
-        byte[] data = genTableService.downloadCode(tableName);
-        genCode(response, data);
-    }
-
-    /**
-     * 生成代码（自定义路径）
-     */
-    @PreAuthorize("@ss.hasPermi('tool:gen:code')")
-    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
-    @GetMapping("/genCode/{tableName}")
-    public AjaxResult genCode(@PathVariable("tableName") String tableName)
-    {
-        genTableService.generatorCode(tableName);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 同步数据库
-     */
-    @PreAuthorize("@ss.hasPermi('tool:gen:edit')")
-    @Log(title = "代码生成", businessType = BusinessType.UPDATE)
-    @GetMapping("/synchDb/{tableName}")
-    public AjaxResult synchDb(@PathVariable("tableName") String tableName)
-    {
-        genTableService.synchDb(tableName);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 批量生成代码
-     */
-    @PreAuthorize("@ss.hasPermi('tool:gen:code')")
-    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
-    @GetMapping("/batchGenCode")
-    public void batchGenCode(HttpServletResponse response, String tables) throws IOException
-    {
-        String[] tableNames = Convert.toStrArray(tables);
-        byte[] data = genTableService.downloadCode(tableNames);
-        genCode(response, data);
-    }
-
-    /**
-     * 生成zip文件
-     */
-    private void genCode(HttpServletResponse response, byte[] data) throws IOException
-    {
-        response.reset();
-        response.addHeader("Access-Control-Allow-Origin", "*");
-        response.addHeader("Access-Control-Allow-Origin", "accept, content-type, origin, custom-header");
-        response.addHeader("Access-Control-Expose-Headers", "Content-Disposition");
-        response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\"");
-        response.addHeader("Content-Length", "" + data.length);
-        response.setContentType("application/octet-stream; charset=UTF-8");
-        IOUtils.write(data, response.getOutputStream());
-    }
-}

zhongzheng-generator/src/main/java/com/zhongzheng/generator/domain/GenTable.java

@@ -1,237 +0,0 @@
-package com.zhongzheng.generator.domain;
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zhongzheng.common.constant.GenConstants;
-import lombok.*;
-import lombok.experimental.Accessors;
-import org.apache.commons.lang3.ArrayUtils;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 业务表 gen_table
- *
- * @author zhongzheng
- */
-
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-@TableName("gen_table")
-public class GenTable implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 编号
-     */
-    @TableId(value = "table_id", type = IdType.AUTO)
-    private Long tableId;
-
-    /**
-     * 表名称
-     */
-    @NotBlank(message = "表名称不能为空")
-    private String tableName;
-
-    /**
-     * 表描述
-     */
-    @NotBlank(message = "表描述不能为空")
-    private String tableComment;
-
-    /**
-     * 关联父表的表名
-     */
-    private String subTableName;
-
-    /**
-     * 本表关联父表的外键名
-     */
-    private String subTableFkName;
-
-    /**
-     * 实体类名称(首字母大写)
-     */
-    @NotBlank(message = "实体类名称不能为空")
-    private String className;
-
-    /**
-     * 使用的模板（crud单表操作 tree树表操作 sub主子表操作）
-     */
-    private String tplCategory;
-
-    /**
-     * 生成包路径
-     */
-    @NotBlank(message = "生成包路径不能为空")
-    private String packageName;
-
-    /**
-     * 生成模块名
-     */
-    @NotBlank(message = "生成模块名不能为空")
-    private String moduleName;
-
-    /**
-     * 生成业务名
-     */
-    @NotBlank(message = "生成业务名不能为空")
-    private String businessName;
-
-    /**
-     * 生成功能名
-     */
-    @NotBlank(message = "生成功能名不能为空")
-    private String functionName;
-
-    /**
-     * 生成作者
-     */
-    @NotBlank(message = "作者不能为空")
-    private String functionAuthor;
-
-    /**
-     * 生成代码方式（0zip压缩包 1自定义路径）
-     */
-    private String genType;
-
-    /**
-     * 生成路径（不填默认项目路径）
-     */
-    private String genPath;
-
-    /**
-     * 主键信息
-     */
-    @TableField(exist = false)
-    private GenTableColumn pkColumn;
-
-    /**
-     * 子表信息
-     */
-    @TableField(exist = false)
-    private GenTable subTable;
-
-    /**
-     * 表列信息
-     */
-    @Valid
-    @TableField(exist = false)
-    private List<GenTableColumn> columns;
-
-    /**
-     * 其它生成选项
-     */
-    private String options;
-
-    /**
-     * 创建者
-     */
-    @TableField(fill = FieldFill.INSERT)
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    /**
-     * 更新者
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 请求参数
-     */
-    @TableField(exist = false)
-    private Map<String, Object> params = new HashMap<>();
-
-    /**
-     * 树编码字段
-     */
-    @TableField(exist = false)
-    private String treeCode;
-
-    /**
-     * 树父编码字段
-     */
-    @TableField(exist = false)
-    private String treeParentCode;
-
-    /**
-     * 树名称字段
-     */
-    @TableField(exist = false)
-    private String treeName;
-
-    /**
-     * 上级菜单ID字段
-     */
-    @TableField(exist = false)
-    private String parentMenuId;
-
-    /**
-     * 上级菜单名称字段
-     */
-    @TableField(exist = false)
-    private String parentMenuName;
-
-    public boolean isSub() {
-        return isSub(this.tplCategory);
-    }
-
-    public static boolean isSub(String tplCategory) {
-        return tplCategory != null && StrUtil.equals(GenConstants.TPL_SUB, tplCategory);
-    }
-
-    public boolean isTree() {
-        return isTree(this.tplCategory);
-    }
-
-    public static boolean isTree(String tplCategory) {
-        return tplCategory != null && StrUtil.equals(GenConstants.TPL_TREE, tplCategory);
-    }
-
-    public boolean isCrud() {
-        return isCrud(this.tplCategory);
-    }
-
-    public static boolean isCrud(String tplCategory) {
-        return tplCategory != null && StrUtil.equals(GenConstants.TPL_CRUD, tplCategory);
-    }
-
-    public boolean isSuperColumn(String javaField) {
-        return isSuperColumn(this.tplCategory, javaField);
-    }
-
-    public static boolean isSuperColumn(String tplCategory, String javaField) {
-        if (isTree(tplCategory)) {
-            return StrUtil.equalsAnyIgnoreCase(javaField,
-                    ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
-        }
-        return StrUtil.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
-    }
-}

zhongzheng-generator/src/main/java/com/zhongzheng/generator/domain/GenTableColumn.java

@@ -1,249 +0,0 @@
-package com.zhongzheng.generator.domain;
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.*;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 代码生成业务字段表 gen_table_column
- *
- * @author zhongzheng
- */
-
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-@TableName("gen_table_column")
-public class GenTableColumn implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 编号
-     */
-    @TableId(value = "column_id", type = IdType.AUTO)
-    private Long columnId;
-
-    /**
-     * 归属表编号
-     */
-    private Long tableId;
-
-    /**
-     * 列名称
-     */
-    private String columnName;
-
-    /**
-     * 列描述
-     */
-    private String columnComment;
-
-    /**
-     * 列类型
-     */
-    private String columnType;
-
-    /**
-     * JAVA类型
-     */
-    private String javaType;
-
-    /**
-     * JAVA字段名
-     */
-    @NotBlank(message = "Java属性不能为空")
-    private String javaField;
-
-    /**
-     * 是否主键（1是）
-     */
-    private String isPk;
-
-    /**
-     * 是否自增（1是）
-     */
-    private String isIncrement;
-
-    /**
-     * 是否必填（1是）
-     */
-    private String isRequired;
-
-    /**
-     * 是否为插入字段（1是）
-     */
-    private String isInsert;
-
-    /**
-     * 是否编辑字段（1是）
-     */
-    private String isEdit;
-
-    /**
-     * 是否列表字段（1是）
-     */
-    private String isList;
-
-    /**
-     * 是否查询字段（1是）
-     */
-    private String isQuery;
-
-    /**
-     * 查询方式（EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围）
-     */
-    private String queryType;
-
-    /**
-     * 显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、image图片上传控件、upload文件上传控件、editor富文本控件）
-     */
-    private String htmlType;
-
-    /**
-     * 字典类型
-     */
-    private String dictType;
-
-    /**
-     * 排序
-     */
-    private Integer sort;
-
-    /**
-     * 创建者
-     */
-    @TableField(fill = FieldFill.INSERT)
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    /**
-     * 更新者
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    /**
-     * 请求参数
-     */
-    @TableField(exist = false)
-    private Map<String, Object> params = new HashMap<>();
-
-    public String getCapJavaField() {
-        return StrUtil.upperFirst(javaField);
-    }
-
-    public boolean isPk() {
-        return isPk(this.isPk);
-    }
-
-    public boolean isPk(String isPk) {
-        return isPk != null && StrUtil.equals("1", isPk);
-    }
-
-    public boolean isIncrement() {
-        return isIncrement(this.isIncrement);
-    }
-
-    public boolean isIncrement(String isIncrement) {
-        return isIncrement != null && StrUtil.equals("1", isIncrement);
-    }
-
-    public boolean isRequired() {
-        return isRequired(this.isRequired);
-    }
-
-    public boolean isRequired(String isRequired) {
-        return isRequired != null && StrUtil.equals("1", isRequired);
-    }
-
-    public boolean isInsert() {
-        return isInsert(this.isInsert);
-    }
-
-    public boolean isInsert(String isInsert) {
-        return isInsert != null && StrUtil.equals("1", isInsert);
-    }
-
-    public boolean isEdit() {
-        return isInsert(this.isEdit);
-    }
-
-    public boolean isEdit(String isEdit) {
-        return isEdit != null && StrUtil.equals("1", isEdit);
-    }
-
-    public boolean isList() {
-        return isList(this.isList);
-    }
-
-    public boolean isList(String isList) {
-        return isList != null && StrUtil.equals("1", isList);
-    }
-
-    public boolean isQuery() {
-        return isQuery(this.isQuery);
-    }
-
-    public boolean isQuery(String isQuery) {
-        return isQuery != null && StrUtil.equals("1", isQuery);
-    }
-
-    public boolean isSuperColumn() {
-        return isSuperColumn(this.javaField);
-    }
-
-    public static boolean isSuperColumn(String javaField) {
-        return StrUtil.equalsAnyIgnoreCase(javaField,
-                // BaseEntity
-                "createBy", "createTime", "updateBy", "updateTime", "remark",
-                // TreeEntity
-                "parentName", "parentId", "orderNum", "ancestors");
-    }
-
-    public boolean isUsableColumn() {
-        return isUsableColumn(javaField);
-    }
-
-    public static boolean isUsableColumn(String javaField) {
-        // isSuperColumn()中的名单用于避免生成多余Domain属性，若某些属性在生成页面时需要用到不能忽略，则放在此处白名单
-        return StrUtil.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark");
-    }
-
-    public String readConverterExp() {
-        String remarks = StrUtil.subBetween(this.columnComment, "（", "）");
-        StringBuffer sb = new StringBuffer();
-        if (StrUtil.isNotEmpty(remarks)) {
-            for (String value : remarks.split(" ")) {
-                if (StrUtil.isNotEmpty(value)) {
-                    Object startStr = value.subSequence(0, 1);
-                    String endStr = value.substring(1);
-                    sb.append("").append(startStr).append("=").append(endStr).append(",");
-                }
-            }
-            return sb.deleteCharAt(sb.length() - 1).toString();
-        } else {
-            return this.columnComment;
-        }
-    }
-}

zhongzheng-generator/src/main/java/com/zhongzheng/generator/mapper/GenTableColumnMapper.java

@@ -1,22 +0,0 @@
-package com.zhongzheng.generator.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.generator.domain.GenTableColumn;
-
-import java.util.List;
-
-/**
- * 业务字段 数据层
- *
- * @author zhongzheng
- */
-public interface GenTableColumnMapper extends BaseMapper<GenTableColumn> {
-    /**
-     * 根据表名称查询列信息
-     *
-     * @param tableName 表名称
-     * @return 列信息
-     */
-    public List<GenTableColumn> selectDbTableColumnsByName(String tableName);
-
-}

zhongzheng-generator/src/main/java/com/zhongzheng/generator/mapper/GenTableMapper.java

@@ -1,61 +0,0 @@
-package com.zhongzheng.generator.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.generator.domain.GenTable;
-
-import java.util.List;
-
-/**
- * 业务 数据层
- *
- * @author zhongzheng
- */
-public interface GenTableMapper extends BaseMapper<GenTable> {
-    /**
-     * 查询业务列表
-     *
-     * @param genTable 业务信息
-     * @return 业务集合
-     */
-    public List<GenTable> selectGenTableList(GenTable genTable);
-
-    /**
-     * 查询据库列表
-     *
-     * @param genTable 业务信息
-     * @return 数据库表集合
-     */
-    public List<GenTable> selectDbTableList(GenTable genTable);
-
-    /**
-     * 查询据库列表
-     *
-     * @param tableNames 表名称组
-     * @return 数据库表集合
-     */
-    public List<GenTable> selectDbTableListByNames(String[] tableNames);
-
-    /**
-     * 查询所有表信息
-     *
-     * @return 表信息集合
-     */
-    public List<GenTable> selectGenTableAll();
-
-    /**
-     * 查询表ID业务信息
-     *
-     * @param id 业务ID
-     * @return 业务信息
-     */
-    public GenTable selectGenTableById(Long id);
-
-    /**
-     * 查询表名称业务信息
-     *
-     * @param tableName 表名称
-     * @return 业务信息
-     */
-    public GenTable selectGenTableByName(String tableName);
-
-}

zhongzheng-generator/src/main/java/com/zhongzheng/generator/service/GenTableColumnServiceImpl.java

@@ -1,65 +0,0 @@
-package com.zhongzheng.generator.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhongzheng.generator.domain.GenTableColumn;
-import com.zhongzheng.generator.mapper.GenTableColumnMapper;
-import org.springframework.stereotype.Service;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 业务字段 服务层实现
- *
- * @author zhongzheng
- */
-@Service
-public class GenTableColumnServiceImpl extends ServiceImpl<GenTableColumnMapper, GenTableColumn> implements IGenTableColumnService {
-
-    /**
-     * 查询业务字段列表
-     *
-     * @param tableId 业务字段编号
-     * @return 业务字段集合
-     */
-    @Override
-    public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId) {
-        return list(new LambdaQueryWrapper<GenTableColumn>()
-                .eq(GenTableColumn::getTableId,tableId)
-                .orderByAsc(GenTableColumn::getSort));
-    }
-
-    /**
-     * 新增业务字段
-     *
-     * @param genTableColumn 业务字段信息
-     * @return 结果
-     */
-    @Override
-    public int insertGenTableColumn(GenTableColumn genTableColumn) {
-        return baseMapper.insert(genTableColumn);
-    }
-
-    /**
-     * 修改业务字段
-     *
-     * @param genTableColumn 业务字段信息
-     * @return 结果
-     */
-    @Override
-    public int updateGenTableColumn(GenTableColumn genTableColumn) {
-        return baseMapper.updateById(genTableColumn);
-    }
-
-    /**
-     * 删除业务字段对象
-     *
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    @Override
-    public int deleteGenTableColumnByIds(String ids) {
-        return baseMapper.deleteBatchIds(Arrays.asList(ids.split(",")));
-    }
-}

zhongzheng-generator/src/main/java/com/zhongzheng/generator/service/GenTableServiceImpl.java

@@ -1,452 +0,0 @@
-package com.zhongzheng.generator.service;
-
-import cn.hutool.core.collection.CollUtil;
-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.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhongzheng.common.constant.Constants;
-import com.zhongzheng.common.constant.GenConstants;
-import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.common.utils.SecurityUtils;
-import com.zhongzheng.common.utils.file.FileUtils;
-import com.zhongzheng.generator.domain.GenTable;
-import com.zhongzheng.generator.domain.GenTableColumn;
-import com.zhongzheng.generator.mapper.GenTableColumnMapper;
-import com.zhongzheng.generator.mapper.GenTableMapper;
-import com.zhongzheng.generator.util.GenUtils;
-import com.zhongzheng.generator.util.VelocityInitializer;
-import com.zhongzheng.generator.util.VelocityUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.IOUtils;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-/**
- * 业务 服务层实现
- *
- * @author zhongzheng
- */
-@Slf4j
-@Service
-public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> implements IGenTableService {
-
-    @Autowired
-    private GenTableColumnMapper genTableColumnMapper;
-
-    /**
-     * 查询业务信息
-     *
-     * @param id 业务ID
-     * @return 业务信息
-     */
-    @Override
-    public GenTable selectGenTableById(Long id) {
-        GenTable genTable = baseMapper.selectGenTableById(id);
-        setTableFromOptions(genTable);
-        return genTable;
-    }
-
-    /**
-     * 查询业务列表
-     *
-     * @param genTable 业务信息
-     * @return 业务集合
-     */
-    @Override
-    public List<GenTable> selectGenTableList(GenTable genTable) {
-        return baseMapper.selectGenTableList(genTable);
-    }
-
-    /**
-     * 查询据库列表
-     *
-     * @param genTable 业务信息
-     * @return 数据库表集合
-     */
-    @Override
-    public List<GenTable> selectDbTableList(GenTable genTable) {
-        return baseMapper.selectDbTableList(genTable);
-    }
-
-    /**
-     * 查询据库列表
-     *
-     * @param tableNames 表名称组
-     * @return 数据库表集合
-     */
-    @Override
-    public List<GenTable> selectDbTableListByNames(String[] tableNames) {
-        return baseMapper.selectDbTableListByNames(tableNames);
-    }
-
-    /**
-     * 查询所有表信息
-     *
-     * @return 表信息集合
-     */
-    @Override
-    public List<GenTable> selectGenTableAll() {
-        return baseMapper.selectGenTableAll();
-    }
-
-    /**
-     * 修改业务
-     *
-     * @param genTable 业务信息
-     * @return 结果
-     */
-    @Override
-    @Transactional
-    public void updateGenTable(GenTable genTable) {
-        String options = JSON.toJSONString(genTable.getParams());
-        genTable.setOptions(options);
-        int row = baseMapper.updateById(genTable);
-        if (row > 0) {
-            for (GenTableColumn cenTableColumn : genTable.getColumns()) {
-                genTableColumnMapper.update(cenTableColumn,
-                        new LambdaUpdateWrapper<GenTableColumn>()
-                                .set(cenTableColumn.getIsPk() == null, GenTableColumn::getIsPk, null)
-                                .set(cenTableColumn.getIsIncrement() == null, GenTableColumn::getIsIncrement, null)
-                                .set(cenTableColumn.getIsInsert() == null, GenTableColumn::getIsInsert, null)
-                                .set(cenTableColumn.getIsEdit() == null, GenTableColumn::getIsEdit, null)
-                                .set(cenTableColumn.getIsList() == null, GenTableColumn::getIsList, null)
-                                .set(cenTableColumn.getIsQuery() == null, GenTableColumn::getIsQuery, null)
-                                .set(GenTableColumn::getUpdateTime, DateUtils.getNowDate())
-                                .eq(GenTableColumn::getColumnId,cenTableColumn.getColumnId()));
-            }
-        }
-    }
-
-    /**
-     * 删除业务对象
-     *
-     * @param tableIds 需要删除的数据ID
-     * @return 结果
-     */
-    @Override
-    @Transactional
-    public void deleteGenTableByIds(Long[] tableIds) {
-        List<Long> ids = Arrays.asList(tableIds);
-        removeByIds(ids);
-        genTableColumnMapper.delete(new LambdaQueryWrapper<GenTableColumn>().in(GenTableColumn::getTableId, ids));
-    }
-
-    /**
-     * 导入表结构
-     *
-     * @param tableList 导入表列表
-     */
-    @Override
-    @Transactional
-    public void importGenTable(List<GenTable> tableList) {
-        String operName = SecurityUtils.getUsername();
-        try {
-            for (GenTable table : tableList) {
-                String tableName = table.getTableName();
-                GenUtils.initTable(table, operName);
-                int row = baseMapper.insert(table);
-                if (row > 0) {
-                    // 保存列信息
-                    List<GenTableColumn> genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
-                    for (GenTableColumn column : genTableColumns) {
-                        GenUtils.initColumnField(column, table);
-                        column.setCreateTime(DateUtils.getNowDate());
-                        genTableColumnMapper.insert(column);
-                    }
-                }
-            }
-        } catch (Exception e) {
-            throw new CustomException("导入失败：" + e.getMessage());
-        }
-    }
-
-    /**
-     * 预览代码
-     *
-     * @param tableId 表编号
-     * @return 预览数据列表
-     */
-    @Override
-    public Map<String, String> previewCode(Long tableId) {
-        Map<String, String> dataMap = new LinkedHashMap<>();
-        // 查询表信息
-        GenTable table = baseMapper.selectGenTableById(tableId);
-        // 设置主子表信息
-        setSubTable(table);
-        // 设置主键列信息
-        setPkColumn(table);
-        VelocityInitializer.initVelocity();
-
-        VelocityContext context = VelocityUtils.prepareContext(table);
-
-        // 获取模板列表
-        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
-        for (String template : templates) {
-            // 渲染模板
-            StringWriter sw = new StringWriter();
-            Template tpl = Velocity.getTemplate(template, Constants.UTF8);
-            tpl.merge(context, sw);
-            dataMap.put(template, sw.toString());
-        }
-        return dataMap;
-    }
-
-    /**
-     * 生成代码（下载方式）
-     *
-     * @param tableName 表名称
-     * @return 数据
-     */
-    @Override
-    public byte[] downloadCode(String tableName) {
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        ZipOutputStream zip = new ZipOutputStream(outputStream);
-        generatorCode(tableName, zip);
-        IOUtils.closeQuietly(zip);
-        return outputStream.toByteArray();
-    }
-
-    /**
-     * 生成代码（自定义路径）
-     *
-     * @param tableName 表名称
-     */
-    @Override
-    public void generatorCode(String tableName) {
-        // 查询表信息
-        GenTable table = baseMapper.selectGenTableByName(tableName);
-        // 设置主子表信息
-        setSubTable(table);
-        // 设置主键列信息
-        setPkColumn(table);
-
-        VelocityInitializer.initVelocity();
-
-        VelocityContext context = VelocityUtils.prepareContext(table);
-
-        // 获取模板列表
-        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
-        for (String template : templates) {
-            if (!StrUtil.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm")) {
-                // 渲染模板
-                StringWriter sw = new StringWriter();
-                Template tpl = Velocity.getTemplate(template, Constants.UTF8);
-                tpl.merge(context, sw);
-                try {
-                    String path = getGenPath(table, template);
-                    FileUtils.writeStringToFile(new File(path), sw.toString(), Constants.UTF8);
-                } catch (IOException e) {
-                    throw new CustomException("渲染模板失败，表名：" + table.getTableName());
-                }
-            }
-        }
-    }
-
-    /**
-     * 同步数据库
-     *
-     * @param tableName 表名称
-     */
-    @Override
-    @Transactional
-    public void synchDb(String tableName) {
-        GenTable table = baseMapper.selectGenTableByName(tableName);
-        List<GenTableColumn> tableColumns = table.getColumns();
-        List<String> tableColumnNames = tableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList());
-
-        List<GenTableColumn> dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
-        if (Validator.isEmpty(dbTableColumns)) {
-            throw new CustomException("同步数据失败，原表结构不存在");
-        }
-        List<String> dbTableColumnNames = dbTableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList());
-
-        dbTableColumns.forEach(column -> {
-            if (!tableColumnNames.contains(column.getColumnName())) {
-                GenUtils.initColumnField(column, table);
-                genTableColumnMapper.insert(column);
-            }
-        });
-
-        List<GenTableColumn> delColumns = tableColumns.stream().filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList());
-        if (CollUtil.isNotEmpty(delColumns)) {
-            List<Long> ids = delColumns.stream().map(GenTableColumn::getColumnId).collect(Collectors.toList());
-            genTableColumnMapper.deleteBatchIds(ids);
-        }
-    }
-
-    /**
-     * 批量生成代码（下载方式）
-     *
-     * @param tableNames 表数组
-     * @return 数据
-     */
-    @Override
-    public byte[] downloadCode(String[] tableNames) {
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        ZipOutputStream zip = new ZipOutputStream(outputStream);
-        for (String tableName : tableNames) {
-            generatorCode(tableName, zip);
-        }
-        IOUtils.closeQuietly(zip);
-        return outputStream.toByteArray();
-    }
-
-    /**
-     * 查询表信息并生成代码
-     */
-    private void generatorCode(String tableName, ZipOutputStream zip) {
-        // 查询表信息
-        GenTable table = baseMapper.selectGenTableByName(tableName);
-        // 设置主子表信息
-        setSubTable(table);
-        // 设置主键列信息
-        setPkColumn(table);
-
-        VelocityInitializer.initVelocity();
-
-        VelocityContext context = VelocityUtils.prepareContext(table);
-
-        // 获取模板列表
-        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
-        for (String template : templates) {
-            // 渲染模板
-            StringWriter sw = new StringWriter();
-            Template tpl = Velocity.getTemplate(template, Constants.UTF8);
-            tpl.merge(context, sw);
-            try {
-                // 添加到zip
-                zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table)));
-                IOUtils.write(sw.toString(), zip, Constants.UTF8);
-                IOUtils.closeQuietly(sw);
-                zip.flush();
-                zip.closeEntry();
-            } catch (IOException e) {
-                log.error("渲染模板失败，表名：" + table.getTableName(), e);
-            }
-        }
-    }
-
-    /**
-     * 修改保存参数校验
-     *
-     * @param genTable 业务信息
-     */
-    @Override
-    public void validateEdit(GenTable genTable) {
-        if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) {
-            String options = JSON.toJSONString(genTable.getParams());
-            JSONObject paramsObj = JSONObject.parseObject(options);
-            if (Validator.isEmpty(paramsObj.getString(GenConstants.TREE_CODE))) {
-                throw new CustomException("树编码字段不能为空");
-            } else if (Validator.isEmpty(paramsObj.getString(GenConstants.TREE_PARENT_CODE))) {
-                throw new CustomException("树父编码字段不能为空");
-            } else if (Validator.isEmpty(paramsObj.getString(GenConstants.TREE_NAME))) {
-                throw new CustomException("树名称字段不能为空");
-            } else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory())) {
-                if (Validator.isEmpty(genTable.getSubTableName())) {
-                    throw new CustomException("关联子表的表名不能为空");
-                } else if (Validator.isEmpty(genTable.getSubTableFkName())) {
-                    throw new CustomException("子表关联的外键名不能为空");
-                }
-            }
-        }
-    }
-
-    /**
-     * 设置主键列信息
-     *
-     * @param table 业务表信息
-     */
-    public void setPkColumn(GenTable table) {
-        for (GenTableColumn column : table.getColumns()) {
-            if (column.isPk()) {
-                table.setPkColumn(column);
-                break;
-            }
-        }
-        if (Validator.isNull(table.getPkColumn())) {
-            table.setPkColumn(table.getColumns().get(0));
-        }
-        if (GenConstants.TPL_SUB.equals(table.getTplCategory())) {
-            for (GenTableColumn column : table.getSubTable().getColumns()) {
-                if (column.isPk()) {
-                    table.getSubTable().setPkColumn(column);
-                    break;
-                }
-            }
-            if (Validator.isNull(table.getSubTable().getPkColumn())) {
-                table.getSubTable().setPkColumn(table.getSubTable().getColumns().get(0));
-            }
-        }
-    }
-
-    /**
-     * 设置主子表信息
-     *
-     * @param table 业务表信息
-     */
-    public void setSubTable(GenTable table) {
-        String subTableName = table.getSubTableName();
-        if (Validator.isNotEmpty(subTableName)) {
-            table.setSubTable(baseMapper.selectGenTableByName(subTableName));
-        }
-    }
-
-    /**
-     * 设置代码生成其他选项值
-     *
-     * @param genTable 设置后的生成对象
-     */
-    public void setTableFromOptions(GenTable genTable) {
-        JSONObject paramsObj = JSONObject.parseObject(genTable.getOptions());
-        if (Validator.isNotNull(paramsObj)) {
-            String treeCode = paramsObj.getString(GenConstants.TREE_CODE);
-            String treeParentCode = paramsObj.getString(GenConstants.TREE_PARENT_CODE);
-            String treeName = paramsObj.getString(GenConstants.TREE_NAME);
-            String parentMenuId = paramsObj.getString(GenConstants.PARENT_MENU_ID);
-            String parentMenuName = paramsObj.getString(GenConstants.PARENT_MENU_NAME);
-
-            genTable.setTreeCode(treeCode);
-            genTable.setTreeParentCode(treeParentCode);
-            genTable.setTreeName(treeName);
-            genTable.setParentMenuId(parentMenuId);
-            genTable.setParentMenuName(parentMenuName);
-        }
-    }
-
-    /**
-     * 获取代码生成地址
-     *
-     * @param table    业务表信息
-     * @param template 模板文件路径
-     * @return 生成地址
-     */
-    public static String getGenPath(GenTable table, String template) {
-        String genPath = table.getGenPath();
-        if (StrUtil.equals(genPath, "/")) {
-            return System.getProperty("user.dir") + File.separator + "src" + File.separator + VelocityUtils.getFileName(template, table);
-        }
-        return genPath + File.separator + VelocityUtils.getFileName(template, table);
-    }
-}

zhongzheng-generator/src/main/java/com/zhongzheng/generator/service/IGenTableColumnService.java

@@ -1,45 +0,0 @@
-package com.zhongzheng.generator.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.generator.domain.GenTableColumn;
-
-import java.util.List;
-
-/**
- * 业务字段 服务层
- *
- * @author zhongzheng
- */
-public interface IGenTableColumnService extends IService<GenTableColumn> {
-    /**
-     * 查询业务字段列表
-     *
-     * @param tableId 业务字段编号
-     * @return 业务字段集合
-     */
-    public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId);
-
-    /**
-     * 新增业务字段
-     *
-     * @param genTableColumn 业务字段信息
-     * @return 结果
-     */
-    public int insertGenTableColumn(GenTableColumn genTableColumn);
-
-    /**
-     * 修改业务字段
-     *
-     * @param genTableColumn 业务字段信息
-     * @return 结果
-     */
-    public int updateGenTableColumn(GenTableColumn genTableColumn);
-
-    /**
-     * 删除业务字段信息
-     *
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteGenTableColumnByIds(String ids);
-}

zhongzheng-generator/src/main/java/com/zhongzheng/generator/service/IGenTableService.java

@@ -1,122 +0,0 @@
-package com.zhongzheng.generator.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.generator.domain.GenTable;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 业务 服务层
- *
- * @author zhongzheng
- */
-public interface IGenTableService extends IService<GenTable> {
-    /**
-     * 查询业务列表
-     *
-     * @param genTable 业务信息
-     * @return 业务集合
-     */
-    public List<GenTable> selectGenTableList(GenTable genTable);
-
-    /**
-     * 查询据库列表
-     *
-     * @param genTable 业务信息
-     * @return 数据库表集合
-     */
-    public List<GenTable> selectDbTableList(GenTable genTable);
-
-    /**
-     * 查询据库列表
-     *
-     * @param tableNames 表名称组
-     * @return 数据库表集合
-     */
-    public List<GenTable> selectDbTableListByNames(String[] tableNames);
-
-    /**
-     * 查询所有表信息
-     *
-     * @return 表信息集合
-     */
-    public List<GenTable> selectGenTableAll();
-
-    /**
-     * 查询业务信息
-     *
-     * @param id 业务ID
-     * @return 业务信息
-     */
-    public GenTable selectGenTableById(Long id);
-
-    /**
-     * 修改业务
-     *
-     * @param genTable 业务信息
-     * @return 结果
-     */
-    public void updateGenTable(GenTable genTable);
-
-    /**
-     * 删除业务信息
-     *
-     * @param tableIds 需要删除的表数据ID
-     * @return 结果
-     */
-    public void deleteGenTableByIds(Long[] tableIds);
-
-    /**
-     * 导入表结构
-     *
-     * @param tableList 导入表列表
-     */
-    public void importGenTable(List<GenTable> tableList);
-
-    /**
-     * 预览代码
-     *
-     * @param tableId 表编号
-     * @return 预览数据列表
-     */
-    public Map<String, String> previewCode(Long tableId);
-
-    /**
-     * 生成代码（下载方式）
-     *
-     * @param tableName 表名称
-     * @return 数据
-     */
-    public byte[] downloadCode(String tableName);
-
-    /**
-     * 生成代码（自定义路径）
-     *
-     * @param tableName 表名称
-     * @return 数据
-     */
-    public void generatorCode(String tableName);
-
-    /**
-     * 同步数据库
-     *
-     * @param tableName 表名称
-     */
-    public void synchDb(String tableName);
-
-    /**
-     * 批量生成代码（下载方式）
-     *
-     * @param tableNames 表数组
-     * @return 数据
-     */
-    public byte[] downloadCode(String[] tableNames);
-
-    /**
-     * 修改保存参数校验
-     *
-     * @param genTable 业务信息
-     */
-    public void validateEdit(GenTable genTable);
-}

zhongzheng-generator/src/main/java/com/zhongzheng/generator/util/GenUtils.java

@@ -1,259 +0,0 @@
-package com.zhongzheng.generator.util;
-
-import cn.hutool.core.util.StrUtil;
-import com.zhongzheng.common.constant.GenConstants;
-import com.zhongzheng.generator.config.GenConfig;
-import com.zhongzheng.generator.domain.GenTable;
-import com.zhongzheng.generator.domain.GenTableColumn;
-import org.apache.commons.lang3.RegExUtils;
-
-import java.util.Arrays;
-
-/**
- * 代码生成器 工具类
- * 
- * @author zhongzheng
- */
-public class GenUtils
-{
-    /**
-     * 初始化表信息
-     */
-    public static void initTable(GenTable genTable, String operName)
-    {
-        genTable.setClassName(convertClassName(genTable.getTableName()));
-        genTable.setPackageName(GenConfig.getPackageName());
-        genTable.setModuleName(getModuleName(GenConfig.getPackageName()));
-        genTable.setBusinessName(getBusinessName(genTable.getTableName()));
-        genTable.setFunctionName(replaceText(genTable.getTableComment()));
-        genTable.setFunctionAuthor(GenConfig.getAuthor());
-        genTable.setCreateBy(operName);
-    }
-
-    /**
-     * 初始化列属性字段
-     */
-    public static void initColumnField(GenTableColumn column, GenTable table)
-    {
-        String dataType = getDbType(column.getColumnType());
-        String columnName = column.getColumnName();
-        column.setTableId(table.getTableId());
-        column.setCreateBy(table.getCreateBy());
-        // 设置java字段名
-        column.setJavaField(StrUtil.toCamelCase(columnName));
-        // 设置默认类型
-        column.setJavaType(GenConstants.TYPE_STRING);
-
-        if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType))
-        {
-            // 字符串长度超过500设置为文本域
-            Integer columnLength = getColumnLength(column.getColumnType());
-            String htmlType = columnLength >= 500 || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType) ? GenConstants.HTML_TEXTAREA : GenConstants.HTML_INPUT;
-            column.setHtmlType(htmlType);
-        }
-        else if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType))
-        {
-            column.setJavaType(GenConstants.TYPE_DATE);
-            column.setHtmlType(GenConstants.HTML_DATETIME);
-        }
-        else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType))
-        {
-            column.setHtmlType(GenConstants.HTML_INPUT);
-
-            // 如果是浮点型 统一用BigDecimal
-            String[] str = StrUtil.split(StrUtil.subBetween(column.getColumnType(), "(", ")"), ",");
-            if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0)
-            {
-                column.setJavaType(GenConstants.TYPE_BIGDECIMAL);
-            }
-            // 如果是整形
-            else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10)
-            {
-                column.setJavaType(GenConstants.TYPE_INTEGER);
-            }
-            // 长整形
-            else
-            {
-                column.setJavaType(GenConstants.TYPE_LONG);
-            }
-        }
-
-        // 插入字段（默认所有字段都需要插入）
-        column.setIsInsert(GenConstants.REQUIRE);
-
-        // 编辑字段
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName) && !column.isPk())
-        {
-            column.setIsEdit(GenConstants.REQUIRE);
-        }
-        // 列表字段
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName) && !column.isPk())
-        {
-            column.setIsList(GenConstants.REQUIRE);
-        }
-        // 查询字段
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk())
-        {
-            column.setIsQuery(GenConstants.REQUIRE);
-        }
-
-        // 查询字段类型
-        if (StrUtil.endWithIgnoreCase(columnName, "name"))
-        {
-            column.setQueryType(GenConstants.QUERY_LIKE);
-        }
-        // 状态字段设置单选框
-        if (StrUtil.endWithIgnoreCase(columnName, "status"))
-        {
-            column.setHtmlType(GenConstants.HTML_RADIO);
-        }
-        // 类型&性别字段设置下拉框
-        else if (StrUtil.endWithIgnoreCase(columnName, "type")
-                || StrUtil.endWithIgnoreCase(columnName, "sex"))
-        {
-            column.setHtmlType(GenConstants.HTML_SELECT);
-        }
-        // 图片字段设置图片上传控件
-        else if (StrUtil.endWithIgnoreCase(columnName, "image"))
-        {
-            column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD);
-        }
-        // 文件字段设置文件上传控件
-        else if (StrUtil.endWithIgnoreCase(columnName, "file"))
-        {
-            column.setHtmlType(GenConstants.HTML_FILE_UPLOAD);
-        }
-        // 内容字段设置富文本控件
-        else if (StrUtil.endWithIgnoreCase(columnName, "content"))
-        {
-            column.setHtmlType(GenConstants.HTML_EDITOR);
-        }
-    }
-
-    /**
-     * 校验数组是否包含指定值
-     * 
-     * @param arr 数组
-     * @param targetValue 值
-     * @return 是否包含
-     */
-    public static boolean arraysContains(String[] arr, String targetValue)
-    {
-        return Arrays.asList(arr).contains(targetValue);
-    }
-
-    /**
-     * 获取模块名
-     * 
-     * @param packageName 包名
-     * @return 模块名
-     */
-    public static String getModuleName(String packageName)
-    {
-        int lastIndex = packageName.lastIndexOf(".");
-        int nameLength = packageName.length();
-        String moduleName = StrUtil.sub(packageName, lastIndex + 1, nameLength);
-        return moduleName;
-    }
-
-    /**
-     * 获取业务名
-     * 
-     * @param tableName 表名
-     * @return 业务名
-     */
-    public static String getBusinessName(String tableName)
-    {
-        int lastIndex = tableName.lastIndexOf("_");
-        int nameLength = tableName.length();
-        String businessName = StrUtil.sub(tableName, lastIndex + 1, nameLength);
-        return businessName;
-    }
-
-    /**
-     * 表名转换成Java类名
-     * 
-     * @param tableName 表名称
-     * @return 类名
-     */
-    public static String convertClassName(String tableName)
-    {
-        boolean autoRemovePre = GenConfig.getAutoRemovePre();
-        String tablePrefix = GenConfig.getTablePrefix();
-        if (autoRemovePre && StrUtil.isNotEmpty(tablePrefix))
-        {
-            String[] searchList = StrUtil.split(tablePrefix, ",");
-            tableName = replaceFirst(tableName, searchList);
-        }
-        return StrUtil.upperFirst(StrUtil.toCamelCase(tableName));
-    }
-
-    /**
-     * 批量替换前缀
-     * 
-     * @param replacementm 替换值
-     * @param searchList 替换列表
-     * @return
-     */
-    public static String replaceFirst(String replacementm, String[] searchList)
-    {
-        String text = replacementm;
-        for (String searchString : searchList)
-        {
-            if (replacementm.startsWith(searchString))
-            {
-                text = replacementm.replaceFirst(searchString, "");
-                break;
-            }
-        }
-        return text;
-    }
-
-    /**
-     * 关键字替换
-     * 
-     * @param text 需要被替换的名字
-     * @return 替换后的名字
-     */
-    public static String replaceText(String text)
-    {
-        return RegExUtils.replaceAll(text, "(?:表|若依)", "");
-    }
-
-    /**
-     * 获取数据库类型字段
-     * 
-     * @param columnType 列类型
-     * @return 截取后的列类型
-     */
-    public static String getDbType(String columnType)
-    {
-        if (StrUtil.indexOf(columnType, '(') > 0)
-        {
-            return StrUtil.subBefore(columnType, "(",false);
-        }
-        else
-        {
-            return columnType;
-        }
-    }
-
-    /**
-     * 获取字段长度
-     * 
-     * @param columnType 列类型
-     * @return 截取后的列类型
-     */
-    public static Integer getColumnLength(String columnType)
-    {
-        if (StrUtil.indexOf(columnType, '(') > 0)
-        {
-            String length = StrUtil.subBetween(columnType, "(", ")");
-            return Integer.valueOf(length);
-        }
-        else
-        {
-            return 0;
-        }
-    }
-}

zhongzheng-generator/src/main/java/com/zhongzheng/generator/util/VelocityInitializer.java

@@ -1,35 +0,0 @@
-package com.zhongzheng.generator.util;
-
-import java.util.Properties;
-import org.apache.velocity.app.Velocity;
-import com.zhongzheng.common.constant.Constants;
-
-/**
- * VelocityEngine工厂
- * 
- * @author zhongzheng
- */
-public class VelocityInitializer
-{
-    /**
-     * 初始化vm方法
-     */
-    public static void initVelocity()
-    {
-        Properties p = new Properties();
-        try
-        {
-            // 加载classpath目录下的vm文件
-            p.setProperty("file.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
-            // 定义字符集
-            p.setProperty(Velocity.INPUT_ENCODING, Constants.UTF8);
-            p.setProperty(Velocity.OUTPUT_ENCODING, Constants.UTF8);
-            // 初始化Velocity引擎，指定配置Properties
-            Velocity.init(p);
-        }
-        catch (Exception e)
-        {
-            throw new RuntimeException(e);
-        }
-    }
-}

zhongzheng-generator/src/main/java/com/zhongzheng/generator/util/VelocityUtils.java

@@ -1,383 +0,0 @@
-package com.zhongzheng.generator.util;
-
-import cn.hutool.core.lang.Validator;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.zhongzheng.common.constant.GenConstants;
-import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.generator.domain.GenTable;
-import com.zhongzheng.generator.domain.GenTableColumn;
-import org.apache.velocity.VelocityContext;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-
-/**
- * 模板处理工具类
- * 
- * @author zhongzheng
- */
-public class VelocityUtils
-{
-    /** 项目空间路径 */
-    private static final String PROJECT_PATH = "main/java";
-
-    /** mybatis空间路径 */
-    private static final String MYBATIS_PATH = "main/resources/mapper";
-
-    /** 默认上级菜单，系统工具 */
-    private static final String DEFAULT_PARENT_MENU_ID = "3";
-
-    /**
-     * 设置模板变量信息
-     *
-     * @return 模板列表
-     */
-    public static VelocityContext prepareContext(GenTable genTable)
-    {
-        String moduleName = genTable.getModuleName();
-        String businessName = genTable.getBusinessName();
-        String packageName = genTable.getPackageName();
-        String tplCategory = genTable.getTplCategory();
-        String functionName = genTable.getFunctionName();
-
-        VelocityContext velocityContext = new VelocityContext();
-        velocityContext.put("tplCategory", genTable.getTplCategory());
-        velocityContext.put("tableName", genTable.getTableName());
-        velocityContext.put("functionName", StrUtil.isNotEmpty(functionName) ? functionName : "【请填写功能名称】");
-        velocityContext.put("ClassName", genTable.getClassName());
-        velocityContext.put("className", StrUtil.lowerFirst(genTable.getClassName()));
-        velocityContext.put("moduleName", genTable.getModuleName());
-        velocityContext.put("BusinessName", StrUtil.upperFirst(genTable.getBusinessName()));
-        velocityContext.put("businessName", genTable.getBusinessName());
-        velocityContext.put("basePackage", getPackagePrefix(packageName));
-        velocityContext.put("packageName", packageName);
-        velocityContext.put("author", genTable.getFunctionAuthor());
-        velocityContext.put("datetime", DateUtils.getDate());
-        velocityContext.put("pkColumn", genTable.getPkColumn());
-        velocityContext.put("importList", getImportList(genTable));
-        velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName));
-        velocityContext.put("columns", genTable.getColumns());
-        velocityContext.put("table", genTable);
-        setMenuVelocityContext(velocityContext, genTable);
-        if (GenConstants.TPL_TREE.equals(tplCategory))
-        {
-            setTreeVelocityContext(velocityContext, genTable);
-        }
-        if (GenConstants.TPL_SUB.equals(tplCategory))
-        {
-            setSubVelocityContext(velocityContext, genTable);
-        }
-        return velocityContext;
-    }
-
-    public static void setMenuVelocityContext(VelocityContext context, GenTable genTable)
-    {
-        String options = genTable.getOptions();
-        JSONObject paramsObj = JSONObject.parseObject(options);
-        String parentMenuId = getParentMenuId(paramsObj);
-        context.put("parentMenuId", parentMenuId);
-    }
-
-    public static void setTreeVelocityContext(VelocityContext context, GenTable genTable)
-    {
-        String options = genTable.getOptions();
-        JSONObject paramsObj = JSONObject.parseObject(options);
-        String treeCode = getTreecode(paramsObj);
-        String treeParentCode = getTreeParentCode(paramsObj);
-        String treeName = getTreeName(paramsObj);
-
-        context.put("treeCode", treeCode);
-        context.put("treeParentCode", treeParentCode);
-        context.put("treeName", treeName);
-        context.put("expandColumn", getExpandColumn(genTable));
-        if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE))
-        {
-            context.put("tree_parent_code", paramsObj.getString(GenConstants.TREE_PARENT_CODE));
-        }
-        if (paramsObj.containsKey(GenConstants.TREE_NAME))
-        {
-            context.put("tree_name", paramsObj.getString(GenConstants.TREE_NAME));
-        }
-    }
-
-    public static void setSubVelocityContext(VelocityContext context, GenTable genTable)
-    {
-        GenTable subTable = genTable.getSubTable();
-        String subTableName = genTable.getSubTableName();
-        String subTableFkName = genTable.getSubTableFkName();
-        String subClassName = genTable.getSubTable().getClassName();
-        String subTableFkClassName = StrUtil.toCamelCase(subTableFkName);
-
-        context.put("subTable", subTable);
-        context.put("subTableName", subTableName);
-        context.put("subTableFkName", subTableFkName);
-        context.put("subTableFkClassName", subTableFkClassName);
-        context.put("subTableFkclassName", StrUtil.lowerFirst(subTableFkClassName));
-        context.put("subClassName", subClassName);
-        context.put("subclassName", StrUtil.lowerFirst(subClassName));
-        context.put("subImportList", getImportList(genTable.getSubTable()));
-    }
-
-    /**
-     * 获取模板信息
-     *
-     * @return 模板列表
-     */
-    public static List<String> getTemplateList(String tplCategory)
-    {
-        List<String> templates = new ArrayList<String>();
-        templates.add("vm/java/domain.java.vm");
-        templates.add("vm/java/vo.java.vm");
-        templates.add("vm/java/queryBo.java.vm");
-        templates.add("vm/java/addBo.java.vm");
-        templates.add("vm/java/editBo.java.vm");
-        templates.add("vm/java/mapper.java.vm");
-        templates.add("vm/java/service.java.vm");
-        templates.add("vm/java/serviceImpl.java.vm");
-        templates.add("vm/java/controller.java.vm");
-        templates.add("vm/xml/mapper.xml.vm");
-        templates.add("vm/sql/sql.vm");
-        templates.add("vm/js/api.js.vm");
-        if (GenConstants.TPL_CRUD.equals(tplCategory))
-        {
-            templates.add("vm/vue/index.vue.vm");
-        }
-        else if (GenConstants.TPL_TREE.equals(tplCategory))
-        {
-            templates.add("vm/vue/index-tree.vue.vm");
-        }
-        else if (GenConstants.TPL_SUB.equals(tplCategory))
-        {
-            templates.add("vm/vue/index.vue.vm");
-            templates.add("vm/java/sub-domain.java.vm");
-        }
-        return templates;
-    }
-
-    /**
-     * 获取文件名
-     */
-    public static String getFileName(String template, GenTable genTable)
-    {
-        // 文件名称
-        String fileName = "";
-        // 包路径
-        String packageName = genTable.getPackageName();
-        // 模块名
-        String moduleName = genTable.getModuleName();
-        // 大写类名
-        String className = genTable.getClassName();
-        // 业务名称
-        String businessName = genTable.getBusinessName();
-
-        String javaPath = PROJECT_PATH + "/" + StrUtil.replace(packageName, ".", "/");
-        String mybatisPath = MYBATIS_PATH + "/" + moduleName;
-        String vuePath = "vue";
-
-        if (template.contains("domain.java.vm"))
-        {
-            fileName = StrUtil.format("{}/domain/{}.java", javaPath, className);
-        }
-        if (template.contains("vo.java.vm"))
-        {
-            fileName = StrUtil.format("{}/vo/{}Vo.java", javaPath, className);
-        }
-        if (template.contains("queryBo.java.vm"))
-        {
-            fileName = StrUtil.format("{}/bo/{}QueryBo.java", javaPath, className);
-        }
-        if (template.contains("addBo.java.vm"))
-        {
-            fileName = StrUtil.format("{}/bo/{}AddBo.java", javaPath, className);
-        }
-        if (template.contains("editBo.java.vm"))
-        {
-            fileName = StrUtil.format("{}/bo/{}EditBo.java", javaPath, className);
-        }
-        if (template.contains("sub-domain.java.vm") && StrUtil.equals(GenConstants.TPL_SUB, genTable.getTplCategory()))
-        {
-            fileName = StrUtil.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName());
-        }
-        else if (template.contains("mapper.java.vm"))
-        {
-            fileName = StrUtil.format("{}/mapper/{}Mapper.java", javaPath, className);
-        }
-        else if (template.contains("service.java.vm"))
-        {
-            fileName = StrUtil.format("{}/service/I{}Service.java", javaPath, className);
-        }
-        else if (template.contains("serviceImpl.java.vm"))
-        {
-            fileName = StrUtil.format("{}/service/impl/{}ServiceImpl.java", javaPath, className);
-        }
-        else if (template.contains("controller.java.vm"))
-        {
-            fileName = StrUtil.format("{}/controller/{}Controller.java", javaPath, className);
-        }
-        else if (template.contains("mapper.xml.vm"))
-        {
-            fileName = StrUtil.format("{}/{}Mapper.xml", mybatisPath, className);
-        }
-        else if (template.contains("sql.vm"))
-        {
-            fileName = businessName + "Menu.sql";
-        }
-        else if (template.contains("api.js.vm"))
-        {
-            fileName = StrUtil.format("{}/api/{}/{}.js", vuePath, moduleName, businessName);
-        }
-        else if (template.contains("index.vue.vm"))
-        {
-            fileName = StrUtil.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
-        }
-        else if (template.contains("index-tree.vue.vm"))
-        {
-            fileName = StrUtil.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
-        }
-        return fileName;
-    }
-
-    /**
-     * 获取包前缀
-     *
-     * @param packageName 包名称
-     * @return 包前缀名称
-     */
-    public static String getPackagePrefix(String packageName)
-    {
-        int lastIndex = packageName.lastIndexOf(".");
-        String basePackage = StrUtil.sub(packageName, 0, lastIndex);
-        return basePackage;
-    }
-
-    /**
-     * 根据列类型获取导入包
-     *
-     * @param genTable 业务表对象
-     * @return 返回需要导入的包列表
-     */
-    public static HashSet<String> getImportList(GenTable genTable)
-    {
-        List<GenTableColumn> columns = genTable.getColumns();
-        GenTable subGenTable = genTable.getSubTable();
-        HashSet<String> importList = new HashSet<String>();
-        if (Validator.isNotNull(subGenTable))
-        {
-            importList.add("java.util.List");
-        }
-        for (GenTableColumn column : columns)
-        {
-            if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType()))
-            {
-                importList.add("java.util.Date");
-                importList.add("com.fasterxml.jackson.annotation.JsonFormat");
-            }
-            else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType()))
-            {
-                importList.add("java.math.BigDecimal");
-            }
-        }
-        return importList;
-    }
-
-    /**
-     * 获取权限前缀
-     *
-     * @param moduleName 模块名称
-     * @param businessName 业务名称
-     * @return 返回权限前缀
-     */
-    public static String getPermissionPrefix(String moduleName, String businessName)
-    {
-        return StrUtil.format("{}:{}", moduleName, businessName);
-    }
-
-    /**
-     * 获取上级菜单ID字段
-     *
-     * @param paramsObj 生成其他选项
-     * @return 上级菜单ID字段
-     */
-    public static String getParentMenuId(JSONObject paramsObj)
-    {
-        if (Validator.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID))
-        {
-            return paramsObj.getString(GenConstants.PARENT_MENU_ID);
-        }
-        return DEFAULT_PARENT_MENU_ID;
-    }
-
-    /**
-     * 获取树编码
-     *
-     * @param paramsObj 生成其他选项
-     * @return 树编码
-     */
-    public static String getTreecode(JSONObject paramsObj)
-    {
-        if (paramsObj.containsKey(GenConstants.TREE_CODE))
-        {
-            return StrUtil.toCamelCase(paramsObj.getString(GenConstants.TREE_CODE));
-        }
-        return StrUtil.EMPTY;
-    }
-
-    /**
-     * 获取树父编码
-     *
-     * @param paramsObj 生成其他选项
-     * @return 树父编码
-     */
-    public static String getTreeParentCode(JSONObject paramsObj)
-    {
-        if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE))
-        {
-            return StrUtil.toCamelCase(paramsObj.getString(GenConstants.TREE_PARENT_CODE));
-        }
-        return StrUtil.EMPTY;
-    }
-
-    /**
-     * 获取树名称
-     *
-     * @param paramsObj 生成其他选项
-     * @return 树名称
-     */
-    public static String getTreeName(JSONObject paramsObj)
-    {
-        if (paramsObj.containsKey(GenConstants.TREE_NAME))
-        {
-            return StrUtil.toCamelCase(paramsObj.getString(GenConstants.TREE_NAME));
-        }
-        return StrUtil.EMPTY;
-    }
-
-    /**
-     * 获取需要在哪一列上面显示展开按钮
-     *
-     * @param genTable 业务表对象
-     * @return 展开按钮列序号
-     */
-    public static int getExpandColumn(GenTable genTable)
-    {
-        String options = genTable.getOptions();
-        JSONObject paramsObj = JSONObject.parseObject(options);
-        String treeName = paramsObj.getString(GenConstants.TREE_NAME);
-        int num = 0;
-        for (GenTableColumn column : genTable.getColumns())
-        {
-            if (column.isList())
-            {
-                num++;
-                String columnName = column.getColumnName();
-                if (columnName.equals(treeName))
-                {
-                    break;
-                }
-            }
-        }
-        return num;
-    }
-}

zhongzheng-generator/src/main/resources/generator.yml

@@ -1,10 +0,0 @@
-# 代码生成
-gen: 
-  # 作者
-  author: ruoyi
-  # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: com.zhongzheng.system
-  # 自动去除表前缀，默认是false
-  autoRemovePre: false
-  # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
-  tablePrefix: sys_

zhongzheng-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.generator.mapper.GenTableColumnMapper">
-    
-    <resultMap type="GenTableColumn" id="GenTableColumnResult">
-        <id     property="columnId"       column="column_id"      />
-        <result property="tableId"        column="table_id"       />
-        <result property="columnName"     column="column_name"    />
-        <result property="columnComment"  column="column_comment" />
-        <result property="columnType"     column="column_type"    />
-        <result property="javaType"       column="java_type"      />
-        <result property="javaField"      column="java_field"     />
-        <result property="isPk"           column="is_pk"          />
-        <result property="isIncrement"    column="is_increment"   />
-        <result property="isRequired"     column="is_required"    />
-        <result property="isInsert"       column="is_insert"      />
-        <result property="isEdit"         column="is_edit"        />
-        <result property="isList"         column="is_list"        />
-        <result property="isQuery"        column="is_query"       />
-        <result property="queryType"      column="query_type"     />
-        <result property="htmlType"       column="html_type"      />
-        <result property="dictType"       column="dict_type"      />
-        <result property="sort"           column="sort"           />
-        <result property="createBy"       column="create_by"      />
-        <result property="createTime"     column="create_time"    />
-        <result property="updateBy"       column="update_by"      />
-        <result property="updateTime"     column="update_time"    />
-    </resultMap>
-    
-    <select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
-		select column_name, (case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else null end) as is_required, (case when column_key = 'PRI' then '1' else '0' end) as is_pk, ordinal_position as sort, column_comment, (case when extra = 'auto_increment' then '1' else '0' end) as is_increment, column_type
-		from information_schema.columns where table_schema = (select database()) and table_name = (#{tableName})
-		order by ordinal_position
-	</select>
-
-</mapper>

zhongzheng-generator/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.generator.mapper.GenTableMapper">
-
-	<resultMap type="GenTable" id="GenTableResult">
-	    <id     property="tableId"        column="table_id"          />
-		<result property="tableName"      column="table_name"        />
-		<result property="tableComment"   column="table_comment"     />
-		<result property="subTableName"   column="sub_table_name"    />
-		<result property="subTableFkName" column="sub_table_fk_name" />
-		<result property="className"      column="class_name"        />
-		<result property="tplCategory"    column="tpl_category"      />
-		<result property="packageName"    column="package_name"      />
-		<result property="moduleName"     column="module_name"       />
-		<result property="businessName"   column="business_name"     />
-		<result property="functionName"   column="function_name"     />
-		<result property="functionAuthor" column="function_author"   />
-		<result property="genType"        column="gen_type"          />
-		<result property="genPath"        column="gen_path"          />
-		<result property="options"        column="options"           />
-		<result property="createBy"       column="create_by"         />
-		<result property="createTime"     column="create_time"       />
-		<result property="updateBy"       column="update_by"         />
-		<result property="updateTime"     column="update_time"       />
-		<result property="remark"         column="remark"            />
-		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
-	</resultMap>
-	
-	<resultMap type="GenTableColumn" id="GenTableColumnResult">
-        <id     property="columnId"       column="column_id"      />
-        <result property="tableId"        column="table_id"       />
-        <result property="columnName"     column="column_name"    />
-        <result property="columnComment"  column="column_comment" />
-        <result property="columnType"     column="column_type"    />
-        <result property="javaType"       column="java_type"      />
-        <result property="javaField"      column="java_field"     />
-        <result property="isPk"           column="is_pk"          />
-        <result property="isIncrement"    column="is_increment"   />
-        <result property="isRequired"     column="is_required"    />
-        <result property="isInsert"       column="is_insert"      />
-        <result property="isEdit"         column="is_edit"        />
-        <result property="isList"         column="is_list"        />
-        <result property="isQuery"        column="is_query"       />
-        <result property="queryType"      column="query_type"     />
-        <result property="htmlType"       column="html_type"      />
-        <result property="dictType"       column="dict_type"      />
-        <result property="sort"           column="sort"           />
-        <result property="createBy"       column="create_by"      />
-        <result property="createTime"     column="create_time"    />
-        <result property="updateBy"       column="update_by"      />
-        <result property="updateTime"     column="update_time"    />
-    </resultMap>
-	
-	<sql id="selectGenTableVo">
-        select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
-    </sql>
-    
-    <select id="selectGenTableList" parameterType="GenTable" resultMap="GenTableResult">
-		<include refid="selectGenTableVo"/>
-		<where>
-			<if test="tableName != null and tableName != ''">
-				AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
-			</if>
-			<if test="tableComment != null and tableComment != ''">
-				AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
-			</if>
-			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-			</if>
-			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-			</if>
-		</where>
-	</select>
-
-	<select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">
-		select table_name, table_comment, create_time, update_time from information_schema.tables
-		where table_schema = (select database())
-		AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%'
-		AND table_name NOT IN (select table_name from gen_table)
-		<if test="tableName != null and tableName != ''">
-			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
-		</if>
-		<if test="tableComment != null and tableComment != ''">
-			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
-		</if>
-		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-			AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-		</if>
-		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-			AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-		</if>
-	</select>
-	
-	<select id="selectDbTableListByNames" resultMap="GenTableResult">
-		select table_name, table_comment, create_time, update_time from information_schema.tables
-		where table_name NOT LIKE 'qrtz_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
-		and table_name in
-	    <foreach collection="array" item="name" open="(" separator="," close=")">
- 			#{name}
-        </foreach> 
-	</select>
-	
-	<select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
-		select table_name, table_comment, create_time, update_time from information_schema.tables
-		where table_comment <![CDATA[ <> ]]> '' and table_schema = (select database())
-		and table_name = #{tableName}
-	</select>
-	
-	<select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
-	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
-			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
-		FROM gen_table t
-			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
-		where t.table_id = #{tableId} order by c.sort
-	</select>
-	
-	<select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
-	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
-			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
-		FROM gen_table t
-			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
-		where t.table_name = #{tableName} order by c.sort
-	</select>
-
-	<select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
-	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.options, t.remark,
-			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
-		FROM gen_table t
-			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
-		order by c.sort
-	</select>
-
-</mapper>

zhongzheng-generator/src/main/resources/vm/java/addBo.java.vm

@@ -1,42 +0,0 @@
-package ${packageName}.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-
-
-#foreach ($import in $importList)
-import ${import};
-#end
-
-/**
- * ${functionName}添加对象 ${tableName}
- *
- * @author ${author}
- * @date ${datetime}
- */
-@Data
-@ApiModel("${functionName}添加对象")
-public class ${ClassName}AddBo {
-
-#foreach ($column in $columns)
-#if($column.isInsert && $column.isPk!=1)
-#if($column.columnName != 'tenant_id')
-    /** $column.columnComment */
-    @ApiModelProperty("$column.columnComment")
-#if($column.javaType == 'Date')
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-#end
-    private $column.javaType $column.javaField;
-#end
-#end
-#end
-#if($table.sub)
-
-    /** $table.subTable.functionName信息 */
-    @ApiModelProperty("$table.subTable.functionName")
-    private List<${subClassName}> ${subclassName}List;
-#end
-}

zhongzheng-generator/src/main/resources/vm/java/controller.java.vm

@@ -1,122 +0,0 @@
-package ${packageName}.controller;
-
-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 ${packageName}.vo.${ClassName}Vo;
-import ${packageName}.bo.${ClassName}QueryBo;
-import ${packageName}.bo.${ClassName}AddBo;
-import ${packageName}.bo.${ClassName}EditBo;
-import ${packageName}.service.I${ClassName}Service;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-#if($table.crud || $table.sub)
-import com.zhongzheng.common.core.page.TableDataInfo;
-#elseif($table.tree)
-#end
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * ${functionName}Controller
- * 
- * @author ${author}
- * @date ${datetime}
- */
-@Api(value = "${functionName}控制器", tags = {"${functionName}管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/${moduleName}/${businessName}")
-public class ${ClassName}Controller extends BaseController {
-
-    private final I${ClassName}Service i${ClassName}Service;
-
-    /**
-     * 查询${functionName}列表
-     */
-    @ApiOperation("查询${functionName}列表")
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
-    @GetMapping("/list")
-#if($table.crud || $table.sub)
-    public TableDataInfo<${ClassName}Vo> list(${ClassName}QueryBo bo) {
-        startPage();
-        List<${ClassName}Vo> list = i${ClassName}Service.queryList(bo);
-        return getDataTable(list);
-    }
-#elseif($table.tree)
-    public AjaxResult<${ClassName}Vo> list(${ClassName}QueryBo bo) {
-        List<${ClassName}Vo> list = i${ClassName}Service.queryList(bo);
-        return AjaxResult.success(list);
-    }
-#end
-
-    /**
-     * 导出${functionName}列表
-     */
-    @ApiOperation("导出${functionName}列表")
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
-    @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<${ClassName}Vo> export(${ClassName}QueryBo bo) {
-        List<${ClassName}Vo> list = i${ClassName}Service.queryList(bo);
-        ExcelUtil<${ClassName}Vo> util = new ExcelUtil<${ClassName}Vo>(${ClassName}Vo.class);
-        return util.exportExcel(list, "${functionName}");
-    }
-
-    /**
-     * 获取${functionName}详细信息
-     */
-    @ApiOperation("获取${functionName}详细信息")
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
-    @GetMapping("/{${pkColumn.javaField}}")
-    public AjaxResult<${ClassName}Vo> getInfo(@PathVariable("${pkColumn.javaField}" ) ${pkColumn.javaType} ${pkColumn.javaField}) {
-        return AjaxResult.success(i${ClassName}Service.queryById(${pkColumn.javaField}));
-    }
-
-    /**
-     * 新增${functionName}
-     */
-    @ApiOperation("新增${functionName}")
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
-    @Log(title = "${functionName}", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody ${ClassName}AddBo bo) {
-        return toAjax(i${ClassName}Service.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改${functionName}
-     */
-    @ApiOperation("修改${functionName}")
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
-    @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
-    @PutMapping()
-    public AjaxResult<Void> edit(@RequestBody ${ClassName}EditBo bo) {
-        return toAjax(i${ClassName}Service.updateByEditBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除${functionName}
-     */
-    @ApiOperation("删除${functionName}")
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
-    @Log(title = "${functionName}" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{${pkColumn.javaField}s}")
-    public AjaxResult<Void> remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) {
-        return toAjax(i${ClassName}Service.deleteWithValidByIds(Arrays.asList(${pkColumn.javaField}s), true) ? 1 : 0);
-    }
-}

zhongzheng-generator/src/main/resources/vm/java/domain.java.vm

@@ -1,44 +0,0 @@
-package ${packageName}.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.zhongzheng.common.annotation.Excel;
-
-/**
- * ${functionName}对象 ${tableName}
- *
- * @author ${author}
- * @date ${datetime}
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-@TableName("${tableName}")
-public class ${ClassName} implements Serializable {
-
-private static final long serialVersionUID=1L;
-
-#foreach ($column in $columns)
-#if($column.columnName != 'tenant_id')
-    /** $column.columnComment */
-#if($column.javaField=="createBy"||$column.javaField=="createTime")
-    @TableField(fill = FieldFill.INSERT)
-#end
-#if($column.javaField=="updateBy"||$column.javaField=="updateTime")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-#end
-#if($column.javaField=='delFlag')
-    @TableLogic
-#end
-#if($column.isPk==1)
-    @TableId(value = "$column.columnName")
-#end
-    private $column.javaType $column.javaField;
-#end
-#end
-}

zhongzheng-generator/src/main/resources/vm/java/editBo.java.vm

@@ -1,42 +0,0 @@
-package ${packageName}.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-
-#foreach ($import in $importList)
-import ${import};
-#end
-
-/**
- * ${functionName}编辑对象 ${tableName}
- *
- * @author ${author}
- * @date ${datetime}
- */
-@Data
-@ApiModel("${functionName}编辑对象")
-public class ${ClassName}EditBo {
-
-#foreach ($column in $columns)
-#if($column.isEdit || $column.isPk==1)
-#if($column.columnName != 'tenant_id')
-    /** $column.columnComment */
-    @ApiModelProperty("$column.columnComment")
-#if($column.javaType == 'Date')
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-#end
-    private $column.javaType $column.javaField;
-#end
-
-#end
-#end
-#if($table.sub)
-
-    /** $table.subTable.functionName信息 */
-    @ApiModelProperty("$table.subTable.functionName")
-    private List<${subClassName}> ${subclassName}List;
-#end
-}

zhongzheng-generator/src/main/resources/vm/java/mapper.java.vm

@@ -1,14 +0,0 @@
-package ${packageName}.mapper;
-
-import ${packageName}.domain.${ClassName};
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * ${functionName}Mapper接口
- *
- * @author ${author}
- * @date ${datetime}
- */
-public interface ${ClassName}Mapper extends BaseMapper<${ClassName}> {
-
-}

zhongzheng-generator/src/main/resources/vm/java/queryBo.java.vm

@@ -1,63 +0,0 @@
-package ${packageName}.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-import java.util.Map;
-import java.util.HashMap;
-
-#foreach ($import in $importList)
-import ${import};
-#end
-#if($table.crud || $table.sub)
-import com.zhongzheng.common.core.domain.BaseEntity;
-#elseif($table.tree)
-import com.zhongzheng.common.core.domain.TreeEntity;
-#end
-
-/**
- * ${functionName}分页查询对象 ${tableName}
- *
- * @author ${author}
- * @date ${datetime}
- */
-#if($table.crud || $table.sub)
-#set($Entity="BaseEntity")
-#elseif($table.tree)
-#set($Entity="TreeEntity")
-#end
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("${functionName}分页查询对象")
-public class ${ClassName}QueryBo extends ${Entity} {
-
-	/** 分页大小 */
-	@ApiModelProperty("分页大小")
-	private Integer pageSize;
-	/** 当前页数 */
-	@ApiModelProperty("当前页数")
-	private Integer pageNum;
-	/** 排序列 */
-	@ApiModelProperty("排序列")
-	private String orderByColumn;
-	/** 排序的方向desc或者asc */
-	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
-	private String isAsc;
-
-
-#foreach ($column in $columns)
-#if($column.columnName != 'tenant_id')
-#if(!$table.isSuperColumn($column.javaField) && $column.query)
-	/** $column.columnComment */
-#if($column.javaType == 'Date')
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-#end
-	@ApiModelProperty("$column.columnComment")
-	private $column.javaType $column.javaField;
-#end
-#end
-#end
-}

zhongzheng-generator/src/main/resources/vm/java/service.java.vm

@@ -1,52 +0,0 @@
-package ${packageName}.service;
-
-import ${packageName}.domain.${ClassName};
-import ${packageName}.vo.${ClassName}Vo;
-import ${packageName}.bo.${ClassName}QueryBo;
-import ${packageName}.bo.${ClassName}AddBo;
-import ${packageName}.bo.${ClassName}EditBo;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * ${functionName}Service接口
- *
- * @author ${author}
- * @date ${datetime}
- */
-public interface I${ClassName}Service extends IService<${ClassName}> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField});
-
-	/**
-	 * 查询列表
-	 */
-	List<${ClassName}Vo> queryList(${ClassName}QueryBo bo);
-
-	/**
-	 * 根据新增业务对象插入${functionName}
-	 * @param bo ${functionName}新增业务对象
-	 * @return
-	 */
-	Boolean insertByAddBo(${ClassName}AddBo bo);
-
-	/**
-	 * 根据编辑业务对象修改${functionName}
-	 * @param bo ${functionName}编辑业务对象
-	 * @return
-	 */
-	Boolean updateByEditBo(${ClassName}EditBo bo);
-
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

zhongzheng-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -1,125 +0,0 @@
-package ${packageName}.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
-import com.zhongzheng.common.utils.DateUtils;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.Page;
-import ${packageName}.bo.${ClassName}AddBo;
-import ${packageName}.bo.${ClassName}QueryBo;
-import ${packageName}.bo.${ClassName}EditBo;
-import ${packageName}.domain.${ClassName};
-import ${packageName}.mapper.${ClassName}Mapper;
-import ${packageName}.vo.${ClassName}Vo;
-import ${packageName}.service.I${ClassName}Service;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * ${functionName}Service业务层处理
- *
- * @author ${author}
- * @date ${datetime}
- */
-@Service
-public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}> implements I${ClassName}Service {
-
-    @Override
-    public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}){
-        ${ClassName} db = this.baseMapper.selectById(${pkColumn.javaField});
-        return BeanUtil.toBean(db, ${ClassName}Vo.class);
-    }
-
-    @Override
-    public List<${ClassName}Vo> queryList(${ClassName}QueryBo bo) {
-        LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery();
-#foreach($column in $columns)
-#if($column.columnName != 'tenant_id')
-#if($column.query)
-#set($queryType=$column.queryType)
-#set($javaField=$column.javaField)
-#set($javaType=$column.javaType)
-#set($columnName=$column.columnName)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#set($mpMethod=$column.queryType.toLowerCase())
-#if($queryType != 'BETWEEN')
-#if($javaType == 'String')
-#set($condition='StrUtil.isNotBlank(bo.get'+$AttrName+'())')
-#else
-#set($condition='bo.get'+$AttrName+'() != null')
-#end
-        lqw.$mpMethod($condition, ${ClassName}::get$AttrName, bo.get$AttrName());
-#else
-        Object dataScope = bo.getParams().get("dataScope");
-        lqw.apply(dataScope != null, dataScope != null ? dataScope.toString() : null);
-        Map<String, Object> params = bo.getParams();
-        if (params.get("begin$AttrName") != null && params.get("end$AttrName") != null) {
-            lqw.between(${ClassName}::get$AttrName ,params.get("begin$AttrName"), params.get("end$AttrName"));
-        }
-#end
-#end
-#end
-#end
-        return entity2Vo(this.list(lqw));
-    }
-
-    /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
-    private List<${ClassName}Vo> entity2Vo(Collection<${ClassName}> collection) {
-        List<${ClassName}Vo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, ${ClassName}Vo.class))
-                .collect(Collectors.toList());
-        if (collection instanceof Page) {
-            Page<${ClassName}> page = (Page<${ClassName}>)collection;
-            Page<${ClassName}Vo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
-            pageVo.addAll(voList);
-            voList = pageVo;
-        }
-        return voList;
-    }
-
-    @Override
-    public Boolean insertByAddBo(${ClassName}AddBo bo) {
-        ${ClassName} add = BeanUtil.toBean(bo, ${ClassName}.class);
-        validEntityBeforeSave(add);
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
-    }
-
-    @Override
-    public Boolean updateByEditBo(${ClassName}EditBo bo) {
-        ${ClassName} update = BeanUtil.toBean(bo, ${ClassName}.class);
-        validEntityBeforeSave(update);
-        update.setUpdateTime(DateUtils.getNowTime());
-        return this.updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(${ClassName} entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return this.removeByIds(ids);
-    }
-}

zhongzheng-generator/src/main/resources/vm/java/sub-domain.java.vm

@@ -1,76 +0,0 @@
-package ${packageName}.domain;
-
-#foreach ($import in $subImportList)
-import ${import};
-#end
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zhongzheng.common.annotation.Excel;
-import com.zhongzheng.common.core.domain.BaseEntity;
-
-/**
- * ${subTable.functionName}对象 ${subTableName}
- * 
- * @author ${author}
- * @date ${datetime}
- */
-public class ${subClassName} extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-#foreach ($column in $subTable.columns)
-#if(!$table.isSuperColumn($column.javaField))
-    /** $column.columnComment */
-#if($column.list)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($parentheseIndex != -1)
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-#elseif($column.javaType == 'Date')
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
-#else
-    @Excel(name = "${comment}")
-#end
-#end
-    private $column.javaType $column.javaField;
-
-#end
-#end
-#foreach ($column in $subTable.columns)
-#if(!$table.isSuperColumn($column.javaField))
-#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
-#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
-    public void set${AttrName}($column.javaType $column.javaField) 
-    {
-        this.$column.javaField = $column.javaField;
-    }
-
-    public $column.javaType get${AttrName}() 
-    {
-        return $column.javaField;
-    }
-#end
-#end
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-#foreach ($column in $subTable.columns)
-#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
-#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
-            .append("${column.javaField}", get${AttrName}())
-#end
-            .toString();
-    }
-}

zhongzheng-generator/src/main/resources/vm/java/vo.java.vm

@@ -1,53 +0,0 @@
-package ${packageName}.vo;
-
-import com.zhongzheng.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
-#foreach ($import in $importList)
-import ${import};
-#end
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.util.Date;
-
-
-
-/**
- * ${functionName}视图对象 mall_package
- *
- * @author ${author}
- * @date ${datetime}
- */
-@Data
-@ApiModel("${functionName}视图对象")
-public class ${ClassName}Vo {
-	private static final long serialVersionUID = 1L;
-
-	/** $pkColumn.columnComment */
-	@ApiModelProperty("$pkColumn.columnComment")
-	private ${pkColumn.javaType} ${pkColumn.javaField};
-
-#foreach ($column in $columns)
-#if($column.columnName != 'tenant_id')
-#if($column.isList)
-	/** $column.columnComment */
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($parentheseIndex != -1)
-	@Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
-#elseif($column.javaType == 'Date')
-	@Excel(name = "${comment}" , width = 30, dateFormat = "yyyy-MM-dd")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-#else
-	@Excel(name = "${comment}")
-#end
-	@ApiModelProperty("$column.columnComment")
-	private $column.javaType $column.javaField;
-#end
-#end
-#end
-}

zhongzheng-generator/src/main/resources/vm/js/api.js.vm

@@ -1,53 +0,0 @@
-import request from '@/utils/request'
-
-// 查询${functionName}列表
-export function list${BusinessName}(query) {
-  return request({
-    url: '/${moduleName}/${businessName}/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询${functionName}详细
-export function get${BusinessName}(${pkColumn.javaField}) {
-  return request({
-    url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
-    method: 'get'
-  })
-}
-
-// 新增${functionName}
-export function add${BusinessName}(data) {
-  return request({
-    url: '/${moduleName}/${businessName}',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改${functionName}
-export function update${BusinessName}(data) {
-  return request({
-    url: '/${moduleName}/${businessName}',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除${functionName}
-export function del${BusinessName}(${pkColumn.javaField}) {
-  return request({
-    url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
-    method: 'delete'
-  })
-}
-
-// 导出${functionName}
-export function export${BusinessName}(query) {
-  return request({
-    url: '/${moduleName}/${businessName}/export',
-    method: 'get',
-    params: query
-  })
-}

zhongzheng-generator/src/main/resources/vm/sql/sql.vm

@@ -1,22 +0,0 @@
--- 菜单 SQL
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', sysdate(), '', null, '${functionName}菜单');
-
--- 按钮父菜单ID
-SELECT @parentId := LAST_INSERT_ID();
-
--- 按钮 SQL
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}查询', @parentId, '1',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query',        '#', 'admin', sysdate(), '', null, '');
-
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}新增', @parentId, '2',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add',          '#', 'admin', sysdate(), '', null, '');
-
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}修改', @parentId, '3',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit',         '#', 'admin', sysdate(), '', null, '');
-
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}删除', @parentId, '4',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove',       '#', 'admin', sysdate(), '', null, '');
-
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}导出', @parentId, '5',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export',       '#', 'admin', sysdate(), '', null, '');

zhongzheng-generator/src/main/resources/vm/vue/index-tree.vue.vm

@@ -1,539 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-#foreach($column in $columns)
-#if($column.query)
-#set($dictType=$column.dictType)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.htmlType == "input")
-      <el-form-item label="${comment}" prop="${column.javaField}">
-        <el-input
-          v-model="queryParams.${column.javaField}"
-          placeholder="请输入${comment}"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
-      <el-form-item label="${comment}" prop="${column.javaField}">
-        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
-          <el-option
-            v-for="dict in ${column.javaField}Options"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          />
-        </el-select>
-      </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
-      <el-form-item label="${comment}" prop="${column.javaField}">
-        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
-      <el-form-item label="${comment}" prop="${column.javaField}">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.${column.javaField}"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择${comment}">
-        </el-date-picker>
-      </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-      <el-form-item label="${comment}">
-        <el-date-picker
-          v-model="daterange${AttrName}"
-          size="small"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
-      </el-form-item>
-#end
-#end
-#end
-      <el-form-item>
-	    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['${moduleName}:${businessName}:add']"
-        >新增</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table
-      v-loading="loading"
-      :data="${businessName}List"
-      row-key="${treeCode}"
-      default-expand-all
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-    >
-#foreach($column in $columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk)
-#elseif($column.list && $column.htmlType == "datetime")
-      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-#elseif($column.list && "" != $column.dictType)
-      <el-table-column label="${comment}" align="center" prop="${javaField}" :formatter="${javaField}Format" />
-#elseif($column.list && "" != $javaField)
-#if(${foreach.index} == 1)
-      <el-table-column label="${comment}" prop="${javaField}" />
-#else
-      <el-table-column label="${comment}" align="center" prop="${javaField}" />
-#end
-#end
-#end
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['${moduleName}:${businessName}:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-plus"
-            @click="handleAdd(scope.row)"
-            v-hasPermi="['${moduleName}:${businessName}:add']"
-          >新增</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['${moduleName}:${businessName}:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 添加或修改${functionName}对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-#foreach($column in $columns)
-#set($field=$column.javaField)
-#if($column.insert && !$column.pk)
-#if(($column.usableColumn) || (!$column.superColumn))
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#set($dictType=$column.dictType)
-#if("" != $treeParentCode && $column.javaField == $treeParentCode)
-        <el-form-item label="${comment}" prop="${treeParentCode}">
-          <treeselect v-model="form.${treeParentCode}" :options="${businessName}Options" :normalizer="normalizer" placeholder="请选择${comment}" />
-        </el-form-item>
-#elseif($column.htmlType == "input")
-        <el-form-item label="${comment}" prop="${field}">
-          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-        </el-form-item>
-#elseif($column.htmlType == "imageUpload")
-        <el-form-item label="${comment}">
-          <imageUpload v-model="form.${field}"/>
-        </el-form-item>
-#elseif($column.htmlType == "fileUpload")
-        <el-form-item label="${comment}">
-          <fileUpload v-model="form.${field}"/>
-        </el-form-item>
-#elseif($column.htmlType == "editor")
-        <el-form-item label="${comment}">
-          <editor v-model="form.${field}" :min-height="192"/>
-        </el-form-item>
-#elseif($column.htmlType == "select" && "" != $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-            <el-option
-              v-for="dict in ${field}Options"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.dictValue)"#else:value="dict.dictValue"#end
-
-            ></el-option>
-          </el-select>
-        </el-form-item>
-#elseif($column.htmlType == "select" && $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-            <el-option label="请选择字典生成" value="" />
-          </el-select>
-        </el-form-item>
-#elseif($column.htmlType == "checkbox" && "" != $dictType)
-        <el-form-item label="${comment}">
-          <el-checkbox-group v-model="form.${field}">
-            <el-checkbox
-              v-for="dict in ${field}Options"
-              :key="dict.dictValue"
-              :label="dict.dictValue">
-              {{dict.dictLabel}}
-            </el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
-#elseif($column.htmlType == "checkbox" && $dictType)
-        <el-form-item label="${comment}">
-          <el-checkbox-group v-model="form.${field}">
-            <el-checkbox>请选择字典生成</el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
-#elseif($column.htmlType == "radio" && "" != $dictType)
-        <el-form-item label="${comment}">
-          <el-radio-group v-model="form.${field}">
-            <el-radio
-              v-for="dict in ${field}Options"
-              :key="dict.dictValue"
-              #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.dictValue)"#else:label="dict.dictValue"#end
-
-            >{{dict.dictLabel}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-#elseif($column.htmlType == "radio" && $dictType)
-        <el-form-item label="${comment}">
-          <el-radio-group v-model="form.${field}">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-#elseif($column.htmlType == "datetime")
-        <el-form-item label="${comment}" prop="${field}">
-          <el-date-picker clearable size="small"
-            v-model="form.${field}"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="选择${comment}">
-          </el-date-picker>
-        </el-form-item>
-#elseif($column.htmlType == "textarea")
-        <el-form-item label="${comment}" prop="${field}">
-          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-#end
-#end
-#end
-#end
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName}, export${BusinessName} } from "@/api/${moduleName}/${businessName}";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-#foreach($column in $columns)
-#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "imageUpload")
-import ImageUpload from '@/components/ImageUpload';
-#break
-#end
-#end
-#foreach($column in $columns)
-#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "fileUpload")
-import FileUpload from '@/components/FileUpload';
-#break
-#end
-#end
-#foreach($column in $columns)
-#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor")
-import Editor from '@/components/Editor';
-#break
-#end
-#end
-
-export default {
-  name: "${BusinessName}",
-  components: {
-#foreach($column in $columns)
-#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "imageUpload")
-    ImageUpload,
-#break
-#end
-#end
-#foreach($column in $columns)
-#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "fileUpload")
-    FileUpload,
-#break
-#end
-#end
-#foreach($column in $columns)
-#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor")
-    Editor,
-#break
-#end
-#end
-    Treeselect
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 显示搜索条件
-      showSearch: true,
-      // ${functionName}表格数据
-      ${businessName}List: [],
-      // ${functionName}树选项
-      ${businessName}Options: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-#foreach ($column in $columns)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if(${column.dictType} != '')
-      // $comment字典
-      ${column.javaField}Options: [],
-#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-      // $comment时间范围
-      daterange${AttrName}: [],
-#end
-#end
-      // 查询参数
-      queryParams: {
-#foreach ($column in $columns)
-#if($column.query)
-        $column.javaField: null#if($velocityCount != $columns.size()),#end
-
-#end
-#end
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-#foreach ($column in $columns)
-#if($column.required)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-        $column.javaField: [
-          { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
-        ]#if($velocityCount != $columns.size()),#end
-
-#end
-#end
-      }
-    };
-  },
-  created() {
-    this.getList();
-#foreach ($column in $columns)
-#if(${column.dictType} != '')
-    this.getDicts("${column.dictType}").then(response => {
-      this.${column.javaField}Options = response.data;
-    });
-#end
-#end
-  },
-  methods: {
-    /** 查询${functionName}列表 */
-    getList() {
-      this.loading = true;
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-      this.queryParams.params = {};
-#break
-#end
-#end
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-      if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
-        this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0];
-        this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1];
-      }
-#end
-#end
-      list${BusinessName}(this.queryParams).then(response => {
-        this.${businessName}List = this.handleTree(response.data, "${treeCode}", "${treeParentCode}");
-        this.loading = false;
-      });
-    },
-    /** 转换${functionName}数据结构 */
-    normalizer(node) {
-      if (node.children && !node.children.length) {
-        delete node.children;
-      }
-      return {
-        id: node.${treeCode},
-        label: node.${treeName},
-        children: node.children
-      };
-    },
-	/** 查询${functionName}下拉树结构 */
-    getTreeselect() {
-      list${BusinessName}().then(response => {
-        this.${businessName}Options = [];
-        const data = { ${treeCode}: 0, ${treeName}: '顶级节点', children: [] };
-        data.children = this.handleTree(response.data, "${treeCode}", "${treeParentCode}");
-        this.${businessName}Options.push(data);
-      });
-    },
-#foreach ($column in $columns)
-#if(${column.dictType} != '')
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-    // $comment字典翻译
-    ${column.javaField}Format(row, column) {
-      return this.selectDictLabel#if($column.htmlType == "checkbox")s#end(this.${column.javaField}Options, row.${column.javaField});
-    },
-#end
-#end
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-#foreach ($column in $columns)
-#if($column.htmlType == "radio")
-        $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($velocityCount != $columns.size()),#end
-
-#elseif($column.htmlType == "checkbox")
-        $column.javaField: []#if($velocityCount != $columns.size()),#end
-
-#else
-        $column.javaField: null#if($velocityCount != $columns.size()),#end
-
-#end
-#end
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-      this.daterange${AttrName} = [];
-#end
-#end
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd(row) {
-      this.reset();
-      this.getTreeselect();
-      if (row != null && row.${treeCode}) {
-        this.form.${treeParentCode} = row.${treeCode};
-      } else {
-        this.form.${treeParentCode} = 0;
-      }
-      this.open = true;
-      this.title = "添加${functionName}";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      this.getTreeselect();
-      if (row != null) {
-        this.form.${treeParentCode} = row.${treeCode};
-      }
-      get${BusinessName}(row.${pkColumn.javaField}).then(response => {
-        this.form = response.data;
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
-        this.form.$column.javaField = this.form.${column.javaField}.split(",");
-#end
-#end
-        this.open = true;
-        this.title = "修改${functionName}";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.#[[$]]#refs["form"].validate(valid => {
-        if (valid) {
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
-          this.form.$column.javaField = this.form.${column.javaField}.join(",");
-#end
-#end
-          if (this.form.${pkColumn.javaField} != null) {
-            update${BusinessName}(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            add${BusinessName}(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      this.$confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return del${BusinessName}(row.${pkColumn.javaField});
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    }
-  }
-};
-</script>