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/Fbs9100StateController.java |   54 +++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/whyc/controller/Fbs9100StateController.java b/src/main/java/com/whyc/controller/Fbs9100StateController.java
index c5ab050..7eba873 100644
--- a/src/main/java/com/whyc/controller/Fbs9100StateController.java
+++ b/src/main/java/com/whyc/controller/Fbs9100StateController.java
@@ -1,26 +1,66 @@
 package com.whyc.controller;
 
 import com.whyc.dto.Response;
+import com.whyc.dto.paramter.FbsStatePar;
+import com.whyc.pojo.UserInf;
 import com.whyc.service.Fbs9100StateService;
+import com.whyc.util.ActionUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.text.ParseException;
 
 @RestController
 @Api(tags= "鍦ㄧ嚎鐩戞祴-瀹炴椂鐩戞帶")
 @RequestMapping("Fbs9100_stateAction")
-public class Fbs9100StateController {
+public class Fbs9100StateController extends BaseController{
 
     @Autowired
     private Fbs9100StateService service;
 
     @ApiOperation("寮�鍏崇姸鎬�")
-    @GetMapping("/serchContactorState")
-    private Response serchContactorState(@RequestParam int devId){
+    @GetMapping("serchContactorState")
+    public Response serchContactorState(@RequestParam int devId){
         return service.serchContactorState(devId);
     }
+
+    @ApiOperation("FBS9100璁惧閫氫俊鐘舵�佹煡璇�")
+        @GetMapping("searchByCondition")
+    public Response searchByCondition(@RequestParam int pageNum,@RequestParam int pageSize,@RequestParam int devErrcommcount){
+        UserInf userInf = ActionUtil.getUser();
+        return service.searchByCondition(pageNum,pageSize,devErrcommcount,userInf.getUId().intValue());
+    }
+
+    @ApiOperation(tags = "鍦ㄧ嚎鐩戞祴-璁惧鐘舵�佹煡璇�",value = "璁惧鐘舵�佹煡璇�",notes = "杩欐槸涓弿杩版�ф帴鍙�,璇烽�氳繃ws鍗忚璋冪敤!鍏蜂綋ws鎺ュ彛涓�:/fg/deviceWorkState,鍙戦�佷俊鎭�:{\"devId\":910000001,\"devWorkstate\":0,\"note\":1002}")
+    @GetMapping("deviceWorkState")
+    public Response remind(){
+        return new Response().setII(1,"杩欐槸涓弿杩版�ф帴鍙�,璇烽�氳繃ws鍗忚璋冪敤!鍏蜂綋ws鎺ュ彛涓�:/fg/deviceWorkState,鍙戦�佷俊鎭�:{\"devId\":910000001,\"devWorkstate\":0,\"note\":1002}");
+    }
+
+    @ApiOperation(tags = "鍦ㄧ嚎鐩戞祴-瀹炴椂鐩戞帶",value = "涓�浣撴満鐑熼浘鎶ヨ纭",notes = "Fbs9100_stateAction_action_update_dev_res_test_state")
+    @GetMapping("update_dev_res_test_state")
+    public Response update_dev_res_test_state(@RequestParam int devId){
+        return service.update_dev_res_test_state(devId);
+    }
+
+    @ApiOperation(tags = "鍦ㄧ嚎鐩戞祴-瀹炴椂鐩戞帶",value = "涓�浣撴満鐣岄潰寮瑰嚭妗嗙‘璁ゆ搷浣�",notes = "Fbs9100_stateAction_action_update_dev_alarmstate")
+    @GetMapping("update_dev_alarmstate")
+    public Response update_dev_alarmstate(@RequestParam int num,@RequestParam int devId){
+        return service.update_dev_alarmstate(num,devId);
+    }
+
+    @ApiOperation(value = "璁惧宸ヤ綔鐘舵��")
+    @PostMapping("getFbsState")
+    public Response getFbsState(@RequestBody FbsStatePar fbsStatePar){
+        return service.getFbsState(fbsStatePar);
+    }
+
+    @ApiOperation(value = "璁惧宸ヤ綔鐘舵��")
+    @GetMapping("BTSEquipStatus")
+    public Response getBTSEquipStatus() throws ParseException {
+        Long uId = ActionUtil.getUser().getUId();
+        return service.getBTSEquipStatus2(uId.intValue(),1);
+    }
 }

--
Gitblit v1.9.1