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/App_ParamController.java |   37 ++++++++++++++++++++++---------------
 1 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/fgkj/controller/App_ParamController.java b/src/main/java/com/fgkj/controller/App_ParamController.java
index c426c78..d63e0da 100644
--- a/src/main/java/com/fgkj/controller/App_ParamController.java
+++ b/src/main/java/com/fgkj/controller/App_ParamController.java
@@ -1,36 +1,38 @@
 package com.fgkj.controller;
 
-import com.fgkj.util.*;
-
-import com.fgkj.db.DBUtil1;
+import com.fgkj.config.DatasourceConfig;
 import com.fgkj.dto.App_Param;
 import com.fgkj.dto.ServiceModel;
 import com.fgkj.services.App_ParamService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 @RequestMapping("appParam")
 @RestController
-@Api
+@Api(tags = "appParam鎺ュ彛")
 public class App_ParamController{
-
-	@Autowired
+	@Resource
 	private App_ParamService service;
+	@Autowired
+	private DatasourceConfig datasourceConfig;
 
 	//鏍规嵁discharge/charge/poweroff鏌ヨ
-	@GetMapping("byInfo")
-	public ServiceModel serchByInfo(@RequestBody App_Param param) {
-		// App_Param param = getGson().fromJson(json, App_Param.class);
+	@PostMapping("byInfo")
+	@ApiOperation(notes = "",value="byInfo")
+	public ServiceModel serchByInfo(@RequestParam String param_name) {
+		App_Param param = new App_Param();
+		param.setParam_name(param_name);
 		ServiceModel model = service.serchByInfo(param);
-
 		return model;
 	}
-	
 	//淇敼鍙傛暟
 	@PutMapping("/")
+	@ApiOperation(notes = "[{ \"num\": 1, \"param_value\": 11 }]",value="淇敼鍙傛暟")
 	public ServiceModel update(@RequestBody List<App_Param> params) {
 		// List<App_Param> params = getGson().fromJson(json, new TypeToken<List<App_Param>>(){}.getType());
 		ServiceModel model = service.update(params);
@@ -42,8 +44,11 @@
 	 * @return
 	 */
 	@GetMapping("ip")
-	public ServiceModel seaechIp(){
-		String ip = DBUtil1.getIp();
+	@ApiOperation(notes = "",value="鑾峰彇杩炴帴鏁版嵁搴撶殑ip鍦板潃")
+	public ServiceModel searchIP(){
+		//jdbc:mysql://localhost:3360/db_user?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+		String url = datasourceConfig.getUrl();
+		String ip = url.split("/")[2].split(":")[0];
 		ServiceModel model = new ServiceModel();
 		if(ip != null && ip.length() > 0){
 			model.setCode(1);
@@ -56,13 +61,15 @@
 	}
 	
 	/**
-	 * 璁剧疆鏈嶅姟鍣╥p鍦板潃
+	 * 璁剧疆鏈嶅姟鍣╥p鍦板潃,TODO
 	 * @return
 	 */
 	@PutMapping("ip")
+	@ApiOperation(notes = "璁剧疆鏈嶅姟鍣╥p鍦板潃,TODO",value="璁剧疆鏈嶅姟鍣╥p鍦板潃")
 	public ServiceModel updataIp(@RequestParam String json){
 
-		ServiceModel model = DBUtil1.setIp(json);
+		// ServiceModel model = DBUtil1.setIp(json);
+		ServiceModel model = new ServiceModel();
 
 		return model;
 	}

--
Gitblit v1.9.1