From 105c22b40dc5376175eb15f4fabb04e1471fad48 Mon Sep 17 00:00:00 2001 From: whycxzp <glperry@163.com> Date: 星期四, 12 六月 2025 15:03:23 +0800 Subject: [PATCH] 故障工单和巡检备忘录 --- src/main/java/com/whyc/controller/AlarmInspectionController.java | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/whyc/controller/AlarmInspectionController.java b/src/main/java/com/whyc/controller/AlarmInspectionController.java index 3467b3e..450687d 100644 --- a/src/main/java/com/whyc/controller/AlarmInspectionController.java +++ b/src/main/java/com/whyc/controller/AlarmInspectionController.java @@ -1,14 +1,19 @@ package com.whyc.controller; import com.whyc.dto.Response; +import com.whyc.pojo.web_site.AlarmInspectionResult; import com.whyc.service.AlarmInspectionService; +import com.whyc.util.CommonUtil; +import com.whyc.util.JsonUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.IOException; +import java.util.List; /** * 瑕佸疄鐜板憡璀﹀贰妫�鍗�,鍒涘缓宸℃宸ュ崟琛�. @@ -26,11 +31,18 @@ @Autowired private AlarmInspectionService service; - @ApiOperation(value = "鏌ヨ绔欑偣瀵瑰簲鐨勫贰妫�鍗�",notes = "inspectionType=1琛ㄧず鍛婅绾у埆涓�1鐨勬晠闅滃伐鍗�,inspectionType=2琛ㄧず鍛婅绾у埆涓�2鐨勫贰妫�澶囧繕褰�") + @ApiOperation(value = "鏌ヨ绔欑偣瀵瑰簲鐨勫贰妫�鍗�",notes = "inspectionType=1琛ㄧず鍛婅绾у埆涓�1鐨勬晠闅滃伐鍗�,inspectionType=2琛ㄧず鍛婅绾у埆涓嶄负1鐨勫贰妫�澶囧繕褰�") @GetMapping("getList") - public Response getList(@RequestParam Integer stationId,@RequestParam Integer inspectionType){ + public Response getList(@RequestParam int stationId,@RequestParam int inspectionType){ return service.getList(stationId,inspectionType); } + @PostMapping("submitInspection") + @ApiOperation(value = "鎻愪氦宸℃缁撴灉",notes = "alarmInspectionResultJsonStr濉玧son瀛楃涓�,瀛楁鍖呭惈stationId,stationName,inspectionType,inspectionResult,finishSuggestion") + public Response submitInspection(@RequestPart(value = "file",required = false) List<MultipartFile> file, @RequestParam String alarmInspectionResultJsonStr) throws IOException { + AlarmInspectionResult result = JsonUtil.getGson().fromJson(alarmInspectionResultJsonStr,AlarmInspectionResult.class); + return service.submitInspection(result,file); + } + } -- Gitblit v1.9.1