From 9de446b0b83610055437fbc5172d216bb374900f Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 21 十一月 2024 09:22:19 +0800
Subject: [PATCH] 1. 2024.11.21 修复部分bug
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/web/ProblemlistController.kt | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/ProblemlistController.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/ProblemlistController.kt
index 416e7e9..0c01066 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/ProblemlistController.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/ProblemlistController.kt
@@ -6,6 +6,8 @@
import cn.flightfeather.supervision.lightshare.service.ProblemlistService
import cn.flightfeather.supervision.lightshare.service.SubtaskService
import cn.flightfeather.supervision.lightshare.vo.*
+import com.fasterxml.jackson.core.type.TypeReference
+import com.fasterxml.jackson.databind.ObjectMapper
import io.swagger.annotations.Api
import io.swagger.annotations.ApiOperation
import io.swagger.annotations.ApiParam
@@ -46,15 +48,15 @@
fun setDeleteStatus(@PathVariable id: String) = problemlistService.setDeleteStatus(id)
@PostMapping("/add")
- fun addProblem(@RequestBody problemlistVo: ProblemlistVo) {
+ fun addProblem(@RequestBody problemlistVo: ProblemListVo) {
problemlistService.addProblem(problemlistVo)
}
@PostMapping("/getbyarea")
- fun getByArea(@RequestBody areaVo: AreaVo): List<ProblemlistVo> = problemlistService.getByArea(areaVo)
+ fun getByArea(@RequestBody areaVo: AreaVo): List<ProblemListVo> = problemlistService.getByArea(areaVo)
@GetMapping("/getbytoptask")
- fun getByTopTask(@RequestParam(value = "tguid", required = true) tguid: String): List<ProblemlistVo> =
+ fun getByTopTask(@RequestParam(value = "tguid", required = true) tguid: String): List<ProblemListVo> =
problemlistService.getByTopTask(tguid)
@PostMapping("/getStatisticalResult")
@@ -74,7 +76,7 @@
fun getProblemsByScene(
@RequestParam(value = "sceneId", required = true) sceneId: String,
@RequestParam date: String,
- ): List<ProblemlistVo> = problemlistService.getProblemByScene(sceneId, date)
+ ): List<ProblemListVo> = problemlistService.getProblemByScene(sceneId, date)
@GetMapping("/month_anlysis")
fun getMonthProblemsById(
@@ -96,9 +98,20 @@
@ApiOperation(value = "鏂板涓�涓棶棰�", notes = "绠�鍖栦笂浼犳墍闇�闂淇℃伅锛屽皢澶ч儴鍒嗘搷浣滀氦鐢卞悗鍙板畬鎴�")
@PostMapping("/newProblem")
fun newProblem(
- @RequestParam("problemVo") problemVo: String,
- @RequestPart("images") files: Array<MultipartFile>,
+ @ApiParam("闂淇℃伅json") @RequestParam("problemVo") problemVo: String,
+ @ApiParam("闂鍥剧墖") @RequestPart("images") files: Array<MultipartFile>,
) = problemlistService.newProblem(problemVo, files)
+
+ @ApiOperation("鏇存柊涓�涓棶棰�")
+ @PostMapping("/updateProblem")
+ fun updateProblem(
+ @ApiParam("闂淇℃伅json") @RequestParam("problem") problem: String,
+ @ApiParam("鍒犻櫎鐨勯棶棰樺浘鐗噄d") @RequestParam("deleteImg") deleteImg: List<String>,
+ @ApiParam("闂鍥剧墖") @RequestPart("images") images: Array<MultipartFile>,
+ ) = resPack {
+ val problemVo = ObjectMapper().readValue(problem, object : TypeReference<ProblemListVo>() {})
+ problemlistService.updateProblem(problemVo, deleteImg, images)
+ }
@ApiOperation(value = "鏁存敼涓�涓棶棰�", notes = "绠�鍖栦笂浼犳墍闇�闂淇℃伅锛屽皢澶ч儴鍒嗘搷浣滀氦鐢卞悗鍙板畬鎴�")
@PostMapping("/changeProblem")
@@ -106,6 +119,14 @@
@RequestParam("problemId") problemId: String,
@RequestPart("images") files: Array<MultipartFile>,
) = problemlistService.changeProblem(problemId, files)
+
+ @ApiOperation("鏇存柊涓�涓棶棰樻暣鏀�")
+ @PostMapping("/updateChange")
+ fun updateChange(
+ @ApiParam("闂id") @RequestParam problemId: String,
+ @ApiParam("鍒犻櫎鐨勬暣鏀瑰浘鐗噄d") @RequestParam("deleteImg") deleteImg: List<String>,
+ @ApiParam("鏂板鏁存敼鍥剧墖") @RequestPart("images") images: Array<MultipartFile>,
+ ) = resPack { problemlistService.updateChange(problemId, deleteImg, images) }
@ApiOperation(value = "閫氳繃浠诲姟鏌ユ壘闂")
@GetMapping("/subtask")
@@ -125,8 +146,7 @@
@PostMapping("/summary/scene")
fun getSceneProSummary(
@RequestBody areaVo: AreaVo,
- @ApiParam(value = "鎺掑簭瀛楁", allowableValues = "pro, changePer") @RequestParam sortBy: String,
@ApiParam(value = "椤电爜") @RequestParam(value = "page") page: Int,
@ApiParam(value = "鍗曢〉鏁版嵁閲�") @RequestParam(value = "per_page") perPage: Int,
- ) = resPack { problemlistService.getSceneProSummary(areaVo, sortBy, page, perPage) }
+ ) = resPack { problemlistService.getSceneProSummary(areaVo, page, perPage) }
}
\ No newline at end of file
--
Gitblit v1.9.3