Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system
This commit is contained in:
commit
d00c1570b3
@ -15,6 +15,14 @@
|
||||
点亮业务基础库
|
||||
</description>
|
||||
<dependencies>
|
||||
|
||||
<!-- 百度富文本-->
|
||||
<dependency>
|
||||
<groupId>com.blingblingbang</groupId>
|
||||
<artifactId>ueditor</artifactId>
|
||||
<version>${ueditor.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.boot</groupId>
|
||||
<artifactId>yudao-module-system-biz</artifactId>
|
||||
|
@ -31,8 +31,13 @@ public class BannerAPI {
|
||||
* @date 11:07 2024/9/27
|
||||
* @param type type
|
||||
**/
|
||||
@GetMapping("/get")
|
||||
public CommonResult<?> getBannerByType(@RequestParam("type") String type) {
|
||||
return success(baseBannerService.getBannerByType(type));
|
||||
@GetMapping("/list")
|
||||
public CommonResult<?> getBannerByTypeList(@RequestParam("type") String type) {
|
||||
return success(baseBannerService.getBannerByTypeList(type));
|
||||
}
|
||||
|
||||
@GetMapping("/getById")
|
||||
public CommonResult<?> getBannerById(@RequestParam("id") String id) {
|
||||
return success(baseBannerService.getBannerById(id));
|
||||
}
|
||||
}
|
||||
|
@ -6,7 +6,9 @@ import cn.iocoder.yudao.framework.security.core.LoginUser;
|
||||
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
|
||||
import cn.iocoder.yudao.module.conf.entity.BaseType;
|
||||
import cn.iocoder.yudao.module.custom.entity.CustomerMain;
|
||||
import cn.iocoder.yudao.module.custom.service.CustomerActiveService;
|
||||
import cn.iocoder.yudao.module.custom.service.CustomerMainService;
|
||||
import cn.iocoder.yudao.module.custom.vo.CustomerActiveSaveReqVO;
|
||||
import cn.iocoder.yudao.module.custom.vo.CustomerMainRespVO;
|
||||
import cn.iocoder.yudao.module.member.entity.MemberLevel;
|
||||
import cn.iocoder.yudao.module.member.service.MemberLevelService;
|
||||
@ -15,10 +17,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
@ -39,6 +38,8 @@ public class CustomerMainApi {
|
||||
private CustomerMainService customerMainService;
|
||||
@Resource
|
||||
private MemberLevelService levelService;
|
||||
@Resource
|
||||
private CustomerActiveService activeService;
|
||||
|
||||
/**
|
||||
* 查询当前登录客户信息
|
||||
@ -70,4 +71,20 @@ public class CustomerMainApi {
|
||||
public CommonResult<?> getCustomerByCarId(@RequestParam("carId")String carId) {
|
||||
return success(customerMainService.getCustomerByCarId(carId));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 参加活动
|
||||
*
|
||||
* @param createReqVO CustomerActiveSaveReqVO
|
||||
* @return cn.iocoder.yudao.framework.common.pojo.CommonResult<java.lang.String>
|
||||
* @author PQZ
|
||||
* @date 9:49 2024/9/21
|
||||
**/
|
||||
@PostMapping("/attendActive")
|
||||
@Operation(summary = "参加活动")
|
||||
public CommonResult<Boolean> attendActive(@RequestBody CustomerActiveSaveReqVO createReqVO) {
|
||||
activeService.attendActive(createReqVO);
|
||||
return success(true);
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,90 @@
|
||||
package cn.iocoder.yudao.module.banner.controller.admin;
|
||||
|
||||
import cn.iocoder.yudao.module.infra.api.file.FileApi;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.baidu.ueditor.ActionEnter;
|
||||
import org.springframework.util.ClassUtils;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.IOException;
|
||||
import java.io.PrintWriter;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/ueditor")
|
||||
public class UeditorController {
|
||||
|
||||
@Resource
|
||||
private FileApi fileApi;
|
||||
|
||||
//配置ueditor后端上传接口的验证
|
||||
@RequestMapping("/config")
|
||||
public String config(HttpServletRequest request, HttpServletResponse response, String action, MultipartFile[] upfile) throws IOException {
|
||||
//获取配置文件json内容返回给前端
|
||||
if (action.equals("config")) {
|
||||
request.setCharacterEncoding("utf-8");
|
||||
response.setHeader("Content-Type", "text/html");
|
||||
//注意path不能含有中文路径,确认该path能指向config.json
|
||||
// String path = ClassUtils.getDefaultClassLoader().getResource("").getPath() + "config";
|
||||
String path = "E:/Workspace/Work/lanan/lanan-system/dl-module-base/target/classes/config/ueditor/config";
|
||||
System.out.println("path = " + path);
|
||||
PrintWriter printWriter = response.getWriter();
|
||||
printWriter.write(new ActionEnter(request, path).exec());
|
||||
printWriter.flush();
|
||||
printWriter.close();
|
||||
}
|
||||
//上传图片
|
||||
else if (action.equals("uploadimage")) {
|
||||
Map<String, Object> result = new HashMap<String, Object>();
|
||||
for (MultipartFile multipartFile : upfile) {
|
||||
//调用系统写好的文件上传方法,并返回给前端上传后的文件路径,组件需要拼接回显
|
||||
String upload = fileApi.createFile(multipartFile.getBytes());
|
||||
System.out.println("upload = " + upload);
|
||||
System.out.println("upload.sub= " + upload.substring(upload.lastIndexOf("/")));
|
||||
result.put("title", upload.substring(upload.lastIndexOf("/")+1));
|
||||
result.put("original", multipartFile.getOriginalFilename());
|
||||
result.put("state", "SUCCESS");
|
||||
result.put("url", upload);
|
||||
String jStr = JSON.toJSONString(result);
|
||||
return jStr;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
//上传视频
|
||||
else if(action.equals("uploadvideo")){
|
||||
Map<String, Object> result = new HashMap<String, Object>();
|
||||
for (MultipartFile multipartFile : upfile) {
|
||||
String upload = fileApi.createFile(multipartFile.getBytes());
|
||||
System.out.println("upload = " + upload);
|
||||
System.out.println("upload.sub = " + upload.substring(upload.lastIndexOf("/")));
|
||||
result.put("title", upload.substring(upload.lastIndexOf("/")+1));
|
||||
result.put("original", multipartFile.getOriginalFilename());
|
||||
result.put("state", "SUCCESS");
|
||||
result.put("url", upload);
|
||||
String jStr = JSON.toJSONString(result);
|
||||
return jStr;
|
||||
}
|
||||
}else{
|
||||
Map<String, Object> result = new HashMap<String, Object>();
|
||||
for (MultipartFile multipartFile : upfile) {
|
||||
String upload = fileApi.createFile(multipartFile.getBytes());
|
||||
System.out.println("upload = " + upload);
|
||||
System.out.println("upload.sub= " + upload.substring(upload.lastIndexOf("/")));
|
||||
result.put("title", upload.substring(upload.lastIndexOf("/")+1));
|
||||
result.put("original", multipartFile.getOriginalFilename());
|
||||
result.put("state", "SUCCESS");
|
||||
result.put("url", upload);
|
||||
String jStr = JSON.toJSONString(result);
|
||||
return jStr;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
@ -45,4 +45,7 @@ public class DlBaseBanner extends TenantBaseDO {
|
||||
|
||||
/** 跳转链接 */
|
||||
private String toUrl;
|
||||
|
||||
/** 页面内容 */
|
||||
private String content;
|
||||
}
|
@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 针对表【dl_base_banner(banner图基础库)】的数据库操作Mapper
|
||||
*
|
||||
@ -25,6 +27,15 @@ public interface DlBaseBannerMapper extends BaseMapper<DlBaseBanner> {
|
||||
* @param bannerReqVO 查询对象
|
||||
**/
|
||||
IPage<DlBaseBanner> queryByPage(@Param("map") DlBannerReqVO bannerReqVO, Page<DlBaseBanner> page);
|
||||
|
||||
/**
|
||||
* 不同小程序用不同的banner,用type分
|
||||
*
|
||||
* @param type type
|
||||
* @author 小李
|
||||
* @date 11:07 2024/9/27
|
||||
**/
|
||||
List<DlBaseBanner> getBannerByTypeList(@Param("type") String type);
|
||||
}
|
||||
|
||||
|
||||
|
@ -59,5 +59,5 @@ public interface DlBaseBannerService extends IService<DlBaseBanner> {
|
||||
* @date 11:07 2024/9/27
|
||||
* @param type type
|
||||
**/
|
||||
List<DlBaseBanner> getBannerByType(String type);
|
||||
List<DlBaseBanner> getBannerByTypeList(String type);
|
||||
}
|
||||
|
@ -80,9 +80,8 @@ public class DlBaseBannerServiceImpl extends ServiceImpl<DlBaseBannerMapper, DlB
|
||||
* @date 11:07 2024/9/27
|
||||
**/
|
||||
@Override
|
||||
public List<DlBaseBanner> getBannerByType(String type) {
|
||||
List<DlBaseBanner> dlBaseBanners = baseMapper.selectList(new LambdaQueryWrapper<DlBaseBanner>().eq(DlBaseBanner::getTypeId, type));
|
||||
return dlBaseBanners.stream().sorted(Comparator.comparing(DlBaseBanner::getSort)).collect(Collectors.toList());
|
||||
public List<DlBaseBanner> getBannerByTypeList(String type) {
|
||||
return baseMapper.getBannerByTypeList(type);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.custom.vo.CustomerActivePageReqVO;
|
||||
import cn.iocoder.yudao.module.custom.vo.CustomerActiveSaveReqVO;
|
||||
import cn.iocoder.yudao.module.member.vo.ActiveMainPageReqVO;
|
||||
import cn.iocoder.yudao.module.member.vo.ActiveMainRespVO;
|
||||
import cn.iocoder.yudao.module.order.entity.RepairOrderInfo;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
import javax.validation.Valid;
|
||||
@ -26,9 +27,17 @@ public interface CustomerActiveService extends IService<CustomerActive> {
|
||||
* @author PQZ
|
||||
* @date 9:57 2024/9/21
|
||||
**/
|
||||
void attendActive(CustomerActiveSaveReqVO saveReqVO);
|
||||
RepairOrderInfo attendActive(CustomerActiveSaveReqVO saveReqVO);
|
||||
|
||||
|
||||
/**
|
||||
* 用户参与活动
|
||||
* @author PQZ
|
||||
* @date 10:18 2024/9/27
|
||||
* @param saveReqVO CustomerActiveSaveReqVO实体
|
||||
**/
|
||||
void cusAttendActive(CustomerActiveSaveReqVO saveReqVO);
|
||||
|
||||
|
||||
/**
|
||||
* 删除用户参与活动记录
|
||||
|
@ -1,5 +1,6 @@
|
||||
package cn.iocoder.yudao.module.custom.service.impl;
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||
@ -75,7 +76,7 @@ public class CustomerActiveServiceImpl extends ServiceImpl<CustomerActiveMapper,
|
||||
**/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void attendActive(CustomerActiveSaveReqVO saveReqVO) {
|
||||
public RepairOrderInfo attendActive(CustomerActiveSaveReqVO saveReqVO) {
|
||||
/*1、基础数据初始化*/
|
||||
//当前客户信息
|
||||
CustomerMainRespVO customer = customerMainService.getCustomerById(saveReqVO.getCusId());
|
||||
@ -89,6 +90,8 @@ public class CustomerActiveServiceImpl extends ServiceImpl<CustomerActiveMapper,
|
||||
List<CustomerCoupon> customerCouponList = null;
|
||||
//需保保存的用户积分余额信息
|
||||
CustomerBalance balance;
|
||||
//要返回的订单数据
|
||||
RepairOrderInfo resultOrder = null;
|
||||
|
||||
/*2、活动关联卡券处理*/
|
||||
if (GENERAL_YES.equals(active.getIsCoupon())) {
|
||||
@ -109,7 +112,8 @@ public class CustomerActiveServiceImpl extends ServiceImpl<CustomerActiveMapper,
|
||||
List<String> ids = saveReqVO.getSelectCoupon().stream().map(MemberCoupon::getId).collect(Collectors.toList());
|
||||
//查询选中卡片信息
|
||||
List<MemberCoupon> couponList = couponService.listByIds(ids, false);
|
||||
couponList.forEach(item -> {
|
||||
if (CollectionUtil.isNotEmpty(couponList)){
|
||||
MemberCoupon item = couponList.get(0);
|
||||
RepairOrderInfo orderInfo = new RepairOrderInfo();
|
||||
orderInfo.setOrderNo(System.currentTimeMillis() + Math.abs(item.getId().hashCode() % 1000) + "");
|
||||
orderInfo.setGoodsId(item.getId());
|
||||
@ -128,7 +132,12 @@ public class CustomerActiveServiceImpl extends ServiceImpl<CustomerActiveMapper,
|
||||
orderInfo.setOrderStatus("0");
|
||||
orderInfo.setPayType(saveReqVO.getAccountType());
|
||||
repairOrderInfoService.save(orderInfo);
|
||||
});
|
||||
resultOrder = repairOrderInfoService.getById(orderInfo.getId());
|
||||
}
|
||||
|
||||
// couponList.forEach(item -> {
|
||||
//
|
||||
// });
|
||||
//转换卡券信息
|
||||
// customerCouponList = transCoupon(active.getId(), customer.getId(), customer.getUserId(), couponList);
|
||||
//转换日志信息
|
||||
@ -172,6 +181,7 @@ public class CustomerActiveServiceImpl extends ServiceImpl<CustomerActiveMapper,
|
||||
orderInfo.setOrderStatus("0");
|
||||
orderInfo.setPayType(saveReqVO.getAccountType());
|
||||
repairOrderInfoService.save(orderInfo);
|
||||
resultOrder = repairOrderInfoService.getById(orderInfo.getId());
|
||||
//保存余额信息
|
||||
// balanceService.updateByCusId(balance);
|
||||
}
|
||||
@ -188,13 +198,23 @@ public class CustomerActiveServiceImpl extends ServiceImpl<CustomerActiveMapper,
|
||||
/*5、保存变动日志*/
|
||||
//保存变动日志
|
||||
changeService.saveBatch(changeList);
|
||||
|
||||
return resultOrder;
|
||||
}
|
||||
|
||||
/**
|
||||
* 用户参与活动
|
||||
*
|
||||
* @param saveReqVO CustomerActiveSaveReqVO实体
|
||||
* @author PQZ
|
||||
* @date 10:18 2024/9/27
|
||||
**/
|
||||
@Override
|
||||
public void cusAttendActive(CustomerActiveSaveReqVO saveReqVO) {
|
||||
RepairOrderInfo repairOrderInfo = attendActive(saveReqVO);
|
||||
if (null != repairOrderInfo){
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
|
@ -85,7 +85,7 @@ public class RepairOrderInfoController {
|
||||
|
||||
/**
|
||||
* 统计未入账和已入账(最简版)
|
||||
*
|
||||
*6
|
||||
* @author 小李
|
||||
* @date 18:52 2024/9/25
|
||||
**/
|
||||
|
69
dl-module-base/src/main/resources/config/ueditor/config.json
Normal file
69
dl-module-base/src/main/resources/config/ueditor/config.json
Normal file
@ -0,0 +1,69 @@
|
||||
{
|
||||
/* 上传图片配置项 */
|
||||
"imageActionName": "uploadimage", /* 执行上传图片的action名称 */
|
||||
"imageFieldName": "upfile", /* 提交的图片表单名称 */
|
||||
"imageMaxSize": 2048000, /* 上传大小限制,单位B */
|
||||
"imageAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp", '.webp'], /* 上传图片格式显示 */
|
||||
"imageCompressEnable": true, /* 是否压缩图片,默认是true */
|
||||
"imageCompressBorder": 1600, /* 图片压缩最长边限制 */
|
||||
"imageInsertAlign": "none", /* 插入的图片浮动方式 */
|
||||
"imageUrlPrefix": "http://122.51.230.86:9000/", /* 图片访问路径前缀 */
|
||||
"imagePathFormat": "image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
|
||||
/* {filename} 会替换成原文件名,配置这项需要注意中文乱码问题 */
|
||||
/* {rand:6} 会替换成随机数,后面的数字是随机数的位数 */
|
||||
/* {time} 会替换成时间戳 */ /* {yyyy} 会替换成四位年份 */
|
||||
/* {yy} 会替换成两位年份 */
|
||||
/* {mm} 会替换成两位月份 */
|
||||
/* {dd} 会替换成两位日期 */
|
||||
/* {hh} 会替换成两位小时 */
|
||||
/* {ii} 会替换成两位分钟 */
|
||||
/* {ss} 会替换成两位秒 */
|
||||
/* 非法字符 \ : * ? " < > | */
|
||||
/* 具请体看线上文档: fex.baidu.com/ueditor/#use-format_upload_filename */
|
||||
/* 涂鸦图片上传配置项 */
|
||||
"scrawlActionName": "uploadscrawl", /* 执行上传涂鸦的action名称 */
|
||||
"scrawlFieldName": "upfile", /* 提交的图片表单名称 */
|
||||
"scrawlPathFormat": "image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
|
||||
"scrawlMaxSize": 2048000, /* 上传大小限制,单位B */
|
||||
"scrawlUrlPrefix": "", /* 图片访问路径前缀 */
|
||||
"scrawlInsertAlign": "none", /* 截图工具上传 */
|
||||
"snapscreenActionName": "uploadimage", /* 执行上传截图的action名称 */
|
||||
"snapscreenPathFormat": "image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
|
||||
"snapscreenUrlPrefix": "", /* 图片访问路径前缀 */
|
||||
"snapscreenInsertAlign": "none", /* 插入的图片浮动方式 */
|
||||
/* 抓取远程图片配置 */
|
||||
"catcherLocalDomain": ["127.0.0.1", "localhost", "img.baidu.com"],
|
||||
"catcherActionName": "catchimage", /* 执行抓取远程图片的action名称 */
|
||||
"catcherFieldName": "source", /* 提交的图片列表表单名称 */
|
||||
"catcherPathFormat": "image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
|
||||
"catcherUrlPrefix": "", /* 图片访问路径前缀 */
|
||||
"catcherMaxSize": 2048000, /* 上传大小限制,单位B */
|
||||
"catcherAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 抓取图片格式显示 */
|
||||
/* 上传视频配置 */
|
||||
"videoActionName": "uploadvideo", /* 执行上传视频的action名称 */
|
||||
"videoFieldName": "upfile", /* 提交的视频表单名称 */
|
||||
"videoPathFormat": "video/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
|
||||
"videoUrlPrefix": "http://122.51.230.86:9000/", /* 视频访问路径前缀 */
|
||||
"videoMaxSize": 102400000, /* 上传大小限制,单位B,默认100MB */
|
||||
"videoAllowFiles": [ ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg", ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid"], /* 上传视频格式显示 */
|
||||
/* 上传文件配置 */
|
||||
"fileActionName": "uploadfile", /* controller里,执行上传视频的action名称 */
|
||||
"fileFieldName": "upfile", /* 提交的文件表单名称 */
|
||||
"filePathFormat": "file/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
|
||||
"fileUrlPrefix": "http://122.51.230.86:9000/", /* 文件访问路径前缀 */
|
||||
"fileMaxSize": 51200000, /* 上传大小限制,单位B,默认50MB */
|
||||
"fileAllowFiles": [ ".png", ".jpg", ".jpeg", ".gif", ".bmp", ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg", ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid", ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso", ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml" ], /* 上传文件格式显示 */
|
||||
/* 列出指定目录下的图片 */
|
||||
"imageManagerActionName": "listimage", /* 执行图片管理的action名称 */
|
||||
"imageManagerListPath": "image/", /* 指定要列出图片的目录 */
|
||||
"imageManagerListSize": 20, /* 每次列出文件数量 */
|
||||
"imageManagerUrlPrefix": "http://122.51.230.86:9000/", /* 图片访问路径前缀 */
|
||||
"imageManagerInsertAlign": "none", /* 插入的图片浮动方式 */
|
||||
"imageManagerAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 列出的文件类型 */
|
||||
/* 列出指定目录下的文件 */
|
||||
"fileManagerActionName": "listfile", /* 执行文件管理的action名称 */
|
||||
"fileManagerListPath": "file/", /* 指定要列出文件的目录 */
|
||||
"fileManagerUrlPrefix": "http://122.51.230.86:9000/", /* 文件访问路径前缀 */
|
||||
"fileManagerListSize": 20, /* 每次列出文件数量 */
|
||||
"fileManagerAllowFiles": [ ".png", ".jpg", ".jpeg", ".gif", ".bmp", ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg", ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid", ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso", ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml" ] /* 列出的文件类型 */
|
||||
}
|
@ -5,12 +5,13 @@
|
||||
<mapper namespace="cn.iocoder.yudao.module.banner.mapper.DlBaseBannerMapper">
|
||||
|
||||
<resultMap id="BaseResultMap" type="cn.iocoder.yudao.module.banner.entity.DlBaseBanner">
|
||||
<id property="id" column="id" jdbcType="VARCHAR"/>
|
||||
<result property="title" column="title" jdbcType="VARCHAR"/>
|
||||
<result property="url" column="url" jdbcType="VARCHAR"/>
|
||||
<result property="sort" column="sort" jdbcType="VARCHAR"/>
|
||||
<result property="typeId" column="type_id" jdbcType="VARCHAR"/>
|
||||
<result property="toUrl" column="to_url" jdbcType="VARCHAR"/>
|
||||
<id property="id" column="id" jdbcType="VARCHAR"/>
|
||||
<result property="title" column="title" jdbcType="VARCHAR"/>
|
||||
<result property="url" column="url" jdbcType="VARCHAR"/>
|
||||
<result property="sort" column="sort" jdbcType="VARCHAR"/>
|
||||
<result property="typeId" column="type_id" jdbcType="VARCHAR"/>
|
||||
<result property="toUrl" column="to_url" jdbcType="VARCHAR"/>
|
||||
<result property="content" column="content"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="Base_SQL">
|
||||
@ -19,14 +20,22 @@
|
||||
url,
|
||||
sort,
|
||||
type_id,
|
||||
to_url
|
||||
from dl_base_banner dbb where dbb.deleted = '0'
|
||||
to_url,
|
||||
content
|
||||
from dl_base_banner dbb
|
||||
where dbb.deleted = '0'
|
||||
</sql>
|
||||
|
||||
<select id="queryByPage" resultMap="BaseResultMap">
|
||||
<include refid="Base_SQL" />
|
||||
<include refid="Base_SQL"/>
|
||||
<if test="map.typeId != null and map.typeId != ''">
|
||||
and dbb.type_id = #{map.typeId}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<select id="getBannerByTypeList" resultType="cn.iocoder.yudao.module.banner.entity.DlBaseBanner">
|
||||
<include refid="Base_SQL" />
|
||||
and dbb.type_id = #{type}
|
||||
order by dbb.sort
|
||||
</select>
|
||||
</mapper>
|
||||
|
1
pom.xml
1
pom.xml
@ -51,6 +51,7 @@
|
||||
<spring.boot.version>2.7.18</spring.boot.version>
|
||||
<mapstruct.version>1.5.5.Final</mapstruct.version>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<ueditor.version>1.1.2</ueditor.version>
|
||||
</properties>
|
||||
|
||||
<dependencyManagement>
|
||||
|
@ -164,7 +164,7 @@ public class YudaoWebSecurityConfigurerAdapter {
|
||||
.antMatchers("/admin-api/system/schoolRegistrationInfo/addWx","/admin-api/system/schoolInstructor/listWx","/admin-api/system/schoolAppointmentInfo/addWx").permitAll()
|
||||
// 驾校
|
||||
.antMatchers("/admin-api/drivingSchool/system/driveSchoolCourse/list","/admin-api/loginJx","/admin-api/loginSmsCodeJx"," /admin-api/jxInfo/payNotify","/admin-api/drivingSchool/text/list","/admin-api/drivingSchool/system/swiper/list","/admin-api/drivingSchool/system/schoolInfo/list").permitAll()
|
||||
|
||||
.antMatchers("/admin-api/ueditor/*").permitAll()
|
||||
// 检测app首页
|
||||
.antMatchers("/admin-api/appInspection/appHome/**").permitAll()
|
||||
//检测小程序相关
|
||||
|
@ -288,6 +288,7 @@ yudao:
|
||||
- /userClient/pay/**
|
||||
- /userClient/weChat/**
|
||||
- /userClient/**
|
||||
- /admin-api/ueditor/**
|
||||
|
||||
ignore-tables:
|
||||
- system_tenant
|
||||
|
Loading…
Reference in New Issue
Block a user