diff --git a/docs/SERVER_URL_REFACTOR_SUMMARY.md b/docs/SERVER_URL_REFACTOR_SUMMARY.md index 7e49a3d..73109a4 100644 --- a/docs/SERVER_URL_REFACTOR_SUMMARY.md +++ b/docs/SERVER_URL_REFACTOR_SUMMARY.md @@ -1,7 +1,7 @@ # 服务器URL配置重构总结 ## 概述 -将项目中硬编码的服务器地址 `https://server.gxwebsoft.com/api` 改为从配置文件读取，提高了代码的可维护性和灵活性。 +将项目中硬编码的服务器地址 `https://server.websoft.top/api` 改为从配置文件读取，提高了代码的可维护性和灵活性。 ## 修改的文件 @@ -31,7 +31,7 @@ **文件路径**: `src/main/java/com/gxwebsoft/common/core/security/JwtAuthenticationFilter.java` **修改内容**: -- 将硬编码的URL `"https://server.gxwebsoft.com/api/auth/user"` +- 将硬编码的URL `"https://server.websoft.top/api/auth/user"` - 改为 `configProperties.getServerUrl() + "/auth/user"` ### 3. OaAppController.java @@ -39,21 +39,21 @@ **修改内容**: - 添加了 `ConfigProperties` 依赖注入 -- 将硬编码的URL `"https://server.gxwebsoft.com/api/file/page"` +- 将硬编码的URL `"https://server.websoft.top/api/file/page"` - 改为 `configProperties.getServerUrl() + "/file/page"` ### 4. SwaggerConfig.java **文件路径**: `src/main/java/com/gxwebsoft/common/core/config/SwaggerConfig.java` **修改内容**: -- 将硬编码的URL `"https://server.gxwebsoft.com/api/system"` +- 将硬编码的URL `"https://server.websoft.top/api/system"` - 改为 `config.getServerUrl() + "/system"` ### 5. WxOfficialUtil.java **文件路径**: `src/main/java/com/gxwebsoft/common/core/utils/WxOfficialUtil.java` **修改内容**: -- 将硬编码的URL `"https://server.gxwebsoft.com/api/open/wx-official/accessToken"` +- 将硬编码的URL `"https://server.websoft.top/api/open/wx-official/accessToken"` - 改为 `pathConfig.getServerUrl() + "/open/wx-official/accessToken"` ### 6. ShopOrderServiceImpl.java @@ -61,7 +61,7 @@ **修改内容**: - 将微信支付回调地址中的硬编码URL -- 从 `"https://server.gxwebsoft.com/api/system/wx-pay/notify/"` +- 从 `"https://server.websoft.top/api/system/wx-pay/notify/"` - 改为 `config.getServerUrl() + "/system/wx-pay/notify/"` ## 配置文件设置 @@ -75,13 +75,13 @@ config: ### 生产环境 (application-prod.yml) ```yaml config: - server-url: https://server.gxwebsoft.com/api + server-url: https://server.websoft.top/api ``` ### 默认配置 (application.yml) ```yaml config: - server-url: https://server.gxwebsoft.com/api + server-url: https://server.websoft.top/api ``` ## 优势 diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsComponentsController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsComponentsController.java deleted file mode 100644 index 8ca1713..0000000 --- a/src/main/java/com/gxwebsoft/cms/controller/CmsComponentsController.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.gxwebsoft.cms.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.cms.service.CmsComponentsService; -import com.gxwebsoft.cms.entity.CmsComponents; -import com.gxwebsoft.cms.param.CmsComponentsParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.system.entity.User; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 组件控制器 - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -@Tag(name = "组件管理") -@RestController -@RequestMapping("/api/cms/cms-components") -public class CmsComponentsController extends BaseController { - @Resource - private CmsComponentsService cmsComponentsService; - - @Operation(summary = "分页查询组件") - @GetMapping("/page") - public ApiResult> page(CmsComponentsParam param) { - // 使用关联查询 - return success(cmsComponentsService.pageRel(param)); - } - - @Operation(summary = "查询全部组件") - @GetMapping() - public ApiResult> list(CmsComponentsParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(cmsComponentsService.list(page.getOrderWrapper())); - // 使用关联查询 - //return success(cmsComponentsService.listRel(param)); - } - - @PreAuthorize("hasAuthority('cms:cmsComponents:list')") - @OperationLog - @Operation(summary = "根据id查询组件") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(cmsComponentsService.getById(id)); - // 使用关联查询 - //return success(cmsComponentsService.getByIdRel(id)); - } - - @Operation(summary = "添加组件") - @PostMapping() - public ApiResult save(@RequestBody CmsComponents cmsComponents) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - cmsComponents.setUserId(loginUser.getUserId()); - } - if (cmsComponentsService.save(cmsComponents)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @Operation(summary = "修改组件") - @PutMapping() - public ApiResult update(@RequestBody CmsComponents cmsComponents) { - if (cmsComponentsService.updateById(cmsComponents)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @Operation(summary = "删除组件") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (cmsComponentsService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @Operation(summary = "批量添加组件") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (cmsComponentsService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @Operation(summary = "批量修改组件") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(cmsComponentsService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @Operation(summary = "批量删除组件") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (cmsComponentsService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsMpAdController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsMpAdController.java deleted file mode 100644 index e95698f..0000000 --- a/src/main/java/com/gxwebsoft/cms/controller/CmsMpAdController.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.gxwebsoft.cms.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.cms.service.CmsMpAdService; -import com.gxwebsoft.cms.entity.CmsMpAd; -import com.gxwebsoft.cms.param.CmsMpAdParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.system.entity.User; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 小程序广告位控制器 - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -@Tag(name = "小程序广告位管理") -@RestController -@RequestMapping("/api/cms/cms-mp-ad") -public class CmsMpAdController extends BaseController { - @Resource - private CmsMpAdService cmsMpAdService; - - @Operation(summary = "分页查询小程序广告位") - @GetMapping("/page") - public ApiResult> page(CmsMpAdParam param) { - // 使用关联查询 - return success(cmsMpAdService.pageRel(param)); - } - - @Operation(summary = "查询全部小程序广告位") - @GetMapping() - public ApiResult> list(CmsMpAdParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(cmsMpAdService.list(page.getOrderWrapper())); - // 使用关联查询 - //return success(cmsMpAdService.listRel(param)); - } - - @PreAuthorize("hasAuthority('cms:cmsMpAd:list')") - @OperationLog - @Operation(summary = "根据id查询小程序广告位") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(cmsMpAdService.getById(id)); - // 使用关联查询 - //return success(cmsMpAdService.getByIdRel(id)); - } - - @Operation(summary = "添加小程序广告位") - @PostMapping() - public ApiResult save(@RequestBody CmsMpAd cmsMpAd) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - cmsMpAd.setUserId(loginUser.getUserId()); - } - if (cmsMpAdService.save(cmsMpAd)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @Operation(summary = "修改小程序广告位") - @PutMapping() - public ApiResult update(@RequestBody CmsMpAd cmsMpAd) { - if (cmsMpAdService.updateById(cmsMpAd)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @Operation(summary = "删除小程序广告位") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (cmsMpAdService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @Operation(summary = "批量添加小程序广告位") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (cmsMpAdService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @Operation(summary = "批量修改小程序广告位") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(cmsMpAdService, "ad_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @Operation(summary = "批量删除小程序广告位") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (cmsMpAdService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsMpController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsMpController.java deleted file mode 100644 index 0517b31..0000000 --- a/src/main/java/com/gxwebsoft/cms/controller/CmsMpController.java +++ /dev/null @@ -1,283 +0,0 @@ -package com.gxwebsoft.cms.controller; - -import cn.hutool.core.date.DateField; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.gxwebsoft.cms.entity.CmsMpField; -import com.gxwebsoft.cms.entity.CmsMpMenu; -import com.gxwebsoft.cms.entity.CmsMpPages; -import com.gxwebsoft.cms.service.CmsMpFieldService; -import com.gxwebsoft.cms.service.CmsMpMenuService; -import com.gxwebsoft.cms.service.CmsMpPagesService; -import com.gxwebsoft.common.core.utils.JSONUtil; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.cms.service.CmsMpService; -import com.gxwebsoft.cms.entity.CmsMp; -import com.gxwebsoft.cms.param.CmsMpParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.system.entity.User; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; -import java.util.concurrent.TimeUnit; - -/** - * 小程序信息控制器 - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -@Tag(name = "小程序信息管理") -@RestController -@RequestMapping("/api/cms/cms-mp") -public class CmsMpController extends BaseController { - @Resource - private CmsMpService cmsMpService; - @Resource - private CmsMpPagesService cmsMpPagesService; - @Resource - private CmsMpFieldService mpFieldService; - @Resource - private CmsMpMenuService cmsMpMenuService; - @Resource - private RedisUtil redisUtil; - - @Operation(summary = "分页查询小程序信息") - @GetMapping("/page") - public ApiResult> page(CmsMpParam param) { - // 使用关联查询 - return success(cmsMpService.pageRel(param)); - } - - @Operation(summary = "查询全部小程序信息") - @GetMapping() - public ApiResult> list(CmsMpParam param) { - // 使用关联查询 - return success(cmsMpService.listRel(param)); - } - - @PreAuthorize("hasAuthority('cms:cmsMp:list')") - @OperationLog - @Operation(summary = "根据id查询小程序信息") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(cmsMpService.getByIdRel(id)); - } - - @Operation(summary = "添加小程序信息") - @PostMapping() - public ApiResult save(@RequestBody CmsMp cmsMp) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - cmsMp.setUserId(loginUser.getUserId()); - } - if (cmsMpService.save(cmsMp)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @Operation(summary = "修改小程序信息") - @PutMapping() - public ApiResult update(@RequestBody CmsMp cmsMp) { - if (cmsMpService.updateById(cmsMp)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @Operation(summary = "删除小程序信息") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (cmsMpService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @Operation(summary = "批量添加小程序信息") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (cmsMpService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @Operation(summary = "批量修改小程序信息") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(cmsMpService, "mp_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @Operation(summary = "批量删除小程序信息") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (cmsMpService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @Operation(summary = "小程序基本信息") - @GetMapping("/getMpInfo") - public ApiResult getMpInfo() { - final Integer tenantId = getTenantId(); - String key = "MpInfo:" + tenantId; - System.out.println("key = " + key); - final String mpInfo = redisUtil.get(key); - - if (tenantId.equals(0)) { - return fail("租户ID不存在", null); - } - System.out.println("mpInfo = " + mpInfo); - // 从缓存读取信息 - if (StrUtil.isNotBlank(mpInfo)) { - final Object object = JSONUtil.parseObject(mpInfo, Object.class); - System.out.println("object = " + object); - return success(object); - } - - // 获取小程序 - if (cmsMpService.count(new LambdaUpdateWrapper().eq(CmsMp::getDeleted, 0)) == 0) { - // 创建小程序 - createMp(); - } - - HashMap map = new HashMap<>(); - - // 获取小程序 - final CmsMp mp = cmsMpService.getOne(new LambdaQueryWrapper().eq(CmsMp::getTenantId, tenantId).last("limit 1")); - mp.setAppSecret(null); - map.put("mp", mp); - - // 原生导航条 - final List tabBar = cmsMpPagesService.list(new LambdaQueryWrapper().eq(CmsMpPages::getSubpackage, "MainPackage").last("limit 5")); - map.put("tabBar", tabBar); - - // 配置信息 - HashMap config = new HashMap<>(); - config.put("LICENSE_CODE", ""); - config.put("MAP_KEY", ""); - final List fields = mpFieldService.list(); - fields.forEach(d -> { - config.put(d.getName(), d.getValue()); - }); - map.put("config", config); - - // 服务器时间 - HashMap serverTime = new HashMap<>(); - // 今天日期 - DateTime date = DateUtil.date(); - String today = DateUtil.today(); - // 明天日期 - final DateTime dateTime = DateUtil.tomorrow(); - String tomorrow = DateUtil.format(dateTime, "yyyy-MM-dd"); - // 后天日期 - final DateTime dateTime2 = DateUtil.offsetDay(date, 2); - final String afterDay = DateUtil.format(dateTime2, "yyyy-MM-dd"); - // 今天星期几 - final int week = DateUtil.thisDayOfWeek(); - final DateTime nextWeek = DateUtil.nextWeek(); - serverTime.put("now", DateUtil.now()); // 2024-07-18 22:06:36 - serverTime.put("today", today); // 2024-07-18 - serverTime.put("tomorrow", tomorrow); // 2024-07-19 - serverTime.put("afterDay", afterDay); // 2024-07-20 - serverTime.put("nextWeek", nextWeek); // 2024-07-25 22:06:36 - serverTime.put("week", week); // 5 - map.put("serverTime", serverTime); - redisUtil.set(key, map, 1L, TimeUnit.DAYS); - return success(map); - } - - private void createMp() { - System.out.println("创建小程序 = "); - final User loginUser = getLoginUser(); - final Integer tenantId = getTenantId(); - // 创建网站记录 - final CmsMp mp = new CmsMp(); - mp.setTenantId(tenantId); - mp.setAppId("小程序ID"); - mp.setMpName("小程序名称"); - mp.setMainPath("/pages/index"); - if (loginUser != null) { - mp.setUserId(getLoginUserId()); - } - mp.setExpirationTime(DateUtil.offset(DateUtil.date(), DateField.YEAR, 1)); - cmsMpService.save(mp); - - // 创建底部导航栏 - final CmsMpPages mpPages = new CmsMpPages(); - mpPages.setHome(1); - mpPages.setTitle("首页"); - mpPages.setPath("/pages/index"); - mpPages.setSubpackage("MainPackage"); - mpPages.setIcon("HomeOutlined"); - mpPages.setSortNumber(0); - mpPages.setTenantId(tenantId); - cmsMpPagesService.save(mpPages); - mpPages.setHome(0); - mpPages.setTitle("分类"); - mpPages.setPath("/pages/category"); - mpPages.setSubpackage("MainPackage"); - mpPages.setIcon("AppstoreOutlined"); - mpPages.setSortNumber(0); - cmsMpPagesService.save(mpPages); - mpPages.setTitle("购物车"); - mpPages.setPath("/pages/category"); - mpPages.setSubpackage("MainPackage"); - mpPages.setIcon("ShoppingCartOutlined"); - mpPages.setSortNumber(0); - cmsMpPagesService.save(mpPages); - mpPages.setTitle("我的"); - mpPages.setPath("/pages/user"); - mpPages.setSubpackage("MainPackage"); - mpPages.setIcon("UserOutlined"); - mpPages.setSortNumber(0); - cmsMpPagesService.save(mpPages); - - // 创建导航图标 - final CmsMpMenu mpMenu = new CmsMpMenu(); - mpMenu.setTenantId(tenantId); - mpMenu.setTitle("分类1"); - mpMenu.setIcon("PictureOutlined"); - mpMenu.setPath("/package/order"); - mpMenu.setTarget("uni.navigateTo"); - cmsMpMenuService.save(mpMenu); - mpMenu.setTitle("分类2"); - mpMenu.setIcon("PictureOutlined"); - mpMenu.setPath("/package/order"); - cmsMpMenuService.save(mpMenu); - mpMenu.setTitle("分类3"); - mpMenu.setIcon("PictureOutlined"); - mpMenu.setPath("/package/order"); - cmsMpMenuService.save(mpMenu); - mpMenu.setTitle("分类4"); - mpMenu.setIcon("PictureOutlined"); - mpMenu.setPath("/package/order"); - cmsMpMenuService.save(mpMenu); - - // 小程序配置信息 - CmsMpField field = new CmsMpField(); - field.setName("mpLogo"); - mpFieldService.save(field); - } - -} diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsMpFieldController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsMpFieldController.java deleted file mode 100644 index d850929..0000000 --- a/src/main/java/com/gxwebsoft/cms/controller/CmsMpFieldController.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.gxwebsoft.cms.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.cms.service.CmsMpFieldService; -import com.gxwebsoft.cms.entity.CmsMpField; -import com.gxwebsoft.cms.param.CmsMpFieldParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 小程序配置控制器 - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -@Tag(name = "小程序配置管理") -@RestController -@RequestMapping("/api/cms/cms-mp-field") -public class CmsMpFieldController extends BaseController { - @Resource - private CmsMpFieldService cmsMpFieldService; - - @Operation(summary = "分页查询小程序配置") - @GetMapping("/page") - public ApiResult> page(CmsMpFieldParam param) { - // 使用关联查询 - return success(cmsMpFieldService.pageRel(param)); - } - - @Operation(summary = "查询全部小程序配置") - @GetMapping() - public ApiResult> list(CmsMpFieldParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(cmsMpFieldService.list(page.getOrderWrapper())); - // 使用关联查询 - //return success(cmsMpFieldService.listRel(param)); - } - - @PreAuthorize("hasAuthority('cms:cmsMpField:list')") - @OperationLog - @Operation(summary = "根据id查询小程序配置") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(cmsMpFieldService.getById(id)); - // 使用关联查询 - //return success(cmsMpFieldService.getByIdRel(id)); - } - - @Operation(summary = "添加小程序配置") - @PostMapping() - public ApiResult save(@RequestBody CmsMpField cmsMpField) { - if (cmsMpFieldService.save(cmsMpField)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @Operation(summary = "修改小程序配置") - @PutMapping() - public ApiResult update(@RequestBody CmsMpField cmsMpField) { - if (cmsMpFieldService.updateById(cmsMpField)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @Operation(summary = "删除小程序配置") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (cmsMpFieldService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @Operation(summary = "批量添加小程序配置") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (cmsMpFieldService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @Operation(summary = "批量修改小程序配置") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(cmsMpFieldService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @Operation(summary = "批量删除小程序配置") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (cmsMpFieldService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsMpMenuController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsMpMenuController.java deleted file mode 100644 index f04c396..0000000 --- a/src/main/java/com/gxwebsoft/cms/controller/CmsMpMenuController.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.gxwebsoft.cms.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.cms.service.CmsMpMenuService; -import com.gxwebsoft.cms.entity.CmsMpMenu; -import com.gxwebsoft.cms.param.CmsMpMenuParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.system.entity.User; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 小程序端菜单控制器 - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -@Tag(name = "小程序端菜单管理") -@RestController -@RequestMapping("/api/cms/cms-mp-menu") -public class CmsMpMenuController extends BaseController { - @Resource - private CmsMpMenuService cmsMpMenuService; - - @Operation(summary = "分页查询小程序端菜单") - @GetMapping("/page") - public ApiResult> page(CmsMpMenuParam param) { - // 使用关联查询 - return success(cmsMpMenuService.pageRel(param)); - } - - @Operation(summary = "查询全部小程序端菜单") - @GetMapping() - public ApiResult> list(CmsMpMenuParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(cmsMpMenuService.list(page.getOrderWrapper())); - // 使用关联查询 - //return success(cmsMpMenuService.listRel(param)); - } - - @PreAuthorize("hasAuthority('cms:cmsMpMenu:list')") - @OperationLog - @Operation(summary = "根据id查询小程序端菜单") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(cmsMpMenuService.getById(id)); - // 使用关联查询 - //return success(cmsMpMenuService.getByIdRel(id)); - } - - @Operation(summary = "添加小程序端菜单") - @PostMapping() - public ApiResult save(@RequestBody CmsMpMenu cmsMpMenu) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - cmsMpMenu.setUserId(loginUser.getUserId()); - } - if (cmsMpMenuService.save(cmsMpMenu)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @Operation(summary = "修改小程序端菜单") - @PutMapping() - public ApiResult update(@RequestBody CmsMpMenu cmsMpMenu) { - if (cmsMpMenuService.updateById(cmsMpMenu)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @Operation(summary = "删除小程序端菜单") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (cmsMpMenuService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @Operation(summary = "批量添加小程序端菜单") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (cmsMpMenuService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @Operation(summary = "批量修改小程序端菜单") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(cmsMpMenuService, "menu_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @Operation(summary = "批量删除小程序端菜单") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (cmsMpMenuService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsMpPagesController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsMpPagesController.java deleted file mode 100644 index 422a7cb..0000000 --- a/src/main/java/com/gxwebsoft/cms/controller/CmsMpPagesController.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.gxwebsoft.cms.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.cms.service.CmsMpPagesService; -import com.gxwebsoft.cms.entity.CmsMpPages; -import com.gxwebsoft.cms.param.CmsMpPagesParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.system.entity.User; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 小程序页面控制器 - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -@Tag(name = "小程序页面管理") -@RestController -@RequestMapping("/api/cms/cms-mp-pages") -public class CmsMpPagesController extends BaseController { - @Resource - private CmsMpPagesService cmsMpPagesService; - - @Operation(summary = "分页查询小程序页面") - @GetMapping("/page") - public ApiResult> page(CmsMpPagesParam param) { - // 使用关联查询 - return success(cmsMpPagesService.pageRel(param)); - } - - @Operation(summary = "查询全部小程序页面") - @GetMapping() - public ApiResult> list(CmsMpPagesParam param) { - // 使用关联查询 - return success(cmsMpPagesService.listRel(param)); - } - - @PreAuthorize("hasAuthority('cms:cmsMpPages:list')") - @OperationLog - @Operation(summary = "根据id查询小程序页面") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(cmsMpPagesService.getByIdRel(id)); - } - - @Operation(summary = "添加小程序页面") - @PostMapping() - public ApiResult save(@RequestBody CmsMpPages cmsMpPages) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - cmsMpPages.setUserId(loginUser.getUserId()); - } - if (cmsMpPagesService.save(cmsMpPages)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @Operation(summary = "修改小程序页面") - @PutMapping() - public ApiResult update(@RequestBody CmsMpPages cmsMpPages) { - if (cmsMpPagesService.updateById(cmsMpPages)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @Operation(summary = "删除小程序页面") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (cmsMpPagesService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @Operation(summary = "批量添加小程序页面") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (cmsMpPagesService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @Operation(summary = "批量修改小程序页面") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(cmsMpPagesService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @Operation(summary = "批量删除小程序页面") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (cmsMpPagesService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsOrderController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsOrderController.java deleted file mode 100644 index 8e613e8..0000000 --- a/src/main/java/com/gxwebsoft/cms/controller/CmsOrderController.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.gxwebsoft.cms.controller; - -import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.cms.service.CmsOrderService; -import com.gxwebsoft.cms.entity.CmsOrder; -import com.gxwebsoft.cms.param.CmsOrderParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.system.entity.User; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 订单控制器 - * - * @author 科技小王子 - * @since 2024-11-25 12:14:05 - */ -@Tag(name = "订单管理") -@RestController -@RequestMapping("/api/cms/cms-order") -public class CmsOrderController extends BaseController { - @Resource - private CmsOrderService cmsOrderService; - - @PreAuthorize("hasAuthority('cms:cmsOrder:list')") - @Operation(summary = "分页查询订单") - @GetMapping("/page") - public ApiResult> page(CmsOrderParam param) { - // 使用关联查询 - return success(cmsOrderService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('cms:cmsOrder:list')") - @Operation(summary = "查询全部订单") - @GetMapping() - public ApiResult> list(CmsOrderParam param) { - // 使用关联查询 - return success(cmsOrderService.listRel(param)); - } - - @PreAuthorize("hasAuthority('cms:cmsOrder:list')") - @Operation(summary = "根据id查询订单") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(cmsOrderService.getByIdRel(id)); - } - - @Operation(summary = "添加订单") - @PostMapping() - public ApiResult save(@RequestBody CmsOrder cmsOrder) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - cmsOrder.setUserId(loginUser.getUserId()); - } - if(cmsOrder.getCode() == null){ - return fail("验证码不正确",null); - } - if(cmsOrder.getOrderNo() == null){ - cmsOrder.setOrderNo(CommonUtil.createOrderNo()); - } - // 默认语言 - if(cmsOrder.getLang() == null){ - cmsOrder.setLang("zh_CN"); - } - if (cmsOrderService.save(cmsOrder)) { - return success("提交成功"); - } - return fail("提交失败"); - } - - @PreAuthorize("hasAuthority('cms:cmsOrder:update')") - @Operation(summary = "修改订单") - @PutMapping() - public ApiResult update(@RequestBody CmsOrder cmsOrder) { - if (cmsOrderService.updateById(cmsOrder)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('cms:cmsOrder:remove')") - @Operation(summary = "删除订单") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (cmsOrderService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('cms:cmsOrder:save')") - @Operation(summary = "批量添加订单") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (cmsOrderService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('cms:cmsOrder:update')") - @Operation(summary = "批量修改订单") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(cmsOrderService, "order_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('cms:cmsOrder:remove')") - @Operation(summary = "批量删除订单") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (cmsOrderService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsProductController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsProductController.java deleted file mode 100644 index ceee073..0000000 --- a/src/main/java/com/gxwebsoft/cms/controller/CmsProductController.java +++ /dev/null @@ -1,150 +0,0 @@ -package com.gxwebsoft.cms.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.cms.param.CmsProductSpecParam; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.cms.service.CmsProductService; -import com.gxwebsoft.cms.entity.CmsProduct; -import com.gxwebsoft.cms.param.CmsProductParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.system.entity.User; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 产品控制器 - * - * @author 科技小王子 - * @since 2024-09-27 16:03:44 - */ -@Tag(name = "产品管理") -@RestController -@RequestMapping("/api/cms/cms-product") -public class CmsProductController extends BaseController { - @Resource - private CmsProductService cmsProductService; - - @Operation(summary = "分页查询产品") - @GetMapping("/page") - public ApiResult> page(CmsProductParam param) { - // 使用关联查询 - return success(cmsProductService.pageRel(param)); - } - - @Operation(summary = "查询全部产品") - @GetMapping() - public ApiResult> list(CmsProductParam param) { - // 使用关联查询 - return success(cmsProductService.listRel(param)); - } - - @Operation(summary = "根据id查询产品") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(cmsProductService.getByIdRel(id)); - } - @PreAuthorize("hasAuthority('cms:cmsProduct:save')") - @OperationLog - @Operation(summary = "添加产品") - @PostMapping() - public ApiResult save(@RequestBody CmsProduct cmsProduct) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - cmsProduct.setUserId(loginUser.getUserId()); - } - if (cmsProductService.save(cmsProduct)) { - return success("添加成功"); - } - return fail("添加失败"); - } - @PreAuthorize("hasAuthority('cms:cmsProduct:update')") - @OperationLog - @Operation(summary = "修改产品") - @PutMapping() - public ApiResult update(@RequestBody CmsProduct cmsProduct) { - if (cmsProductService.updateById(cmsProduct)) { - return success("修改成功"); - } - return fail("修改失败"); - } - @PreAuthorize("hasAuthority('cms:cmsProduct:remove')") - @OperationLog - @Operation(summary = "删除产品") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (cmsProductService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - @PreAuthorize("hasAuthority('cms:cmsProduct:save')") - @OperationLog - @Operation(summary = "批量添加产品") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (cmsProductService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - @PreAuthorize("hasAuthority('cms:cmsProduct:update')") - @OperationLog - @Operation(summary = "批量修改产品") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(cmsProductService, "product_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - @PreAuthorize("hasAuthority('cms:cmsProduct:remove')") - @OperationLog - @Operation(summary = "批量删除产品") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (cmsProductService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @Operation(summary = "统计信息") - @GetMapping("/data") - public ApiResult> data(CmsProductSpecParam param) { - Map data = new HashMap<>(); - final LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - - if(param.getMerchantId() != null){ - wrapper.eq(CmsProduct::getMerchantId,param.getMerchantId()); - } - - Integer totalNum = Math.toIntExact(cmsProductService.count( - wrapper.eq(CmsProduct::getDeleted, 0).eq(CmsProduct::getStatus, 0) - )); - data.put("totalNum", totalNum); - - Integer totalNum2 = Math.toIntExact(cmsProductService.count( - wrapper.eq(CmsProduct::getStatus, 1) - )); - data.put("totalNum2", totalNum2); - - Integer totalNum3 = Math.toIntExact(cmsProductService.count( - wrapper.gt(CmsProduct::getStatus, 1) - )); - data.put("totalNum3", totalNum3); - - return success(data); - } -} diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsProductSpecController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsProductSpecController.java deleted file mode 100644 index b32d266..0000000 --- a/src/main/java/com/gxwebsoft/cms/controller/CmsProductSpecController.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.gxwebsoft.cms.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.cms.service.CmsProductSpecService; -import com.gxwebsoft.cms.entity.CmsProductSpec; -import com.gxwebsoft.cms.param.CmsProductSpecParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.system.entity.User; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 规格控制器 - * - * @author 科技小王子 - * @since 2024-09-27 16:03:44 - */ -@Tag(name = "规格管理") -@RestController -@RequestMapping("/api/cms/cms-product-spec") -public class CmsProductSpecController extends BaseController { - @Resource - private CmsProductSpecService cmsProductSpecService; - - @Operation(summary = "分页查询规格") - @GetMapping("/page") - public ApiResult> page(CmsProductSpecParam param) { - // 使用关联查询 - return success(cmsProductSpecService.pageRel(param)); - } - - @Operation(summary = "查询全部规格") - @GetMapping() - public ApiResult> list(CmsProductSpecParam param) { - // 使用关联查询 - return success(cmsProductSpecService.listRel(param)); - } - - @PreAuthorize("hasAuthority('cms:cmsProductSpec:list')") - @OperationLog - @Operation(summary = "根据id查询规格") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(cmsProductSpecService.getByIdRel(id)); - } - - @Operation(summary = "添加规格") - @PostMapping() - public ApiResult save(@RequestBody CmsProductSpec cmsProductSpec) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - cmsProductSpec.setUserId(loginUser.getUserId()); - } - if (cmsProductSpecService.save(cmsProductSpec)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @Operation(summary = "修改规格") - @PutMapping() - public ApiResult update(@RequestBody CmsProductSpec cmsProductSpec) { - if (cmsProductSpecService.updateById(cmsProductSpec)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @Operation(summary = "删除规格") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (cmsProductSpecService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @Operation(summary = "批量添加规格") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (cmsProductSpecService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @Operation(summary = "批量修改规格") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(cmsProductSpecService, "spec_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @Operation(summary = "批量删除规格") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (cmsProductSpecService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsProductSpecValueController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsProductSpecValueController.java deleted file mode 100644 index 659374d..0000000 --- a/src/main/java/com/gxwebsoft/cms/controller/CmsProductSpecValueController.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.gxwebsoft.cms.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.cms.service.CmsProductSpecValueService; -import com.gxwebsoft.cms.entity.CmsProductSpecValue; -import com.gxwebsoft.cms.param.CmsProductSpecValueParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 规格值控制器 - * - * @author 科技小王子 - * @since 2024-09-27 16:03:44 - */ -@Tag(name = "规格值管理") -@RestController -@RequestMapping("/api/cms/cms-product-spec-value") -public class CmsProductSpecValueController extends BaseController { - @Resource - private CmsProductSpecValueService cmsProductSpecValueService; - - @Operation(summary = "分页查询规格值") - @GetMapping("/page") - public ApiResult> page(CmsProductSpecValueParam param) { - // 使用关联查询 - return success(cmsProductSpecValueService.pageRel(param)); - } - - @Operation(summary = "查询全部规格值") - @GetMapping() - public ApiResult> list(CmsProductSpecValueParam param) { - // 使用关联查询 - return success(cmsProductSpecValueService.listRel(param)); - } - - @PreAuthorize("hasAuthority('cms:cmsProductSpecValue:list')") - @OperationLog - @Operation(summary = "根据id查询规格值") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(cmsProductSpecValueService.getByIdRel(id)); - } - - @Operation(summary = "添加规格值") - @PostMapping() - public ApiResult save(@RequestBody CmsProductSpecValue cmsProductSpecValue) { - if (cmsProductSpecValueService.save(cmsProductSpecValue)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @Operation(summary = "修改规格值") - @PutMapping() - public ApiResult update(@RequestBody CmsProductSpecValue cmsProductSpecValue) { - if (cmsProductSpecValueService.updateById(cmsProductSpecValue)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @Operation(summary = "删除规格值") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (cmsProductSpecValueService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @Operation(summary = "批量添加规格值") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (cmsProductSpecValueService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @Operation(summary = "批量修改规格值") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(cmsProductSpecValueService, "spec_value_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @Operation(summary = "批量删除规格值") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (cmsProductSpecValueService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsProductUrlController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsProductUrlController.java deleted file mode 100644 index b367be8..0000000 --- a/src/main/java/com/gxwebsoft/cms/controller/CmsProductUrlController.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.gxwebsoft.cms.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.cms.service.CmsProductUrlService; -import com.gxwebsoft.cms.entity.CmsProductUrl; -import com.gxwebsoft.cms.param.CmsProductUrlParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 域名控制器 - * - * @author 科技小王子 - * @since 2024-09-27 16:03:44 - */ -@Tag(name = "域名管理") -@RestController -@RequestMapping("/api/cms/cms-product-url") -public class CmsProductUrlController extends BaseController { - @Resource - private CmsProductUrlService cmsProductUrlService; - - @Operation(summary = "分页查询域名") - @GetMapping("/page") - public ApiResult> page(CmsProductUrlParam param) { - // 使用关联查询 - return success(cmsProductUrlService.pageRel(param)); - } - - @Operation(summary = "查询全部域名") - @GetMapping() - public ApiResult> list(CmsProductUrlParam param) { - // 使用关联查询 - return success(cmsProductUrlService.listRel(param)); - } - - @PreAuthorize("hasAuthority('cms:cmsProductUrl:list')") - @OperationLog - @Operation(summary = "根据id查询域名") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(cmsProductUrlService.getByIdRel(id)); - } - - @Operation(summary = "添加域名") - @PostMapping() - public ApiResult save(@RequestBody CmsProductUrl cmsProductUrl) { - if (cmsProductUrlService.save(cmsProductUrl)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @Operation(summary = "修改域名") - @PutMapping() - public ApiResult update(@RequestBody CmsProductUrl cmsProductUrl) { - if (cmsProductUrlService.updateById(cmsProductUrl)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @Operation(summary = "删除域名") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (cmsProductUrlService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @Operation(summary = "批量添加域名") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (cmsProductUrlService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @Operation(summary = "批量修改域名") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(cmsProductUrlService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @Operation(summary = "批量删除域名") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (cmsProductUrlService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsComponents.java b/src/main/java/com/gxwebsoft/cms/entity/CmsComponents.java deleted file mode 100644 index d4edc07..0000000 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsComponents.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.gxwebsoft.cms.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 组件 - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Schema(name = "CmsComponents对象", description = "组件") -public class CmsComponents implements Serializable { - private static final long serialVersionUID = 1L; - - @Schema(description = "ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @Schema(description = "组件标题") - private String title; - - @Schema(description = "关联导航ID") - private Integer navigationId; - - @Schema(description = "组件类型") - private String type; - - @Schema(description = "页面关键词") - private String keywords; - - @Schema(description = "页面描述") - private String description; - - @Schema(description = "组件路径") - private String path; - - @Schema(description = "组件图标") - private String icon; - - @Schema(description = "用户ID") - private Integer userId; - - @Schema(description = "排序(数字越小越靠前)") - private Integer sortNumber; - - @Schema(description = "备注") - private String comments; - - @Schema(description = "状态, 0正常, 1冻结") - private Integer status; - - @Schema(description = "租户id") - private Integer tenantId; - - @Schema(description = "创建时间") - private Date createTime; - -} diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsDesign.java b/src/main/java/com/gxwebsoft/cms/entity/CmsDesign.java index b424722..a562ef1 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsDesign.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsDesign.java @@ -29,12 +29,16 @@ public class CmsDesign implements Serializable { @TableId(value = "page_id", type = IdType.AUTO) private Integer pageId; - @Schema(description = "页面标题") + @Schema(description = "页面") private String name; @Schema(description = "所属栏目ID") private Integer categoryId; + @Schema(description = "所属栏目") + @TableField(exist = false) + private String categoryName; + @Schema(description = "页面模型") private String model; diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsMp.java b/src/main/java/com/gxwebsoft/cms/entity/CmsMp.java deleted file mode 100644 index e921212..0000000 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsMp.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.gxwebsoft.cms.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.TableLogic; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 小程序信息 - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Schema(name = "CmsMp对象", description = "小程序信息") -public class CmsMp implements Serializable { - private static final long serialVersionUID = 1L; - - @Schema(description = "ID") - @TableId(value = "mp_id", type = IdType.AUTO) - private Integer mpId; - - @Schema(description = "是否主账号") - private Integer type; - - @Schema(description = "小程序ID") - private String appId; - - @Schema(description = "小程序密钥") - private String appSecret; - - @Schema(description = "小程序名称") - private String mpName; - - @Schema(description = "小程序简称") - private String shortName; - - @Schema(description = "头像") - private String avatar; - - @Schema(description = "小程序码") - private String mpQrcode; - - @Schema(description = "微信认证") - private Integer authentication; - - @Schema(description = "主体信息") - private String companyName; - - @Schema(description = "小程序备案") - private String icpNo; - - @Schema(description = "登录邮箱") - private String email; - - @Schema(description = "登录密码") - private String password; - - @Schema(description = "原始ID") - private String ghId; - - @Schema(description = "入口页面") - private String mainPath; - - @Schema(description = "过期时间") - private Date expirationTime; - - @Schema(description = "排序(数字越小越靠前)") - private Integer sortNumber; - - @Schema(description = "介绍") - private String comments; - - @Schema(description = "用户ID") - private Integer userId; - - @Schema(description = "状态, 0正常, 1冻结") - private Integer status; - - @Schema(description = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @Schema(description = "租户id") - private Integer tenantId; - - @Schema(description = "创建时间") - private Date createTime; - -} diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsMpAd.java b/src/main/java/com/gxwebsoft/cms/entity/CmsMpAd.java deleted file mode 100644 index d724f96..0000000 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsMpAd.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.gxwebsoft.cms.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.TableLogic; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 小程序广告位 - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Schema(name = "CmsMpAd对象", description = "小程序广告位") -public class CmsMpAd implements Serializable { - private static final long serialVersionUID = 1L; - - @Schema(description = "ID") - @TableId(value = "ad_id", type = IdType.AUTO) - private Integer adId; - - @Schema(description = "页面ID") - private Integer pageId; - - @Schema(description = "广告类型") - private String adType; - - @Schema(description = "广告位名称") - private String name; - - @Schema(description = "宽") - private String width; - - @Schema(description = "高") - private String height; - - @Schema(description = "广告图片") - private String images; - - @Schema(description = "路由/链接地址") - private String path; - - @Schema(description = "页面名称") - private String pageName; - - @Schema(description = "用户ID") - private Integer userId; - - @Schema(description = "排序(数字越小越靠前)") - private Integer sortNumber; - - @Schema(description = "备注") - private String comments; - - @Schema(description = "状态, 0正常, 1冻结") - private Integer status; - - @Schema(description = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @Schema(description = "租户id") - private Integer tenantId; - - @Schema(description = "创建时间") - private Date createTime; - -} diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsMpField.java b/src/main/java/com/gxwebsoft/cms/entity/CmsMpField.java deleted file mode 100644 index 5363ce0..0000000 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsMpField.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.gxwebsoft.cms.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.TableLogic; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 小程序配置 - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Schema(name = "CmsMpField对象", description = "小程序配置") -public class CmsMpField implements Serializable { - private static final long serialVersionUID = 1L; - - @Schema(description = "自增ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @Schema(description = "类型，0文本 1图片 2其他") - private Integer type; - - @Schema(description = "名称") - private String name; - - @Schema(description = "备注") - private String comments; - - @Schema(description = "名称") - private String value; - - @Schema(description = "页面ID") - private Integer pageId; - - @Schema(description = "排序(数字越小越靠前)") - private Integer sortNumber; - - @Schema(description = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @Schema(description = "租户id") - private Integer tenantId; - - @Schema(description = "创建时间") - private Date createTime; - -} diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsMpMenu.java b/src/main/java/com/gxwebsoft/cms/entity/CmsMpMenu.java deleted file mode 100644 index 1739dbf..0000000 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsMpMenu.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.gxwebsoft.cms.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 小程序端菜单 - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Schema(name = "CmsMpMenu对象", description = "小程序端菜单") -public class CmsMpMenu implements Serializable { - private static final long serialVersionUID = 1L; - - @Schema(description = "ID") - @TableId(value = "menu_id", type = IdType.AUTO) - private Integer menuId; - - @Schema(description = "上级id, 0是顶级") - private Integer parentId; - - @Schema(description = "菜单名称") - private String title; - - @Schema(description = "类型 0功能图标 1订单状态图标 2首页导航图标 3 商城导航图标 4管理人员功能图标") - private Integer type; - - @Schema(description = "是否微信小程序菜单") - private Boolean isMpWeixin; - - @Schema(description = "菜单路由地址") - private String path; - - @Schema(description = "菜单组件地址, 目录可为空") - private String component; - - @Schema(description = "打开位置") - private String target; - - @Schema(description = "菜单图标") - private String avatar; - - @Schema(description = "图标颜色") - private String color; - - @Schema(description = "上传图标") - private String icon; - - @Schema(description = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)") - private Integer hide; - - @Schema(description = "位置 0不限 1顶部 2底部") - private Integer position; - - @Schema(description = "0 第一行 1第二行") - private Integer rows; - - @Schema(description = "菜单侧栏选中的path") - private String active; - - @Schema(description = "其它路由元信息") - private String meta; - - @Schema(description = "绑定的页面") - private Integer pageId; - - @Schema(description = "绑定的文章分类ID") - private Integer articleCategoryId; - - @Schema(description = "绑定的文章ID") - private Integer articleId; - - @Schema(description = "绑定的表单ID") - private Integer formId; - - @Schema(description = "绑定的知识库标识") - private String bookCode; - - @Schema(description = "绑定的商品分类ID") - private Integer goodsCategoryId; - - @Schema(description = "绑定的商品ID") - private Integer goodsId; - - @Schema(description = "用户ID") - private Integer userId; - - @Schema(description = "是否管理人员可见") - private Integer adminShow; - - @Schema(description = "设为首页") - private Integer home; - - @Schema(description = "分组名称") - private String groupName; - - @Schema(description = "排序(数字越小越靠前)") - private Integer sortNumber; - - @Schema(description = "备注") - private String comments; - - @Schema(description = "状态, 0正常, 1冻结") - private Integer status; - - @Schema(description = "租户id") - private Integer tenantId; - - @Schema(description = "创建时间") - private Date createTime; - -} diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsMpPages.java b/src/main/java/com/gxwebsoft/cms/entity/CmsMpPages.java deleted file mode 100644 index adc22cc..0000000 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsMpPages.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.gxwebsoft.cms.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.TableLogic; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 小程序页面 - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Schema(name = "CmsMpPages对象", description = "小程序页面") -public class CmsMpPages implements Serializable { - private static final long serialVersionUID = 1L; - - @Schema(description = "ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @Schema(description = "上级id, 0是顶级") - private Integer parentId; - - @Schema(description = "页面名称") - private String title; - - @Schema(description = "页面路径") - private String path; - - @Schema(description = "设为首页") - private Integer home; - - @Schema(description = "分包") - private String subpackage; - - @Schema(description = "图标") - private String icon; - - @Schema(description = "未选中图标") - private String iconPath; - - @Schema(description = "选中的图标") - private String selectedIconPath; - - @Schema(description = "排序(数字越小越靠前)") - private Integer sortNumber; - - @Schema(description = "备注") - private String comments; - - @Schema(description = "用户ID") - private Integer userId; - - @Schema(description = "状态, 0正常, 1冻结") - private Integer status; - - @Schema(description = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @Schema(description = "租户id") - private Integer tenantId; - - @Schema(description = "创建时间") - private Date createTime; - -} diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsOrder.java b/src/main/java/com/gxwebsoft/cms/entity/CmsOrder.java deleted file mode 100644 index eceb20e..0000000 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsOrder.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.gxwebsoft.cms.entity; - -import java.math.BigDecimal; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.TableLogic; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 订单 - * - * @author 科技小王子 - * @since 2024-11-25 12:14:05 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Schema(name = "CmsOrder对象", description = "订单") -public class CmsOrder implements Serializable { - private static final long serialVersionUID = 1L; - - @Schema(description = "订单号") - @TableId(value = "order_id", type = IdType.AUTO) - private Integer orderId; - - @Schema(description = "订单标题") - private String title; - - @Schema(description = "模型名称") - private String model; - - @Schema(description = "订单编号") - private String orderNo; - - @Schema(description = "订单类型，0商城 1询价 2留言") - private Integer type; - - @Schema(description = "关联文章ID") - private Integer articleId; - - @Schema(description = "关联网站ID") - private Integer websiteId; - - @Schema(description = "真实姓名") - private String realName; - - @Schema(description = "手机号码") - private String phone; - - @Schema(description = "电子邮箱") - private String email; - - @Schema(description = "联系地址") - private String address; - - @Schema(description = "订单内容") - private String content; - - @Schema(description = "订单附件") - private String files; - - @Schema(description = "订单总额") - private BigDecimal totalPrice; - - @Schema(description = "实际付款") - private BigDecimal payPrice; - - @Schema(description = "报价询价") - private BigDecimal price; - - @Schema(description = "购买数量") - private Integer totalNum; - - @Schema(description = "二维码地址，保存订单号，支付成功后才生成") - private String qrcode; - - @Schema(description = "下单渠道，0网站 1小程序 2其他") - private Integer channel; - - @Schema(description = "过期时间") - private Date expirationTime; - - @Schema(description = "订单是否已结算(0未结算 1已结算)") - private Boolean isSettled; - - @Schema(description = "用户id") - private Integer userId; - - @Schema(description = "国际化语言") - private String lang; - - @Schema(description = "备注") - private String comments; - - @Schema(description = "排序号") - private Integer sortNumber; - - @Schema(description = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @Schema(description = "租户id") - private Integer tenantId; - - @Schema(description = "创建时间") - private Date createTime; - - @Schema(description = "图像验证码") - @TableField(exist = false) - private String code; - - @Schema(description = "栏目ID") - @TableField(exist = false) - private Integer categoryId; - - public String getLang() { - if(this.lang == null || this.lang.equals("zh")){ - return "zh_CN"; - } - return this.lang; - } -} diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsProduct.java b/src/main/java/com/gxwebsoft/cms/entity/CmsProduct.java deleted file mode 100644 index 4d7bce4..0000000 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsProduct.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.gxwebsoft.cms.entity; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.TableLogic; -import java.io.Serializable; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 产品 - * - * @author 科技小王子 - * @since 2024-09-27 16:03:44 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Schema(name = "CmsProduct对象", description = "产品") -public class CmsProduct implements Serializable { - private static final long serialVersionUID = 1L; - - @Schema(description = "自增ID") - @TableId(value = "product_id", type = IdType.AUTO) - private Integer productId; - - @Schema(description = "类型 0软件产品 1实物商品 2虚拟商品") - private Integer type; - - @Schema(description = "产品编码") - private String code; - - @Schema(description = "产品标题") - private String title; - - @Schema(description = "封面图") - private String image; - - @Schema(description = "标签") - private String tag; - - @Schema(description = "产品详情") - private String content; - - @Schema(description = "父级分类ID") - private Integer parentId; - - @Schema(description = "产品分类ID") - private Integer categoryId; - - @Schema(description = "产品规格 0单规格 1多规格") - private Integer specs; - - @Schema(description = "货架") - private String position; - - @Schema(description = "单位名称 (个)") - private String unitName; - - @Schema(description = "进货价格") - private BigDecimal price; - - @Schema(description = "销售价格") - private BigDecimal salePrice; - - @Schema(description = "库存计算方式(10下单减库存 20付款减库存)") - private Integer deductStockType; - - @Schema(description = "轮播图") - private String files; - - @Schema(description = "销量") - private Integer sales; - - @Schema(description = "库存") - private Integer stock; - - @Schema(description = "消费赚取积分") - private BigDecimal gainIntegral; - - @Schema(description = "推荐") - private Integer recommend; - - @Schema(description = "商户ID") - private Long merchantId; - - @Schema(description = "状态（0：未上架，1：上架）") - private Boolean isShow; - - @Schema(description = "状态, 0上架 1待上架 2待审核 3审核不通过") - private Integer status; - - @Schema(description = "备注") - private String comments; - - @Schema(description = "排序号") - private Integer sortNumber; - - @Schema(description = "用户ID") - private Integer userId; - - @Schema(description = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @Schema(description = "租户id") - private Integer tenantId; - - @Schema(description = "创建时间") - private Date createTime; - - @Schema(description = "修改时间") - private Date updateTime; - -} diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsProductSpec.java b/src/main/java/com/gxwebsoft/cms/entity/CmsProductSpec.java deleted file mode 100644 index b4d0967..0000000 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsProductSpec.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.gxwebsoft.cms.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; -import java.io.Serializable; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 规格 - * - * @author 科技小王子 - * @since 2024-09-27 16:03:44 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Schema(name = "CmsProductSpec对象", description = "规格") -public class CmsProductSpec implements Serializable { - private static final long serialVersionUID = 1L; - - @Schema(description = "规格ID") - @TableId(value = "spec_id", type = IdType.AUTO) - private Integer specId; - - @Schema(description = "规格名称") - private String specName; - - @Schema(description = "规格值") - private String specValue; - - @Schema(description = "创建用户") - private Integer userId; - - @Schema(description = "更新者") - private Integer updater; - - @Schema(description = "备注") - private String comments; - - @Schema(description = "状态, 0正常, 1待修,2异常已修，3异常未修") - private Integer status; - - @Schema(description = "排序号") - private Integer sortNumber; - - @Schema(description = "租户id") - private Integer tenantId; - - @Schema(description = "创建时间") - private Date createTime; - -} diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsProductSpecValue.java b/src/main/java/com/gxwebsoft/cms/entity/CmsProductSpecValue.java deleted file mode 100644 index f718359..0000000 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsProductSpecValue.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.gxwebsoft.cms.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; -import java.io.Serializable; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 规格值 - * - * @author 科技小王子 - * @since 2024-09-27 16:03:44 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Schema(name = "CmsProductSpecValue对象", description = "规格值") -public class CmsProductSpecValue implements Serializable { - private static final long serialVersionUID = 1L; - - @Schema(description = "规格值ID") - @TableId(value = "spec_value_id", type = IdType.AUTO) - private Integer specValueId; - - @Schema(description = "规格组ID") - private Integer specId; - - @Schema(description = "规格值") - private String specValue; - - @Schema(description = "备注") - private String comments; - - @Schema(description = "排序号") - private Integer sortNumber; - - @Schema(description = "租户id") - private Integer tenantId; - - @Schema(description = "创建时间") - private Date createTime; - -} diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsProductUrl.java b/src/main/java/com/gxwebsoft/cms/entity/CmsProductUrl.java deleted file mode 100644 index 73064b5..0000000 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsProductUrl.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.gxwebsoft.cms.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.util.Date; -import java.io.Serializable; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 域名 - * - * @author 科技小王子 - * @since 2024-09-27 16:03:44 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Schema(name = "CmsProductUrl对象", description = "域名") -public class CmsProductUrl implements Serializable { - private static final long serialVersionUID = 1L; - - @Schema(description = "自增ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @Schema(description = "产品ID") - private Integer productId; - - @Schema(description = "域名类型") - private String type; - - @Schema(description = "域名") - private String domain; - - @Schema(description = "账号") - private String account; - - @Schema(description = "密码") - private String password; - - @Schema(description = "商户ID") - private Long merchantId; - - @Schema(description = "备注") - private String comments; - - @Schema(description = "排序(数字越小越靠前)") - private Integer sortNumber; - - @Schema(description = "状态, 0正常, 1待确认") - private Integer status; - - @Schema(description = "创建时间") - private Date createTime; - - @Schema(description = "租户id") - private Integer tenantId; - -} diff --git a/src/main/java/com/gxwebsoft/cms/mapper/CmsComponentsMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/CmsComponentsMapper.java deleted file mode 100644 index 1b64edb..0000000 --- a/src/main/java/com/gxwebsoft/cms/mapper/CmsComponentsMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.cms.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.cms.entity.CmsComponents; -import com.gxwebsoft.cms.param.CmsComponentsParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 组件Mapper - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -public interface CmsComponentsMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") CmsComponentsParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") CmsComponentsParam param); - -} diff --git a/src/main/java/com/gxwebsoft/cms/mapper/CmsMpAdMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/CmsMpAdMapper.java deleted file mode 100644 index 63e9029..0000000 --- a/src/main/java/com/gxwebsoft/cms/mapper/CmsMpAdMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.cms.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.cms.entity.CmsMpAd; -import com.gxwebsoft.cms.param.CmsMpAdParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 小程序广告位Mapper - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -public interface CmsMpAdMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") CmsMpAdParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") CmsMpAdParam param); - -} diff --git a/src/main/java/com/gxwebsoft/cms/mapper/CmsMpFieldMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/CmsMpFieldMapper.java deleted file mode 100644 index 68c141a..0000000 --- a/src/main/java/com/gxwebsoft/cms/mapper/CmsMpFieldMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.cms.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.cms.entity.CmsMpField; -import com.gxwebsoft.cms.param.CmsMpFieldParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 小程序配置Mapper - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -public interface CmsMpFieldMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") CmsMpFieldParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") CmsMpFieldParam param); - -} diff --git a/src/main/java/com/gxwebsoft/cms/mapper/CmsMpMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/CmsMpMapper.java deleted file mode 100644 index 1d6f315..0000000 --- a/src/main/java/com/gxwebsoft/cms/mapper/CmsMpMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.cms.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.cms.entity.CmsMp; -import com.gxwebsoft.cms.param.CmsMpParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 小程序信息Mapper - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -public interface CmsMpMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") CmsMpParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") CmsMpParam param); - -} diff --git a/src/main/java/com/gxwebsoft/cms/mapper/CmsMpMenuMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/CmsMpMenuMapper.java deleted file mode 100644 index 3d1b7cd..0000000 --- a/src/main/java/com/gxwebsoft/cms/mapper/CmsMpMenuMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.cms.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.cms.entity.CmsMpMenu; -import com.gxwebsoft.cms.param.CmsMpMenuParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 小程序端菜单Mapper - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -public interface CmsMpMenuMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") CmsMpMenuParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") CmsMpMenuParam param); - -} diff --git a/src/main/java/com/gxwebsoft/cms/mapper/CmsMpPagesMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/CmsMpPagesMapper.java deleted file mode 100644 index 70995b5..0000000 --- a/src/main/java/com/gxwebsoft/cms/mapper/CmsMpPagesMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.cms.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.cms.entity.CmsMpPages; -import com.gxwebsoft.cms.param.CmsMpPagesParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 小程序页面Mapper - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -public interface CmsMpPagesMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") CmsMpPagesParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") CmsMpPagesParam param); - -} diff --git a/src/main/java/com/gxwebsoft/cms/mapper/CmsOrderMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/CmsOrderMapper.java deleted file mode 100644 index a4d0e9e..0000000 --- a/src/main/java/com/gxwebsoft/cms/mapper/CmsOrderMapper.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.cms.mapper; - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.cms.entity.CmsNavigation; -import com.gxwebsoft.cms.entity.CmsOrder; -import com.gxwebsoft.cms.param.CmsNavigationParam; -import com.gxwebsoft.cms.param.CmsOrderParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 订单Mapper - * - * @author 科技小王子 - * @since 2024-11-25 12:14:05 - */ -public interface CmsOrderMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") CmsOrderParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") CmsOrderParam param); - - @InterceptorIgnore(tenantLine = "true") - List selectListAllRel(@Param("param") CmsOrderParam param); -} diff --git a/src/main/java/com/gxwebsoft/cms/mapper/CmsProductMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/CmsProductMapper.java deleted file mode 100644 index 5abc070..0000000 --- a/src/main/java/com/gxwebsoft/cms/mapper/CmsProductMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.cms.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.cms.entity.CmsProduct; -import com.gxwebsoft.cms.param.CmsProductParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 产品Mapper - * - * @author 科技小王子 - * @since 2024-09-27 16:03:44 - */ -public interface CmsProductMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") CmsProductParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") CmsProductParam param); - -} diff --git a/src/main/java/com/gxwebsoft/cms/mapper/CmsProductSpecMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/CmsProductSpecMapper.java deleted file mode 100644 index ce73ad8..0000000 --- a/src/main/java/com/gxwebsoft/cms/mapper/CmsProductSpecMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.cms.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.cms.entity.CmsProductSpec; -import com.gxwebsoft.cms.param.CmsProductSpecParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 规格Mapper - * - * @author 科技小王子 - * @since 2024-09-27 16:03:44 - */ -public interface CmsProductSpecMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") CmsProductSpecParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") CmsProductSpecParam param); - -} diff --git a/src/main/java/com/gxwebsoft/cms/mapper/CmsProductSpecValueMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/CmsProductSpecValueMapper.java deleted file mode 100644 index 9885e18..0000000 --- a/src/main/java/com/gxwebsoft/cms/mapper/CmsProductSpecValueMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.cms.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.cms.entity.CmsProductSpecValue; -import com.gxwebsoft.cms.param.CmsProductSpecValueParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 规格值Mapper - * - * @author 科技小王子 - * @since 2024-09-27 16:03:44 - */ -public interface CmsProductSpecValueMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") CmsProductSpecValueParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") CmsProductSpecValueParam param); - -} diff --git a/src/main/java/com/gxwebsoft/cms/mapper/CmsProductUrlMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/CmsProductUrlMapper.java deleted file mode 100644 index 5bd2486..0000000 --- a/src/main/java/com/gxwebsoft/cms/mapper/CmsProductUrlMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.cms.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.cms.entity.CmsProductUrl; -import com.gxwebsoft.cms.param.CmsProductUrlParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 域名Mapper - * - * @author 科技小王子 - * @since 2024-09-27 16:03:44 - */ -public interface CmsProductUrlMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") CmsProductUrlParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") CmsProductUrlParam param); - -} diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsComponentsMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsComponentsMapper.xml deleted file mode 100644 index 56c3e24..0000000 --- a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsComponentsMapper.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - SELECT a.* - FROM cms_components a - - - AND a.id = #{param.id} - - - AND a.title LIKE CONCAT('%', #{param.title}, '%') - - - AND a.navigation_id = #{param.navigationId} - - - AND a.type LIKE CONCAT('%', #{param.type}, '%') - - - AND a.keywords LIKE CONCAT('%', #{param.keywords}, '%') - - - AND a.description LIKE CONCAT('%', #{param.description}, '%') - - - AND a.path LIKE CONCAT('%', #{param.path}, '%') - - - AND a.icon LIKE CONCAT('%', #{param.icon}, '%') - - - AND a.user_id = #{param.userId} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsDesignMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsDesignMapper.xml index ed0f2d5..def6547 100644 --- a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsDesignMapper.xml +++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsDesignMapper.xml @@ -4,7 +4,7 @@ - SELECT a.*,b.lang_category_id + SELECT a.*,b.lang_category_id, b.title as categoryName FROM cms_design a LEFT JOIN cms_navigation b ON a.category_id = b.navigation_id diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsMpAdMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsMpAdMapper.xml deleted file mode 100644 index 798715d..0000000 --- a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsMpAdMapper.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - SELECT a.* - FROM cms_mp_ad a - - - AND a.ad_id = #{param.adId} - - - AND a.page_id = #{param.pageId} - - - AND a.ad_type LIKE CONCAT('%', #{param.adType}, '%') - - - AND a.name LIKE CONCAT('%', #{param.name}, '%') - - - AND a.width LIKE CONCAT('%', #{param.width}, '%') - - - AND a.height LIKE CONCAT('%', #{param.height}, '%') - - - AND a.images LIKE CONCAT('%', #{param.images}, '%') - - - AND a.path LIKE CONCAT('%', #{param.path}, '%') - - - AND a.page_name LIKE CONCAT('%', #{param.pageName}, '%') - - - AND a.user_id = #{param.userId} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsMpFieldMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsMpFieldMapper.xml deleted file mode 100644 index d7c0cda..0000000 --- a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsMpFieldMapper.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - SELECT a.* - FROM cms_mp_field a - - - AND a.id = #{param.id} - - - AND a.type = #{param.type} - - - AND a.name LIKE CONCAT('%', #{param.name}, '%') - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.value LIKE CONCAT('%', #{param.value}, '%') - - - AND a.page_id = #{param.pageId} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsMpMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsMpMapper.xml deleted file mode 100644 index 6cf57e5..0000000 --- a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsMpMapper.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - SELECT a.* - FROM cms_mp a - - - AND a.mp_id = #{param.mpId} - - - AND a.type = #{param.type} - - - AND a.app_id LIKE CONCAT('%', #{param.appId}, '%') - - - AND a.app_secret LIKE CONCAT('%', #{param.appSecret}, '%') - - - AND a.mp_name LIKE CONCAT('%', #{param.mpName}, '%') - - - AND a.short_name LIKE CONCAT('%', #{param.shortName}, '%') - - - AND a.avatar LIKE CONCAT('%', #{param.avatar}, '%') - - - AND a.mp_qrcode LIKE CONCAT('%', #{param.mpQrcode}, '%') - - - AND a.authentication = #{param.authentication} - - - AND a.company_name LIKE CONCAT('%', #{param.companyName}, '%') - - - AND a.icp_no LIKE CONCAT('%', #{param.icpNo}, '%') - - - AND a.email LIKE CONCAT('%', #{param.email}, '%') - - - AND a.password LIKE CONCAT('%', #{param.password}, '%') - - - AND a.gh_id LIKE CONCAT('%', #{param.ghId}, '%') - - - AND a.main_path LIKE CONCAT('%', #{param.mainPath}, '%') - - - AND a.expiration_time LIKE CONCAT('%', #{param.expirationTime}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.user_id = #{param.userId} - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsMpMenuMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsMpMenuMapper.xml deleted file mode 100644 index 7ac324c..0000000 --- a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsMpMenuMapper.xml +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - SELECT a.* - FROM cms_mp_menu a - - - AND a.menu_id = #{param.menuId} - - - AND a.parent_id = #{param.parentId} - - - AND a.title LIKE CONCAT('%', #{param.title}, '%') - - - AND a.type = #{param.type} - - - AND a.is_mp_weixin = #{param.isMpWeixin} - - - AND a.path LIKE CONCAT('%', #{param.path}, '%') - - - AND a.component LIKE CONCAT('%', #{param.component}, '%') - - - AND a.target LIKE CONCAT('%', #{param.target}, '%') - - - AND a.avatar LIKE CONCAT('%', #{param.avatar}, '%') - - - AND a.color LIKE CONCAT('%', #{param.color}, '%') - - - AND a.icon LIKE CONCAT('%', #{param.icon}, '%') - - - AND a.hide = #{param.hide} - - - AND a.position = #{param.position} - - - AND a.rows = #{param.rows} - - - AND a.active LIKE CONCAT('%', #{param.active}, '%') - - - AND a.meta LIKE CONCAT('%', #{param.meta}, '%') - - - AND a.page_id = #{param.pageId} - - - AND a.article_category_id = #{param.articleCategoryId} - - - AND a.article_id = #{param.articleId} - - - AND a.form_id = #{param.formId} - - - AND a.book_code LIKE CONCAT('%', #{param.bookCode}, '%') - - - AND a.goods_category_id = #{param.goodsCategoryId} - - - AND a.goods_id = #{param.goodsId} - - - AND a.user_id = #{param.userId} - - - AND a.admin_show = #{param.adminShow} - - - AND a.home = #{param.home} - - - AND a.group_name LIKE CONCAT('%', #{param.groupName}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsMpPagesMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsMpPagesMapper.xml deleted file mode 100644 index 08fcf49..0000000 --- a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsMpPagesMapper.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - SELECT a.* - FROM cms_mp_pages a - - - AND a.id = #{param.id} - - - AND a.parent_id = #{param.parentId} - - - AND a.title LIKE CONCAT('%', #{param.title}, '%') - - - AND a.path LIKE CONCAT('%', #{param.path}, '%') - - - AND a.home = #{param.home} - - - AND a.subpackage LIKE CONCAT('%', #{param.subpackage}, '%') - - - AND a.icon LIKE CONCAT('%', #{param.icon}, '%') - - - AND a.icon_path LIKE CONCAT('%', #{param.iconPath}, '%') - - - AND a.selected_icon_path LIKE CONCAT('%', #{param.selectedIconPath}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.user_id = #{param.userId} - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsOrderMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsOrderMapper.xml deleted file mode 100644 index e167b20..0000000 --- a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsOrderMapper.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - SELECT a.*, b.category_id, c.user_id as websiteUserId - FROM cms_order a - LEFT JOIN cms_article b ON a.article_id = b.article_id - LEFT JOIN cms_website c ON a.tenant_id = c.tenant_id - - - AND a.order_id = #{param.orderId} - - - AND a.title LIKE CONCAT('%', #{param.title}, '%') - - - AND a.order_no LIKE CONCAT('%', #{param.orderNo}, '%') - - - AND a.model = #{param.model} - - - AND a.lang = #{param.lang} - - - AND a.type = #{param.type} - - - AND a.article_id = #{param.articleId} - - - AND a.website_id = #{param.websiteId} - - - AND a.real_name LIKE CONCAT('%', #{param.realName}, '%') - - - AND a.phone LIKE CONCAT('%', #{param.phone}, '%') - - - AND a.email LIKE CONCAT('%', #{param.email}, '%') - - - AND a.content LIKE CONCAT('%', #{param.content}, '%') - - - AND a.total_price = #{param.totalPrice} - - - AND a.pay_price = #{param.payPrice} - - - AND a.price = #{param.price} - - - AND a.total_num = #{param.totalNum} - - - AND a.qrcode LIKE CONCAT('%', #{param.qrcode}, '%') - - - AND a.channel = #{param.channel} - - - AND a.expiration_time LIKE CONCAT('%', #{param.expirationTime}, '%') - - - AND a.is_settled = #{param.isSettled} - - - AND a.user_id = #{param.userId} - - - AND c.user_id = #{param.websiteUserId} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - OR a.title LIKE CONCAT('%', #{param.keywords}, '%') - OR a.content LIKE CONCAT('%', #{param.keywords}, '%') - OR a.phone = #{param.keywords} - ) - - - - - - - - - - - - - diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsProductMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsProductMapper.xml deleted file mode 100644 index dc2a719..0000000 --- a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsProductMapper.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - SELECT a.* - FROM cms_product a - - - AND a.product_id = #{param.productId} - - - AND a.type = #{param.type} - - - AND a.code LIKE CONCAT('%', #{param.code}, '%') - - - AND a.title LIKE CONCAT('%', #{param.title}, '%') - - - AND a.image LIKE CONCAT('%', #{param.image}, '%') - - - AND a.content LIKE CONCAT('%', #{param.content}, '%') - - - AND a.parent_id = #{param.parentId} - - - AND a.category_id = #{param.categoryId} - - - AND a.specs = #{param.specs} - - - AND a.position LIKE CONCAT('%', #{param.position}, '%') - - - AND a.unit_name LIKE CONCAT('%', #{param.unitName}, '%') - - - AND a.price = #{param.price} - - - AND a.sale_price = #{param.salePrice} - - - AND a.deduct_stock_type = #{param.deductStockType} - - - AND a.files LIKE CONCAT('%', #{param.files}, '%') - - - AND a.sales = #{param.sales} - - - AND a.stock = #{param.stock} - - - AND a.gain_integral = #{param.gainIntegral} - - - AND a.recommend = #{param.recommend} - - - AND a.merchant_id = #{param.merchantId} - - - AND a.is_show = #{param.isShow} - - - AND a.status = #{param.status} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.user_id = #{param.userId} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsProductSpecMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsProductSpecMapper.xml deleted file mode 100644 index 08ee497..0000000 --- a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsProductSpecMapper.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - SELECT a.* - FROM cms_product_spec a - - - AND a.spec_id = #{param.specId} - - - AND a.spec_name LIKE CONCAT('%', #{param.specName}, '%') - - - AND a.spec_value LIKE CONCAT('%', #{param.specValue}, '%') - - - AND a.user_id = #{param.userId} - - - AND a.updater = #{param.updater} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsProductSpecValueMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsProductSpecValueMapper.xml deleted file mode 100644 index acc1723..0000000 --- a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsProductSpecValueMapper.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - SELECT a.* - FROM cms_product_spec_value a - - - AND a.spec_value_id = #{param.specValueId} - - - AND a.spec_id = #{param.specId} - - - AND a.spec_value LIKE CONCAT('%', #{param.specValue}, '%') - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsProductUrlMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsProductUrlMapper.xml deleted file mode 100644 index fb42be5..0000000 --- a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsProductUrlMapper.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - SELECT a.* - FROM cms_product_url a - - - AND a.id = #{param.id} - - - AND a.product_id = #{param.productId} - - - AND a.type LIKE CONCAT('%', #{param.type}, '%') - - - AND a.domain LIKE CONCAT('%', #{param.domain}, '%') - - - AND a.account LIKE CONCAT('%', #{param.account}, '%') - - - AND a.password LIKE CONCAT('%', #{param.password}, '%') - - - AND a.merchant_id = #{param.merchantId} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.status = #{param.status} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsComponentsParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsComponentsParam.java deleted file mode 100644 index 9be566f..0000000 --- a/src/main/java/com/gxwebsoft/cms/param/CmsComponentsParam.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.gxwebsoft.cms.param; - -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 组件查询参数 - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@Schema(name = "CmsComponentsParam对象", description = "组件查询参数") -public class CmsComponentsParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @Schema(description = "ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @Schema(description = "组件标题") - private String title; - - @Schema(description = "关联导航ID") - @QueryField(type = QueryType.EQ) - private Integer navigationId; - - @Schema(description = "组件类型") - private String type; - - @Schema(description = "页面关键词") - private String keywords; - - @Schema(description = "页面描述") - private String description; - - @Schema(description = "组件路径") - private String path; - - @Schema(description = "组件图标") - private String icon; - - @Schema(description = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @Schema(description = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @Schema(description = "备注") - private String comments; - - @Schema(description = "状态, 0正常, 1冻结") - @QueryField(type = QueryType.EQ) - private Integer status; - -} diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsMpAdParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsMpAdParam.java deleted file mode 100644 index 0d807af..0000000 --- a/src/main/java/com/gxwebsoft/cms/param/CmsMpAdParam.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.gxwebsoft.cms.param; - -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 小程序广告位查询参数 - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@Schema(name = "CmsMpAdParam对象", description = "小程序广告位查询参数") -public class CmsMpAdParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @Schema(description = "ID") - @QueryField(type = QueryType.EQ) - private Integer adId; - - @Schema(description = "页面ID") - @QueryField(type = QueryType.EQ) - private Integer pageId; - - @Schema(description = "广告类型") - private String adType; - - @Schema(description = "广告位名称") - private String name; - - @Schema(description = "宽") - private String width; - - @Schema(description = "高") - private String height; - - @Schema(description = "广告图片") - private String images; - - @Schema(description = "路由/链接地址") - private String path; - - @Schema(description = "页面名称") - private String pageName; - - @Schema(description = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @Schema(description = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @Schema(description = "备注") - private String comments; - - @Schema(description = "状态, 0正常, 1冻结") - @QueryField(type = QueryType.EQ) - private Integer status; - - @Schema(description = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - -} diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsMpFieldParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsMpFieldParam.java deleted file mode 100644 index 4717e19..0000000 --- a/src/main/java/com/gxwebsoft/cms/param/CmsMpFieldParam.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.gxwebsoft.cms.param; - -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 小程序配置查询参数 - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@Schema(name = "CmsMpFieldParam对象", description = "小程序配置查询参数") -public class CmsMpFieldParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @Schema(description = "自增ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @Schema(description = "类型，0文本 1图片 2其他") - @QueryField(type = QueryType.EQ) - private Integer type; - - @Schema(description = "名称") - private String name; - - @Schema(description = "备注") - private String comments; - - @Schema(description = "名称") - private String value; - - @Schema(description = "页面ID") - @QueryField(type = QueryType.EQ) - private Integer pageId; - - @Schema(description = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @Schema(description = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - -} diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsMpMenuParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsMpMenuParam.java deleted file mode 100644 index 4cece86..0000000 --- a/src/main/java/com/gxwebsoft/cms/param/CmsMpMenuParam.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.gxwebsoft.cms.param; - -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 小程序端菜单查询参数 - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@Schema(name = "CmsMpMenuParam对象", description = "小程序端菜单查询参数") -public class CmsMpMenuParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @Schema(description = "ID") - @QueryField(type = QueryType.EQ) - private Integer menuId; - - @Schema(description = "上级id, 0是顶级") - @QueryField(type = QueryType.EQ) - private Integer parentId; - - @Schema(description = "菜单名称") - private String title; - - @Schema(description = "类型 0功能图标 1订单状态图标 2首页导航图标 3 商城导航图标 4管理人员功能图标") - @QueryField(type = QueryType.EQ) - private Integer type; - - @Schema(description = "是否微信小程序菜单") - @QueryField(type = QueryType.EQ) - private Boolean isMpWeixin; - - @Schema(description = "菜单路由地址") - private String path; - - @Schema(description = "菜单组件地址, 目录可为空") - private String component; - - @Schema(description = "打开位置") - private String target; - - @Schema(description = "菜单图标") - private String avatar; - - @Schema(description = "图标颜色") - private String color; - - @Schema(description = "上传图标") - private String icon; - - @Schema(description = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)") - @QueryField(type = QueryType.EQ) - private Integer hide; - - @Schema(description = "位置 0不限 1顶部 2底部") - @QueryField(type = QueryType.EQ) - private Integer position; - - @Schema(description = "0 第一行 1第二行") - @QueryField(type = QueryType.EQ) - private Integer rows; - - @Schema(description = "菜单侧栏选中的path") - private String active; - - @Schema(description = "其它路由元信息") - private String meta; - - @Schema(description = "绑定的页面") - @QueryField(type = QueryType.EQ) - private Integer pageId; - - @Schema(description = "绑定的文章分类ID") - @QueryField(type = QueryType.EQ) - private Integer articleCategoryId; - - @Schema(description = "绑定的文章ID") - @QueryField(type = QueryType.EQ) - private Integer articleId; - - @Schema(description = "绑定的表单ID") - @QueryField(type = QueryType.EQ) - private Integer formId; - - @Schema(description = "绑定的知识库标识") - private String bookCode; - - @Schema(description = "绑定的商品分类ID") - @QueryField(type = QueryType.EQ) - private Integer goodsCategoryId; - - @Schema(description = "绑定的商品ID") - @QueryField(type = QueryType.EQ) - private Integer goodsId; - - @Schema(description = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @Schema(description = "是否管理人员可见") - @QueryField(type = QueryType.EQ) - private Integer adminShow; - - @Schema(description = "设为首页") - @QueryField(type = QueryType.EQ) - private Integer home; - - @Schema(description = "分组名称") - private String groupName; - - @Schema(description = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @Schema(description = "备注") - private String comments; - - @Schema(description = "状态, 0正常, 1冻结") - @QueryField(type = QueryType.EQ) - private Integer status; - -} diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsMpPagesParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsMpPagesParam.java deleted file mode 100644 index e93a5f4..0000000 --- a/src/main/java/com/gxwebsoft/cms/param/CmsMpPagesParam.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.gxwebsoft.cms.param; - -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 小程序页面查询参数 - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@Schema(name = "CmsMpPagesParam对象", description = "小程序页面查询参数") -public class CmsMpPagesParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @Schema(description = "ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @Schema(description = "上级id, 0是顶级") - @QueryField(type = QueryType.EQ) - private Integer parentId; - - @Schema(description = "页面名称") - private String title; - - @Schema(description = "页面路径") - private String path; - - @Schema(description = "设为首页") - @QueryField(type = QueryType.EQ) - private Integer home; - - @Schema(description = "分包") - private String subpackage; - - @Schema(description = "图标") - private String icon; - - @Schema(description = "未选中图标") - private String iconPath; - - @Schema(description = "选中的图标") - private String selectedIconPath; - - @Schema(description = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @Schema(description = "备注") - private String comments; - - @Schema(description = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @Schema(description = "状态, 0正常, 1冻结") - @QueryField(type = QueryType.EQ) - private Integer status; - - @Schema(description = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - -} diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsMpParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsMpParam.java deleted file mode 100644 index e428af2..0000000 --- a/src/main/java/com/gxwebsoft/cms/param/CmsMpParam.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.gxwebsoft.cms.param; - -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 小程序信息查询参数 - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@Schema(name = "CmsMpParam对象", description = "小程序信息查询参数") -public class CmsMpParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @Schema(description = "ID") - @QueryField(type = QueryType.EQ) - private Integer mpId; - - @Schema(description = "是否主账号") - @QueryField(type = QueryType.EQ) - private Integer type; - - @Schema(description = "小程序ID") - private String appId; - - @Schema(description = "小程序密钥") - private String appSecret; - - @Schema(description = "小程序名称") - private String mpName; - - @Schema(description = "小程序简称") - private String shortName; - - @Schema(description = "头像") - private String avatar; - - @Schema(description = "小程序码") - private String mpQrcode; - - @Schema(description = "微信认证") - @QueryField(type = QueryType.EQ) - private Integer authentication; - - @Schema(description = "主体信息") - private String companyName; - - @Schema(description = "小程序备案") - private String icpNo; - - @Schema(description = "登录邮箱") - private String email; - - @Schema(description = "登录密码") - private String password; - - @Schema(description = "原始ID") - private String ghId; - - @Schema(description = "入口页面") - private String mainPath; - - @Schema(description = "过期时间") - private String expirationTime; - - @Schema(description = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @Schema(description = "介绍") - private String comments; - - @Schema(description = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @Schema(description = "状态, 0正常, 1冻结") - @QueryField(type = QueryType.EQ) - private Integer status; - - @Schema(description = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - -} diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsOrderParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsOrderParam.java deleted file mode 100644 index d2fa8e6..0000000 --- a/src/main/java/com/gxwebsoft/cms/param/CmsOrderParam.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.gxwebsoft.cms.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 订单查询参数 - * - * @author 科技小王子 - * @since 2024-11-25 12:14:05 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@Schema(name = "CmsOrderParam对象", description = "订单查询参数") -public class CmsOrderParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @Schema(description = "订单号") - @QueryField(type = QueryType.EQ) - private Integer orderId; - - @Schema(description = "订单标题") - private String title; - - @Schema(description = "模型名称") - private String model; - - @Schema(description = "订单编号") - private String orderNo; - - @Schema(description = "订单类型，0商城 1询价 2留言") - @QueryField(type = QueryType.EQ) - private Integer type; - - @Schema(description = "关联文章ID") - @QueryField(type = QueryType.EQ) - private Integer articleId; - - @Schema(description = "关联网站ID") - @QueryField(type = QueryType.EQ) - private Integer websiteId; - - @Schema(description = "真实姓名") - private String realName; - - @Schema(description = "手机号码") - private String phone; - - @Schema(description = "电子邮箱") - private String email; - - @Schema(description = "订单内容") - private String content; - - @Schema(description = "订单总额") - @QueryField(type = QueryType.EQ) - private BigDecimal totalPrice; - - @Schema(description = "实际付款") - @QueryField(type = QueryType.EQ) - private BigDecimal payPrice; - - @Schema(description = "报价询价") - @QueryField(type = QueryType.EQ) - private BigDecimal price; - - @Schema(description = "购买数量") - @QueryField(type = QueryType.EQ) - private Integer totalNum; - - @Schema(description = "二维码地址，保存订单号，支付成功后才生成") - private String qrcode; - - @Schema(description = "下单渠道，0网站 1小程序 2其他") - @QueryField(type = QueryType.EQ) - private Integer channel; - - @Schema(description = "过期时间") - private String expirationTime; - - @Schema(description = "订单是否已结算(0未结算 1已结算)") - @QueryField(type = QueryType.EQ) - private Boolean isSettled; - - @Schema(description = "用户id") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @Schema(description = "备注") - private String comments; - - @Schema(description = "排序号") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @Schema(description = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - - @Schema(description = "网站创建者ID") - @QueryField(type = QueryType.EQ) - private Integer websiteUserId; - -} diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsProductParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsProductParam.java deleted file mode 100644 index c8b59e2..0000000 --- a/src/main/java/com/gxwebsoft/cms/param/CmsProductParam.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.gxwebsoft.cms.param; - -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; - -/** - * 产品查询参数 - * - * @author 科技小王子 - * @since 2024-09-27 16:03:44 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@Schema(name = "CmsProductParam对象", description = "产品查询参数") -public class CmsProductParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @Schema(description = "自增ID") - @QueryField(type = QueryType.EQ) - private Integer productId; - - @Schema(description = "类型 0软件产品 1实物商品 2虚拟商品") - @QueryField(type = QueryType.EQ) - private Integer type; - - @Schema(description = "产品编码") - private String code; - - @Schema(description = "产品标题") - private String title; - - @Schema(description = "封面图") - private String image; - - @Schema(description = "产品详情") - private String content; - - @Schema(description = "父级分类ID") - @QueryField(type = QueryType.EQ) - private Integer parentId; - - @Schema(description = "产品分类ID") - @QueryField(type = QueryType.EQ) - private Integer categoryId; - - @Schema(description = "产品规格 0单规格 1多规格") - @QueryField(type = QueryType.EQ) - private Integer specs; - - @Schema(description = "货架") - private String position; - - @Schema(description = "单位名称 (个)") - private String unitName; - - @Schema(description = "进货价格") - @QueryField(type = QueryType.EQ) - private BigDecimal price; - - @Schema(description = "销售价格") - @QueryField(type = QueryType.EQ) - private BigDecimal salePrice; - - @Schema(description = "库存计算方式(10下单减库存 20付款减库存)") - @QueryField(type = QueryType.EQ) - private Integer deductStockType; - - @Schema(description = "轮播图") - private String files; - - @Schema(description = "销量") - @QueryField(type = QueryType.EQ) - private Integer sales; - - @Schema(description = "库存") - @QueryField(type = QueryType.EQ) - private Integer stock; - - @Schema(description = "消费赚取积分") - @QueryField(type = QueryType.EQ) - private BigDecimal gainIntegral; - - @Schema(description = "推荐") - @QueryField(type = QueryType.EQ) - private Integer recommend; - - @Schema(description = "商户ID") - @QueryField(type = QueryType.EQ) - private Long merchantId; - - @Schema(description = "状态（0：未上架，1：上架）") - @QueryField(type = QueryType.EQ) - private Boolean isShow; - - @Schema(description = "状态, 0上架 1待上架 2待审核 3审核不通过") - @QueryField(type = QueryType.EQ) - private Integer status; - - @Schema(description = "备注") - private String comments; - - @Schema(description = "排序号") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @Schema(description = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @Schema(description = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - -} diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsProductSpecParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsProductSpecParam.java deleted file mode 100644 index 6f31993..0000000 --- a/src/main/java/com/gxwebsoft/cms/param/CmsProductSpecParam.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.gxwebsoft.cms.param; - -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 规格查询参数 - * - * @author 科技小王子 - * @since 2024-09-27 16:03:44 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@Schema(name = "CmsProductSpecParam对象", description = "规格查询参数") -public class CmsProductSpecParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @Schema(description = "规格ID") - @QueryField(type = QueryType.EQ) - private Integer specId; - - @Schema(description = "规格名称") - private String specName; - - @Schema(description = "规格值") - private String specValue; - - @Schema(description = "创建用户") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @Schema(description = "更新者") - @QueryField(type = QueryType.EQ) - private Integer updater; - - @Schema(description = "备注") - private String comments; - - @Schema(description = "状态, 0正常, 1待修,2异常已修，3异常未修") - @QueryField(type = QueryType.EQ) - private Integer status; - - @Schema(description = "排序号") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - -} diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsProductSpecValueParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsProductSpecValueParam.java deleted file mode 100644 index e8e1174..0000000 --- a/src/main/java/com/gxwebsoft/cms/param/CmsProductSpecValueParam.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.gxwebsoft.cms.param; - -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 规格值查询参数 - * - * @author 科技小王子 - * @since 2024-09-27 16:03:44 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@Schema(name = "CmsProductSpecValueParam对象", description = "规格值查询参数") -public class CmsProductSpecValueParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @Schema(description = "规格值ID") - @QueryField(type = QueryType.EQ) - private Integer specValueId; - - @Schema(description = "规格组ID") - @QueryField(type = QueryType.EQ) - private Integer specId; - - @Schema(description = "规格值") - private String specValue; - - @Schema(description = "备注") - private String comments; - - @Schema(description = "排序号") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - -} diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsProductUrlParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsProductUrlParam.java deleted file mode 100644 index 78be55a..0000000 --- a/src/main/java/com/gxwebsoft/cms/param/CmsProductUrlParam.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.gxwebsoft.cms.param; - -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 域名查询参数 - * - * @author 科技小王子 - * @since 2024-09-27 16:03:44 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@Schema(name = "CmsProductUrlParam对象", description = "域名查询参数") -public class CmsProductUrlParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @Schema(description = "自增ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @Schema(description = "产品ID") - @QueryField(type = QueryType.EQ) - private Integer productId; - - @Schema(description = "域名类型") - private String type; - - @Schema(description = "域名") - private String domain; - - @Schema(description = "账号") - private String account; - - @Schema(description = "密码") - private String password; - - @Schema(description = "商户ID") - @QueryField(type = QueryType.EQ) - private Long merchantId; - - @Schema(description = "备注") - private String comments; - - @Schema(description = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @Schema(description = "状态, 0正常, 1待确认") - @QueryField(type = QueryType.EQ) - private Integer status; - -} diff --git a/src/main/java/com/gxwebsoft/cms/service/CmsComponentsService.java b/src/main/java/com/gxwebsoft/cms/service/CmsComponentsService.java deleted file mode 100644 index 6f6de7c..0000000 --- a/src/main/java/com/gxwebsoft/cms/service/CmsComponentsService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.cms.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.cms.entity.CmsComponents; -import com.gxwebsoft.cms.param.CmsComponentsParam; - -import java.util.List; - -/** - * 组件Service - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -public interface CmsComponentsService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(CmsComponentsParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(CmsComponentsParam param); - - /** - * 根据id查询 - * - * @param id ID - * @return CmsComponents - */ - CmsComponents getByIdRel(Integer id); - -} diff --git a/src/main/java/com/gxwebsoft/cms/service/CmsMpAdService.java b/src/main/java/com/gxwebsoft/cms/service/CmsMpAdService.java deleted file mode 100644 index de40752..0000000 --- a/src/main/java/com/gxwebsoft/cms/service/CmsMpAdService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.cms.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.cms.entity.CmsMpAd; -import com.gxwebsoft.cms.param.CmsMpAdParam; - -import java.util.List; - -/** - * 小程序广告位Service - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -public interface CmsMpAdService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(CmsMpAdParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(CmsMpAdParam param); - - /** - * 根据id查询 - * - * @param adId ID - * @return CmsMpAd - */ - CmsMpAd getByIdRel(Integer adId); - -} diff --git a/src/main/java/com/gxwebsoft/cms/service/CmsMpFieldService.java b/src/main/java/com/gxwebsoft/cms/service/CmsMpFieldService.java deleted file mode 100644 index e12a68c..0000000 --- a/src/main/java/com/gxwebsoft/cms/service/CmsMpFieldService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.cms.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.cms.entity.CmsMpField; -import com.gxwebsoft.cms.param.CmsMpFieldParam; - -import java.util.List; - -/** - * 小程序配置Service - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -public interface CmsMpFieldService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(CmsMpFieldParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(CmsMpFieldParam param); - - /** - * 根据id查询 - * - * @param id 自增ID - * @return CmsMpField - */ - CmsMpField getByIdRel(Integer id); - -} diff --git a/src/main/java/com/gxwebsoft/cms/service/CmsMpMenuService.java b/src/main/java/com/gxwebsoft/cms/service/CmsMpMenuService.java deleted file mode 100644 index 133d2ae..0000000 --- a/src/main/java/com/gxwebsoft/cms/service/CmsMpMenuService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.cms.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.cms.entity.CmsMpMenu; -import com.gxwebsoft.cms.param.CmsMpMenuParam; - -import java.util.List; - -/** - * 小程序端菜单Service - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -public interface CmsMpMenuService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(CmsMpMenuParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(CmsMpMenuParam param); - - /** - * 根据id查询 - * - * @param menuId ID - * @return CmsMpMenu - */ - CmsMpMenu getByIdRel(Integer menuId); - -} diff --git a/src/main/java/com/gxwebsoft/cms/service/CmsMpPagesService.java b/src/main/java/com/gxwebsoft/cms/service/CmsMpPagesService.java deleted file mode 100644 index 23ce484..0000000 --- a/src/main/java/com/gxwebsoft/cms/service/CmsMpPagesService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.cms.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.cms.entity.CmsMpPages; -import com.gxwebsoft.cms.param.CmsMpPagesParam; - -import java.util.List; - -/** - * 小程序页面Service - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -public interface CmsMpPagesService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(CmsMpPagesParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(CmsMpPagesParam param); - - /** - * 根据id查询 - * - * @param id ID - * @return CmsMpPages - */ - CmsMpPages getByIdRel(Integer id); - -} diff --git a/src/main/java/com/gxwebsoft/cms/service/CmsMpService.java b/src/main/java/com/gxwebsoft/cms/service/CmsMpService.java deleted file mode 100644 index 90d9fb1..0000000 --- a/src/main/java/com/gxwebsoft/cms/service/CmsMpService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.cms.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.cms.entity.CmsMp; -import com.gxwebsoft.cms.param.CmsMpParam; - -import java.util.List; - -/** - * 小程序信息Service - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -public interface CmsMpService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(CmsMpParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(CmsMpParam param); - - /** - * 根据id查询 - * - * @param mpId ID - * @return CmsMp - */ - CmsMp getByIdRel(Integer mpId); - -} diff --git a/src/main/java/com/gxwebsoft/cms/service/CmsOrderService.java b/src/main/java/com/gxwebsoft/cms/service/CmsOrderService.java deleted file mode 100644 index 2950d01..0000000 --- a/src/main/java/com/gxwebsoft/cms/service/CmsOrderService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.cms.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.cms.entity.CmsOrder; -import com.gxwebsoft.cms.param.CmsOrderParam; - -import java.util.List; - -/** - * 订单Service - * - * @author 科技小王子 - * @since 2024-11-25 12:14:05 - */ -public interface CmsOrderService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(CmsOrderParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(CmsOrderParam param); - - /** - * 根据id查询 - * - * @param orderId 订单号 - * @return CmsOrder - */ - CmsOrder getByIdRel(Integer orderId); - -} diff --git a/src/main/java/com/gxwebsoft/cms/service/CmsProductService.java b/src/main/java/com/gxwebsoft/cms/service/CmsProductService.java deleted file mode 100644 index 00ef8bd..0000000 --- a/src/main/java/com/gxwebsoft/cms/service/CmsProductService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.cms.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.cms.entity.CmsProduct; -import com.gxwebsoft.cms.param.CmsProductParam; - -import java.util.List; - -/** - * 产品Service - * - * @author 科技小王子 - * @since 2024-09-27 16:03:44 - */ -public interface CmsProductService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(CmsProductParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(CmsProductParam param); - - /** - * 根据id查询 - * - * @param productId 自增ID - * @return CmsProduct - */ - CmsProduct getByIdRel(Integer productId); - -} diff --git a/src/main/java/com/gxwebsoft/cms/service/CmsProductSpecService.java b/src/main/java/com/gxwebsoft/cms/service/CmsProductSpecService.java deleted file mode 100644 index d2beb35..0000000 --- a/src/main/java/com/gxwebsoft/cms/service/CmsProductSpecService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.cms.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.cms.entity.CmsProductSpec; -import com.gxwebsoft.cms.param.CmsProductSpecParam; - -import java.util.List; - -/** - * 规格Service - * - * @author 科技小王子 - * @since 2024-09-27 16:03:44 - */ -public interface CmsProductSpecService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(CmsProductSpecParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(CmsProductSpecParam param); - - /** - * 根据id查询 - * - * @param specId 规格ID - * @return CmsProductSpec - */ - CmsProductSpec getByIdRel(Integer specId); - -} diff --git a/src/main/java/com/gxwebsoft/cms/service/CmsProductSpecValueService.java b/src/main/java/com/gxwebsoft/cms/service/CmsProductSpecValueService.java deleted file mode 100644 index 29a94c0..0000000 --- a/src/main/java/com/gxwebsoft/cms/service/CmsProductSpecValueService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.cms.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.cms.entity.CmsProductSpecValue; -import com.gxwebsoft.cms.param.CmsProductSpecValueParam; - -import java.util.List; - -/** - * 规格值Service - * - * @author 科技小王子 - * @since 2024-09-27 16:03:44 - */ -public interface CmsProductSpecValueService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(CmsProductSpecValueParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(CmsProductSpecValueParam param); - - /** - * 根据id查询 - * - * @param specValueId 规格值ID - * @return CmsProductSpecValue - */ - CmsProductSpecValue getByIdRel(Integer specValueId); - -} diff --git a/src/main/java/com/gxwebsoft/cms/service/CmsProductUrlService.java b/src/main/java/com/gxwebsoft/cms/service/CmsProductUrlService.java deleted file mode 100644 index 6501378..0000000 --- a/src/main/java/com/gxwebsoft/cms/service/CmsProductUrlService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.cms.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.cms.entity.CmsProductUrl; -import com.gxwebsoft.cms.param.CmsProductUrlParam; - -import java.util.List; - -/** - * 域名Service - * - * @author 科技小王子 - * @since 2024-09-27 16:03:44 - */ -public interface CmsProductUrlService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(CmsProductUrlParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(CmsProductUrlParam param); - - /** - * 根据id查询 - * - * @param id 自增ID - * @return CmsProductUrl - */ - CmsProductUrl getByIdRel(Integer id); - -} diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/CmsComponentsServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/CmsComponentsServiceImpl.java deleted file mode 100644 index cf90d51..0000000 --- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsComponentsServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.cms.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.cms.mapper.CmsComponentsMapper; -import com.gxwebsoft.cms.service.CmsComponentsService; -import com.gxwebsoft.cms.entity.CmsComponents; -import com.gxwebsoft.cms.param.CmsComponentsParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 组件Service实现 - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -@Service -public class CmsComponentsServiceImpl extends ServiceImpl implements CmsComponentsService { - - @Override - public PageResult pageRel(CmsComponentsParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(CmsComponentsParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public CmsComponents getByIdRel(Integer id) { - CmsComponentsParam param = new CmsComponentsParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/CmsMpAdServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/CmsMpAdServiceImpl.java deleted file mode 100644 index fa53927..0000000 --- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsMpAdServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.cms.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.cms.mapper.CmsMpAdMapper; -import com.gxwebsoft.cms.service.CmsMpAdService; -import com.gxwebsoft.cms.entity.CmsMpAd; -import com.gxwebsoft.cms.param.CmsMpAdParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 小程序广告位Service实现 - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -@Service -public class CmsMpAdServiceImpl extends ServiceImpl implements CmsMpAdService { - - @Override - public PageResult pageRel(CmsMpAdParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(CmsMpAdParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public CmsMpAd getByIdRel(Integer adId) { - CmsMpAdParam param = new CmsMpAdParam(); - param.setAdId(adId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/CmsMpFieldServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/CmsMpFieldServiceImpl.java deleted file mode 100644 index 68bdca2..0000000 --- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsMpFieldServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.cms.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.cms.mapper.CmsMpFieldMapper; -import com.gxwebsoft.cms.service.CmsMpFieldService; -import com.gxwebsoft.cms.entity.CmsMpField; -import com.gxwebsoft.cms.param.CmsMpFieldParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 小程序配置Service实现 - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -@Service -public class CmsMpFieldServiceImpl extends ServiceImpl implements CmsMpFieldService { - - @Override - public PageResult pageRel(CmsMpFieldParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(CmsMpFieldParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public CmsMpField getByIdRel(Integer id) { - CmsMpFieldParam param = new CmsMpFieldParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/CmsMpMenuServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/CmsMpMenuServiceImpl.java deleted file mode 100644 index eec21fd..0000000 --- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsMpMenuServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.cms.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.cms.mapper.CmsMpMenuMapper; -import com.gxwebsoft.cms.service.CmsMpMenuService; -import com.gxwebsoft.cms.entity.CmsMpMenu; -import com.gxwebsoft.cms.param.CmsMpMenuParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 小程序端菜单Service实现 - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -@Service -public class CmsMpMenuServiceImpl extends ServiceImpl implements CmsMpMenuService { - - @Override - public PageResult pageRel(CmsMpMenuParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(CmsMpMenuParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public CmsMpMenu getByIdRel(Integer menuId) { - CmsMpMenuParam param = new CmsMpMenuParam(); - param.setMenuId(menuId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/CmsMpPagesServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/CmsMpPagesServiceImpl.java deleted file mode 100644 index 6226628..0000000 --- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsMpPagesServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.cms.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.cms.mapper.CmsMpPagesMapper; -import com.gxwebsoft.cms.service.CmsMpPagesService; -import com.gxwebsoft.cms.entity.CmsMpPages; -import com.gxwebsoft.cms.param.CmsMpPagesParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 小程序页面Service实现 - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -@Service -public class CmsMpPagesServiceImpl extends ServiceImpl implements CmsMpPagesService { - - @Override - public PageResult pageRel(CmsMpPagesParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(CmsMpPagesParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public CmsMpPages getByIdRel(Integer id) { - CmsMpPagesParam param = new CmsMpPagesParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/CmsMpServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/CmsMpServiceImpl.java deleted file mode 100644 index d4a8079..0000000 --- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsMpServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.cms.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.cms.mapper.CmsMpMapper; -import com.gxwebsoft.cms.service.CmsMpService; -import com.gxwebsoft.cms.entity.CmsMp; -import com.gxwebsoft.cms.param.CmsMpParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 小程序信息Service实现 - * - * @author 科技小王子 - * @since 2024-09-10 20:47:57 - */ -@Service -public class CmsMpServiceImpl extends ServiceImpl implements CmsMpService { - - @Override - public PageResult pageRel(CmsMpParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(CmsMpParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public CmsMp getByIdRel(Integer mpId) { - CmsMpParam param = new CmsMpParam(); - param.setMpId(mpId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/CmsOrderServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/CmsOrderServiceImpl.java deleted file mode 100644 index 0dda732..0000000 --- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsOrderServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.cms.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.cms.mapper.CmsOrderMapper; -import com.gxwebsoft.cms.service.CmsOrderService; -import com.gxwebsoft.cms.entity.CmsOrder; -import com.gxwebsoft.cms.param.CmsOrderParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 订单Service实现 - * - * @author 科技小王子 - * @since 2024-11-25 12:14:05 - */ -@Service -public class CmsOrderServiceImpl extends ServiceImpl implements CmsOrderService { - - @Override - public PageResult pageRel(CmsOrderParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(CmsOrderParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public CmsOrder getByIdRel(Integer orderId) { - CmsOrderParam param = new CmsOrderParam(); - param.setOrderId(orderId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/CmsProductServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/CmsProductServiceImpl.java deleted file mode 100644 index a2c4a24..0000000 --- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsProductServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.cms.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.cms.mapper.CmsProductMapper; -import com.gxwebsoft.cms.service.CmsProductService; -import com.gxwebsoft.cms.entity.CmsProduct; -import com.gxwebsoft.cms.param.CmsProductParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 产品Service实现 - * - * @author 科技小王子 - * @since 2024-09-27 16:03:44 - */ -@Service -public class CmsProductServiceImpl extends ServiceImpl implements CmsProductService { - - @Override - public PageResult pageRel(CmsProductParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc,create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(CmsProductParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc,create_time desc"); - return page.sortRecords(list); - } - - @Override - public CmsProduct getByIdRel(Integer productId) { - CmsProductParam param = new CmsProductParam(); - param.setProductId(productId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/CmsProductSpecServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/CmsProductSpecServiceImpl.java deleted file mode 100644 index 6532eba..0000000 --- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsProductSpecServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.cms.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.cms.mapper.CmsProductSpecMapper; -import com.gxwebsoft.cms.service.CmsProductSpecService; -import com.gxwebsoft.cms.entity.CmsProductSpec; -import com.gxwebsoft.cms.param.CmsProductSpecParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 规格Service实现 - * - * @author 科技小王子 - * @since 2024-09-27 16:03:44 - */ -@Service -public class CmsProductSpecServiceImpl extends ServiceImpl implements CmsProductSpecService { - - @Override - public PageResult pageRel(CmsProductSpecParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(CmsProductSpecParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public CmsProductSpec getByIdRel(Integer specId) { - CmsProductSpecParam param = new CmsProductSpecParam(); - param.setSpecId(specId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/CmsProductSpecValueServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/CmsProductSpecValueServiceImpl.java deleted file mode 100644 index c004b49..0000000 --- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsProductSpecValueServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.cms.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.cms.mapper.CmsProductSpecValueMapper; -import com.gxwebsoft.cms.service.CmsProductSpecValueService; -import com.gxwebsoft.cms.entity.CmsProductSpecValue; -import com.gxwebsoft.cms.param.CmsProductSpecValueParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 规格值Service实现 - * - * @author 科技小王子 - * @since 2024-09-27 16:03:44 - */ -@Service -public class CmsProductSpecValueServiceImpl extends ServiceImpl implements CmsProductSpecValueService { - - @Override - public PageResult pageRel(CmsProductSpecValueParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(CmsProductSpecValueParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public CmsProductSpecValue getByIdRel(Integer specValueId) { - CmsProductSpecValueParam param = new CmsProductSpecValueParam(); - param.setSpecValueId(specValueId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/CmsProductUrlServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/CmsProductUrlServiceImpl.java deleted file mode 100644 index 041f6b7..0000000 --- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsProductUrlServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.cms.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.cms.mapper.CmsProductUrlMapper; -import com.gxwebsoft.cms.service.CmsProductUrlService; -import com.gxwebsoft.cms.entity.CmsProductUrl; -import com.gxwebsoft.cms.param.CmsProductUrlParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 域名Service实现 - * - * @author 科技小王子 - * @since 2024-09-27 16:03:44 - */ -@Service -public class CmsProductUrlServiceImpl extends ServiceImpl implements CmsProductUrlService { - - @Override - public PageResult pageRel(CmsProductUrlParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time asc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(CmsProductUrlParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time asc"); - return page.sortRecords(list); - } - - @Override - public CmsProductUrl getByIdRel(Integer id) { - CmsProductUrlParam param = new CmsProductUrlParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/src/main/java/com/gxwebsoft/common/core/utils/SignCheckUtil.java b/src/main/java/com/gxwebsoft/common/core/utils/SignCheckUtil.java index c07ab55..b09cd9a 100644 --- a/src/main/java/com/gxwebsoft/common/core/utils/SignCheckUtil.java +++ b/src/main/java/com/gxwebsoft/common/core/utils/SignCheckUtil.java @@ -183,7 +183,7 @@ public class SignCheckUtil { return true; } // 服务器域名白名单列表 - whiteDomains.add("server.gxwebsoft.com"); + whiteDomains.add("server.websoft.top"); System.out.println("whiteDomains = " + whiteDomains); System.out.println(">>> domainName = " + domainName); for(String item: whiteDomains){ diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGoodsMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGoodsMapper.xml index ac73201..bb91f03 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGoodsMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGoodsMapper.xml @@ -130,7 +130,8 @@ - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') + AND (a.name LIKE CONCAT('%', #{param.keywords}, '%') + OR a.comments LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ec4af5a..ad15671 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -18,16 +18,10 @@ spring: pathmatch: matching-strategy: ant_path_matcher -# 启用 SpringDoc OpenAPI -springdoc: - api-docs: - enabled: true - swagger-ui: - enabled: true - -# 启用 Knife4j -knife4j: - enable: true + # json时间格式设置 + jackson: + time-zone: GMT+8 + date-format: yyyy-MM-dd HH:mm:ss # 连接池配置 datasource: @@ -54,11 +48,6 @@ knife4j: login-username: admin login-password: admin - # json时间格式设置 - jackson: - time-zone: GMT+8 - date-format: yyyy-MM-dd HH:mm:ss - # 设置上传文件大小 servlet: multipart: @@ -166,3 +155,14 @@ certificate: app-cert-public-key-file: "appCertPublicKey.crt" alipay-cert-public-key-file: "alipayCertPublicKey.crt" alipay-root-cert-file: "alipayRootCert.crt" + +# 启用 SpringDoc OpenAPI +springdoc: + api-docs: + enabled: true + swagger-ui: + enabled: true + +# 启用 Knife4j +knife4j: + enable: true