diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java index e45570e..9562e99 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java @@ -65,7 +65,7 @@ public class Swagger2Config implements WebMvcConfigurer { .apiInfo(apiInfo()) .select() //此包路径下的类,才生成接口文档 - .apis(RequestHandlerSelectors.basePackage("org.jeecg")) + .apis(RequestHandlerSelectors.basePackage("org.jeecg.modules.miniapp")) //加了ApiOperation注解的类,才生成接口文档 .apis(RequestHandlerSelectors.withClassAnnotation(RestController.class)) .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) diff --git a/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/banner/controller/BannerController.java b/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/banner/controller/BannerController.java new file mode 100644 index 0000000..fa20785 --- /dev/null +++ b/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/banner/controller/BannerController.java @@ -0,0 +1,64 @@ +package org.jeecg.modules.miniapp.banner.controller; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.query.QueryRuleEnum; +import org.jeecg.config.shiro.IgnoreAuth; +import org.jeecg.modules.demo.appbanner.entity.AppBanner; +import org.jeecg.modules.demo.appbanner.service.IAppBannerService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** +* @Description: 应用广告配置 +* @Author: jeecg-boot +* @Date: 2025-02-15 +* @Version: V1.0 +*/ +@Api(tags="广告管理") +@RestController +@RequestMapping("/miniapp/banner") +@Slf4j +public class BannerController extends JeecgController { + @Autowired + private IAppBannerService appBannerService; + + /** + * 列表查询 + * + * @param appBanner + * @param req + * @return + */ + //@AutoLog(value = "应用广告配置-分页列表查询") + @ApiOperation(value="应用广告查询", notes="应用广告查询") + @GetMapping(value = "/list") + @IgnoreAuth + public Result> queryPageList(AppBanner appBanner, + HttpServletRequest req) { + // 自定义查询规则 + Map customeRuleMap = new HashMap<>(); + // 默认查询启用的 + if (appBanner.getStatus()== null){ + appBanner.setStatus(1); + } + // 自定义多选的查询规则为:LIKE_WITH_OR + customeRuleMap.put("jumpType", QueryRuleEnum.LIKE_WITH_OR); + customeRuleMap.put("position", QueryRuleEnum.LIKE_WITH_OR); + customeRuleMap.put("status", QueryRuleEnum.LIKE_WITH_OR); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(appBanner, req.getParameterMap(),customeRuleMap); + List list = appBannerService.list(queryWrapper); + return Result.OK(list); + } +} diff --git a/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/notice/controller/NoticeController.java b/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/notice/controller/NoticeController.java new file mode 100644 index 0000000..23ffea2 --- /dev/null +++ b/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/notice/controller/NoticeController.java @@ -0,0 +1,69 @@ +package org.jeecg.modules.miniapp.notice.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.query.QueryRuleEnum; +import org.jeecg.config.shiro.IgnoreAuth; +import org.jeecg.modules.demo.notice.entity.AppNotice; +import org.jeecg.modules.demo.notice.service.IAppNoticeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** +* @Description: 公告管理 +* @Author: jeecg-boot +* @Date: 2025-02-16 +* @Version: V1.0 +*/ +@Api(tags="公告管理") +@RestController +@RequestMapping("/miniapp/notice") +@Slf4j +public class NoticeController extends JeecgController { + @Autowired + private IAppNoticeService appNoticeService; + + /** + * 列表查询 + * + * @param appNotice + * @param req + * @return + */ + //@AutoLog(value = "公告管理-分页列表查询") + @ApiOperation(value="公告管理-公告查询", notes="公告管理-公告查询") + @GetMapping(value = "/list") + @IgnoreAuth + public Result> queryPageList(AppNotice appNotice, + HttpServletRequest req) { + // 自定义查询规则 + Map customeRuleMap = new HashMap<>(); + // 自定义多选的查询规则为:LIKE_WITH_OR + customeRuleMap.put("status", QueryRuleEnum.LIKE_WITH_OR); + if (appNotice.getStatus()== null){ + appNotice.setStatus(1); + } + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(appNotice, req.getParameterMap(),customeRuleMap); + List list = appNoticeService.list(queryWrapper); + return Result.OK(list); + } + + +} diff --git a/jeecg-module-miniapp/src/main/java/org/jeecg/modules/pdftest/service/PdfService.java b/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/pdftest/service/PdfService.java similarity index 74% rename from jeecg-module-miniapp/src/main/java/org/jeecg/modules/pdftest/service/PdfService.java rename to jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/pdftest/service/PdfService.java index a165a75..2b686e9 100644 --- a/jeecg-module-miniapp/src/main/java/org/jeecg/modules/pdftest/service/PdfService.java +++ b/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/pdftest/service/PdfService.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.pdftest.service; +package org.jeecg.modules.miniapp.pdftest.service; /** * @author Tanzs diff --git a/jeecg-module-miniapp/src/main/java/org/jeecg/modules/pdftest/service/impl/PdfServiceImpl.java b/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/pdftest/service/impl/PdfServiceImpl.java similarity index 85% rename from jeecg-module-miniapp/src/main/java/org/jeecg/modules/pdftest/service/impl/PdfServiceImpl.java rename to jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/pdftest/service/impl/PdfServiceImpl.java index 16b085d..e9625bf 100644 --- a/jeecg-module-miniapp/src/main/java/org/jeecg/modules/pdftest/service/impl/PdfServiceImpl.java +++ b/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/pdftest/service/impl/PdfServiceImpl.java @@ -1,8 +1,7 @@ -package org.jeecg.modules.pdftest.service.impl; +package org.jeecg.modules.miniapp.pdftest.service.impl; -import org.apache.commons.fileupload.FileItemStream; import org.jeecg.common.util.oss.OssBootUtil; -import org.jeecg.modules.pdftest.service.PdfService; +import org.jeecg.modules.miniapp.pdftest.service.PdfService; import org.springframework.stereotype.Service; import java.io.File; @@ -11,7 +10,7 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import static org.jeecg.modules.utils.PdfBoxUtils.convertImagesToPDF; +import static org.jeecg.modules.miniapp.utils.PdfBoxUtils.convertImagesToPDF; /** * @author Tanzs diff --git a/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/store/controller/StoreController.java b/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/store/controller/StoreController.java new file mode 100644 index 0000000..04ee133 --- /dev/null +++ b/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/store/controller/StoreController.java @@ -0,0 +1,67 @@ +package org.jeecg.modules.miniapp.store.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.query.QueryRuleEnum; +import org.jeecg.config.shiro.IgnoreAuth; +import org.jeecg.modules.demo.store.entity.AppStore; +import org.jeecg.modules.demo.store.service.IAppStoreService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** +* @Description: 门店管理 +* @Author: jeecg-boot +* @Date: 2025-02-16 +* @Version: V1.0 +*/ +@Api(tags="门店管理") +@RestController +@RequestMapping("miniapp/store") +@Slf4j +public class StoreController extends JeecgController { + @Autowired + private IAppStoreService appStoreService; + + /** + * 列表查询 + * + * @param appStore + * @param req + * @return + */ + //@AutoLog(value = "门店管理-分页列表查询") + @ApiOperation(value="门店管理-列表查询", notes="门店管理-列表查询") + @GetMapping(value = "/list") + @IgnoreAuth + public Result> queryPageList(AppStore appStore, HttpServletRequest req) { + // 自定义查询规则 + Map customeRuleMap = new HashMap<>(); + // 自定义多选的查询规则为:LIKE_WITH_OR + customeRuleMap.put("status", QueryRuleEnum.LIKE_WITH_OR); + if (appStore.getStatus()== null){ + appStore.setStatus(1); + } + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(appStore, req.getParameterMap(),customeRuleMap); + List list = appStoreService.list(queryWrapper); + return Result.OK(list); + } + +} diff --git a/jeecg-module-miniapp/src/main/java/org/jeecg/modules/user/contoller/UserController.java b/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/user/contoller/UserController.java similarity index 81% rename from jeecg-module-miniapp/src/main/java/org/jeecg/modules/user/contoller/UserController.java rename to jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/user/contoller/UserController.java index 91379ce..a916a6e 100644 --- a/jeecg-module-miniapp/src/main/java/org/jeecg/modules/user/contoller/UserController.java +++ b/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/user/contoller/UserController.java @@ -1,11 +1,11 @@ -package org.jeecg.modules.user.contoller; +package org.jeecg.modules.miniapp.user.contoller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.IgnoreAuth; -import org.jeecg.modules.user.domain.WxLoginInfo; -import org.jeecg.modules.user.service.UserService; +import org.jeecg.modules.miniapp.user.domain.WxLoginInfo; +import org.jeecg.modules.miniapp.user.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -14,9 +14,9 @@ import org.springframework.web.bind.annotation.*; * @date 2025/2/7 下午5:58 * @description */ -@Api(tags="小程序活动测试") +@Api(tags="用户管理") @RestController -@RequestMapping("/api/user") +@RequestMapping("/miniapp/user") @Slf4j public class UserController { diff --git a/jeecg-module-miniapp/src/main/java/org/jeecg/modules/user/domain/WxLoginInfo.java b/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/user/domain/WxLoginInfo.java similarity index 88% rename from jeecg-module-miniapp/src/main/java/org/jeecg/modules/user/domain/WxLoginInfo.java rename to jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/user/domain/WxLoginInfo.java index 453819e..bbc676c 100644 --- a/jeecg-module-miniapp/src/main/java/org/jeecg/modules/user/domain/WxLoginInfo.java +++ b/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/user/domain/WxLoginInfo.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.user.domain; +package org.jeecg.modules.miniapp.user.domain; import lombok.Data; diff --git a/jeecg-module-miniapp/src/main/java/org/jeecg/modules/user/service/UserService.java b/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/user/service/UserService.java similarity index 71% rename from jeecg-module-miniapp/src/main/java/org/jeecg/modules/user/service/UserService.java rename to jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/user/service/UserService.java index f998e5c..e82a486 100644 --- a/jeecg-module-miniapp/src/main/java/org/jeecg/modules/user/service/UserService.java +++ b/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/user/service/UserService.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.user.service; +package org.jeecg.modules.miniapp.user.service; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.user.domain.WxLoginInfo; +import org.jeecg.modules.miniapp.user.domain.WxLoginInfo; /** * @author Tanzs diff --git a/jeecg-module-miniapp/src/main/java/org/jeecg/modules/user/service/impl/UserServiceImpl.java b/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/user/service/impl/UserServiceImpl.java similarity index 91% rename from jeecg-module-miniapp/src/main/java/org/jeecg/modules/user/service/impl/UserServiceImpl.java rename to jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/user/service/impl/UserServiceImpl.java index 9bd135a..24d7251 100644 --- a/jeecg-module-miniapp/src/main/java/org/jeecg/modules/user/service/impl/UserServiceImpl.java +++ b/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/user/service/impl/UserServiceImpl.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.user.service.impl; +package org.jeecg.modules.miniapp.user.service.impl; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; @@ -6,8 +6,8 @@ import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.error.WxErrorException; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.user.domain.WxLoginInfo; -import org.jeecg.modules.user.service.UserService; +import org.jeecg.modules.miniapp.user.domain.WxLoginInfo; +import org.jeecg.modules.miniapp.user.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/jeecg-module-miniapp/src/main/java/org/jeecg/modules/utils/PdfBoxUtils.java b/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/utils/PdfBoxUtils.java similarity index 99% rename from jeecg-module-miniapp/src/main/java/org/jeecg/modules/utils/PdfBoxUtils.java rename to jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/utils/PdfBoxUtils.java index bb462d6..fd44df6 100644 --- a/jeecg-module-miniapp/src/main/java/org/jeecg/modules/utils/PdfBoxUtils.java +++ b/jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/utils/PdfBoxUtils.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.utils; +package org.jeecg.modules.miniapp.utils; import com.aliyuncs.utils.IOUtils; import org.apache.pdfbox.pdmodel.PDDocument; diff --git a/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/miniapp/pdf/PdfUtilTest.java b/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/miniapp/pdf/PdfUtilTest.java index a6e4a9e..b778d42 100644 --- a/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/miniapp/pdf/PdfUtilTest.java +++ b/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/miniapp/pdf/PdfUtilTest.java @@ -1,7 +1,7 @@ package org.jeecg.modules.miniapp.pdf; import org.jeecg.JeecgSystemApplication; -import org.jeecg.modules.pdftest.service.PdfService; +import org.jeecg.modules.miniapp.pdftest.service.PdfService; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired;