From cbb807c80c747c37005d3a282b10782fc458f07f Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期四, 29 九月 2022 18:34:44 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java | 240 ++++++++++++++++++++++++
ycl-platform/src/main/java/com/ycl/controller/caseHandler/IllegalBuildingController.java | 53 ++--
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java | 8
ycl-platform/src/main/java/com/ycl/remote/dto/EventProcessResponseDto.java | 3
ycl-platform/src/main/java/com/ycl/vo/casePool/QuestionDisposeVO.java | 91 +++++++++
ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java | 7
ycl-platform/src/main/java/com/ycl/config/feign/MessageConverter.java | 2
ycl-platform/src/main/java/com/ycl/remote/service/CityPlatformService.java | 4
ycl-platform/src/main/resources/logback-spring.xml | 0
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 24 ++
ycl-platform/src/main/java/com/ycl/remote/dto/ResultResponseDto.java | 4
ycl-platform/src/main/resources/application.yml | 1
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 62 +++---
ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java | 60 +++++
14 files changed, 485 insertions(+), 74 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/config/feign/MessageConverter.java b/ycl-platform/src/main/java/com/ycl/config/feign/MessageConverter.java
index d78f77e..858cb0d 100644
--- a/ycl-platform/src/main/java/com/ycl/config/feign/MessageConverter.java
+++ b/ycl-platform/src/main/java/com/ycl/config/feign/MessageConverter.java
@@ -9,7 +9,7 @@
public class MessageConverter extends MappingJackson2HttpMessageConverter {
public MessageConverter(){
List<MediaType> mediaTypes = new ArrayList<>();
- mediaTypes.add(MediaType.TEXT_PLAIN);
+ mediaTypes.add(MediaType.APPLICATION_JSON);
setSupportedMediaTypes(mediaTypes);
}
}
\ No newline at end of file
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 337cb17..4ddf56a 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
@@ -2,6 +2,7 @@
import com.alibaba.druid.util.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
@@ -9,6 +10,7 @@
import com.ycl.dto.casePool.ViolationParam;
import com.ycl.entity.caseHandler.BaseCase;
import com.ycl.service.caseHandler.IBaseCaseService;
+import com.ycl.service.caseHandler.IDisposeRecordService;
import com.ycl.service.caseHandler.IIllegalBuildingService;
import com.ycl.service.caseHandler.IViolationsService;
import io.swagger.annotations.Api;
@@ -44,6 +46,10 @@
@Autowired
IIllegalBuildingService illegalBuildingService;
+
+ @Autowired
+ IDisposeRecordService iDisposeRecordService;
+
@Autowired
public void setBaseCaseService(IBaseCaseService baseCaseService) {
@@ -173,7 +179,6 @@
return CommonResult.success(baseCaseService.saveIllegalBuildingCase(illegalBuildingParam, baseCase.getId()));
}
-
@ApiOperation(value = "妗堜欢璇︽儏")
@GetMapping("/baseCaseDetail/{code}")
@ApiImplicitParams({
@@ -188,7 +193,20 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "01 杩濊,02 杩濆缓", dataType = "Integer")
})
- public CommonResult queryCaseImages(@RequestParam Integer id,@RequestParam Integer type){
- return CommonResult.success(baseCaseService.listCaseImages(id,type));
+ public CommonResult queryCaseImages(@RequestParam Integer id, @RequestParam Integer type) {
+ return CommonResult.success(baseCaseService.listCaseImages(id, type));
+ }
+
+ @ApiOperation("妗堜欢鏆備笉澶勭悊")
+ @GetMapping("/case_leave")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "type", value = "01 杩濊,02 杩濆缓", dataType = "Integer")
+ })
+ public CommonResult updateCaseStatus(@RequestParam Integer caseId) {
+ Integer leaveType = 8;
+ return CommonResult.success(baseCaseService
+ .update(new LambdaUpdateWrapper<BaseCase>()
+ .eq(BaseCase::getId, caseId)
+ .set(BaseCase::getState, leaveType)));
}
}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
index 38d9fd1..28df6d8 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
@@ -2,14 +2,20 @@
import com.ycl.api.CommonResult;
+import com.ycl.bo.AdminUserDetails;
import com.ycl.dto.caseHandler.DispatchInfoParam;
-import com.ycl.entity.caseHandler.DispatchInfo;
-import com.ycl.service.caseHandler.IDispatchHandleService;
+import com.ycl.dto.dispatch.UploadDisposingResultParam;
+import com.ycl.entity.caseHandler.*;
+import com.ycl.service.caseHandler.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
/**
* <p>
@@ -20,14 +26,21 @@
* @since 2022-09-28
*/
@RestController
-@RequestMapping("/dispatch-handle")
+@RequestMapping("/dispatch_handle")
@Api(tags = "璋冨害澶勭悊")
public class DispatchHandleController {
@Autowired
IDispatchHandleService iDispatchHandleService;
-
+ @Autowired
+ IInvestigationService iInvestigationService;
+ @Autowired
+ IArrivalSituationService iArrivalSituationService;
+ @Autowired
+ IPartyInfoService iPartyInfoService;
+ @Autowired
+ IWritService iWritService;
@ApiOperation(value = "璋冨害")
@RequestMapping(value = "/dispatch", method = RequestMethod.POST)
@@ -35,4 +48,43 @@
public CommonResult<DispatchInfo> dispatch(@Validated @RequestBody DispatchInfoParam dispatchInfoParam) {
return CommonResult.success(iDispatchHandleService.dispatch(dispatchInfoParam));
}
+
+ @ApiOperation(value = "涓婁紶杩濊/杩濆缓澶勭疆缁撴灉")
+ @GetMapping("/addition_")
+ public CommonResult searchDisposeList(@RequestParam Integer caseId, @RequestParam Integer type, @RequestBody UploadDisposingResultParam uploadDisposingResultParam) {
+ AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+ //褰撲簨浜�
+ PartyInfo partyInfo = new PartyInfo();
+ BeanUtils.copyProperties(uploadDisposingResultParam, partyInfo);
+ partyInfo.setCreateUser(user.getUserId().intValue());
+ partyInfo.setCreateTime(LocalDateTime.now());
+ iPartyInfoService.save(partyInfo);
+ //璋冩煡鍙栬瘉
+ Investigation investigation = new Investigation();
+ BeanUtils.copyProperties(uploadDisposingResultParam, investigation);
+ investigation.setBaseCaseId(caseId);
+ investigation.setCreateTime(LocalDateTime.now());
+ investigation.setCreateUser(user.getUserId().intValue());
+ investigation.setPartyId(partyInfo.getId());
+ iInvestigationService.save(investigation);
+ //鍒拌揪
+ ArrivalSituation arrivalSituation = new ArrivalSituation();
+ BeanUtils.copyProperties(uploadDisposingResultParam, arrivalSituation);
+ arrivalSituation.setBaseCaseId(caseId);
+ arrivalSituation.setCreateTime(LocalDateTime.now());
+ arrivalSituation.setCreateUser(user.getUserId().intValue());
+ iArrivalSituationService.save(arrivalSituation);
+ //鏂囦功
+ Integer illegalBuildingType = 02;
+ if (type == illegalBuildingType) {
+ Writ writ = new Writ();
+ BeanUtils.copyProperties(uploadDisposingResultParam, writ);
+ writ.setBaseCaseId(caseId);
+ writ.setIllegalBuildingId(caseId);
+ writ.setCreateTime(LocalDateTime.now());
+ writ.setCreateUser(user.getUserId().intValue());
+ iWritService.save(writ);
+ }
+ return CommonResult.success("add success");
+ }
}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/IllegalBuildingController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/IllegalBuildingController.java
index 07c9d13..b7a2bc8 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/IllegalBuildingController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/IllegalBuildingController.java
@@ -8,7 +8,6 @@
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import com.ycl.entity.dict.DataDictionary;
-import com.ycl.service.caseHandler.IIllegalBuildingService;
import com.ycl.service.dict.IDataDictionaryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -36,9 +35,9 @@
IDataDictionaryService iDataDictionaryService;
/**
+ * @return com.ycl.api.CommonResult
* @Description 鏌ヨ杩濆缓绫诲瀷
* @Param [size, current, keyWord]
- * @return com.ycl.api.CommonResult
**/
@ApiOperation(value = "鏌ヨ杩濆缓绫诲瀷")
@GetMapping("/query")
@@ -48,85 +47,85 @@
Page<DataDictionary> dataDictionaryPage = new Page<>();
dataDictionaryPage.setSize(size);
dataDictionaryPage.setCurrent(current);
- return CommonResult.success(iDataDictionaryService.listIllegalBuildingSettings(dataDictionaryPage,keyWord));
+ return CommonResult.success(iDataDictionaryService.listIllegalBuildingSettings(dataDictionaryPage, keyWord));
}
/**
- * @Description delete illegal building by id
- * @Param [id]
* @return com.ycl.api.CommonResult
+ * @Description delete illegal building by id
+ * @Param [id]
**/
@ApiOperation(value = "鍒犻櫎杩濆缓绫诲瀷")
@DeleteMapping("/delete")
- public CommonResult removeIllegalBuilding(@RequestParam Integer id){
+ public CommonResult removeIllegalBuilding(@RequestParam Integer id) {
return CommonResult.success(iDataDictionaryService.removeById(id));
}
/**
+ * @return com.ycl.api.CommonResult
* @Description batch delete illegal building
* @Param [ids]
- * @return com.ycl.api.CommonResult
**/
@ApiOperation(value = "鎵归噺鍒犻櫎杩濊绫诲瀷")
@DeleteMapping("/batch_delete")
- public CommonResult removeIllegalBuildings(@RequestParam String[] ids){
+ public CommonResult removeIllegalBuildings(@RequestParam String[] ids) {
return CommonResult.success(iDataDictionaryService.removeBatchByIds(Arrays.asList(ids)));
}
/**
+ * @return com.ycl.api.CommonResult
* @Description search illegal building type first
* @Param []
- * @return com.ycl.api.CommonResult
**/
@ApiOperation(value = "鏌ヨ鎵�灞炵被鍨�")
@GetMapping("/query/type_first")
- public CommonResult searchIllegalBuildingTypeFirst(){
- String typeLevel="1";
- String typeCode="06";
+ public CommonResult searchIllegalBuildingTypeFirst() {
+ String typeLevel = "1";
+ String typeCode = "06";
return CommonResult.success(iDataDictionaryService
.list(new LambdaQueryWrapper<DataDictionary>()
- .eq(DataDictionary::getLevel,typeLevel)
- .eq(DataDictionary::getTypeCode,typeCode)));
+ .eq(DataDictionary::getLevel, typeLevel)
+ .eq(DataDictionary::getTypeCode, typeCode)));
}
/**
+ * @return com.ycl.api.CommonResult
* @Description search illegal building type second
* @Param []
- * @return com.ycl.api.CommonResult
**/
@ApiOperation(value = "鏌ヨ鎵�灞炵被鍒�")
@GetMapping("/query/type_second")
- public CommonResult searchIllegalBuildingTypeSecond(){
- String typeLevel="2";
- String typeCode="06";
+ public CommonResult searchIllegalBuildingTypeSecond() {
+ String typeLevel = "2";
+ String typeCode = "06";
return CommonResult.success(iDataDictionaryService
.list(new LambdaQueryWrapper<DataDictionary>()
- .eq(DataDictionary::getLevel,typeLevel)
- .eq(DataDictionary::getTypeCode,typeCode)));
+ .eq(DataDictionary::getLevel, typeLevel)
+ .eq(DataDictionary::getTypeCode, typeCode)));
}
/**
+ * @return com.ycl.api.CommonResult
* @Description modify illegal building type
* @Param [typeFirst, id]
- * @return com.ycl.api.CommonResult
**/
@ApiOperation(value = "淇敼鎵�灞炵被鍨�/绫诲埆")
@PutMapping("/modification/type")
- public CommonResult modifyIllegalBuildingType(@RequestParam String type,@RequestParam Integer id){
- return CommonResult.success(iDataDictionaryService
+ public CommonResult modifyIllegalBuildingType(@RequestParam String type, @RequestParam Integer id) {
+ return CommonResult.success(iDataDictionaryService
.update(new LambdaUpdateWrapper<DataDictionary>()
- .eq(DataDictionary::getId,id)
- .set(StringUtils.isNotBlank(type),DataDictionary::getName,type)));
+ .eq(DataDictionary::getId, id)
+ .set(StringUtils.isNotBlank(type), DataDictionary::getName, type)));
}
/**
+ * @return com.ycl.api.CommonResult
* @Description addition illegal building type
* @Param [dataDictionary]
- * @return com.ycl.api.CommonResult
**/
@ApiOperation(value = "娣诲姞鎵�灞炵被鍨�/绫诲埆")
@PostMapping("/addition/type")
- public CommonResult addIllegalBuildingTypeFirst(@RequestBody @Validated DataDictionary dataDictionary){
+ public CommonResult addIllegalBuildingTypeFirst(@RequestBody @Validated DataDictionary dataDictionary) {
return CommonResult.success(iDataDictionaryService.save(dataDictionary));
}
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 3966a9c..5bd2cfc 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
@@ -30,6 +30,13 @@
private Integer typeId;
/**
+ * 妗堜欢绛夌骇
+ */
+ @ApiModelProperty(value = "妗堜欢绛夌骇")
+ @NotNull(message = "涓嶅厑璁告浠剁瓑绾т负绌�")
+ private Integer gradeId;
+
+ /**
* 鎵�灞炶閬�
*/
@ApiModelProperty(value = "鎵�灞炶閬�")
diff --git a/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java b/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java
new file mode 100644
index 0000000..56243a7
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java
@@ -0,0 +1,240 @@
+package com.ycl.dto.dispatch;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class UploadDisposingResultParam {
+
+ //鎵垮姙闃熷憳
+
+ /**
+ * 鎵垮姙闃熷憳
+ */
+ @ApiModelProperty(value = "鎵垮姙闃熷憳")
+ private String undertaker;
+
+ /**
+ * 鍗忓姙闃熷憳
+ */
+ @ApiModelProperty(value = "鍗忓姙闃熷憳")
+ private String assistant;
+
+ /**
+ * 鏃堕棿
+ */
+ @ApiModelProperty(value = "鏃堕棿")
+ private LocalDateTime investigationTime;
+
+ /**
+ * 鍦板潃
+ */
+ @ApiModelProperty(value = "鍦板潃")
+ private String address;
+
+ /**
+ * 妗堢敱
+ */
+ @ApiModelProperty(value = "妗堢敱")
+ private String caseAction;
+
+// /**
+// * 褰撲簨浜篿d
+// */
+// @ApiModelProperty(value = "褰撲簨浜篿d")
+// private Integer partyId;
+
+ /**
+ * 鎯呭喌鎻忚堪
+ */
+ @ApiModelProperty(value = "鎯呭喌鎻忚堪")
+ private String description;
+
+ /**
+ * 鐓х墖
+ */
+ @ApiModelProperty(value = "鐓х墖")
+ private String pic;
+
+ //鐜板満
+
+ /**
+ * 鍒拌揪鏃堕棿
+ */
+ @ApiModelProperty(value = "鍒拌揪鏃堕棿")
+ private LocalDateTime arrivalTime;
+
+ /**
+ * 鍒拌揪鍦板潃
+ */
+ @ApiModelProperty(value = "鍒拌揪鍦板潃")
+ private String arrivalAddress;
+
+ /**
+ * 鐜板満鎯呭喌璇存槑
+ */
+ @ApiModelProperty(value = "鐜板満鎯呭喌璇存槑")
+ private String situationExplain;
+
+ /**
+ * 淇¤鍥炲璇存槑
+ */
+ @ApiModelProperty(value = "淇¤鍥炲璇存槑")
+ private String replyExplain;
+
+ /**
+ * 鐜板満鎯呭喌鐓х墖
+ */
+ @ApiModelProperty(value = "鐜板満鎯呭喌鐓х墖")
+ private String situationPic;
+
+ //鏂囦功
+ /**
+ * 鏂囦功绉嶇被
+ */
+ @ApiModelProperty(value = "鏂囦功绉嶇被")
+ private Integer writType;
+
+ /**
+ * 鏂囦功缂栧彿
+ */
+ @ApiModelProperty(value = "鏂囦功缂栧彿")
+ private String writCode;
+
+ /**
+ * 杩濇硶绫诲瀷
+ */
+ @ApiModelProperty(value = "杩濇硶绫诲瀷")
+ private Integer illegalType;
+
+ /**
+ * 鏂囦功鍙戞斁鏃堕棿
+ */
+ @ApiModelProperty(value = "鏂囦功鍙戞斁鏃堕棿")
+ private LocalDateTime sendTime;
+
+ /**
+ * 鏂囦功闄愬畾鏃堕棿
+ */
+ @ApiModelProperty(value = "鏂囦功闄愬畾鏃堕棿")
+ private LocalDateTime limitTime;
+
+ /**
+ * 鏂囦功鍙戞斁鍐呭
+ */
+ @ApiModelProperty(value = "鏂囦功鍙戞斁鍐呭")
+ private String sendContent;
+
+ /**
+ * 瀹為檯鏁存敼鏃堕棿
+ */
+ @ApiModelProperty(value = "瀹為檯鏁存敼鏃堕棿")
+ private LocalDateTime rectifyTime;
+
+ /**
+ * 鏁存敼鎯呭喌
+ */
+ @ApiModelProperty(value = "鏁存敼鎯呭喌")
+ private String rectifySituation;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+
+ /**
+ * 鏂囦功鐓х墖涓婁紶
+ */
+ @ApiModelProperty(value = "鏂囦功鐓х墖涓婁紶")
+ private String writPic;
+
+ /**
+ * 鏁存敼鍓嶇収鐗�
+ */
+ @ApiModelProperty(value = "鏁存敼鍓嶇収鐗�")
+ private String originalPic;
+
+ /**
+ * 鏁存敼鍚庣収鐗�
+ */
+ @ApiModelProperty(value = "鏁存敼鍚庣収鐗�")
+ private String rectifiedPic;
+
+ /**
+ * 鍏朵粬鐓х墖
+ */
+ @ApiModelProperty(value = "鍏朵粬鐓х墖")
+ private String otherPic;
+
+ //褰撲簨浜�
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty(value = "濮撳悕")
+ private String name;
+
+ /**
+ * 鎵嬫満鍙�
+ */
+ @ApiModelProperty(value = "鎵嬫満鍙�")
+ private String phoneCode;
+
+ /**
+ * 璇佷欢绫诲瀷
+ */
+ @ApiModelProperty(value = "璇佷欢绫诲瀷")
+ private String certificateType;
+
+ /**
+ * 璇佷欢鍙�
+ */
+ @ApiModelProperty(value = "璇佷欢鍙�")
+ private String certificateCode;
+
+ /**
+ * 鏂囧寲绋嬪害
+ */
+ @ApiModelProperty(value = "鏂囧寲绋嬪害")
+ private String educationDegree;
+
+ /**
+ * 鑱屼笟
+ */
+ @ApiModelProperty(value = "鑱屼笟")
+ private String career;
+
+ /**
+ * 宸ヤ綔鍗曚綅鍙婅亴鍔�
+ */
+ @ApiModelProperty(value = "宸ヤ綔鍗曚綅鍙婅亴鍔�")
+ private String work;
+
+ /**
+ * 姘戞棌
+ */
+ @ApiModelProperty(value = "姘戞棌")
+ private String nation;
+
+ /**
+ * 绫嶈疮
+ */
+ @ApiModelProperty(value = "绫嶈疮")
+ private String nativePlace;
+
+ /**
+ * 鐜颁綇鍦板潃
+ */
+ @ApiModelProperty(value = "鐜颁綇鍦板潃")
+ private String liveAddress;
+
+ /**
+ * 鎴风睄鎵�鍦ㄥ湴
+ */
+ @ApiModelProperty(value = "鎴风睄鎵�鍦ㄥ湴")
+ private String registerAddress;
+
+}
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/remote/dto/EventProcessResponseDto.java b/ycl-platform/src/main/java/com/ycl/remote/dto/EventProcessResponseDto.java
index ed38fea..e4dd551 100644
--- a/ycl-platform/src/main/java/com/ycl/remote/dto/EventProcessResponseDto.java
+++ b/ycl-platform/src/main/java/com/ycl/remote/dto/EventProcessResponseDto.java
@@ -1,5 +1,7 @@
package com.ycl.remote.dto;
+import lombok.Data;
+
/**
* EventProcessResponseDto 妗堜欢璇︽儏
*
@@ -7,6 +9,7 @@
* @author: AI
* @date: 2022-09-28 16:03
**/
+@Data
public class EventProcessResponseDto {
private String taskcode;
private String statusName;
diff --git a/ycl-platform/src/main/java/com/ycl/remote/dto/ResultResponseDto.java b/ycl-platform/src/main/java/com/ycl/remote/dto/ResultResponseDto.java
index 5fe52d5..61feae6 100644
--- a/ycl-platform/src/main/java/com/ycl/remote/dto/ResultResponseDto.java
+++ b/ycl-platform/src/main/java/com/ycl/remote/dto/ResultResponseDto.java
@@ -10,8 +10,8 @@
* @date: 2022-09-28 16:00
**/
@Data
-public class ResultResponseDto<T> {
+public class ResultResponseDto {
private String msg;
private Integer code;
- private T result;
+ private String result;
}
diff --git a/ycl-platform/src/main/java/com/ycl/remote/service/CityPlatformService.java b/ycl-platform/src/main/java/com/ycl/remote/service/CityPlatformService.java
index 3923a42..0271955 100644
--- a/ycl-platform/src/main/java/com/ycl/remote/service/CityPlatformService.java
+++ b/ycl-platform/src/main/java/com/ycl/remote/service/CityPlatformService.java
@@ -24,7 +24,7 @@
* @date 2022-09-28 16:12
*/
@PostMapping("/unauthorized/external/event/add")
- ResultResponseDto<EventAddResponseDto> addEvent(EventAddParamDto paramDto);
+ String addEvent(EventAddParamDto paramDto);
/**
* 浜嬩欢璇︽儏
@@ -35,7 +35,7 @@
* @date 2022-09-28 16:12
*/
@PostMapping("/unauthorized/external/event/process")
- ResultResponseDto<EventProcessResponseDto> getEventProcess(EventProcessParamDto paramDto);
+ String getEventProcess(EventProcessParamDto paramDto);
}
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 e5220d4..1758bfd 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
@@ -1,5 +1,6 @@
package com.ycl.service.caseHandler.impl;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -14,8 +15,8 @@
import com.ycl.mapper.caseHandler.*;
import com.ycl.mapper.common.ImageResourcesMapper;
import com.ycl.mapper.dict.DataDictionaryMapper;
-import com.ycl.remote.dto.EventAddParamDto;
-import com.ycl.remote.dto.EventProcessParamDto;
+import com.ycl.remote.dto.*;
+import com.ycl.remote.service.CityPlatformService;
import com.ycl.service.caseHandler.IBaseCaseService;
import com.ycl.service.caseHandler.IViolationsService;
import com.ycl.service.video.IVideoAlarmReportService;
@@ -44,17 +45,17 @@
@Service
public class BaseCaseServiceImpl extends ServiceImpl<BaseCaseMapper, BaseCase> implements IBaseCaseService {
- // private CityPlatformService cityPlatformService;
+ private CityPlatformService cityPlatformService;
private IViolationsService violationsService;
private IVideoAlarmReportService videoAlarmReportService;
@Value("${fdfs.fileUrl}")
private String fileUrl;
-// @Autowired
-// public void setCityPlatformService(CityPlatformService cityPlatformService) {
-// this.cityPlatformService = cityPlatformService;
-// }
+ @Autowired
+ public void setCityPlatformService(CityPlatformService cityPlatformService) {
+ this.cityPlatformService = cityPlatformService;
+ }
@Autowired
public void setViolationsService(IViolationsService violationsService) {
@@ -106,33 +107,34 @@
medias = stringBuilder.toString();
}
}
- EventAddParamDto dto = EventAddParamDto.builder().y84(baseCase.getLatitude().toString()).x84(baseCase.getLongitude().toString())
+ EventAddParamDto dto = EventAddParamDto.builder().y84(baseCase.getLatitude() != null ? baseCase.getLatitude().toString() : "")
+ .x84(baseCase.getLongitude() != null ? baseCase.getLongitude().toString() : "")
.source(11).address(baseCase.getSite()).eventDesc(eventDesc).eventSign(baseCase.getCode()).medias(medias).build();
-// ResultResponseDto<EventAddResponseDto> result = cityPlatformService.addEvent(dto);
-// if (result.getCode() == 0) {
-// EventAddResponseDto responseDto = result.getResult();
-// baseCase.setTaskCode(responseDto.getTaskcode());
-// this.updateById(baseCase);
-// return null;
-// } else {
-// return result.getMsg();
-// }
- return null;
+ String msg = cityPlatformService.addEvent(dto);
+ ResultResponseDto result = JSONObject.parseObject(msg, ResultResponseDto.class);
+ if (result.getCode() == 0) {
+ EventAddResponseDto responseDto = JSONObject.parseObject(result.getResult(), EventAddResponseDto.class);
+ baseCase.setTaskCode(responseDto.getTaskcode());
+ this.updateById(baseCase);
+ return null;
+ } else {
+ return result.getMsg();
+ }
}
@Override
public String processEvent(Integer caseId) {
BaseCase baseCase = this.getById(caseId);
EventProcessParamDto paramDto = EventProcessParamDto.builder().eventSign(baseCase.getCode()).taskcode(baseCase.getTaskCode()).build();
-// ResultResponseDto<EventProcessResponseDto> responseDto = cityPlatformService.getEventProcess(paramDto);
-// if (responseDto.getCode() == 0) {
-// EventProcessResponseDto eventProcessResponseDto = responseDto.getResult();
-// /*********** 鏈鐞嗗競骞冲彴杩斿洖鏁版嵁 ***************/
-// return null;
-// } else {
-// return responseDto.getMsg();
-// }
- return null;
+ String msg = cityPlatformService.getEventProcess(paramDto);
+ ResultResponseDto responseDto = JSONObject.parseObject(msg, ResultResponseDto.class);
+ if (responseDto.getCode() == 0) {
+ EventProcessResponseDto eventProcessResponseDto = JSONObject.parseObject(responseDto.getResult(), EventProcessResponseDto.class);
+ /*********** 鏈鐞嗗競骞冲彴杩斿洖鏁版嵁 ***************/
+ return null;
+ } else {
+ return responseDto.getMsg();
+ }
}
@Override
@@ -188,9 +190,7 @@
@Override
public Boolean saveViolationCase(ViolationParam violationParam, Integer id) {
- BaseCase baseCase = new BaseCase();
Violations violations = new Violations();
- BeanUtils.copyProperties(violationParam, baseCase);
BeanUtils.copyProperties(violationParam, violations);
violations.setId(id);
Integer value = 1;
@@ -199,9 +199,7 @@
@Override
public Boolean saveIllegalBuildingCase(IllegalBuildingParam illegalBuildingParam, Integer id) {
- BaseCase baseCase = new BaseCase();
IllegalBuilding illegalBuilding = new IllegalBuilding();
- BeanUtils.copyProperties(illegalBuilding, baseCase);
BeanUtils.copyProperties(illegalBuilding, illegalBuildingParam);
illegalBuilding.setBaseCaseId(id);
Integer value = 1;
@@ -222,7 +220,7 @@
QueryWrapper<WorkflowConfig> wrapperWc = new QueryWrapper<>();
wrapperWc.lambda().eq(WorkflowConfig::getCode, "ddlc").or().eq(WorkflowConfig::getCode, "wtcllc");
List<WorkflowConfig> wcs = workflowConfigMapper.selectList(wrapperWc);
- Integer ddlcId=0,wtcllcId=0;
+ Integer ddlcId = 0, wtcllcId = 0;
for (WorkflowConfig wc : wcs) {
if ("ddlc".equals(wc.getCode())) {
ddlcId = wc.getId();
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java
index d5cbed7..d2016ca 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java
@@ -14,6 +14,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.service.video.impl.IVideoPointService;
import com.ycl.service.video.impl.VideoPointServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
@@ -33,10 +34,11 @@
private IVideoPointService videoPointService;
private IBaseCaseService baseCaseService;
+ @Autowired
public void setVideoPointService(IVideoPointService videoPointService) {
this.videoPointService = videoPointService;
}
-
+ @Autowired
public void setBaseCaseService(IBaseCaseService baseCaseService) {
this.baseCaseService = baseCaseService;
}
@@ -51,7 +53,7 @@
videoPoint = pointList.get(0);
}
BaseCase baseCase = BaseCase.builder().eventSource(EventSource.VIDEO.getCode()).category(QuestionCategory.VIOLATION.getCode())
- .createTime(LocalDateTime.now()).createUser(0).alarmTime(videoAlarmReport.getAlarmTime()).build();
+ .createTime(LocalDateTime.now()).createUser(0).state(1).alarmTime(videoAlarmReport.getAlarmTime()).build();
Violations violations = new Violations();
if (videoPoint != null) {
baseCase.setLatitude(videoPoint.getLatitude());
@@ -59,10 +61,10 @@
baseCase.setStreetId(videoPoint.getStreetId());
baseCase.setCommunityId(videoPoint.getCommunityId());
- violations.setVideoAlarmReportId(videoAlarmReport.getId());
}
baseCaseService.save(baseCase);
violations.setId(baseCase.getId());
+ violations.setVideoAlarmReportId(videoAlarmReport.getId());
baseMapper.insert(violations);
}
}
diff --git a/ycl-platform/src/main/java/com/ycl/vo/casePool/QuestionDisposeVO.java b/ycl-platform/src/main/java/com/ycl/vo/casePool/QuestionDisposeVO.java
new file mode 100644
index 0000000..d78e447
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/vo/casePool/QuestionDisposeVO.java
@@ -0,0 +1,91 @@
+package com.ycl.vo.casePool;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 澶勭疆娴佺▼璁板綍
+ * </p>
+ *
+ * @author wl
+ * @since 2022-09-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class QuestionDisposeVO {
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 妗堜欢id
+ */
+ private Integer baseCaseId;
+
+ /**
+ * 鐜妭鍚嶇О
+ */
+ @ApiModelProperty(value = "鐜妭鍚嶇О")
+ private String stepName;
+
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ private LocalDateTime startTime;
+
+ /**
+ * 澶勭悊浜鸿鑹瞚d
+ */
+ @ApiModelProperty(value = "澶勭悊浜鸿鑹瞚d")
+ private String handlerRoleName;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ private LocalDateTime endTime;
+
+ /**
+ * 鐜妭鐘舵��
+ */
+ @ApiModelProperty(value = "鐜妭鐘舵��")
+ private Integer state;
+
+ /**
+ * 瀹為檯澶勭悊浜�
+ */
+ @ApiModelProperty(value = "瀹為檯澶勭悊浜�")
+ private String handlerName;
+
+ /**
+ * 鍒涘缓浜�
+ */
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private Integer createUser;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+
+ /**
+ * 缁撴灉
+ */
+ @ApiModelProperty(value = "缁撴灉")
+ private String result;
+
+ /**
+ * 闄愬埗鏃堕檺
+ */
+ @ApiModelProperty(value = "闄愬埗鏃堕檺")
+ private LocalDateTime limitTime;
+}
diff --git a/ycl-platform/src/main/resources/application.yml b/ycl-platform/src/main/resources/application.yml
index 3558824..4e81bc2 100644
--- a/ycl-platform/src/main/resources/application.yml
+++ b/ycl-platform/src/main/resources/application.yml
@@ -86,3 +86,4 @@
- /dict/**
- /sccg-region/**
- /**/system/portal/logo/search
+ - /**/unauthorized/**
diff --git a/ycl-platform/src/main/resources/logback.xml b/ycl-platform/src/main/resources/logback-spring.xml
similarity index 100%
rename from ycl-platform/src/main/resources/logback.xml
rename to ycl-platform/src/main/resources/logback-spring.xml
--
Gitblit v1.8.0