Skip to content

G
gic-evaluate
Commit 6dc1174c by zhiwj
Options

添加门店选择器

parent 170117e2
Showing with 196 additions and 106 deletions
gic-evaluate-api/src/main/java/com/gic/evaluate/qo/StoreScoreQO.java
......@@ -2,6 +2,8 @@ package com.gic.evaluate.qo;
import com.gic.enterprise.qo.PageQO;
import java.util.List;
/**
*
* @Description:
......@@ -15,6 +17,7 @@ public class StoreScoreQO extends PageQO {
private Integer sortColumn;
private Integer sortType;
private Integer storeGroupId;
private List<Integer> storeIdList;
public Integer getEnterpriseId() {
return enterpriseId;
......@@ -48,6 +51,14 @@ public class StoreScoreQO extends PageQO {
this.storeGroupId = storeGroupId;
}
public List<Integer> getStoreIdList() {
return storeIdList;
}
public void setStoreIdList(List<Integer> storeIdList) {
this.storeIdList = storeIdList;
}
public Integer getPageNum() {
return this.getCurrentPage();
}
......
gic-evaluate-api/src/main/java/com/gic/evaluate/qo/StoreTrendQO.java
......@@ -2,6 +2,8 @@ package com.gic.evaluate.qo;
import com.gic.enterprise.qo.PageQO;
import java.util.List;
/**
*
* @Description:
......@@ -15,6 +17,7 @@ public class StoreTrendQO extends PageQO {
private Integer sortColumn;
private Integer sortType;
private Integer storeGroupId;
private List<Integer> storeIdList;
public Integer getEnterpriseId() {
return enterpriseId;
......@@ -47,4 +50,12 @@ public class StoreTrendQO extends PageQO {
public void setStoreGroupId(Integer storeGroupId) {
this.storeGroupId = storeGroupId;
}
public List<Integer> getStoreIdList() {
return storeIdList;
}
public void setStoreIdList(List<Integer> storeIdList) {
this.storeIdList = storeIdList;
}
}
gic-evaluate-api/src/main/java/com/gic/evaluate/service/EvaluateOverviewApiService.java
package com.gic.evaluate.service;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.evaluate.qo.StoreScoreQO;
import com.gic.evaluate.qo.StoreTrendQO;
......@@ -27,7 +28,7 @@ public interface EvaluateOverviewApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<Map<String, Long>> chart1(Integer enterpriseId, String startTime, String endTime);
ServiceResponse<Map<String, Long>> chart1(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
/**
* 图表2 各项评分概况
......@@ -40,7 +41,7 @@ public interface EvaluateOverviewApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<HashMap<String, Map<String, Long>>> chart2(Integer enterpriseId, String startTime, String endTime);
ServiceResponse<HashMap<String, Map<String, Long>>> chart2(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
/**
* 图表3 评价趋势
......@@ -49,7 +50,7 @@ public interface EvaluateOverviewApiService {
* @param endTime
* @return
*/
ServiceResponse<Map<String, List<Map<String, Object>>>> chart3(Integer enterpriseId, String startTime, String endTime);
ServiceResponse<Map<String, List<Map<String, Object>>>> chart3(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
/**
* 图表4 正面/负面快评使用统计 变化趋势
......@@ -58,7 +59,7 @@ public interface EvaluateOverviewApiService {
* @param endTime
* @return
*/
ServiceResponse<Map<String, List<Map<String, Object>>>> chart4(Integer enterpriseId, String startTime, String endTime);
ServiceResponse<Map<String, List<Map<String, Object>>>> chart4(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
/**
* 查询门店评分
......@@ -69,7 +70,7 @@ public interface EvaluateOverviewApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<List<Map<String, Object>>> listStoreScore(StoreScoreQO storeScoreQO);
ServiceResponse<Page<Map<String, Object>>> listStoreScore(StoreScoreQO storeScoreQO);
/**
* 门店总评分
......@@ -91,7 +92,7 @@ public interface EvaluateOverviewApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<List<Map<String, Object>>> listTrend(StoreTrendQO storeTrendQO);
ServiceResponse<Page<Map<String, Object>>> listTrend(StoreTrendQO storeTrendQO);
/**
* 查看各个时间段好评的变化趋势
......@@ -101,7 +102,7 @@ public interface EvaluateOverviewApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<List<Map<String, Integer>>> listGoodEvaluateTrendByDate(Integer enterpriseId, String startTime, String endTime);
ServiceResponse<List<Map<String, Integer>>> listGoodEvaluateTrendByDate(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
/**
* 查看各个时间段差评的变化趋势
......@@ -111,5 +112,5 @@ public interface EvaluateOverviewApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<List<Map<String, Integer>>> listBadEvaluateTrendByDate(Integer enterpriseId, String startTime, String endTime);
ServiceResponse<List<Map<String, Integer>>> listBadEvaluateTrendByDate(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
}
gic-evaluate-service/src/main/java/com/gic/evaluate/dao/mapper/TabEvaluateMapper.java
......@@ -72,25 +72,25 @@ public interface TabEvaluateMapper {
void updateMaliciousStatus(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateId") Integer evaluateId, @Param("maliciousStatus") Integer maliciousStatus);
Map<String, Long> getTotalChart(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") String startTime, @Param("endTime") String endTime);
Map<String, Long> getTotalChart(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List<Integer> storeIdList);
Map<String, Long> getGoodsCountChart(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") String startTime, @Param("endTime") String endTime);
Map<String, Long> getGoodsCountChart(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List<Integer> storeIdList);
Map<String, Long> getStoreCountChart(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") String startTime, @Param("endTime") String endTime);
Map<String, Long> getStoreCountChart(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List<Integer> storeIdList);
Map<String, Long> getServiceCountChart(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") String startTime, @Param("endTime") String endTime);
Map<String, Long> getServiceCountChart(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List<Integer> storeIdList);
List<Map<String, Object>> listTrendEvaluate(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("goodEvaluateStatus") Integer goodEvaluateStatus);
List<Map<String, Object>> listTrendEvaluate(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("goodEvaluateStatus") Integer goodEvaluateStatus, @Param("ids") List<Integer> storeIdList);
List<Map<String, Object>> listStoreScore(StoreScoreQO storeScoreQO);
Page<Map<String, Object>> listStoreScore(StoreScoreQO storeScoreQO);
Map<String, Object> getTotalStoreScore(StoreScoreQO storeScoreQO);
List<Map<String, Object>> listTrend(StoreTrendQO storeTrendQO);
Page<Map<String, Object>> listTrend(StoreTrendQO storeTrendQO);
TabEvaluate getEvaluateByOrderNumber(@Param("enterpriseId") Integer enterpriseId, @Param("orderNumber") String orderNumber);
List<Map<String, Object>> evaluateQuickChart(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("tagType") Integer tagType);
List<Map<String, Object>> evaluateQuickChart(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("tagType") Integer tagType, @Param("ids") List<Integer> storeIdList);
@MapKey("statisticsDate")
Map<String, Map<String, Object>> listEvaluateTrendByYear(@Param("enterpriseId") Integer enterpriseId, @Param("replyType") Integer replyType);
......@@ -107,5 +107,5 @@ public interface TabEvaluateMapper {
Set<Integer> getStoreHasTopHot(@Param("enterpriseId") Integer enterpriseId, @Param("ids") List<Integer> storeIdList);
Integer countEvaluateTrend(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("quickReplyType") Integer quickReplyType);
Integer countEvaluateTrend(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("ids") List<Integer> storeIdList, @Param("quickReplyType") Integer quickReplyType);
}
\ No newline at end of file
gic-evaluate-service/src/main/java/com/gic/evaluate/service/EvaluateService.java
......@@ -33,31 +33,31 @@ public interface EvaluateService {
void updateMaliciousStatus(Integer enterpriseId, Integer evaluateId, Integer maliciousStatus);
Map<String, Long> getTotalCountChart(Integer enterpriseId, String startTime, String endTime);
Map<String, Long> getTotalCountChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
Map<String, Long> getGoodsCountChart(Integer enterpriseId, String startTime, String endTime);
Map<String, Long> getGoodsCountChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
Map<String, Long> getStoreCountChart(Integer enterpriseId, String startTime, String endTime);
Map<String, Long> getStoreCountChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
Map<String, Long> getServiceCountChart(Integer enterpriseId, String startTime, String endTime);
Map<String, Long> getServiceCountChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
List<Map<String, Object>> listTrendTotalEvaluate(Integer enterpriseId, String startTime, String endTime);
List<Map<String, Object>> listTrendTotalEvaluate(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
List<Map<String, Object>> listTrendGoodEvaluate(Integer enterpriseId, String startTime, String endTime);
List<Map<String, Object>> listTrendGoodEvaluate(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
List<Map<String, Object>> listStoreScore(StoreScoreQO storeScoreQO);
Page<Map<String, Object>> listStoreScore(StoreScoreQO storeScoreQO);
Map<String, Object> getTotalStoreScore(StoreScoreQO storeScoreQO);
List<Map<String, Object>> listTrend(StoreTrendQO storeTrendQO);
Page<Map<String, Object>> listTrend(StoreTrendQO storeTrendQO);
TabEvaluate getEvaluateByOrderNumber(Integer enterpriseId, String orderNumber);
void updateEvaluate(EvaluateDTO evaluateDTO);
List<Map<String, Object>> evaluateGoodQuickChart(Integer enterpriseId, String startTime, String endTime);
List<Map<String, Object>> evaluateGoodQuickChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
List<Map<String, Object>> evaluateBadQuickChart(Integer enterpriseId, String startTime, String endTime);
List<Map<String, Object>> evaluateBadQuickChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
List<Map<String, Object>> listEvaluateTrendByYear(Integer enterpriseId, Integer replyType);
......@@ -71,5 +71,5 @@ public interface EvaluateService {
Set<Integer> getStoreIdHasTopHot(Integer enterpriseId, List<Integer> storeIdList);
Integer countEvaluateTrend(Integer enterpriseId, Date startTime, Date endTime, Integer quickReplyTypeEnumCode);
Integer countEvaluateTrend(Integer enterpriseId, Date startTime, Date endTime , List<Integer> storeIdList, Integer quickReplyTypeEnumCode);
}
gic-evaluate-service/src/main/java/com/gic/evaluate/service/impl/EvaluateServiceImpl.java
......@@ -99,37 +99,37 @@ public class EvaluateServiceImpl implements EvaluateService {
}
@Override
public Map<String, Long> getTotalCountChart(Integer enterpriseId, String startTime, String endTime) {
return tabEvaluateMapper.getTotalChart(enterpriseId, startTime, endTime);
public Map<String, Long> getTotalCountChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
return tabEvaluateMapper.getTotalChart(enterpriseId, startTime, endTime, storeIdList);
}
@Override
public Map<String, Long> getGoodsCountChart(Integer enterpriseId, String startTime, String endTime) {
return tabEvaluateMapper.getGoodsCountChart(enterpriseId, startTime, endTime);
public Map<String, Long> getGoodsCountChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
return tabEvaluateMapper.getGoodsCountChart(enterpriseId, startTime, endTime, storeIdList);
}
@Override
public Map<String, Long> getStoreCountChart(Integer enterpriseId, String startTime, String endTime) {
return tabEvaluateMapper.getStoreCountChart(enterpriseId, startTime, endTime);
public Map<String, Long> getStoreCountChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
return tabEvaluateMapper.getStoreCountChart(enterpriseId, startTime, endTime, storeIdList);
}
@Override
public Map<String, Long> getServiceCountChart(Integer enterpriseId, String startTime, String endTime) {
return tabEvaluateMapper.getServiceCountChart(enterpriseId, startTime, endTime);
public Map<String, Long> getServiceCountChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
return tabEvaluateMapper.getServiceCountChart(enterpriseId, startTime, endTime, storeIdList);
}
@Override
public List<Map<String, Object>> listTrendTotalEvaluate(Integer enterpriseId, String startTime, String endTime) {
return tabEvaluateMapper.listTrendEvaluate(enterpriseId, startTime, endTime, null);
public List<Map<String, Object>> listTrendTotalEvaluate(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
return tabEvaluateMapper.listTrendEvaluate(enterpriseId, startTime, endTime, null, storeIdList);
}
@Override
public List<Map<String, Object>> listTrendGoodEvaluate(Integer enterpriseId, String startTime, String endTime) {
return tabEvaluateMapper.listTrendEvaluate(enterpriseId, startTime, endTime, Constants.NORMAL_STATUS);
public List<Map<String, Object>> listTrendGoodEvaluate(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
return tabEvaluateMapper.listTrendEvaluate(enterpriseId, startTime, endTime, Constants.NORMAL_STATUS, storeIdList);
}
@Override
public List<Map<String, Object>> listStoreScore(StoreScoreQO storeScoreQO) {
public Page<Map<String, Object>> listStoreScore(StoreScoreQO storeScoreQO) {
PageHelper.startPage(storeScoreQO);
return tabEvaluateMapper.listStoreScore(storeScoreQO);
}
......@@ -141,7 +141,7 @@ public class EvaluateServiceImpl implements EvaluateService {
}
@Override
public List<Map<String, Object>> listTrend(StoreTrendQO storeTrendQO) {
public Page<Map<String, Object>> listTrend(StoreTrendQO storeTrendQO) {
return tabEvaluateMapper.listTrend(storeTrendQO);
}
......@@ -157,13 +157,13 @@ public class EvaluateServiceImpl implements EvaluateService {
}
@Override
public List<Map<String, Object>> evaluateGoodQuickChart(Integer enterpriseId, String startTime, String endTime) {
return tabEvaluateMapper.evaluateQuickChart(enterpriseId, startTime, endTime, QuickReplyTypeEnum.GOOD.getCode());
public List<Map<String, Object>> evaluateGoodQuickChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
return tabEvaluateMapper.evaluateQuickChart(enterpriseId, startTime, endTime, QuickReplyTypeEnum.GOOD.getCode(), storeIdList);
}
@Override
public List<Map<String, Object>> evaluateBadQuickChart(Integer enterpriseId, String startTime, String endTime) {
return tabEvaluateMapper.evaluateQuickChart(enterpriseId, startTime, endTime, QuickReplyTypeEnum.BAD.getCode());
public List<Map<String, Object>> evaluateBadQuickChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
return tabEvaluateMapper.evaluateQuickChart(enterpriseId, startTime, endTime, QuickReplyTypeEnum.BAD.getCode(), storeIdList);
}
@Override
......@@ -251,8 +251,8 @@ public class EvaluateServiceImpl implements EvaluateService {
}
@Override
public Integer countEvaluateTrend(Integer enterpriseId, Date startTime, Date endTime, Integer quickReplyType) {
return tabEvaluateMapper.countEvaluateTrend(enterpriseId, startTime, endTime, quickReplyType);
public Integer countEvaluateTrend(Integer enterpriseId, Date startTime, Date endTime, List<Integer> storeIdList, Integer quickReplyType) {
return tabEvaluateMapper.countEvaluateTrend(enterpriseId, startTime, endTime, storeIdList, quickReplyType);
}
private List<String> getYear() {
......
gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/EvaluateOverviewApiServiceImpl.java
package com.gic.evaluate.service.outer.impl;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.DateUtil;
import com.gic.commons.util.PageHelperUtils;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.response.EnterpriseServiceResponse;
import com.gic.evaluate.constant.QuickReplyTypeEnum;
......@@ -35,16 +37,16 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
private EvaluateService evaluateService;
@Override
public ServiceResponse<Map<String, Long>> chart1(Integer enterpriseId, String startTime, String endTime) {
Map<String, Long> countMap = evaluateService.getTotalCountChart(enterpriseId, startTime, endTime);
public ServiceResponse<Map<String, Long>> chart1(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
Map<String, Long> countMap = evaluateService.getTotalCountChart(enterpriseId, startTime, endTime, storeIdList);
return EnterpriseServiceResponse.success(countMap);
}
@Override
public ServiceResponse<HashMap<String, Map<String, Long>>> chart2(Integer enterpriseId, String startTime, String endTime) {
Map<String, Long> goodsCountMap = evaluateService.getGoodsCountChart(enterpriseId, startTime, endTime);
Map<String, Long> storeCountMap = evaluateService.getStoreCountChart(enterpriseId, startTime, endTime);
Map<String, Long> serviceCountMap = evaluateService.getServiceCountChart(enterpriseId, startTime, endTime);
public ServiceResponse<HashMap<String, Map<String, Long>>> chart2(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
Map<String, Long> goodsCountMap = evaluateService.getGoodsCountChart(enterpriseId, startTime, endTime, storeIdList);
Map<String, Long> storeCountMap = evaluateService.getStoreCountChart(enterpriseId, startTime, endTime, storeIdList);
Map<String, Long> serviceCountMap = evaluateService.getServiceCountChart(enterpriseId, startTime, endTime, storeIdList);
HashMap<String, Map<String, Long>> hashMap = new HashMap<>(4);
hashMap.put("goodsCountMap", goodsCountMap);
......@@ -56,9 +58,9 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
}
@Override
public ServiceResponse<Map<String, List<Map<String, Object>>>> chart3(Integer enterpriseId, String startTime, String endTime) {
List<Map<String, Object>> listTrendTotalEvaluate = this.evaluateService.listTrendTotalEvaluate(enterpriseId, startTime, endTime);
List<Map<String, Object>> listTrendGoodEvaluate = this.evaluateService.listTrendGoodEvaluate(enterpriseId, startTime, endTime);
public ServiceResponse<Map<String, List<Map<String, Object>>>> chart3(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
List<Map<String, Object>> listTrendTotalEvaluate = this.evaluateService.listTrendTotalEvaluate(enterpriseId, startTime, endTime, storeIdList);
List<Map<String, Object>> listTrendGoodEvaluate = this.evaluateService.listTrendGoodEvaluate(enterpriseId, startTime, endTime, storeIdList);
// todo order trend
Map<String, List<Map<String, Object>>> map = new HashMap<>();
......@@ -77,9 +79,9 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
}
@Override
public ServiceResponse<Map<String, List<Map<String, Object>>>> chart4(Integer enterpriseId, String startTime, String endTime) {
List<Map<String, Object>> goodChart = this.evaluateService.evaluateGoodQuickChart(enterpriseId, startTime, endTime);
List<Map<String, Object>> badChart = this.evaluateService.evaluateBadQuickChart(enterpriseId, startTime, endTime);
public ServiceResponse<Map<String, List<Map<String, Object>>>> chart4(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
List<Map<String, Object>> goodChart = this.evaluateService.evaluateGoodQuickChart(enterpriseId, startTime, endTime, storeIdList);
List<Map<String, Object>> badChart = this.evaluateService.evaluateBadQuickChart(enterpriseId, startTime, endTime, storeIdList);
Map<String, List<Map<String, Object>>> map = new HashMap<>(4);
map.put("goodChart", goodChart);
......@@ -99,9 +101,9 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
}
@Override
public ServiceResponse<List<Map<String, Object>>> listStoreScore(StoreScoreQO storeScoreQO) {
List<Map<String, Object>> storeScoreList = this.evaluateService.listStoreScore(storeScoreQO);
return EnterpriseServiceResponse.success(storeScoreList);
public ServiceResponse<Page<Map<String, Object>>> listStoreScore(StoreScoreQO storeScoreQO) {
com.github.pagehelper.Page<Map<String, Object>> storeScoreList = this.evaluateService.listStoreScore(storeScoreQO);
return EnterpriseServiceResponse.success(PageHelperUtils.changePageHelperToCurrentPage(storeScoreList));
}
@Override
......@@ -111,8 +113,8 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
}
@Override
public ServiceResponse<List<Map<String, Object>>> listTrend(StoreTrendQO storeTrendQO) {
List<Map<String, Object>> trendList = this.evaluateService.listTrend(storeTrendQO);
public ServiceResponse<Page<Map<String, Object>>> listTrend(StoreTrendQO storeTrendQO) {
com.github.pagehelper.Page<Map<String, Object>> trendList = this.evaluateService.listTrend(storeTrendQO);
if (CollectionUtils.isNotEmpty(trendList)) {
List<Integer> storeIdList = trendList.stream().map(
e -> {
......@@ -122,28 +124,28 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
).collect(Collectors.toList());
// todo order 通过storeIdList拿到order总数
}
return EnterpriseServiceResponse.success(trendList);
return EnterpriseServiceResponse.success(PageHelperUtils.changePageHelperToCurrentPage(trendList));
}
@Override
public ServiceResponse<List<Map<String, Integer>>> listGoodEvaluateTrendByDate(Integer enterpriseId, String startTime, String endTime) {
public ServiceResponse<List<Map<String, Integer>>> listGoodEvaluateTrendByDate(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
// todo 放假回来改成循环
return getListServiceResponse(enterpriseId, startTime, endTime, QuickReplyTypeEnum.GOOD);
return getListServiceResponse(enterpriseId, startTime, endTime, QuickReplyTypeEnum.GOOD, storeIdList);
}
@Override
public ServiceResponse<List<Map<String, Integer>>> listBadEvaluateTrendByDate(Integer enterpriseId, String startTime, String endTime) {
public ServiceResponse<List<Map<String, Integer>>> listBadEvaluateTrendByDate(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
// todo 放假回来改成循环
return getListServiceResponse(enterpriseId, startTime, endTime, QuickReplyTypeEnum.BAD);
return getListServiceResponse(enterpriseId, startTime, endTime, QuickReplyTypeEnum.BAD, storeIdList);
}
private ServiceResponse<List<Map<String, Integer>>> getListServiceResponse(Integer enterpriseId, String startTime, String endTime, QuickReplyTypeEnum quickReplyTypeEnum) {
private ServiceResponse<List<Map<String, Integer>>> getListServiceResponse(Integer enterpriseId, String startTime, String endTime, QuickReplyTypeEnum quickReplyTypeEnum, List<Integer> storeIdList) {
Date[] time = getTime(startTime, endTime);
Integer count1 = this.evaluateService.countEvaluateTrend(enterpriseId, time[0], time[1], quickReplyTypeEnum.getCode());
Integer count2 = this.evaluateService.countEvaluateTrend(enterpriseId, time[1], time[2], quickReplyTypeEnum.getCode());
Integer count3 = this.evaluateService.countEvaluateTrend(enterpriseId, time[2], time[3], quickReplyTypeEnum.getCode());
Integer count4 = this.evaluateService.countEvaluateTrend(enterpriseId, time[3], time[4], quickReplyTypeEnum.getCode());
Integer count5 = this.evaluateService.countEvaluateTrend(enterpriseId, time[4], null, quickReplyTypeEnum.getCode());
Integer count1 = this.evaluateService.countEvaluateTrend(enterpriseId, time[0], time[1], storeIdList, quickReplyTypeEnum.getCode());
Integer count2 = this.evaluateService.countEvaluateTrend(enterpriseId, time[1], time[2], storeIdList, quickReplyTypeEnum.getCode());
Integer count3 = this.evaluateService.countEvaluateTrend(enterpriseId, time[2], time[3], storeIdList, quickReplyTypeEnum.getCode());
Integer count4 = this.evaluateService.countEvaluateTrend(enterpriseId, time[3], time[4], storeIdList, quickReplyTypeEnum.getCode());
Integer count5 = this.evaluateService.countEvaluateTrend(enterpriseId, time[4], null, storeIdList, quickReplyTypeEnum.getCode());
Map<String, Integer> map1 = new HashMap<>(4);
map1.put(DateUtil.dateToStr(time[0], DateUtil.FORMAT_DATE_10), count1);
Map<String, Integer> map2 = new HashMap<>(4);
......@@ -164,13 +166,6 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
return EnterpriseServiceResponse.success(list);
}
public static void main(String[] args) {
Date[] time = new EvaluateOverviewApiServiceImpl().getTime("2019-12-01", "2020-01-17");
for (Date date : time) {
System.out.println(DateUtil.dateToStr(date, DateUtil.FORMAT_DATE_10));
}
}
private Date[] getTime(String startTime, String endTime) {
Date[] arr = new Date[5];
// String startTime = "2019-12-01";
......
gic-evaluate-service/src/main/resources/mapper/TabEvaluateMapper.xml
......@@ -576,6 +576,12 @@
<if test="endTime != null and endTime != '' ">
and evaluate_time &lt;= #{endTime}
</if>
<if test="null != ids and ids.size > 0">
and store_id in
<foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
<select id="getGoodsCountChart" resultType="map">
SELECT
......@@ -596,6 +602,12 @@
<if test="endTime != null and endTime != '' ">
and evaluate_time &lt;= #{endTime}
</if>
<if test="null != ids and ids.size > 0">
and store_id in
<foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
<select id="getStoreCountChart" resultType="map">
SELECT
......@@ -616,6 +628,12 @@
<if test="endTime != null and endTime != '' ">
and evaluate_time &lt;= #{endTime}
</if>
<if test="null != ids and ids.size > 0">
and store_id in
<foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
<select id="getServiceCountChart" resultType="map">
SELECT
......@@ -636,6 +654,12 @@
<if test="endTime != null and endTime != '' ">
and evaluate_time &lt;= #{endTime}
</if>
<if test="null != ids and ids.size > 0">
and store_id in
<foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
<select id="listTrendEvaluate" resultType="map">
select
......@@ -653,6 +677,12 @@
<if test="goodEvaluateStatus != null ">
and good_evaluate_status = #{goodEvaluateStatus}
</if>
<if test="null != ids and ids.size > 0">
and store_id in
<foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
group by statisticsDate
</select>
<select id="listStoreScore" resultType="map">
......@@ -768,6 +798,12 @@
<if test="tagType != null ">
and tag_type = #{tagType}
</if>
<if test="null != ids and ids.size > 0">
and store_id in
<foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
<select id="listEvaluateTrendByYear" resultType="map">
select
......@@ -870,5 +906,11 @@
<if test="endTime != null ">
and evaluate_time &lt; #{endTime}
</if>
<if test="null != ids and ids.size > 0">
and store_id in
<foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
</mapper>
\ No newline at end of file
gic-evaluate-web/src/main/java/com/gic/evaluate/web/controller/EvaluateOverviewController.java
package com.gic.evaluate.web.controller;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.enterprise.utils.ResultControllerUtils;
......@@ -7,14 +8,12 @@ import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.evaluate.qo.StoreScoreQO;
import com.gic.evaluate.qo.StoreTrendQO;
import com.gic.evaluate.service.EvaluateOverviewApiService;
import com.gic.store.service.StoreWidgetApiService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* @author zhiwj
......@@ -26,40 +25,59 @@ public class EvaluateOverviewController {
@Autowired
private EvaluateOverviewApiService evaluateOverviewApiService;
@Autowired
private StoreWidgetApiService storeWidgetApiService;
@RequestMapping("/evaluate-chart1")
public RestResponse evaluateChart1(String startTime, String endTime) {
ServiceResponse<Map<String, Long>> serviceResponse = evaluateOverviewApiService.chart1(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime);
public RestResponse evaluateChart1(String startTime, String endTime, Integer storeWidgetId) {
List<Integer> storeIdList = Collections.emptyList();
if (storeWidgetId != null) {
ServiceResponse<List<Integer>> serviceResponse = storeWidgetApiService.listStoreIdByStoreWidgetId(UserDetailUtils.getUserDetail().getEnterpriseId(), storeWidgetId);
storeIdList = serviceResponse.getResult();
}
ServiceResponse<Map<String, Long>> serviceResponse = evaluateOverviewApiService.chart1(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
return ResultControllerUtils.commonResult(serviceResponse);
}
@RequestMapping("/evaluate-chart2")
public RestResponse evaluateChart2(String startTime, String endTime) {
ServiceResponse<HashMap<String, Map<String, Long>>> serviceResponse = evaluateOverviewApiService.chart2(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime);
public RestResponse evaluateChart2(String startTime, String endTime, Integer storeWidgetId) {
List<Integer> storeIdList = Collections.emptyList();
if (storeWidgetId != null) {
ServiceResponse<List<Integer>> serviceResponse = storeWidgetApiService.listStoreIdByStoreWidgetId(UserDetailUtils.getUserDetail().getEnterpriseId(), storeWidgetId);
storeIdList = serviceResponse.getResult();
}
ServiceResponse<HashMap<String, Map<String, Long>>> serviceResponse = evaluateOverviewApiService.chart2(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
return ResultControllerUtils.commonResult(serviceResponse);
}
@RequestMapping("/evaluate-chart3")
public RestResponse evaluateChart3(String startTime, String endTime) {
ServiceResponse<Map<String, List<Map<String, Object>>>> serviceResponse = evaluateOverviewApiService.chart3(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime);
public RestResponse evaluateChart3(String startTime, String endTime, Integer storeWidgetId) {
List<Integer> storeIdList = Collections.emptyList();
if (storeWidgetId != null) {
ServiceResponse<List<Integer>> serviceResponse = storeWidgetApiService.listStoreIdByStoreWidgetId(UserDetailUtils.getUserDetail().getEnterpriseId(), storeWidgetId);
storeIdList = serviceResponse.getResult();
}
ServiceResponse<Map<String, List<Map<String, Object>>>> serviceResponse = evaluateOverviewApiService.chart3(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
return ResultControllerUtils.commonResult(serviceResponse);
}
@RequestMapping("/evaluate-chart4")
public RestResponse evaluateChart4(String startTime, String endTime) {
ServiceResponse<Map<String, List<Map<String, Object>>>> serviceResponse = evaluateOverviewApiService.chart4(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime);
public RestResponse evaluateChart4(String startTime, String endTime, Integer storeWidgetId) {
List<Integer> storeIdList = Collections.emptyList();
if (storeWidgetId != null) {
ServiceResponse<List<Integer>> serviceResponse = storeWidgetApiService.listStoreIdByStoreWidgetId(UserDetailUtils.getUserDetail().getEnterpriseId(), storeWidgetId);
storeIdList = serviceResponse.getResult();
}
ServiceResponse<Map<String, List<Map<String, Object>>>> serviceResponse = evaluateOverviewApiService.chart4(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
return ResultControllerUtils.commonResult(serviceResponse);
}
@RequestMapping("/evaluate-store-score")
public RestResponse evaluateStoreScore(StoreScoreQO storeScoreQO) {
storeScoreQO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
ServiceResponse<List<Map<String, Object>>> serviceResponse = evaluateOverviewApiService.listStoreScore(storeScoreQO);
ServiceResponse<Page<Map<String, Object>>> serviceResponse = evaluateOverviewApiService.listStoreScore(storeScoreQO);
ServiceResponse<Map<String, Object>> totalStoreScore = evaluateOverviewApiService.getTotalStoreScore(storeScoreQO);
List<Map<String, Object>> result = serviceResponse.getResult();
if (result == null) {
result = new ArrayList<>();
}
List<Map<String, Object>> result = serviceResponse.getResult().getResult();
result.add(0, totalStoreScore.getResult());
return RestResponse.success(result);
}
......@@ -67,19 +85,29 @@ public class EvaluateOverviewController {
@RequestMapping("/evaluate-list-trend")
public RestResponse evaluateListTrend(StoreTrendQO storeTrendQO) {
storeTrendQO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
ServiceResponse<List<Map<String, Object>>> serviceResponse = evaluateOverviewApiService.listTrend(storeTrendQO);
ServiceResponse<Page<Map<String, Object>>> serviceResponse = evaluateOverviewApiService.listTrend(storeTrendQO);
return ResultControllerUtils.commonResult(serviceResponse);
}
@RequestMapping("/good-trend-by-date")
public RestResponse listGoodEvaluateTrendByDate(String startTime, String endTime) {
ServiceResponse<List<Map<String, Integer>>> serviceResponse = evaluateOverviewApiService.listGoodEvaluateTrendByDate(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime);
public RestResponse listGoodEvaluateTrendByDate(String startTime, String endTime, Integer storeWidgetId) {
List<Integer> storeIdList = Collections.emptyList();
if (storeWidgetId != null) {
ServiceResponse<List<Integer>> serviceResponse = storeWidgetApiService.listStoreIdByStoreWidgetId(UserDetailUtils.getUserDetail().getEnterpriseId(), storeWidgetId);
storeIdList = serviceResponse.getResult();
}
ServiceResponse<List<Map<String, Integer>>> serviceResponse = evaluateOverviewApiService.listGoodEvaluateTrendByDate(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
return ResultControllerUtils.commonResult(serviceResponse);
}
@RequestMapping("/bad-trend-by-date")
public RestResponse listBadEvaluateTrendByDate(String startTime, String endTime) {
ServiceResponse<List<Map<String, Integer>>> serviceResponse = evaluateOverviewApiService.listBadEvaluateTrendByDate(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime);
public RestResponse listBadEvaluateTrendByDate(String startTime, String endTime, Integer storeWidgetId) {
List<Integer> storeIdList = Collections.emptyList();
if (storeWidgetId != null) {
ServiceResponse<List<Integer>> serviceResponse = storeWidgetApiService.listStoreIdByStoreWidgetId(UserDetailUtils.getUserDetail().getEnterpriseId(), storeWidgetId);
storeIdList = serviceResponse.getResult();
}
ServiceResponse<List<Map<String, Integer>>> serviceResponse = evaluateOverviewApiService.listBadEvaluateTrendByDate(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
return ResultControllerUtils.commonResult(serviceResponse);
}
}
gic-evaluate-web/src/main/java/com/gic/evaluate/web/controller/ProblemController.java
......@@ -66,7 +66,7 @@ public class ProblemController {
return ResultControllerUtils.commonResult(serviceResponse);
}
@RequestMapping("/update-malicious-status")
@RequestMapping("/update-problem-malicious-status")
public RestResponse updateMaliciousStatus(Integer problemId, Integer maliciousStatus) {
ServiceResponse<Void> serviceResponse = problemManageApiService.updateMaliciousStatus(problemId, maliciousStatus);
return ResultControllerUtils.commonResult(serviceResponse);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment