no message
parent
a55367271f
commit
010f5c0e6e
|
|
@ -11,7 +11,7 @@ import java.io.Serializable;
|
||||||
/**
|
/**
|
||||||
* 接口返回数据格式
|
* 接口返回数据格式
|
||||||
* @author scott
|
* @author scott
|
||||||
* @email jeecgos@163.com
|
* @email cpteos@163.com
|
||||||
* @date 2019年1月19日
|
* @date 2019年1月19日
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ import java.util.Date;
|
||||||
* 系统日志,切面处理类
|
* 系统日志,切面处理类
|
||||||
*
|
*
|
||||||
* @Author scott
|
* @Author scott
|
||||||
* @email jeecgos@163.com
|
* @email cpteos@163.com
|
||||||
* @Date 2018年1月14日
|
* @Date 2018年1月14日
|
||||||
*/
|
*/
|
||||||
@Aspect
|
@Aspect
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ import java.lang.annotation.*;
|
||||||
* 通过此注解声明的接口,自动实现字典翻译
|
* 通过此注解声明的接口,自动实现字典翻译
|
||||||
*
|
*
|
||||||
* @Author scott
|
* @Author scott
|
||||||
* @email jeecgos@163.com
|
* @email cpteos@163.com
|
||||||
* @Date 2022年01月05日
|
* @Date 2022年01月05日
|
||||||
*/
|
*/
|
||||||
@Target(ElementType.METHOD)
|
@Target(ElementType.METHOD)
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ import java.lang.annotation.*;
|
||||||
* 系统日志注解
|
* 系统日志注解
|
||||||
*
|
*
|
||||||
* @Author scott
|
* @Author scott
|
||||||
* @email jeecgos@163.com
|
* @email cpteos@163.com
|
||||||
* @Date 2019年1月14日
|
* @Date 2019年1月14日
|
||||||
*/
|
*/
|
||||||
@Target(ElementType.METHOD)
|
@Target(ElementType.METHOD)
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ import java.util.regex.Pattern;
|
||||||
* IP地址
|
* IP地址
|
||||||
*
|
*
|
||||||
* @Author scott
|
* @Author scott
|
||||||
* @email jeecgos@163.com
|
* @email cpteos@163.com
|
||||||
* @Date 2019年01月14日
|
* @Date 2019年01月14日
|
||||||
*/
|
*/
|
||||||
public class IpUtils {
|
public class IpUtils {
|
||||||
|
|
|
||||||
|
|
@ -116,9 +116,9 @@ public class Swagger3Config implements WebMvcConfigurer {
|
||||||
public OpenAPI customOpenAPI() {
|
public OpenAPI customOpenAPI() {
|
||||||
return new OpenAPI()
|
return new OpenAPI()
|
||||||
.info(new Info()
|
.info(new Info()
|
||||||
.title("JeecgBoot 后台服务API接口文档")
|
.title("Cpte Cloud 后台服务API接口文档")
|
||||||
.version("3.8.3")
|
.version("3.8.3")
|
||||||
.contact(new Contact().name("北京国炬信息技术有限公司").url("www.jeccg.com").email("jeecgos@163.com"))
|
.contact(new Contact().name("中邮科技股份有限公司").url("www.cpte.com").email("cpteos@163.com"))
|
||||||
.description("后台API接口")
|
.description("后台API接口")
|
||||||
.termsOfService("NO terms of service")
|
.termsOfService("NO terms of service")
|
||||||
.license(new License().name("Apache 2.0").url("http://www.apache.org/licenses/LICENSE-2.0.html")))
|
.license(new License().name("Apache 2.0").url("http://www.apache.org/licenses/LICENSE-2.0.html")))
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
/**
|
/**
|
||||||
* @Description: 库区
|
* @Description: 库区
|
||||||
* @author: cpte
|
* @author: cpte
|
||||||
* @Date: 2025-10-27
|
* @Date: 2025-10-29
|
||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
@Tag(name="库区")
|
@Tag(name="库区")
|
||||||
|
|
@ -68,12 +68,11 @@ public class AreaController extends JeecgController<Area, IAreaService> {
|
||||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
|
|
||||||
|
|
||||||
// 自定义查询规则
|
// 自定义查询规则
|
||||||
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
|
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
|
||||||
// 自定义多选的查询规则为:LIKE_WITH_OR
|
// 自定义多选的查询规则为:LIKE_WITH_OR
|
||||||
customeRuleMap.put("delFlag", QueryRuleEnum.LIKE_WITH_OR);
|
customeRuleMap.put("areaCode", QueryRuleEnum.RIGHT_LIKE);
|
||||||
|
customeRuleMap.put("areaName", QueryRuleEnum.RIGHT_LIKE);
|
||||||
QueryWrapper<Area> queryWrapper = QueryGenerator.initQueryWrapper(area, req.getParameterMap(),customeRuleMap);
|
QueryWrapper<Area> queryWrapper = QueryGenerator.initQueryWrapper(area, req.getParameterMap(),customeRuleMap);
|
||||||
Page<Area> page = new Page<Area>(pageNo, pageSize);
|
Page<Area> page = new Page<Area>(pageNo, pageSize);
|
||||||
IPage<Area> pageList = areaService.page(page, queryWrapper);
|
IPage<Area> pageList = areaService.page(page, queryWrapper);
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ import lombok.experimental.Accessors;
|
||||||
/**
|
/**
|
||||||
* @Description: 库区
|
* @Description: 库区
|
||||||
* @author: cpte
|
* @author: cpte
|
||||||
* @Date: 2025-10-27
|
* @Date: 2025-10-29
|
||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
|
|
@ -65,9 +65,8 @@ public class Area implements Serializable {
|
||||||
@Schema(description = "创建人")
|
@Schema(description = "创建人")
|
||||||
private java.lang.String createBy;
|
private java.lang.String createBy;
|
||||||
/**创建日期*/
|
/**创建日期*/
|
||||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Schema(description = "创建日期")
|
|
||||||
private java.util.Date createTime;
|
private java.util.Date createTime;
|
||||||
/**更新人*/
|
/**更新人*/
|
||||||
@Schema(description = "更新人")
|
@Schema(description = "更新人")
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
/**
|
/**
|
||||||
* @Description: 库区
|
* @Description: 库区
|
||||||
* @author: cpte
|
* @author: cpte
|
||||||
* @Date: 2025-10-27
|
* @Date: 2025-10-29
|
||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
public interface AreaMapper extends BaseMapper<Area> {
|
public interface AreaMapper extends BaseMapper<Area> {
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
/**
|
/**
|
||||||
* @Description: 库区
|
* @Description: 库区
|
||||||
* @author: cpte
|
* @author: cpte
|
||||||
* @Date: 2025-10-27
|
* @Date: 2025-10-29
|
||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
public interface IAreaService extends IService<Area> {
|
public interface IAreaService extends IService<Area> {
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
/**
|
/**
|
||||||
* @Description: 库区
|
* @Description: 库区
|
||||||
* @author: cpte
|
* @author: cpte
|
||||||
* @Date: 2025-10-27
|
* @Date: 2025-10-29
|
||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ spring:
|
||||||
# lazy-initialization: true
|
# lazy-initialization: true
|
||||||
flyway:
|
flyway:
|
||||||
# 是否启用flyway
|
# 是否启用flyway
|
||||||
enabled: true
|
enabled: false
|
||||||
# 是否关闭要清除已有库下的表功能,生产环境必须为true,否则会删库,非常重要!!!
|
# 是否关闭要清除已有库下的表功能,生产环境必须为true,否则会删库,非常重要!!!
|
||||||
clean-disabled: true
|
clean-disabled: true
|
||||||
servlet:
|
servlet:
|
||||||
|
|
@ -194,7 +194,7 @@ jeecg:
|
||||||
# AIRag向量库
|
# AIRag向量库
|
||||||
ai-rag:
|
ai-rag:
|
||||||
embed-store:
|
embed-store:
|
||||||
host: 47.103.100.52
|
host: 127.0.0.1
|
||||||
port: 5432
|
port: 5432
|
||||||
database: postgres
|
database: postgres
|
||||||
user: postgres
|
user: postgres
|
||||||
|
|
@ -214,7 +214,7 @@ jeecg:
|
||||||
uploadType: local
|
uploadType: local
|
||||||
# 前端访问地址
|
# 前端访问地址
|
||||||
domainUrl:
|
domainUrl:
|
||||||
pc: http://localhost:3100
|
pc: http://localhost:8080
|
||||||
app: http://localhost:8051
|
app: http://localhost:8051
|
||||||
path:
|
path:
|
||||||
#文件上传根目录 设置
|
#文件上传根目录 设置
|
||||||
|
|
|
||||||
|
|
@ -144,7 +144,7 @@ spring:
|
||||||
master:
|
master:
|
||||||
url: jdbc:mysql://127.0.0.1:3306/cpte-wms?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
|
url: jdbc:mysql://127.0.0.1:3306/cpte-wms?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
|
||||||
username: root
|
username: root
|
||||||
password: root
|
password: Youchain@56
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
# 多数据源配置
|
# 多数据源配置
|
||||||
#multi-datasource1:
|
#multi-datasource1:
|
||||||
|
|
@ -161,7 +161,7 @@ spring:
|
||||||
password:
|
password:
|
||||||
#mybatis plus 设置
|
#mybatis plus 设置
|
||||||
mybatis-plus:
|
mybatis-plus:
|
||||||
mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml
|
mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml,,classpath*:org/cpte/**/xml/*Mapper.xml
|
||||||
global-config:
|
global-config:
|
||||||
# 关闭MP3.0自带的banner
|
# 关闭MP3.0自带的banner
|
||||||
banner: false
|
banner: false
|
||||||
|
|
@ -209,7 +209,7 @@ jeecg:
|
||||||
uploadType: alioss
|
uploadType: alioss
|
||||||
# 前端访问地址
|
# 前端访问地址
|
||||||
domainUrl:
|
domainUrl:
|
||||||
pc: http://localhost:3100
|
pc: http://localhost:8080
|
||||||
app: http://localhost:8051
|
app: http://localhost:8051
|
||||||
path:
|
path:
|
||||||
#文件上传根目录 设置
|
#文件上传根目录 设置
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue