From a0a525d59f1cb3167a54af9309c8dab162e89005 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期四, 12 六月 2025 19:23:32 +0800
Subject: [PATCH] 优化巡检和维修器件的图片路径
---
src/main/java/com/whyc/controller/AlarmInspectionController.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/whyc/controller/AlarmInspectionController.java b/src/main/java/com/whyc/controller/AlarmInspectionController.java
index e7d672e..2303d2f 100644
--- a/src/main/java/com/whyc/controller/AlarmInspectionController.java
+++ b/src/main/java/com/whyc/controller/AlarmInspectionController.java
@@ -1,21 +1,26 @@
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;
/**
* 瑕佸疄鐜板憡璀﹀贰妫�鍗�,鍒涘缓宸℃宸ュ崟琛�.
* 鍦ㄥ彂鐢熷憡璀︾殑鎯呭喌涓�,鍔犲叆鍒板疄鏃跺贰妫�宸ュ崟琛ㄤ腑
* 鍦ㄧ偣鍑绘煇涓珯鐐圭殑鏃跺��,鑳藉垪鍑烘墍鏈夋湭澶勭悊杩囩殑瀹炴椂宸℃宸ュ崟
* 杩涜宸℃缁撴灉鎻愪氦鐨勬椂鍊�,閫変腑宸插鐞嗙殑宸℃宸ュ崟,瀵归�変腑鐨勫憡璀﹁繘琛屾槸鍚﹀凡缁忔秷澶辩殑鏍￠獙(杩樺瓨鍦ㄥ垯鏃犳硶鎻愪氦宸℃澶勭悊缁撴灉),灏嗗疄鏃跺贰妫�宸ュ崟鐨勭浉鍏宠褰曠Щ鍏ュ埌宸℃宸ュ崟澶勭悊琛�,骞跺垹闄ゅ疄鏃跺伐鍗曞唴鐩稿叧鍐呭
- * TODO 鏈変袱涓畾鏃朵换鍔�:1.鍛婅浜х敓,鍔犲叆鍒板贰妫�瀹炴椂琛�,2.鍛婅鏄惁娑堝け,鍚屾鍒板贰妫�瀹炴椂琛�
+ * 鏈変袱涓畾鏃朵换鍔�:1.鍛婅浜х敓,鍔犲叆鍒板贰妫�瀹炴椂琛�,2.鍛婅鏄惁娑堝け,鍚屾鍒板贰妫�瀹炴椂琛�
*/
@RestController
@@ -26,11 +31,18 @@
@Autowired
private AlarmInspectionService service;
- @ApiOperation("鏌ヨ绔欑偣瀵瑰簲鐨勫贰妫�鍗�")
- @GetMapping("")
- public Response getList(@RequestParam Integer stationId,@RequestParam Integer inspectionType){
+ @ApiOperation(value = "鏌ヨ绔欑偣瀵瑰簲鐨勫贰妫�鍗�",notes = "inspectionType=1琛ㄧず鍛婅绾у埆涓�1鐨勬晠闅滃伐鍗�,inspectionType=2琛ㄧず鍛婅绾у埆涓嶄负1鐨勫贰妫�澶囧繕褰�")
+ @GetMapping("getList")
+ 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