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/BattInfController.java | 395 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 267 insertions(+), 128 deletions(-)
diff --git a/src/main/java/com/fgkj/controller/BattInfController.java b/src/main/java/com/fgkj/controller/BattInfController.java
index fd5ce85..355b07a 100644
--- a/src/main/java/com/fgkj/controller/BattInfController.java
+++ b/src/main/java/com/fgkj/controller/BattInfController.java
@@ -5,12 +5,15 @@
import com.fgkj.util.ActionUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+import com.sun.xml.internal.bind.v2.TODO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
@RequestMapping("battInf")
@@ -21,50 +24,59 @@
@Resource
private BattInfServices service;
- // private BattInf bif;
- // private Batt_maintenance_inf bmaif;
- // private Batttestdata_inf btdif;
- // private User_inf uinf;
- //private Battalarm_data bdata;
-
//娣诲姞鏂扮殑鐢垫睜缁�
@PostMapping("/")
- @ApiOperation(notes = "",value="娣诲姞鏂扮殑鐢垫睜缁�")
+ @ApiOperation(notes = "TODO 鏈畬鎴�",value="娣诲姞鏂扮殑鐢垫睜缁�")
public ServiceModel add(@RequestBody List<BattInf> list) {
- // List<BattInf> list= getGson("yyyy-MM-dd").fromJson(json, new TypeToken<List<BattInf>>(){}.getType());
return service.add(list);
}
+
+
//淇敼鐢垫睜缁勪俊鎭�
@PutMapping("/")
- @ApiOperation(notes = "",value="淇敼鐢垫睜缁勪俊鎭�")
+ @ApiOperation(notes = "[{ \"stationId\": \"1000023\", \"stationName\": \"tt\", \"stationName1\": \"t1\", \"stationName2\": \"t2\", \"stationName3\": \"t3\", \"stationName4\": \"t4\", \"stationName5\": \"t5\", \"stationName6\": \"\", \"stationName7\": \"\", \"stationName8\": \"\", \"stationName9\": \"\", \"stationIp\": \"1\", \"fbsDeviceId\": 0, \"fbsDeviceIp\": \"127.0.0.1\", \"fbsDeviceIp_WG\": \"t\", \"fbsDeviceName\": \"t\", \"groupIndexInFBSDevice\": 0, \"battModel\": \"\", \"battGroupId\": 1000023, \"battGroupNum\": 0, \"battGroupName\": \"t\", \"floatVolLevel\": 0.0, \"offlineVolLevel\": 0.0, \"battFloatCurrent\": 0.0, \"deviceId\": \"\", \"deviceName\": \"\", \"monCount\": 0, \"monCapStd\": 0.0, \"monResStd\": 0.0, \"monSerStd\": 0.0, \"monTmpStd\": 0.0, \"monVolStd\": 0.0, \"monVolLowToAvg\": 0.0, \"battProducer\": \"\", \"battProductDate\": \"2020-12-31 11:52:56\", \"battProductDate1\": \"2020-12-31 11:52:56\", \"battInUseDate\": \"2020-12-31 11:52:56\", \"load_curr\": 0.0, \"disCurrMax\": 0.0, \"station_phone\": \"\", \"stationId_ex\": \"\", \"videoOrImage\": \"\", \"vol_grade\": 0.0, \"manufacturers\": \"\", \"assetequipment\": \"\", \"deviceclasspath\": \"\", \"deviceoperationdepartment\": \"\", \"propertyRightUnit\": \"\", \"propertyAttribute\": \"\", \"factoryNumber\": \"\", \"operationTeam\": \"\", \"deviceIdentityCode\": \"\", \"projectType\": \"\", \"batteryApplicationType\": \"\", \"singleRatedVoltage\": 0.0, \"remoteMonitor\": \"\", \"batttIndependentPlaced\": \"\", \"junChargeVoltageValue\": 0.0 }]",value="淇敼鐢垫睜缁勪俊鎭�")
public ServiceModel update(@RequestBody List<BattInf> list) {
// List<BattInf> list= getGson("yyyy-MM-dd").fromJson(json, new TypeToken<List<BattInf>>(){}.getType());
return service.update(list);
}
+
+
//淇敼鐢垫睜淇℃伅閰嶇疆(ip鍦板潃,鎺╃爜鍜岀綉鍏�)
@PostMapping("/ip")
@ApiOperation(notes = "",value="淇敼鐢垫睜淇℃伅閰嶇疆(ip鍦板潃,鎺╃爜鍜岀綉鍏�)")
- public ServiceModel updateIp(@RequestBody BattInf binf) {
- // BattInf binf= getGson("yyyy-MM-dd").fromJson(json, BattInf.class);
- //System.out.println(binf);
-
+ public ServiceModel updateIp(@RequestParam String fbsDeviceIp,@RequestParam String fbsDeviceIp_YM,@RequestParam String fbsDeviceIp_WG,@RequestParam Integer fbsDeviceId) {
+ BattInf binf= new BattInf();
+ binf.setFbsDeviceIp(fbsDeviceIp);
+ binf.setFbsDeviceIp_YM(fbsDeviceIp_YM);
+ binf.setFbsDeviceIp_WG(fbsDeviceIp_WG);
+ binf.setFbsDeviceId(fbsDeviceId);
return service.updateIp(binf);
}
- //鍒犻櫎鐢垫睜缁�
- @DeleteMapping("/")
- @ApiOperation(notes = "",value="鍒犻櫎鐢垫睜缁�")
- public ServiceModel delete(@RequestBody List<BattInf> list) {
- // List<BattInf> list= getGson("yyyy-MM-dd").fromJson(json, new TypeToken<List<BattInf>>(){}.getType());
+
+ //鍒犻櫎鐢垫睜缁� stationName鏃ュ織璁板綍浣跨敤
+ @DeleteMapping("/")
+ @ApiOperation(notes = "[{ \"battGroupId\": 1000021, \"stationName\": \"test\" }]",value="鍒犻櫎鐢垫睜缁�")
+ public ServiceModel delete(@RequestBody List<BattInf> list) {
return service.delete(list);
}
//鏍规嵁缁存姢鍖哄拰鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁勪俊鎭�
- @GetMapping("inform")
- @ApiOperation(notes = "",value="缁存姢鍖哄拰鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁勪俊鎭�")
- public ServiceModel searchInform(@RequestBody Batt_Maint_Dealarm bmd) {
- // Batt_Maint_Dealarm bmd = getGson().fromJson(json, Batt_Maint_Dealarm.class);
-
+ @PostMapping("inform")
+ @ApiOperation(notes = "stationName1銆�2銆�3銆�5 涓烘ā绯婃煡璇㈡潯浠�",value="缁存姢鍖哄拰鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁勪俊鎭�")
+ public ServiceModel searchInform(@ApiParam(value = "鐪�",required = true) @RequestParam String stationName1, @ApiParam(value = "甯�",required = true)@RequestParam String stationName2, @ApiParam(value = "鍖�",required = true)@RequestParam String stationName5, @ApiParam(value = "鏈烘埧",required = true)@RequestParam String stationName3, @ApiParam(value = "椤电爜",required = true)@RequestParam Integer pageNum, @ApiParam(value = "椤甸潰鏁伴噺",required = true)@RequestParam Integer pageSize) {
+ Batt_Maint_Dealarm bmd = new Batt_Maint_Dealarm();
+ bmd.setBinf(new BattInf());
+ BattInf battInf = new BattInf();
+ battInf.setStationName1(stationName1);
+ battInf.setStationName2(stationName2);
+ battInf.setStationName3(stationName3);
+ battInf.setStationName5(stationName5);
+ PageBean pageBean = new PageBean();
+ pageBean.setPageSize(pageSize);
+ pageBean.setPageNum(pageNum);
+ bmd.setPageBean(pageBean);
+ bmd.setBinf(battInf);
return service.searchInform(bmd);
}
//娣诲姞绔欑偣鏃惰繑鍥炴渶澶х殑鏈烘埧id,璁惧id,鐢垫睜缁刬d
@@ -75,14 +87,16 @@
return service.searchmaxId();
}
- @GetMapping("byCondition")
+ @PostMapping("byCondition")
@ApiOperation(notes = "鏌apstdolstd/moncount/serstd",value="battgroupid鏌ユ満鎴垮悕绉板拰鐢垫睜缁勫悕绉�")
- public ServiceModelOnce serchByCondition(@RequestBody BattInf bif) {
+ public ServiceModelOnce serchByCondition(@RequestParam Integer battGroupId) {
+ BattInf bif =new BattInf();
+ bif.setBattGroupId(battGroupId);
return service.serchByCondition(bif);
}
@GetMapping("all")
- @ApiOperation(notes = "",value="all")
+ @ApiOperation(notes = "鏌ユ墍鏈夌殑鐢垫睜缁�",value="all")
public ServiceModel searchAll() {
return service.searchAll();
}
@@ -94,13 +108,24 @@
}*/
//鏍规嵁鐢垫睜id鏌ヨ鐢垫睜鐨勫熀鏈俊鎭�
- @GetMapping("byBattGroupId")
+ @PostMapping("searchBattBybattgroupId")
@ApiOperation(notes = "",value="鐢垫睜id鏌ヨ鐢垫睜鐨勫熀鏈俊鎭�")
- public ServiceModel searchBattBybattgroupid(@RequestBody BattInf bif){
+ public ServiceModel searchBattBybattgroupid(@RequestParam Integer battGroupId) {
+ BattInf bif = new BattInf();
+ bif.setBattGroupId(battGroupId);
return service.searchBattBybattgroupid(bif);
}
-
+
+ @PostMapping("findByBattGroupId")
+ @ApiOperation(notes = "",value="findByBattGroupId")
+ public ServiceModel findByBattGroupId(@RequestParam Integer battGroupId){
+ BattInf binf = new BattInf();
+ binf.setBattGroupId(battGroupId);
+ ServiceModel model=service.findByBattGroupId(binf);
+ return model;
+ }
+
//鏌ヨ鍑哄綋鍓嶅瓨鍦ㄥ唴瀛樹腑鏈�澶х殑璁惧鐨刬d(寰堥噸瑕�**********)
@GetMapping("maxDevId")
@ApiOperation(notes = "",value="鏌ヨ鍑哄綋鍓嶅瓨鍦ㄥ唴瀛樹腑鏈�澶х殑璁惧鐨刬d(寰堥噸瑕�**********)")
@@ -109,26 +134,35 @@
}
//----------鏍规嵁StationName1锛堢淮鎶ゅ尯锛� 鏌ヤ笉閲嶅鐨凚attGroupName锛堣搫鐢垫睜缁勶級
- @GetMapping("byStationName1")
- @ApiOperation(notes = "",value="StationName1锛堢淮鎶ゅ尯锛� 鏌ヤ笉閲嶅鐨凚attGroupName锛堣搫鐢垫睜缁勶級")
- public ServiceModelOnce serchByStationName1(@RequestBody BattInf bif){
+ @PostMapping("byStationName1")
+ @ApiOperation(notes = "stationName1濡傛灉鏃犲�间紶String绫诲瀷鐨刵ull锛屽簳灞傛煡璇笉鍚�",value="StationName1锛堢淮鎶ゅ尯锛� 鏌ヤ笉閲嶅鐨凚attGroupName锛堣搫鐢垫睜缁勶級")
+ public ServiceModelOnce serchByStationName1(@ApiParam(value = "缁存姢鍖�",required = false) @RequestParam String stationName1){
+ BattInf bif = new BattInf();
+// System.out.println("bif ---= " + bif);
+ if (stationName1!=null&&!stationName1.equals("null")) {
+ bif.setStationName1(stationName1);
+ }
return service.serchByStationName1(bif);
}
//----------鏍规嵁StationName1锛堢淮鎶ゅ尯锛� 鏌ヤ笉閲嶅鐨凷tationName锛堢珯鐐癸級
- @GetMapping("byStationName")
+ @PostMapping("byStationName")
@ApiOperation(notes = "",value="StationName1锛堢淮鎶ゅ尯锛� 鏌ヤ笉閲嶅鐨凷tationName锛堢珯鐐癸級")
- public ServiceModelOnce serchByStationName(@RequestBody BattInf bif){
+ public ServiceModelOnce serchByStationName(@RequestParam String stationName1) {
+ BattInf bif = new BattInf();
+ bif.setStationName1(stationName1);
return service.serchByStationName(bif);
}
//----------鏍规嵁StationName1锛堢淮鎶ゅ尯锛� 鏌ヤ笉閲嶅鐨凷tationName锛堢珯鐐癸級涓嶅寘鍚�91000000涓�鏈熻澶�
- @GetMapping("byStationNameWithout91")
+ @PostMapping("byStationNameWithout91")
@ApiOperation(notes = "",value="StationName1锛堢淮鎶ゅ尯锛� 鏌ヤ笉閲嶅鐨凷tationName锛堢珯鐐癸級涓嶅寘鍚�91000000涓�鏈熻澶�")
- public ServiceModelOnce serchByStationNameNot91(@RequestBody BattInf bif){
+ public ServiceModelOnce serchByStationNameNot91(@ApiParam(value = "鐪�",required = true) @RequestParam String stationName1) {
+ BattInf bif = new BattInf();
+ bif.setStationName1(stationName1);
return service.serchByStationNameNot91(bif);
}
//--鏌ヤ笉閲嶅鐨凷tationName1锛堢淮鎶ゅ尯锛�
@GetMapping("byStation")
- @ApiOperation(notes = "",value="鏌ヤ笉閲嶅鐨凷tationName1锛堢淮鎶ゅ尯锛�")
+ @ApiOperation(notes = "sum 闆嗗悎闀垮害",value="鏌ヤ笉閲嶅鐨凷tationName1锛堢淮鎶ゅ尯锛�")
public ServiceModelOnce serchByStation(){
return service.serchByStation();
}
@@ -140,50 +174,65 @@
}
//-----------鏌ヨ鎵�鏈夌殑鐪佷唤
@GetMapping("allStationName1")
- @ApiOperation(notes = "",value="鏌ヨ鎵�鏈夌殑鐪佷唤")
+ @ApiOperation(notes = "闇�瑕乻ession涓殑uId",value="鏌ヨ鎵�鏈夌殑鐪佷唤")
public ServiceModel serchAllStationName1(){
User_inf uinf=(User_inf) ActionUtil.getUser();
return service.serchAllStationName1(uinf);
}
// ----------鏌ヨ鎵�鏈夌殑甯�
- @GetMapping("allStationName2")
- @ApiOperation(notes = "",value="鏌ヨ鎵�鏈夌殑甯�")
- public ServiceModel serchAllStationName2(@RequestBody BattInf binf){
+ @PostMapping("allStationName2")
+ @ApiOperation(notes = "妯＄硦鏌ヨ",value="鏌ヨ鎵�鏈夌殑甯�")
+ public ServiceModel serchAllStationName2(@ApiParam(value = "鐪�",required = true) @RequestParam String stationName1) {
+ BattInf binf = new BattInf();
User_inf uinf=(User_inf) ActionUtil.getUser();
binf.setNum(uinf.getuId());
+ binf.setStationName1(stationName1);
return service.serchAllStationName2(binf);
}
//--鏌ヨ鎵�鏈夌殑鍖哄幙
- @GetMapping("allStationName5")
+ @PostMapping("allStationName5")
@ApiOperation(notes = "",value="鏌ヨ鎵�鏈夌殑鍖哄幙")
- public ServiceModel serchAllStationName5(@RequestBody BattInf binf){
- User_inf uinf=(User_inf) ActionUtil.getUser();
+ public ServiceModel serchAllStationName5(@ApiParam(value = "鐪�",required = true) @RequestParam String stationName1,@ApiParam(value = "甯�",required = true) @RequestParam String stationName2) {
+ BattInf binf = new BattInf();
+ User_inf uinf = (User_inf) ActionUtil.getUser();
binf.setNum(uinf.getuId());
+ binf.setStationName1(stationName1);
+ binf.setStationName2(stationName2);
return service.serchAllStationName5(binf);
}
//--鏌ヨ鎵�鏈夌殑鏈烘埧
- @GetMapping("allStationName")
- @ApiOperation(notes = "",value="鏌ヨ鎵�鏈夌殑鏈烘埧")
- public ServiceModel serchAllStationName(@RequestBody BattInf binf){
- User_inf uinf=(User_inf) ActionUtil.getUser();
+ @PostMapping("allStationName")
+ @ApiOperation(notes = "",value="鏌ヨ鎵�鏈夌殑鏈烘埧鈥斿甫鍙�")
+ public ServiceModel serchAllStationName(@ApiParam(value = "鐪�",required = true) @RequestParam String stationName1,@ApiParam(value = "甯�",required = true) @RequestParam String stationName2,@ApiParam(value = "鍖�",required = true) @RequestParam String stationName5) {
+ BattInf binf = new BattInf();
+ User_inf uinf = (User_inf) ActionUtil.getUser();
binf.setNum(uinf.getuId());
+ binf.setStationName1(stationName1);
+ binf.setStationName2(stationName2);
+ binf.setStationName5(stationName5);
return service.serchAllStationName(binf);
}
//--鏌ヨ鐢垫睜缁勪俊鎭�
- @GetMapping("allBattInf")
- @ApiOperation(notes = "",value="鏌ヨ鐢垫睜缁勪俊鎭�")
- public ServiceModel serchAllBattinf(@RequestBody BattInf binf){
-
+ @PostMapping("allBattInf")
+ @ApiOperation(notes = "鍙傛暟s1銆乻2銆乻5 妯＄硦鏌ヨ鍙傛暟",value="鏌ヨ鐢垫睜缁勪俊鎭�")
+ public ServiceModel serchAllBattinf(@ApiParam(value = "鐪�",required = true) @RequestParam String stationName1,@ApiParam(value = "甯�",required = true) @RequestParam String stationName2,@ApiParam(value = "鍖�",required = true) @RequestParam String stationName5,@ApiParam(value = "鏈烘埧",required = true) @RequestParam String stationName3) {
+ BattInf binf = new BattInf();
+ binf.setStationName1(stationName1);
+ binf.setStationName2(stationName2);
+ binf.setStationName5(stationName5);
+ binf.setStationName3(stationName3);
return service.serchAllBattinf(binf);
}
//----------鏍规嵁StationName锛堢珯鐐癸級 鏌ヤ笉閲嶅鐨凚attGroupName锛堣搫鐢垫睜缁勶級
- @GetMapping("byBattGroupName")
- @ApiOperation(notes = "",value="鏍规嵁StationName锛堢珯鐐癸級 鏌ヤ笉閲嶅鐨凚attGroupName锛堣搫鐢垫睜缁勶級")
- public ServiceModelOnce serchByBattGroupName(@RequestBody BattInf bif){
-
- return service.serchByBattGroupName(bif);
+ @PostMapping("byBattGroupName")
+ @ApiOperation(notes = "",value="StationName锛堢珯鐐癸級 鏌ヤ笉閲嶅鐨凚attGroupName锛堣搫鐢垫睜缁勶級")
+ public ServiceModelOnce serchByBattGroupName(@ApiParam(value = "鍦板潃",required = true) @RequestParam String stationName,@ApiParam(value = "鐪�",required = true) @RequestParam String stationName1){
+ BattInf binf = new BattInf();
+ binf.setStationName(stationName);
+ binf.setStationName1(stationName1);
+ return service.serchByBattGroupName(binf);
}
//鏌ョ數姹犲搧鐗�
@GetMapping("battProducer")
@@ -214,85 +263,152 @@
return service.findMenu();
}
-
- //鍒ゆ柇鏂板鐨勭數姹犵粍鏄惁瀛樺湪
- @GetMapping("judgeBatt")
- @ApiOperation(notes = "",value="鍒ゆ柇鏂板鐨勭數姹犵粍鏄惁瀛樺湪")
- public ServiceModel judgeBatt(@RequestBody BattInf binf){
+ //鍒ゆ柇鏂板鐨勭數姹犵粍鏄惁瀛樺湪
+ @PostMapping("judgeBatt")
+ @ApiOperation(notes = "",value="鍒ゆ柇鏂板鐨勭數姹犵粍鏄惁瀛樺湪")
+ public ServiceModel judgeBatt(@ApiParam(value = "绔欑偣",required = true) @RequestParam String stationName) {
+ BattInf binf = new BattInf();
+ binf.setStationName(stationName);
return service.judgeBatt(binf);
}
- @GetMapping("byBattGroupId2")
- @ApiOperation(notes = "",value="byBattGroupId2")
- public ServiceModel findByBattGroupId(@RequestBody BattInf bif){
- ServiceModel model=service.findByBattGroupId(bif);
- return model;
- }
-
//鏍规嵁鐢垫睜缁刬d鏌ヨ涓嶉噸澶嶇殑鍗曚綋缂栧彿
- @GetMapping("monNumByBattGroupId")
+ @PostMapping("monNumByBattGroupId")
@ApiOperation(notes = "",value="鐢垫睜缁刬d鏌ヨ涓嶉噸澶嶇殑鍗曚綋缂栧彿")
- public ServiceModelOnce serchByMonNum(@RequestBody BattInf bif){
+ public ServiceModelOnce serchByMonNum(@RequestParam Integer battGroupId) {
+ BattInf binf = new BattInf();
+ binf.setBattGroupId(battGroupId);
- return service.serchByMonNum(bif);
+ return service.serchByMonNum(binf);
}
-
+
//5.3娣诲姞閫夊彇鐢垫睜缁勬垨鑰呮満鎴挎垨鑰呯淮鎶ゅ尯(鏈搴旂敤)
- @Deprecated
- public ServiceModel serchBatt(@RequestBody BattInf bif) {
- // bif=ActionUtil.getGson("yyyy-MM-dd").fromJson(result,BattInf.class);
-
- return service.serchBatt(bif);
+ @PostMapping("serchBatt")
+ @ApiOperation(notes = "缁撴灉闆�:{ \"code\": 1, \"msg\": null, \"data\": [{ \"stationId\": \"42010007\", \"stationName\": \"灞辫タ鐪�-澶師甯�-杩庢辰鍖�-灞�鏈烘埧119-灞�鏈烘埧绔�-1\", \"stationName1\": \"灞辫タ鐪乗"\"battGroupId\": 1000003, \"battGroupName\": \"鐢垫睜缁�1\", \"battGroupName\": \"鐢垫睜缁�1\" }]}",value="娣诲姞閫夊彇鐢垫睜缁勬垨鑰呮満鎴挎垨鑰呯淮鎶ゅ尯(鏈搴旂敤)")
+ public ServiceModel serchBatt(@ApiParam(value = "鍦板潃",required = true) @RequestParam String stationName,@ApiParam(value = "鐪�",required = true) @RequestParam String stationName1,@RequestParam Integer battGroupId) {
+ BattInf binf = new BattInf();
+ binf.setStationName(stationName);
+ binf.setStationName1(stationName1);
+ binf.setBattGroupId(battGroupId);
+ return service.serchBatt(binf);
}
+ //TODO 鏁版嵁涓嶈冻寰呮祴
//6.4.7鎸夊湴鍩熷拰鏍囩О鐢靛帇鍒嗙粍缁熻钃勭數姹犵粍鏈嶅焦瓒呮湡鐨勬暟閲�
/*
* 鍖哄煙灞傛鏀惧湪stationid涓�
* battgroupnum 涓瓨鏀剧粺璁℃柟寮忥細骞村害缁熻涓�0 瀛ｅ害缁熻涓�1
- * moncount涓瓨鏀剧粺璁″搴︼細涓�瀛ｅ害涓�1 浠ユ绫绘帹
- * monnum 涓瓨鏀惧勾浠�*/
- @GetMapping("beyondTime")
- @ApiOperation(notes = "鍖哄煙灞傛鏀惧湪stationid涓� battgroupnum 涓瓨鏀剧粺璁℃柟寮忥細骞村害缁熻涓�0 瀛ｅ害缁熻涓�1 moncount涓瓨鏀剧粺璁″搴︼細涓�瀛ｅ害涓�1 浠ユ绫绘帹 monnum 涓瓨鏀惧勾浠�",value="鎸夊湴鍩熷拰鏍囩О鐢靛帇鍒嗙粍缁熻钃勭數姹犵粍鏈嶅焦瓒呮湡鐨勬暟閲�")
- public ServiceModel serchBeyondTime(@RequestBody BattInf bif){
- // bif=ActionUtil.getGson("yyyy-MM-dd").fromJson(result,BattInf.class);
-
- return service.serchBeyondTime(bif);
+ * moncount涓瓨鏀剧粺璁″搴︼細涓�瀛ｅ害涓�1 浠ユ绫绘帹 -3
+ * monnum 涓瓨鏀惧勾浠� -2020*/
+ @PostMapping("beyondTime")
+ @ApiOperation(notes = "TODO 寰呮祴",
+ value="鎸夊湴鍩熷拰鏍囩О鐢靛帇鍒嗙粍缁熻钃勭數姹犵粍鏈嶅焦瓒呮湡鐨勬暟閲�")
+ public ServiceModel serchBeyondTime(@ApiParam(value = "鍖哄煙灞傛(瀛楃涓叉暟瀛�)",required = true) @RequestParam String stationId,
+ @ApiParam(value = "骞翠唤",required = true) @RequestParam Integer monNum,
+ @ApiParam(value = "缁熻鏂瑰紡锛氬勾搴︾粺璁′负0 瀛ｅ害缁熻涓�1",required = true) @RequestParam Integer battGroupNum,
+ @ApiParam(value = "缁熻瀛ｅ害锛氫竴瀛ｅ害涓�1 浠ユ绫绘帹",required = true) @RequestParam Integer monCount) {
+ ServiceModel model= new ServiceModel();
+ try {
+ Integer.parseInt(stationId);
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ model.setMsg("鍙傛暟涓嶅悎娉�");
+ return model;
+ }
+ BattInf binf = new BattInf();
+ binf.setStationId(stationId);
+ binf.setBattGroupNum(battGroupNum);
+ binf.setMonNum(monNum);
+ binf.setMonCount(monCount);
+ model =service.serchBeyondTime(binf);
+ return model;
}
//6.4.8鎸夊湴鍩熷拰鏍囩О鐢靛帇鍒嗙粍缁熻钃勭數姹犵粍鐨勬暟閲�(钃勭數姹犵粍鏁伴噺缁熻)
- @GetMapping("battGroupCountByMonVolStdGroup")
- @ApiOperation(notes = "",value="鎸夊湴鍩熷拰鏍囩О鐢靛帇鍒嗙粍缁熻钃勭數姹犵粍鐨勬暟閲�(钃勭數姹犵粍鏁伴噺缁熻)")
- public ServiceModel serchByMonVolStdGroup(@RequestBody BattInf bif){
- // bif=ActionUtil.getGson("yyyy-MM-dd").fromJson(result,BattInf.class);
-
- return service.serchByMonVolStdGroup(bif);
+ @PostMapping("battGroupCountByMonVolStdGroup")
+ @ApiOperation(notes = "TODO 寰呮祴",value="鎸夊湴鍩熷拰鏍囩О鐢靛帇鍒嗙粍缁熻钃勭數姹犵粍鐨勬暟閲�(钃勭數姹犵粍鏁伴噺缁熻)")
+ public ServiceModel serchByMonVolStdGroup(@ApiParam(value = "鍖哄煙灞傛(瀛楃涓叉暟瀛�)",required = true) @RequestParam String stationId,
+ @ApiParam(value = "鑾峰彇骞翠唤",required = true) @RequestParam Integer monNum,
+ @ApiParam(value = "瀛樻斁缁熻鏂瑰紡锛氬勾搴︾粺璁′负0 瀛ｅ害缁熻涓�1",required = true) @RequestParam Integer battGroupNum,
+ @ApiParam(value = "瀛樻斁缁熻瀛ｅ害锛氫竴瀛ｅ害涓�1 浠ユ绫绘帹",required = true) @RequestParam Integer monCount){
+ ServiceModel model = new ServiceModel();
+ BattInf bif = new BattInf();
+ try {
+ Integer.parseInt(stationId);
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ model.setMsg("鍙傛暟涓嶅悎娉�");
+ return model;
+ }
+ bif.setStationId(stationId);
+ bif.setBattGroupNum(battGroupNum);
+ bif.setMonNum(monNum);
+ bif.setMonCount(monCount);
+ model = service.serchByMonVolStdGroup(bif);
+ return model;
}
//6.4.9鎸夊湴鍩熷拰鏍囩О鐢靛帇鍒嗙粍缁熻钃勭數姹犵粍鍝佺墝鐨勬暟閲�(钃勭數姹犱緵搴斿晢淇℃伅缁熻)
- @GetMapping("battProducerCountByBattProducerGroup")
+ @PostMapping("battProducerCountByBattProducerGroup")
@ApiOperation(notes = "",value="鎸夊湴鍩熷拰鏍囩О鐢靛帇鍒嗙粍缁熻钃勭數姹犵粍鍝佺墝鐨勬暟閲�(钃勭數姹犱緵搴斿晢淇℃伅缁熻)")
- public ServiceModel serchByBattProducerGroup(@RequestBody BattInf bif){
- // bif=ActionUtil.getGson("yyyy-MM-dd").fromJson(result,BattInf.class);
-
+ public ServiceModel serchByBattProducerGroup(@ApiParam(value = "鍖哄煙灞傛(瀛楃涓叉暟瀛�)",required = true) @RequestParam String stationId,
+ @ApiParam(value = "鑾峰彇骞翠唤",required = true) @RequestParam Integer monNum,
+ @ApiParam(value = "瀛樻斁缁熻鏂瑰紡锛氬勾搴︾粺璁′负0 瀛ｅ害缁熻涓�1",required = true) @RequestParam Integer battGroupNum,
+ @ApiParam(value = "瀛樻斁缁熻瀛ｅ害锛氫竴瀛ｅ害涓�1 浠ユ绫绘帹",required = true) @RequestParam Integer monCount){
+ ServiceModel model = new ServiceModel();
+ BattInf bif = new BattInf();
+ try {
+ Integer.parseInt(stationId);
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ model.setMsg("鍙傛暟涓嶅悎娉�");
+ return model;
+ }
+ bif.setStationId(stationId);
+ bif.setBattGroupNum(battGroupNum);
+ bif.setMonNum(monNum);
+ bif.setMonCount(monCount);
return service.serchByBattProducerGroup(bif);
}
//6.4.10鎸夊湴鍩熷拰鏍囩О鐢靛帇鍒嗙粍缁熻钃勭數姹犵粍浣跨敤鏃堕棿(钃勭數姹犳姇浜у勾闄愮粺璁�)
- @GetMapping("battGroupTimeInUse")
+ @PostMapping("battGroupTimeInUse")
@ApiOperation(notes = "",value="鎸夊湴鍩熷拰鏍囩О鐢靛帇鍒嗙粍缁熻钃勭數姹犵粍浣跨敤鏃堕棿(钃勭數姹犳姇浜у勾闄愮粺璁�)")
- public ServiceModel serchByBattInUseDateGroup(@RequestBody BattInf bif){
- // bif=ActionUtil.getGson("yyyy-MM-dd").fromJson(result,BattInf.class);
-
+ public ServiceModel serchByBattInUseDateGroup(@ApiParam(value = "鍖哄煙灞傛(瀛楃涓叉暟瀛�)",required = true) @RequestParam String stationId,
+ @ApiParam(value = "鑾峰彇骞翠唤",required = true) @RequestParam Integer monNum,
+ @ApiParam(value = "瀛樻斁缁熻鏂瑰紡锛氬勾搴︾粺璁′负0 瀛ｅ害缁熻涓�1",required = true) @RequestParam Integer battGroupNum,
+ @ApiParam(value = "瀛樻斁缁熻瀛ｅ害锛氫竴瀛ｅ害涓�1 浠ユ绫绘帹",required = true) @RequestParam Integer monCount){
+ ServiceModel model = new ServiceModel();
+ BattInf bif = new BattInf();
+ try {
+ Integer.parseInt(stationId);
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ model.setMsg("鍙傛暟涓嶅悎娉�");
+ return model;
+ }
+ bif.setStationId(stationId);
+ bif.setBattGroupNum(battGroupNum);
+ bif.setMonNum(monNum);
+ bif.setMonCount(monCount);
return service.serchByBattInUseDateGroup(bif);
}
//1 鏍规嵁鏈烘埧id鏌ヨ鐢垫睜缁刬d鎺掑簭鏈�灏忓��
- @GetMapping("byIdLow")
+ @PostMapping("byIdLow")
@ApiOperation(notes = "",value="鏈烘埧id鏌ヨ鐢垫睜缁刬d鎺掑簭鏈�灏忓��")
- public ServiceModel serchByIdLow(@RequestBody BattInf bif){
- // bif=ActionUtil.getGson("yyyy-MM-dd").fromJson(result,BattInf.class);
-
+ public ServiceModel serchByIdLow(@RequestParam String stationId){
+ ServiceModel model = new ServiceModel();
+ BattInf bif = new BattInf();
+ try {
+ Integer.parseInt(stationId);
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ model.setMsg("鍙傛暟涓嶅悎娉�");
+ return model;
+ }
+ bif.setStationId(stationId);
return service.serchByIdLow(bif);
}
@@ -304,47 +420,70 @@
return service.serchAllStation(u);
}
-
- //鎼滅储鏈烘埧鎴栫數姹犵粍
- @GetMapping("stationOrBattGroup")
- @ApiOperation(notes = "",value="鎼滅储鏈烘埧鎴栫數姹犵粍")
- public ServiceModel serchStationOrBattgroup(@RequestBody BattInf binf){
- // BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
+ //鎼滅储鏈烘埧鎴栫數姹犵粍
+ @PostMapping("stationOrBattGroup")
+ @ApiOperation(notes = "num:1 鏈烘埧;0鐢垫睜缁� 涓ょ鐘舵�� stationName9 妯＄硦鏌ヨ鏉′欢", value = "鎼滅储鏈烘埧鎴栫數姹犵粍")
+ public ServiceModel serchStationOrBattgroup(@ApiParam(value = "1 鏈烘埧;0 鐢垫睜缁�",required = true) @RequestParam Integer num,@RequestParam String stationName9) {
+ BattInf binf = new BattInf();
+ binf.setNum(num);
+ binf.setStationName9(stationName9);
return service.serchStationOrBattgroup(binf);
}
+
//鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�
- @GetMapping("battByStationId")
+ @PostMapping("battByStationId")
@ApiOperation(notes = "",value="鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�")
- public ServiceModel serchBattByStation(@RequestBody BattInf binf){
- // BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
- // result = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").toJson(model);
+ public ServiceModel serchBattByStation(@RequestParam String stationId){
+ ServiceModel model = new ServiceModel();
+ BattInf binf = new BattInf();
+ try {
+ Integer.parseInt(stationId);
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ model.setMsg("鍙傛暟涓嶅悎娉�");
+ return model;
+ }
+ binf.setStationId(stationId);
return service.serchBattByStation(binf);
}
//鏌ヨ鎵�鏈夌殑鐢垫睜缁勬暟
@GetMapping("battCount")
@ApiOperation(notes = "",value="鏌ヨ鎵�鏈夌殑鐢垫睜缁勬暟")
- public ServiceModel serchAllBatt(){
+ public ServiceModelOnce serchAllBatt(){
User_inf u = (User_inf)ActionUtil.getUser();
return service.serchAllBatt(u);
}
- //鏌ョ珯鐐逛笅鐨勬墍鏈夎澶囧悕绉�
- @GetMapping("devNameByStationName3")
- @ApiOperation(notes = "",value="鏌ョ珯鐐逛笅鐨勬墍鏈夎澶囧悕绉�")
- public ServiceModel searchDevByStationName3(@RequestBody BattInf binf){
- // BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
+ //鏌ョ珯鐐逛笅鐨勬墍鏈夎澶囧悕绉�
+ @PostMapping("devNameByStationName3")
+ @ApiOperation(notes = "妯＄硦鏌ヨ", value = "鏌ョ珯鐐逛笅鐨勬墍鏈夎澶囧悕绉�")
+ public ServiceModel searchDevByStationName3(@ApiParam(value = "鐪�", required = true) @RequestParam String stationName1, @ApiParam(value = "甯�", required = true) @RequestParam String stationName2,
+ @ApiParam(value = "鏈烘埧", required = true) @RequestParam String stationName3, @ApiParam(value = "鍖�", required = true) @RequestParam String stationName5) {
+ BattInf binf = new BattInf();
+ binf.setStationName1(stationName1);
+ binf.setStationName2(stationName2);
+ binf.setStationName3(stationName3);
+ binf.setStationName5(stationName5);
return service.searchDevByStationName3(binf);
}
//棣栭〉涓婃牴鎹畇tationid鏌ヨ鐢垫睜缁勭殑鏈哄巻鍗�
- @GetMapping("battAllInfoByStationId")
+ @PostMapping("battAllInfoByStationId")
@ApiOperation(notes = "",value="棣栭〉涓婃牴鎹畇tationid鏌ヨ鐢垫睜缁勭殑鏈哄巻鍗�")
- public ServiceModel serchBattAllInfoByStationId(@RequestBody BattInf binf){
- // BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
-
+ public ServiceModel serchBattAllInfoByStationId(@RequestParam String stationId){
+ ServiceModel model = new ServiceModel();
+ BattInf binf = new BattInf();
+ try {
+ Integer.parseInt(stationId);
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ model.setMsg("鍙傛暟涓嶅悎娉�");
+ return model;
+ }
+ binf.setStationId(stationId);
return service.serchBattAllInfoByStationId(binf);
}
//璺ㄥ煙璁块棶鑾峰彇鎵�鏈夌數姹犵粍鐨勪俊鎭�<-------璺ㄥ煙----------->
@@ -357,7 +496,7 @@
}
//娣诲姞鏂扮殑鐢垫睜缁�
@PostMapping("ky")
- @ApiOperation(notes = "",value="娣诲姞鏂扮殑鐢垫睜缁�")
+ @ApiOperation(notes = "TODO",value="娣诲姞鏂扮殑鐢垫睜缁凾ODO")
public ServiceModel add_ky(@RequestBody List<BattInf> list) {
// List<BattInf> list= getGson("yyyy-MM-dd").fromJson(json, new TypeToken<List<BattInf>>(){}.getType());
@@ -382,10 +521,10 @@
//鏌ヨ鐢垫睜缁勪俊鎭�<澶у睆鏄剧ず>
@GetMapping("battOnBigScreen")
- @ApiOperation(notes = "",value="鏌ヨ鐢垫睜缁勪俊鎭�<澶у睆鏄剧ず>")
- public ServiceModel serchBatt_DP(@RequestBody BattInf binf){
- // BattInf binf= getGson("yyyy-MM-dd").fromJson(json, BattInf.class);
+ @ApiOperation(notes = "鏈娇鐢ㄥ弬鏁版煡璇�",value="鏌ヨ鐢垫睜缁勪俊鎭�<澶у睆鏄剧ず>")
+ public ServiceModel serchBatt_DP(){
+ BattInf binf= new BattInf();
return service.serchBatt_DP(binf);
}
//绱櫠灞辫タ鈥斺��---鏈烘埧鍒楄〃
--
Gitblit v1.9.1