From 351b9a53cb9ecebdf8f79db0117f540d9c42c2a4 Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期二, 23 二月 2021 17:19:23 +0800
Subject: [PATCH] update

---
 src/main/java/com/fgkj/controller/Alarm_paramController.java |   54 ++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/fgkj/controller/Alarm_paramController.java b/src/main/java/com/fgkj/controller/Alarm_paramController.java
index 65addfb..4c372b2 100644
--- a/src/main/java/com/fgkj/controller/Alarm_paramController.java
+++ b/src/main/java/com/fgkj/controller/Alarm_paramController.java
@@ -1,29 +1,45 @@
 package com.fgkj.controller;
 
-import com.fgkj.mapper.UinfDaoFactory;
 import com.fgkj.dto.Alarm_param;
 import com.fgkj.dto.ServiceModel;
 import com.fgkj.dto.User_log;
+import com.fgkj.mapper.UinfDaoFactory;
 import com.fgkj.services.Alarm_paramService;
 import com.fgkj.services.User_logService;
 import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.io.FileUtils;
 import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.io.File;
+import java.io.IOException;
 
 @RequestMapping("alarmParam")
 @RestController
-@Api
+@Api(tags = "alarmParam鎺ュ彛")
 public class Alarm_paramController {
 
-	@Autowired
+	@Resource
 	private Alarm_paramService service;
 
-	@Autowired
+	@Resource
 	private User_logService uservice;
 
 	@PostMapping("/")
+	@ApiOperation(notes = "{\n" +
+			"  \"alm_id\": 0,\n" +
+			"  \"alm_name\": \"\",\n" +
+			"  \"alm_high_coe\": 0.0,\n" +
+			"  \"alm_low_coe\": 0.0,\n" +
+			"  \"alm_high_level\": 0,\n" +
+			"  \"alm_low_level\": 0,\n" +
+			"  \"alm_high_en\": 0,\n" +
+			"  \"alm_low_en\": 0\n" +
+			"}",value="鏂板")
 	public ServiceModel add(@RequestBody Alarm_param param){
-		// Alarm_param param = getGson().fromJson(json, Alarm_param.class);
 		ServiceModel model = service.add(param);
 
 		return model;
@@ -31,8 +47,16 @@
 	
 	//缂栬緫鍙傛暟
 	@PutMapping("/")
+	@ApiOperation(notes = "{\n" +
+			"  \"alm_id\": 0,\n" +
+			"  \"alm_high_coe\": 0.0,\n" +
+			"  \"alm_low_coe\": 0.0,\n" +
+			"  \"alm_high_level\": 0,\n" +
+			"  \"alm_low_level\": 0,\n" +
+			"  \"alm_high_en\": 0,\n" +
+			"  \"alm_low_en\": 0\n" +
+			"}",value="缂栬緫鍙傛暟")
 	public ServiceModel update(@RequestBody Alarm_param param){
-		// Alarm_param param = getGson().fromJson(json, Alarm_param.class);
 		ServiceModel model = service.update(param);
 		{
 			String msg="淇敼"+param.getAlm_name()+"鐨勫弬鏁�";
@@ -44,14 +68,17 @@
 	}
 
 	@DeleteMapping("/")
-	public ServiceModel del(@RequestBody Alarm_param param){
-		// Alarm_param param = getGson().fromJson(json, Alarm_param.class);
+	@ApiOperation(notes = "",value="鍒犻櫎")
+	public ServiceModel del(@NotNull @RequestParam Integer num){
+		Alarm_param param = new Alarm_param();
+		param.setNum(num);
 		ServiceModel model = service.del(param);
 
 		return model;
 	}
 
 	@GetMapping("all")
+	@ApiOperation(notes = "",value="all")
 	public ServiceModel searchAll(){
 		ServiceModel model = service.searchAll();
 
@@ -59,9 +86,12 @@
 	}
 	
 	 //7.1鏍规嵁鍛婅绫诲瀷鏌ュ憡璀﹀弬鏁�
-	@GetMapping("byCondition")
-	public ServiceModel serchByCondition(@RequestBody Alarm_param param){
-		// Alarm_param param = getGson().fromJson(json, Alarm_param.class);
+	@PostMapping("/byCondition")
+	@ApiOperation(notes = "alm_id=1鐢垫睜鍛婅鍙傛暟;alm_id=2瀹归噺/鏇存崲鍛婅鍙傛暟",value="鏍规嵁鍛婅绫诲瀷鏌ュ憡璀﹀弬鏁�")
+	public ServiceModel serchByCondition(@NotNull @RequestParam Integer alm_id){
+//		System.out.println("alm_id = " + alm_id);
+		Alarm_param param =new Alarm_param();
+		param.setAlm_id(alm_id);
 		ServiceModel model = service.serchByCondition(param);
 
 		return model;

--
Gitblit v1.9.1