wl
2022-12-21 5dc89200ced02314474ce34aff8dc0d3e3f31ad9
fix: 门店管理
6个文件已修改
1个文件已添加
46 ■■■■■ 已修改文件
ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/mapper/video/VideoPointMapper.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/vo/cockpit/aiIot/AIIotVO.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/vo/cockpit/aiIot/EfficiencyVO.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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));
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);
}
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;
/**
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 {
ycl-platform/src/main/java/com/ycl/vo/cockpit/aiIot/EfficiencyVO.java
New file
@@ -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;
}
ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java
@@ -87,4 +87,7 @@
    @ApiModelProperty("摄像头")
    private VideoPoint videoPoint;
}
    @ApiModelProperty("状态")
    private Integer status;
}
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}