one-YI
/
cloud-server
5
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

车辆电子围栏后台master

张毅大神 2024-09-21 11:51:58 +08:00
parent 3ede309abe
commit 3271c30c0f
48 changed files with 980 additions and 1827 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cloud-server/cloud-auth/src/main/resources/bootstrap.yml
View File

@ -4,10 +4,10 @@ server:
# nacos线上地址 # nacos线上地址
nacos: nacos:
addr: 47.116.173.119:8848 addr: 110.42.213.184:8848
user-name: nacos user-name: nacos
password: nacos password: nacos
namespace: one namespace: public
# Spring # Spring
spring: spring:
application: application:

37
cloud-server/cloud-common/cloud-common-xxl/pom.xml
View File

@ -1,37 +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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.muyu</groupId>
<artifactId>cloud-common</artifactId>
<version>3.6.3</version>
</parent>
<artifactId>cloud-common-xxl</artifactId>
<description>XllJob定时任务</description>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<!-- MuYu Common Core-->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-core</artifactId>
</dependency>
<!-- xxl-job-core -->
<dependency>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId>
</dependency>
</dependencies>
</project>

28
cloud-server/cloud-common/cloud-common-xxl/src/main/java/com/muyu/common/xxl/XXLJobConfig.java
View File

@ -1,28 +0,0 @@
package com.muyu.common.xxl;
import com.muyu.common.core.utils.StringUtils;
import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
import lombok.extern.log4j.Log4j2;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Component;
@Log4j2
@Component
public class XXLJobConfig {
@Bean
public XxlJobSpringExecutor xxlJobExecutor(XxlJobProperties xxlJobProperties) {
if (StringUtils.isEmpty(xxlJobProperties.getAdminAddresses())){
throw new RuntimeException("请在bootstrap.yml当中配置shared-configs项，xxl-job共享配置[application-xxl-config]");
}
XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
xxlJobSpringExecutor.setAdminAddresses(xxlJobProperties.getAdminAddresses());
xxlJobSpringExecutor.setAppname(xxlJobProperties.getAppName());
xxlJobSpringExecutor.setIp(xxlJobProperties.getIp());
xxlJobSpringExecutor.setPort(xxlJobProperties.getPort());
xxlJobSpringExecutor.setAccessToken(xxlJobProperties.getAccessToken());
xxlJobSpringExecutor.setLogPath(xxlJobProperties.getLogPath());
xxlJobSpringExecutor.setLogRetentionDays(xxlJobProperties.getLogRetentionDays());
log.info(">>>>>>>>>>> xxl-job config init success.");
return xxlJobSpringExecutor;
}
}

63
cloud-server/cloud-common/cloud-common-xxl/src/main/java/com/muyu/common/xxl/XxlJobProperties.java
View File

@ -1,63 +0,0 @@
package com.muyu.common.xxl;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
@Data
@Configuration
@ConfigurationProperties(prefix = "xxl-job")
public class XxlJobProperties {
/**
* 调度中心部署根地址 [选填]：
* 如调度中心集群部署存在多个地址则用逗号分隔。执行器将会使用该地址进行"执行器心跳注册"和"任务结果回调"；
* 为空则关闭自动注册；
*/
private String adminAddresses;
/**
* 执行器通讯TOKEN [选填]：
* 非空时启用；
*/
private String accessToken;
/**
* 执行器AppName [选填]：
* 执行器心跳注册分组依据；为空则关闭自动注册
*/
private String appName;
/**
* 执行器注册 [选填]：
* 优先使用该配置作为注册地址，为空时使用内嵌服务 ”IP:PORT“ 作为注册地址。
* 从而更灵活的支持容器类型执行器动态IP和动态映射端口问题。
*/
private String address;
/**
* 执行器IP [选填]：
* 默认为空表示自动获取IP，多网卡时可手动设置指定IP，该IP不会绑定Host仅作为通讯实用；
* 地址信息用于 "执行器注册" 和 "调度中心请求并触发任务"；
*/
private String ip;
/**
* 执行器端口号 [选填]：
* 小于等于0则自动获取；默认端口为9999，
* 单机部署多个执行器时，注意要配置不同执行器端口；
*/
private int port;
/**
* 执行器运行日志文件存储磁盘路径 [选填]：
* 需要对该路径拥有读写权限；为空则使用默认路径；
*/
private String logPath;
/**
* 执行器日志文件保存天数 [选填]：
* 过期日志自动清理, 限制值大于等于3时生效; 否则, 如-1, 关闭自动清理功能；
*/
private int logRetentionDays;
}

38
cloud-server/cloud-common/cloud-common-xxl/src/main/java/com/muyu/common/xxl/demo/XxlJobDemoService.java
View File

@ -1,38 +0,0 @@
package com.muyu.common.xxl.demo;
import com.xxl.job.core.context.XxlJobHelper;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Component;
@Log4j2
@Component
public class XxlJobDemoService {
/**
* 无参测试
*/
@XxlJob("xxl-job-demo-no-param")
public void xxlJobDemoNoParam(){
log.info("调度名称：[{}] - 无参", "xxl-job-demo-no-param");
}
/**
* 有参测试
*/
@XxlJob("xxl-job-demo-one-param")
public void xxlJobDemoOneParam(){
String param = XxlJobHelper.getJobParam();
log.info("调度名称：[{}] - 参数：[{}]", "xxl-job-demo-one-param", param);
}
/**
* 分片测试
*/
@XxlJob("xxl-job-slice-demo")
public void xxlJobSliceDemo(){
int shardTotal = XxlJobHelper.getShardTotal();
int shardIndex = XxlJobHelper.getShardIndex();
String param = XxlJobHelper.getJobParam();
log.info("调度名称：[{}-[{}/{}(分片位置/分片总数)]] - 参数：[{}]", "xxl-job-slice-demo",shardIndex, shardTotal, param);
}
}

3
cloud-server/cloud-common/cloud-common-xxl/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View File

@ -1,3 +0,0 @@
com.muyu.common.xxl.XXLJobConfig
com.muyu.common.xxl.XxlJobProperties
com.muyu.common.xxl.demo.XxlJobDemoService

2
cloud-server/cloud-common/pom.xml
View File

@ -18,7 +18,7 @@
<module>cloud-common-datascope</module> <module>cloud-common-datascope</module>
<module>cloud-common-datasource</module> <module>cloud-common-datasource</module>
<module>cloud-common-system</module> <module>cloud-common-system</module>
<module>cloud-common-xxl</module>
<module>cloud-common-rabbit</module> <module>cloud-common-rabbit</module>
</modules> </modules>

6
cloud-server/cloud-gateway/src/main/resources/bootstrap.yml
View File

@ -1,13 +1,13 @@
# Tomcat # Tomcat
server: server:
port: 8080 port: 8084
# nacos线上地址 # nacos线上地址
nacos: nacos:
addr: 47.116.173.119:8848 addr: 110.42.213.184:8848
user-name: nacos user-name: nacos
password: nacos password: nacos
namespace: one namespace: public
# Spring # Spring
spring: spring:

38
cloud-server/cloud-modules/cloud-modules-car/.gitignore vendored
View File

@ -1,38 +0,0 @@
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/
### IntelliJ IDEA ###
.idea/modules.xml
.idea/jarRepositories.xml
.idea/compiler.xml
.idea/libraries/
*.iws
*.iml
*.ipr
### Eclipse ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/
!**/src/main/**/build/
!**/src/test/**/build/
### VS Code ###
.vscode/
### Mac OS ###
.DS_Store

14
cloud-server/cloud-modules/cloud-modules-car/pom.xml
View File

@ -61,28 +61,17 @@
<artifactId>cloud-common-datascope</artifactId> <artifactId>cloud-common-datascope</artifactId>
</dependency> </dependency>
<!-- MuYu Common Log -->
<dependency> <dependency>
<groupId>com.muyu</groupId> <groupId>com.muyu</groupId>
<artifactId>cloud-common-log</artifactId> <artifactId>cloud-common-core</artifactId>
</dependency> </dependency>
<!-- 接口模块 --> <!-- 接口模块 -->
<dependency> <dependency>
<groupId>com.muyu</groupId> <groupId>com.muyu</groupId>
<artifactId>cloud-common-api-doc</artifactId> <artifactId>cloud-common-api-doc</artifactId>
</dependency> </dependency>
<!-- XllJob定时任务 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-xxl</artifactId>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-rabbit</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
@ -102,4 +91,5 @@
</plugins> </plugins>
</build> </build>
</project> </project>

21
cloud-server/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/CloudCarApplication.java
View File

@ -1,21 +0,0 @@
package com.muyu.car;
import com.muyu.common.security.annotation.EnableCustomConfig;
import com.muyu.common.security.annotation.EnableMyFeignClients;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
/**
* 系统模块
*
* @author muyu
*/
@EnableCustomConfig
//@EnableCustomSwagger2
@EnableMyFeignClients
@SpringBootApplication
public class CloudCarApplication {
public static void main (String[] args) {
SpringApplication.run(CloudCarApplication.class, args);
}
}

114
cloud-server/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/SysCarController.java
View File

@ -1,114 +0,0 @@
package com.muyu.car.controller;
import java.util.Arrays;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import javax.annotation.Resource;
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.muyu.common.security.annotation.RequiresPermissions;
import com.muyu.car.domain.SysCar;
import com.muyu.car.service.ISysCarService;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.poi.ExcelUtil;
import com.muyu.common.security.utils.SecurityUtils;
import org.springframework.validation.annotation.Validated;
import com.muyu.common.core.web.page.TableDataInfo;
/**
* 车辆基础信息Controller
*
* @author muyu
* @date 2024-09-17
*/
@RestController
@RequestMapping("/car")
public class SysCarController extends BaseController
{
@Autowired
private ISysCarService sysCarService;
/**
* 查询车辆基础信息列表
*/
@RequiresPermissions("car:car:list")
@GetMapping("/list")
public Result<TableDataInfo<SysCar>> list(SysCar sysCar)
{
startPage();
List<SysCar> list = sysCarService.selectSysCarList(sysCar);
return getDataTable(list);
}
/**
* 导出车辆基础信息列表
*/
@RequiresPermissions("car:car:export")
@PostMapping("/export")
public void export(HttpServletResponse response, SysCar sysCar)
{
List<SysCar> list = sysCarService.selectSysCarList(sysCar);
ExcelUtil<SysCar> util = new ExcelUtil<SysCar>(SysCar.class);
util.exportExcel(response, list, "车辆基础信息数据");
}
/**
* 获取车辆基础信息详细信息
*/
@RequiresPermissions("car:car:query")
@GetMapping(value = "/{id}")
public Result<List<SysCar>> getInfo(@PathVariable("id") Long id)
{
return success(sysCarService.selectSysCarById(id));
}
/**
* 新增车辆基础信息
*/
@RequiresPermissions("car:car:add")
@PostMapping
public Result<Integer> add(
@Validated @RequestBody SysCar sysCar)
{
if (sysCarService.checkIdUnique(sysCar)) {
return error("新增 车辆基础信息 '" + sysCar + "'失败，车辆基础信息已存在");
}
sysCar.setCreateBy(SecurityUtils.getUsername());
return toAjax(sysCarService.save(sysCar));
}
/**
* 修改车辆基础信息
*/
@RequiresPermissions("car:car:edit")
@PutMapping
public Result<Integer> edit(
@Validated @RequestBody SysCar sysCar)
{
if (!sysCarService.checkIdUnique(sysCar)) {
return error("修改 车辆基础信息 '" + sysCar + "'失败，车辆基础信息不存在");
}
sysCar.setUpdateBy(SecurityUtils.getUsername());
return toAjax(sysCarService.updateById(sysCar));
}
/**
* 删除车辆基础信息
*/
@RequiresPermissions("car:car:remove")
@DeleteMapping("/{ids}")
public Result<Integer> remove(@PathVariable("ids") Long[] ids)
{
sysCarService.removeBatchByIds(Arrays.asList(ids));
return success();
}
}

91
cloud-server/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/SysCar.java
View File

@ -1,91 +0,0 @@
package com.muyu.car.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.common.core.annotation.Excel;
import com.muyu.common.core.web.domain.BaseEntity;
import lombok.*;
import lombok.experimental.SuperBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
/**
* 车辆基础信息对象 sys_car
*
* @author muyu
* @date 2024-09-17
*/
@Data
@Setter
@Getter
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@TableName("sys_car")
public class SysCar extends BaseEntity{
private static final long serialVersionUID = 1L;
/** 自增主键 */
@TableId( type = IdType.AUTO)
private Long id;
/** 车辆VIN码 */
@Excel(name = "车辆VIN码")
private String carVin;
/** 车辆车牌号 */
@Excel(name = "车辆车牌号")
private String carPlate;
/** 车辆品牌 */
@Excel(name = "车辆品牌")
private String carBrand;
/** 车辆型号 */
@Excel(name = "车辆型号")
private String carModel;
/** 车辆车型(如客车,卡车,公交车等) */
@Excel(name = "车辆车型(如客车,卡车,公交车等)")
private String carType;
/** 最后一次连线时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最后一次连线时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date carLastJoinTime;
/** 最后一次离线时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最后一次离线时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date carLastOfflineTime;
/** 启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中 */
@Excel(name = "启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中")
private String state;
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("carVin", getCarVin())
.append("carPlate", getCarPlate())
.append("carBrand", getCarBrand())
.append("carModel", getCarModel())
.append("carType", getCarType())
.append("carLastJoinTime", getCarLastJoinTime())
.append("carLastOfflineTime", getCarLastOfflineTime())
.append("state", getState())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
}
}

16
cloud-server/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/SysCarMapper.java
View File

@ -1,16 +0,0 @@
package com.muyu.car.mapper;
import java.util.List;
import com.muyu.car.domain.SysCar;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
* 车辆基础信息Mapper接口
*
* @author muyu
* @date 2024-09-17
*/
public interface SysCarMapper extends BaseMapper<SysCar>{
}

37
cloud-server/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/ISysCarService.java
View File

@ -1,37 +0,0 @@
package com.muyu.car.service;
import java.util.List;
import com.muyu.car.domain.SysCar;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* 车辆基础信息Service接口
*
* @author muyu
* @date 2024-09-17
*/
public interface ISysCarService extends IService<SysCar> {
/**
* 精确查询车辆基础信息
*
* @param id 车辆基础信息主键
* @return 车辆基础信息
*/
public SysCar selectSysCarById(Long id);
/**
* 查询车辆基础信息列表
*
* @param sysCar 车辆基础信息
* @return 车辆基础信息集合
*/
public List<SysCar> selectSysCarList(SysCar sysCar);
/**
* 判断 车辆基础信息 id是否唯一
* @param sysCar 车辆基础信息
* @return 结果
*/
Boolean checkIdUnique(SysCar sysCar);
}

90
cloud-server/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/impl/SysCarServiceImpl.java
View File

@ -1,90 +0,0 @@
package com.muyu.car.service.impl;
import java.util.List;
import com.muyu.common.core.utils.DateUtils;
import org.springframework.stereotype.Service;
import com.muyu.car.mapper.SysCarMapper;
import com.muyu.car.domain.SysCar;
import com.muyu.car.service.ISysCarService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.common.core.utils.StringUtils;
import org.springframework.util.Assert;
/**
* 车辆基础信息Service业务层处理
*
* @author muyu
* @date 2024-09-17
*/
@Service
public class SysCarServiceImpl
extends ServiceImpl<SysCarMapper, SysCar>
implements ISysCarService {
/**
* 精确查询车辆基础信息
*
* @param id 车辆基础信息主键
* @return 车辆基础信息
*/
@Override
public SysCar selectSysCarById(Long id)
{
LambdaQueryWrapper<SysCar> queryWrapper = new LambdaQueryWrapper<>();
Assert.notNull(id, "id不可为空");
queryWrapper.eq(SysCar::getId, id);
return this.getOne(queryWrapper);
}
/**
* 查询车辆基础信息列表
*
* @param sysCar 车辆基础信息
* @return 车辆基础信息
*/
@Override
public List<SysCar> selectSysCarList(SysCar sysCar)
{
LambdaQueryWrapper<SysCar> queryWrapper = new LambdaQueryWrapper<>();
if (StringUtils.isNotEmpty(sysCar.getCarVin())){
queryWrapper.eq(SysCar::getCarVin, sysCar.getCarVin());
}
if (StringUtils.isNotEmpty(sysCar.getCarPlate())){
queryWrapper.eq(SysCar::getCarPlate, sysCar.getCarPlate());
}
if (StringUtils.isNotEmpty(sysCar.getCarBrand())){
queryWrapper.eq(SysCar::getCarBrand, sysCar.getCarBrand());
}
if (StringUtils.isNotEmpty(sysCar.getCarModel())){
queryWrapper.eq(SysCar::getCarModel, sysCar.getCarModel());
}
if (StringUtils.isNotEmpty(sysCar.getCarType())){
queryWrapper.eq(SysCar::getCarType, sysCar.getCarType());
}
if (sysCar.getCarLastJoinTime()!= null){
queryWrapper.eq(SysCar::getCarLastJoinTime, sysCar.getCarLastJoinTime());
}
if (sysCar.getCarLastOfflineTime()!= null){
queryWrapper.eq(SysCar::getCarLastOfflineTime, sysCar.getCarLastOfflineTime());
}
if (StringUtils.isNotEmpty(sysCar.getState())){
queryWrapper.eq(SysCar::getState, sysCar.getState());
}
return this.list(queryWrapper);
}
/**
* 唯一 判断
* @param sysCar 车辆基础信息
* @return 车辆基础信息
*/
@Override
public Boolean checkIdUnique(SysCar sysCar) {
LambdaQueryWrapper<SysCar> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysCar::getId, sysCar.getId());
return this.count(queryWrapper) > 0;
}
}

2
cloud-server/cloud-modules/cloud-modules-car/src/main/resources/banner.txt
View File

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

13
cloud-server/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml
View File

@ -1,13 +1,13 @@
# Tomcat # Tomcat
server: server:
port: 10010 port: 10011
# nacos线上地址 # nacos线上地址
nacos: nacos:
addr: 47.116.173.119:8848 addr: 110.42.213.184:8848
user-name: nacos user-name: nacos
password: nacos password: nacos
namespace: one namespace: public
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring # Spring
spring: spring:
@ -51,11 +51,8 @@ spring:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
# 系统环境Config共享配置 # 系统环境Config共享配置
- application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
# xxl-job 配置文件
- application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
# rabbit 配置文件
- application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
logging: logging:
level: level:
com.muyu.system.mapper: DEBUG com.muyu.carrail.mapper: DEBUG

74
cloud-server/cloud-modules/cloud-modules-car/src/main/resources/logback/dev.xml
View File

@ -1,74 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<!-- 日志存放路径 -->
<property name="log.path" value="logs/cloud-system"/>
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
<!-- 控制台输出 -->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
</appender>
<!-- 系统日志输出 -->
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/info.log</file>
<!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/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}/error.log</file>
<!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/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>
<!-- 系统模块日志级别控制 -->
<logger name="com.muyu" 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"/>
</root>
</configuration>

81
cloud-server/cloud-modules/cloud-modules-car/src/main/resources/logback/prod.xml
View File

@ -1,81 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<!-- 日志存放路径 -->
<property name="log.path" value="logs/cloud-system"/>
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
<property name="log.sky.pattern" value="%d{HH:mm:ss.SSS} %yellow([%tid]) [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
<!-- 控制台输出 -->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>${log.sky.pattern}</pattern>
</encoder>
</appender>
<!-- 系统日志输出 -->
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/info.log</file>
<!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
</rollingPolicy>
<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}/error.log</file>
<!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
</rollingPolicy>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->
<level>ERROR</level>
<!-- 匹配时的操作：接收（记录） -->
<onMatch>ACCEPT</onMatch>
<!-- 不匹配时的操作：拒绝（不记录） -->
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 使用gRpc将日志发送到skywalking服务端 -->
<appender name="GRPC_LOG" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
<layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
<Pattern>${log.sky.pattern}</Pattern>
</layout>
</encoder>
</appender>
<!-- 系统模块日志级别控制 -->
<logger name="com.muyu" level="info"/>
<!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn"/>
<root level="info">
<appender-ref ref="GRPC_LOG"/>
<appender-ref ref="console"/>
</root>
<!--系统操作日志-->
<root level="info">
<appender-ref ref="file_info"/>
<appender-ref ref="file_error"/>
</root>
</configuration>

81
cloud-server/cloud-modules/cloud-modules-car/src/main/resources/logback/test.xml
View File

@ -1,81 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<!-- 日志存放路径 -->
<property name="log.path" value="logs/cloud-system"/>
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
<property name="log.sky.pattern" value="%d{HH:mm:ss.SSS} %yellow([%tid]) [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
<!-- 控制台输出 -->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>${log.sky.pattern}</pattern>
</encoder>
</appender>
<!-- 系统日志输出 -->
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/info.log</file>
<!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
</rollingPolicy>
<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}/error.log</file>
<!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
</rollingPolicy>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->
<level>ERROR</level>
<!-- 匹配时的操作：接收（记录） -->
<onMatch>ACCEPT</onMatch>
<!-- 不匹配时的操作：拒绝（不记录） -->
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 使用gRpc将日志发送到skywalking服务端 -->
<appender name="GRPC_LOG" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
<layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
<Pattern>${log.sky.pattern}</Pattern>
</layout>
</encoder>
</appender>
<!-- 系统模块日志级别控制 -->
<logger name="com.muyu" level="info"/>
<!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn"/>
<root level="info">
<appender-ref ref="GRPC_LOG"/>
<appender-ref ref="console"/>
</root>
<!--系统操作日志-->
<root level="info">
<appender-ref ref="file_info"/>
<appender-ref ref="file_error"/>
</root>
</configuration>

111
cloud-server/cloud-modules/cloud-modules-car/src/main/resources/mapper/car/SysCarMapper.xml
View File

@ -1,111 +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.muyu.car.mapper.SysCarMapper">
<resultMap type="SysCar" id="SysCarResult">
<result property="id" column="id" />
<result property="carVin" column="car_vin" />
<result property="carPlate" column="car_plate" />
<result property="carBrand" column="car_brand" />
<result property="carModel" column="car_model" />
<result property="carType" column="car_type" />
<result property="carLastJoinTime" column="car_last_join_time" />
<result property="carLastOfflineTime" column="car_last_offline_time" />
<result property="state" column="state" />
<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" />
</resultMap>
<sql id="selectSysCarVo">
select id, car_vin, car_plate, car_brand, car_model, car_type, car_last_join_time, car_last_offline_time, state, create_by, create_time, update_by, update_time, remark from sys_car
</sql>
<select id="selectSysCarList" parameterType="SysCar" resultMap="SysCarResult">
<include refid="selectSysCarVo"/>
<where>
<if test="carVin != null and carVin != ''"> and car_vin = #{carVin}</if>
<if test="carPlate != null and carPlate != ''"> and car_plate = #{carPlate}</if>
<if test="carBrand != null and carBrand != ''"> and car_brand = #{carBrand}</if>
<if test="carModel != null and carModel != ''"> and car_model = #{carModel}</if>
<if test="carType != null and carType != ''"> and car_type = #{carType}</if>
<if test="carLastJoinTime != null "> and car_last_join_time = #{carLastJoinTime}</if>
<if test="carLastOfflineTime != null "> and car_last_offline_time = #{carLastOfflineTime}</if>
<if test="state != null and state != ''"> and state = #{state}</if>
</where>
</select>
<select id="selectSysCarById" parameterType="Long" resultMap="SysCarResult">
<include refid="selectSysCarVo"/>
where id = #{id}
</select>
<insert id="insertSysCar" parameterType="SysCar" useGeneratedKeys="true" keyProperty="id">
insert into sys_car
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="carVin != null and carVin != ''">car_vin,</if>
<if test="carPlate != null and carPlate != ''">car_plate,</if>
<if test="carBrand != null">car_brand,</if>
<if test="carModel != null">car_model,</if>
<if test="carType != null">car_type,</if>
<if test="carLastJoinTime != null">car_last_join_time,</if>
<if test="carLastOfflineTime != null">car_last_offline_time,</if>
<if test="state != null">state,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="carVin != null and carVin != ''">#{carVin},</if>
<if test="carPlate != null and carPlate != ''">#{carPlate},</if>
<if test="carBrand != null">#{carBrand},</if>
<if test="carModel != null">#{carModel},</if>
<if test="carType != null">#{carType},</if>
<if test="carLastJoinTime != null">#{carLastJoinTime},</if>
<if test="carLastOfflineTime != null">#{carLastOfflineTime},</if>
<if test="state != null">#{state},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
</trim>
</insert>
<update id="updateSysCar" parameterType="SysCar">
update sys_car
<trim prefix="SET" suffixOverrides=",">
<if test="carVin != null and carVin != ''">car_vin = #{carVin},</if>
<if test="carPlate != null and carPlate != ''">car_plate = #{carPlate},</if>
<if test="carBrand != null">car_brand = #{carBrand},</if>
<if test="carModel != null">car_model = #{carModel},</if>
<if test="carType != null">car_type = #{carType},</if>
<if test="carLastJoinTime != null">car_last_join_time = #{carLastJoinTime},</if>
<if test="carLastOfflineTime != null">car_last_offline_time = #{carLastOfflineTime},</if>
<if test="state != null">state = #{state},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteSysCarById" parameterType="Long">
delete from sys_car where id = #{id}
</delete>
<delete id="deleteSysCarByIds" parameterType="String">
delete from sys_car where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

4
cloud-server/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml
View File

@ -4,10 +4,10 @@ server:
# nacos线上地址 # nacos线上地址
nacos: nacos:
addr: 47.116.173.119:8848 addr: 110.42.213.184:8848
user-name: nacos user-name: nacos
password: nacos password: nacos
namespace: one namespace: public
# Spring # Spring
spring: spring:

1
cloud-server/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/CloudGenApplication.java
View File

@ -16,6 +16,5 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
public class CloudGenApplication { public class CloudGenApplication {
public static void main (String[] args) { public static void main (String[] args) {
SpringApplication.run(CloudGenApplication.class, args); SpringApplication.run(CloudGenApplication.class, args);
System.out.println("CloudGen 模块启动成功!");
} }
} }

107
cloud-server/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java
View File

@ -1,24 +1,22 @@
package com.muyu.gen.controller; package com.muyu.gen.controller;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.text.Convert; import com.muyu.common.core.text.Convert;
import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.log.annotation.Log; import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType; import com.muyu.common.log.enums.BusinessType;
import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.annotation.RequiresPermissions;
import com.muyu.gen.domain.GenTable; import com.muyu.gen.domain.GenTable;
import com.muyu.gen.domain.GenTableColumn; import com.muyu.gen.domain.GenTableColumn;
import com.muyu.gen.domain.GenTableResp;
import com.muyu.gen.service.IGenTableColumnService; import com.muyu.gen.service.IGenTableColumnService;
import com.muyu.gen.service.IGenTableService; import com.muyu.gen.service.IGenTableService;
import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -27,19 +25,15 @@ import java.util.Map;
/** /**
* 代码生成 操作处理 * 代码生成 操作处理
* *
* @author ruoyi * @author muyu
*/ */
@RequestMapping("/gen") @RequestMapping("/gen")
@RestController @RestController
public class GenController extends BaseController public class GenController extends BaseController {
{ @Autowired
@Resource
private IGenTableService genTableService; private IGenTableService genTableService;
@Resource @Autowired
private HttpServletResponse response;
@Resource
private IGenTableColumnService genTableColumnService; private IGenTableColumnService genTableColumnService;
/** /**
@ -47,8 +41,7 @@ public class GenController extends BaseController
*/ */
@RequiresPermissions("tool:gen:list") @RequiresPermissions("tool:gen:list")
@GetMapping("/list") @GetMapping("/list")
public Result genList(GenTable genTable) public Result<TableDataInfo<GenTable>> genList (GenTable genTable) {
{
startPage(); startPage();
List<GenTable> list = genTableService.selectGenTableList(genTable); List<GenTable> list = genTableService.selectGenTableList(genTable);
return getDataTable(list); return getDataTable(list);
@ -59,8 +52,7 @@ public class GenController extends BaseController
*/ */
@RequiresPermissions("tool:gen:query") @RequiresPermissions("tool:gen:query")
@GetMapping(value = "/{tableId}") @GetMapping(value = "/{tableId}")
public Result getInfo(@PathVariable("tableId") Long tableId) public Result getInfo (@PathVariable("tableId") Long tableId) {
{
GenTable table = genTableService.selectGenTableById(tableId); GenTable table = genTableService.selectGenTableById(tableId);
List<GenTable> tables = genTableService.selectGenTableAll(); List<GenTable> tables = genTableService.selectGenTableAll();
List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(tableId); List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(tableId);
@ -71,14 +63,12 @@ public class GenController extends BaseController
return success(map); return success(map);
} }
/** /**
* 查询数据库列表 * 查询数据库列表
*/ */
@RequiresPermissions("tool:gen:list") @RequiresPermissions("tool:gen:list")
@GetMapping("/db/list") @GetMapping("/db/list")
public Result dataList(GenTable genTable) public Result<TableDataInfo<GenTable>> dataList (GenTable genTable) {
{
startPage(); startPage();
List<GenTable> list = genTableService.selectDbTableList(genTable); List<GenTable> list = genTableService.selectDbTableList(genTable);
return getDataTable(list); return getDataTable(list);
@ -88,26 +78,26 @@ public class GenController extends BaseController
* 查询数据表字段列表 * 查询数据表字段列表
*/ */
@GetMapping(value = "/column/{tableId}") @GetMapping(value = "/column/{tableId}")
public Result columnList(@PathVariable("tableId") Long tableId) public Result<TableDataInfo<GenTableColumn>> columnList (Long tableId) {
{
TableDataInfo dataInfo = new TableDataInfo();
List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(tableId); List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(tableId);
dataInfo.setRows(list); return Result.success(
dataInfo.setTotal(list.size()); TableDataInfo.<GenTableColumn>builder()
return success(dataInfo); .total(list.size())
.rows(list)
.build()
);
} }
/** /**
* 导入表结构（保存） * 导入表结构（保存）
*/ */
// @RequiresPermissions("tool:gen:import") @RequiresPermissions("tool:gen:import")
@Log(title = "代码生成", businessType = BusinessType.IMPORT) @Log(title = "代码生成", businessType = BusinessType.IMPORT)
@PostMapping("/importTable") @PostMapping("/importTable")
public Result importTableSave(@RequestParam("tables") String tables, @RequestParam("dbName") String dbName) public Result importTableSave (String tables) {
{
String[] tableNames = Convert.toStrArray(tables); String[] tableNames = Convert.toStrArray(tables);
// 查询表信息 // 查询表信息
List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames,dbName); List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames);
genTableService.importGenTable(tableList); genTableService.importGenTable(tableList);
return success(); return success();
} }
@ -118,8 +108,7 @@ public class GenController extends BaseController
@RequiresPermissions("tool:gen:edit") @RequiresPermissions("tool:gen:edit")
@Log(title = "代码生成", businessType = BusinessType.UPDATE) @Log(title = "代码生成", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public Result editSave(@Validated @RequestBody GenTable genTable) public Result editSave (@Validated @RequestBody GenTable genTable) {
{
genTableService.validateEdit(genTable); genTableService.validateEdit(genTable);
genTableService.updateGenTable(genTable); genTableService.updateGenTable(genTable);
return success(); return success();
@ -131,8 +120,7 @@ public class GenController extends BaseController
@RequiresPermissions("tool:gen:remove") @RequiresPermissions("tool:gen:remove")
@Log(title = "代码生成", businessType = BusinessType.DELETE) @Log(title = "代码生成", businessType = BusinessType.DELETE)
@DeleteMapping("/{tableIds}") @DeleteMapping("/{tableIds}")
public Result remove(@PathVariable("tableIds") Long[] tableIds) public Result remove (@PathVariable("tableIds") Long[] tableIds) {
{
genTableService.deleteGenTableByIds(tableIds); genTableService.deleteGenTableByIds(tableIds);
return success(); return success();
} }
@ -142,8 +130,7 @@ public class GenController extends BaseController
*/ */
@RequiresPermissions("tool:gen:preview") @RequiresPermissions("tool:gen:preview")
@GetMapping("/preview/{tableId}") @GetMapping("/preview/{tableId}")
public Result preview(@PathVariable("tableId") Long tableId) throws IOException public Result preview (@PathVariable("tableId") Long tableId) throws IOException {
{
Map<String, String> dataMap = genTableService.previewCode(tableId); Map<String, String> dataMap = genTableService.previewCode(tableId);
return success(dataMap); return success(dataMap);
} }
@ -154,8 +141,7 @@ public class GenController extends BaseController
@RequiresPermissions("tool:gen:code") @RequiresPermissions("tool:gen:code")
@Log(title = "代码生成", businessType = BusinessType.GENCODE) @Log(title = "代码生成", businessType = BusinessType.GENCODE)
@GetMapping("/download/{tableName}") @GetMapping("/download/{tableName}")
public void download(@PathVariable("tableName") String tableName) throws IOException public void download (HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException {
{
byte[] data = genTableService.downloadCode(tableName); byte[] data = genTableService.downloadCode(tableName);
genCode(response, data); genCode(response, data);
} }
@ -166,8 +152,7 @@ public class GenController extends BaseController
@RequiresPermissions("tool:gen:code") @RequiresPermissions("tool:gen:code")
@Log(title = "代码生成", businessType = BusinessType.GENCODE) @Log(title = "代码生成", businessType = BusinessType.GENCODE)
@GetMapping("/genCode/{tableName}") @GetMapping("/genCode/{tableName}")
public Result genCode(@PathVariable("tableName") String tableName) public Result genCode (@PathVariable("tableName") String tableName) {
{
genTableService.generatorCode(tableName); genTableService.generatorCode(tableName);
return success(); return success();
} }
@ -177,10 +162,9 @@ public class GenController extends BaseController
*/ */
@RequiresPermissions("tool:gen:edit") @RequiresPermissions("tool:gen:edit")
@Log(title = "代码生成", businessType = BusinessType.UPDATE) @Log(title = "代码生成", businessType = BusinessType.UPDATE)
@GetMapping("/synchDb/{tableName}/{dbName}") @GetMapping("/synchDb/{tableName}")
public Result synchDb(@PathVariable("tableName") String tableName,@PathVariable("dbName") String dbName) public Result synchDb (@PathVariable("tableName") String tableName) {
{ genTableService.synchDb(tableName);
genTableService.synchDb(tableName,dbName);
return success(); return success();
} }
@ -190,8 +174,7 @@ public class GenController extends BaseController
@RequiresPermissions("tool:gen:code") @RequiresPermissions("tool:gen:code")
@Log(title = "代码生成", businessType = BusinessType.GENCODE) @Log(title = "代码生成", businessType = BusinessType.GENCODE)
@GetMapping("/batchGenCode") @GetMapping("/batchGenCode")
public void batchGenCode(@RequestParam("tables") String tables) throws IOException public void batchGenCode (HttpServletResponse response, String tables) throws IOException {
{
String[] tableNames = Convert.toStrArray(tables); String[] tableNames = Convert.toStrArray(tables);
byte[] data = genTableService.downloadCode(tableNames); byte[] data = genTableService.downloadCode(tableNames);
genCode(response, data); genCode(response, data);
@ -200,37 +183,11 @@ public class GenController extends BaseController
/** /**
* 生成zip文件 * 生成zip文件
*/ */
private void genCode(HttpServletResponse response, byte[] data) throws IOException private void genCode (HttpServletResponse response, byte[] data) throws IOException {
{
response.reset(); response.reset();
response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); response.setHeader("Content-Disposition", "attachment; filename=\"muyu.zip\"");
response.addHeader("Content-Length", "" + data.length); response.addHeader("Content-Length", String.valueOf(data.length));
response.setContentType("application/octet-stream; charset=UTF-8"); response.setContentType("application/octet-stream; charset=UTF-8");
IOUtils.write(data, response.getOutputStream()); IOUtils.write(data, response.getOutputStream());
} }
/**
* 查询所有数据库名称
*/
@GetMapping("/selDbNameAll")
public Result<List<String>> selDbNameAll(){
return Result.success(genTableService.selDbNameAll());
}
/**
* 查询所有表,不分数据库
*/
@GetMapping("/db/listAll")
public Result<List<GenTableResp>> genListAll() {
return success(genTableService.selectDbTableListAll());
}
/**
* 根据数据库名称与表名称查询表字段
*/
@GetMapping("/selectDbTableColumnsByName")
public Result<List<GenTableColumn>> selTableAll(@RequestParam("dbName") String dbName,@RequestParam("table") String table){
List<GenTableColumn> genTableColumns = genTableColumnService.selectDbTableColumnsByName(table, dbName);
return Result.success(genTableColumns);
}
} }

2
cloud-server/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTable.java
View File

@ -35,8 +35,6 @@ public class GenTable extends BaseEntity {
*/ */
private Long tableId; private Long tableId;
private String dbName;
/** /**
* 表名称 * 表名称
*/ */

43
cloud-server/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTableResp.java
View File

@ -1,43 +0,0 @@
package com.muyu.gen.domain;
import com.muyu.common.core.constant.GenConstants;
import com.muyu.common.core.utils.StringUtils;
import com.muyu.common.core.web.domain.BaseEntity;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotBlank;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import org.apache.commons.lang3.ArrayUtils;
import java.util.List;
/**
* 业务表 gen_table
*
* @author muyu
*/
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
public class GenTableResp extends BaseEntity {
private String dbName;
/**
* 表名称
*/
private String tableName;
/**
* 表描述
*/
private String tableComment;
}

27
cloud-server/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/mapper/GenTableColumnMapper.java
View File

@ -1,64 +1,67 @@
package com.muyu.gen.mapper; package com.muyu.gen.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.muyu.gen.domain.GenTableColumn; import com.muyu.gen.domain.GenTableColumn;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
/** /**
* 业务字段 数据层 * 业务字段 数据层
* *
* @author ruoyi * @author muyu
*/ */
public interface GenTableColumnMapper public interface GenTableColumnMapper extends BaseMapper<GenTableColumn> {
{
/** /**
* 根据表名称查询列信息 * 根据表名称查询列信息
* *
* @param tableName 表名称 * @param tableName 表名称
* @param dbName *
* @return 列信息 * @return 列信息
*/ */
public List<GenTableColumn> selectDbTableColumnsByName(@Param("tableName") String tableName, @Param("dbName") String dbName); List<GenTableColumn> selectDbTableColumnsByName (String tableName);
/** /**
* 查询业务字段列表 * 查询业务字段列表
* *
* @param tableId 业务字段编号 * @param tableId 业务字段编号
*
* @return 业务字段集合 * @return 业务字段集合
*/ */
public List<GenTableColumn> selectGenTableColumnListByTableId(@Param("tableId") Long tableId); List<GenTableColumn> selectGenTableColumnListByTableId (Long tableId);
/** /**
* 新增业务字段 * 新增业务字段
* *
* @param genTableColumn 业务字段信息 * @param genTableColumn 业务字段信息
*
* @return 结果 * @return 结果
*/ */
public int insertGenTableColumn(GenTableColumn genTableColumn); int insertGenTableColumn (GenTableColumn genTableColumn);
/** /**
* 修改业务字段 * 修改业务字段
* *
* @param genTableColumn 业务字段信息 * @param genTableColumn 业务字段信息
*
* @return 结果 * @return 结果
*/ */
public int updateGenTableColumn(GenTableColumn genTableColumn); int updateGenTableColumn (GenTableColumn genTableColumn);
/** /**
* 删除业务字段 * 删除业务字段
* *
* @param genTableColumns 列数据 * @param genTableColumns 列数据
*
* @return 结果 * @return 结果
*/ */
public int deleteGenTableColumns(@Param("genTableColumns") List<GenTableColumn> genTableColumns); int deleteGenTableColumns (List<GenTableColumn> genTableColumns);
/** /**
* 批量删除业务字段 * 批量删除业务字段
* *
* @param ids 需要删除的数据ID * @param ids 需要删除的数据ID
*
* @return 结果 * @return 结果
*/ */
public int deleteGenTableColumnByIds(@Param("ids") Long[] ids); int deleteGenTableColumnByIds (Long[] ids);
} }

39
cloud-server/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java
View File

@ -1,91 +1,92 @@
package com.muyu.gen.mapper; package com.muyu.gen.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.muyu.gen.domain.GenTable; import com.muyu.gen.domain.GenTable;
import com.muyu.gen.domain.GenTableResp;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
/** /**
* 业务 数据层 * 业务 数据层
* *
* @author ruoyi * @author muyu
*/ */
public interface GenTableMapper public interface GenTableMapper extends BaseMapper<GenTable> {
{
/** /**
* 查询业务列表 * 查询业务列表
* *
* @param genTable 业务信息 * @param genTable 业务信息
*
* @return 业务集合 * @return 业务集合
*/ */
public List<GenTable> selectGenTableList(GenTable genTable); List<GenTable> selectGenTableList (GenTable genTable);
/** /**
* 查询据库列表 * 查询据库列表
* *
* @param genTable 业务信息 * @param genTable 业务信息
*
* @return 数据库表集合 * @return 数据库表集合
*/ */
public List<GenTable> selectDbTableList(GenTable genTable); List<GenTable> selectDbTableList (GenTable genTable);
/** /**
* 查询据库列表 * 查询据库列表
* *
* @param tableNames 表名称组 * @param tableNames 表名称组
* @param dbName *
* @return 数据库表集合 * @return 数据库表集合
*/ */
public List<GenTable> selectDbTableListByNames(@Param("tableNames") String[] tableNames, @Param("dbName") String dbName); List<GenTable> selectDbTableListByNames (String[] tableNames);
/** /**
* 查询所有表信息 * 查询所有表信息
* *
* @return 表信息集合 * @return 表信息集合
*/ */
public List<GenTable> selectGenTableAll(); List<GenTable> selectGenTableAll ();
/** /**
* 查询表ID业务信息 * 查询表ID业务信息
* *
* @param id 业务ID * @param id 业务ID
*
* @return 业务信息 * @return 业务信息
*/ */
public GenTable selectGenTableById(@Param("id") Long id); GenTable selectGenTableById (Long id);
/** /**
* 查询表名称业务信息 * 查询表名称业务信息
* *
* @param tableName 表名称 * @param tableName 表名称
*
* @return 业务信息 * @return 业务信息
*/ */
public GenTable selectGenTableByName(@Param("tableName") String tableName); GenTable selectGenTableByName (String tableName);
/** /**
* 新增业务 * 新增业务
* *
* @param genTable 业务信息 * @param genTable 业务信息
*
* @return 结果 * @return 结果
*/ */
public int insertGenTable(GenTable genTable); int insertGenTable (GenTable genTable);
/** /**
* 修改业务 * 修改业务
* *
* @param genTable 业务信息 * @param genTable 业务信息
*
* @return 结果 * @return 结果
*/ */
public int updateGenTable(GenTable genTable); int updateGenTable (GenTable genTable);
/** /**
* 批量删除业务 * 批量删除业务
* *
* @param ids 需要删除的数据ID * @param ids 需要删除的数据ID
*
* @return 结果 * @return 结果
*/ */
public int deleteGenTableByIds(@Param("ids") Long[] ids); int deleteGenTableByIds (Long[] ids);
List<String> selDbNameAll();
List<GenTableResp> selectDbTableListAll();
} }

58
cloud-server/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java
View File

@ -3,7 +3,7 @@ package com.muyu.gen.service;
import com.muyu.common.core.text.Convert; import com.muyu.common.core.text.Convert;
import com.muyu.gen.domain.GenTableColumn; import com.muyu.gen.domain.GenTableColumn;
import com.muyu.gen.mapper.GenTableColumnMapper; import com.muyu.gen.mapper.GenTableColumnMapper;
import javax.annotation.Resource; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
@ -11,64 +11,58 @@ import java.util.List;
/** /**
* 业务字段 服务层实现 * 业务字段 服务层实现
* *
* @author ruoyi * @author muyu
*/ */
@Service @Service
public class GenTableColumnServiceImpl implements IGenTableColumnService public class GenTableColumnServiceImpl implements IGenTableColumnService {
{ @Autowired
@Resource private GenTableColumnMapper genTableColumnMapper;
private GenTableColumnMapper genTableColumnMapper;
/** /**
* 查询业务字段列表 * 查询业务字段列表
* *
* @param tableId 业务字段编号 * @param tableId 业务字段编号
*
* @return 业务字段集合 * @return 业务字段集合
*/ */
@Override @Override
public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId) public List<GenTableColumn> selectGenTableColumnListByTableId (Long tableId) {
{ return genTableColumnMapper.selectGenTableColumnListByTableId(tableId);
return genTableColumnMapper.selectGenTableColumnListByTableId(tableId); }
}
/** /**
* 新增业务字段 * 新增业务字段
* *
* @param genTableColumn 业务字段信息 * @param genTableColumn 业务字段信息
*
* @return 结果 * @return 结果
*/ */
@Override @Override
public int insertGenTableColumn(GenTableColumn genTableColumn) public int insertGenTableColumn (GenTableColumn genTableColumn) {
{ return genTableColumnMapper.insertGenTableColumn(genTableColumn);
return genTableColumnMapper.insertGenTableColumn(genTableColumn); }
}
/** /**
* 修改业务字段 * 修改业务字段
* *
* @param genTableColumn 业务字段信息 * @param genTableColumn 业务字段信息
*
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateGenTableColumn(GenTableColumn genTableColumn) public int updateGenTableColumn (GenTableColumn genTableColumn) {
{ return genTableColumnMapper.updateGenTableColumn(genTableColumn);
return genTableColumnMapper.updateGenTableColumn(genTableColumn); }
}
/** /**
* 删除业务字段对象 * 删除业务字段对象
* *
* @param ids 需要删除的数据ID * @param ids 需要删除的数据ID
*
* @return 结果 * @return 结果
*/ */
@Override
public int deleteGenTableColumnByIds(String ids)
{
return genTableColumnMapper.deleteGenTableColumnByIds(Convert.toLongArray(ids));
}
@Override @Override
public List<GenTableColumn> selectDbTableColumnsByName(String table, String dbName) { public int deleteGenTableColumnByIds (String ids) {
return genTableColumnMapper.selectDbTableColumnsByName(table,dbName); return genTableColumnMapper.deleteGenTableColumnByIds(Convert.toLongArray(ids));
} }
} }

250
cloud-server/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java
View File

@ -10,7 +10,6 @@ import com.muyu.common.core.utils.StringUtils;
import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.security.utils.SecurityUtils;
import com.muyu.gen.domain.GenTable; import com.muyu.gen.domain.GenTable;
import com.muyu.gen.domain.GenTableColumn; import com.muyu.gen.domain.GenTableColumn;
import com.muyu.gen.domain.GenTableResp;
import com.muyu.gen.mapper.GenTableColumnMapper; import com.muyu.gen.mapper.GenTableColumnMapper;
import com.muyu.gen.mapper.GenTableMapper; import com.muyu.gen.mapper.GenTableMapper;
import com.muyu.gen.util.GenUtils; import com.muyu.gen.util.GenUtils;
@ -23,7 +22,7 @@ import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity; import org.apache.velocity.app.Velocity;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import javax.annotation.Resource; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -42,28 +41,43 @@ import java.util.zip.ZipOutputStream;
/** /**
* 业务 服务层实现 * 业务 服务层实现
* *
* @author ruoyi * @author muyu
*/ */
@Service @Service
public class GenTableServiceImpl implements IGenTableService public class GenTableServiceImpl implements IGenTableService {
{
private static final Logger log = LoggerFactory.getLogger(GenTableServiceImpl.class); private static final Logger log = LoggerFactory.getLogger(GenTableServiceImpl.class);
@Resource @Autowired
private GenTableMapper genTableMapper; private GenTableMapper genTableMapper;
@Resource @Autowired
private GenTableColumnMapper genTableColumnMapper; private GenTableColumnMapper genTableColumnMapper;
/**
* 获取代码生成地址
*
* @param table 业务表信息
* @param template 模板文件路径
*
* @return 生成地址
*/
public static String getGenPath (GenTable table, String template) {
String genPath = table.getGenPath();
if (StringUtils.equals(genPath, "/")) {
return System.getProperty("user.dir") + File.separator + "src" + File.separator + VelocityUtils.getFileName(template, table);
}
return genPath + File.separator + VelocityUtils.getFileName(template, table);
}
/** /**
* 查询业务信息 * 查询业务信息
* *
* @param id 业务ID * @param id 业务ID
*
* @return 业务信息 * @return 业务信息
*/ */
@Override @Override
public GenTable selectGenTableById(Long id) public GenTable selectGenTableById (Long id) {
{
GenTable genTable = genTableMapper.selectGenTableById(id); GenTable genTable = genTableMapper.selectGenTableById(id);
setTableFromOptions(genTable); setTableFromOptions(genTable);
return genTable; return genTable;
@ -73,11 +87,11 @@ public class GenTableServiceImpl implements IGenTableService
* 查询业务列表 * 查询业务列表
* *
* @param genTable 业务信息 * @param genTable 业务信息
*
* @return 业务集合 * @return 业务集合
*/ */
@Override @Override
public List<GenTable> selectGenTableList(GenTable genTable) public List<GenTable> selectGenTableList (GenTable genTable) {
{
return genTableMapper.selectGenTableList(genTable); return genTableMapper.selectGenTableList(genTable);
} }
@ -85,11 +99,11 @@ public class GenTableServiceImpl implements IGenTableService
* 查询据库列表 * 查询据库列表
* *
* @param genTable 业务信息 * @param genTable 业务信息
*
* @return 数据库表集合 * @return 数据库表集合
*/ */
@Override @Override
public List<GenTable> selectDbTableList(GenTable genTable) public List<GenTable> selectDbTableList (GenTable genTable) {
{
return genTableMapper.selectDbTableList(genTable); return genTableMapper.selectDbTableList(genTable);
} }
@ -97,13 +111,12 @@ public class GenTableServiceImpl implements IGenTableService
* 查询据库列表 * 查询据库列表
* *
* @param tableNames 表名称组 * @param tableNames 表名称组
* @param dbName *
* @return 数据库表集合 * @return 数据库表集合
*/ */
@Override @Override
public List<GenTable> selectDbTableListByNames(String[] tableNames, String dbName) public List<GenTable> selectDbTableListByNames (String[] tableNames) {
{ return genTableMapper.selectDbTableListByNames(tableNames);
return genTableMapper.selectDbTableListByNames(tableNames,dbName);
} }
/** /**
@ -112,8 +125,7 @@ public class GenTableServiceImpl implements IGenTableService
* @return 表信息集合 * @return 表信息集合
*/ */
@Override @Override
public List<GenTable> selectGenTableAll() public List<GenTable> selectGenTableAll () {
{
return genTableMapper.selectGenTableAll(); return genTableMapper.selectGenTableAll();
} }
@ -121,19 +133,17 @@ public class GenTableServiceImpl implements IGenTableService
* 修改业务 * 修改业务
* *
* @param genTable 业务信息 * @param genTable 业务信息
*
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void updateGenTable(GenTable genTable) public void updateGenTable (GenTable genTable) {
{
String options = JSON.toJSONString(genTable.getParams()); String options = JSON.toJSONString(genTable.getParams());
genTable.setOptions(options); genTable.setOptions(options);
int row = genTableMapper.updateGenTable(genTable); int row = genTableMapper.updateGenTable(genTable);
if (row > 0) if (row > 0) {
{ for (GenTableColumn cenTableColumn : genTable.getColumns()) {
for (GenTableColumn cenTableColumn : genTable.getColumns())
{
genTableColumnMapper.updateGenTableColumn(cenTableColumn); genTableColumnMapper.updateGenTableColumn(cenTableColumn);
} }
} }
@ -143,12 +153,12 @@ public class GenTableServiceImpl implements IGenTableService
* 删除业务对象 * 删除业务对象
* *
* @param tableIds 需要删除的数据ID * @param tableIds 需要删除的数据ID
*
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void deleteGenTableByIds(Long[] tableIds) public void deleteGenTableByIds (Long[] tableIds) {
{
genTableMapper.deleteGenTableByIds(tableIds); genTableMapper.deleteGenTableByIds(tableIds);
genTableColumnMapper.deleteGenTableColumnByIds(tableIds); genTableColumnMapper.deleteGenTableColumnByIds(tableIds);
} }
@ -160,31 +170,23 @@ public class GenTableServiceImpl implements IGenTableService
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void importGenTable(List<GenTable> tableList) public void importGenTable (List<GenTable> tableList) {
{
String operName = SecurityUtils.getUsername(); String operName = SecurityUtils.getUsername();
try try {
{ for (GenTable table : tableList) {
for (GenTable table : tableList)
{
String dbName = table.getDbName();
String tableName = table.getTableName(); String tableName = table.getTableName();
GenUtils.initTable(table, operName); GenUtils.initTable(table, operName);
int row = genTableMapper.insertGenTable(table); int row = genTableMapper.insertGenTable(table);
if (row > 0) if (row > 0) {
{
// 保存列信息 // 保存列信息
List<GenTableColumn> genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName, dbName); List<GenTableColumn> genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
for (GenTableColumn column : genTableColumns) for (GenTableColumn column : genTableColumns) {
{
GenUtils.initColumnField(column, table); GenUtils.initColumnField(column, table);
genTableColumnMapper.insertGenTableColumn(column); genTableColumnMapper.insertGenTableColumn(column);
} }
} }
} }
} } catch (Exception e) {
catch (Exception e)
{
throw new ServiceException("导入失败：" + e.getMessage()); throw new ServiceException("导入失败：" + e.getMessage());
} }
} }
@ -193,11 +195,11 @@ public class GenTableServiceImpl implements IGenTableService
* 预览代码 * 预览代码
* *
* @param tableId 表编号 * @param tableId 表编号
*
* @return 预览数据列表 * @return 预览数据列表
*/ */
@Override @Override
public Map<String, String> previewCode(Long tableId) public Map<String, String> previewCode (Long tableId) {
{
Map<String, String> dataMap = new LinkedHashMap<>(); Map<String, String> dataMap = new LinkedHashMap<>();
// 查询表信息 // 查询表信息
GenTable table = genTableMapper.selectGenTableById(tableId); GenTable table = genTableMapper.selectGenTableById(tableId);
@ -211,8 +213,7 @@ public class GenTableServiceImpl implements IGenTableService
// 获取模板列表 // 获取模板列表
List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory()); List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
for (String template : templates) for (String template : templates) {
{
// 渲染模板 // 渲染模板
StringWriter sw = new StringWriter(); StringWriter sw = new StringWriter();
Template tpl = Velocity.getTemplate(template, Constants.UTF8); Template tpl = Velocity.getTemplate(template, Constants.UTF8);
@ -226,11 +227,11 @@ public class GenTableServiceImpl implements IGenTableService
* 生成代码（下载方式） * 生成代码（下载方式）
* *
* @param tableName 表名称 * @param tableName 表名称
*
* @return 数据 * @return 数据
*/ */
@Override @Override
public byte[] downloadCode(String tableName) public byte[] downloadCode (String tableName) {
{
ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
ZipOutputStream zip = new ZipOutputStream(outputStream); ZipOutputStream zip = new ZipOutputStream(outputStream);
generatorCode(tableName, zip); generatorCode(tableName, zip);
@ -244,8 +245,7 @@ public class GenTableServiceImpl implements IGenTableService
* @param tableName 表名称 * @param tableName 表名称
*/ */
@Override @Override
public void generatorCode(String tableName) public void generatorCode (String tableName) {
{
// 查询表信息 // 查询表信息
GenTable table = genTableMapper.selectGenTableByName(tableName); GenTable table = genTableMapper.selectGenTableByName(tableName);
// 设置主子表信息 // 设置主子表信息
@ -259,21 +259,16 @@ public class GenTableServiceImpl implements IGenTableService
// 获取模板列表 // 获取模板列表
List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory()); List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
for (String template : templates) for (String template : templates) {
{ if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm")) {
if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm"))
{
// 渲染模板 // 渲染模板
StringWriter sw = new StringWriter(); StringWriter sw = new StringWriter();
Template tpl = Velocity.getTemplate(template, Constants.UTF8); Template tpl = Velocity.getTemplate(template, Constants.UTF8);
tpl.merge(context, sw); tpl.merge(context, sw);
try try {
{
String path = getGenPath(table, template); String path = getGenPath(table, template);
FileUtils.writeStringToFile(new File(path), sw.toString(), CharsetKit.UTF_8); FileUtils.writeStringToFile(new File(path), sw.toString(), CharsetKit.UTF_8);
} } catch (IOException e) {
catch (IOException e)
{
throw new ServiceException("渲染模板失败，表名：" + table.getTableName()); throw new ServiceException("渲染模板失败，表名：" + table.getTableName());
} }
} }
@ -284,54 +279,45 @@ public class GenTableServiceImpl implements IGenTableService
* 同步数据库 * 同步数据库
* *
* @param tableName 表名称 * @param tableName 表名称
* @param dbName
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void synchDb(String tableName, String dbName) public void synchDb (String tableName) {
{
GenTable table = genTableMapper.selectGenTableByName(tableName); GenTable table = genTableMapper.selectGenTableByName(tableName);
List<GenTableColumn> tableColumns = table.getColumns(); List<GenTableColumn> tableColumns = table.getColumns();
Map<String, GenTableColumn> tableColumnMap = tableColumns.stream().collect(Collectors.toMap(GenTableColumn::getColumnName, Function.identity())); Map<String, GenTableColumn> tableColumnMap = tableColumns.stream().collect(Collectors.toMap(GenTableColumn::getColumnName, Function.identity()));
List<GenTableColumn> dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName, dbName); List<GenTableColumn> dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
if (StringUtils.isEmpty(dbTableColumns)) if (StringUtils.isEmpty(dbTableColumns)) {
{
throw new ServiceException("同步数据失败，原表结构不存在"); throw new ServiceException("同步数据失败，原表结构不存在");
} }
List<String> dbTableColumnNames = dbTableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList()); List<String> dbTableColumnNames = dbTableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList());
dbTableColumns.forEach(column -> { dbTableColumns.forEach(column -> {
GenUtils.initColumnField(column, table); GenUtils.initColumnField(column, table);
if (tableColumnMap.containsKey(column.getColumnName())) if (tableColumnMap.containsKey(column.getColumnName())) {
{
GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName()); GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName());
column.setColumnId(prevColumn.getColumnId()); column.setColumnId(prevColumn.getColumnId());
if (column.isList()) if (column.isList()) {
{
// 如果是列表，继续保留查询方式/字典类型选项 // 如果是列表，继续保留查询方式/字典类型选项
column.setDictType(prevColumn.getDictType()); column.setDictType(prevColumn.getDictType());
column.setQueryType(prevColumn.getQueryType()); column.setQueryType(prevColumn.getQueryType());
} }
if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk() if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk()
&& (column.isInsert() || column.isEdit()) && (column.isInsert() || column.isEdit())
&& ((column.isUsableColumn()) || (!column.isSuperColumn()))) && ((column.isUsableColumn()) || (!column.isSuperColumn()))) {
{
// 如果是(新增/修改&非主键/非忽略及父属性)，继续保留必填/显示类型选项 // 如果是(新增/修改&非主键/非忽略及父属性)，继续保留必填/显示类型选项
column.setIsRequired(prevColumn.getIsRequired()); column.setIsRequired(prevColumn.getIsRequired());
column.setHtmlType(prevColumn.getHtmlType()); column.setHtmlType(prevColumn.getHtmlType());
} }
genTableColumnMapper.updateGenTableColumn(column); genTableColumnMapper.updateGenTableColumn(column);
} } else {
else
{
genTableColumnMapper.insertGenTableColumn(column); genTableColumnMapper.insertGenTableColumn(column);
} }
}); });
List<GenTableColumn> delColumns = tableColumns.stream().filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList()); List<GenTableColumn> delColumns = tableColumns.stream().filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList());
if (StringUtils.isNotEmpty(delColumns)) if (StringUtils.isNotEmpty(delColumns)) {
{
genTableColumnMapper.deleteGenTableColumns(delColumns); genTableColumnMapper.deleteGenTableColumns(delColumns);
} }
} }
@ -340,15 +326,14 @@ public class GenTableServiceImpl implements IGenTableService
* 批量生成代码（下载方式） * 批量生成代码（下载方式）
* *
* @param tableNames 表数组 * @param tableNames 表数组
*
* @return 数据 * @return 数据
*/ */
@Override @Override
public byte[] downloadCode(String[] tableNames) public byte[] downloadCode (String[] tableNames) {
{
ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
ZipOutputStream zip = new ZipOutputStream(outputStream); ZipOutputStream zip = new ZipOutputStream(outputStream);
for (String tableName : tableNames) for (String tableName : tableNames) {
{
generatorCode(tableName, zip); generatorCode(tableName, zip);
} }
IOUtils.closeQuietly(zip); IOUtils.closeQuietly(zip);
@ -358,8 +343,7 @@ public class GenTableServiceImpl implements IGenTableService
/** /**
* 查询表信息并生成代码 * 查询表信息并生成代码
*/ */
private void generatorCode(String tableName, ZipOutputStream zip) private void generatorCode (String tableName, ZipOutputStream zip) {
{
// 查询表信息 // 查询表信息
GenTable table = genTableMapper.selectGenTableByName(tableName); GenTable table = genTableMapper.selectGenTableByName(tableName);
// 设置主子表信息 // 设置主子表信息
@ -373,23 +357,19 @@ public class GenTableServiceImpl implements IGenTableService
// 获取模板列表 // 获取模板列表
List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory()); List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
for (String template : templates) for (String template : templates) {
{
// 渲染模板 // 渲染模板
StringWriter sw = new StringWriter(); StringWriter sw = new StringWriter();
Template tpl = Velocity.getTemplate(template, Constants.UTF8); Template tpl = Velocity.getTemplate(template, Constants.UTF8);
tpl.merge(context, sw); tpl.merge(context, sw);
try try {
{
// 添加到zip // 添加到zip
zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table))); zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table)));
IOUtils.write(sw.toString(), zip, Constants.UTF8); IOUtils.write(sw.toString(), zip, Constants.UTF8);
IOUtils.closeQuietly(sw); IOUtils.closeQuietly(sw);
zip.flush(); zip.flush();
zip.closeEntry(); zip.closeEntry();
} } catch (IOException e) {
catch (IOException e)
{
log.error("渲染模板失败，表名：" + table.getTableName(), e); log.error("渲染模板失败，表名：" + table.getTableName(), e);
} }
} }
@ -401,80 +381,49 @@ public class GenTableServiceImpl implements IGenTableService
* @param genTable 业务信息 * @param genTable 业务信息
*/ */
@Override @Override
public void validateEdit(GenTable genTable) public void validateEdit (GenTable genTable) {
{ if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) {
if (GenConstants.TPL_TREE.equals(genTable.getTplCategory()))
{
String options = JSON.toJSONString(genTable.getParams()); String options = JSON.toJSONString(genTable.getParams());
JSONObject paramsObj = JSON.parseObject(options); JSONObject paramsObj = JSON.parseObject(options);
if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_CODE))) if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_CODE))) {
{
throw new ServiceException("树编码字段不能为空"); throw new ServiceException("树编码字段不能为空");
} } else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_PARENT_CODE))) {
else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_PARENT_CODE)))
{
throw new ServiceException("树父编码字段不能为空"); throw new ServiceException("树父编码字段不能为空");
} } else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_NAME))) {
else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_NAME)))
{
throw new ServiceException("树名称字段不能为空"); throw new ServiceException("树名称字段不能为空");
} } else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory())) {
else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory())) if (StringUtils.isEmpty(genTable.getSubTableName())) {
{
if (StringUtils.isEmpty(genTable.getSubTableName()))
{
throw new ServiceException("关联子表的表名不能为空"); throw new ServiceException("关联子表的表名不能为空");
} } else if (StringUtils.isEmpty(genTable.getSubTableFkName())) {
else if (StringUtils.isEmpty(genTable.getSubTableFkName()))
{
throw new ServiceException("子表关联的外键名不能为空"); throw new ServiceException("子表关联的外键名不能为空");
} }
} }
} }
} }
@Override
public List<String> selDbNameAll() {
return genTableMapper.selDbNameAll();
}
@Override
public List<GenTableResp> selectDbTableListAll() {
return genTableMapper.selectDbTableListAll();
}
/** /**
* 设置主键列信息 * 设置主键列信息
* *
* @param table 业务表信息 * @param table 业务表信息
*/ */
public void setPkColumn(GenTable table) public void setPkColumn (GenTable table) {
{ for (GenTableColumn column : table.getColumns()) {
for (GenTableColumn column : table.getColumns()) if (column.isPk()) {
{
if (column.isPk())
{
table.setPkColumn(column); table.setPkColumn(column);
break; break;
} }
} }
if (StringUtils.isNull(table.getPkColumn())) if (StringUtils.isNull(table.getPkColumn())) {
{
table.setPkColumn(table.getColumns().get(0)); table.setPkColumn(table.getColumns().get(0));
} }
if (GenConstants.TPL_SUB.equals(table.getTplCategory())) if (GenConstants.TPL_SUB.equals(table.getTplCategory())) {
{ for (GenTableColumn column : table.getSubTable().getColumns()) {
for (GenTableColumn column : table.getSubTable().getColumns()) if (column.isPk()) {
{
if (column.isPk())
{
table.getSubTable().setPkColumn(column); table.getSubTable().setPkColumn(column);
break; break;
} }
} }
if (StringUtils.isNull(table.getSubTable().getPkColumn())) if (StringUtils.isNull(table.getSubTable().getPkColumn())) {
{
table.getSubTable().setPkColumn(table.getSubTable().getColumns().get(0)); table.getSubTable().setPkColumn(table.getSubTable().getColumns().get(0));
} }
} }
@ -485,11 +434,9 @@ public class GenTableServiceImpl implements IGenTableService
* *
* @param table 业务表信息 * @param table 业务表信息
*/ */
public void setSubTable(GenTable table) public void setSubTable (GenTable table) {
{
String subTableName = table.getSubTableName(); String subTableName = table.getSubTableName();
if (StringUtils.isNotEmpty(subTableName)) if (StringUtils.isNotEmpty(subTableName)) {
{
table.setSubTable(genTableMapper.selectGenTableByName(subTableName)); table.setSubTable(genTableMapper.selectGenTableByName(subTableName));
} }
} }
@ -499,11 +446,9 @@ public class GenTableServiceImpl implements IGenTableService
* *
* @param genTable 设置后的生成对象 * @param genTable 设置后的生成对象
*/ */
public void setTableFromOptions(GenTable genTable) public void setTableFromOptions (GenTable genTable) {
{
JSONObject paramsObj = JSON.parseObject(genTable.getOptions()); JSONObject paramsObj = JSON.parseObject(genTable.getOptions());
if (StringUtils.isNotNull(paramsObj)) if (StringUtils.isNotNull(paramsObj)) {
{
String treeCode = paramsObj.getString(GenConstants.TREE_CODE); String treeCode = paramsObj.getString(GenConstants.TREE_CODE);
String treeParentCode = paramsObj.getString(GenConstants.TREE_PARENT_CODE); String treeParentCode = paramsObj.getString(GenConstants.TREE_PARENT_CODE);
String treeName = paramsObj.getString(GenConstants.TREE_NAME); String treeName = paramsObj.getString(GenConstants.TREE_NAME);
@ -517,21 +462,4 @@ public class GenTableServiceImpl implements IGenTableService
genTable.setParentMenuName(parentMenuName); genTable.setParentMenuName(parentMenuName);
} }
} }
/**
* 获取代码生成地址
*
* @param table 业务表信息
* @param template 模板文件路径
* @return 生成地址
*/
public static String getGenPath(GenTable table, String template)
{
String genPath = table.getGenPath();
if (StringUtils.equals(genPath, "/"))
{
return System.getProperty("user.dir") + File.separator + "src" + File.separator + VelocityUtils.getFileName(template, table);
}
return genPath + File.separator + VelocityUtils.getFileName(template, table);
}
} }

19
cloud-server/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/IGenTableColumnService.java
View File

@ -7,41 +7,42 @@ import java.util.List;
/** /**
* 业务字段 服务层 * 业务字段 服务层
* *
* @author ruoyi * @author muyu
*/ */
public interface IGenTableColumnService public interface IGenTableColumnService {
{
/** /**
* 查询业务字段列表 * 查询业务字段列表
* *
* @param tableId 业务字段编号 * @param tableId 业务字段编号
*
* @return 业务字段集合 * @return 业务字段集合
*/ */
public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId); List<GenTableColumn> selectGenTableColumnListByTableId (Long tableId);
/** /**
* 新增业务字段 * 新增业务字段
* *
* @param genTableColumn 业务字段信息 * @param genTableColumn 业务字段信息
*
* @return 结果 * @return 结果
*/ */
public int insertGenTableColumn(GenTableColumn genTableColumn); int insertGenTableColumn (GenTableColumn genTableColumn);
/** /**
* 修改业务字段 * 修改业务字段
* *
* @param genTableColumn 业务字段信息 * @param genTableColumn 业务字段信息
*
* @return 结果 * @return 结果
*/ */
public int updateGenTableColumn(GenTableColumn genTableColumn); int updateGenTableColumn (GenTableColumn genTableColumn);
/** /**
* 删除业务字段信息 * 删除业务字段信息
* *
* @param ids 需要删除的数据ID * @param ids 需要删除的数据ID
*
* @return 结果 * @return 结果
*/ */
public int deleteGenTableColumnByIds(String ids); int deleteGenTableColumnByIds (String ids);
List<GenTableColumn> selectDbTableColumnsByName(String table, String dbName);
} }

50
cloud-server/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/IGenTableService.java
View File

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

4
cloud-server/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml
View File

@ -4,10 +4,10 @@ server:
# nacos线上地址 # nacos线上地址
nacos: nacos:
addr: 47.116.173.119:8848 addr: 110.42.213.184:8848
user-name: nacos user-name: nacos
password: nacos password: nacos
namespace: one namespace: public
# Spring # Spring
spring: spring:

68
cloud-server/cloud-modules/cloud-modules-gen/src/main/resources/logback/dev.xml
View File

@ -1,31 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="60 seconds" debug="false"> <configuration scan="true" scanPeriod="60 seconds" debug="false">
<!-- 日志存放路径 --> <!-- 日志存放路径 -->
<property name="log.path" value="logs/cloud-file"/> <property name="log.path" value="logs/cloud-gen" />
<!-- 日志输出格式 --> <!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/> <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
<!-- 控制台输出 --> <!-- 控制台输出 -->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender"> <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder> <encoder>
<pattern>${log.pattern}</pattern> <pattern>${log.pattern}</pattern>
</encoder> </encoder>
</appender> </appender>
<!-- 系统日志输出 --> <!-- 系统日志输出 -->
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/info.log</file> <file>${log.path}/info.log</file>
<!-- 循环政策：基于时间创建日志文件 --> <!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 --> <!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern> <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 --> <!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory> <maxHistory>60</maxHistory>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<pattern>${log.pattern}</pattern> <pattern>${log.pattern}</pattern>
</encoder> </encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter"> <filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 --> <!-- 过滤的级别 -->
<level>INFO</level> <level>INFO</level>
<!-- 匹配时的操作：接收（记录） --> <!-- 匹配时的操作：接收（记录） -->
@ -33,16 +33,16 @@
<!-- 不匹配时的操作：拒绝（不记录） --> <!-- 不匹配时的操作：拒绝（不记录） -->
<onMismatch>DENY</onMismatch> <onMismatch>DENY</onMismatch>
</filter> </filter>
</appender> </appender>
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/error.log</file> <file>${log.path}/error.log</file>
<!-- 循环政策：基于时间创建日志文件 --> <!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 --> <!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern> <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 --> <!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory> <maxHistory>60</maxHistory>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<pattern>${log.pattern}</pattern> <pattern>${log.pattern}</pattern>
@ -50,25 +50,25 @@
<filter class="ch.qos.logback.classic.filter.LevelFilter"> <filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 --> <!-- 过滤的级别 -->
<level>ERROR</level> <level>ERROR</level>
<!-- 匹配时的操作：接收（记录） --> <!-- 匹配时的操作：接收（记录） -->
<onMatch>ACCEPT</onMatch> <onMatch>ACCEPT</onMatch>
<!-- 不匹配时的操作：拒绝（不记录） --> <!-- 不匹配时的操作：拒绝（不记录） -->
<onMismatch>DENY</onMismatch> <onMismatch>DENY</onMismatch>
</filter> </filter>
</appender> </appender>
<!-- 系统模块日志级别控制 --> <!-- 系统模块日志级别控制 -->
<logger name="com.muyu" level="info"/> <logger name="com.muyu" level="info" />
<!-- Spring日志级别控制 --> <!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn"/> <logger name="org.springframework" level="warn" />
<root level="info"> <root level="info">
<appender-ref ref="console"/> <appender-ref ref="console" />
</root> </root>
<!--系统操作日志--> <!--系统操作日志-->
<root level="info"> <root level="info">
<appender-ref ref="file_info"/> <appender-ref ref="file_info" />
<appender-ref ref="file_error"/> <appender-ref ref="file_error" />
</root> </root>
</configuration> </configuration>

68
cloud-server/cloud-modules/cloud-modules-gen/src/main/resources/logback/prod.xml
View File

@ -1,32 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="60 seconds" debug="false"> <configuration scan="true" scanPeriod="60 seconds" debug="false">
<!-- 日志存放路径 --> <!-- 日志存放路径 -->
<property name="log.path" value="logs/cloud-file"/> <property name="log.path" value="logs/cloud-gen" />
<!-- 日志输出格式 --> <!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/> <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
<property name="log.sky.pattern" value="%d{HH:mm:ss.SSS} %yellow([%tid]) [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/> <property name="log.sky.pattern" value="%d{HH:mm:ss.SSS} %yellow([%tid]) [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
<!-- 控制台输出 --> <!-- 控制台输出 -->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender"> <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder> <encoder>
<pattern>${log.pattern}</pattern> <pattern>${log.pattern}</pattern>
</encoder> </encoder>
</appender> </appender>
<!-- 系统日志输出 --> <!-- 系统日志输出 -->
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/info.log</file> <file>${log.path}/info.log</file>
<!-- 循环政策：基于时间创建日志文件 --> <!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 --> <!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern> <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 --> <!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory> <maxHistory>60</maxHistory>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<pattern>${log.pattern}</pattern> <pattern>${log.pattern}</pattern>
</encoder> </encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter"> <filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 --> <!-- 过滤的级别 -->
<level>INFO</level> <level>INFO</level>
<!-- 匹配时的操作：接收（记录） --> <!-- 匹配时的操作：接收（记录） -->
@ -34,16 +34,16 @@
<!-- 不匹配时的操作：拒绝（不记录） --> <!-- 不匹配时的操作：拒绝（不记录） -->
<onMismatch>DENY</onMismatch> <onMismatch>DENY</onMismatch>
</filter> </filter>
</appender> </appender>
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/error.log</file> <file>${log.path}/error.log</file>
<!-- 循环政策：基于时间创建日志文件 --> <!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 --> <!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern> <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 --> <!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory> <maxHistory>60</maxHistory>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<pattern>${log.pattern}</pattern> <pattern>${log.pattern}</pattern>
@ -51,9 +51,9 @@
<filter class="ch.qos.logback.classic.filter.LevelFilter"> <filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 --> <!-- 过滤的级别 -->
<level>ERROR</level> <level>ERROR</level>
<!-- 匹配时的操作：接收（记录） --> <!-- 匹配时的操作：接收（记录） -->
<onMatch>ACCEPT</onMatch> <onMatch>ACCEPT</onMatch>
<!-- 不匹配时的操作：拒绝（不记录） --> <!-- 不匹配时的操作：拒绝（不记录） -->
<onMismatch>DENY</onMismatch> <onMismatch>DENY</onMismatch>
</filter> </filter>
</appender> </appender>
@ -72,17 +72,17 @@
</root> </root>
<!-- 系统模块日志级别控制 --> <!-- 系统模块日志级别控制 -->
<logger name="com.muyu" level="info"/> <logger name="com.muyu" level="info" />
<!-- Spring日志级别控制 --> <!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn"/> <logger name="org.springframework" level="warn" />
<root level="info"> <root level="info">
<appender-ref ref="console"/> <appender-ref ref="console" />
</root> </root>
<!--系统操作日志--> <!--系统操作日志-->
<root level="info"> <root level="info">
<appender-ref ref="file_info"/> <appender-ref ref="file_info" />
<appender-ref ref="file_error"/> <appender-ref ref="file_error" />
</root> </root>
</configuration> </configuration>

68
cloud-server/cloud-modules/cloud-modules-gen/src/main/resources/logback/test.xml
View File

@ -1,32 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="60 seconds" debug="false"> <configuration scan="true" scanPeriod="60 seconds" debug="false">
<!-- 日志存放路径 --> <!-- 日志存放路径 -->
<property name="log.path" value="logs/cloud-file"/> <property name="log.path" value="logs/cloud-gen" />
<!-- 日志输出格式 --> <!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/> <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
<property name="log.sky.pattern" value="%d{HH:mm:ss.SSS} %yellow([%tid]) [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/> <property name="log.sky.pattern" value="%d{HH:mm:ss.SSS} %yellow([%tid]) [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
<!-- 控制台输出 --> <!-- 控制台输出 -->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender"> <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder> <encoder>
<pattern>${log.pattern}</pattern> <pattern>${log.pattern}</pattern>
</encoder> </encoder>
</appender> </appender>
<!-- 系统日志输出 --> <!-- 系统日志输出 -->
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/info.log</file> <file>${log.path}/info.log</file>
<!-- 循环政策：基于时间创建日志文件 --> <!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 --> <!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern> <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 --> <!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory> <maxHistory>60</maxHistory>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<pattern>${log.pattern}</pattern> <pattern>${log.pattern}</pattern>
</encoder> </encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter"> <filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 --> <!-- 过滤的级别 -->
<level>INFO</level> <level>INFO</level>
<!-- 匹配时的操作：接收（记录） --> <!-- 匹配时的操作：接收（记录） -->
@ -34,16 +34,16 @@
<!-- 不匹配时的操作：拒绝（不记录） --> <!-- 不匹配时的操作：拒绝（不记录） -->
<onMismatch>DENY</onMismatch> <onMismatch>DENY</onMismatch>
</filter> </filter>
</appender> </appender>
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/error.log</file> <file>${log.path}/error.log</file>
<!-- 循环政策：基于时间创建日志文件 --> <!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 --> <!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern> <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 --> <!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory> <maxHistory>60</maxHistory>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<pattern>${log.pattern}</pattern> <pattern>${log.pattern}</pattern>
@ -51,9 +51,9 @@
<filter class="ch.qos.logback.classic.filter.LevelFilter"> <filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 --> <!-- 过滤的级别 -->
<level>ERROR</level> <level>ERROR</level>
<!-- 匹配时的操作：接收（记录） --> <!-- 匹配时的操作：接收（记录） -->
<onMatch>ACCEPT</onMatch> <onMatch>ACCEPT</onMatch>
<!-- 不匹配时的操作：拒绝（不记录） --> <!-- 不匹配时的操作：拒绝（不记录） -->
<onMismatch>DENY</onMismatch> <onMismatch>DENY</onMismatch>
</filter> </filter>
</appender> </appender>
@ -72,17 +72,17 @@
</root> </root>
<!-- 系统模块日志级别控制 --> <!-- 系统模块日志级别控制 -->
<logger name="com.muyu" level="info"/> <logger name="com.muyu" level="info" />
<!-- Spring日志级别控制 --> <!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn"/> <logger name="org.springframework" level="warn" />
<root level="info"> <root level="info">
<appender-ref ref="console"/> <appender-ref ref="console" />
</root> </root>
<!--系统操作日志--> <!--系统操作日志-->
<root level="info"> <root level="info">
<appender-ref ref="file_info"/> <appender-ref ref="file_info" />
<appender-ref ref="file_error"/> <appender-ref ref="file_error" />
</root> </root>
</configuration> </configuration>

183
cloud-server/cloud-modules/cloud-modules-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
View File

@ -1,36 +1,58 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.muyu.gen.mapper.GenTableColumnMapper"> <mapper namespace="com.muyu.gen.mapper.GenTableColumnMapper">
<resultMap type="com.muyu.gen.domain.GenTableColumn" id="GenTableColumnResult"> <resultMap type="com.muyu.gen.domain.GenTableColumn" id="GenTableColumnResult">
<id property="columnId" column="column_id" /> <id property="columnId" column="column_id"/>
<result property="tableId" column="table_id" /> <result property="tableId" column="table_id"/>
<result property="columnName" column="column_name" /> <result property="columnName" column="column_name"/>
<result property="columnComment" column="column_comment" /> <result property="columnComment" column="column_comment"/>
<result property="columnType" column="column_type" /> <result property="columnType" column="column_type"/>
<result property="javaType" column="java_type" /> <result property="javaType" column="java_type"/>
<result property="javaField" column="java_field" /> <result property="javaField" column="java_field"/>
<result property="isPk" column="is_pk" /> <result property="isPk" column="is_pk"/>
<result property="isIncrement" column="is_increment" /> <result property="isIncrement" column="is_increment"/>
<result property="isRequired" column="is_required" /> <result property="isRequired" column="is_required"/>
<result property="isInsert" column="is_insert" /> <result property="isInsert" column="is_insert"/>
<result property="isEdit" column="is_edit" /> <result property="isEdit" column="is_edit"/>
<result property="isList" column="is_list" /> <result property="isList" column="is_list"/>
<result property="isQuery" column="is_query" /> <result property="isQuery" column="is_query"/>
<result property="queryType" column="query_type" /> <result property="queryType" column="query_type"/>
<result property="htmlType" column="html_type" /> <result property="htmlType" column="html_type"/>
<result property="dictType" column="dict_type" /> <result property="dictType" column="dict_type"/>
<result property="sort" column="sort" /> <result property="sort" column="sort"/>
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by"/>
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time"/>
</resultMap> </resultMap>
<sql id="selectGenTableColumnVo"> <sql id="selectGenTableColumnVo">
select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column select column_id,
table_id,
column_name,
column_comment,
column_type,
java_type,
java_field,
is_pk,
is_increment,
is_required,
is_insert,
is_edit,
is_list,
is_query,
query_type,
html_type,
dict_type,
sort,
create_by,
create_time,
update_by,
update_time
from gen_table_column
</sql> </sql>
<select id="selectGenTableColumnListByTableId" parameterType="com.muyu.gen.domain.GenTableColumn" resultMap="GenTableColumnResult"> <select id="selectGenTableColumnListByTableId" parameterType="com.muyu.gen.domain.GenTableColumn" resultMap="GenTableColumnResult">
@ -40,55 +62,61 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult"> <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 select column_name,
from information_schema.columns where (case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else null end) as is_required,
<include refid="com.muyu.gen.mapper.GenTableMapper.select_dbName"/> (case when column_key = 'PRI' then '1' else '0' end) as is_pk,
and table_name = (#{tableName}) ordinal_position as sort,
order by ordinal_position column_comment,
</select> (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>
<insert id="insertGenTableColumn" parameterType="com.muyu.gen.domain.GenTableColumn" useGeneratedKeys="true" keyProperty="columnId"> <insert id="insertGenTableColumn" parameterType="com.muyu.gen.domain.GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
insert into gen_table_column ( insert into gen_table_column (
<if test="tableId != null and tableId != ''">table_id,</if> <if test="tableId != null and tableId != ''">table_id,</if>
<if test="columnName != null and columnName != ''">column_name,</if> <if test="columnName != null and columnName != ''">column_name,</if>
<if test="columnComment != null and columnComment != ''">column_comment,</if> <if test="columnComment != null and columnComment != ''">column_comment,</if>
<if test="columnType != null and columnType != ''">column_type,</if> <if test="columnType != null and columnType != ''">column_type,</if>
<if test="javaType != null and javaType != ''">java_type,</if> <if test="javaType != null and javaType != ''">java_type,</if>
<if test="javaField != null and javaField != ''">java_field,</if> <if test="javaField != null and javaField != ''">java_field,</if>
<if test="isPk != null and isPk != ''">is_pk,</if> <if test="isPk != null and isPk != ''">is_pk,</if>
<if test="isIncrement != null and isIncrement != ''">is_increment,</if> <if test="isIncrement != null and isIncrement != ''">is_increment,</if>
<if test="isRequired != null and isRequired != ''">is_required,</if> <if test="isRequired != null and isRequired != ''">is_required,</if>
<if test="isInsert != null and isInsert != ''">is_insert,</if> <if test="isInsert != null and isInsert != ''">is_insert,</if>
<if test="isEdit != null and isEdit != ''">is_edit,</if> <if test="isEdit != null and isEdit != ''">is_edit,</if>
<if test="isList != null and isList != ''">is_list,</if> <if test="isList != null and isList != ''">is_list,</if>
<if test="isQuery != null and isQuery != ''">is_query,</if> <if test="isQuery != null and isQuery != ''">is_query,</if>
<if test="queryType != null and queryType != ''">query_type,</if> <if test="queryType != null and queryType != ''">query_type,</if>
<if test="htmlType != null and htmlType != ''">html_type,</if> <if test="htmlType != null and htmlType != ''">html_type,</if>
<if test="dictType != null and dictType != ''">dict_type,</if> <if test="dictType != null and dictType != ''">dict_type,</if>
<if test="sort != null">sort,</if> <if test="sort != null">sort,</if>
<if test="createBy != null and createBy != ''">create_by,</if> <if test="createBy != null and createBy != ''">create_by,</if>
create_time create_time
)values( )values(
<if test="tableId != null and tableId != ''">#{tableId},</if> <if test="tableId != null and tableId != ''">#{tableId},</if>
<if test="columnName != null and columnName != ''">#{columnName},</if> <if test="columnName != null and columnName != ''">#{columnName},</if>
<if test="columnComment != null and columnComment != ''">#{columnComment},</if> <if test="columnComment != null and columnComment != ''">#{columnComment},</if>
<if test="columnType != null and columnType != ''">#{columnType},</if> <if test="columnType != null and columnType != ''">#{columnType},</if>
<if test="javaType != null and javaType != ''">#{javaType},</if> <if test="javaType != null and javaType != ''">#{javaType},</if>
<if test="javaField != null and javaField != ''">#{javaField},</if> <if test="javaField != null and javaField != ''">#{javaField},</if>
<if test="isPk != null and isPk != ''">#{isPk},</if> <if test="isPk != null and isPk != ''">#{isPk},</if>
<if test="isIncrement != null and isIncrement != ''">#{isIncrement},</if> <if test="isIncrement != null and isIncrement != ''">#{isIncrement},</if>
<if test="isRequired != null and isRequired != ''">#{isRequired},</if> <if test="isRequired != null and isRequired != ''">#{isRequired},</if>
<if test="isInsert != null and isInsert != ''">#{isInsert},</if> <if test="isInsert != null and isInsert != ''">#{isInsert},</if>
<if test="isEdit != null and isEdit != ''">#{isEdit},</if> <if test="isEdit != null and isEdit != ''">#{isEdit},</if>
<if test="isList != null and isList != ''">#{isList},</if> <if test="isList != null and isList != ''">#{isList},</if>
<if test="isQuery != null and isQuery != ''">#{isQuery},</if> <if test="isQuery != null and isQuery != ''">#{isQuery},</if>
<if test="queryType != null and queryType != ''">#{queryType},</if> <if test="queryType != null and queryType != ''">#{queryType},</if>
<if test="htmlType != null and htmlType != ''">#{htmlType},</if> <if test="htmlType != null and htmlType != ''">#{htmlType},</if>
<if test="dictType != null and dictType != ''">#{dictType},</if> <if test="dictType != null and dictType != ''">#{dictType},</if>
<if test="sort != null">#{sort},</if> <if test="sort != null">#{sort},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if> <if test="createBy != null and createBy != ''">#{createBy},</if>
sysdate() sysdate()
) )
</insert> </insert>
<update id="updateGenTableColumn" parameterType="com.muyu.gen.domain.GenTableColumn"> <update id="updateGenTableColumn" parameterType="com.muyu.gen.domain.GenTableColumn">
@ -113,20 +141,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update> </update>
<delete id="deleteGenTableColumnByIds" parameterType="Long"> <delete id="deleteGenTableColumnByIds" parameterType="Long">
delete from gen_table_column where table_id in ( delete from gen_table_column where table_id in
<foreach collection="ids" item="tableId" separator="," > <foreach collection="array" item="tableId" open="(" separator="," close=")">
#{tableId} #{tableId}
</foreach> </foreach>
)
</delete> </delete>
<delete id="deleteGenTableColumns"> <delete id="deleteGenTableColumns">
delete from gen_table_column where column_id in ( delete from gen_table_column where column_id in
<foreach collection="genTableColumns" item="item" separator="," > <foreach collection="list" item="item" open="(" separator="," close=")">
#{item.columnId} #{item.columnId}
</foreach> </foreach>
)
</delete> </delete>
</mapper> </mapper>

453
cloud-server/cloud-modules/cloud-modules-gen/src/main/resources/mapper/generator/GenTableMapper.xml
View File

@ -1,208 +1,291 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.muyu.gen.mapper.GenTableMapper"> <mapper namespace="com.muyu.gen.mapper.GenTableMapper">
<resultMap type="com.muyu.gen.domain.GenTable" id="GenTableResult"> <resultMap type="com.muyu.gen.domain.GenTable" id="GenTableResult">
<id property="tableId" column="table_id" /> <id property="tableId" column="table_id"/>
<result property="dbName" column="db_name" /> <result property="tableName" column="table_name"/>
<result property="tableName" column="table_name" /> <result property="tableComment" column="table_comment"/>
<result property="tableComment" column="table_comment" /> <result property="subTableName" column="sub_table_name"/>
<result property="subTableName" column="sub_table_name" /> <result property="subTableFkName" column="sub_table_fk_name"/>
<result property="subTableFkName" column="sub_table_fk_name" /> <result property="className" column="class_name"/>
<result property="className" column="class_name" /> <result property="tplCategory" column="tpl_category"/>
<result property="tplCategory" column="tpl_category" /> <result property="packageName" column="package_name"/>
<result property="packageName" column="package_name" /> <result property="moduleName" column="module_name"/>
<result property="moduleName" column="module_name" /> <result property="businessName" column="business_name"/>
<result property="businessName" column="business_name" /> <result property="functionName" column="function_name"/>
<result property="functionName" column="function_name" /> <result property="functionAuthor" column="function_author"/>
<result property="functionAuthor" column="function_author" /> <result property="genType" column="gen_type"/>
<result property="genType" column="gen_type" /> <result property="genPath" column="gen_path"/>
<result property="genPath" column="gen_path" /> <result property="options" column="options"/>
<result property="options" column="options" /> <result property="createBy" column="create_by"/>
<result property="createBy" column="create_by" /> <result property="createTime" column="create_time"/>
<result property="createTime" column="create_time" /> <result property="updateBy" column="update_by"/>
<result property="updateBy" column="update_by" /> <result property="updateTime" column="update_time"/>
<result property="updateTime" column="update_time" /> <result property="remark" column="remark"/>
<result property="remark" column="remark" /> <collection property="columns" javaType="java.util.List" resultMap="GenTableColumnResult"/>
<collection property="columns" javaType="java.util.List" resultMap="GenTableColumnResult" />
</resultMap>
<resultMap type="com.muyu.gen.domain.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> </resultMap>
<sql id="selectGenTableVo"> <resultMap type="com.muyu.gen.domain.GenTableColumn" id="GenTableColumnResult">
select table_id, db_name, 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 <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> </sql>
<sql id="select_dbName">
<choose>
<when test="dbName!=null and dbName!=''">
table_schema in (#{dbName})
</when>
<otherwise>
table_schema = (select database())
</otherwise>
</choose>
</sql>
<select id="selectGenTableList" parameterType="com.muyu.gen.domain.GenTable" resultMap="GenTableResult"> <select id="selectGenTableList" parameterType="com.muyu.gen.domain.GenTable" resultMap="GenTableResult">
<include refid="selectGenTableVo"/> <include refid="selectGenTableVo"/>
<where> <where>
<if test="tableName != null and tableName != ''"> <if test="tableName != null and tableName != ''">
AND lower(table_name) like lower(concat('%', #{tableName}, '%')) AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
</if> </if>
<if test="tableComment != null and tableComment != ''"> <if test="tableComment != null and tableComment != ''">
AND lower(table_comment) like lower(concat('%', #{tableComment}, '%')) AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
</if> </if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 --> <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d') AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if> </if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 --> <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d') AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if> </if>
</where> </where>
</select> </select>
<select id="selectDbTableList" parameterType="com.muyu.gen.domain.GenTable" resultMap="GenTableResult"> <select id="selectDbTableList" parameterType="com.muyu.gen.domain.GenTable" resultMap="GenTableResult">
select table_name, table_comment, create_time, update_time from information_schema.tables select table_name, table_comment, create_time, update_time from information_schema.tables
where where table_schema = (select database())
<include refid="select_dbName"/> AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%'
AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%' AND table_name NOT IN (select table_name from gen_table)
AND table_name NOT IN (select table_name from gen_table) <if test="tableName != null and tableName != ''">
<if test="tableName != null and tableName != ''"> AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
AND lower(table_name) like lower(concat('%', #{tableName}, '%')) </if>
</if> <if test="tableComment != null and tableComment != ''">
<if test="tableComment != null and tableComment != ''"> AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
AND lower(table_comment) like lower(concat('%', #{tableComment}, '%')) </if>
</if> <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 --> AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d') </if>
</if> <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 --> AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d') </if>
</if>
order by create_time desc order by create_time desc
</select> </select>
<select id="selectDbTableListByNames" resultMap="GenTableResult"> <select id="selectDbTableListByNames" resultMap="GenTableResult">
select table_name, table_schema db_name, table_comment, create_time, update_time from information_schema.tables 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_%' where table_name NOT LIKE 'qrtz_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
and <include refid="select_dbName"/> and table_name in
and table_name in <foreach collection="array" item="name" open="(" separator="," close=")">
<foreach collection="tableNames" item="name" open="(" separator="," close=")"> #{name}
#{name}
</foreach> </foreach>
</select> </select>
<select id="selectTableByName" parameterType="String" resultMap="GenTableResult"> <select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
select table_name, table_comment, create_time, update_time from information_schema.tables select table_name, table_comment, create_time, update_time
where table_comment <![CDATA[ <> ]]> '' and table_schema = (select database()) from information_schema.tables
and table_name = #{tableName} where table_comment <![CDATA[ <> ]]> ''
</select> and table_schema = (select database())
and table_name = #{tableName}
</select>
<select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult"> <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, SELECT t.table_id,
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 t.table_name,
FROM gen_table t t.table_comment,
LEFT JOIN gen_table_column c ON t.table_id = c.table_id t.sub_table_name,
where t.table_id = #{id} order by c.sort t.sub_table_fk_name,
</select> 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 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, SELECT t.table_id,
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 t.table_name,
FROM gen_table t t.table_comment,
LEFT JOIN gen_table_column c ON t.table_id = c.table_id t.sub_table_name,
where t.table_name = #{tableName} order by c.sort t.sub_table_fk_name,
</select> 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 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, SELECT t.table_id,
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 t.table_name,
FROM gen_table t t.table_comment,
LEFT JOIN gen_table_column c ON t.table_id = c.table_id t.sub_table_name,
order by c.sort t.sub_table_fk_name,
</select> t.class_name,
<select id="selDbNameAll" resultType="java.lang.String"> t.tpl_category,
select table_schema from information_schema.tables t.package_name,
WHERE table_schema NOT IN ('information_schema', 'mysql', 'performance_schema', 'sys') t.module_name,
GROUP BY table_schema t.business_name,
</select> t.function_name,
<select id="selFilterableByDbNameAndTableName" resultType="java.lang.String"> 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>
</select> <insert id="insertGenTable" parameterType="com.muyu.gen.domain.GenTable" useGeneratedKeys="true" keyProperty="tableId">
<select id="selectDbTableListAll" resultType="com.muyu.gen.domain.GenTableResp">
select table_name,table_comment,table_schema db_name from information_schema.tables
where table_name NOT LIKE 'qrtz_%' and table_name NOT LIKE 'gen_%'
and table_schema in (select table_schema from information_schema.tables
WHERE table_schema NOT IN ('information_schema', 'mysql', 'performance_schema', 'sys')
GROUP BY table_schema)
</select>
<insert id="insertGenTable" parameterType="com.muyu.gen.domain.GenTable" useGeneratedKeys="true" keyProperty="tableId">
insert into gen_table ( insert into gen_table (
<if test="dbName != null">db_name,</if> <if test="tableName != null">table_name,</if>
<if test="tableName != null">table_name,</if> <if test="tableComment != null and tableComment != ''">table_comment,</if>
<if test="tableComment != null and tableComment != ''">table_comment,</if> <if test="className != null and className != ''">class_name,</if>
<if test="className != null and className != ''">class_name,</if> <if test="tplCategory != null and tplCategory != ''">tpl_category,</if>
<if test="tplCategory != null and tplCategory != ''">tpl_category,</if> <if test="packageName != null and packageName != ''">package_name,</if>
<if test="packageName != null and packageName != ''">package_name,</if> <if test="moduleName != null and moduleName != ''">module_name,</if>
<if test="moduleName != null and moduleName != ''">module_name,</if> <if test="businessName != null and businessName != ''">business_name,</if>
<if test="businessName != null and businessName != ''">business_name,</if> <if test="functionName != null and functionName != ''">function_name,</if>
<if test="functionName != null and functionName != ''">function_name,</if> <if test="functionAuthor != null and functionAuthor != ''">function_author,</if>
<if test="functionAuthor != null and functionAuthor != ''">function_author,</if> <if test="genType != null and genType != ''">gen_type,</if>
<if test="genType != null and genType != ''">gen_type,</if> <if test="genPath != null and genPath != ''">gen_path,</if>
<if test="genPath != null and genPath != ''">gen_path,</if> <if test="remark != null and remark != ''">remark,</if>
<if test="remark != null and remark != ''">remark,</if> <if test="createBy != null and createBy != ''">create_by,</if>
<if test="createBy != null and createBy != ''">create_by,</if> create_time
create_time )values(
)values( <if test="tableName != null">#{tableName},</if>
<if test="dbName != null">#{dbName},</if> <if test="tableComment != null and tableComment != ''">#{tableComment},</if>
<if test="tableName != null">#{tableName},</if> <if test="className != null and className != ''">#{className},</if>
<if test="tableComment != null and tableComment != ''">#{tableComment},</if> <if test="tplCategory != null and tplCategory != ''">#{tplCategory},</if>
<if test="className != null and className != ''">#{className},</if> <if test="packageName != null and packageName != ''">#{packageName},</if>
<if test="tplCategory != null and tplCategory != ''">#{tplCategory},</if> <if test="moduleName != null and moduleName != ''">#{moduleName},</if>
<if test="packageName != null and packageName != ''">#{packageName},</if> <if test="businessName != null and businessName != ''">#{businessName},</if>
<if test="moduleName != null and moduleName != ''">#{moduleName},</if> <if test="functionName != null and functionName != ''">#{functionName},</if>
<if test="businessName != null and businessName != ''">#{businessName},</if> <if test="functionAuthor != null and functionAuthor != ''">#{functionAuthor},</if>
<if test="functionName != null and functionName != ''">#{functionName},</if> <if test="genType != null and genType != ''">#{genType},</if>
<if test="functionAuthor != null and functionAuthor != ''">#{functionAuthor},</if> <if test="genPath != null and genPath != ''">#{genPath},</if>
<if test="genType != null and genType != ''">#{genType},</if> <if test="remark != null and remark != ''">#{remark},</if>
<if test="genPath != null and genPath != ''">#{genPath},</if> <if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="remark != null and remark != ''">#{remark},</if> sysdate()
<if test="createBy != null and createBy != ''">#{createBy},</if> )
sysdate()
)
</insert> </insert>
<update id="updateGenTable" parameterType="com.muyu.gen.domain.GenTable"> <update id="updateGenTable" parameterType="com.muyu.gen.domain.GenTable">
update gen_table update gen_table
<set> <set>
<if test="dbName != null">db_name = #{dbName},</if>
<if test="tableName != null">table_name = #{tableName},</if> <if test="tableName != null">table_name = #{tableName},</if>
<if test="tableComment != null and tableComment != ''">table_comment = #{tableComment},</if> <if test="tableComment != null and tableComment != ''">table_comment = #{tableComment},</if>
<if test="subTableName != null">sub_table_name = #{subTableName},</if> <if test="subTableName != null">sub_table_name = #{subTableName},</if>
@ -211,7 +294,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="functionAuthor != null and functionAuthor != ''">function_author = #{functionAuthor},</if> <if test="functionAuthor != null and functionAuthor != ''">function_author = #{functionAuthor},</if>
<if test="genType != null and genType != ''">gen_type = #{genType},</if> <if test="genType != null and genType != ''">gen_type = #{genType},</if>
<if test="genPath != null and genPath != ''">gen_path = #{genPath},</if> <if test="genPath != null and genPath != ''">gen_path = #{genPath},</if>
<if test="tplCategory != null and tplCategory != ''">tpl_category = #{tplCategory},</if> <if test="packageName != null and packageName != ''">package_name = #{packageName},</if> <if test="tplCategory != null and tplCategory != ''">tpl_category = #{tplCategory},</if>
<if test="packageName != null and packageName != ''">package_name = #{packageName},</if>
<if test="moduleName != null and moduleName != ''">module_name = #{moduleName},</if> <if test="moduleName != null and moduleName != ''">module_name = #{moduleName},</if>
<if test="businessName != null and businessName != ''">business_name = #{businessName},</if> <if test="businessName != null and businessName != ''">business_name = #{businessName},</if>
<if test="functionName != null and functionName != ''">function_name = #{functionName},</if> <if test="functionName != null and functionName != ''">function_name = #{functionName},</if>
@ -224,11 +308,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update> </update>
<delete id="deleteGenTableByIds" parameterType="Long"> <delete id="deleteGenTableByIds" parameterType="Long">
delete from gen_table where table_id in ( delete from gen_table where table_id in
<foreach collection="ids" item="tableId" separator="," > <foreach collection="array" item="tableId" open="(" separator="," close=")">
#{tableId} #{tableId}
</foreach> </foreach>
)
</delete> </delete>
</mapper> </mapper>

43
cloud-server/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/controller.java.vm
View File

@ -1,9 +1,9 @@
package ${packageName}.controller; package ${packageName}.controller;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.io.IOException;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import javax.annotation.Resource; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.PutMapping;
@ -12,14 +12,14 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;
import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.annotation.RequiresPermissions;
import ${packageName}.domain.${ClassName}; import ${packageName}.domain.${ClassName};
import ${packageName}.service.I${ClassName}Service; import ${packageName}.service.I${ClassName}Service;
import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.domain.Result; import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.utils.poi.ExcelUtil;
import com.muyu.common.security.utils.SecurityUtils;
import org.springframework.validation.annotation.Validated;
#if($table.crud || $table.sub) #if($table.crud || $table.sub)
import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.core.web.page.TableDataInfo;
#elseif($table.tree) #elseif($table.tree)
@ -35,7 +35,7 @@ import com.muyu.common.core.web.page.TableDataInfo;
@RequestMapping("/${businessName}") @RequestMapping("/${businessName}")
public class ${ClassName}Controller extends BaseController public class ${ClassName}Controller extends BaseController
{ {
@Resource @Autowired
private I${ClassName}Service ${className}Service; private I${ClassName}Service ${className}Service;
/** /**
@ -44,14 +44,14 @@ public class ${ClassName}Controller extends BaseController
@RequiresPermissions("${permissionPrefix}:list") @RequiresPermissions("${permissionPrefix}:list")
@GetMapping("/list") @GetMapping("/list")
#if($table.crud || $table.sub) #if($table.crud || $table.sub)
public Result<TableDataInfo<${ClassName}>> list(${ClassName} ${className}) public Result<TableDataInfo> list(${ClassName} ${className})
{ {
startPage(); startPage();
List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
return getDataTable(list); return getDataTable(list);
} }
#elseif($table.tree) #elseif($table.tree)
public Result<${ClassName}> list(${ClassName} ${className}) public Result list(${ClassName} ${className})
{ {
List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
return success(list); return success(list);
@ -62,6 +62,7 @@ public class ${ClassName}Controller extends BaseController
* 导出${functionName}列表 * 导出${functionName}列表
*/ */
@RequiresPermissions("${permissionPrefix}:export") @RequiresPermissions("${permissionPrefix}:export")
@Log(title = "${functionName}", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, ${ClassName} ${className}) public void export(HttpServletResponse response, ${ClassName} ${className})
{ {
@ -75,7 +76,7 @@ public class ${ClassName}Controller extends BaseController
*/ */
@RequiresPermissions("${permissionPrefix}:query") @RequiresPermissions("${permissionPrefix}:query")
@GetMapping(value = "/{${pkColumn.javaField}}") @GetMapping(value = "/{${pkColumn.javaField}}")
public Result<List<${ClassName}>> getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) public Result getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
{ {
return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField})); return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
} }
@ -84,40 +85,32 @@ public class ${ClassName}Controller extends BaseController
* 新增${functionName} * 新增${functionName}
*/ */
@RequiresPermissions("${permissionPrefix}:add") @RequiresPermissions("${permissionPrefix}:add")
@Log(title = "${functionName}", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public Result<Integer> add( public Result add(@RequestBody ${ClassName} ${className})
@Validated @RequestBody ${ClassName} ${className})
{ {
if (${className}Service.checkIdUnique(${className})) { return toAjax(${className}Service.insert${ClassName}(${className}));
return error("新增 ${functionName} '" + ${className} + "'失败，${functionName}已存在");
}
${className}.setCreateBy(SecurityUtils.getUsername());
return toAjax(${className}Service.save(${className}));
} }
/** /**
* 修改${functionName} * 修改${functionName}
*/ */
@RequiresPermissions("${permissionPrefix}:edit") @RequiresPermissions("${permissionPrefix}:edit")
@Log(title = "${functionName}", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public Result<Integer> edit( public Result edit(@RequestBody ${ClassName} ${className})
@Validated @RequestBody ${ClassName} ${className})
{ {
if (!${className}Service.checkIdUnique(${className})) { return toAjax(${className}Service.update${ClassName}(${className}));
return error("修改 ${functionName} '" + ${className} + "'失败，${functionName}不存在");
}
${className}.setUpdateBy(SecurityUtils.getUsername());
return toAjax(${className}Service.updateById(${className}));
} }
/** /**
* 删除${functionName} * 删除${functionName}
*/ */
@RequiresPermissions("${permissionPrefix}:remove") @RequiresPermissions("${permissionPrefix}:remove")
@Log(title = "${functionName}", businessType = BusinessType.DELETE)
@DeleteMapping("/{${pkColumn.javaField}s}") @DeleteMapping("/{${pkColumn.javaField}s}")
public Result<Integer> remove(@PathVariable("${pkColumn.javaField}s") ${pkColumn.javaType}[] ${pkColumn.javaField}s) public Result remove(@PathVariable("${pkColumn.javaField}s") ${pkColumn.javaType}[] ${pkColumn.javaField}s)
{ {
${className}Service.removeBatchByIds(Arrays.asList(${pkColumn.javaField}s)); return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s));
return success();
} }
} }

40
cloud-server/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/domain.java.vm
View File

@ -9,13 +9,6 @@ import com.muyu.common.core.web.domain.BaseEntity;
#elseif($table.tree) #elseif($table.tree)
import com.muyu.common.core.web.domain.TreeEntity; import com.muyu.common.core.web.domain.TreeEntity;
#end #end
import lombok.*;
import lombok.experimental.SuperBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
/** /**
* ${functionName}对象 ${tableName} * ${functionName}对象 ${tableName}
@ -23,20 +16,13 @@ import com.baomidou.mybatisplus.annotation.IdType;
* @author ${author} * @author ${author}
* @date ${datetime} * @date ${datetime}
*/ */
#if($table.crud || $table.sub) #if($table.crud || $table.sub)
#set($Entity="BaseEntity") #set($Entity="BaseEntity")
#elseif($table.tree) #elseif($table.tree)
#set($Entity="TreeEntity") #set($Entity="TreeEntity")
#end #end
@Data public class ${ClassName} extends ${Entity}
@Setter {
@Getter
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@TableName("${tableName}")
public class ${ClassName} extends ${Entity}{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
#foreach ($column in $columns) #foreach ($column in $columns)
@ -58,19 +44,33 @@ public class ${ClassName} extends ${Entity}{
@Excel(name = "${comment}") @Excel(name = "${comment}")
#end #end
#end #end
#if($column.javaField == $pkColumn.javaField)
@TableId( type = IdType.AUTO)
#end
private $column.javaType $column.javaField; private $column.javaType $column.javaField;
#end #end
#end #end
#if($table.sub) #if($table.sub)
/** $table.subTable.functionName信息 */ /** $table.subTable.functionName信息 */
private List<${subClassName}> ${subclassName}List; private List<${subClassName}> ${subclassName}List;
#end #end
#foreach ($column in $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
#if($table.sub) #if($table.sub)
public List<${subClassName}> get${subClassName}List() public List<${subClassName}> get${subClassName}List()

81
cloud-server/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/mapper.java.vm
View File

@ -5,16 +5,87 @@ import ${packageName}.domain.${ClassName};
#if($table.sub) #if($table.sub)
import ${packageName}.domain.${subClassName}; import ${packageName}.domain.${subClassName};
#end #end
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/** /**
* ${functionName}Mapper接口 * ${functionName}Mapper接口
* *
* @author ${author} * @author ${author}
* @date ${datetime} * @date ${datetime}
*/ */
@Mapper public interface ${ClassName}Mapper
public interface ${ClassName}Mapper extends BaseMapper<${ClassName}>{ {
/**
* 查询${functionName}
*
* @param ${pkColumn.javaField} ${functionName}主键
* @return ${functionName}
*/
public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
/**
* 查询${functionName}列表
*
* @param ${className} ${functionName}
* @return ${functionName}集合
*/
public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
/**
* 新增${functionName}
*
* @param ${className} ${functionName}
* @return 结果
*/
public int insert${ClassName}(${ClassName} ${className});
/**
* 修改${functionName}
*
* @param ${className} ${functionName}
* @return 结果
*/
public int update${ClassName}(${ClassName} ${className});
/**
* 删除${functionName}
*
* @param ${pkColumn.javaField} ${functionName}主键
* @return 结果
*/
public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
/**
* 批量删除${functionName}
*
* @param ${pkColumn.javaField}s 需要删除的数据主键集合
* @return 结果
*/
public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
#if($table.sub)
/**
* 批量删除${subTable.functionName}
*
* @param ${pkColumn.javaField}s 需要删除的数据主键集合
* @return 结果
*/
public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
/**
* 批量新增${subTable.functionName}
*
* @param ${subclassName}List ${subTable.functionName}列表
* @return 结果
*/
public int batch${subClassName}(List<${subClassName}> ${subclassName}List);
/**
* 通过${functionName}主键删除${subTable.functionName}信息
*
* @param ${pkColumn.javaField} ${functionName}ID
* @return 结果
*/
public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField});
#end
} }

40
cloud-server/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/service.java.vm
View File

@ -2,18 +2,18 @@ package ${packageName}.service;
import java.util.List; import java.util.List;
import ${packageName}.domain.${ClassName}; import ${packageName}.domain.${ClassName};
import com.baomidou.mybatisplus.extension.service.IService;
/** /**
* ${functionName}Service接口 * ${functionName}Service接口
* *
* @author ${author} * @author ${author}
* @date ${datetime} * @date ${datetime}
*/ */
public interface I${ClassName}Service extends IService<${ClassName}> { public interface I${ClassName}Service
{
/** /**
* 精确查询${functionName} * 查询${functionName}
* *
* @param ${pkColumn.javaField} ${functionName}主键 * @param ${pkColumn.javaField} ${functionName}主键
* @return ${functionName} * @return ${functionName}
*/ */
@ -21,17 +21,41 @@ public interface I${ClassName}Service extends IService<${ClassName}> {
/** /**
* 查询${functionName}列表 * 查询${functionName}列表
* *
* @param ${className} ${functionName} * @param ${className} ${functionName}
* @return ${functionName}集合 * @return ${functionName}集合
*/ */
public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
/** /**
* 判断 ${functionName} id是否唯一 * 新增${functionName}
*
* @param ${className} ${functionName} * @param ${className} ${functionName}
* @return 结果 * @return 结果
*/ */
Boolean checkIdUnique(${ClassName} ${className}); public int insert${ClassName}(${ClassName} ${className});
/**
* 修改${functionName}
*
* @param ${className} ${functionName}
* @return 结果
*/
public int update${ClassName}(${ClassName} ${className});
/**
* 批量删除${functionName}
*
* @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合
* @return 结果
*/
public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
/**
* 删除${functionName}信息
*
* @param ${pkColumn.javaField} ${functionName}主键
* @return 结果
*/
public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
} }

176
cloud-server/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/serviceImpl.java.vm
View File

@ -7,6 +7,7 @@ import com.muyu.common.core.utils.DateUtils;
#break #break
#end #end
#end #end
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
#if($table.sub) #if($table.sub)
import java.util.ArrayList; import java.util.ArrayList;
@ -17,10 +18,6 @@ import ${packageName}.domain.${subClassName};
import ${packageName}.mapper.${ClassName}Mapper; import ${packageName}.mapper.${ClassName}Mapper;
import ${packageName}.domain.${ClassName}; import ${packageName}.domain.${ClassName};
import ${packageName}.service.I${ClassName}Service; import ${packageName}.service.I${ClassName}Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.common.core.utils.StringUtils;
import org.springframework.util.Assert;
/** /**
* ${functionName}Service业务层处理 * ${functionName}Service业务层处理
@ -29,12 +26,13 @@ import org.springframework.util.Assert;
* @date ${datetime} * @date ${datetime}
*/ */
@Service @Service
public class ${ClassName}ServiceImpl public class ${ClassName}ServiceImpl implements I${ClassName}Service
extends ServiceImpl<${ClassName}Mapper, ${ClassName}> {
implements I${ClassName}Service { @Autowired
private ${ClassName}Mapper ${className}Mapper;
/** /**
* 精确查询${functionName} * 查询${functionName}
* *
* @param ${pkColumn.javaField} ${functionName}主键 * @param ${pkColumn.javaField} ${functionName}主键
* @return ${functionName} * @return ${functionName}
@ -42,13 +40,9 @@ public class ${ClassName}ServiceImpl
@Override @Override
public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
{ {
LambdaQueryWrapper<${ClassName}> queryWrapper = new LambdaQueryWrapper<>(); return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
Assert.notNull(${pkColumn.javaField}, "${pkColumn.javaField}不可为空");
queryWrapper.eq(${ClassName}::get${pkColumn.capJavaField}, ${pkColumn.javaField});
return this.getOne(queryWrapper);
} }
/** /**
* 查询${functionName}列表 * 查询${functionName}列表
* *
@ -58,58 +52,118 @@ public class ${ClassName}ServiceImpl
@Override @Override
public List<${ClassName}> select${ClassName}List(${ClassName} ${className}) public List<${ClassName}> select${ClassName}List(${ClassName} ${className})
{ {
LambdaQueryWrapper<${ClassName}> queryWrapper = new LambdaQueryWrapper<>(); return ${className}Mapper.select${ClassName}List(${className});
#foreach($column in $columns)
#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)})
#if($column.query)
#if($column.queryType == "EQ")
if (StringUtils.isNotEmpty(${className}.get${AttrName}())){
queryWrapper.eq(${ClassName}::get${AttrName}, ${className}.get${AttrName}());
}
#elseif($queryType == "NE")
if (StringUtils.isNotEmpty(${className}.get${AttrName}())){
queryWrapper.ne(${ClassName}::get${AttrName}, ${className}.get${AttrName}());
}
#elseif($queryType == "GT")
if (StringUtils.isNotEmpty(${className}.get${AttrName}())){
queryWrapper.gt(${ClassName}::get${AttrName}, ${className}.get${AttrName}());
}
#elseif($queryType == "GTE")
if (StringUtils.isNotEmpty(${className}.get${AttrName}())){
queryWrapper.ge(${ClassName}::get${AttrName}, ${className}.get${AttrName}());
}
#elseif($queryType == "LT")
if (StringUtils.isNotEmpty(${className}.get${AttrName}())){
queryWrapper.lt(${ClassName}::get${AttrName}, ${className}.get${AttrName}());
}
#elseif($queryType == "LTE")
if (StringUtils.isNotEmpty(${className}.get${AttrName}())){
queryWrapper.le(${ClassName}::get${AttrName}, ${className}.get${AttrName}());
}
#elseif($queryType == "LIKE")
if (StringUtils.isNotEmpty(${className}.get${AttrName}())){
queryWrapper.like(${ClassName}::get${AttrName}, ${className}.get${AttrName}());
}
#end
#end
#end
return this.list(queryWrapper);
} }
/** /**
* 唯一 判断 * 新增${functionName}
* @param ${className} ${functionName} *
* @return ${functionName} * @param ${className} ${functionName}
*/ * @return 结果
*/
#if($table.sub)
@Transactional
#end
@Override @Override
public Boolean checkIdUnique(${ClassName} ${className}) { public int insert${ClassName}(${ClassName} ${className})
LambdaQueryWrapper<${ClassName}> queryWrapper = new LambdaQueryWrapper<>(); {
queryWrapper.eq(${ClassName}::get${pkColumn.capJavaField}, ${className}.get${pkColumn.capJavaField}()); #foreach ($column in $columns)
return this.count(queryWrapper) > 0; #if($column.javaField == 'createTime')
${className}.setCreateTime(DateUtils.getNowDate());
#end
#end
#if($table.sub)
int rows = ${className}Mapper.insert${ClassName}(${className});
insert${subClassName}(${className});
return rows;
#else
return ${className}Mapper.insert${ClassName}(${className});
#end
} }
/**
* 修改${functionName}
*
* @param ${className} ${functionName}
* @return 结果
*/
#if($table.sub)
@Transactional
#end
@Override
public int update${ClassName}(${ClassName} ${className})
{
#foreach ($column in $columns)
#if($column.javaField == 'updateTime')
${className}.setUpdateTime(DateUtils.getNowDate());
#end
#end
#if($table.sub)
${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}());
insert${subClassName}(${className});
#end
return ${className}Mapper.update${ClassName}(${className});
}
/**
* 批量删除${functionName}
*
* @param ${pkColumn.javaField}s 需要删除的${functionName}主键
* @return 结果
*/
#if($table.sub)
@Transactional
#end
@Override
public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s)
{
#if($table.sub)
${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
#end
return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s);
}
/**
* 删除${functionName}信息
*
* @param ${pkColumn.javaField} ${functionName}主键
* @return 结果
*/
#if($table.sub)
@Transactional
#end
@Override
public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
{
#if($table.sub)
${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
#end
return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
}
#if($table.sub)
/**
* 新增${subTable.functionName}信息
*
* @param ${className} ${functionName}对象
*/
public void insert${subClassName}(${ClassName} ${className})
{
List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List();
${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
if (StringUtils.isNotNull(${subclassName}List))
{
List<${subClassName}> list = new ArrayList<${subClassName}>();
for (${subClassName} ${subclassName} : ${subclassName}List)
{
${subclassName}.set${subTableFkClassName}(${pkColumn.javaField});
list.add(${subclassName});
}
if (list.size() > 0)
{
${className}Mapper.batch${subClassName}(list);
}
}
}
#end
} }

3
cloud-server/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/sub-domain.java.vm
View File

@ -17,7 +17,8 @@ import com.muyu.common.core.web.domain.BaseEntity;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class ${subClassName} extends BaseEntity { public class ${subClassName} extends BaseEntity
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
#foreach ($column in $subTable.columns) #foreach ($column in $subTable.columns)

8
cloud-server/cloud-modules/cloud-modules-gen/src/main/resources/vm/vue/index.vue.vm
View File

@ -170,7 +170,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
@ -353,7 +353,7 @@
</template> </template>
<script> <script>
import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "/src/api/${moduleName}/${businessName}"; import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
export default { export default {
name: "${BusinessName}", name: "${BusinessName}",
@ -448,8 +448,8 @@ export default {
#end #end
#end #end
list${BusinessName}(this.queryParams).then(response => { list${BusinessName}(this.queryParams).then(response => {
this.${businessName}List = response.data.rows; this.${businessName}List = response.rows;
this.total = response.data.total; this.total = response.total;
this.loading = false; this.loading = false;
}); });
}, },

4
cloud-server/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml
View File

@ -4,10 +4,10 @@ server:
# nacos线上地址 # nacos线上地址
nacos: nacos:
addr: 47.116.173.119:8848 addr: 110.42.213.184:8848
user-name: nacos user-name: nacos
password: nacos password: nacos
namespace: one namespace: public
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring # Spring
spring: spring:

4
cloud-server/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml
View File

@ -4,10 +4,10 @@ server:
# nacos线上地址 # nacos线上地址
nacos: nacos:
addr: 47.116.173.119:8848 addr: 110.42.213.184:8848
user-name: nacos user-name: nacos
password: nacos password: nacos
namespace: one namespace: public
# Spring # Spring
spring: spring: