From b421fde8f3499b638c117cc2cb9a49f260fb3481 Mon Sep 17 00:00:00 2001 From: whycrzg <ruanzhigang@whycst.com> Date: 星期五, 29 一月 2021 16:34:30 +0800 Subject: [PATCH] update --- src/main/java/com/fgkj/controller/Battalarm_dataController.java | 346 ++++++++++++++++++++++++++++++--------------------------- 1 files changed, 182 insertions(+), 164 deletions(-) diff --git a/src/main/java/com/fgkj/controller/Battalarm_dataController.java b/src/main/java/com/fgkj/controller/Battalarm_dataController.java index fca36b9..a5f0271 100644 --- a/src/main/java/com/fgkj/controller/Battalarm_dataController.java +++ b/src/main/java/com/fgkj/controller/Battalarm_dataController.java @@ -3,65 +3,72 @@ import com.fgkj.dto.*; import com.fgkj.services.Battalarm_dataService; import com.fgkj.util.*; +import com.google.gson.Gson; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.Date; import java.util.List; import javax.annotation.Resource; +import javax.annotation.security.PermitAll; @RequestMapping("battAlarmData") @RestController @Api(tags = "battAlarmData鎺ュ彛") -public class Battalarm_dataController{ +public class Battalarm_dataController { - @Resource - private Battalarm_dataService service=new Battalarm_dataService(); + @Resource + private Battalarm_dataService service; - // private Batt_Maint_Dealarm bmd; - // private String bads; - - //3.1鐢垫睜鍛婅瀹炴椂鏌ヨ - @GetMapping("byCondition") - @ApiOperation(notes = "",value="鐢垫睜鍛婅瀹炴椂鏌ヨ") - public ServiceModel serchByCondition(@RequestBody Batt_Maint_Dealarm bmd){ - User_inf uinf=(User_inf) ActionUtil.getUser(); - bmd.setUinf(uinf); - ServiceModel model=service.serchByCondition(bmd); - return model; - } - - //3.2鐢垫睜鍛婅鍘嗗彶璁板綍鏌ヨ - @GetMapping("byInfo") - @ApiOperation(notes = "",value="鐢垫睜鍛婅鍘嗗彶璁板綍鏌ヨ") - public ServiceModel serchByInfo(@RequestBody Batt_Maint_Dealarm bmd){ - // bmd = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(result, Batt_Maint_Dealarm.class); - User_inf uinf=(User_inf) ActionUtil.getUser(); - bmd.setUinf(uinf); - ServiceModel model=service.serchByInfo(bmd); - return model; - } - - //0.5鏌ヨ瀹炴椂鍛婅鏁� - @GetMapping("alm") - @ApiOperation(notes = "",value="鏌ヨ瀹炴椂鍛婅鏁�") - public ServiceModel serchAlm(@RequestBody Batt_Maint_Dealarm bmd){ - User_inf uinf=(User_inf) ActionUtil.getUser(); - bmd.setUinf(uinf); - ServiceModel model=service.serchAlm(bmd); - return model; - } - - //0.10瀹炴椂鍛婅璁板綍鎬绘暟鏌ヨ - @GetMapping("realTime") - @ApiOperation(notes = "",value="瀹炴椂鍛婅璁板綍鎬绘暟鏌ヨ") - public ServiceModel serchRealTime(){ - User_inf uinf=(User_inf) ActionUtil.getUser(); - ServiceModel model=service.serchRealTime(uinf); - return model; - } + // private Batt_Maint_Dealarm bmd; + // private String bads; + + //3.1鐢垫睜鍛婅瀹炴椂鏌ヨ + @PostMapping("byCondition") + @ApiOperation(notes = "binf.stationName1&binf.stationName 妯$硦鏌ヨ { \"binf\": { \"stationName\": \"\", \"stationName1\": \"\", \"battGroupId\": 0 },\"mainf\": { \"num\": 0, \"battGroupId\": 0, \"uname\": \"\", \"fault_level\": 0, \"fault_type_id\": 0, \"record_uid\": 0, \"maint_type_id\": 0, \"maint_done\": 0, \"maint_close\": 0, \"master_audit\": 0, \"appoint_uid\": 0 },\"pageBean\": { \"pageSize\": 10, \"pageNum\": 0 },\"adata\": { \"alm_id\": 0, \"alm_signal_id\": 0, \"alm_start_time\": \"2021-01-29 09:40:11\", \"alm_start_time1\": \"2021-01-29 09:40:11\" } }", value = "鐢垫睜鍛婅瀹炴椂鏌ヨ") + public ServiceModel serchByCondition(@RequestBody Batt_Maint_Dealarm bmd) { + User_inf uinf = (User_inf) ActionUtil.getUser(); + bmd.setUinf(uinf); + ServiceModel model = service.serchByCondition(bmd); + return model; + } + + //3.2鐢垫睜鍛婅鍘嗗彶璁板綍鏌ヨ + @PostMapping("byInfo") + @ApiOperation(notes = "binf.stationName1&binf.stationName 妯$硦鏌ヨ { \"binf\": { \"stationName\": \"\", \"stationName1\": \"\", \"battGroupId\": 0 },\"mainf\": { \"num\": 0, \"battGroupId\": 0, \"fault_level\": 0, \"fault_type_id\": 0, \"record_uid\": 0, \"maint_type_id\": 0, \"maint_done\": 0, \"maint_close\": 0, \"master_audit\": 0, \"appoint_uid\": 0 },\"pageBean\": { \"pageSize\": 10, \"pageNum\": 0 },\"adata\": { \"alm_id\": 0, \"alm_signal_id\": 0, \"alm_start_time\": \"2021-01-29 09:40:11\", \"alm_start_time1\": \"2021-01-29 09:40:11\" } }", value = "鐢垫睜鍛婅鍘嗗彶璁板綍鏌ヨ") + public ServiceModel serchByInfo(@RequestBody Batt_Maint_Dealarm bmd) { + // bmd = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(result, Batt_Maint_Dealarm.class); + User_inf uinf = (User_inf) ActionUtil.getUser(); + bmd.setUinf(uinf); + ServiceModel model = service.serchByInfo(bmd); + return model; + } + + //0.5鏌ヨ瀹炴椂鍛婅鏁� + @PostMapping("alm") + @ApiOperation(notes = "", value = "鏌ヨ瀹炴椂鍛婅鏁�") + public ServiceModel serchAlm(@ApiParam(value = "binf.stationName", required = true) @RequestParam String stationName) { + Batt_Maint_Dealarm bmd = new Batt_Maint_Dealarm(); + User_inf uinf = (User_inf) ActionUtil.getUser(); + bmd.setUinf(uinf); + bmd.setBinf(new BattInf()); + bmd.getBinf().setStationName(stationName); + ServiceModel model = service.serchAlm(bmd); + return model; + } + + //0.10瀹炴椂鍛婅璁板綍鎬绘暟鏌ヨ + @GetMapping("realTime") + @ApiOperation(notes = "", value = "瀹炴椂鍛婅璁板綍鎬绘暟鏌ヨ") + public ServiceModelOnce serchRealTime() { + User_inf uinf = (User_inf) ActionUtil.getUser(); + ServiceModelOnce model = service.serchRealTime(uinf); + return model; + } /*// 3.1鐢垫睜鍛婅瀹炴椂鏌ヨ(纭鍛婅) public ServiceModel update() { @@ -74,18 +81,20 @@ result=ActionUtil.tojson(model); return model; }*/ - // 3.1鐢垫睜鍛婅瀹炴椂鏌ヨ(纭鍛婅) - @PutMapping("/") - @ApiOperation(notes = "",value="鐢垫睜鍛婅瀹炴椂鏌ヨ(纭鍛婅)") - public ServiceModel update(@RequestBody List<Battalarm_data> list) { - /*if(bads!=null && bads.length()>0){ - Gson gson=new Gson(); - List<Battalarm_data> list=gson.fromJson(bads, new TypeToken<List<Battalarm_data>>(){}.getType()); - model=service.updatePro(list); - }*/ - ServiceModel model=service.updatePro(list); - return model; - } + + + // 3.1鐢垫睜鍛婅瀹炴椂鏌ヨ(纭鍛婅) + @PutMapping("/") + @ApiOperation(notes = "[{ \"num\": 1902, \"alm_is_confirmed\": 0, \"alm_confirmed_time\": \"2021-01-29 09:40:11\", \"stationname\": \"st\", \"note\": \"t\" }]", value = "鐢垫睜鍛婅瀹炴椂鏌ヨ(纭鍛婅)") + public ServiceModel update(@RequestBody List<Battalarm_data> list) { + ServiceModel model = new ServiceModel(); + if (list != null && list.size() > 0) { + model = service.updatePro(list); + } else { + model.setCode(0); + } + return model; + } /*// 3.1鐢垫睜鍛婅瀹炴椂鏌ヨ(鍙栨秷鍛婅) public ServiceModel cancelalarm() { ServiceModel model=new ServiceModel(); @@ -97,112 +106,121 @@ result=ActionUtil.tojson(model); return model; }*/ - // 3.1鐢垫睜鍛婅瀹炴椂鏌ヨ(鍙栨秷鍛婅) - @PutMapping("/cancel") - @ApiOperation(notes = "",value="鐢垫睜鍛婅瀹炴椂鏌ヨ(鍙栨秷鍛婅)") - public ServiceModel cancelalarm(@RequestBody List<Battalarm_data> list) { - /*ServiceModel model=new ServiceModel(); - if(bads!=null && bads.length()>0){ - Gson gson=new Gson(); - List<Battalarm_data> list=gson.fromJson(bads, new TypeToken<List<Battalarm_data>>(){}.getType()); - model=service.cancelalarmPro(list); - }*/ - ServiceModel model=service.cancelalarmPro(list); - return model; - } - //3.1/3.2鐢垫睜鍛婅鏌ヨ(鍒犻櫎璁板綍) - @DeleteMapping("/") - @ApiOperation(notes = "",value="鐢垫睜鍛婅鏌ヨ(鍒犻櫎璁板綍)") - public ServiceModel delete(@RequestBody List<Battalarm_data> list) { - /*ServiceModel model=new ServiceModel(); - if(bads!=null && bads.length()>0){ - Gson gson=new Gson(); - List<Battalarm_data> list=gson.fromJson(bads, new TypeToken<List<Battalarm_data>>(){}.getType()); - model=service.delete(list); - }*/ - ServiceModel model=service.delete(list); - return model; - } - - //楗肩姸鍥剧數姹犲崟浣撳仴搴风巼 - @GetMapping("healthRate") - @ApiOperation(notes = "",value="楗肩姸鍥剧數姹犲崟浣撳仴搴风巼") - public ServiceModel serchGood(){ - User_inf uinf=(User_inf) ActionUtil.getUser(); - ServiceModel model = service.serchGood(uinf);//鍗曚綋瀹归噺鍛婅鍜屽崟浣撳憡璀﹀憡璀� - return model; - } - //椤圭洰涓嬫柟鐨勬粴鍔紝鏌ヨ鏈�鏂扮數姹犲憡璀�(鐢垫睜鍛婅鍜岃澶囧憡璀︾瓫閫夊嚭鏈�鏂扮殑涓�鏉�)(鏃х増鏈�) - @GetMapping("topAlm") - @ApiOperation(notes = "",value="椤圭洰涓嬫柟鐨勬粴鍔紝鏌ヨ鏈�鏂扮數姹犲憡璀�(鐢垫睜鍛婅鍜岃澶囧憡璀︾瓫閫夊嚭鏈�鏂扮殑涓�鏉�)(鏃х増鏈�)") - public ServiceModel serchTopAlm(){ - ServiceModel model=service.serchTopAlm(); - return model; - } - - //椤圭洰涓嬫柟鐨勬粴鍔紝鏌ヨ鏈�鏂扮數姹犲憡璀�(鐢垫睜鍛婅鍜岃澶囧憡璀︾瓫閫夊嚭鏈�鏂扮殑浜旀潯) - @GetMapping("topAlmTen") - @ApiOperation(notes = "",value="椤圭洰涓嬫柟鐨勬粴鍔紝鏌ヨ鏈�鏂扮數姹犲憡璀�(鐢垫睜鍛婅鍜岃澶囧憡璀︾瓫閫夊嚭鏈�鏂扮殑浜旀潯)") - public ServiceModel serchTopAlmTen(){ - User_inf uinf=(User_inf) ActionUtil.getUser(); - ServiceModel model=service.serchTopAlmTen(uinf); - return model; - } - - //鐐瑰嚮椤圭洰涓嬫柟鐨勬粴鍔紝鏌ヨ璇ユ潯鍛婅鐨勫疄鏃朵俊鎭� - @GetMapping("battAlarm") - @ApiOperation(notes = "",value="鐐瑰嚮椤圭洰涓嬫柟鐨勬粴鍔紝鏌ヨ璇ユ潯鍛婅鐨勫疄鏃朵俊鎭�") - public ServiceModel serchBatt_alarm(@RequestBody Battalarm_data data){ - // Battalarm_data adata=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Battalarm_data.class); - ServiceModel model=service.serchBatt_alarm(data); - return model; - } - //3.1鐢垫睜鍛婅瀹炴椂鏌ヨ<***********璺ㄥ煙涓撶敤**************> - @GetMapping("byCondition_ky") - @ApiOperation(tags = "璺ㄥ煙", notes = "",value="鐢垫睜鍛婅瀹炴椂鏌ヨ 璺ㄥ煙璁块棶") - public ServiceModel serchByCondition_ky(@RequestBody BattInf binf){ - // BattInf binf=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class); - ServiceModel model=service.serchByCondition_ky(binf); - return model; - } - // 3.1鐢垫睜鍛婅瀹炴椂鏌ヨ(纭鍛婅)<***********璺ㄥ煙涓撶敤**************> - @PutMapping("/ky") - @ApiOperation(tags = "璺ㄥ煙", notes = "",value="鐢垫睜鍛婅瀹炴椂鏌ヨ(纭鍛婅) 璺ㄥ煙涓撶敤") - public ServiceModel update_ky(@RequestBody List<Battalarm_data> list) { - /*ServiceModel model=new ServiceModel(); - if(bads!=null && bads.length()>0){ - Gson gson=new Gson(); - List<Battalarm_data> list=gson.fromJson(bads, new TypeToken<List<Battalarm_data>>(){}.getType()); - model=service.updatePro(list); - }*/ - ServiceModel model=service.updatePro(list); - return model; - } - // 3.1鐢垫睜鍛婅瀹炴椂鏌ヨ(鍙栨秷鍛婅)<***********璺ㄥ煙涓撶敤**************> - @PutMapping("/cancelAlarm_ky") - @ApiOperation(tags = "璺ㄥ煙", notes = "",value="鐢垫睜鍛婅瀹炴椂鏌ヨ(鍙栨秷鍛婅) 璺ㄥ煙涓撶敤") - public ServiceModel cancelalarm_ky(@RequestBody List<Battalarm_data> list) { - /*ServiceModel model=new ServiceModel(); - if(bads!=null && bads.length()>0){ - Gson gson=new Gson(); - List<Battalarm_data> list=gson.fromJson(bads, new TypeToken<List<Battalarm_data>>(){}.getType()); - model=service.cancelalarmPro(list); - }*/ - ServiceModel model=service.cancelalarmPro(list); - return model; - } - //3.1/3.2鐢垫睜鍛婅鏌ヨ(鍒犻櫎璁板綍)<***********璺ㄥ煙涓撶敤**************> - @DeleteMapping("/ky") - @ApiOperation(tags = "璺ㄥ煙", notes = "",value="鐢垫睜鍛婅鏌ヨ(鍒犻櫎璁板綍) 璺ㄥ煙涓撶敤") - public ServiceModel delete_ky(@RequestBody List<Battalarm_data> list) { - /*ServiceModel model=new ServiceModel(); - if(bads!=null && bads.length()>0){ - Gson gson=new Gson(); - List<Battalarm_data> list=gson.fromJson(bads, new TypeToken<List<Battalarm_data>>(){}.getType()); - model=service.delete(list); - }*/ - ServiceModel model=service.delete(list); - return model; - } + + + // 3.1鐢垫睜鍛婅瀹炴椂鏌ヨ(鍙栨秷鍛婅) + @PutMapping("/cancel") + @ApiOperation(notes = "[{ \"num\": 1902, \"record_Id\": 0, \"alm_end_time\": \"2021-01-29 09:40:11\", \"alm_cleared_type\": 0, \"stationname\": \"st\", \"note\": \"t\" }]", value = "鐢垫睜鍛婅瀹炴椂鏌ヨ(鍙栨秷鍛婅)") + public ServiceModel cancelalarm(@RequestBody List<Battalarm_data> list) { + ServiceModel model = new ServiceModel(); + if (list != null && list.size() > 0) { + model = service.cancelalarmPro(list); + } else { + model.setCode(0); + } + return model; + } + + //3.1/3.2鐢垫睜鍛婅鏌ヨ(鍒犻櫎璁板綍) + @DeleteMapping("/") + @ApiOperation(notes = "[{ \"num\": 1902, \"stationname\": \"\", \"note\": \"\" }]", value = "鐢垫睜鍛婅鏌ヨ(鍒犻櫎璁板綍)") + public ServiceModel delete(@RequestBody List<Battalarm_data> list) { + ServiceModel model = new ServiceModel(); + if (list != null && list.size() > 0) { + model = service.delete(list); + } else { + model.setCode(0); + } + return model; + } + + //楗肩姸鍥剧數姹犲崟浣撳仴搴风巼 + @GetMapping("healthRate") + @ApiOperation(notes = "sum:鎬诲崟浣撴暟 data:鍗曚綋瀹归噺鍛婅鍜屽崟浣撳憡璀﹀憡璀�", value = "楗肩姸鍥剧數姹犲崟浣撳仴搴风巼") + public ServiceModelOnce serchGood() { + User_inf uinf = (User_inf) ActionUtil.getUser(); + ServiceModelOnce model = service.serchGood(uinf);//鍗曚綋瀹归噺鍛婅鍜屽崟浣撳憡璀﹀憡璀� + return model; + } + + //椤圭洰涓嬫柟鐨勬粴鍔紝鏌ヨ鏈�鏂扮數姹犲憡璀�(鐢垫睜鍛婅鍜岃澶囧憡璀︾瓫閫夊嚭鏈�鏂扮殑涓�鏉�)(鏃х増鏈�) + @GetMapping("topAlm") + @Deprecated + @ApiOperation(notes = "Deprecated(鏃х増鏈�)", value = "椤圭洰涓嬫柟鐨勬粴鍔紝鏌ヨ鏈�鏂扮數姹犲憡璀�(鐢垫睜鍛婅鍜岃澶囧憡璀︾瓫閫夊嚭鏈�鏂扮殑涓�鏉�)(鏃х増鏈�)") + public ServiceModelOnce serchTopAlm() { +// ServiceModelOnce model=service.serchTopAlm(); + return new ServiceModelOnce(); + } + + //椤圭洰涓嬫柟鐨勬粴鍔紝鏌ヨ鏈�鏂扮數姹犲憡璀�(鐢垫睜鍛婅鍜岃澶囧憡璀︾瓫閫夊嚭鏈�鏂扮殑浜旀潯) + @GetMapping("topAlmTen") + @ApiOperation(notes = "", value = "椤圭洰涓嬫柟鐨勬粴鍔紝鏌ヨ鏈�鏂扮數姹犲憡璀�(鐢垫睜鍛婅鍜岃澶囧憡璀︾瓫閫夊嚭鏈�鏂扮殑浜旀潯)") + public ServiceModel serchTopAlmTen() { + User_inf uinf = (User_inf) ActionUtil.getUser(); + ServiceModel model = service.serchTopAlmTen(uinf); + return model; + } + + //鐐瑰嚮椤圭洰涓嬫柟鐨勬粴鍔紝鏌ヨ璇ユ潯鍛婅鐨勫疄鏃朵俊鎭� + @PostMapping("battAlarm") + @ApiOperation(notes = "", value = "鐐瑰嚮椤圭洰涓嬫柟鐨勬粴鍔紝鏌ヨ璇ユ潯鍛婅鐨勫疄鏃朵俊鎭�") + public ServiceModel serchBatt_alarm(@ApiParam(value = "battGroupId", required = true) @RequestParam Integer battGroupId, @ApiParam(value = "monNum", required = true) @RequestParam Integer monNum, @ApiParam(value = "alm_id", required = true) @RequestParam Integer alm_id, @ApiParam(value = "鍛婅寮�濮嬫椂闂� 鏍煎紡2021/01/1 09:40:11", required = true) @RequestParam Date alm_start_time) { + Battalarm_data data = new Battalarm_data(); + data.setBattGroupId(battGroupId); + data.setMonNum(monNum); + data.setAlm_id(alm_id); + data.setAlm_start_time(alm_start_time); + ServiceModel model = service.serchBatt_alarm(data); + return model; + } + + //3.1鐢垫睜鍛婅瀹炴椂鏌ヨ<***********璺ㄥ煙涓撶敤**************> + @PostMapping("byCondition_ky") + @ApiOperation(tags = "璺ㄥ煙", notes = "", value = "鐢垫睜鍛婅瀹炴椂鏌ヨ 璺ㄥ煙涓撶敤") + public ServiceModel serchByCondition_ky(@RequestParam Integer battGroupId) { + BattInf binf = new BattInf(); + binf.setBattGroupId(battGroupId); + ServiceModel model = service.serchByCondition_ky(binf); + return model; + } + + // 3.1鐢垫睜鍛婅瀹炴椂鏌ヨ(纭鍛婅)<***********璺ㄥ煙涓撶敤**************> + @PutMapping("/ky") + @ApiOperation(tags = "璺ㄥ煙", notes = "[{ \"num\": 1902, \"alm_is_confirmed\": 0, \"alm_confirmed_time\": \"2021-01-29 09:40:11\", \"stationname\": \"st\", \"note\": \"t\" }]", value = "鐢垫睜鍛婅瀹炴椂鏌ヨ(纭鍛婅) 璺ㄥ煙涓撶敤") + public ServiceModel update_ky(@RequestBody List<Battalarm_data> list) { + ServiceModel model = new ServiceModel(); + if (list != null && list.size() > 0) { + model = service.updatePro(list);//鍜寀pdate 鍏辩敤 + } else { + model.setCode(0); + } + return model; + } + + // 3.1鐢垫睜鍛婅瀹炴椂鏌ヨ(鍙栨秷鍛婅)<***********璺ㄥ煙涓撶敤**************> + @PutMapping("/cancelAlarm_ky") + @ApiOperation(tags = "璺ㄥ煙", notes = "[{ \"num\": 1902, \"record_Id\": 0, \"alm_end_time\": \"2021-01-29 09:40:11\", \"alm_cleared_type\": 0, \"stationname\": \"st\", \"note\": \"t\" }]", value = "鐢垫睜鍛婅瀹炴椂鏌ヨ(鍙栨秷鍛婅) 璺ㄥ煙涓撶敤") + public ServiceModel cancelalarm_ky(@RequestBody List<Battalarm_data> list) { + ServiceModel model = new ServiceModel(); + if (list != null && list.size() > 0) { + model = service.cancelalarmPro(list); + } else { + model.setCode(0); + } + return model; + } + + //3.1/3.2鐢垫睜鍛婅鏌ヨ(鍒犻櫎璁板綍)<***********璺ㄥ煙涓撶敤**************> + @DeleteMapping("/ky") + @ApiOperation(tags = "璺ㄥ煙", notes = "[{ \"num\": 1902, \"stationname\": \"\", \"note\": \"\" }]", value = "鐢垫睜鍛婅鏌ヨ(鍒犻櫎璁板綍) 璺ㄥ煙涓撶敤") + public ServiceModel delete_ky(@RequestBody List<Battalarm_data> list) { + ServiceModel model = new ServiceModel(); + if (list != null && list.size() > 0) { + model = service.delete(list); + } else { + model.setCode(0); + } + return model; + } } -- Gitblit v1.9.1