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/Batt_devalarm_data_historyController.java | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/fgkj/controller/Batt_devalarm_data_historyController.java b/src/main/java/com/fgkj/controller/Batt_devalarm_data_historyController.java index ef6038f..b217d2e 100644 --- a/src/main/java/com/fgkj/controller/Batt_devalarm_data_historyController.java +++ b/src/main/java/com/fgkj/controller/Batt_devalarm_data_historyController.java @@ -1,28 +1,29 @@ package com.fgkj.controller; -import com.fgkj.util.*; - import com.fgkj.dto.Batt_Maint_Dealarm; import com.fgkj.dto.Batt_devalarm_data_history; import com.fgkj.dto.ServiceModel; import com.fgkj.dto.User_inf; import com.fgkj.services.Batt_devalarm_data_historyService; +import com.fgkj.util.ActionUtil; import io.swagger.annotations.Api; -import org.springframework.beans.factory.annotation.Autowired; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import java.util.List; @RequestMapping("battDevAlarmDataHistory") @RestController -@Api +@Api(tags = "battDevAlarmDataHistory鎺ュ彛") public class Batt_devalarm_data_historyController{ - @Autowired + @Resource private Batt_devalarm_data_historyService service; //3.4璁惧鍛婅鍘嗗彶璁板綍鏌ヨ - @GetMapping("byCondition") + @PostMapping("byCondition") + @ApiOperation(notes = "{ \"pageBean\": { \"pageNum\": 1, \"pageSize\": 3 },\"binf\": { \"stationName\": \"\", \"stationName1\": \"\" },\"adata_H\": { \"alm_start_time\": \"2000-12-15 09:09:57\", \"alm_start_time1\": \"2020-12-15 09:09:57\" } }",value="璁惧鍛婅鍘嗗彶璁板綍鏌ヨ") public ServiceModel serchByCondition(@RequestBody Batt_Maint_Dealarm bmd) { // Batt_Maint_Dealarm bmd = getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_Maint_Dealarm.class); User_inf uinf=(User_inf) ActionUtil.getUser(); @@ -34,6 +35,7 @@ //3.4璁惧鍘嗗彶鍛婅(鍒犻櫎鍛婅)<澶氭暟鎹垹闄�> @DeleteMapping("/") + @ApiOperation(notes = "[{ \"num\":1, \"stationName\":\"\", \"note\":\"\" }]",value="璁惧鍘嗗彶鍛婅(鍒犻櫎鍛婅)<澶氭暟鎹垹闄�>") public ServiceModel deletePro(@RequestBody List<Batt_devalarm_data_history> list) { // List<Batt_devalarm_data_history> list = getGson().fromJson(json,new TypeToken<List<Batt_devalarm_data_history>>(){}.getType()); ServiceModel model = service.deletePro(list); -- Gitblit v1.9.1