Skip to content

G
gic-evaluate
Commit 53cba37f by zhiwj
Options

pmd

parent 85aefc3f
Showing with 68 additions and 68 deletions
gic-evaluate-api/src/main/java/com/gic/evaluate/service/EvaluateOverviewApiService.java
......@@ -29,7 +29,7 @@ public interface EvaluateOverviewApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.util.Map<java.lang.String,java.lang.Long>>
* @throws
*/
ServiceResponse<Map<String, Long>> chart1(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
ServiceResponse<Map<String, Long>> chartOne(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
/**
* 图表2 各项评分概况
......@@ -39,7 +39,7 @@ public interface EvaluateOverviewApiService {
* @param storeIdList
* @return
*/
ServiceResponse<HashMap<String, Map<String, Long>>> chart2(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
ServiceResponse<HashMap<String, Map<String, Long>>> chartTwo(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
/**
* 图表3 评价趋势
......@@ -53,7 +53,7 @@ public interface EvaluateOverviewApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.util.Map<java.lang.String,java.util.List<java.util.Map<java.lang.String,java.lang.Object>>>>
* @throws
*/
ServiceResponse<Map<String, List<Map<String, Object>>>> chart3(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
ServiceResponse<Map<String, List<Map<String, Object>>>> chartThree(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
/**
* 图表4 正面/负面快评使用统计 变化趋势
......@@ -67,7 +67,7 @@ public interface EvaluateOverviewApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.util.Map<java.lang.String,java.util.List<java.util.Map<java.lang.String,java.lang.Object>>>>
* @throws
*/
ServiceResponse<Map<String, List<Map<String, Object>>>> chart4(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
ServiceResponse<Map<String, List<Map<String, Object>>>> chartFour(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
/**
* 查询门店评分
......
gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/EvaluateOverviewApiServiceImpl.java
......@@ -46,13 +46,13 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
StoreEvaluateApiService storeEvaluateApiService;
@Override
public ServiceResponse<Map<String, Long>> chart1(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
public ServiceResponse<Map<String, Long>> chartOne(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, List<Integer> storeIdList) {
public ServiceResponse<HashMap<String, Map<String, Long>>> chartTwo(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);
......@@ -67,7 +67,7 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
}
@Override
public ServiceResponse<Map<String, List<Map<String, Object>>>> chart3(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
public ServiceResponse<Map<String, List<Map<String, Object>>>> chartThree(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);
List<Map<String, Object>> listTrendOrderCount = this.storeEvaluateApiService.listTrendOrderCount(enterpriseId, startTime, endTime, storeIdList).getResult();
......@@ -77,9 +77,9 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
try {
List<String> dateList = this.getDateList(startTime, endTime);
map.put("totalEvaluateList", dealChart4(listTrendTotalEvaluate, dateList));
map.put("goodEvaluateList", dealChart4(listTrendGoodEvaluate, dateList));
map.put("orderList", dealChart4(listTrendOrderCount, dateList));
map.put("totalEvaluateList", dealChartFour(listTrendTotalEvaluate, dateList));
map.put("goodEvaluateList", dealChartFour(listTrendGoodEvaluate, dateList));
map.put("orderList", dealChartFour(listTrendOrderCount, dateList));
return EnterpriseServiceResponse.success(map);
} catch (Exception e) {
logger.info("解析参数错误", e);
......@@ -88,7 +88,7 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
}
@Override
public ServiceResponse<Map<String, List<Map<String, Object>>>> chart4(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
public ServiceResponse<Map<String, List<Map<String, Object>>>> chartFour(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
List<Map<String, Object>> goodChart = this.evaluateQuickService.evaluateGoodQuickChart(enterpriseId, startTime, endTime, storeIdList);
List<Map<String, Object>> badChart = this.evaluateQuickService.evaluateBadQuickChart(enterpriseId, startTime, endTime, storeIdList);
......@@ -98,7 +98,7 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
return EnterpriseServiceResponse.success(map);
}
private List<Map<String, Object>> dealChart4(List<Map<String, Object>> chart, List<String> dateList) {
private List<Map<String, Object>> dealChartFour(List<Map<String, Object>> chart, List<String> dateList) {
List<Map<String, Object>> result = new ArrayList<>();
for (String date : dateList) {
Map<Object, Object> collect = chart.stream().collect(Collectors.toMap(e -> e.get("statisticsDate"), e -> e.get("count")));
......@@ -177,28 +177,28 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
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], 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);
map2.put(DateUtil.dateToStr(time[1], DateUtil.FORMAT_DATE_10), count2);
Map<String, Integer> map3 = new HashMap<>(4);
map3.put(DateUtil.dateToStr(time[2], DateUtil.FORMAT_DATE_10), count3);
Map<String, Integer> map4 = new HashMap<>(4);
map4.put(DateUtil.dateToStr(time[3], DateUtil.FORMAT_DATE_10), count4);
Map<String, Integer> map5 = new HashMap<>(4);
map5.put(DateUtil.dateToStr(time[4], DateUtil.FORMAT_DATE_10), count5);
Integer countOne = this.evaluateService.countEvaluateTrend(enterpriseId, time[0], time[1], storeIdList, quickReplyTypeEnum.getCode());
Integer countTwo = this.evaluateService.countEvaluateTrend(enterpriseId, time[1], time[2], storeIdList, quickReplyTypeEnum.getCode());
Integer countThree = this.evaluateService.countEvaluateTrend(enterpriseId, time[2], time[3], storeIdList, quickReplyTypeEnum.getCode());
Integer countFour = this.evaluateService.countEvaluateTrend(enterpriseId, time[3], time[4], storeIdList, quickReplyTypeEnum.getCode());
Integer countFive = this.evaluateService.countEvaluateTrend(enterpriseId, time[4], null, storeIdList, quickReplyTypeEnum.getCode());
Map<String, Integer> mapOne = new HashMap<>(4);
mapOne.put(DateUtil.dateToStr(time[0], DateUtil.FORMAT_DATE_10), countOne);
Map<String, Integer> mapTwo = new HashMap<>(4);
mapTwo.put(DateUtil.dateToStr(time[1], DateUtil.FORMAT_DATE_10), countTwo);
Map<String, Integer> mapThree = new HashMap<>(4);
mapThree.put(DateUtil.dateToStr(time[2], DateUtil.FORMAT_DATE_10), countThree);
Map<String, Integer> mapFour = new HashMap<>(4);
mapFour.put(DateUtil.dateToStr(time[3], DateUtil.FORMAT_DATE_10), countFour);
Map<String, Integer> mapFive = new HashMap<>(4);
mapFive.put(DateUtil.dateToStr(time[4], DateUtil.FORMAT_DATE_10), countFive);
List<Map<String, Integer>> list = new ArrayList<>();
list.add(map1);
list.add(map2);
list.add(map3);
list.add(map4);
list.add(map5);
list.add(mapOne);
list.add(mapTwo);
list.add(mapThree);
list.add(mapFour);
list.add(mapFive);
return EnterpriseServiceResponse.success(list);
}
......@@ -212,32 +212,32 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
try {
startTimeDate = sdf.parse(startTime);
endTimeDate = sdf.parse(endTime);
Calendar cal1 = Calendar.getInstance();
cal1.setTime(startTimeDate);
Date date1 = cal1.getTime();
long time1 = cal1.getTimeInMillis();
Calendar cal2 = Calendar.getInstance();
cal2.setTime(endTimeDate);
long time2 = cal2.getTimeInMillis();
long betweenDays = (time2 - time1) / 86400000L;
Calendar cal = Calendar.getInstance();
cal.setTime(startTimeDate);
Date dateOne = cal.getTime();
long startTimeL = cal.getTimeInMillis();
Calendar calTmp = Calendar.getInstance();
calTmp.setTime(endTimeDate);
long endTimeL = calTmp.getTimeInMillis();
long betweenDays = (endTimeL - startTimeL) / 86400000L;
int days = Integer.parseInt(String.valueOf(betweenDays));
int step = days/5;
cal1.add(Calendar.DAY_OF_MONTH, step);
Date date2 = cal1.getTime();
cal1.add(Calendar.DAY_OF_MONTH, step);
Date date3 = cal1.getTime();
cal1.add(Calendar.DAY_OF_MONTH, step);
Date date4 = cal1.getTime();
cal1.add(Calendar.DAY_OF_MONTH, step);
Date date5 = cal1.getTime();
arr[0] = date1;
arr[1] = date2;
arr[2] = date3;
arr[3] = date4;
arr[4] = date5;
} catch (ParseException var10) {
logger.warn("exception", var10);
cal.add(Calendar.DAY_OF_MONTH, step);
Date dateTwo = cal.getTime();
cal.add(Calendar.DAY_OF_MONTH, step);
Date dateThree = cal.getTime();
cal.add(Calendar.DAY_OF_MONTH, step);
Date dateFour = cal.getTime();
cal.add(Calendar.DAY_OF_MONTH, step);
Date dateFive = cal.getTime();
arr[0] = dateOne;
arr[1] = dateTwo;
arr[2] = dateThree;
arr[3] = dateFour;
arr[4] = dateFive;
} catch (ParseException e) {
logger.warn("exception", e);
}
return arr;
......
gic-evaluate-web/src/main/java/com/gic/evaluate/web/controller/EvaluateOverviewController.java
......@@ -39,7 +39,7 @@ public class EvaluateOverviewController {
private ResourceApiService resourceApiService;
@RequestMapping("/evaluate-chart1")
public RestResponse evaluateChart1(String startTime, String endTime, Integer storeWidgetId) {
public RestResponse evaluateChartOne(String startTime, String endTime, Integer storeWidgetId) {
List<Integer> storeIdList = Collections.emptyList();
// 权限判断
// 判断权限
......@@ -62,12 +62,12 @@ public class EvaluateOverviewController {
if (StringUtils.isNotBlank(endTime)) {
endTime += " 23:59:59";
}
ServiceResponse<Map<String, Long>> serviceResponse = evaluateOverviewApiService.chart1(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
ServiceResponse<Map<String, Long>> serviceResponse = evaluateOverviewApiService.chartOne(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
return ResultControllerUtils.commonResult(serviceResponse);
}
@RequestMapping("/evaluate-chart2")
public RestResponse evaluateChart2(String startTime, String endTime, Integer storeWidgetId) {
public RestResponse evaluateChartTwo(String startTime, String endTime, Integer storeWidgetId) {
List<Integer> storeIdList = Collections.emptyList();
// 判断权限
OrderResourceDTO orderResourceDTO = resourceApiService.getOrderResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
......@@ -89,12 +89,12 @@ public class EvaluateOverviewController {
if (StringUtils.isNotBlank(endTime)) {
endTime += " 23:59:59";
}
ServiceResponse<HashMap<String, Map<String, Long>>> serviceResponse = evaluateOverviewApiService.chart2(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
ServiceResponse<HashMap<String, Map<String, Long>>> serviceResponse = evaluateOverviewApiService.chartTwo(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
return ResultControllerUtils.commonResult(serviceResponse);
}
@RequestMapping("/evaluate-chart3")
public RestResponse evaluateChart3(String startTime, String endTime, Integer storeWidgetId) {
public RestResponse evaluateChartThree(String startTime, String endTime, Integer storeWidgetId) {
List<Integer> storeIdList = Collections.emptyList();
// 权限判断
OrderResourceDTO orderResourceDTO = resourceApiService.getOrderResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
......@@ -115,12 +115,12 @@ public class EvaluateOverviewController {
if (StringUtils.isNotBlank(endTime)) {
endTime += " 23:59:59";
}
ServiceResponse<Map<String, List<Map<String, Object>>>> serviceResponse = evaluateOverviewApiService.chart3(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
ServiceResponse<Map<String, List<Map<String, Object>>>> serviceResponse = evaluateOverviewApiService.chartThree(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
return ResultControllerUtils.commonResult(serviceResponse);
}
@RequestMapping("/evaluate-chart4")
public RestResponse evaluateChart4(String startTime, String endTime, Integer storeWidgetId) {
public RestResponse evaluateChartFour(String startTime, String endTime, Integer storeWidgetId) {
List<Integer> storeIdList = Collections.emptyList();
// 权限判断
OrderResourceDTO orderResourceDTO = resourceApiService.getOrderResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
......@@ -142,7 +142,7 @@ public class EvaluateOverviewController {
if (StringUtils.isNotBlank(endTime)) {
endTime += " 23:59:59";
}
ServiceResponse<Map<String, List<Map<String, Object>>>> serviceResponse = evaluateOverviewApiService.chart4(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
ServiceResponse<Map<String, List<Map<String, Object>>>> serviceResponse = evaluateOverviewApiService.chartFour(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
return ResultControllerUtils.commonResult(serviceResponse);
}
......
gic-evaluate-web/src/main/java/com/gic/evaluate/web/utils/ExcelUtils.java
......@@ -63,9 +63,9 @@ public class ExcelUtils {
for (int j = 0; j < everyLines.get(i).size(); j++) {
sheet.setColumnWidth(j, COLUMN_HEIGHT);
//将内容按顺序赋给对应的列对象
XSSFCell cell1 = row.createCell(j);
cell1.setCellValue(everyLines.get(i).get(j));
cell1.setCellStyle(style);
XSSFCell cellTmp = row.createCell(j);
cellTmp.setCellValue(everyLines.get(i).get(j));
cellTmp.setCellStyle(style);
}
}
return wb;
......@@ -79,9 +79,9 @@ public class ExcelUtils {
XSSFRow row1 = sheet.createRow(0);
row1.setZeroHeight(true);
XSSFCell cell1 = row1.createCell(0);
XSSFCell cellOne = row1.createCell(0);
if (StringUtils.isNotBlank(regionIdStr)) {
cell1.setCellValue(regionIdStr);
cellOne.setCellValue(regionIdStr);
}
XSSFRow rowm = sheet.createRow(1); // 产生表格标题行
......
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