From d07435eccba99c286c5eef12406a303108d33948 Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Thu, 7 Nov 2024 13:49:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E6=B7=BB=E5=8A=A0=E6=A1=88=E4=BB=B6?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/docker-compose/.env                                    | 2 +-
 src/main/java/com/supervision/police/dto/ModelCaseBase.java   | 3 ++-
 .../supervision/police/service/impl/ModelCaseServiceImpl.java | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docker/docker-compose/.env b/docker/docker-compose/.env
index e3b5a01..81e59dc 100644
--- a/docker/docker-compose/.env
+++ b/docker/docker-compose/.env
@@ -23,7 +23,7 @@ OLLAMA_MODEL=llama3-chinese:8b
 LANGCHAIN_CHAT_URL=http://113.128.242.110:7861
 THREAD_POOL_TRIPLE_CORE=1
 THREAD_POOL_TYPE_CORE=1
-XXl_JOB_PASSWORD=sT7SSTiX8&&s
+XXl_JOB_PASSWORD=sT7SSTiX8s
 
 OCR_PORT_HTTP=8866
 OCR_MINIO_ENDPOINT_URL=http://fu-hsi-minio:9000
diff --git a/src/main/java/com/supervision/police/dto/ModelCaseBase.java b/src/main/java/com/supervision/police/dto/ModelCaseBase.java
index 5d19ed5..ab2c886 100644
--- a/src/main/java/com/supervision/police/dto/ModelCaseBase.java
+++ b/src/main/java/com/supervision/police/dto/ModelCaseBase.java
@@ -1,5 +1,6 @@
 package com.supervision.police.dto;
 
+import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.supervision.police.domain.ModelCase;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -58,7 +59,7 @@ public class ModelCaseBase {
         modelCase.setRegisterTime(this.registerTime);
         modelCase.setAcceptTime(this.acceptTime);
         modelCase.setIndexNum(this.indexNum);
-        modelCase.setCaseNo(this.caseNo);
+        modelCase.setCaseNo(StrUtil.trim(this.caseNo));
         return modelCase;
     }
 
diff --git a/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java
index efdc3eb..bb85ece 100644
--- a/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java
@@ -162,6 +162,10 @@ public class ModelCaseServiceImpl extends ServiceImpl<ModelCaseMapper, ModelCase
             }
             i = modelCaseMapper.updateById(modelCase);
         } else {
+
+            Long count = super.lambdaQuery().eq(ModelCase::getCaseNo, modelCase.getCaseNo()).count();
+            Assert.isTrue(count == 0, "案件编号已存在,请更换案件编号！");
+
             Long num = modelCaseMapper.selectCount(null);
             modelCase.setIndexNum(Integer.parseInt(num.toString()) + 1);
             i = modelCaseMapper.insert(modelCase);