diff --git a/src/main/java/com/lz/modules/performance/controller/IndicatorLibraryController.java b/src/main/java/com/lz/modules/performance/controller/IndicatorLibraryController.java index 889709d7..a836f73a 100644 --- a/src/main/java/com/lz/modules/performance/controller/IndicatorLibraryController.java +++ b/src/main/java/com/lz/modules/performance/controller/IndicatorLibraryController.java @@ -2,44 +2,20 @@ package com.lz.modules.performance.controller; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSONObject; -import com.google.common.collect.Maps; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; -import com.lz.common.utils.StringUtil; -import com.lz.modules.flow.entity.FlowStart; import com.lz.modules.performance.dto.IndicatorLibraryDto; import com.lz.modules.performance.dto.IndicatorLibraryMoveDto; -import com.lz.modules.performance.dto.StatisticalIndicatorTypeDto; +import com.lz.modules.performance.res.StatisticalIndicatorTypeRes; import com.lz.modules.performance.entity.IndicatorLibrary; import com.lz.modules.performance.req.IndicatorLibraryReq; import com.lz.modules.performance.service.IndicatorLibraryService; import io.swagger.annotations.*; import lombok.extern.slf4j.Slf4j; -import org.aopalliance.aop.Advice; -import org.apache.ibatis.annotations.Param; -import org.springframework.aop.Advisor; -import org.springframework.aop.AfterReturningAdvice; -import org.springframework.aop.framework.adapter.AdvisorAdapter; -import org.springframework.aop.framework.adapter.AfterReturningAdviceInterceptor; -import org.springframework.aop.framework.adapter.UnknownAdviceTypeException; -import org.springframework.aop.support.DefaultPointcutAdvisor; -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; -import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.*; -import javax.annotation.PostConstruct; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; @Slf4j @RestController @@ -110,9 +86,9 @@ public class IndicatorLibraryController { @GetMapping("/statistical") @ApiOperation("统计指标") - @ApiResponses({@ApiResponse(code = 200, message = "成功", response = StatisticalIndicatorTypeDto.class)}) - public R statistical(@RequestParam(name = "indicatorType",required = false) @ApiParam(value = "指标分类id",name = "indicatorType") Long indicatorType) { - List dtos = indicatorLibraryService.statisticalByIndicatorType(indicatorType); + @ApiResponses({@ApiResponse(code = 200, message = "成功", response = StatisticalIndicatorTypeRes.class)}) + public R statistical(@RequestParam(name = "type",required = false) @ApiParam(value = "指标分类id",name = "type") Long type) { + List dtos = indicatorLibraryService.statisticalByType(type); return R.ok().put("data",dtos); } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/controller/IndicatorTypeController.java b/src/main/java/com/lz/modules/performance/controller/IndicatorTypeController.java index 6a3c863c..5aff7bf6 100644 --- a/src/main/java/com/lz/modules/performance/controller/IndicatorTypeController.java +++ b/src/main/java/com/lz/modules/performance/controller/IndicatorTypeController.java @@ -8,11 +8,10 @@ import com.lz.common.utils.StringUtil; import com.lz.modules.performance.dto.IndicatorTypeDto; import com.lz.modules.performance.entity.IndicatorType; import com.lz.modules.performance.req.IndicatorReq; +import com.lz.modules.performance.res.IndicatorTypeRes; import com.lz.modules.performance.service.IndicatorLibraryService; import com.lz.modules.performance.service.IndicatorTypeService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import io.swagger.annotations.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -32,7 +31,8 @@ public class IndicatorTypeController { @PostMapping("/list") @ApiOperation("获取分类/类型列表") - public R list(@RequestBody IndicatorReq req) { + @ApiResponses({@ApiResponse(code = 200, message = "成功", response = IndicatorTypeRes.class)}) + public R list(@RequestBody IndicatorReq req) { PageUtils page = indicatorTypeService.selectIndicatorTypesByReq(req); return R.ok().put("data", page); } diff --git a/src/main/java/com/lz/modules/performance/dao/IndicatorLibraryMapper.java b/src/main/java/com/lz/modules/performance/dao/IndicatorLibraryMapper.java index 7dde2eab..48f62c85 100644 --- a/src/main/java/com/lz/modules/performance/dao/IndicatorLibraryMapper.java +++ b/src/main/java/com/lz/modules/performance/dao/IndicatorLibraryMapper.java @@ -10,7 +10,7 @@ package com.lz.modules.performance.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.lz.modules.performance.dto.IndicatorLibraryDto; -import com.lz.modules.performance.dto.StatisticalIndicatorTypeDto; +import com.lz.modules.performance.res.StatisticalIndicatorTypeRes; import com.lz.modules.performance.entity.IndicatorLibrary; import com.lz.modules.performance.req.IndicatorLibraryReq; import org.apache.ibatis.annotations.Mapper; @@ -42,7 +42,7 @@ public interface IndicatorLibraryMapper extends BaseMapper { void updateIndicatorLibrarysMove(@Param("ids")List ids,@Param("indicatorType")Long indicatorType); - List statisticalByIndicatorType(Long indicatorType); + List statisticalByType(Long type); int deleteIndicatorLibrarysByIndicatorType(@Param("indicatorType") Integer indicatorType); diff --git a/src/main/java/com/lz/modules/performance/req/IndicatorLibraryReq.java b/src/main/java/com/lz/modules/performance/req/IndicatorLibraryReq.java index 85d27fe3..02453f03 100644 --- a/src/main/java/com/lz/modules/performance/req/IndicatorLibraryReq.java +++ b/src/main/java/com/lz/modules/performance/req/IndicatorLibraryReq.java @@ -21,4 +21,8 @@ public class IndicatorLibraryReq extends BasePage{ @ApiModelProperty(value = "指标分类 lz_indicator_type 表id", name = "indicatorType") private Integer indicatorType; + //指标分类 lz_indicator_type 表id + @ApiModelProperty(value = "指标类型 lz_indicator_type 表id", name = "type") + private Integer type; + } diff --git a/src/main/java/com/lz/modules/performance/res/IndicatorTypeRes.java b/src/main/java/com/lz/modules/performance/res/IndicatorTypeRes.java new file mode 100644 index 00000000..068e7454 --- /dev/null +++ b/src/main/java/com/lz/modules/performance/res/IndicatorTypeRes.java @@ -0,0 +1,27 @@ +package com.lz.modules.performance.res; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author: djc + * @Desc: + * @Date: 2021/1/12 10:21 + */ +@Data +@ApiModel("分类响应实体") +public class IndicatorTypeRes { + + @ApiModelProperty(value = "id 分类或类型标识", name = "id") + private Long id; + //指标名称 + @ApiModelProperty(value = "指标分类名称", name = "name") + private String name; + //指标名称 + @ApiModelProperty(value = "类型0: 指标分类 1：指标类型", name = "type") + private Integer type; + //排序 + @ApiModelProperty(value = "排序（非必须）", name = "orderBy") + private Integer orderBy; +} diff --git a/src/main/java/com/lz/modules/performance/dto/StatisticalIndicatorTypeDto.java b/src/main/java/com/lz/modules/performance/res/StatisticalIndicatorTypeRes.java similarity index 79% rename from src/main/java/com/lz/modules/performance/dto/StatisticalIndicatorTypeDto.java rename to src/main/java/com/lz/modules/performance/res/StatisticalIndicatorTypeRes.java index a70c1603..f2d2c6d7 100644 --- a/src/main/java/com/lz/modules/performance/dto/StatisticalIndicatorTypeDto.java +++ b/src/main/java/com/lz/modules/performance/res/StatisticalIndicatorTypeRes.java @@ -1,4 +1,4 @@ -package com.lz.modules.performance.dto; +package com.lz.modules.performance.res; import com.lz.modules.performance.entity.IndicatorType; import io.swagger.annotations.ApiModel; @@ -12,12 +12,12 @@ import lombok.Data; */ @Data @ApiModel("统计响应实体") -public class StatisticalIndicatorTypeDto { +public class StatisticalIndicatorTypeRes { @ApiModelProperty(value = "名称",name = "name") private String name; - @ApiModelProperty(value = "类型",name = "indicatorType") + @ApiModelProperty(value = "分类",name = "indicatorType") private Integer indicatorType; @ApiModelProperty(value = "个数",name = "count") diff --git a/src/main/java/com/lz/modules/performance/service/IndicatorLibraryService.java b/src/main/java/com/lz/modules/performance/service/IndicatorLibraryService.java index 2898bc29..2a8f09ee 100644 --- a/src/main/java/com/lz/modules/performance/service/IndicatorLibraryService.java +++ b/src/main/java/com/lz/modules/performance/service/IndicatorLibraryService.java @@ -3,7 +3,7 @@ package com.lz.modules.performance.service; import com.baomidou.mybatisplus.extension.service.IService; import com.lz.common.utils.PageUtils; import com.lz.modules.performance.dto.IndicatorLibraryMoveDto; -import com.lz.modules.performance.dto.StatisticalIndicatorTypeDto; +import com.lz.modules.performance.res.StatisticalIndicatorTypeRes; import com.lz.modules.performance.entity.IndicatorLibrary; import com.lz.modules.performance.req.IndicatorLibraryReq; @@ -41,7 +41,7 @@ public interface IndicatorLibraryService extends IService { void updateIndicatorLibrarysMove(IndicatorLibraryMoveDto dto); - List statisticalByIndicatorType(Long indicatorType); + List statisticalByType(Long indicatorType); int deleteIndicatorLibrarysIndicatorType(Integer indicatorType); diff --git a/src/main/java/com/lz/modules/performance/service/impl/IndicatorLibraryServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/IndicatorLibraryServiceImpl.java index c6baa6fd..0ea56e02 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/IndicatorLibraryServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/IndicatorLibraryServiceImpl.java @@ -1,12 +1,11 @@ package com.lz.modules.performance.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.google.common.collect.Lists; import com.lz.common.utils.PageUtils; import com.lz.common.utils.StringUtil; import com.lz.modules.performance.dao.IndicatorLibraryMapper; import com.lz.modules.performance.dto.IndicatorLibraryMoveDto; -import com.lz.modules.performance.dto.StatisticalIndicatorTypeDto; +import com.lz.modules.performance.res.StatisticalIndicatorTypeRes; import com.lz.modules.performance.entity.IndicatorLibrary; import com.lz.modules.performance.req.IndicatorLibraryReq; import com.lz.modules.performance.service.IndicatorLibraryService; @@ -15,10 +14,7 @@ import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Arrays; import java.util.List; -import java.util.Optional; -import java.util.function.ToDoubleFunction; /** *

@@ -103,9 +99,9 @@ public class IndicatorLibraryServiceImpl extends ServiceImpl statisticalByIndicatorType(Long indicatorType) { - List dtos = indicatorLibraryMapper.statisticalByIndicatorType(indicatorType); - StatisticalIndicatorTypeDto dto = new StatisticalIndicatorTypeDto(); + public List statisticalByType(Long type) { + List dtos = indicatorLibraryMapper.statisticalByType(type); + StatisticalIndicatorTypeRes dto = new StatisticalIndicatorTypeRes(); dto.setName("未分类指标"); dto.setIndicatorType(0); dto.setDelete(1); @@ -115,7 +111,7 @@ public class IndicatorLibraryServiceImpl extends ServiceImpl and indicator_type = #{req.indicatorType} + + and type = #{req.type} + order by sort @@ -123,15 +126,18 @@ - SELECT t.id indicatorType,t.name,IFNULL(l.count,0) count from lz_indicator_type t - LEFT JOIN (SELECT name,indicator_type,count(indicator_type) count from lz_indicator_library where is_delete = 0 - - and l.indicator_type=#{indicatorType} + LEFT JOIN + (SELECT name,indicator_type,count(indicator_type) count from lz_indicator_library where is_delete=0 + + and type = #{type} GROUP BY indicator_type) l - on t.is_delete = 0 and t.id = l.indicator_type + on t.id = l.indicator_type + where t.is_delete = 0 +