From 2a501287a4d49af2bd4a3010466333e37a6e5c68 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 27 十月 2022 17:52:29 +0800
Subject: [PATCH] 优化

---
 ycl-platform/src/main/java/com/ycl/entity/video/VideoAlarmReport.java                     |   10 ++++++----
 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java |   11 +++++++----
 ycl-platform/src/main/resources/application.yml                                           |    1 +
 ycl-platform/src/main/java/com/ycl/common/constant/StepName.java                          |    2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/common/constant/StepName.java b/ycl-platform/src/main/java/com/ycl/common/constant/StepName.java
index 59e809b..c46c068 100644
--- a/ycl-platform/src/main/java/com/ycl/common/constant/StepName.java
+++ b/ycl-platform/src/main/java/com/ycl/common/constant/StepName.java
@@ -3,7 +3,7 @@
 public enum StepName {
 
     DISPATCH("01", "璋冨害"),
-    DISPOSE("02", "涓婁紶澶勭疆缁撴灉"),
+    DISPOSE("02", "澶勭悊"),
     CHECK("03", "鏍告煡"),
     CLOSING_REGISTER("04", "缁撴");
 
diff --git a/ycl-platform/src/main/java/com/ycl/entity/video/VideoAlarmReport.java b/ycl-platform/src/main/java/com/ycl/entity/video/VideoAlarmReport.java
index 29b6059..57049bf 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/video/VideoAlarmReport.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/video/VideoAlarmReport.java
@@ -1,6 +1,8 @@
 package com.ycl.entity.video;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,10 +16,10 @@
 /**
  * VideoAlarmReport
  *
- * @author: AI
- * @date:  2022-09-20 17:14
  * @version V1.0
-**/
+ * @author: AI
+ * @date: 2022-09-20 17:14
+ **/
 @TableName("ums_video_alarm_report")
 @Data
 @NoArgsConstructor
@@ -27,7 +29,7 @@
 public class VideoAlarmReport {
 
     @ApiModelProperty("$column.comment")
-    @TableField("owner")
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     @ApiModelProperty("璁块棶鍦板潃")
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
index 5c2ef5e..56722c8 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
@@ -71,10 +71,12 @@
         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);
+        if (StringUtils.isNotEmpty(uploadDisposingResultParam.getName())) {
+            BeanUtils.copyProperties(uploadDisposingResultParam, partyInfo);
+            partyInfo.setCreateUser(user.getUserId().intValue());
+            partyInfo.setCreateTime(LocalDateTime.now());
+            iPartyInfoService.save(partyInfo);
+        }
         //璋冩煡鍙栬瘉
         Investigation investigation = new Investigation();
         BeanUtils.copyProperties(uploadDisposingResultParam, investigation);
@@ -142,6 +144,7 @@
         updateRecord.setState(1);
         updateRecord.setEndTime(LocalDateTime.now());
         updateRecord.setHandlerId(disposeRecord.getCreateUser());
+        updateRecord.setResult(uploadDisposingResultParam.getDescription());
         baseMapper.update(updateRecord, updateWrapper);
 
         QueryWrapper<WorkflowConfigStep> stepQurey = new QueryWrapper<>();
diff --git a/ycl-platform/src/main/resources/application.yml b/ycl-platform/src/main/resources/application.yml
index e44a192..2a40847 100644
--- a/ycl-platform/src/main/resources/application.yml
+++ b/ycl-platform/src/main/resources/application.yml
@@ -87,3 +87,4 @@
       - /sccg-region/**
       - /**/system/portal/logo/search
       - /**/unauthorized/**
+      - /**/api/**

--
Gitblit v1.8.0