Sfoglia il codice sorgente

fix 去掉无用代码

zoujiajian 1 anno fa
parent
commit
5d181b2036

+ 4 - 0
netflix-dao/src/main/java/com/cyksj/mapper/mirrorshop/MirrorNoticeUserMapper.java

@@ -2,6 +2,9 @@ package com.cyksj.mapper.mirrorshop;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cyksj.model.entity.MirrorNoticeUser;
+import com.cyksj.model.views.UserMirrorShopAdvertiseFrontView;
+
+import java.util.List;
 
 /**
  * 项目名: yhlxj
@@ -10,4 +13,5 @@ import com.cyksj.model.entity.MirrorNoticeUser;
  * 创建时间:2024/11/8 17:49
  */
 public interface MirrorNoticeUserMapper extends BaseMapper<MirrorNoticeUser> {
+	List<UserMirrorShopAdvertiseFrontView> getAdvertise(String customId);
 }

+ 0 - 13
netflix-dao/src/main/java/com/cyksj/mapper/mirrorshop/MirrorNoticeUserStatusRelateMapper.java

@@ -1,13 +0,0 @@
-package com.cyksj.mapper.mirrorshop;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.cyksj.model.entity.MirrorNoticeUserStatusRelate;
-
-/**
- * 项目名: yhlxj
- * 文件名: MirrorNoticeUserStatusRelateMapper
- * 创建者: JavaZou
- * 创建时间:2024/11/8 11:45
- */
-public interface MirrorNoticeUserStatusRelateMapper extends BaseMapper<MirrorNoticeUserStatusRelate> {
-}

+ 0 - 17
netflix-dao/src/main/java/com/cyksj/mapper/mirrorshop/UserMirrorShopManageAdvertiseMapper.java

@@ -1,17 +0,0 @@
-package com.cyksj.mapper.mirrorshop;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.cyksj.model.entity.UserMirrorShopManageAdvertise;
-import com.cyksj.model.views.UserMirrorShopAdvertiseFrontView;
-
-import java.util.List;
-
-/**
- * 项目名: yhlxj2
- * 文件名: UserMirrorShopManageAdvertiseMapper
- * 创建者: JavaZou
- * 创建时间:2024/10/24 11:53
- */
-public interface UserMirrorShopManageAdvertiseMapper extends BaseMapper<UserMirrorShopManageAdvertise> {
-	List<UserMirrorShopAdvertiseFrontView> getAdvertise(String customId);
-}

+ 0 - 13
netflix-dao/src/main/java/com/cyksj/mapper/mirrorshop/UserMirrorShopUserAdvertiseReviewRecordMapper.java

@@ -1,13 +0,0 @@
-package com.cyksj.mapper.mirrorshop;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.cyksj.model.entity.UserMirrorShopUserAdvertiseReviewRecord;
-
-/**
- * 项目名: yhlxj2
- * 文件名: UserMirrorShopUserAdvertiseReviewRecordMapper
- * 创建者: JavaZou
- * 创建时间:2024/10/24 11:53
- */
-public interface UserMirrorShopUserAdvertiseReviewRecordMapper extends BaseMapper<UserMirrorShopUserAdvertiseReviewRecord> {
-}

+ 0 - 49
netflix-dao/src/main/java/com/cyksj/model/entity/UserMirrorShopManageAdvertise.java

@@ -1,49 +0,0 @@
-package com.cyksj.model.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.ejlchina.searcher.bean.DbField;
-import com.ejlchina.searcher.bean.SearchBean;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 项目名: yhlxj2
- * 文件名: UserMirrorShopManageAdvertise
- * 创建者: JavaZou
- * 创建时间:2024/10/24 11:51
- */
-@Getter
-@Setter
-@SearchBean(tables = "mirror_notice ua",
-		where = ":uid:")
-public class UserMirrorShopManageAdvertise extends BaseEntity {
-
-	/**
-	 * 平台 MJ GPT
-	 */
-	private String platform;
-
-	/**
-	 * 标题
-	 */
-	private String title;
-
-	/**
-	 * 富文本
-	 */
-	private String text;
-
-	/**
-	 * 状态
-	 */
-	private Boolean status;
-
-	@TableField(exist = false)
-	@DbField("select count(1) from mirror_notice_user_review_record myr where myr.notice_id = ua.id")
-	private Boolean isNew;
-
-	/**
-	 * 所属店主用户id
-	 */
-	private Long userId;
-}

+ 1 - 1
netflix-dao/src/main/resources/mapper/UserMirrorShopManageAdvertiseMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.cyksj.mapper.mirrorshop.UserMirrorShopManageAdvertiseMapper">
+<mapper namespace="com.cyksj.mapper.mirrorshop.MirrorNoticeUserMapper">
 
     <select id="getAdvertise" resultType="com.cyksj.model.views.UserMirrorShopAdvertiseFrontView">
         select mur.*

+ 0 - 13
netflix-service/src/main/java/com/cyksj/service/mirrorshop/UserMirrorShopAdvertiseService.java

@@ -1,13 +0,0 @@
-package com.cyksj.service.mirrorshop;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.cyksj.model.entity.UserMirrorShopManageAdvertise;
-
-/**
- * 项目名: yhlxj2
- * 文件名: UserMirrorShopAdvertiseService
- * 创建者: JavaZou
- * 创建时间:2024/10/24 11:58
- */
-public interface UserMirrorShopAdvertiseService extends IService<UserMirrorShopManageAdvertise> {
-}

+ 0 - 20
netflix-service/src/main/java/com/cyksj/service/mirrorshop/impl/UserMirrorShopAdvertiseServiceImpl.java

@@ -1,20 +0,0 @@
-package com.cyksj.service.mirrorshop.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.cyksj.mapper.mirrorshop.UserMirrorShopManageAdvertiseMapper;
-import com.cyksj.model.entity.UserMirrorShopManageAdvertise;
-import com.cyksj.service.mirrorshop.UserMirrorShopAdvertiseService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-/**
- * 项目名: yhlxj2
- * 文件名: UserMirrorShopAdvertiseServiceImpl
- * 创建者: JavaZou
- * 创建时间:2024/10/24 11:58
- */
-@Service
-@RequiredArgsConstructor
-public class UserMirrorShopAdvertiseServiceImpl extends ServiceImpl<UserMirrorShopManageAdvertiseMapper, UserMirrorShopManageAdvertise> implements UserMirrorShopAdvertiseService {
-
-}

+ 0 - 94
netflix-web/src/main/java/com/cyksj/web/controller/manage/mirrorshop/UserMirrorShopAdvertiseController.java

@@ -1,94 +0,0 @@
-package com.cyksj.web.controller.manage.mirrorshop;
-
-import com.cyksj.dto.Result;
-import com.cyksj.enums.GatewayResponse;
-import com.cyksj.model.entity.UserMirrorShopManageAdvertise;
-import com.cyksj.service.mange.RefreshCacheService;
-import com.cyksj.service.mirrorshop.UserMirrorShopAdvertiseService;
-import com.ejlchina.searcher.BeanSearcher;
-import com.ejlchina.searcher.SearchResult;
-import com.ejlchina.searcher.util.MapUtils;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Optional;
-
-/**
- * 项目名: yhlxj2
- * 文件名: UserMirrorShopAdvertiseController
- * 创建者: JavaZou
- * 创建时间:2024/10/24 11:54
- */
-@Slf4j
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/manage/mirror/shop/advertise")
-public class UserMirrorShopAdvertiseController {
-	private final UserMirrorShopAdvertiseService userMirrorShopAdvertiseService;
-
-	private final BeanSearcher beanSearcher;
-
-	private final HttpServletRequest request;
-
-	private final RefreshCacheService refreshCacheService;
-
-	/**
-	 * 店铺公告列表
-	 */
-	@GetMapping("/get")
-	public Result<SearchResult<UserMirrorShopManageAdvertise>> get() {
-		SearchResult<UserMirrorShopManageAdvertise> search = beanSearcher.search(UserMirrorShopManageAdvertise.class, MapUtils.flatBuilder(request.getParameterMap())
-				.field(UserMirrorShopManageAdvertise::getUserId, 0)
-				.orderBy(UserMirrorShopManageAdvertise::getUpdateTime).desc()
-				.build());
-		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
-	}
-
-
-	/**
-	 * 新增店铺公告
-	 */
-	@PostMapping("/post")
-	public Result<String> post(@RequestBody UserMirrorShopManageAdvertise advertise) {
-		userMirrorShopAdvertiseService.saveOrUpdate(advertise);
-		return GatewayResponse.SUCCESS.newBuilder().toResult();
-	}
-
-
-	/**
-	 * 编辑店铺公告
-	 */
-	@PutMapping("/update")
-	public Result<String> update(@RequestBody UserMirrorShopManageAdvertise advertise) {
-		userMirrorShopAdvertiseService.saveOrUpdate(advertise);
-		refreshCacheService.refreshUserMirrorShopAdvertiseCache(null);
-		return GatewayResponse.SUCCESS.newBuilder().toResult();
-	}
-
-
-	/**
-	 * 上下架店铺公告
-	 */
-	@PutMapping("/update/status/{id}")
-	public Result<String> updateStatusById(@PathVariable Long id) {
-		Optional.ofNullable(userMirrorShopAdvertiseService.getById(id))
-				.ifPresent(en -> {
-					en.setStatus(!en.getStatus());
-					refreshCacheService.refreshUserMirrorShopAdvertiseCache(null);
-					userMirrorShopAdvertiseService.updateById(en);
-				});
-		return GatewayResponse.SUCCESS.newBuilder().toResult();
-	}
-
-	/**
-	 * 删除店铺公告
-	 */
-	@PutMapping("/delete/{id}")
-	public Result<String> deleteById(@PathVariable Long id) {
-		userMirrorShopAdvertiseService.removeById(id);
-		refreshCacheService.refreshUserMirrorShopAdvertiseCache(null);
-		return GatewayResponse.SUCCESS.newBuilder().toResult();
-	}
-}

+ 1 - 1
netflix-web/src/main/java/com/cyksj/web/controller/manage/mirrorshop/manage/CmsUserMirrorAdvertiseController.java → netflix-web/src/main/java/com/cyksj/web/controller/manage/mirrorshop/manage/CmsUserMirrorNoticeController.java

@@ -35,7 +35,7 @@ import java.util.Optional;
 @RestController
 @RequestMapping("/mirrorShop/manage/notice")
 @RequiredArgsConstructor
-public class CmsUserMirrorAdvertiseController {
+public class CmsUserMirrorNoticeController {
 
 	private final BeanSearcher beanSearcher;
 

+ 3 - 3
netflix-web/src/main/java/com/cyksj/web/controller/mirrorshop/UserMirrorShopFrontController.java

@@ -6,7 +6,7 @@ import com.cyksj.config.zfb.BaseZfbConfig;
 import com.cyksj.config.zfb.ZfbProductCode;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
-import com.cyksj.mapper.mirrorshop.UserMirrorShopManageAdvertiseMapper;
+import com.cyksj.mapper.mirrorshop.MirrorNoticeUserMapper;
 import com.cyksj.mapper.mirrorshop.UserMirrorShopMapper;
 import com.cyksj.model.dto.AliPayParams;
 import com.cyksj.model.entity.UserMirrorShop;
@@ -51,7 +51,7 @@ public class UserMirrorShopFrontController {
 
 	private final RedisService redisService;
 
-	private final UserMirrorShopManageAdvertiseMapper userMirrorShopManageAdvertiseMapper;
+	private final MirrorNoticeUserMapper mirrorNoticeUserMapper;
 
 	private final UserMirrorShopMapper userMirrorShopMapper;
 
@@ -73,7 +73,7 @@ public class UserMirrorShopFrontController {
 		Object value = redisService.get(key);
 		List<UserMirrorShopAdvertiseFrontView> userMirrorShopAdvertiseFrontViews;
 		if (value == null) {
-			userMirrorShopAdvertiseFrontViews = userMirrorShopManageAdvertiseMapper.getAdvertise(customId);
+			userMirrorShopAdvertiseFrontViews = mirrorNoticeUserMapper.getAdvertise(customId);
 			redisService.set(key, userMirrorShopAdvertiseFrontViews, RedisService.key.USER_MIRROR_SHOP_ADVERTISE_CACHE_KEY.getTimeout());
 		} else {
 			userMirrorShopAdvertiseFrontViews = (List<UserMirrorShopAdvertiseFrontView>) value;