|
@@ -2,7 +2,9 @@ package com.benyun.core.controller;
|
|
|
|
|
|
import com.benyun.core.constant.RedisContant;
|
|
|
import com.benyun.core.entity.bo.BrandGeoLabelBo;
|
|
|
+import com.benyun.core.entity.bo.BrandOpcloseBo;
|
|
|
import com.benyun.core.entity.bo.BrandSearch;
|
|
|
+import com.benyun.core.entity.vo.BrandOpcloseVo;
|
|
|
import com.benyun.core.entity.vo.ListQueryBody;
|
|
|
import com.benyun.core.service.BrandService;
|
|
|
import com.benyun.core.utils.HashUtil;
|
|
@@ -14,6 +16,7 @@ import org.springframework.data.redis.core.RedisTemplate;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
+import java.time.LocalDateTime;
|
|
|
import java.util.List;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
|
@@ -130,12 +133,23 @@ public class BrandController extends BaseController {
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
-// 连锁品牌近期开关店情况
|
|
|
- @GetMapping("/opclose")
|
|
|
- public R opclose(ListQueryBody body){
|
|
|
- List<String> industryCode = body.getIndustryCode(); // 预留
|
|
|
- String startTime = body.getStartTime();
|
|
|
- String endTime = body.getEndTime();
|
|
|
- return null;
|
|
|
+// 连锁品牌近期开关店情况(开点量)
|
|
|
+ @PostMapping("/open")
|
|
|
+ public R open(@RequestBody BrandOpcloseBo bo){
|
|
|
+ List<String> typeCodes = bo.getTypeCodes(); // 网点类型(犇云)
|
|
|
+ LocalDateTime startTime = bo.getStartTime();
|
|
|
+ LocalDateTime endTime = bo.getEndTime();
|
|
|
+ List<BrandOpcloseVo> vos = brandService.searchOpenByMulti(typeCodes, startTime, endTime);
|
|
|
+ return R.ok(vos);
|
|
|
+ }
|
|
|
+
|
|
|
+// 连锁品牌近期开关店情况(关店量)
|
|
|
+ @PostMapping("/close")
|
|
|
+ public R close(@RequestBody BrandOpcloseBo bo){
|
|
|
+ List<String> typeCodes = bo.getTypeCodes(); // 网点类型(犇云)
|
|
|
+ LocalDateTime startTime = bo.getStartTime();
|
|
|
+ LocalDateTime endTime = bo.getEndTime();
|
|
|
+ List<BrandOpcloseVo> vos = brandService.searchCloseByMulti(typeCodes, startTime, endTime);
|
|
|
+ return R.ok(vos);
|
|
|
}
|
|
|
}
|