From a27ebcc079a52c131d1040ccea776f5fd8fc658f Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期五, 25 十一月 2022 17:35:26 +0800
Subject: [PATCH] fix: 导出bug 预警研判相关接口
---
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 23 +++++++++++
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 19 +++++++++
ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java | 5 +-
ycl-platform/src/main/java/com/ycl/controller/zf/VideowarmEventsreportController.java | 2
ycl-platform/src/main/java/com/ycl/vo/casePool/BaseCaseVO.java | 16 ++++++++
ycl-platform/src/main/java/com/ycl/controller/zf/EnforcelawReportController.java | 2
ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java | 1
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 27 +++++++++++++
ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java | 3 +
ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java | 3 +
ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java | 8 ++++
11 files changed, 104 insertions(+), 5 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
index 03c2a63..471cbb8 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
@@ -299,4 +299,23 @@
String sheetName = "杩濊鏁版嵁";
EasyExcelUtils.export(response, sheetName, QueryForViolationVO.class, baseCaseService.selectViolation(queryForViolationParam).getRecords());
}
+
+ @GetMapping("/video_inspection")
+ @ApiOperation("棰勮鐮斿垽")
+ public CommonResult searchVideoInspection(@RequestParam Integer current){
+ return CommonResult.success(baseCaseService.selectVideoInspection(current));
+ }
+
+ @GetMapping("/video_inspection/Count")
+ @ApiOperation("棰勮鐮斿垽宸︿笂瑙掑緟瀹℃牳妗堜欢,浠婃棩瀹℃牳,浠婃棩鍦ㄥ涔�")
+ public CommonResult searchCount(){
+ return CommonResult.success(baseCaseService.selectCount());
+ }
+
+ @PutMapping("/video_inspection")
+ @ApiOperation("棰勮鐮斿垽纭畾")
+ public CommonResult searchCount(ViolationParam violationParam){
+ return CommonResult.success(baseCaseService.updateCase(violationParam));
+ }
+
}
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java b/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
index b728a00..a411ee5 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
@@ -66,13 +66,14 @@
}
@DeleteMapping("/delete/{id}")
- @ApiOperation("淇敼")
+ @ApiOperation("鍒犻櫎")
@LogSave(operationType = "鍗″彛绠＄悊", contain = "鍒犻櫎鍗″彛")
public CommonResult delete(@PathVariable Integer id) {
return CommonResult.success(iEquipmentBayonetService.removeById(id));
}
- @GetMapping("/export")
+
+ @PostMapping("/export")
@ApiOperation("瀵煎嚭")
@SneakyThrows
@LogSave(operationType = "鍗″彛绠＄悊", contain = "瀵煎嚭鍗″彛")
diff --git a/ycl-platform/src/main/java/com/ycl/controller/zf/EnforcelawReportController.java b/ycl-platform/src/main/java/com/ycl/controller/zf/EnforcelawReportController.java
index 0bd8575..6f298d8 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/zf/EnforcelawReportController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/zf/EnforcelawReportController.java
@@ -76,7 +76,7 @@
return CommonResult.success(enforcelawReportService.updateById(enforcelawReport));
}
- @GetMapping("/download")
+ @PostMapping("/download")
@ApiOperation("瀵煎嚭")
@SneakyThrows
public void downloadExcel(@RequestParam(required = false) String startTime,
diff --git a/ycl-platform/src/main/java/com/ycl/controller/zf/VideowarmEventsreportController.java b/ycl-platform/src/main/java/com/ycl/controller/zf/VideowarmEventsreportController.java
index cd11cac..3d60970 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/zf/VideowarmEventsreportController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/zf/VideowarmEventsreportController.java
@@ -76,7 +76,7 @@
return CommonResult.success(iVideowarmEventsreportService.updateById(videoWarnEventsReport));
}
- @GetMapping("/download")
+ @PostMapping("/download")
@ApiOperation("瀵煎嚭")
@SneakyThrows
public void downloadExcel(@RequestParam(required = false) String startTime,
diff --git a/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java b/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java
index 36fb3e4..052bdd4 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java
@@ -7,12 +7,13 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
@Data
@ApiModel(value = "娣诲姞杩濊妗堜欢")
public class ViolationParam {
+ private Long baseId;
+
/**
* 澶х被
*/
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java
index c80d993..6718df0 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java
@@ -6,6 +6,7 @@
import com.ycl.bo.casePool.CasePoolViolationDO;
import com.ycl.dto.caseHandler.QueryForViolationParam;
import com.ycl.entity.caseHandler.BaseCase;
+import com.ycl.vo.casePool.BaseCaseVO;
import com.ycl.vo.casePool.CasePoolIllegalBuildingVO;
import com.ycl.vo.casePool.CasePoolViolationVO;
import com.ycl.vo.casePool.QueryForViolationVO;
@@ -32,4 +33,6 @@
List<BaseCase> selectBaseCasePage(Page<BaseCase> page, @Param("code") String number,@Param("communityId") Integer communityId, @Param("categories") Integer categories, @Param("startTime") String startTime,@Param("endTime") String endTime,@Param("site") String site);
Page<QueryForViolationVO> selectViolationPage(Page<QueryForViolationVO> setCurrent, QueryForViolationParam queryForViolationParam);
+
+ Page<BaseCaseVO> selectVideoInspection(Page<Object> objectPage);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
index 8f3055e..984d961 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
@@ -7,10 +7,12 @@
import com.ycl.dto.casePool.ViolationParam;
import com.ycl.entity.caseHandler.BaseCase;
import com.ycl.entity.caseHandler.BaseCaseDetail;
+import com.ycl.vo.casePool.BaseCaseVO;
import com.ycl.vo.casePool.QueryForViolationVO;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -57,4 +59,10 @@
List<BaseCase> selectPage(Page<BaseCase> setSize, String number, Integer communityId, Integer categories, String startTime, String endTime, String site);
Page<QueryForViolationVO> selectViolation(QueryForViolationParam queryForViolationParam);
+
+ Page<BaseCaseVO> selectVideoInspection(Integer current);
+
+ Map<String,Object> selectCount();
+
+ Boolean updateCase(ViolationParam violationParam);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
index 52b1d17..5ed3ad7 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -33,6 +33,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.time.Duration;
@@ -386,4 +387,30 @@
.setSize(queryForViolationParam.getPageSize())
.setCurrent(queryForViolationParam.getCurrent()), queryForViolationParam);
}
+
+ @Override
+ public Page<BaseCaseVO> selectVideoInspection(Integer current) {
+ return baseCaseMapper.selectVideoInspection(new Page<>(current, 1));
+ }
+
+ @Override
+ public Map<String, Object> selectCount() {
+ HashMap<String, Object> map = new HashMap<>();
+ Long review = baseCaseMapper.selectCount(new LambdaQueryWrapper<BaseCase>().eq(BaseCase::getState, 1));
+ map.put("review", review);
+ return map;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean updateCase(ViolationParam violationParam) {
+ BaseCase baseCase = new BaseCase();
+ BeanUtils.copyProperties(violationParam, baseCase);
+ baseCase.setId(violationParam.getBaseId());
+ baseCaseMapper.updateById(baseCase);
+ Violations violations = new Violations();
+ BeanUtils.copyProperties(violationParam, violations);
+ violations.setId(violations.getId());
+ return violationsMapper.updateById(violations) == 1 ? true : false;
+ }
}
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/vo/casePool/BaseCaseVO.java b/ycl-platform/src/main/java/com/ycl/vo/casePool/BaseCaseVO.java
new file mode 100644
index 0000000..16d4b75
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/vo/casePool/BaseCaseVO.java
@@ -0,0 +1,16 @@
+package com.ycl.vo.casePool;
+
+import lombok.Data;
+
+@Data
+public class BaseCaseVO {
+ private String code;
+ private String name;
+ private String urlAddress;
+ private String longitude;
+ private String latitude;
+ private String picData;
+ private String grade;
+ private String street;
+ private String community;
+}
diff --git a/ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java b/ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java
index 06fd27b..da9ae92 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java
@@ -95,5 +95,6 @@
@ExcelProperty(index = 6, value = "鍑哄叆鍩庣被鍨�")
private String inOutCityTypeName;
+ @ExcelIgnore
private String belongArea;
}
\ No newline at end of file
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index 7635344..df229d3 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -227,4 +227,27 @@
</where>
</select>
+
+ <select id="selectVideoInspection" resultType="com.ycl.vo.casePool.BaseCaseVO">
+ SELECT
+ t1.`code`,
+ t3.`name`,
+ t3.url_address,
+ t3.longitude,
+ t3.latitude,
+ t4.pic_data,
+ t5.`name` as grade,
+ t6.`name` as street,
+ t7.`name` as community
+ FROM
+ ums_base_case t1
+ LEFT JOIN ums_violations t2 ON t1.id = t2.id
+ LEFT JOIN ums_video_point t3 on t2.video_point_id=t3.id
+ LEFT JOIN ums_video_alarm_report t4 on t4.id=t2.video_alarm_report_id
+ LEFT JOIN ums_data_dictionary t5 on t5.id=t2.grade_id
+ LEFT JOIN ums_data_dictionary t6 on t6.id=t1.street_id
+ LEFT JOIN ums_data_dictionary t7 on t7.id=t1.community_id
+ WHERE t1.state=1
+ group by t1.id
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0