From 7fc6a36e9e336554a15e3d6c13d04dad0300cbc1 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期五, 30 九月 2022 11:25:25 +0800
Subject: [PATCH] 细节调整
---
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 51 ++++++++++++++++---------
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 20 ++++------
ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java | 14 ++++---
ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java | 16 ++++----
4 files changed, 56 insertions(+), 45 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 6172da9..c607977 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
@@ -13,9 +13,10 @@
import com.ycl.service.caseHandler.IDisposeRecordService;
import com.ycl.service.caseHandler.IIllegalBuildingService;
import com.ycl.service.caseHandler.IViolationsService;
-import com.ycl.vo.casePool.CasePoolIllegalBuildingVO;
-import com.ycl.vo.casePool.CasePoolViolationVO;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -23,6 +24,7 @@
import java.util.Arrays;
import java.util.List;
+import java.util.UUID;
/**
@@ -72,23 +74,24 @@
* @Param [size, current, state, type, resource]
**/
@ApiOperation(value = "鏌ヨ杩濊杩濆缓")
- @GetMapping("/query/{type}")
+ @GetMapping("/query")
@ApiImplicitParams({
@ApiImplicitParam(name = "state", value = "澶勭悊鐘舵��(0璇姤 1涓婃姤 2绔嬫 3娲鹃仯 4澶勭疆 5鏍告煡 6缁撴7澶勭悊涓�)", dataType = "Integer"),
- @ApiImplicitParam(name = "type", value = "01 杩濊,02 杩濆缓", dataType = "Integer")
+ @ApiImplicitParam(name = "type", value = "1 杩濊,2 杩濆缓", dataType = "Integer"),
+ @ApiImplicitParam(name = "resource", value = "1 瑙嗛,2 鎵嬪姩", dataType = "Integer")
})
public CommonResult searchViolation(@RequestParam Integer size,
@RequestParam Integer current,
@RequestParam Integer state,
- @PathVariable(value = "type") Integer type,
- @RequestParam Integer resource) {
+ @RequestParam(required = false) Integer type,
+ @RequestParam(required = false) Integer resource) {
if (state != null) {
Page<Object> page = new Page<>();
page.setCurrent(current);
page.setSize(size);
Page<Object> queryList;
- Integer violation = 01;
- Integer illegalBuilding = 02;
+ Integer violation = 1;
+ Integer illegalBuilding = 2;
if (type == violation) {
queryList = baseCaseService.listViolationsPage(page, state, resource);
} else if (type == illegalBuilding) {
@@ -109,15 +112,11 @@
@ApiOperation(value = "鍒犻櫎杩濊/杩濆缓妗堜欢")
@DeleteMapping("/deletion")
@ApiImplicitParams({
- @ApiImplicitParam(name = "type", value = "01 杩濊,02 杩濆缓", dataType = "Integer")
- })
- @ApiResponses({
- @ApiResponse(code = 200, message = "鎴愬姛", response = CasePoolViolationVO.class),
- @ApiResponse(code = 200, message = "鎴愬姛", response = CasePoolIllegalBuildingVO.class),
+ @ApiImplicitParam(name = "type", value = "1 杩濊,2 杩濆缓", dataType = "Integer")
})
public CommonResult removeCase(@RequestParam Integer id, @RequestParam Integer type) {
- Integer violationType = 01;
- Integer illegalBuildingType = 02;
+ Integer violationType = 1;
+ Integer illegalBuildingType = 2;
if (id != null) {
if (type == violationType) {
return CommonResult.success(violationsService.removeById(id));
@@ -137,11 +136,11 @@
@ApiOperation(value = "鍒犻櫎杩濊/杩濆缓妗堜欢")
@DeleteMapping("/batch_deletion")
@ApiImplicitParams({
- @ApiImplicitParam(name = "type", value = "01 杩濊,02 杩濆缓", dataType = "Integer")
+ @ApiImplicitParam(name = "type", value = "1 杩濊,2 杩濆缓", dataType = "Integer")
})
public CommonResult removeCases(@RequestParam String[] ids, @RequestParam Integer type) {
- Integer violationType = 01;
- Integer illegalBuildingType = 02;
+ Integer violationType = 1;
+ Integer illegalBuildingType = 2;
List<String> idList = Arrays.asList(ids);
if (!idList.isEmpty()) {
if (type == violationType) {
@@ -162,8 +161,15 @@
@ApiOperation(value = "娣诲姞杩濊妗堜欢")
@PostMapping("/addition_violation")
public CommonResult addViolationCase(@RequestBody @Validated ViolationParam violationParam) {
+ Integer violation = 1;
+ Integer resource = 2;
+ Integer state = 7;
BaseCase baseCase = new BaseCase();
BeanUtils.copyProperties(violationParam, baseCase);
+ baseCase.setEventSource(resource);
+ baseCase.setCategory(violation);
+ baseCase.setCode(UUID.randomUUID().toString());
+ baseCase.setState(state);
baseCaseService.save(baseCase);
return CommonResult.success(baseCaseService.saveViolationCase(violationParam, baseCase.getId()));
}
@@ -176,8 +182,15 @@
@ApiOperation(value = "娣诲姞杩濆缓妗堜欢")
@PostMapping("/addition_illegal_building")
public CommonResult addIllegalBuildingCase(@RequestBody @Validated IllegalBuildingParam illegalBuildingParam) {
+ Integer illegalBuilding = 2;
+ Integer resource = 2;
+ Integer state = 7;
BaseCase baseCase = new BaseCase();
BeanUtils.copyProperties(illegalBuildingParam, baseCase);
+ baseCase.setCategory(illegalBuilding);
+ baseCase.setEventSource(resource);
+ baseCase.setCode(UUID.randomUUID().toString());
+ baseCase.setState(state);
baseCaseService.save(baseCase);
return CommonResult.success(baseCaseService.saveIllegalBuildingCase(illegalBuildingParam, baseCase.getId()));
}
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 e946f92..ab813c5 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
@@ -1,19 +1,14 @@
package com.ycl.dto.casePool;
+import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
@Data
public class IllegalBuildingParam {
- /**
- * 闂绫诲埆锛�1-杩濊 2-杩濆缓锛�
- */
- @ApiModelProperty(value = "闂绫诲埆锛�1-杩濊 2-杩濆缓")
- @NotNull(message = "涓嶅厑璁搁棶棰樼被鍨嬩负绌�")
- private Integer category;
/**
* 杩濆缓绫诲埆
@@ -24,12 +19,17 @@
/**
+ * 鎶ヨ鏃堕棿
+ */
+ @TableField("alarm_time")
+ private LocalDateTime alarmTime;
+
+ /**
* 鎵�灞炵ぞ鍖�
*/
@ApiModelProperty(value = "鎵�灞炵ぞ鍖�")
@NotBlank(message = "涓嶅厑璁告墍灞炵ぞ鍖轰负绌�")
private Integer communityId;
-
/**
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 bf1c3ee..763dd58 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
@@ -1,19 +1,15 @@
package com.ycl.dto.casePool;
+import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
@Data
public class ViolationParam {
- /**
- * 闂绫诲埆锛�1-杩濊 2-杩濆缓锛�
- */
- @ApiModelProperty(value = "闂绫诲埆锛�1-杩濊 2-杩濆缓")
- @NotNull(message = "涓嶅厑璁搁棶棰樼被鍨嬩负绌�")
- private Integer category;
/**
* 澶х被
@@ -23,6 +19,12 @@
private Integer categoryId;
/**
+ * 鎶ヨ鏃堕棿
+ */
+ @TableField("alarm_time")
+ private LocalDateTime alarmTime;
+
+ /**
* 灏忕被
*/
@ApiModelProperty(value = "灏忕被")
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 1758bfd..936760c 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
@@ -27,9 +27,8 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.time.Instant;
+import java.time.Duration;
import java.time.LocalDateTime;
-import java.time.ZoneOffset;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -91,8 +90,6 @@
ImageResourcesMapper imageResourcesMapper;
-
-
@Override
public String uploadEvent(Integer caseId) {
BaseCase baseCase = this.getById(caseId);
@@ -140,21 +137,20 @@
@Override
public Page listViolationsPage(Page page, Integer state, Integer resource) {
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) {
- long nowTime = System.currentTimeMillis();
- long alarmTime = item.getAlarmTime().toEpochSecond(ZoneOffset.ofHours(8));
- LocalDateTime continueTimes = Instant.ofEpochMilli(nowTime - alarmTime).atZone(ZoneOffset.ofHours(8)).toLocalDateTime();
- String continueTime = continueTimes.getHour() + "鏃�" + continueTimes.getSecond() + "鍒嗛挓";
+ Duration duration = Duration.between(item.getAlarmTime(), LocalDateTime.now());
+ long minutes = duration.toMinutes() - (duration.toHours() * hours);
+ String continueTime = duration.toHours() + "鏃�" + minutes + "鍒嗛挓";
casePoolViolationVO.setContinueTime(continueTime);
} else {
- long closeTime = item.getCloseTime().toEpochSecond(ZoneOffset.ofHours(8));
- long alarmTime = item.getAlarmTime().toEpochSecond(ZoneOffset.ofHours(8));
- LocalDateTime continueTimes = Instant.ofEpochMilli(closeTime - alarmTime).atZone(ZoneOffset.ofHours(8)).toLocalDateTime();
- String continueTime = continueTimes.getHour() + "鏃�" + continueTimes.getSecond() + "鍒嗛挓";
+ 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());
--
Gitblit v1.8.0