From dfe4cab5ccc6345756c179c747a6c888a8cb83ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 10 Apr 2026 14:29:48 +0800 Subject: [PATCH] =?UTF-8?q?refactor(advertisement):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=AE=A3=E4=BC=A0=E5=9B=BE=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=8F=8A=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在Advertisement实体类上添加@TableName注解指定表名为qms_advertisement - 删除广告模块相关代码，迁移AdvertisementController至qms模块并更新包名 - 修改控制器中接口名称及注解的模块标识为“质量宣传图” - 更新控制器中相关方法和注释，体现为质量宣传图操作 - 修改Mapper中的SQL语句，查询表由advertisement改为qms_advertisement - 调整分页查询接口及根据类型获取质量宣传图接口 - 规范接口请求参数及响应数据类型，优化参数注解使用 --- .../controller/AdvertisementController.java | 46 ++++++++++--------- .../wms/repository/entity/Advertisement.java | 2 + .../resources/mapper/AdvertisementMapper.xml | 4 +- 3 files changed, 29 insertions(+), 23 deletions(-) rename {nflg-wms-admin/src/main/java/com/nflg/wms => nflg-qms-admin/src/main/java/com/nflg/qms}/admin/controller/AdvertisementController.java (69%) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/AdvertisementController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/AdvertisementController.java similarity index 69% rename from nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/AdvertisementController.java rename to nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/AdvertisementController.java index f2be1b47..de05121b 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/AdvertisementController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/AdvertisementController.java @@ -1,15 +1,19 @@ -package com.nflg.wms.admin.controller; +package com.nflg.qms.admin.controller; import com.nflg.wms.common.constant.Constant; import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.PageData; -import com.nflg.wms.common.pojo.qo.*; +import com.nflg.wms.common.pojo.qo.AdvertisementRequst; +import com.nflg.wms.common.pojo.qo.AdvertisementSaveRequest; +import com.nflg.wms.common.pojo.qo.EnableBatchQO; +import com.nflg.wms.common.pojo.qo.PageQO; import com.nflg.wms.common.pojo.vo.AdvertisementListVO; import com.nflg.wms.common.pojo.vo.AdvertisementVO; import com.nflg.wms.common.util.MultilingualUtil; import com.nflg.wms.repository.entity.DictionaryItem; import com.nflg.wms.repository.service.IAdvertisementService; import com.nflg.wms.repository.service.IDictionaryItemService; +import com.nflg.wms.starter.BaseController; import com.nflg.wms.starter.annotation.ApiMark; import jakarta.annotation.Resource; import jakarta.validation.Valid; @@ -21,13 +25,13 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * 广告相关接口 + * 质量宣传图 * @author 曹鹏飞 */ @RestController @RequestMapping("/ad") @Slf4j -public class AdvertisementController extends BaseController{ +public class AdvertisementController extends BaseController { @Resource private IAdvertisementService advertisementService; @@ -36,39 +40,39 @@ public class AdvertisementController extends BaseController{ private IDictionaryItemService dictionaryItemService; /** - * 获取广告类型 - * @return 广告类型列表 + * 获取质量宣传图类型 + * @return 质量宣传图类型列表 */ @GetMapping("getType") - @ApiMark(moduleName = "广告", apiName = "获取广告类型",isPublic = true) + @ApiMark(moduleName = "质量宣传图", apiName = "获取质量宣传图类型",isPublic = true) public ApiResult> getType(){ return ApiResult.success(dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_AD_TYPE, MultilingualUtil.getLanguage())); } /** - * 获取广告位置 - * @return 广告类型列表 + * 获取质量宣传图位置 + * @return 质量宣传图类型列表 */ @GetMapping("getPosition") - @ApiMark(moduleName = "广告", apiName = "获取广告位置",isPublic = true) + @ApiMark(moduleName = "质量宣传图", apiName = "获取质量宣传图位置",isPublic = true) public ApiResult> getPosition(){ return ApiResult.success(dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_AD_POSITION, MultilingualUtil.getLanguage())); } /** - * 保存广告 - * @param request 广告信息 + * 保存质量宣传图 + * @param request 质量宣传图信息 * @return 无 */ @PostMapping("save") - @ApiMark(moduleName = "广告", apiName = "保存广告") + @ApiMark(moduleName = "质量宣传图", apiName = "保存质量宣传图") public ApiResult saveAdvertisement(@Valid @RequestBody @NotNull AdvertisementSaveRequest request){ advertisementService.save(request); return ApiResult.success(); } /** - * 是否启用广告 + * 是否启用质量宣传图 */ @PostMapping("enable") public ApiResult enableAdvertisement(@Valid @RequestBody @NotNull EnableBatchQO request){ @@ -77,8 +81,8 @@ public class AdvertisementController extends BaseController{ } /** - * 删除广告 - * @param ids 广告id列表 + * 删除质量宣传图 + * @param ids 质量宣传图id列表 * @return 无 */ @PostMapping("delete") @@ -88,8 +92,8 @@ public class AdvertisementController extends BaseController{ } /** - * 获取广告列表 - * @return 广告列表 + * 获取质量宣传图列表 + * @return 质量宣传图列表 */ @PostMapping("list") public ApiResult> getAdvertisementList(@Valid @RequestBody @NotNull PageQO request){ @@ -97,12 +101,12 @@ public class AdvertisementController extends BaseController{ } /** - * 根据类型获取广告 + * 根据类型获取质量宣传图 * @param request 请求参数 - * @return 广告列表 + * @return 质量宣传图列表 */ @PostMapping("getByType") - @ApiMark(moduleName = "广告", apiName = "根据类型获取广告") + @ApiMark(moduleName = "质量宣传图", apiName = "根据类型获取质量宣传图") public ApiResult getAdvertisement(@Valid @RequestBody @NotNull AdvertisementRequst request){ return ApiResult.success(advertisementService.getByType(request.getType(),request.getPosition())); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/Advertisement.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/Advertisement.java index d5f60077..0071314e 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/Advertisement.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/Advertisement.java @@ -3,6 +3,7 @@ package com.nflg.wms.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; @@ -21,6 +22,7 @@ import java.time.LocalDateTime; @Getter @Setter @Accessors(chain = true) +@TableName("qms_advertisement") public class Advertisement implements Serializable { private static final long serialVersionUID = 1L; diff --git a/nflg-wms-repository/src/main/resources/mapper/AdvertisementMapper.xml b/nflg-wms-repository/src/main/resources/mapper/AdvertisementMapper.xml index 6931c78b..8837fc3c 100644 --- a/nflg-wms-repository/src/main/resources/mapper/AdvertisementMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/AdvertisementMapper.xml @@ -4,7 +4,7 @@ SELECT ad.*,di1.value AS "typeName",di2.value AS "positionName" - FROM advertisement ad + FROM qms_advertisement ad INNER JOIN dictionary_item di1 ON ad.type=di1.id INNER JOIN dictionary_item di2 ON ad.position=di2.id