From c03e1d823eb86c856ecbe40d8d2180ffce7c7b0f Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 14 十一月 2025 17:45:39 +0800
Subject: [PATCH] 2025.11.14 新增值域的增删改接口

---
 src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DomaincatalogServiceImpl.kt |   30 +++++++++++++++++++++++++++---
 1 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DomaincatalogServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DomaincatalogServiceImpl.kt
index 94b7445..97cf9cb 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DomaincatalogServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DomaincatalogServiceImpl.kt
@@ -1,5 +1,6 @@
 package cn.flightfeather.supervision.lightshare.service.impl
 
+import cn.flightfeather.supervision.common.exception.BizException
 import cn.flightfeather.supervision.common.utils.Constant
 import cn.flightfeather.supervision.common.utils.UUIDGenerator
 import cn.flightfeather.supervision.domain.ds1.entity.*
@@ -33,7 +34,9 @@
     //鑾峰彇鍏ㄩ儴
     override fun findAll(): MutableList<DomaincatalogVo> {
         val domaincatalogVoList = mutableListOf<DomaincatalogVo>()
-        val domaincatalogList = domaincatalogMapper.selectAll()
+        val domaincatalogList = domaincatalogMapper.selectByExample(Example(Domaincatalog::class.java).apply {
+            orderBy("name")
+        })
         domaincatalogList.forEach {
             val domaincatalogVo = DomaincatalogVo()
             BeanUtils.copyProperties(it,domaincatalogVo)
@@ -42,9 +45,30 @@
         return domaincatalogVoList
     }
 
-    override fun save(domaincatalog: Domaincatalog): Int = domaincatalogMapper.insert(domaincatalog)
+    override fun save(domaincatalog: Domaincatalog): Domaincatalog{
+        if (domaincatalog.guid == null) {
+            domaincatalog.guid = UUIDGenerator.generate16ShortUUID()
+        }
+        if (domaincatalogMapper.insert(domaincatalog) == 1) {
+            return domaincatalog
+        } else {
+            throw BizException("鍊煎煙椤规柊澧炲け璐�")
+        }
+    }
 
-    override fun update(domaincatalog: Domaincatalog): Int = domaincatalogMapper.updateByPrimaryKey(domaincatalog)
+    override fun update(domaincatalog: Domaincatalog): Domaincatalog{
+        // 2025.11.11 鏂板鐗堟湰鍙峰姣旈�昏緫锛岃嫢鏇存柊鐨勯厤缃俊鎭増鏈彿绛変簬鏁版嵁鍘嗗彶鐗堟湰鍙凤紝鎵嶈兘鏇存柊
+        val oldOne = domaincatalogMapper.selectByPrimaryKey(domaincatalog.guid)
+        if ((domaincatalog.version == oldOne.version)) {
+            // 鏇存柊鏃讹紝鐗堟湰鍙烽�掑
+            domaincatalog.version = (domaincatalog.version ?: 0) + 1
+            domaincatalogMapper.updateByPrimaryKey(domaincatalog)
+
+            return domaincatalog
+        } else {
+            throw BizException("鐗堟湰鍙蜂笉涓�鑷达紝鏇存柊澶辫触")
+        }
+    }
 
     override fun delete(id: String): Int = domaincatalogMapper.deleteByPrimaryKey(id)
 

--
Gitblit v1.9.3