From 8d0e312443876371e2be7ae9a2cb70e4f73bb2cd Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期日, 02 十月 2022 09:35:33 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/bo/casePool/CasePoolIllegalBuildingDO.java | 2 +
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 2 +
ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java | 12 +++--
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 22 +++++------
ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java | 21 ++++++----
ycl-platform/src/main/java/com/ycl/bo/casePool/CasePoolViolationDO.java | 2 +
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 39 ++++++++++---------
ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolIllegalBuildingVO.java | 3 +
ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java | 10 ++--
9 files changed, 64 insertions(+), 49 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
index 9e13d2f..bcd0613 100644
--- a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
@@ -67,11 +67,13 @@
* @Param [ids]
* @return com.ycl.api.CommonResult<java.lang.Void>
**/
- @ApiOperation("鍒犻櫎")
- @PostMapping(value = "/batch_deletion)")
- public CommonResult<Void> delete(@RequestParam String[] ids) {
- departService.removeBatchByIds(Arrays.asList(ids));
- return CommonResult.success(null);
+ @ApiOperation("鎵瑰鐞�-鍒犻櫎")
+ @PostMapping(value = "/batch_deletion")
+ public CommonResult delete(@RequestParam List<Long> ids) {
+ if (ids.isEmpty()){
+ return CommonResult.failed("bad request parameter");
+ }
+ return CommonResult.success(departService.removeBatchByIds(ids));
}
@ApiOperation("璇︽儏")
diff --git a/ycl-platform/src/main/java/com/ycl/bo/casePool/CasePoolIllegalBuildingDO.java b/ycl-platform/src/main/java/com/ycl/bo/casePool/CasePoolIllegalBuildingDO.java
index de34a54..6cc25fc 100644
--- a/ycl-platform/src/main/java/com/ycl/bo/casePool/CasePoolIllegalBuildingDO.java
+++ b/ycl-platform/src/main/java/com/ycl/bo/casePool/CasePoolIllegalBuildingDO.java
@@ -9,6 +9,8 @@
@ApiModel("妗堜欢姹犺繚寤虹珛妗堜欢")
public class CasePoolIllegalBuildingDO {
+ private Integer id;
+
/**
* 浜嬩欢缂栧彿
*/
diff --git a/ycl-platform/src/main/java/com/ycl/bo/casePool/CasePoolViolationDO.java b/ycl-platform/src/main/java/com/ycl/bo/casePool/CasePoolViolationDO.java
index cfb96c0..ab90e48 100644
--- a/ycl-platform/src/main/java/com/ycl/bo/casePool/CasePoolViolationDO.java
+++ b/ycl-platform/src/main/java/com/ycl/bo/casePool/CasePoolViolationDO.java
@@ -10,6 +10,8 @@
@ApiModel("妗堜欢姹犺繚瑙勬浠�")
public class CasePoolViolationDO {
+ private Integer id;
+
/**
* 浜嬩欢缂栧彿
*/
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 007f825..a891839 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
@@ -25,7 +25,6 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
import java.util.List;
import java.util.UUID;
@@ -136,22 +135,21 @@
* @Description delete illegal buildings or violations
* @Param [ids, type]
**/
- @ApiOperation(value = "鍒犻櫎杩濊/杩濆缓妗堜欢")
+ @ApiOperation(value = "鎵瑰鐞�-鍒犻櫎杩濊/杩濆缓妗堜欢")
@DeleteMapping("/batch_deletion")
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "1 杩濊,2 杩濆缓", dataType = "Integer")
})
- public CommonResult removeCases(@RequestParam String[] ids, @RequestParam Integer type) {
+ public CommonResult removeCases(@RequestParam List<Long> ids, @RequestParam Integer type) {
Integer violationType = 1;
Integer illegalBuildingType = 2;
- List<String> idList = Arrays.asList(ids);
- if (!idList.isEmpty()) {
+ if (!ids.isEmpty()) {
+ CommonResult.success(baseCaseService.removeBatchByIds(ids));
if (type == violationType) {
- return CommonResult.success(violationsService.removeBatchByIds(idList));
+ return CommonResult.success(violationsService.removeBatchByIds(ids));
} else if (type == illegalBuildingType) {
- return CommonResult.success(illegalBuildingService.removeBatchByIds(idList));
+ return CommonResult.success(illegalBuildingService.removeBatchByIds(ids));
}
- return CommonResult.success(baseCaseService.removeBatchByIds(idList));
}
return CommonResult.failed("request parameter is null");
}
@@ -224,7 +222,7 @@
@ApiOperation(value = "妗堜欢鐘舵�佷慨鏀�")
@PutMapping("/case_status_update")
@ApiImplicitParams({
- @ApiImplicitParam(value = "澶勭悊鐘舵��(0璇姤 1涓婃姤 2绔嬫 3娲鹃仯 4澶勭疆 5鏍告煡 6缁撴7澶勭悊涓�8鏆備笉澶勭悊)",name = "state")
+ @ApiImplicitParam(value = "澶勭悊鐘舵��(0璇姤 1涓婃姤 2绔嬫 3娲鹃仯 4澶勭疆 5鏍告煡 6缁撴7澶勭悊涓�8鏆備笉澶勭悊)", name = "state")
})
public CommonResult updateCaseStatus(@RequestParam Integer caseId, @RequestParam Integer state) {
return CommonResult.success(baseCaseService
@@ -254,8 +252,8 @@
@ApiOperation(value = "缁撴")
@PutMapping("/end_case")
- public CommonResult endCase(@RequestParam Integer caseId,@RequestParam String result){
- baseCaseService.endCase(caseId,result);
+ public CommonResult endCase(@RequestParam Integer caseId, @RequestParam String result) {
+ baseCaseService.endCase(caseId, result);
return CommonResult.success("end case success~!");
}
-}
+}
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java b/ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java
index e9f7a8c..87ffd9c 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java
@@ -81,35 +81,35 @@
* 杩濆缓鍏蜂綋浣嶇疆
*/
@ApiModelProperty(value = "杩濆缓鍏蜂綋浣嶇疆")
- @NotBlank(message = "涓嶅厑璁歌繚寤哄叿浣撲綅缃负绌�")
+ @NotNull(message = "涓嶅厑璁歌繚寤哄叿浣撲綅缃负绌�")
private String position;
/**
* 杩濆缓闀�
*/
@ApiModelProperty(value = "杩濆缓闀�")
- @NotBlank(message = "涓嶅厑璁歌繚寤洪暱涓虹┖")
+ @NotNull(message = "涓嶅厑璁歌繚寤洪暱涓虹┖")
private Float buildingLength;
/**
* 杩濆缓瀹�
*/
@ApiModelProperty(value = "杩濆缓瀹�")
- @NotBlank(message = "涓嶅厑璁歌繚寤哄涓虹┖")
+ @NotNull(message = "涓嶅厑璁歌繚寤哄涓虹┖")
private Float buildingWidth;
/**
* 杩濆缓楂�
*/
@ApiModelProperty(value = "杩濆缓楂�")
- @NotBlank(message = "涓嶅厑璁歌繚寤洪珮涓虹┖")
+ @NotNull(message = "涓嶅厑璁歌繚寤洪珮涓虹┖")
private Float buildingHigh;
/**
* 杩濆缓闈㈢Н
*/
@ApiModelProperty(value = "杩濆缓闈㈢Н")
- @NotBlank(message = "涓嶅厑璁歌繚寤洪潰绉负绌�")
+ @NotNull(message = "涓嶅厑璁歌繚寤洪潰绉负绌�")
private Float buildingArea;
/**
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 62abac5..de22bbc 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
@@ -143,24 +143,27 @@
Integer type = 01;
Integer hours = 60;
Page<CasePoolViolationDO> violationsPage = baseCaseMapper.listViolationsPage(page, state, type, resource);
- List<CasePoolViolationVO> violationVOList = violationsPage.getRecords().stream().map(item -> {
- CasePoolViolationVO casePoolViolationVO = new CasePoolViolationVO();
- BeanUtils.copyProperties(item, casePoolViolationVO);
- if (item.getCloseTime() == null) {
- Duration duration = Duration.between(item.getAlarmTime(), LocalDateTime.now());
- long minutes = duration.toMinutes() - (duration.toHours() * hours);
- String continueTime = duration.toHours() + "鏃�" + minutes + "鍒嗛挓";
- casePoolViolationVO.setContinueTime(continueTime);
- } else {
- Duration duration = Duration.between(item.getAlarmTime(), item.getCloseTime());
- long minutes = duration.toMinutes() - (duration.toHours() * hours);
- String continueTime = duration.toHours() + "鏃�" + minutes + "鍒嗛挓";
- casePoolViolationVO.setContinueTime(continueTime);
- }
- casePoolViolationVO.setCategory(dataDictionaryMapper.selectById(item.getCategoryId()).getName());
- casePoolViolationVO.setType(dataDictionaryMapper.selectById(item.getTypeId()).getName());
- return casePoolViolationVO;
- }).collect(Collectors.toList());
+ List<CasePoolViolationVO> violationVOList = violationsPage
+ .getRecords()
+ .stream()
+ .map(item -> {
+ CasePoolViolationVO casePoolViolationVO = new CasePoolViolationVO();
+ BeanUtils.copyProperties(item, casePoolViolationVO);
+ if (item.getCloseTime() == null) {
+ Duration duration = Duration.between(item.getAlarmTime(), LocalDateTime.now());
+ long minutes = duration.toMinutes() - (duration.toHours() * hours);
+ String continueTime = duration.toHours() + "鏃�" + minutes + "鍒嗛挓";
+ casePoolViolationVO.setContinueTime(continueTime);
+ } else {
+ Duration duration = Duration.between(item.getAlarmTime(), item.getCloseTime());
+ long minutes = duration.toMinutes() - (duration.toHours() * hours);
+ String continueTime = duration.toHours() + "鏃�" + minutes + "鍒嗛挓";
+ casePoolViolationVO.setContinueTime(continueTime);
+ }
+ casePoolViolationVO.setCategory(dataDictionaryMapper.selectById(item.getCategoryId()).getName());
+ casePoolViolationVO.setType(dataDictionaryMapper.selectById(item.getTypeId()).getName());
+ return casePoolViolationVO;
+ }).collect(Collectors.toList());
Page<CasePoolViolationVO> casePoolViolationVOPage = new Page<>();
BeanUtils.copyProperties(violationsPage, casePoolViolationVOPage);
casePoolViolationVOPage.setRecords(violationVOList);
diff --git a/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolIllegalBuildingVO.java b/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolIllegalBuildingVO.java
index d946d45..840f271 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolIllegalBuildingVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolIllegalBuildingVO.java
@@ -11,6 +11,9 @@
@ApiModel("妗堜欢姹犺繚寤虹珛妗堜欢")
public class CasePoolIllegalBuildingVO {
+ @ApiModelProperty(value = "id")
+ private Integer id;
+
/**
* 浜嬩欢缂栧彿
*/
diff --git a/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java b/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java
index 644dbf0..43fa21c 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java
@@ -10,60 +10,63 @@
@ApiModel(value = "妗堜欢姹犺繚瑙刅O")
public class CasePoolViolationVO {
+ @ApiModelProperty(value = "id")
+ private Integer id;
+
/**
* 浜嬩欢缂栧彿
*/
- @ApiModelProperty(value = "浜嬩欢缂栧彿", dataType = "String")
+ @ApiModelProperty(value = "浜嬩欢缂栧彿")
private String code;
/**
* 浜嬩欢鏉ユ簮(1-瑙嗛 2-鎵嬪姩鐧昏)
*/
- @ApiModelProperty(value = "浜嬩欢鏉ユ簮(1-瑙嗛 2-鎵嬪姩鐧昏)", dataType = "Integer")
+ @ApiModelProperty(value = "浜嬩欢鏉ユ簮(1-瑙嗛 2-鎵嬪姩鐧昏)")
private Integer eventSource;
/**
* 鎶ヨ鐐逛綅 浜嬪彂鍦扮偣
*/
- @ApiModelProperty(value = "鎶ヨ鐐逛綅", dataType = "String")
+ @ApiModelProperty(value = "鎶ヨ鐐逛綅")
private String site;
/**
* 鎵�灞炶閬�
*/
- @ApiModelProperty(value = "鎵�灞炶閬�", dataType = "Integer")
+ @ApiModelProperty(value = "鎵�灞炶閬�")
private Integer streetId;
/**
* 鎶ヨ鏃堕棿
*/
- @ApiModelProperty(value = "鎶ヨ鏃堕棿", dataType = "LocalDateTime")
+ @ApiModelProperty(value = "鎶ヨ鏃堕棿")
private LocalDateTime alarmTime;
/**
* 澶х被
*/
- @ApiModelProperty(value = "澶х被", dataType = "String")
+ @ApiModelProperty(value = "澶х被")
private String category;
/**
* 灏忕被
*/
- @ApiModelProperty(value = "灏忕被", dataType = "String")
+ @ApiModelProperty(value = "灏忕被")
private String type;
/**
* 妗堢敱
*/
- @ApiModelProperty(value = "妗堢敱", dataType = "String")
+ @ApiModelProperty(value = "妗堢敱")
private String actionCause;
/**
* 鎸佺画鏃堕棿
*/
- @ApiModelProperty(value = "鎸佺画鏃堕棿", dataType = "String")
+ @ApiModelProperty(value = "鎸佺画鏃堕棿")
private String continueTime;
}
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index fd07456..c11bccc 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -40,6 +40,7 @@
<select id="listViolationsPage" resultType="com.ycl.bo.casePool.CasePoolViolationDO">
SELECT
+ ubc.`id`,
ubc.`code`,
ubc.event_source,
uv.category_id,
@@ -68,6 +69,7 @@
<select id="listIllegalBuildingsPage" resultType="com.ycl.bo.casePool.CasePoolIllegalBuildingDO">
SELECT
+ ubc.`id`,
ubc.`code`,
ubc.event_source,
uib.category_id,
--
Gitblit v1.8.0