From f75ff7a0fc566dc18b60987b3fa2e65cae4665da Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期三, 30 七月 2025 16:01:41 +0800 Subject: [PATCH] 2025.7.30 1. 新增基础数据产品相关接口(待完成) --- src/main/kotlin/cn/flightfeather/supervision/model/dataproduct/DataProdOption.kt | 38 ++++++++++++ src/main/kotlin/cn/flightfeather/supervision/model/dataproduct/PPListProblemChange.kt | 35 +++++++++++ src/main/kotlin/cn/flightfeather/supervision/model/dataproduct/PPListProbRecurrence.kt | 42 ++++++++++++++ src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DataProductService.kt | 14 ++++ src/main/kotlin/cn/flightfeather/supervision/model/package-info.txt | 5 + 5 files changed, 133 insertions(+), 1 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DataProductService.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DataProductService.kt index c263969..5e99f5f 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DataProductService.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DataProductService.kt @@ -1,7 +1,9 @@ package cn.flightfeather.supervision.lightshare.service import cn.flightfeather.supervision.lightshare.vo.AreaVo -import cn.flightfeather.supervision.lightshare.vo.ExcelConfigVo +import cn.flightfeather.supervision.model.dataproduct.DataProdOption +import cn.flightfeather.supervision.model.dataproduct.PPListProbRecurrence +import cn.flightfeather.supervision.model.dataproduct.PPListProblemChange import javax.servlet.http.HttpServletResponse /** @@ -15,4 +17,14 @@ * 涓嬭浇鏁版嵁浜у搧鎶ュ憡 */ fun downloadProduct(areaVo: AreaVo, type: Int, forceUpdate: Boolean, response: HttpServletResponse): Boolean + + /** + * 闂鏁存敼娓呭崟 + */ + fun problemChangeList(option: DataProdOption): List<PPListProblemChange> + + /** + * 闂澶嶅彂鎯呭喌 + */ + fun problemRecurrence(option: DataProdOption): List<PPListProbRecurrence> } \ No newline at end of file diff --git a/src/main/kotlin/cn/flightfeather/supervision/model/dataproduct/DataProdOption.kt b/src/main/kotlin/cn/flightfeather/supervision/model/dataproduct/DataProdOption.kt new file mode 100644 index 0000000..8167bd6 --- /dev/null +++ b/src/main/kotlin/cn/flightfeather/supervision/model/dataproduct/DataProdOption.kt @@ -0,0 +1,38 @@ +package cn.flightfeather.supervision.model.dataproduct + +import com.fasterxml.jackson.annotation.JsonFormat +import io.swagger.annotations.ApiModelProperty +import java.time.LocalDateTime + +/** + * 鏁版嵁浜у搧绛涢�夋潯浠� + * @date 2025/7/30 + * @author feiyu02 + */ +class DataProdOption { + @ApiModelProperty("鐪佷唤缂栫爜") + var provinceCode: String? = null + + @ApiModelProperty("鍩庡競缂栫爜") + var cityCode: String? = null + + @ApiModelProperty("鍖哄幙缂栫爜") + var districtCode: String? = null + + @ApiModelProperty("琛楅晣缂栫爜") + var townCode: 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 + + @ApiModelProperty("鍦烘櫙涓婚敭id") + var sceneId: String? = null + + @ApiModelProperty("鍦烘櫙绫诲瀷id") + var sceneTypeId: Int? = null +} \ No newline at end of file diff --git a/src/main/kotlin/cn/flightfeather/supervision/model/dataproduct/PPListProbRecurrence.kt b/src/main/kotlin/cn/flightfeather/supervision/model/dataproduct/PPListProbRecurrence.kt new file mode 100644 index 0000000..1013740 --- /dev/null +++ b/src/main/kotlin/cn/flightfeather/supervision/model/dataproduct/PPListProbRecurrence.kt @@ -0,0 +1,42 @@ +package cn.flightfeather.supervision.model.dataproduct + +import cn.flightfeather.supervision.domain.ds1.entity.Scense + +/** + * 鍒濈骇鏁版嵁浜у搧 + * 闂澶嶅彂鎯呭喌 + * @date 2025/7/30 + * @author feiyu02 + */ +class PPListProbRecurrence { + + /** + * 鍦烘櫙淇℃伅 + */ + var scene: Scense? = null + + /** + * 闂绫诲瀷id + */ + var ptGuid: String? = null + + /** + * 闂绫诲瀷鍚嶇О + */ + var pTName: String? = null + + /** + * 闂鍚嶇О + */ + var problemName: String? = null + + /** + * 闂鏁� + */ + var proNum: Int = 0 + + /** + * 鏁存敼鏁� + */ + var changeNum: Int = 0 +} \ No newline at end of file diff --git a/src/main/kotlin/cn/flightfeather/supervision/model/dataproduct/PPListProblemChange.kt b/src/main/kotlin/cn/flightfeather/supervision/model/dataproduct/PPListProblemChange.kt new file mode 100644 index 0000000..d587397 --- /dev/null +++ b/src/main/kotlin/cn/flightfeather/supervision/model/dataproduct/PPListProblemChange.kt @@ -0,0 +1,35 @@ +package cn.flightfeather.supervision.model.dataproduct + +import cn.flightfeather.supervision.domain.ds1.entity.Problemlist +import cn.flightfeather.supervision.domain.ds1.entity.Problemtype +import cn.flightfeather.supervision.domain.ds1.entity.Scense +import cn.flightfeather.supervision.domain.ds1.entity.Subtask + +/** + * 鍒濈骇鏁版嵁浜у搧 + * 鍦烘櫙闂鏁存敼娓呭崟 + * @date 2025/7/30 + * @author feiyu02 + */ +class PPListProblemChange { + + /** + * 闂淇℃伅 + */ + var problem: Problemlist? = null + + /** + * 鍦烘櫙淇℃伅 + */ + var scene: Scense? = null + + /** + * 宸℃煡淇℃伅 + */ + var subTask: Subtask? = null + + /** + * 闂绫诲瀷 + */ + var problemType: Problemtype? = null +} \ No newline at end of file diff --git a/src/main/kotlin/cn/flightfeather/supervision/model/package-info.txt b/src/main/kotlin/cn/flightfeather/supervision/model/package-info.txt new file mode 100644 index 0000000..79ff393 --- /dev/null +++ b/src/main/kotlin/cn/flightfeather/supervision/model/package-info.txt @@ -0,0 +1,5 @@ +鏁版嵁妯″瀷鍖� + +1. dataproduct锛氭暟鎹骇鍝佺浉鍏虫暟鎹ā鍨� + 鏁版嵁浜у搧鍒嗕负鍒濈骇浜у搧銆佷腑绾т骇鍝併�佹渶缁堜骇鍝併�� + 鍒濈骇浜у搧鐨勫懡鍚嶆柟寮忛噰鐢≒rimary Product鐨勭缉鍐橮P寮�澶达紝琛旀帴鏁版嵁褰㈠紡鍒楄〃锛圠ist锛夈�佸浘锛圕hart锛夊崟璇嶏紝鏈�鍚庤鎺ヤ笟鍔″唴瀹癸紱 \ No newline at end of file -- Gitblit v1.9.3