From d2727f231319a48019bc3b87439136ab49b97b9b Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 08 十一月 2024 09:49:57 +0800
Subject: [PATCH] 1. 2024.11.08 修复部分bug
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/ScenseServiceImpl.kt | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/ScenseServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/ScenseServiceImpl.kt
index 3322c91..8bf1dba 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/ScenseServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/ScenseServiceImpl.kt
@@ -278,10 +278,10 @@
override fun getSceneDetail(sceneId: String): BaseResponse<SceneDetail> {
val sceneDetail = SceneDetail()
- val scene = scenseMapper.selectByPrimaryKey(sceneId)
+ val scene = sceneRep.findScene(sceneId = sceneId)
sceneDetail.scense = scene
- val mapper = when (scene.typeid.toString()) {
+ val mapper = when (scene?.typeid.toString()) {
Constant.SceneType.TYPE1.value -> sceneConstructionSiteMapper
Constant.SceneType.TYPE2.value -> sceneWharfMapper
Constant.SceneType.TYPE3.value -> sceneMixingPlantMapper
@@ -411,7 +411,7 @@
val scenes = sceneImport.readFromFile(f)
// 鏌ユ壘鍦烘櫙鍚嶇О鏄惁閲嶅
val names = scenes.map { it.name }
- sceneRep.findScenes(names).map { it?.name }.ifNotEmpty {
+ sceneRep.findSceneList(names).map { it?.name }.ifNotEmpty {
val str = this.joinToString("锛�")
throw BizException("瀛樺湪閲嶅鍦烘櫙锛屽涓嬶細${str}")
}
@@ -423,7 +423,7 @@
override fun createScene(scense: Scense): Scense {
val names = listOf(scense.name)
- sceneRep.findScenes(names).map { it?.name }.ifNotEmpty {
+ sceneRep.findSceneList(names).map { it?.name }.ifNotEmpty {
val str = this.joinToString("锛�")
throw BizException("瀛樺湪閲嶅鍦烘櫙锛屽涓嬶細${str}")
}
@@ -434,6 +434,7 @@
override fun createOneScene(scense: Scense) {
//1. 鎻掑叆鍦烘櫙琛�
+ scense.townname = scense.townname?.trim()
sceneRep.insert(scense)
//2. 鐢熸垚瀵瑰簲璐︽埛淇℃伅
val userInfo = userinfoService.createAccount(scense)
--
Gitblit v1.9.3