From 5dc89200ced02314474ce34aff8dc0d3e3f31ad9 Mon Sep 17 00:00:00 2001 From: wl <173@qq.com> Date: 星期三, 21 十二月 2022 17:34:21 +0800 Subject: [PATCH] fix: 门店管理 --- ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java | 1 + ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml | 2 +- ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java | 5 ++++- ycl-platform/src/main/java/com/ycl/vo/cockpit/aiIot/EfficiencyVO.java | 16 ++++++++++++++++ ycl-platform/src/main/java/com/ycl/mapper/video/VideoPointMapper.java | 1 + ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java | 8 ++++---- ycl-platform/src/main/java/com/ycl/vo/cockpit/aiIot/AIIotVO.java | 13 ------------- 7 files changed, 27 insertions(+), 19 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java b/ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java index bb5c16d..307a6fe 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java @@ -11,6 +11,7 @@ import com.ycl.util.VideoUtil; import com.ycl.vo.cockpit.CockpitVO; import com.ycl.vo.cockpit.aiIot.AIIotVO; +import com.ycl.vo.cockpit.aiIot.EfficiencyVO; import com.ycl.vo.cockpit.aiIot.VideoVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -85,12 +86,11 @@ @ApiOperation(value = "AI绠楁硶鏁堣兘") @GetMapping("/efficiency") - public CommonResult<List<AIIotVO.EfficiencyVO>> efficiency(@Validated CockpitVO params) { + public CommonResult efficiency(@Validated CockpitVO params) { checkApiUtil.cockpit(params); - List<AIIotVO.EfficiencyVO> efficiencyVOS = new ArrayList<>(); - AIIotVO.EfficiencyVO a = null; + List<EfficiencyVO> efficiencyVOS = new ArrayList<>(); for (int i = 0; i < 4; i++) { - a = new AIIotVO.EfficiencyVO(); + EfficiencyVO a = new EfficiencyVO(); a.setType("閬撹矾鐮存崯"); a.setCount(12); a.setRatio(new BigDecimal("0.63").setScale(2, RoundingMode.HALF_UP)); diff --git a/ycl-platform/src/main/java/com/ycl/mapper/video/VideoPointMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/video/VideoPointMapper.java index 21c7c35..c119559 100644 --- a/ycl-platform/src/main/java/com/ycl/mapper/video/VideoPointMapper.java +++ b/ycl-platform/src/main/java/com/ycl/mapper/video/VideoPointMapper.java @@ -21,4 +21,5 @@ IPage<VideoPointVo> search(Page<VideoPointVo> page, @Param("streetId") Integer streetId, @Param("communityId") Integer communityId); + } diff --git a/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java index 63e408f..f057787 100644 --- a/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java +++ b/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java @@ -9,6 +9,7 @@ import com.ycl.vo.equipment.VideoPointVo; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; /** diff --git a/ycl-platform/src/main/java/com/ycl/vo/cockpit/aiIot/AIIotVO.java b/ycl-platform/src/main/java/com/ycl/vo/cockpit/aiIot/AIIotVO.java index 9c2108f..0648f5b 100644 --- a/ycl-platform/src/main/java/com/ycl/vo/cockpit/aiIot/AIIotVO.java +++ b/ycl-platform/src/main/java/com/ycl/vo/cockpit/aiIot/AIIotVO.java @@ -30,19 +30,6 @@ private Long slagCar; } - - - @ApiModel(description = "AI绠楁硶鏁堣兘") - @Data - public static class EfficiencyVO { - @ApiModelProperty(value = "鐗╄仈缃戣澶囩被鍨�") - private String type; - @ApiModelProperty(value = "鏁伴噺") - private Integer count; - @ApiModelProperty(value = "姣斾緥") - private BigDecimal ratio; - } - @ApiModel(description = "AI浜嬩欢缁熻") @Data public static class StatisticsVO { diff --git a/ycl-platform/src/main/java/com/ycl/vo/cockpit/aiIot/EfficiencyVO.java b/ycl-platform/src/main/java/com/ycl/vo/cockpit/aiIot/EfficiencyVO.java new file mode 100644 index 0000000..bf8b39f --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/vo/cockpit/aiIot/EfficiencyVO.java @@ -0,0 +1,16 @@ +package com.ycl.vo.cockpit.aiIot; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class EfficiencyVO { + @ApiModelProperty(value = "鐗╄仈缃戣澶囩被鍨�") + private String type; + @ApiModelProperty(value = "鏁伴噺") + private Integer count; + @ApiModelProperty(value = "姣斾緥") + private BigDecimal ratio; +} diff --git a/ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java b/ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java index ac1bcea..82e7114 100644 --- a/ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java +++ b/ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java @@ -87,4 +87,7 @@ @ApiModelProperty("鎽勫儚澶�") private VideoPoint videoPoint; -} + + @ApiModelProperty("鐘舵��") + private Integer status; +} \ No newline at end of file diff --git a/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml b/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml index 1142b20..b0c0d7f 100644 --- a/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml +++ b/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml @@ -23,7 +23,7 @@ left JOIN ums_data_dictionary t2 ON t1.type = t2.id <where> <if test="keyword!=null and keyword!=''"> - t1.store_name LIKE CONCAT('%', #{keyword}, '%') + t1.store_number LIKE CONCAT('%', #{keyword}, '%') </if> <if test="status!=null and status!='' and status!='0' "> t1.status = #{status} -- Gitblit v1.8.0