From 9cb8d7e0f4ffca386b14a15f8a0aca4d1db23252 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 30 十月 2025 15:58:45 +0800
Subject: [PATCH] 2025.10.30 新增单场景纵向统计接口
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/ScenseService.kt | 4
src/main/kotlin/cn/flightfeather/supervision/lightshare/web/DataProdSingleSceneController.kt | 37 ++++
src/main/kotlin/cn/flightfeather/supervision/domain/ds1/entity/DataProductBase.java | 25 +++
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DataProdSingleSceneService.kt | 28 +++
src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/DataProductRep.kt | 31 +++
pom.xml | 1
src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/base/DPSceneInfo.kt | 2
src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPProblemRecurrence.kt | 27 +++
src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/base/DPEvaluateInfo.kt | 2
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/ScenseServiceImpl.kt | 8
/dev/null | 37 ----
src/main/kotlin/cn/flightfeather/supervision/domain/ds1/entity/DataProductMiddle.java | 25 +++
src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPChangeInfo.kt | 53 ++++++
src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/base/DPInspectionInfo.kt | 2
src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/base/DPMonitorDataInfo.kt | 2
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DataProdSingleSceneServiceImpl.kt | 110 +++++++++++++
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DataProdBaseServiceImpl.kt | 4
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DataProdBaseService.kt | 4
src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/QueryOptSingle.kt | 26 +++
src/main/kotlin/cn/flightfeather/supervision/lightshare/web/DomainitemController.kt | 17 ++
src/main/resources/generator/generatorConfig4ds1.xml | 2
src/main/kotlin/cn/flightfeather/supervision/domain/ds1/entity/DataProductFinal.java | 25 +++
src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/QueryOpt.kt | 2
23 files changed, 425 insertions(+), 49 deletions(-)
diff --git a/pom.xml b/pom.xml
index d60f5ae..ae3ee27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -468,6 +468,7 @@
<artifactId>mapper</artifactId>
<version>3.3.9</version>
</dependency>
+ <!-- 2025.10.17 寮曞叆鑷畾涔夋彃浠讹紝 鐢ㄤ簬鍦ㄧ敓鎴愭暟鎹簱琛ㄦā鍨嬫椂锛岃嚜鍔ㄦ坊鍔爏wagger鐨凘ApiModel娉ㄨВ -->
<dependency>
<groupId>cn.flight.feather.devtool</groupId>
<artifactId>mybatis-plugin</artifactId>
diff --git a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/entity/DataProductBase.java b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/entity/DataProductBase.java
index 94224ec..5212804 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/entity/DataProductBase.java
+++ b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/entity/DataProductBase.java
@@ -73,6 +73,13 @@
private Byte dpbSceneTypeId;
/**
+ * 鏁版嵁浜у搧鐗堟湰鍙凤紝浠�1寮�濮嬬殑鑷劧鏁帮紝鏁板瓧瓒婂ぇ锛岀増鏈秺鏂�
+ */
+ @Column(name = "DPB_Version")
+ @ApiModelProperty(value = "鏁版嵁浜у搧鐗堟湰鍙凤紝浠�1寮�濮嬬殑鑷劧鏁帮紝鏁板瓧瓒婂ぇ锛岀増鏈秺鏂�")
+ private Integer dpbVersion;
+
+ /**
* 鏁版嵁浜у搧鍐呭
*/
@Column(name = "DPB_Content")
@@ -242,6 +249,24 @@
}
/**
+ * 鑾峰彇鏁版嵁浜у搧鐗堟湰鍙凤紝浠�1寮�濮嬬殑鑷劧鏁帮紝鏁板瓧瓒婂ぇ锛岀増鏈秺鏂�
+ *
+ * @return DPB_Version - 鏁版嵁浜у搧鐗堟湰鍙凤紝浠�1寮�濮嬬殑鑷劧鏁帮紝鏁板瓧瓒婂ぇ锛岀増鏈秺鏂�
+ */
+ public Integer getDpbVersion() {
+ return dpbVersion;
+ }
+
+ /**
+ * 璁剧疆鏁版嵁浜у搧鐗堟湰鍙凤紝浠�1寮�濮嬬殑鑷劧鏁帮紝鏁板瓧瓒婂ぇ锛岀増鏈秺鏂�
+ *
+ * @param dpbVersion 鏁版嵁浜у搧鐗堟湰鍙凤紝浠�1寮�濮嬬殑鑷劧鏁帮紝鏁板瓧瓒婂ぇ锛岀増鏈秺鏂�
+ */
+ public void setDpbVersion(Integer dpbVersion) {
+ this.dpbVersion = dpbVersion;
+ }
+
+ /**
* 鑾峰彇鏁版嵁浜у搧鍐呭
*
* @return DPB_Content - 鏁版嵁浜у搧鍐呭
diff --git a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/entity/DataProductFinal.java b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/entity/DataProductFinal.java
index 8e4eafc..b2da23f 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/entity/DataProductFinal.java
+++ b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/entity/DataProductFinal.java
@@ -73,6 +73,13 @@
private Byte dpfSceneTypeId;
/**
+ * 鏁版嵁浜у搧鐗堟湰鍙凤紝浠�1寮�濮嬬殑鑷劧鏁帮紝鏁板瓧瓒婂ぇ锛岀増鏈秺鏂�
+ */
+ @Column(name = "DPF_Version")
+ @ApiModelProperty(value = "鏁版嵁浜у搧鐗堟湰鍙凤紝浠�1寮�濮嬬殑鑷劧鏁帮紝鏁板瓧瓒婂ぇ锛岀増鏈秺鏂�")
+ private Integer dpfVersion;
+
+ /**
* 鏁版嵁浜у搧鍐呭
*/
@Column(name = "DPF_Content")
@@ -242,6 +249,24 @@
}
/**
+ * 鑾峰彇鏁版嵁浜у搧鐗堟湰鍙凤紝浠�1寮�濮嬬殑鑷劧鏁帮紝鏁板瓧瓒婂ぇ锛岀増鏈秺鏂�
+ *
+ * @return DPF_Version - 鏁版嵁浜у搧鐗堟湰鍙凤紝浠�1寮�濮嬬殑鑷劧鏁帮紝鏁板瓧瓒婂ぇ锛岀増鏈秺鏂�
+ */
+ public Integer getDpfVersion() {
+ return dpfVersion;
+ }
+
+ /**
+ * 璁剧疆鏁版嵁浜у搧鐗堟湰鍙凤紝浠�1寮�濮嬬殑鑷劧鏁帮紝鏁板瓧瓒婂ぇ锛岀増鏈秺鏂�
+ *
+ * @param dpfVersion 鏁版嵁浜у搧鐗堟湰鍙凤紝浠�1寮�濮嬬殑鑷劧鏁帮紝鏁板瓧瓒婂ぇ锛岀増鏈秺鏂�
+ */
+ public void setDpfVersion(Integer dpfVersion) {
+ this.dpfVersion = dpfVersion;
+ }
+
+ /**
* 鑾峰彇鏁版嵁浜у搧鍐呭
*
* @return DPF_Content - 鏁版嵁浜у搧鍐呭
diff --git a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/entity/DataProductMiddle.java b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/entity/DataProductMiddle.java
index 339b32e..b57b76e 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/entity/DataProductMiddle.java
+++ b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/entity/DataProductMiddle.java
@@ -73,6 +73,13 @@
private Byte dpmSceneTypeId;
/**
+ * 鏁版嵁浜у搧鐗堟湰鍙凤紝浠�1寮�濮嬬殑鑷劧鏁帮紝鏁板瓧瓒婂ぇ锛岀増鏈秺鏂�
+ */
+ @Column(name = "DPM_Version")
+ @ApiModelProperty(value = "鏁版嵁浜у搧鐗堟湰鍙凤紝浠�1寮�濮嬬殑鑷劧鏁帮紝鏁板瓧瓒婂ぇ锛岀増鏈秺鏂�")
+ private Integer dpmVersion;
+
+ /**
* 鏁版嵁浜у搧鍐呭
*/
@Column(name = "DPM_Content")
@@ -242,6 +249,24 @@
}
/**
+ * 鑾峰彇鏁版嵁浜у搧鐗堟湰鍙凤紝浠�1寮�濮嬬殑鑷劧鏁帮紝鏁板瓧瓒婂ぇ锛岀増鏈秺鏂�
+ *
+ * @return DPM_Version - 鏁版嵁浜у搧鐗堟湰鍙凤紝浠�1寮�濮嬬殑鑷劧鏁帮紝鏁板瓧瓒婂ぇ锛岀増鏈秺鏂�
+ */
+ public Integer getDpmVersion() {
+ return dpmVersion;
+ }
+
+ /**
+ * 璁剧疆鏁版嵁浜у搧鐗堟湰鍙凤紝浠�1寮�濮嬬殑鑷劧鏁帮紝鏁板瓧瓒婂ぇ锛岀増鏈秺鏂�
+ *
+ * @param dpmVersion 鏁版嵁浜у搧鐗堟湰鍙凤紝浠�1寮�濮嬬殑鑷劧鏁帮紝鏁板瓧瓒婂ぇ锛岀増鏈秺鏂�
+ */
+ public void setDpmVersion(Integer dpmVersion) {
+ this.dpmVersion = dpmVersion;
+ }
+
+ /**
* 鑾峰彇鏁版嵁浜у搧鍐呭
*
* @return DPM_Content - 鏁版嵁浜у搧鍐呭
diff --git a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/DataProductRep.kt b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/DataProductRep.kt
new file mode 100644
index 0000000..9d8bb2f
--- /dev/null
+++ b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/DataProductRep.kt
@@ -0,0 +1,31 @@
+package cn.flightfeather.supervision.domain.ds1.repository
+
+import cn.flightfeather.supervision.domain.ds1.mapper.DataProductBaseMapper
+import cn.flightfeather.supervision.domain.ds1.mapper.DataProductFinalMapper
+import cn.flightfeather.supervision.domain.ds1.mapper.DataProductMiddleMapper
+import org.springframework.stereotype.Repository
+
+/**
+ * 鏁版嵁浜у搧鏁版嵁搴撴煡璇�
+ * @date 2025/10/17
+ * @author feiyu02
+ */
+@Repository
+class DataProductRep(
+ private val dataProductBaseMapper: DataProductBaseMapper,
+ private val dataProductMiddleMapper: DataProductMiddleMapper,
+ private val dataProductFinalMapper: DataProductFinalMapper
+) {
+
+
+ /**
+ * 鎻掑叆鏁版嵁浜у搧
+ */
+ fun insertDataProduct() {
+
+ }
+
+ fun selectDataProduct() {
+
+ }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DataProdBaseService.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DataProdBaseService.kt
index 4da47e1..711a685 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DataProdBaseService.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DataProdBaseService.kt
@@ -1,6 +1,10 @@
package cn.flightfeather.supervision.lightshare.service
import cn.flightfeather.supervision.lightshare.vo.dataprod.*
+import cn.flightfeather.supervision.lightshare.vo.dataprod.base.DPEvaluateInfo
+import cn.flightfeather.supervision.lightshare.vo.dataprod.base.DPInspectionInfo
+import cn.flightfeather.supervision.lightshare.vo.dataprod.base.DPMonitorDataInfo
+import cn.flightfeather.supervision.lightshare.vo.dataprod.base.DPSceneInfo
/**
* 鍩虹鏁版嵁浜у搧鏈嶅姟鎺ュ彛
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DataProdSingleSceneService.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DataProdSingleSceneService.kt
new file mode 100644
index 0000000..9430255
--- /dev/null
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DataProdSingleSceneService.kt
@@ -0,0 +1,28 @@
+package cn.flightfeather.supervision.lightshare.service
+
+import cn.flightfeather.supervision.lightshare.vo.dataprod.DPChangeInfo
+import cn.flightfeather.supervision.lightshare.vo.dataprod.DPProblemRecurrence
+import cn.flightfeather.supervision.lightshare.vo.dataprod.QueryOptSingle
+
+/**
+ * 鍗曞満鏅旱鍚戞暟鎹粺璁′骇鍝佹湇鍔℃帴鍙�
+ * @date 2025/10/30
+ * @author feiyu02
+ */
+interface DataProdSingleSceneService {
+
+ /**
+ * 鏁存敼鎯呭喌
+ */
+ fun getChangeInfo(option: QueryOptSingle): DPChangeInfo
+
+ /**
+ * 鎵归噺鏌ヨ鏁存敼鎯呭喌
+ */
+ fun getChangeInfoList(options: List<QueryOptSingle>): List<DPChangeInfo>
+
+ /**
+ * 闂閲嶅鎯呭喌
+ */
+ fun getProblemRecurrence(option: QueryOptSingle): List<DPProblemRecurrence>
+}
\ No newline at end of file
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/ScenseService.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/ScenseService.kt
index a6d5a1d..6c25006 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/ScenseService.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/ScenseService.kt
@@ -38,9 +38,9 @@
fun getSceneByToken(token: String, page: Int? = 1, perPage: Int? = 30): BaseResponse<BaseSearchResultVo>
- fun getSceneDetail(sceneId: String):BaseResponse<SceneDetail>
+ fun getSceneDetail(sceneId: String):SceneDetail
- fun updateSceneDetail(typeId: Int, sceneDetailStr: SceneDetailStr): BaseResponse<String>
+ fun updateSceneDetail(typeId: Int, sceneDetailStr: SceneDetailStr): String
fun searchScene(areaVo: AreaVo, page: Int?, perPage: Int?): BaseResponse<List<Scense>>
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 fe6a7c7..b1d9e32 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
@@ -7,6 +7,10 @@
import cn.flightfeather.supervision.lightshare.service.DataProdBaseService
import cn.flightfeather.supervision.lightshare.vo.ProblemListVo
import cn.flightfeather.supervision.lightshare.vo.dataprod.*
+import cn.flightfeather.supervision.lightshare.vo.dataprod.base.DPEvaluateInfo
+import cn.flightfeather.supervision.lightshare.vo.dataprod.base.DPInspectionInfo
+import cn.flightfeather.supervision.lightshare.vo.dataprod.base.DPMonitorDataInfo
+import cn.flightfeather.supervision.lightshare.vo.dataprod.base.DPSceneInfo
import org.springframework.beans.BeanUtils
import org.springframework.stereotype.Service
import tk.mybatis.mapper.entity.Example
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
new file mode 100644
index 0000000..ce3eb0b
--- /dev/null
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DataProdSingleSceneServiceImpl.kt
@@ -0,0 +1,110 @@
+package cn.flightfeather.supervision.lightshare.service.impl
+
+import cn.flightfeather.supervision.business.autooutput.datasource.AopDbMapper
+import cn.flightfeather.supervision.common.utils.QueryByCache
+import cn.flightfeather.supervision.domain.ds1.entity.Problemlist
+import cn.flightfeather.supervision.domain.ds1.entity.Problemtype
+import cn.flightfeather.supervision.domain.ds1.entity.Subtask
+import cn.flightfeather.supervision.lightshare.service.DataProdSingleSceneService
+import cn.flightfeather.supervision.lightshare.vo.ProblemListVo
+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
+
+/**
+ * 鍗曞満鏅旱鍚戞暟鎹粺璁′骇鍝佹湇鍔″疄鐜扮被
+ * @date 2025/10/30
+ * @author feiyu02
+ */
+@Service
+class DataProdSingleSceneServiceImpl(private val aopDbMapper: AopDbMapper) : DataProdSingleSceneService {
+
+ // 鏁存敼瑕佹眰鏈�澶ц�楁椂锛堝ぉ锛�
+ private val maxChangeTime = 3
+
+ override fun getChangeInfo(option: QueryOptSingle): DPChangeInfo {
+ return QueryByCache.queryCache(
+ cache = { return@queryCache null },
+ calculate = {
+ val subtaskList = aopDbMapper.subtaskMapper.selectByExample(Example(Subtask::class.java).apply {
+ createCriteria().andEqualTo("scenseid", option.sceneId)
+ .andBetween("planstarttime", option.startTime, option.endTime)
+ orderBy("planstarttime").desc()
+ })
+ if (subtaskList.isEmpty()) return@queryCache DPChangeInfo()
+ val problemList = aopDbMapper.problemlistMapper.selectByExample(Example(Problemlist::class.java).apply {
+ createCriteria().andIn("stguid", subtaskList.map { it.stguid })
+ })
+ return@queryCache DPChangeInfo().apply {
+ subTasks = subtaskList
+ 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
+ }
+ }
+ )
+ }
+
+ override fun getChangeInfoList(options: List<QueryOptSingle>): List<DPChangeInfo> {
+ return options.map { getChangeInfo(it) }
+ }
+
+ override fun getProblemRecurrence(option: QueryOptSingle): List<DPProblemRecurrence> {
+ return QueryByCache.queryCache(
+ 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()
+ })
+ if (problemList.isEmpty()) return@queryCache emptyList()
+ 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 }
+ type?.typename != "閬撹矾鎵皹" || type.description == "宸ュ湴鍐呭鏉￠亾璺槑鏄炬偿鐥�/娉ユ碁/绉皹/閬楁拻"
+ }.groupBy { problem ->
+ val type = problemTypeList.find { type-> type.guid == problem.ptguid } ?: return@groupBy null
+ /**
+ * 2025.10.30 鐩墠鏍规嵁涓氬姟瑕佹眰锛屽湪宸ュ湴绫诲瀷涓紝鈥滈亾璺壃灏樷�濋棶棰樺嚭鐜版鐜囬潪甯搁珮锛�
+ * 鍥犳璇ラ棶棰樺湪鍋氶噸澶嶆�х粺璁℃椂锛� 鍙粺璁＄敤鍏跺瓙绫诲瀷"宸ュ湴鍐呭鏉￠亾璺槑鏄炬偿鐥�/娉ユ碁/绉皹/閬楁拻"涓哄垎绫荤被鍨�
+ */
+ if (type.typename == "閬撹矾鎵皹") {
+ type.description
+ } else {
+ type.typename
+ }
+ }
+ return@queryCache problemMap.map { (key, value) ->
+ val type = problemTypeList.find { type-> type.guid == value.first().ptguid }
+ DPProblemRecurrence().apply {
+ problemTag = key
+ problemType = type
+ count = value.size
+ changeCount = value.count { it.ischanged == true }
+ changePer = if (count == 0) 0.0 else changeCount.toDouble() / count
+ }
+ }
+ }
+ )
+ }
+}
\ No newline at end of file
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 c26f05b..41ed227 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
@@ -280,7 +280,7 @@
return BaseResponse(true, "璇锋眰鎴愬姛", data = result)
}
- override fun getSceneDetail(sceneId: String): BaseResponse<SceneDetail> {
+ override fun getSceneDetail(sceneId: String): SceneDetail {
val sceneDetail = SceneDetail()
val scene = sceneRep.findScene(sceneId = sceneId)
@@ -302,10 +302,10 @@
val sceneDevice = sceneDeviceMapper.selectByPrimaryKey(sceneId)
sceneDetail.sceneDevice = sceneDevice
- return BaseResponse(true, data = sceneDetail)
+ return sceneDetail
}
- override fun updateSceneDetail(typeId: Int, sceneDetailStr: SceneDetailStr): BaseResponse<String> {
+ override fun updateSceneDetail(typeId: Int, sceneDetailStr: SceneDetailStr): String {
val result = StringBuilder()
if (sceneDetailStr.scense?.guid != null) {
@@ -380,7 +380,7 @@
result.append("鍦烘櫙鐗规湁淇℃伅${if (isUpdate) "鏇存柊" else "鏂板"}: $r; ")
}
- return BaseResponse(true, data = result.toString())
+ return result.toString()
}
override fun searchScene(areaVo: AreaVo, page: Int?, perPage: Int?): BaseResponse<List<Scense>> {
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
new file mode 100644
index 0000000..385593d
--- /dev/null
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPChangeInfo.kt
@@ -0,0 +1,53 @@
+package cn.flightfeather.supervision.lightshare.vo.dataprod
+
+import cn.flightfeather.supervision.domain.ds1.entity.Subtask
+import cn.flightfeather.supervision.lightshare.vo.ProblemListVo
+import io.swagger.annotations.ApiModel
+import io.swagger.annotations.ApiModelProperty
+import java.time.LocalDateTime
+import java.util.*
+
+/**
+ * 鍦烘櫙鏁存敼鎯呭喌
+ * @date 2025/10/30
+ * @author feiyu02
+ */
+@ApiModel("鍦烘櫙鏁存敼鎯呭喌")
+class DPChangeInfo {
+
+
+// /**
+// * 鏃堕棿鏍囩锛屽彲瀵瑰簲涓嶅悓鐨勭粺璁℃椂闂撮绮掑害锛岀洰鍓嶅父瑙佺殑鏄湀搴︺�佸搴︺�佷换鎰忓涓湀绛�
+// * 渚嬪锛�2025骞�10鏈堛��2025骞寸涓�瀛ｅ害銆�2025骞翠笂鍗婂勾绛�
+// */
+// @ApiModelProperty(value = "鏃堕棿鏍囩锛屽彲瀵瑰簲涓嶅悓鐨勭粺璁℃椂闂撮绮掑害锛岀洰鍓嶅父瑙佺殑鏄湀搴︺�佸搴︺�佷换鎰忓涓湀绛�")
+// var timeTag: String? = null
+//
+// @ApiModelProperty("璧峰鏃堕棿")
+// var startTime: Date? = null
+//
+// @ApiModelProperty("缁撴潫鏃堕棿")
+// var endTime: Date? = null
+
+ @ApiModelProperty(value = "瀛愪换鍔′俊鎭�")
+ var subTasks: List<Subtask>? = null
+
+ @ApiModelProperty(value = "闂鍒楄〃")
+ var problems: List<ProblemListVo>? = null
+
+ @ApiModelProperty(value = "闂鏁�")
+ var proCount = 0
+
+ @ApiModelProperty(value = "鏁存敼鏁�")
+ var changeCount = 0
+
+ @ApiModelProperty(value = "鏁存敼鐜�")
+ var changePer: Double = 0.0
+
+ @ApiModelProperty(value = "鏁存敼鑰楁椂锛堝ぉ锛�(鍙栬�楁椂鏈�闀跨殑闂浣滀负鏈�缁堟暣鏀硅�楁椂)")
+ var changeTime: Int = 0
+
+ // 鏁存敼鏁堢巼 = 鏁存敼瑕佹眰鏈�澶ц�楁椂 / 鏁存敼瀹為檯鑰楁椂
+ @ApiModelProperty(value = "鏁存敼鏁堢巼")
+ var changeEfficiency: 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
new file mode 100644
index 0000000..d15cbf1
--- /dev/null
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPProblemRecurrence.kt
@@ -0,0 +1,27 @@
+package cn.flightfeather.supervision.lightshare.vo.dataprod
+
+import cn.flightfeather.supervision.domain.ds1.entity.Problemtype
+import io.swagger.annotations.ApiModelProperty
+
+/**
+ * 闂閲嶅鎯呭喌
+ * @date 2025/10/30
+ * @author feiyu02
+ */
+class DPProblemRecurrence {
+
+ @ApiModelProperty(value = "闂鏍囩")
+ var problemTag:String? = null
+
+ @ApiModelProperty(value = "闂绫诲瀷")
+ var problemType: Problemtype? = null
+
+ @ApiModelProperty(value = "鍑虹幇娆℃暟")
+ var count = 0
+
+ @ApiModelProperty(value = "鏁存敼鏁�")
+ var changeCount = 0
+
+ @ApiModelProperty(value = "鏁存敼鐜�")
+ var changePer: Double = 0.0
+}
\ No newline at end of file
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/QueryOpt.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/QueryOpt.kt
index 18b3716..11877b8 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/QueryOpt.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/QueryOpt.kt
@@ -1,6 +1,7 @@
package cn.flightfeather.supervision.lightshare.vo.dataprod
import com.fasterxml.jackson.annotation.JsonFormat
+import io.swagger.annotations.ApiModel
import io.swagger.annotations.ApiModelProperty
import java.time.LocalDateTime
@@ -9,6 +10,7 @@
* @date 2025/9/15
* @author feiyu02
*/
+@ApiModel("鏌ヨ鍙傛暟")
class QueryOpt {
@ApiModelProperty("鎬讳换鍔d")
var topTaskId: String? = null
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/QueryOptSingle.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/QueryOptSingle.kt
new file mode 100644
index 0000000..f1527b8
--- /dev/null
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/QueryOptSingle.kt
@@ -0,0 +1,26 @@
+package cn.flightfeather.supervision.lightshare.vo.dataprod
+
+import com.fasterxml.jackson.annotation.JsonFormat
+import io.swagger.annotations.ApiModel
+import io.swagger.annotations.ApiModelProperty
+import java.time.LocalDateTime
+
+/**
+ * 鍗曚釜鍦烘櫙绾靛悜鏁版嵁缁熻浜у搧鏌ヨ鏉′欢
+ * @date 2025/10/30
+ * @author feiyu02
+ */
+@ApiModel("鍗曚釜鍦烘櫙绾靛悜鏁版嵁缁熻浜у搧鏌ヨ鏉′欢")
+class QueryOptSingle {
+
+ @ApiModelProperty("鍦烘櫙id")
+ var sceneId: String? = null
+
+ @ApiModelProperty("璧峰鏃堕棿锛屾牸寮� yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ var startTime: LocalDateTime? = null
+
+ @ApiModelProperty("缁撴潫鏃堕棿锛屾牸寮� yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ var endTime: LocalDateTime? = null
+}
\ No newline at end of file
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPEvaluateInfo.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/base/DPEvaluateInfo.kt
similarity index 92%
rename from src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPEvaluateInfo.kt
rename to src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/base/DPEvaluateInfo.kt
index ec8d71d..b5047f3 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPEvaluateInfo.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/base/DPEvaluateInfo.kt
@@ -1,4 +1,4 @@
-package cn.flightfeather.supervision.lightshare.vo.dataprod
+package cn.flightfeather.supervision.lightshare.vo.dataprod.base
import cn.flightfeather.supervision.domain.ds1.entity.Evaluation
import cn.flightfeather.supervision.domain.ds1.entity.Subtask
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPInspectionInfo.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/base/DPInspectionInfo.kt
similarity index 90%
rename from src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPInspectionInfo.kt
rename to src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/base/DPInspectionInfo.kt
index e562a03..8138313 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPInspectionInfo.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/base/DPInspectionInfo.kt
@@ -1,4 +1,4 @@
-package cn.flightfeather.supervision.lightshare.vo.dataprod
+package cn.flightfeather.supervision.lightshare.vo.dataprod.base
import cn.flightfeather.supervision.domain.ds1.entity.Subtask
import cn.flightfeather.supervision.lightshare.vo.ProblemListVo
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPMonitorDataInfo.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/base/DPMonitorDataInfo.kt
similarity index 89%
rename from src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPMonitorDataInfo.kt
rename to src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/base/DPMonitorDataInfo.kt
index cf13bd2..e1162e3 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPMonitorDataInfo.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/base/DPMonitorDataInfo.kt
@@ -1,4 +1,4 @@
-package cn.flightfeather.supervision.lightshare.vo.dataprod
+package cn.flightfeather.supervision.lightshare.vo.dataprod.base
import cn.flightfeather.supervision.domain.ds1.entity.DustDataResult
import cn.flightfeather.supervision.domain.ds1.entity.Scense
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPSceneInfo.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/base/DPSceneInfo.kt
similarity index 94%
rename from src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPSceneInfo.kt
rename to src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/base/DPSceneInfo.kt
index 4563580..abe3d08 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/DPSceneInfo.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/dataprod/base/DPSceneInfo.kt
@@ -1,4 +1,4 @@
-package cn.flightfeather.supervision.lightshare.vo.dataprod
+package cn.flightfeather.supervision.lightshare.vo.dataprod.base
import cn.flightfeather.supervision.domain.ds1.entity.BaseScene
import cn.flightfeather.supervision.domain.ds1.entity.Scense
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/DataProdSingleSceneController.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/DataProdSingleSceneController.kt
new file mode 100644
index 0000000..6710f49
--- /dev/null
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/DataProdSingleSceneController.kt
@@ -0,0 +1,37 @@
+package cn.flightfeather.supervision.lightshare.web
+
+import cn.flightfeather.supervision.lightshare.service.DataProdSingleSceneService
+import cn.flightfeather.supervision.lightshare.vo.dataprod.QueryOptSingle
+import io.swagger.annotations.Api
+import io.swagger.annotations.ApiOperation
+import io.swagger.annotations.ApiParam
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 鍗曞満鏅旱鍚戞暟鎹粺璁′骇鍝佹帶鍒跺櫒
+ * @date 2025/10/30
+ * @author feiyu02
+ */
+@Api(tags = ["鍗曞満鏅旱鍚戞暟鎹粺璁′骇鍝佺浉鍏矨PI鎺ュ彛"], description = "鍗曞満鏅旱鍚戞暟鎹粺璁′骇鍝佺浉鍏矨PI鎺ュ彛")
+@RestController
+@RequestMapping("/dataProd/singleScene")
+class DataProdSingleSceneController(private val dataProdSingleSceneService: DataProdSingleSceneService) {
+
+ @ApiOperation(value = "鏁存敼鎯呭喌")
+ @PostMapping("/changeInfo/get")
+ fun getChangeInfo(@ApiParam("鏌ヨ鏉′欢") @RequestBody queryOpt: QueryOptSingle) =
+ dataProdSingleSceneService.getChangeInfo(queryOpt)
+
+ @ApiOperation(value = "鎵归噺鏌ヨ鏁存敼鎯呭喌")
+ @PostMapping("/changeInfo/get/list")
+ fun getChangeInfoList(@ApiParam("鏌ヨ鏉′欢") @RequestBody queryOpts: List<QueryOptSingle>) =
+ dataProdSingleSceneService.getChangeInfoList(queryOpts)
+
+ @ApiOperation(value = "闂閲嶅鎯呭喌")
+ @PostMapping("/problemRecurrence/get")
+ fun getProblemRecurrence(@ApiParam("鏌ヨ鏉′欢") @RequestBody queryOpt: QueryOptSingle) =
+ dataProdSingleSceneService.getProblemRecurrence(queryOpt)
+}
\ No newline at end of file
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 c9432f7..cffeb1e 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/DomainitemController.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/DomainitemController.kt
@@ -10,46 +10,61 @@
@Api(tags = ["DomainitemController"], description = "鍊煎煙淇℃伅API鎺ュ彛")
@RestController
-@IgnoreResponseAdvice
@RequestMapping("/domainitem")
class DomainitemController (val domainitemService: DomainitemService) {
+ @IgnoreResponseAdvice
@GetMapping
fun getAll() = domainitemService.findAll()
+ @IgnoreResponseAdvice
@PutMapping
fun add(@RequestBody domainitem: Domainitem) = domainitemService.save(domainitem)
+ @IgnoreResponseAdvice
@PostMapping
fun update(@RequestBody domainitem: Domainitem) = domainitemService.update(domainitem)
+ @IgnoreResponseAdvice
@GetMapping("/{id}")
fun getById(@PathVariable id:String) = domainitemService.findOne(id)
+ @IgnoreResponseAdvice
@DeleteMapping("/{id}")
fun delete (@PathVariable id: String) = domainitemService.delete(id)
+ @IgnoreResponseAdvice
@ApiOperation("鑾峰彇鏌愮被鍦烘櫙鐨勯棶棰樹綅缃�夐」")
@GetMapping("/location")
fun getLocation(
@ApiParam("鍦烘櫙绫诲瀷id") @RequestParam("sceneType") sceneType:Int
) = domainitemService.getLocation(sceneType)
+ @IgnoreResponseAdvice
@ApiOperation("鑾峰彇宸℃煡浠诲姟鐨勭被鍨嬮�夐」")
@GetMapping("/taskType")
fun getTaskType() = domainitemService.getTaskType()
+ @IgnoreResponseAdvice
@ApiOperation("鑾峰彇宸℃煡浠诲姟鐨勬湡闄愮被鍨嬮�夐」")
@GetMapping("/deadlineType")
fun getDeadlineType() = domainitemService.getDeadlineType()
+ @IgnoreResponseAdvice
@ApiOperation("鑾峰彇宸℃煡浠诲姟灞傛绫诲瀷閫夐」")
@GetMapping("/level")
fun getLevelType() = domainitemService.getLevelType()
+ @IgnoreResponseAdvice
@ApiOperation("鏍规嵁鍦烘櫙绫诲瀷鑾峰彇浠绘剰鎷嶇殑绫诲瀷")
@GetMapping("/mediaFileType")
fun getMediaFileType(
@ApiParam("鍦烘櫙绫诲瀷id") @RequestParam("sceneType") sceneType:Int
) = domainitemService.getMediaFileType(sceneType)
+
+ @ApiOperation("鏍规嵁鍊煎煙绫诲埆鍚嶇О锛岃幏鍙栧叿浣撶殑閫夐」")
+ @GetMapping("/name")
+ fun getItemByName(
+ @ApiParam("鍊煎煙鍚嶇О") @RequestParam("name") name:String
+ ) = domainitemService.findOneByName(name)
}
\ No newline at end of file
diff --git a/src/main/resources/generator/generatorConfig4ds1.xml b/src/main/resources/generator/generatorConfig4ds1.xml
index 8c96315..9a0c662 100644
--- a/src/main/resources/generator/generatorConfig4ds1.xml
+++ b/src/main/resources/generator/generatorConfig4ds1.xml
@@ -11,7 +11,7 @@
<property name="javaFileEncoding" value="UTF-8"/>
<property name="beginningDelimiter" value="`"/>
<property name="endingDelimiter" value="`"/>
- <!-- 閰嶇疆鑷畾涔夋敞瑙ｆ彃浠� -->
+ <!-- 閰嶇疆鑷畾涔夋敞瑙ｆ彃浠讹紝鐢ㄤ簬鍦ㄧ敓鎴愭暟鎹簱琛ㄦā鍨嬫椂锛岃嚜鍔ㄦ坊鍔爏wagger鐨凘ApiModel娉ㄨВ -->
<plugin type="cn.flight.feather.devtool.mybatis.plugin.CustomAnnotationPlugin">
<!-- 鍙互鍦ㄨ繖閲屾坊鍔犳彃浠跺睘鎬� -->
</plugin>
diff --git a/src/main/resources/mapper/ds1/DataProductBaseMapper.xml b/src/main/resources/mapper/ds1/DataProductBaseMapper.xml
deleted file mode 100644
index a05eba2..0000000
--- a/src/main/resources/mapper/ds1/DataProductBaseMapper.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.flightfeather.supervision.domain.ds1.mapper.DataProductBaseMapper" >
- <resultMap id="BaseResultMap" type="cn.flightfeather.supervision.domain.ds1.entity.DataProductBase" >
- <!--
- WARNING - @mbg.generated
- -->
- <id column="DPB_Id" property="dpbId" jdbcType="INTEGER" />
- <result column="DPB_Task_Id" property="dpbTaskId" jdbcType="VARCHAR" />
- <result column="DPB_Province_Code" property="dpbProvinceCode" jdbcType="VARCHAR" />
- <result column="DPB_City_Code" property="dpbCityCode" jdbcType="VARCHAR" />
- <result column="DPB_District_Code" property="dpbDistrictCode" jdbcType="VARCHAR" />
- <result column="DPB_Town_Code" property="dpbTownCode" jdbcType="VARCHAR" />
- <result column="DPB_Start_Time" property="dpbStartTime" jdbcType="TIMESTAMP" />
- <result column="DPB_End_Time" property="dpbEndTime" jdbcType="TIMESTAMP" />
- <result column="DPB_Scene_Type_Id" property="dpbSceneTypeId" jdbcType="TINYINT" />
- </resultMap>
- <resultMap id="ResultMapWithBLOBs" type="cn.flightfeather.supervision.domain.ds1.entity.DataProductBase" extends="BaseResultMap" >
- <!--
- WARNING - @mbg.generated
- -->
- <result column="DPB_Content" property="dpbContent" jdbcType="LONGVARCHAR" />
- </resultMap>
- <sql id="Base_Column_List" >
- <!--
- WARNING - @mbg.generated
- -->
- DPB_Id, DPB_Task_Id, DPB_Province_Code, DPB_City_Code, DPB_District_Code, DPB_Town_Code,
- DPB_Start_Time, DPB_End_Time, DPB_Scene_Type_Id
- </sql>
- <sql id="Blob_Column_List" >
- <!--
- WARNING - @mbg.generated
- -->
- DPB_Content
- </sql>
-</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/ds1/DataProductFinalMapper.xml b/src/main/resources/mapper/ds1/DataProductFinalMapper.xml
deleted file mode 100644
index 51f5f52..0000000
--- a/src/main/resources/mapper/ds1/DataProductFinalMapper.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.flightfeather.supervision.domain.ds1.mapper.DataProductFinalMapper" >
- <resultMap id="BaseResultMap" type="cn.flightfeather.supervision.domain.ds1.entity.DataProductFinal" >
- <!--
- WARNING - @mbg.generated
- -->
- <id column="DPF_Id" property="dpfId" jdbcType="INTEGER" />
- <result column="DPF_Task_Id" property="dpfTaskId" jdbcType="VARCHAR" />
- <result column="DPF_Province_Code" property="dpfProvinceCode" jdbcType="VARCHAR" />
- <result column="DPF_City_Code" property="dpfCityCode" jdbcType="VARCHAR" />
- <result column="DPF_District_Code" property="dpfDistrictCode" jdbcType="VARCHAR" />
- <result column="DPF_Town_Code" property="dpfTownCode" jdbcType="VARCHAR" />
- <result column="DPF_Start_Time" property="dpfStartTime" jdbcType="TIMESTAMP" />
- <result column="DPF_End_Time" property="dpfEndTime" jdbcType="TIMESTAMP" />
- <result column="DPF_Scene_Type_Id" property="dpfSceneTypeId" jdbcType="TINYINT" />
- </resultMap>
- <resultMap id="ResultMapWithBLOBs" type="cn.flightfeather.supervision.domain.ds1.entity.DataProductFinal" extends="BaseResultMap" >
- <!--
- WARNING - @mbg.generated
- -->
- <result column="DPF_Content" property="dpfContent" jdbcType="LONGVARCHAR" />
- </resultMap>
- <sql id="Base_Column_List" >
- <!--
- WARNING - @mbg.generated
- -->
- DPF_Id, DPF_Task_Id, DPF_Province_Code, DPF_City_Code, DPF_District_Code, DPF_Town_Code,
- DPF_Start_Time, DPF_End_Time, DPF_Scene_Type_Id
- </sql>
- <sql id="Blob_Column_List" >
- <!--
- WARNING - @mbg.generated
- -->
- DPF_Content
- </sql>
-</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/ds1/DataProductMiddleMapper.xml b/src/main/resources/mapper/ds1/DataProductMiddleMapper.xml
deleted file mode 100644
index 4dcfd85..0000000
--- a/src/main/resources/mapper/ds1/DataProductMiddleMapper.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.flightfeather.supervision.domain.ds1.mapper.DataProductMiddleMapper" >
- <resultMap id="BaseResultMap" type="cn.flightfeather.supervision.domain.ds1.entity.DataProductMiddle" >
- <!--
- WARNING - @mbg.generated
- -->
- <id column="DPM_Id" property="dpmId" jdbcType="INTEGER" />
- <result column="DPM_Task_Id" property="dpmTaskId" jdbcType="VARCHAR" />
- <result column="DPM_Province_Code" property="dpmProvinceCode" jdbcType="VARCHAR" />
- <result column="DPM_City_Code" property="dpmCityCode" jdbcType="VARCHAR" />
- <result column="DPM_District_Code" property="dpmDistrictCode" jdbcType="VARCHAR" />
- <result column="DPM_Town_Code" property="dpmTownCode" jdbcType="VARCHAR" />
- <result column="DPM_Start_Time" property="dpmStartTime" jdbcType="TIMESTAMP" />
- <result column="DPM_End_Time" property="dpmEndTime" jdbcType="TIMESTAMP" />
- <result column="DPM_Scene_Type_Id" property="dpmSceneTypeId" jdbcType="TINYINT" />
- </resultMap>
- <resultMap id="ResultMapWithBLOBs" type="cn.flightfeather.supervision.domain.ds1.entity.DataProductMiddle" extends="BaseResultMap" >
- <!--
- WARNING - @mbg.generated
- -->
- <result column="DPM_Content" property="dpmContent" jdbcType="LONGVARCHAR" />
- </resultMap>
- <sql id="Base_Column_List" >
- <!--
- WARNING - @mbg.generated
- -->
- DPM_Id, DPM_Task_Id, DPM_Province_Code, DPM_City_Code, DPM_District_Code, DPM_Town_Code,
- DPM_Start_Time, DPM_End_Time, DPM_Scene_Type_Id
- </sql>
- <sql id="Blob_Column_List" >
- <!--
- WARNING - @mbg.generated
- -->
- DPM_Content
- </sql>
-</mapper>
\ No newline at end of file
--
Gitblit v1.9.3