Compare commits

..

No commits in common. "8bee19b948912252fa2a1d6c14bc72d99b3e5018" and "15c853832a0ad8a4d80838f8a5945cce61d9bf27" have entirely different histories.

5 changed files with 0 additions and 44 deletions

View File

@ -79,12 +79,6 @@ public class SaleDataApi {
return saleDataService.findBySaleMethod();
}
@GetMapping("/itemType")
@Operation(summary = "查询各个产品类型的购票人数")
public List<Map<String, String>> findByItemType() {
return saleDataService.findByDoItemType();
}
@GetMapping("/wuyi/{x}")
@Operation(summary = "查询最近前几年当年的五一期间的数据")
public List<Map<String, String>> findByWuyi(@PathVariable("x") int x) {

View File

@ -1,9 +0,0 @@
package cn.iocoder.yudao.module.datacenter.controller.app.saledata.vo;
import lombok.Data;
@Data
public class SaleDataItemTypeVo {
// private String itemtype;
private String itemtypename;
}

View File

@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.datacenter.dal.mongodb.saledata;
import cn.iocoder.yudao.module.datacenter.controller.app.saledata.vo.AgeVo;
import cn.iocoder.yudao.module.datacenter.controller.app.saledata.vo.AggregationVO;
import cn.iocoder.yudao.module.datacenter.controller.app.saledata.vo.SaleDataItemTypeVo;
import cn.iocoder.yudao.module.datacenter.dal.dataobject.saledata.SaleData;
import org.springframework.data.mongodb.repository.Aggregation;
import org.springframework.data.mongodb.repository.MongoRepository;
@ -42,7 +41,4 @@ public interface SaleDataRepository extends MongoRepository<SaleData,String> {
})
AgeVo findByAge();
@Query(value = "{}", fields = "{ 'itemtypename': 1 }")
List<SaleDataItemTypeVo> findAllByItemtypename();
}

View File

@ -65,12 +65,6 @@ public interface SaleDataService {
*/
public List<Map<String, String>> findBySaleMethod();
/**
* 查询各个产品类型的购票人数
* @return
*/
public List<Map<String, String>> findByDoItemType();
/**
* 查询最近前x年五一期间的数据
* @param x 前几年

View File

@ -6,7 +6,6 @@ import cn.iocoder.yudao.framework.common.util.ticket.IdCardUtil;
import cn.iocoder.yudao.module.datacenter.controller.app.saledata.vo.AgeVo;
import cn.iocoder.yudao.module.datacenter.controller.app.saledata.vo.AggregationVO;
import cn.iocoder.yudao.module.datacenter.controller.app.saledata.vo.SaleDataItemTypeVo;
import cn.iocoder.yudao.module.datacenter.dal.dataobject.saledata.SaleData;
import cn.iocoder.yudao.module.datacenter.dal.mongodb.saledata.SaleDataRepository;
import org.springframework.beans.factory.annotation.Autowired;
@ -18,7 +17,6 @@ import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
/**
@ -212,23 +210,6 @@ public class SaleDataServiceImpl implements SaleDataService {
return mapList;
}
@Override
public List<Map<String, String>> findByDoItemType() {
List<SaleDataItemTypeVo> list = saleDataRepository.findAllByItemtypename();
Map<String, Long> countMap = list.stream()
.collect(Collectors.groupingBy(SaleDataItemTypeVo::getItemtypename, Collectors.counting()));
List<Map<String, String>> mapArrayList = new ArrayList<>();
for (String s : countMap.keySet()) {
Map<String, String> map = new HashMap<>();
map.put("TypeName",s);
map.put("count",countMap.get(s).toString());
mapArrayList.add(map);
// map.clear();
}
return mapArrayList;
}
@Override
public List<Map<String, String>> findWuyi(int x) {
DateTimeFormatter date = DateTimeFormatter.ofPattern("yyyyMMdd");