ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisIndexRankingDataController.java
File was renamed from ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/controller/AnalysisIndexRankingDataController.java @@ -1,4 +1,4 @@ package com.ruoyi.admin.large.controller; package com.ruoyi.admin.controller.large; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -24,7 +24,7 @@ * @author xiaochen * @since 2025-04-22 */ @Api(tags = "指标排名") @Api(tags = {"大屏-指标排名"}) @RestController @RequestMapping("/analysis-index-ranking-data") public class AnalysisIndexRankingDataController { ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java
File was renamed from ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/controller/AnalysisOrderDataController.java @@ -1,4 +1,4 @@ package com.ruoyi.admin.large.controller; package com.ruoyi.admin.controller.large; import cn.afterturn.easypoi.excel.ExcelExportUtil; @@ -14,7 +14,6 @@ import com.ruoyi.admin.utils.ImportExcelUtil; import com.ruoyi.admin.utils.WebUtils; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.order.api.entity.Order; @@ -44,7 +43,7 @@ * @author xiaochen * @since 2025-04-22 */ @Api(tags = "上门回收订单") @Api(tags = {"大屏-上门回收订单"}) @RestController @RequestMapping("/analysis-order-data") public class AnalysisOrderDataController { ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisRecycleDataController.java
File was renamed from ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/controller/AnalysisRecycleDataController.java @@ -1,16 +1,12 @@ package com.ruoyi.admin.large.controller; package com.ruoyi.admin.controller.large; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.admin.entity.SysUser; import com.ruoyi.admin.large.model.AnalysisRecycleData; import com.ruoyi.admin.large.model.vo.RecycleLargeVO; import com.ruoyi.admin.large.service.AnalysisRecycleDataService; import com.ruoyi.admin.service.SysUserService; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.page.PageInfo; import com.ruoyi.common.security.service.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -30,7 +26,7 @@ * @author xiaochen * @since 2025-04-21 */ @Api(tags = "回收数据分析") @Api(tags = {"大屏-回收数据分析"}) @RestController @RequestMapping("/analysis-recycle-data") public class AnalysisRecycleDataController { ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisRecycleTypeDataController.java
File was renamed from ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/controller/AnalysisRecycleTypeDataController.java @@ -1,7 +1,6 @@ package com.ruoyi.admin.large.controller; package com.ruoyi.admin.controller.large; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.admin.entity.SysUser; @@ -28,7 +27,7 @@ * @author xiaochen * @since 2025-04-21 */ @Api(tags = "回收分类订单数量统计") @Api(tags = {"大屏-回收分类订单数量统计"}) @RestController @RequestMapping("/analysis-recycle-type-data") public class AnalysisRecycleTypeDataController { ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisServiceIndexChildDataController.java
File was renamed from ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/controller/AnalysisServiceIndexChildDataController.java @@ -1,21 +1,17 @@ package com.ruoyi.admin.large.controller; package com.ruoyi.admin.controller.large; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.admin.large.model.AnalysisServiceIndexChildData; import com.ruoyi.admin.large.model.AnalysisServiceIndexData; import com.ruoyi.admin.large.service.AnalysisServiceIndexChildDataService; import com.ruoyi.admin.large.service.AnalysisServiceIndexDataService; import com.ruoyi.admin.service.SysUserService; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.security.service.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.stream.Collectors; /** * <p> @@ -25,15 +21,17 @@ * @author xiaochen * @since 2025-04-21 */ @Api(tags = "服务分析指标") @Api(tags = {"大屏-服务分析指标"}) @RestController @RequestMapping("/analysis-service-index-child-data") public class AnalysisServiceIndexChildDataController { private final AnalysisServiceIndexChildDataService analysisServiceIndexChildDataService; private final AnalysisServiceIndexDataService analysisServiceIndexDataService; @Autowired public AnalysisServiceIndexChildDataController(AnalysisServiceIndexChildDataService analysisServiceIndexChildDataService) { public AnalysisServiceIndexChildDataController(AnalysisServiceIndexChildDataService analysisServiceIndexChildDataService, AnalysisServiceIndexDataService analysisServiceIndexDataService) { this.analysisServiceIndexChildDataService = analysisServiceIndexChildDataService; this.analysisServiceIndexDataService = analysisServiceIndexDataService; } /** * 修改服务指标分析渠道商 @@ -41,7 +39,10 @@ @ApiOperation( value = "修改服务指标分析渠道商") @PostMapping(value = "/update") public R<Boolean> update(@RequestBody List<AnalysisServiceIndexChildData> dto) { return R.ok(analysisServiceIndexChildDataService.updateBatchById(dto)); Integer serviceIndexId = dto.get(0).getServiceIndexId(); analysisServiceIndexChildDataService.remove(Wrappers.lambdaQuery(AnalysisServiceIndexChildData.class) .eq(AnalysisServiceIndexChildData::getServiceIndexId, serviceIndexId)); return R.ok(analysisServiceIndexChildDataService.saveBatch(dto)); } /** ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisServiceIndexDataController.java
File was renamed from ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/controller/AnalysisServiceIndexDataController.java @@ -1,4 +1,4 @@ package com.ruoyi.admin.large.controller; package com.ruoyi.admin.controller.large; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -25,7 +25,7 @@ * @author xiaochen * @since 2025-04-21 */ @Api(tags = "服务指标分析渠道商") @Api(tags = {"大屏-服务指标分析渠道商"}) @RestController @RequestMapping("/analysis-service-index-data") public class AnalysisServiceIndexDataController { ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisSetDataController.java
File was renamed from ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/controller/AnalysisSetDataController.java @@ -1,7 +1,6 @@ package com.ruoyi.admin.large.controller; package com.ruoyi.admin.controller.large; import com.ruoyi.admin.large.base.BasePage; import com.ruoyi.admin.large.model.AnalysisSetData; import com.ruoyi.admin.large.service.AnalysisSetDataService; import com.ruoyi.common.core.domain.R; @@ -18,7 +17,7 @@ * @author xiaochen * @since 2025-04-22 */ @Api(tags = "统计数据设置") @Api(tags = {"大屏-统计数据设置"}) @RestController @RequestMapping("/analysis-set-data") public class AnalysisSetDataController { ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisIndexRankingData.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -33,7 +34,7 @@ @ApiModelProperty(value = "时间") @TableField("rank_time") private LocalDateTime rankTime; private String rankTime; @ApiModelProperty(value = "区域") @TableField("rank_area") ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/service/impl/AnalysisRecycleDataServiceImpl.java
@@ -35,47 +35,51 @@ Map<String,Long> map = new HashMap<>(); if (analysisType == 1) { // 年份 int year = LocalDateTime.now().getYear(); String year = LocalDateTime.now().getYear()+"年"; long count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, year)); map.put(String.valueOf(year),count); year = LocalDateTime.now().minusYears(1).getYear(); map.put(year,count); year = LocalDateTime.now().minusYears(1).getYear()+"年"; count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, year)); map.put(String.valueOf(year),count); year = LocalDateTime.now().minusYears(2).getYear(); map.put(year,count); year = LocalDateTime.now().minusYears(2).getYear()+"年"; count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, year)); map.put(String.valueOf(year),count); year = LocalDateTime.now().minusYears(3).getYear(); map.put(year,count); year = LocalDateTime.now().minusYears(3).getYear()+"年"; count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, year)); map.put(String.valueOf(year),count); year = LocalDateTime.now().minusYears(4).getYear(); map.put(year,count); year = LocalDateTime.now().minusYears(4).getYear()+"年"; count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, year)); map.put(String.valueOf(year),count); year = LocalDateTime.now().minusYears(5).getYear(); map.put(year,count); year = LocalDateTime.now().minusYears(5).getYear()+"年"; count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, year)); map.put(String.valueOf(year),count); map.put(year,count); return map; } else{ // 月份 String month = new SimpleDateFormat("yyyy-MM").format(new Date()); String month = new SimpleDateFormat("yyyy年MM月").format(new Date()); long count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, month)); map.put(month,count); month = new SimpleDateFormat("yyyy-MM").format(DateUtils.localDateTimeToDate(LocalDateTime.now().minusMonths(1))); month = new SimpleDateFormat("yyyy年MM月").format(DateUtils.localDateTimeToDate(LocalDateTime.now().minusMonths(1))); count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, month)); map.put(month,count); month = new SimpleDateFormat("yyyy-MM").format(DateUtils.localDateTimeToDate(LocalDateTime.now().minusMonths(2))); month = new SimpleDateFormat("yyyy年MM月").format(DateUtils.localDateTimeToDate(LocalDateTime.now().minusMonths(2))); count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, month)); map.put(month,count); month = new SimpleDateFormat("yyyy-MM").format(DateUtils.localDateTimeToDate(LocalDateTime.now().minusMonths(3))); month = new SimpleDateFormat("yyyy年MM月").format(DateUtils.localDateTimeToDate(LocalDateTime.now().minusMonths(3))); count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, month)); map.put(month,count); month = new SimpleDateFormat("yyyy-MM").format(DateUtils.localDateTimeToDate(LocalDateTime.now().minusMonths(4))); month = new SimpleDateFormat("yyyy年MM月").format(DateUtils.localDateTimeToDate(LocalDateTime.now().minusMonths(4))); count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, month)); map.put(month,count); month = new SimpleDateFormat("yyyy-MM").format(DateUtils.localDateTimeToDate(LocalDateTime.now().minusMonths(5))); month = new SimpleDateFormat("yyyy年MM月").format(DateUtils.localDateTimeToDate(LocalDateTime.now().minusMonths(5))); count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, month)); map.put(month,count); return map; } } public static void main(String[] args) { System.err.println(LocalDateTime.now().getYear()+"年"); } }
