Skip to content

Commit 378a009

Browse files
UltronxrUltronxr
committed
移除有关 batchUpdateSingle/batchQuerySingle 、 batchUpdateBonus/batchQueryBonus 的所有内容， 现统一更新为 batchUpdateBoth/batchQueryBoth （批量更新、查询每日商店+夜市）。
1 parent f2b4ce0 commit 378a009

File tree

12 files changed

+0
-676
lines changed

12 files changed

+0
-676
lines changed

‎src/main/java/cn/ultronxr/valorant/bean/VO/BatchStoreFrontVO.java‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎src/main/java/cn/ultronxr/valorant/bean/mybatis/mapper/StoreFrontMapper.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
package cn.ultronxr.valorant.bean.mybatis.mapper;
22

33
import cn.ultronxr.valorant.bean.VO.BatchBothStoreFrontVO;
4-
import cn.ultronxr.valorant.bean.VO.BatchStoreFrontVO;
54
import cn.ultronxr.valorant.bean.mybatis.bean.StoreFront;
65
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
76
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
87
import org.apache.ibatis.annotations.Param;
98

109
import java.util.ArrayList;
1110
import java.util.LinkedList;
12-
import java.util.List;
1311

1412
/**
1513
* @author Ultronxr
@@ -18,12 +16,6 @@
1816
*/
1917
public interface StoreFrontMapper extends MppBaseMapper<StoreFront> {
2018

21-
@Deprecated
22-
List<BatchStoreFrontVO> batchQuerySingle(@Param("date") String date, @Param("displayName") String displayName);
23-
24-
@Deprecated
25-
List<BatchStoreFrontVO> batchQueryBonus(@Param("date") String date, @Param("displayName") String displayName);
26-
2719
/**
2820
* 同时查询每日商店和夜市的数据
2921
* @return 查询结果list中，同一个账号的两条数据总是相连，且每日商店数据在夜市数据前面

‎src/main/java/cn/ultronxr/valorant/controller/StoreFrontController.java‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -44,26 +44,6 @@ public AjaxResponse bonusOffers(String userId, String date) {
4444
return AjaxResponseUtils.success(sfService.toVO(sfService.bonusOffers(userId, date)));
4545
}
4646

47-
@Deprecated
48-
@PostMapping("/batchUpdateSingle")
49-
@ResponseBody
50-
public AjaxResponse batchUpdateSingle() {
51-
if(sfService.batchUpdateSingle()) {
52-
return AjaxResponseUtils.success();
53-
}
54-
return AjaxResponseUtils.fail();
55-
}
56-
57-
@Deprecated
58-
@PostMapping("/batchUpdateBonus")
59-
@ResponseBody
60-
public AjaxResponse batchUpdateBonus() {
61-
if(sfService.batchUpdateBonus()) {
62-
return AjaxResponseUtils.success();
63-
}
64-
return AjaxResponseUtils.fail();
65-
}
66-
6747
@PostMapping("/batchUpdateBoth")
6848
@ResponseBody
6949
public AjaxResponse batchUpdateBoth() {
@@ -73,20 +53,6 @@ public AjaxResponse batchUpdateBoth() {
7353
return AjaxResponseUtils.fail();
7454
}
7555

76-
@Deprecated
77-
@GetMapping("/batchQuerySingle")
78-
@ResponseBody
79-
public AjaxResponse batchQuerySingle(String displayName) {
80-
return AjaxResponseUtils.success(sfService.batchQuerySingle(null, displayName));
81-
}
82-
83-
@Deprecated
84-
@GetMapping("/batchQueryBonus")
85-
@ResponseBody
86-
public AjaxResponse batchQueryBonus(String displayName) {
87-
return AjaxResponseUtils.success(sfService.batchQueryBonus(null, displayName));
88-
}
89-
9056
@GetMapping("/batchQueryBoth")
9157
@ResponseBody
9258
public AjaxResponse batchQueryBoth(String skin1, String skin2, String skin3, String skin4,

‎src/main/java/cn/ultronxr/valorant/service/StoreFrontService.java‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package cn.ultronxr.valorant.service;
22

33
import cn.ultronxr.valorant.bean.VO.BatchBothStoreFrontVO;
4-
import cn.ultronxr.valorant.bean.VO.BatchStoreFrontVO;
54
import cn.ultronxr.valorant.bean.VO.StoreFrontVO;
65
import cn.ultronxr.valorant.bean.mybatis.bean.StoreFront;
76
import com.github.jeffreyning.mybatisplus.service.IMppService;
@@ -47,37 +46,11 @@ public interface StoreFrontService extends IMppService<StoreFront> {
4746
*/
4847
List<StoreFrontVO> toVO(List<StoreFront> storeFrontList);
4948

50-
/**
51-
* 批量更新所有账号的每日商店
52-
*/
53-
@Deprecated
54-
boolean batchUpdateSingle();
55-
56-
/**
57-
* 批量更新所有账号的夜市数据
58-
*/
59-
@Deprecated
60-
boolean batchUpdateBonus();
61-
6249
/**
6350
* 批量更新所有账号的每日商店+夜市
6451
*/
6552
boolean batchUpdateBoth();
6653

67-
/**
68-
* 查询所有账号的每日商店，是否在指定日期存在指定的皮肤
69-
* @return 商品列表
70-
*/
71-
@Deprecated
72-
List<BatchStoreFrontVO> batchQuerySingle(String date, String displayName);
73-
74-
/**
75-
* 查询所有账号的夜市，是否在指定日期存在指定的皮肤
76-
* @return 商品列表
77-
*/
78-
@Deprecated
79-
List<BatchStoreFrontVO> batchQueryBonus(String date, String displayName);
80-
8154
/**
8255
* 查询所有账号的每日商店+夜市
8356
* @return 商品列表

‎src/main/java/cn/ultronxr/valorant/service/impl/StoreFrontServiceImpl.java‎

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import cn.ultronxr.valorant.api.impl.StoreFrontAPI;
88
import cn.ultronxr.valorant.auth.RSO;
99
import cn.ultronxr.valorant.bean.VO.BatchBothStoreFrontVO;
10-
import cn.ultronxr.valorant.bean.VO.BatchStoreFrontVO;
1110
import cn.ultronxr.valorant.bean.VO.StoreFrontVO;
1211
import cn.ultronxr.valorant.bean.mybatis.bean.RiotAccount;
1312
import cn.ultronxr.valorant.bean.mybatis.bean.StoreFront;
@@ -224,32 +223,6 @@ private static String addDays(String date, int amount) {
224223
return DateUtil.date(dateObj).toDateStr();
225224
}
226225

227-
@Override
228-
public boolean batchUpdateSingle() {
229-
log.info("批量更新每日商店数据。");
230-
231-
String date = DateUtil.today();
232-
List<RiotAccount> accountList = accountMapper.selectList(null);
233-
accountList.forEach(account -> {
234-
singleItemOffers(account.getUserId(), date);
235-
// sleep
236-
});
237-
return true;
238-
}
239-
240-
@Override
241-
public boolean batchUpdateBonus() {
242-
log.info("批量更新夜市数据。");
243-
244-
String date = DateUtil.today();
245-
List<RiotAccount> accountList = accountMapper.selectList(null);
246-
accountList.forEach(account -> {
247-
bonusOffers(account.getUserId(), date);
248-
// sleep
249-
});
250-
return true;
251-
}
252-
253226
@Override
254227
public boolean batchUpdateBoth() {
255228
log.info("批量更新每日商店+夜市数据。");
@@ -265,30 +238,6 @@ public boolean batchUpdateBoth() {
265238
return true;
266239
}
267240

268-
@Deprecated
269-
@Override
270-
public List<BatchStoreFrontVO> batchQuerySingle(String date, String displayName) {
271-
if(StringUtils.isEmpty(date)) {
272-
date = DateUtil.today();
273-
}
274-
if(!isNowAfterToday8AM()) {
275-
date = addDays(date, -1);
276-
}
277-
return sfMapper.batchQuerySingle(date, displayName);
278-
}
279-
280-
@Deprecated
281-
@Override
282-
public List<BatchStoreFrontVO> batchQueryBonus(String date, String displayName) {
283-
if(StringUtils.isEmpty(date)) {
284-
date = DateUtil.today();
285-
}
286-
if(!isNowAfterToday8AM()) {
287-
date = addDays(date, -1);
288-
}
289-
return sfMapper.batchQueryBonus(date, displayName);
290-
}
291-
292241
@Override
293242
public List<BatchBothStoreFrontVO> batchQueryBoth(String date, String skin1, String skin2, String skin3, String skin4,
294243
String bonusSkin1, String bonusSkin2, String bonusSkin3) {

‎src/main/resources/mapper/StoreFrontMapper.xml‎

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
33
<mapper namespace="cn.ultronxr.valorant.bean.mybatis.mapper.StoreFrontMapper">
4-
<resultMap id="ResultMap" type="cn.ultronxr.valorant.bean.VO.BatchStoreFrontVO">
5-
<result column="username" jdbcType="VARCHAR" property="username" />
6-
<result column="user_id" jdbcType="VARCHAR" property="userId" />
7-
<result column="is_bonus" jdbcType="TINYINT" property="isBonus" />
8-
<result column="date" jdbcType="VARCHAR" property="date" />
9-
<result column="cost" jdbcType="INTEGER" property="cost" />
10-
<result column="discount_percent" jdbcType="INTEGER" property="discountPercent" />
11-
<result column="discount_cost" jdbcType="INTEGER" property="discountCost" />
12-
<result column="display_name" jdbcType="VARCHAR" property="displayName" />
13-
</resultMap>
14-
15-
<select id="batchQuerySingle" parameterType="java.lang.String" resultMap="ResultMap">
16-
SELECT
17-
account.username, store.user_id, store.is_bonus, store.date, store.cost, skin.display_name
18-
FROM
19-
valorant_store_front AS store, valorant_weapon_skin AS skin, valorant_riot_account AS account
20-
<where>
21-
store.is_bonus = 0
22-
AND store.item_id = skin.uuid
23-
AND store.user_id = account.user_id
24-
<if test="date != null">
25-
AND store.date = #{date}
26-
</if>
27-
<if test="displayName != null">
28-
AND skin.display_name LIKE CONCAT('%', #{displayName}, '%')
29-
</if>
30-
</where>
31-
ORDER BY account.username ASC
32-
LIMIT 1000
33-
</select>
34-
35-
<select id="batchQueryBonus" parameterType="java.lang.String" resultMap="ResultMap">
36-
SELECT
37-
account.username, store.user_id, store.is_bonus, store.date, store.cost, store.discount_percent, store.discount_cost, skin.display_name
38-
FROM
39-
valorant_store_front AS store, valorant_weapon_skin AS skin, valorant_riot_account AS account
40-
<where>
41-
store.is_bonus = 1
42-
AND store.item_id = skin.uuid
43-
AND store.user_id = account.user_id
44-
<if test="date != null">
45-
AND store.date >= #{date}
46-
</if>
47-
<if test="displayName != null">
48-
AND skin.display_name LIKE CONCAT('%', #{displayName}, '%')
49-
</if>
50-
</where>
51-
ORDER BY account.username ASC
52-
LIMIT 1000
53-
</select>
544

555
<resultMap id="ResultMapBatchBoth" type="cn.ultronxr.valorant.bean.VO.BatchBothStoreFrontVO">
566
<result column="username" jdbcType="VARCHAR" property="username" />

‎src/main/resources/static/html/index.html‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,6 @@
4848
<li class="layui-nav-item">
4949
<a href="javascript:;" class="left-nav-menu" data-url="/static/html/valorant/storefront/batch/both.html" data-name="每日商店+夜市（批量查询）" data-id="layMenuID13">每日商店+夜市（批量查询）</a>
5050
</li>
51-
<!--<li class="layui-nav-item">-->
52-
<!-- <a href="javascript:;" class="left-nav-menu" data-url="/static/html/valorant/storefront/batch/single.html" data-name="每日商店（批量查询）" data-id="layMenuID14">每日商店（批量查询）</a>-->
53-
<!--</li>-->
54-
<!--<li class="layui-nav-item">-->
55-
<!-- <a href="javascript:;" class="left-nav-menu" data-url="/static/html/valorant/storefront/batch/bonus.html" data-name="夜市（批量查询）" data-id="layMenuID15">夜市（批量查询）</a>-->
56-
<!--</li>-->
5751
<li class="layui-nav-item">
5852
<a href="javascript:;" class="left-nav-menu" data-url="/static/html/valorant/storefront/single/list.html" data-name="每日商店" data-id="layMenuID16">每日商店</a>
5953
</li>

‎src/main/resources/static/html/valorant/storefront/batch/bonus.html‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)