From dcca6ce2e830389b9575119f5626724e321d6008 Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Mon, 6 Jan 2025 12:26:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?1.=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../config/MyMetaObjectHandler.java | 25 +++++++++++++++++--
.../supervision/police/domain/TaskRecord.java | 4 ++-
.../police/service/impl/MroServiceImpl.java | 1 -
.../service/impl/TaskRecordServiceImpl.java | 11 ++++----
4 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/supervision/config/MyMetaObjectHandler.java b/src/main/java/com/supervision/config/MyMetaObjectHandler.java
index ad84206..ac44606 100644
--- a/src/main/java/com/supervision/config/MyMetaObjectHandler.java
+++ b/src/main/java/com/supervision/config/MyMetaObjectHandler.java
@@ -1,14 +1,16 @@
package com.supervision.config;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.supervision.police.dto.user.UserInfoDTO;
+import com.supervision.utils.UserUtil;
+import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.reflection.MetaObject;
-
import java.time.LocalDateTime;
-import java.util.Date;
/**
* @author Ray
*/
+@Slf4j
public class MyMetaObjectHandler implements MetaObjectHandler {
public MyMetaObjectHandler() {
}
@@ -17,11 +19,30 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
public void insertFill(MetaObject metaObject) {
this.setFieldValByName("createTime", LocalDateTime.now(), metaObject);
this.setFieldValByName("updateTime", LocalDateTime.now(), metaObject);
+ if (null == this.getFieldValByName("createUserId", metaObject)){
+ // 只有为空才会继续创建
+ try {
+ UserInfoDTO user = UserUtil.getUser();
+ this.setFieldValByName("createUserId", user.getId(), metaObject);
+ }catch (Exception e){
+ log.info("获取用户信息失败");
+ }
+ }
}
@Override
public void updateFill(MetaObject metaObject) {
this.setFieldValByName("updateTime", LocalDateTime.now(), metaObject);
+
+ if (null == this.getFieldValByName("updateUserId", metaObject)){
+ // 只有为空才会继续创建
+ try {
+ UserInfoDTO user = UserUtil.getUser();
+ this.setFieldValByName("updateUserId", user.getId(), metaObject);
+ }catch (Exception e){
+ log.info("获取用户信息失败");
+ }
+ }
}
}
\ No newline at end of file
diff --git a/src/main/java/com/supervision/police/domain/TaskRecord.java b/src/main/java/com/supervision/police/domain/TaskRecord.java
index ec51214..81ab799 100644
--- a/src/main/java/com/supervision/police/domain/TaskRecord.java
+++ b/src/main/java/com/supervision/police/domain/TaskRecord.java
@@ -61,11 +61,12 @@ public class TaskRecord implements Serializable {
/**
* 取消时间
*/
- private Date cancelTime;
+ private LocalDateTime cancelTime;
/**
* 创建人ID
*/
+ @TableField(fill = FieldFill.INSERT)
private String createUserId;
/**
@@ -77,6 +78,7 @@ public class TaskRecord implements Serializable {
/**
* 更新人ID
*/
+ @TableField(fill = FieldFill.UPDATE)
private String updateUserId;
/**
diff --git a/src/main/java/com/supervision/police/service/impl/MroServiceImpl.java b/src/main/java/com/supervision/police/service/impl/MroServiceImpl.java
index 6302996..0f66c8d 100644
--- a/src/main/java/com/supervision/police/service/impl/MroServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/MroServiceImpl.java
@@ -28,7 +28,6 @@ public class MroServiceImpl implements MroService {
private final ModelService modelService;
- private final TaskCaseRecordService caseRecordService;
@Override
public IPage<CaseProcessDTO> queryCaseList(CaseProcessReqVO caseProcessReqVO, Integer page, Integer size) {
diff --git a/src/main/java/com/supervision/police/service/impl/TaskRecordServiceImpl.java b/src/main/java/com/supervision/police/service/impl/TaskRecordServiceImpl.java
index e5034e3..4ee9762 100644
--- a/src/main/java/com/supervision/police/service/impl/TaskRecordServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/TaskRecordServiceImpl.java
@@ -216,7 +216,7 @@ public class TaskRecordServiceImpl extends ServiceImpl<TaskRecordMapper, TaskRec
@Override
public Boolean taskStatusCancelEnabled(String status) {
- return StrUtil.equalsAny(status, TaskRecordConstants.TASK_STATUS_WAITING);
+ return StrUtil.equalsAny(status, TaskRecordConstants.TASK_STATUS_WAITING, TaskRecordConstants.TASK_STATUS_PROCESSING);
}
@Override
@@ -238,10 +238,11 @@ public class TaskRecordServiceImpl extends ServiceImpl<TaskRecordMapper, TaskRec
}
Assert.isTrue(CollUtil.isEmpty(list), "取消任务失败，存在不可取消的任务");
- super.lambdaUpdate()
- .set(TaskRecord::getStatus, TaskRecordConstants.TASK_STATUS_CANCELLING)
- .set(TaskRecord::getCancelTime, LocalDateTime.now())
- .in(TaskRecord::getId, taskIds).update();
+ for (TaskRecord taskRecord : taskRecords) {
+ taskRecord.setStatus(TaskRecordConstants.TASK_STATUS_CANCELED);
+ taskRecord.setCancelTime(LocalDateTime.now());
+ super.updateById(taskRecord);
+ }
}
@Override
From 881929f683c1e6aac46c23e26f649a83a6125055 Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Mon, 6 Jan 2025 12:33:15 +0800
Subject: [PATCH 2/3] =?UTF-8?q?1.=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/mapper/TaskRecordMapper.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/TaskRecordMapper.xml b/src/main/resources/mapper/TaskRecordMapper.xml
index 4ea9391..36f59f0 100644
--- a/src/main/resources/mapper/TaskRecordMapper.xml
+++ b/src/main/resources/mapper/TaskRecordMapper.xml
@@ -35,10 +35,10 @@
t.create_time as createTime,
t.cancel_time as cancelTime,
t.create_user_id as createUserId,
- p.name as createUserName
+ su.user_name as createUserName
from task_record t
left join model_case c on t.case_id = c.id
- left join case_person p on t.create_user_id = p.id
+ left join system_user su on t.create_user_id = su.id
<where>
<if test="taskInfo.caseName != null and taskInfo.caseName != ''">
and c.case_name like concat('%',#{taskInfo.caseName},'%')
From a30adbb45119e98395f5aa66a689c3baa0cd0a28 Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Mon, 6 Jan 2025 13:32:08 +0800
Subject: [PATCH 3/3] =?UTF-8?q?1.=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/supervision/police/service/impl/MroServiceImpl.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main/java/com/supervision/police/service/impl/MroServiceImpl.java b/src/main/java/com/supervision/police/service/impl/MroServiceImpl.java
index 0f66c8d..6a75e54 100644
--- a/src/main/java/com/supervision/police/service/impl/MroServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/MroServiceImpl.java
@@ -33,6 +33,7 @@ public class MroServiceImpl implements MroService {
public IPage<CaseProcessDTO> queryCaseList(CaseProcessReqVO caseProcessReqVO, Integer page, Integer size) {
Page<ModelCase> paged = modelCaseService.lambdaQuery()
+ .eq(ModelCase::getDataStatus, "1")
.like(StrUtil.isNotEmpty(caseProcessReqVO.getCaseName()), ModelCase::getCaseName, caseProcessReqVO.getCaseName())
.in(CollUtil.isNotEmpty(caseProcessReqVO.getIdentifyResult()), ModelCase::getIdentifyResult, caseProcessReqVO.getIdentifyResult())
.in(CollUtil.isNotEmpty(caseProcessReqVO.getAnalysisStatus()), ModelCase::getCaseAnalysisStatus, caseProcessReqVO.getAnalysisStatus())