From e16302f9d475c7cc4dd18c5abf1a23cb5502e362 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 28 五月 2025 14:57:56 +0800
Subject: [PATCH] 密码验证加-

---
 src/main/java/com/whyc/controller/BattInfController.java |  233 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 227 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/whyc/controller/BattInfController.java b/src/main/java/com/whyc/controller/BattInfController.java
index 3bfe94f..d4615a7 100644
--- a/src/main/java/com/whyc/controller/BattInfController.java
+++ b/src/main/java/com/whyc/controller/BattInfController.java
@@ -1,27 +1,34 @@
 package com.whyc.controller;
 
 import com.whyc.dto.Response;
+import com.whyc.dto.ServiceModel;
+import com.whyc.dto.paramter.DateTimePar;
 import com.whyc.pojo.Battinf;
 import com.whyc.pojo.UserInf;
 import com.whyc.service.BattInfService;
 import com.whyc.util.ActionUtil;
+import com.whyc.util.HttpUtil;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
+import java.util.Map;
 
 @RequestMapping("battInf")
 @RestController
-@Api(tags = "鐢垫睜淇℃伅")
-public class BattInfController {
+@Api(tags = "鏁版嵁绠$悊-鐢垫睜淇℃伅")
+public class BattInfController extends BaseController{
 
     @Autowired
     private BattInfService service;
 
     @GetMapping("/searchAllStationName1")
-    @ApiOperation("鏌ヨ鐪�")
+    @ApiOperation(tags = "鍦ㄧ嚎鐩戞祴-鍘嗗彶鏁版嵁绠$悊",value="鏌ヨ鐪�",notes = "鍘熸帴鍙�:BattInfAction!serchAllStationName1")
     public Response searchAllStationName1(){
         UserInf userInf = (UserInf) ActionUtil.getUser();
         return service.searchAllStationName1(userInf.getUId().intValue());
@@ -57,11 +64,18 @@
         UserInf userInf = (UserInf) ActionUtil.getUser();
         return service.searchStationNameInGroup(userInf.getUId().intValue(), stationName1);
     }
+    @GetMapping("/searchStationNameInGroup2")
+    @ApiOperation(value = "鏌ヨ鐢ㄦ埛绠$悊涓嬬殑鏈烘埧",notes = "鍘焥erchStationNameInGroup鎺ュ彛锛岃繑鍥瀞tationName")
+    public Response searchBattGroupByStationName2(@RequestParam(required = false)String stationName1){
+        UserInf userInf = (UserInf) ActionUtil.getUser();
+        return service.searchStationNameInGroup2(userInf.getUId().intValue(), stationName1);
+    }
+
     @GetMapping("/searchInform")
     @ApiOperation(value = "鐢垫睜缁勪俊鎭厤缃腑鏌ヨ鎵�鏈夌殑鐢垫睜缁勪俊鎭�")
-    public Response searchInform(@RequestParam(required = false)String stationName1,@RequestParam(required = false)String stationName2,@RequestParam(required = false)String stationName5,@RequestParam(required = false)String stationName3){
+    public Response searchInform(@RequestParam int pageNum,@RequestParam int pageSize,@RequestParam(required = false)String stationName1,@RequestParam(required = false)String stationName2,@RequestParam(required = false)String stationName5,@RequestParam(required = false)String stationName3){
         UserInf userInf = (UserInf) ActionUtil.getUser();
-        return service.searchInfo(userInf.getUId().intValue(),stationName1,stationName2,stationName5,stationName3);
+        return service.searchInfo(pageNum,pageSize,userInf.getUId().intValue(),stationName1,stationName2,stationName5,stationName3);
     }
 
 
@@ -72,18 +86,225 @@
         List<Battinf> stationList =  service.getStationList(userInf.getUId().intValue());
         return new Response().set(1,stationList);
     }
+    @GetMapping("/searchByBattProducer")
+    @ApiOperation(value = "鑾峰彇鎵�鏈夌數姹犲搧鐗�")
+    public Response getAllBattProducer(){
+        return service.searchBattProducer();
+    }
 
 
-    @GetMapping("/add")
+    @PostMapping("/add")
     @ApiOperation("鏂板鐢垫睜缁�")
     public Response addBattinf(@RequestBody Battinf battinf){
         UserInf userInf = (UserInf) ActionUtil.getUser();
         return service.add(battinf,userInf.getUId().intValue());
     }
 
+    @PostMapping("delete")
+    @ApiOperation(value = "鍒犻櫎鐢垫睜缁�")
+    public Response delete(@RequestParam Integer battgroupId){
+        service.deleteByBattgroupId(battgroupId);
+        return new Response().setII(1,"鍒犻櫎鎴愬姛");
+    }
+
+    @PostMapping("update")
+    @ApiOperation(value = "鏇存柊鐢垫睜缁�")
+    public Response update(@RequestBody Battinf battinf){
+        return service.update(battinf);
+    }
+
+    @PostMapping("/updateList")
+    @ApiOperation(value = "鏇存柊鐢垫睜缁凩ist")
+    public Response updateList(@RequestBody List<Battinf> battinfs){
+        return service.updateList(battinfs);
+    }
 
 
+    @PostMapping("/updatePubByDevId")
+    @ApiOperation(value = "鏍规嵁璁惧id淇敼PublicKeyY鍊�")
+    public Response updatePubByDevId(@RequestParam String publicKeyY,@RequestParam Integer deviceId){
+        return service.updatePublicKeyByDevId(publicKeyY,deviceId);
+    }
+
+    @PostMapping("/updateIP")
+    @ApiOperation(value = "鏇存柊鐢垫睜缁勭綉鍏崇瓑淇℃伅",notes = "todo杩橀渶鍚戣澶囧彂閫佺浉鍏虫寚浠ゅ拰鏈嶅姟闇�閲嶅惎")
+    public Response updateIp(@RequestBody Battinf battinf){
+        //todo Fbs9100_setparamImpl().sendCmdToFBS9100Dev
+        //淇敼ip闇�瑕佸皢61850鐨勬湇鍔¤涓洪噸鍚�
+        //todo process_survey
+        return service.updateIp(battinf);
+    }
+    @GetMapping("/findByBattGroupId")
+    @ApiOperation(value = "閫氳繃鐢垫睜缁刬d鑾峰彇鐢垫睜淇℃伅")
+    public Response findByBattGroupId(@RequestParam int battGroupId){
+        return service.findByBattGroupId(battGroupId);
+    }
 
 
+    public Response searchNotInBattMapByUid(){
+        UserInf user = ActionUtil.getUser();
+        return service.searchNotInBattMapByUid(user.getUId().intValue());
+    }
 
+    @GetMapping("battGroupInfoByFBSDeviceId")
+    @ApiOperation(value = "鏌ヨ鐢垫睜缁勪俊鎭�-閫氳繃璁惧Id")
+    public Response<List<Battinf>> getBattGroupInfoByFBSDeviceId(@RequestParam int fbsDeviceId){
+        List<Battinf> battInfList = service.getBattGroupInfoByFBSDeviceId(fbsDeviceId);
+        return new Response<List<Battinf>>().set(1,battInfList);
+    }
+
+    @GetMapping("/findUseYear")
+    @ApiOperation(value = "鏌ヨ鐢垫睜浣跨敤骞撮檺")
+    public Response findUseYear(){
+        UserInf userInf = ActionUtil.getUser();
+        return service.findUseYear(userInf.getUId().intValue());
+    }
+    @GetMapping("/findBattProducer")
+    @ApiOperation(value = "鏌ヨ鍝佺墝鏁伴噺")
+    public Response findBattProducer(){
+        UserInf userInf = ActionUtil.getUser();
+        return service.findBattProducer(userInf.getUId().intValue());
+    }
+
+    @GetMapping("/findBattProducerInfoByProducerName")
+    @ApiOperation(value = "鏍规嵁鐢垫睜鍝佺墝鏌ヨ绔欑偣鍙婄數姹犲搧鐗屽熀纭�淇℃伅")
+    public Response findBattProducerInfoByProducerName(@RequestParam String battProducer){
+        UserInf userInf = ActionUtil.getUser();
+        return service.findBattProducerInfoByProducerName(battProducer,userInf.getUId().intValue());
+    }
+    @GetMapping("/findBattProducerInfoByYearCode")
+    @ApiOperation(value = "鏍规嵁鐢垫睜浣跨敤骞撮檺鏌ヨ绔欑偣鍙婄數姹犲搧鐗屽熀纭�淇℃伅",notes = "yearCode: 锛�1:3骞翠互鍐� 锛�2:3-5骞� 锛�3:5鍒�7骞� 锛�4:7骞翠互涓�")
+    public Response findBattProducerInfoByYearCode(@RequestParam int yearCode){
+        UserInf userInf = ActionUtil.getUser();
+        return service.findBattProducerInfoByYearCode(yearCode,userInf.getUId().intValue());
+    }
+
+    @PostMapping("/findBattProducerInfoByTime")
+    @ApiOperation(value = "鏍规嵁鐢垫睜浣跨敤鏃堕棿娈垫煡璇㈢珯鐐瑰強鐢垫睜鍝佺墝鍩虹淇℃伅",notes = "")
+    public Response findBattProducerInfoByTime(@RequestBody DateTimePar dateTimePar){
+        UserInf userInf = ActionUtil.getUser();
+        return service.findBattProducerInfoByTime(dateTimePar.getStartTime(),dateTimePar.getEndTime(),userInf.getUId().intValue());
+    }
+
+    @GetMapping("/findBattInfByStationId")
+    @ApiOperation("鏍规嵁鏈烘埧id鑾峰彇鐢垫睜淇℃伅")
+    public Response findBattInfByStationId(@RequestParam String stationId){
+        return service.findBattInfoByStationId(stationId);
+    }
+
+    @GetMapping("stationList8059")
+    @ApiOperation(tags = "鍦ㄧ嚎鐩戞祴-涓�浣撴満瀵煎叆璁板綍",value = "绔欑偣鍒楄〃")
+    public Response<List<Battinf>> getStationList8059(){
+        Long uId = ActionUtil.getUser().getUId();
+        List<Battinf> stationList = service.getStationList8059(uId);
+        return new Response<List<Battinf>>().set(1,stationList);
+    }
+
+    @GetMapping("battInfByStationId")
+    @ApiOperation(tags = "鍦ㄧ嚎鐩戞祴-涓�浣撴満瀵煎叆璁板綍",value = "绔欑偣涓嬬殑鐢垫睜缁勪俊鎭�")
+    public Response findBattInfByStationId2(@RequestParam String stationId){
+        return service.findBattInfoByStationId(stationId);
+    }
+
+    @GetMapping("/searchByMonNum")
+    @ApiOperation(value = "鏍规嵁鐢垫睜缁刬d鏌ヨ涓嶉噸澶嶇殑鍗曚綋缂栧彿")
+    public Response searchByMonNum(int battGroupId){
+        return service.searchByMonNum(battGroupId);
+    }
+
+
+    @GetMapping("/getVideoAccessToken")
+    @ApiOperation(value = "鑾峰彇鏈烘埧鍐呯數姹犵粍瀵瑰簲瑙嗛鐨則oken浠ょ墝")
+    public Response getVideoAccessToken()  {
+        String resultJson = HttpUtil.doPost(HttpUtil.VIDEO_URL, HttpUtil.VIDEO_REQUEST_BODY);
+        ServiceModel responseNew = ActionUtil.getGson().fromJson(resultJson, ServiceModel.class);
+        //ActionUtil.getApplication().setAttribute("videoToken",responseNew);
+        if(responseNew.getCode()==200){
+            return new Response().set(1,((Map)responseNew.getData()).get("accessToken"));
+        }else{
+            return new Response().setCode(0);
+        }
+    }
+
+    //@GetMapping("/getVideoAccessToken")
+    //@ApiOperation(value = "鑾峰彇鏈烘埧鍐呯數姹犵粍瀵瑰簲瑙嗛鐨則oken浠ょ墝")
+    //public Response getVideoAccessToken1()  {
+    //    Response response = new Response();
+    //    String resultJson = HttpUtil.doPost(HttpUtil.VIDEO_URL, HttpUtil.VIDEO_REQUEST_BODY);
+    //    try {
+    //        Object resp =  ActionUtil.getApplication().getAttribute("videoToken");
+    //        Integer code = ((ServiceModel)resp).getCode();
+    //        Map map = (Map) ((ServiceModel)resp).getData();
+    //        if(code==200){
+    //            String accessToken = (String) map.get("accessToken");
+    //            Double expireTime = (Double) map.get("expireTime");
+    //            long now = System.currentTimeMillis();
+    //            if(now>=(expireTime-1000*10)){
+    //                //閲嶆柊鑾峰彇accessToken骞跺瓨鍏pplication
+    //                //String resultJson = HttpUtil.doPost(HttpUtil.VIDEO_URL, HttpUtil.VIDEO_REQUEST_BODY);
+    //                Response responseNew = ActionUtil.getGson().fromJson(resultJson, Response.class);
+    //                ActionUtil.getApplication().setAttribute("videoToken",responseNew);
+    //                if(responseNew.getCode()==200){
+    //                    response.set(1,((Map)responseNew.getData()).get("accessToken"));
+    //                }else{
+    //                    response.setCode(0);
+    //                }
+    //            }else {
+    //                response.set(1,accessToken);
+    //            }
+    //        }else {
+    //            response.set(0);
+    //        }
+    //    }catch (Exception e){
+    //
+    //        response.set(0);
+    //    }
+    //    return response;
+    //}
+    @PostMapping("/uploadPicOfStation")
+    @ApiOperation("涓婁紶鍥剧墖")
+    @ApiImplicitParam(name = "file", value = "涓婁紶鐨勬枃浠�", dataTypeClass = MultipartFile.class, required = true,paramType = "form")
+    public Response uploadPicOfStation(@RequestPart("file") List<MultipartFile> file, @RequestParam String stationId){
+        return service.uploadPicOfStation(file,stationId);
+    }
+    @PostMapping("/deletePic")
+    @ApiOperation("鍒犻櫎鍥剧墖")
+    public Response deletePic(@RequestParam String stationId,@RequestParam List<String> fileNames){
+        return service.deletePic(stationId,fileNames);
+    }
+    @PostMapping("/getStationPic")
+    @ApiOperation("鑾峰彇绔欑偣鍥剧墖")
+    public Response getStationPic(@RequestParam String stationId){
+        return service.getStationPic(stationId);
+    }
+
+    @GetMapping("getDeviceId")
+    @ApiOperation(value = "鑾峰彇鏈�澶х殑璁惧id", notes = "鏃�:BattInfAction!getDeviceId")
+    public Response getDeviceId(@RequestParam Integer devId) {
+        return new Response().set(1, service.searchMaxDevId(devId));
+    }
+
+    @GetMapping("setKeyIdWithDeviceId")
+    @ApiOperation(value = "keyid缁戝畾璁惧id", notes = "鏃�:BattInfAction!getDeviceId")
+    public Response setKeyIdWithDeviceId(@RequestParam Integer devId,@RequestParam String keyId) {
+        return service.setKeyIdWithDeviceId(devId,keyId);
+    }
+
+    @PostMapping("updateMonCapWH")
+    @ApiModelProperty(value = "鏍囩О瀹归噺KWH淇敼", notes = "浼犲叆battGroupId鍜宯omCapWH")
+    public Response updateMonCapWH(@RequestBody Battinf inf) {
+        return service.updateMonCapWH(inf);
+    }
+
+    @ApiOperation(value = "鏌ヨ鏍囩О鐢靛帇绫诲埆")
+    @GetMapping("searchMonVol")
+    public Response searchMonVol() {
+        return service.searchMonVol();
+    }
+
+    @GetMapping("searchBattGroupIdByDevId")
+    @ApiOperation(value = "鏍规嵁璁惧id鏌ヨ鐢垫睜缁刬d锛堝彇绗竴涓級")
+    public Response searchBattGroupIdByDevId(@RequestParam int devId) {
+        return service.searchBattGroupIdByDevId(devId);
+    }
 }

--
Gitblit v1.9.1