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 ++++++
src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPProblemRecurrence.kt | 5 +
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DomainitemService.kt | 4
src/main/kotlin/cn/flightfeather/supervision/config/RestExceptionHandler.kt | 1
src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPChangeInfo.kt | 24 +++++
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DomainitemServiceImpl.kt | 28 ++++++
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DataProdSingleSceneServiceImpl.kt | 79 +++++++++++++------
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DataProdBaseServiceImpl.kt | 14 +++
src/main/kotlin/cn/flightfeather/supervision/lightshare/web/DomainitemController.kt | 8 +
src/main/kotlin/cn/flightfeather/supervision/lightshare/web/DomaincatalogController.kt | 4
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DomaincatalogService.kt | 4
11 files changed, 157 insertions(+), 44 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/config/RestExceptionHandler.kt b/src/main/kotlin/cn/flightfeather/supervision/config/RestExceptionHandler.kt
index f01b270..8b6421d 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/config/RestExceptionHandler.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/config/RestExceptionHandler.kt
@@ -23,6 +23,7 @@
@ExceptionHandler(Exception::class)
@ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
fun exception(e: Exception): BaseResponse<String> {
+ e.printStackTrace()
return BaseResponse.fail("500", e)
}
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DomaincatalogService.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DomaincatalogService.kt
index 193d7d5..eb03db4 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DomaincatalogService.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DomaincatalogService.kt
@@ -13,9 +13,9 @@
fun findAll(): MutableList<DomaincatalogVo>
- fun save(domaincatalog: Domaincatalog): Int
+ fun save(domaincatalog: Domaincatalog): Domaincatalog
- fun update(domaincatalog: Domaincatalog): Int
+ fun update(domaincatalog: Domaincatalog): Domaincatalog
fun delete(id: String): Int
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DomainitemService.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DomainitemService.kt
index 2ad1c44..d63a9d5 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DomainitemService.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DomainitemService.kt
@@ -9,9 +9,9 @@
fun findAll(): MutableList<DomainitemVo>
- fun save(domainitem: Domainitem): Int
+ fun save(domainitem: Domainitem): Domainitem
- fun update(domainitem: Domainitem): Int
+ fun update(domainitem: Domainitem): Domainitem
fun delete(id: String): Int
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DataProdBaseServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DataProdBaseServiceImpl.kt
index b1d9e32..4fe2ea5 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DataProdBaseServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DataProdBaseServiceImpl.kt
@@ -164,6 +164,20 @@
val res = mutableListOf<DPInspectionInfo>()
val subtaskList = aopDbMapper.subtaskMapper.selectByExample(Example(Subtask::class.java).apply {
createCriteria().andEqualTo("tguid", queryOpt.topTaskId)
+ .andEqualTo("provincecode", queryOpt.provinceCode)
+ .andEqualTo("citycode", queryOpt.cityCode)
+ .andEqualTo("districtcode", queryOpt.districtCode)
+ .apply {
+// queryOpt.topTaskId?.let { topTaskId ->
+// andEqualTo("tguid", topTaskId)
+// }
+ queryOpt.startTime?.let { startTime ->
+ andGreaterThanOrEqualTo("planstarttime", startTime)
+ }
+ queryOpt.endTime?.let { endTime ->
+ andLessThanOrEqualTo("planstarttime", endTime)
+ }
+ }
})
if (subtaskList.isEmpty()) return@queryCache emptyList<DPInspectionInfo>()
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DataProdSingleSceneServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DataProdSingleSceneServiceImpl.kt
index ce3eb0b..00ba68c 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DataProdSingleSceneServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DataProdSingleSceneServiceImpl.kt
@@ -10,7 +10,6 @@
import cn.flightfeather.supervision.lightshare.vo.dataprod.DPChangeInfo
import cn.flightfeather.supervision.lightshare.vo.dataprod.DPProblemRecurrence
import cn.flightfeather.supervision.lightshare.vo.dataprod.QueryOptSingle
-import cn.flightfeather.supervision.lightshare.vo.dataprod.base.DPInspectionInfo
import org.springframework.beans.BeanUtils
import org.springframework.stereotype.Service
import tk.mybatis.mapper.entity.Example
@@ -24,7 +23,7 @@
class DataProdSingleSceneServiceImpl(private val aopDbMapper: AopDbMapper) : DataProdSingleSceneService {
// 鏁存敼瑕佹眰鏈�澶ц�楁椂锛堝ぉ锛�
- private val maxChangeTime = 3
+ private val MAX_CHANGE_TIME = 3
override fun getChangeInfo(option: QueryOptSingle): DPChangeInfo {
return QueryByCache.queryCache(
@@ -41,21 +40,44 @@
})
return@queryCache DPChangeInfo().apply {
subTasks = subtaskList
- problems = problemList.map {problem ->
+ problems = problemList.map { problem ->
val problemListVo = ProblemListVo()
BeanUtils.copyProperties(problem, problemListVo)
problemListVo
}
proCount = problemList.size
- changeCount = problemList.count { it.ischanged == true }
- changePer = if (proCount == 0) 0.0 else changeCount.toDouble() / proCount
- changeTime = problemList
- .filter { it.ischanged == true }
- .maxOf { (it.changedtime?.time?:0L) - (it?.time?.time?:0L) }.toInt()
- .div(1000 * 60 * 60 * 24)
- val eff = if (changeTime == 0) 1.0 else maxChangeTime.toDouble() / changeTime
- changeEfficiency = if (eff > 1.0) 1.0 else eff
+ val changeTimeList = mutableListOf<Long>()
+ problemList.forEach { p ->
+ if (p.ischanged != true) return@forEach
+ // 鏁存敼鑰楁椂锛堝ぉ锛�
+ val day = ((p.changedtime?.time ?: 0L) - (p?.time?.time ?: 0L)).div(1000 * 60 * 60 * 24)
+ changeTimeList.add(day)
+
+ // 鍙婃椂鐜板満鏁存敼
+ if (day <= 1) {
+ immeChangeCount++
+ }
+ // 甯告��/瑙勮寖鏁存敼锛�48灏忔椂鍐呮暣鏀癸級
+ else if (day < MAX_CHANGE_TIME) {
+ normalChangeCount++
+ }
+ // 鏈�缁堟暣鏀�
+ changeCount++
+ }
+ immeChangePer = if (proCount == 0) 0.0 else immeChangeCount.toDouble() / proCount
+ normalChangePer = if (proCount == 0) 0.0 else normalChangeCount.toDouble() / proCount
+ changePer = if (proCount == 0) 0.0 else changeCount.toDouble() / proCount
+
+ if (changeTimeList.isNotEmpty()) {
+ changeTime = changeTimeList.maxOrNull()?.toInt() ?: 0
+ val eff = if (changeTime == 0) 1.0 else MAX_CHANGE_TIME.toDouble() / changeTime
+ changeEfficiency = if (eff > 1.0) 1.0 else eff
+
+ avgChangeTime = changeTimeList.average().toInt()
+ val effAvg = if (avgChangeTime == 0) 1.0 else MAX_CHANGE_TIME.toDouble() / avgChangeTime
+ avgChangeEfficiency = if (effAvg > 1.0) 1.0 else effAvg
+ }
}
}
)
@@ -70,35 +92,38 @@
cache = { return@queryCache null },
calculate = {
val problemList = aopDbMapper.problemlistMapper.selectByExample(Example(Problemlist::class.java).apply {
- createCriteria().andEqualTo("scenseid", option.sceneId)
- .andBetween("planstarttime", option.startTime, option.endTime)
- orderBy("planstarttime").desc()
+ createCriteria().andEqualTo("sguid", option.sceneId)
+ .andBetween("time", option.startTime, option.endTime)
+ orderBy("time").desc()
})
if (problemList.isEmpty()) return@queryCache emptyList()
- val problemTypeList = aopDbMapper.problemtypeMapper.selectByExample(Example(Problemtype::class.java)
- .apply { createCriteria().andIn("guid", problemList.map { it.ptguid }) })
+ val problemTypeList = aopDbMapper.problemtypeMapper.selectByExample(
+ Example(Problemtype::class.java)
+ .apply { createCriteria().andIn("guid", problemList.map { it.ptguid }) })
val problemMap = problemList
.filter {
- val type = problemTypeList.find { type-> type.guid == it.ptguid }
+ val type = problemTypeList.find { type -> type.guid == it.ptguid }
type?.typename != "閬撹矾鎵皹" || type.description == "宸ュ湴鍐呭鏉￠亾璺槑鏄炬偿鐥�/娉ユ碁/绉皹/閬楁拻"
}.groupBy { problem ->
- val type = problemTypeList.find { type-> type.guid == problem.ptguid } ?: return@groupBy null
- /**
- * 2025.10.30 鐩墠鏍规嵁涓氬姟瑕佹眰锛屽湪宸ュ湴绫诲瀷涓紝鈥滈亾璺壃灏樷�濋棶棰樺嚭鐜版鐜囬潪甯搁珮锛�
- * 鍥犳璇ラ棶棰樺湪鍋氶噸澶嶆�х粺璁℃椂锛� 鍙粺璁＄敤鍏跺瓙绫诲瀷"宸ュ湴鍐呭鏉￠亾璺槑鏄炬偿鐥�/娉ユ碁/绉皹/閬楁拻"涓哄垎绫荤被鍨�
- */
- if (type.typename == "閬撹矾鎵皹") {
+ val type = problemTypeList.find { type -> type.guid == problem.ptguid } ?: return@groupBy null
+// /**
+// * 2025.10.30 鐩墠鏍规嵁涓氬姟瑕佹眰锛屽湪宸ュ湴绫诲瀷涓紝鈥滈亾璺壃灏樷�濋棶棰樺嚭鐜版鐜囬潪甯搁珮锛�
+// * 鍥犳璇ラ棶棰樺湪鍋氶噸澶嶆�х粺璁℃椂锛� 鍙粺璁＄敤鍏跺瓙绫诲瀷"宸ュ湴鍐呭鏉￠亾璺槑鏄炬偿鐥�/娉ユ碁/绉皹/閬楁拻"涓哄垎绫荤被鍨�
+// */
+// if (type.typename == "閬撹矾鎵皹") {
+// type.description
+// } else {
+// type.typename
+// }
type.description
- } else {
- type.typename
}
- }
return@queryCache problemMap.map { (key, value) ->
- val type = problemTypeList.find { type-> type.guid == value.first().ptguid }
+ val type = problemTypeList.find { type -> type.guid == value.first().ptguid }
DPProblemRecurrence().apply {
problemTag = key
problemType = type
+ this.problemList = value
count = value.size
changeCount = value.count { it.ischanged == true }
changePer = if (count == 0) 0.0 else changeCount.toDouble() / count
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)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DomainitemServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DomainitemServiceImpl.kt
index 9baf7f1..a560f0b 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DomainitemServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DomainitemServiceImpl.kt
@@ -1,6 +1,8 @@
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.Domainitem
import cn.flightfeather.supervision.domain.ds1.mapper.DomainitemMapper
import cn.flightfeather.supervision.lightshare.service.DomainitemService
@@ -45,7 +47,7 @@
val domainitemVoList = mutableListOf<DomainitemVo>()
val domainitem = Domainitem()
domainitem.dcguid = guid
- val domainitemList = domainitemMapper.select(domainitem)
+ val domainitemList = domainitemMapper.select(domainitem).also { it.sortBy { it1 -> it1.index } }
domainitemList.forEach {
val domainitemVo = DomainitemVo()
BeanUtils.copyProperties(it, domainitemVo)
@@ -74,9 +76,29 @@
return domainitemVoList
}
- override fun save(domainitem: Domainitem): Int = domainitemMapper.insert(domainitem)
+ override fun save(domainitem: Domainitem): Domainitem{
+ if (domainitem.guid == null) {
+ domainitem.guid = UUIDGenerator.generate16ShortUUID()
+ }
+ return if (domainitemMapper.insert(domainitem) == 1) {
+ domainitem
+ } else {
+ throw BizException("鍊煎煙椤规柊澧炲け璐�")
+ }
+ }
- override fun update(domainitem: Domainitem): Int = domainitemMapper.updateByPrimaryKey(domainitem)
+ override fun update(domainitem: Domainitem): Domainitem {
+ // 2025.11.11 鏂板鐗堟湰鍙峰姣旈�昏緫锛岃嫢鏇存柊鐨勯厤缃俊鎭増鏈彿绛変簬鏁版嵁鍘嗗彶鐗堟湰鍙凤紝鎵嶈兘鏇存柊
+ val oldOne = domainitemMapper.selectByPrimaryKey(domainitem.guid)
+ if ((domainitem.remark == oldOne.remark)) {
+ // 鏇存柊鏃讹紝鐗堟湰鍙烽�掑
+ domainitem.remark = domainitem.remark?.toInt()?.plus(1)?.toString() ?: "1"
+ domainitemMapper.updateByPrimaryKey(domainitem)
+ } else {
+ throw BizException("鍊煎煙椤规洿鏂板け璐ワ紝鐗堟湰鍙蜂笉涓�鑷�")
+ }
+ return domainitem
+ }
override fun delete(id: String): Int = domainitemMapper.deleteByPrimaryKey(id)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPChangeInfo.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPChangeInfo.kt
index 385593d..5bede3c 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPChangeInfo.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPChangeInfo.kt
@@ -35,13 +35,25 @@
@ApiModelProperty(value = "闂鍒楄〃")
var problems: List<ProblemListVo>? = null
- @ApiModelProperty(value = "闂鏁�")
+ @ApiModelProperty(value = "鏈�缁堥棶棰樻暟")
var proCount = 0
- @ApiModelProperty(value = "鏁存敼鏁�")
+ @ApiModelProperty(value = "鍙婃椂鐜板満鏁存敼鏁�")
+ var immeChangeCount = 0
+
+ @ApiModelProperty(value = "鍙婃椂鐜板満鏁存敼鐜�")
+ var immeChangePer: Double = 0.0
+
+ @ApiModelProperty(value = "甯告��/瑙勮寖鏁存敼鏁帮紙48灏忔椂鍐呮暣鏀癸級")
+ var normalChangeCount = 0
+
+ @ApiModelProperty(value = "甯告��/瑙勮寖鏁存敼鐜�")
+ var normalChangePer: Double = 0.0
+
+ @ApiModelProperty(value = "鏈�缁堟暣鏀规暟")
var changeCount = 0
- @ApiModelProperty(value = "鏁存敼鐜�")
+ @ApiModelProperty(value = "鏈�缁堟暣鏀圭巼")
var changePer: Double = 0.0
@ApiModelProperty(value = "鏁存敼鑰楁椂锛堝ぉ锛�(鍙栬�楁椂鏈�闀跨殑闂浣滀负鏈�缁堟暣鏀硅�楁椂)")
@@ -50,4 +62,10 @@
// 鏁存敼鏁堢巼 = 鏁存敼瑕佹眰鏈�澶ц�楁椂 / 鏁存敼瀹為檯鑰楁椂
@ApiModelProperty(value = "鏁存敼鏁堢巼")
var changeEfficiency: Double = 0.0
+
+ @ApiModelProperty(value = "骞冲潎鏁存敼鑰楁椂锛堝ぉ锛�")
+ var avgChangeTime: Int = 0
+
+ @ApiModelProperty(value = "骞冲潎鏁存敼鏁堢巼")
+ var avgChangeEfficiency: Double = 0.0
}
\ No newline at end of file
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPProblemRecurrence.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPProblemRecurrence.kt
index d15cbf1..4322865 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPProblemRecurrence.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPProblemRecurrence.kt
@@ -1,6 +1,8 @@
package cn.flightfeather.supervision.lightshare.vo.dataprod
+import cn.flightfeather.supervision.domain.ds1.entity.Problemlist
import cn.flightfeather.supervision.domain.ds1.entity.Problemtype
+import cn.flightfeather.supervision.lightshare.vo.ProblemListVo
import io.swagger.annotations.ApiModelProperty
/**
@@ -16,6 +18,9 @@
@ApiModelProperty(value = "闂绫诲瀷")
var problemType: Problemtype? = null
+ @ApiModelProperty(value = "闂")
+ var problemList: List<Problemlist>? = null
+
@ApiModelProperty(value = "鍑虹幇娆℃暟")
var count = 0
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/DomaincatalogController.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/DomaincatalogController.kt
index 0849d25..6cd60d9 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/DomaincatalogController.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/DomaincatalogController.kt
@@ -16,9 +16,7 @@
fun getAll() = domaincatalogService.findAll()
@PutMapping
- fun add(@RequestBody domaincatalog: Domaincatalog):Int {
- return domaincatalogService.save(domaincatalog)
- }
+ fun add(@RequestBody domaincatalog: Domaincatalog) = domaincatalogService.save(domaincatalog)
@PostMapping
fun update(@RequestBody domaincatalog: Domaincatalog) = domaincatalogService.update(domaincatalog)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/DomainitemController.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/DomainitemController.kt
index cffeb1e..22cffc8 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/DomainitemController.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/DomainitemController.kt
@@ -66,5 +66,11 @@
@GetMapping("/name")
fun getItemByName(
@ApiParam("鍊煎煙鍚嶇О") @RequestParam("name") name:String
- ) = domainitemService.findOneByName(name)
+ ) = domainitemService.findByLogName(name)
+
+ @ApiOperation("鏍规嵁鍊煎煙绫诲埆guid锛岃幏鍙栧叿浣撶殑閫夐」")
+ @GetMapping("/catalogId")
+ fun getItemByCatalogId(
+ @ApiParam("鍊煎煙绫诲埆guid") @RequestParam("catalogId") catalogId:String
+ ) = domainitemService.findByLogID(catalogId)
}
\ No newline at end of file
--
Gitblit v1.9.3