From c899166d7986bbc5a8db58381e75f27ea2aeac1e Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 27 十二月 2022 09:28:11 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java | 1 +
ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java | 4 ++++
ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml | 4 ++--
ycl-platform/src/main/java/com/ycl/vo/message/MessageVO.java | 6 +++---
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 -------------
9 files changed, 35 insertions(+), 23 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/entity/store/StoreInfo.java b/ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java
index 611099d..6c5ed45 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java
@@ -73,6 +73,10 @@
@TableField(" relation_video")
private String relationVideo;
+ @ApiModelProperty("鐘舵��")
+ @TableField("status")
+ private Integer status;
+
@ApiModelProperty("闂ㄥ簵绫诲瀷")
@TableField("type")
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/message/MessageVO.java b/ycl-platform/src/main/java/com/ycl/vo/message/MessageVO.java
index f07d246..be9d22f 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/message/MessageVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/message/MessageVO.java
@@ -11,7 +11,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
/**
* <p>
@@ -69,7 +69,7 @@
*/
@ApiModelProperty(value = "鍙戦�佹椂闂�")
@JsonFormat(timezone = "GMT", pattern = "yyyy-MM-dd HH:mm:ss")
- private Date sendTime;
+ private LocalDateTime sendTime;
/**
* 鐘舵��0-鏈彂甯�1-宸插彂甯�
*/
@@ -84,7 +84,7 @@
*/
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@JsonFormat(timezone = "GMT", pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
+ private LocalDateTime createTime;
@ApiModelProperty(value = "鍝嶅簲缁撴灉")
private String respondResult;
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..8430765 100644
--- a/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
@@ -23,10 +23,10 @@
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}
+ and t1.status = #{status}
</if>
</where>
order by t1.id desc
--
Gitblit v1.8.0