refactor(advertisement): 重构质量宣传图相关代码及接口

- 在Advertisement实体类上添加@TableName注解指定表名为qms_advertisement
- 删除广告模块相关代码,迁移AdvertisementController至qms模块并更新包名
- 修改控制器中接口名称及注解的模块标识为“质量宣传图”
- 更新控制器中相关方法和注释,体现为质量宣传图操作
- 修改Mapper中的SQL语句,查询表由advertisement改为qms_advertisement
- 调整分页查询接口及根据类型获取质量宣传图接口
- 规范接口请求参数及响应数据类型,优化参数注解使用
This commit is contained in:
曹鹏飞 2026-04-10 14:29:48 +08:00
parent 10bf148599
commit dfe4cab5cc
3 changed files with 29 additions and 23 deletions

View File

@ -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.constant.Constant;
import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.ApiResult;
import com.nflg.wms.common.pojo.PageData; 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.AdvertisementListVO;
import com.nflg.wms.common.pojo.vo.AdvertisementVO; import com.nflg.wms.common.pojo.vo.AdvertisementVO;
import com.nflg.wms.common.util.MultilingualUtil; import com.nflg.wms.common.util.MultilingualUtil;
import com.nflg.wms.repository.entity.DictionaryItem; import com.nflg.wms.repository.entity.DictionaryItem;
import com.nflg.wms.repository.service.IAdvertisementService; import com.nflg.wms.repository.service.IAdvertisementService;
import com.nflg.wms.repository.service.IDictionaryItemService; import com.nflg.wms.repository.service.IDictionaryItemService;
import com.nflg.wms.starter.BaseController;
import com.nflg.wms.starter.annotation.ApiMark; import com.nflg.wms.starter.annotation.ApiMark;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import jakarta.validation.Valid; import jakarta.validation.Valid;
@ -21,13 +25,13 @@ import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
/** /**
* 广告相关接口 * 质量宣传图
* @author 曹鹏飞 * @author 曹鹏飞
*/ */
@RestController @RestController
@RequestMapping("/ad") @RequestMapping("/ad")
@Slf4j @Slf4j
public class AdvertisementController extends BaseController{ public class AdvertisementController extends BaseController {
@Resource @Resource
private IAdvertisementService advertisementService; private IAdvertisementService advertisementService;
@ -36,39 +40,39 @@ public class AdvertisementController extends BaseController{
private IDictionaryItemService dictionaryItemService; private IDictionaryItemService dictionaryItemService;
/** /**
* 获取广告类型 * 获取质量宣传图类型
* @return 广告类型列表 * @return 质量宣传图类型列表
*/ */
@GetMapping("getType") @GetMapping("getType")
@ApiMark(moduleName = "广告", apiName = "获取广告类型",isPublic = true) @ApiMark(moduleName = "质量宣传图", apiName = "获取质量宣传图类型",isPublic = true)
public ApiResult<List<DictionaryItem>> getType(){ public ApiResult<List<DictionaryItem>> getType(){
return ApiResult.success(dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_AD_TYPE, MultilingualUtil.getLanguage())); return ApiResult.success(dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_AD_TYPE, MultilingualUtil.getLanguage()));
} }
/** /**
* 获取广告位置 * 获取质量宣传图位置
* @return 广告类型列表 * @return 质量宣传图类型列表
*/ */
@GetMapping("getPosition") @GetMapping("getPosition")
@ApiMark(moduleName = "广告", apiName = "获取广告位置",isPublic = true) @ApiMark(moduleName = "质量宣传图", apiName = "获取质量宣传图位置",isPublic = true)
public ApiResult<List<DictionaryItem>> getPosition(){ public ApiResult<List<DictionaryItem>> getPosition(){
return ApiResult.success(dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_AD_POSITION, MultilingualUtil.getLanguage())); return ApiResult.success(dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_AD_POSITION, MultilingualUtil.getLanguage()));
} }
/** /**
* 保存广告 * 保存质量宣传图
* @param request 广告信息 * @param request 质量宣传图信息
* @return * @return
*/ */
@PostMapping("save") @PostMapping("save")
@ApiMark(moduleName = "广告", apiName = "保存广告") @ApiMark(moduleName = "质量宣传图", apiName = "保存质量宣传图")
public ApiResult<Void> saveAdvertisement(@Valid @RequestBody @NotNull AdvertisementSaveRequest request){ public ApiResult<Void> saveAdvertisement(@Valid @RequestBody @NotNull AdvertisementSaveRequest request){
advertisementService.save(request); advertisementService.save(request);
return ApiResult.success(); return ApiResult.success();
} }
/** /**
* 是否启用广告 * 是否启用质量宣传图
*/ */
@PostMapping("enable") @PostMapping("enable")
public ApiResult<Void> enableAdvertisement(@Valid @RequestBody @NotNull EnableBatchQO request){ public ApiResult<Void> enableAdvertisement(@Valid @RequestBody @NotNull EnableBatchQO request){
@ -77,8 +81,8 @@ public class AdvertisementController extends BaseController{
} }
/** /**
* 删除广告 * 删除质量宣传图
* @param ids 广告id列表 * @param ids 质量宣传图id列表
* @return * @return
*/ */
@PostMapping("delete") @PostMapping("delete")
@ -88,8 +92,8 @@ public class AdvertisementController extends BaseController{
} }
/** /**
* 获取广告列表 * 获取质量宣传图列表
* @return 广告列表 * @return 质量宣传图列表
*/ */
@PostMapping("list") @PostMapping("list")
public ApiResult<PageData<AdvertisementListVO>> getAdvertisementList(@Valid @RequestBody @NotNull PageQO request){ public ApiResult<PageData<AdvertisementListVO>> getAdvertisementList(@Valid @RequestBody @NotNull PageQO request){
@ -97,12 +101,12 @@ public class AdvertisementController extends BaseController{
} }
/** /**
* 根据类型获取广告 * 根据类型获取质量宣传图
* @param request 请求参数 * @param request 请求参数
* @return 广告列表 * @return 质量宣传图列表
*/ */
@PostMapping("getByType") @PostMapping("getByType")
@ApiMark(moduleName = "广告", apiName = "根据类型获取广告") @ApiMark(moduleName = "质量宣传图", apiName = "根据类型获取质量宣传图")
public ApiResult<AdvertisementVO> getAdvertisement(@Valid @RequestBody @NotNull AdvertisementRequst request){ public ApiResult<AdvertisementVO> getAdvertisement(@Valid @RequestBody @NotNull AdvertisementRequst request){
return ApiResult.success(advertisementService.getByType(request.getType(),request.getPosition())); return ApiResult.success(advertisementService.getByType(request.getType(),request.getPosition()));
} }

View File

@ -3,6 +3,7 @@ package com.nflg.wms.repository.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -21,6 +22,7 @@ import java.time.LocalDateTime;
@Getter @Getter
@Setter @Setter
@Accessors(chain = true) @Accessors(chain = true)
@TableName("qms_advertisement")
public class Advertisement implements Serializable { public class Advertisement implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

View File

@ -4,7 +4,7 @@
<select id="getByType" resultType="com.nflg.wms.repository.entity.Advertisement"> <select id="getByType" resultType="com.nflg.wms.repository.entity.Advertisement">
SELECT ad.* SELECT ad.*
FROM advertisement ad FROM qms_advertisement ad
INNER JOIN dictionary_item di1 ON ad.type = di1.id INNER JOIN dictionary_item di1 ON ad.type = di1.id
INNER JOIN dictionary_item di2 ON ad.position = di2.id INNER JOIN dictionary_item di2 ON ad.position = di2.id
where di1.code = #{type} AND di2.code=#{position} where di1.code = #{type} AND di2.code=#{position}
@ -12,7 +12,7 @@
<select id="getList" resultType="com.nflg.wms.common.pojo.vo.AdvertisementListVO"> <select id="getList" resultType="com.nflg.wms.common.pojo.vo.AdvertisementListVO">
SELECT ad.*,di1.value AS "typeName",di2.value AS "positionName" 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 di1 ON ad.type=di1.id
INNER JOIN dictionary_item di2 ON ad.position=di2.id INNER JOIN dictionary_item di2 ON ad.position=di2.id
</select> </select>