From f2f5029b2deba8da541d80872fdbce2d8681bc3b Mon Sep 17 00:00:00 2001 From: wanghao Date: Mon, 22 Sep 2025 11:05:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=85=B3=E9=94=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-druid.yml | 2 +- .../ruoyi/device/controller/PdaApiController.java | 15 +++++++++++++-- .../com/ruoyi/device/mapper/PdaApiMapper.java | 2 ++ .../com/ruoyi/device/service/IPdaApiService.java | 2 ++ .../ruoyi/device/service/impl/PdaServiceImpl.java | 5 +++++ ruoyi-device/src/main/resources/PdaApiMapper.xml | 4 ++++ 6 files changed, 27 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index c4cd63f..ac774b7 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -14,7 +14,7 @@ spring: # 从库数据源 slave: # 从数据源开关/默认关闭 - enabled: true + enabled: false url: jdbc:mysql://119.45.202.115:3306/no_power_control?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: haiwei@123 diff --git a/ruoyi-device/src/main/java/com/ruoyi/device/controller/PdaApiController.java b/ruoyi-device/src/main/java/com/ruoyi/device/controller/PdaApiController.java index 4094328..6705227 100644 --- a/ruoyi-device/src/main/java/com/ruoyi/device/controller/PdaApiController.java +++ b/ruoyi-device/src/main/java/com/ruoyi/device/controller/PdaApiController.java @@ -56,6 +56,7 @@ public class PdaApiController { ResponseEntity response = null; try { + RestTemplate restTemplate = new RestTemplate(); String url = "http://119.45.202.115:7789/devcontrolbusiness/unlock?idStr=" + baseInfo.getOpenCode() + "&password=" + baseInfo.getOpenPassword(); // 根据实际情况调整参数值 @@ -64,7 +65,16 @@ public class PdaApiController { MyResult myResult = JSONObject.parseObject(response.getBody(), MyResult.class); System.out.println(myResult.toString()); if (myResult.getCode() == 200) { + // 修改设备状态 + BaseInfo updateBaseInfo = new BaseInfo(); + updateBaseInfo.setObjId(baseInfo.getObjId()); + updateBaseInfo.setUseState("0"); + updateBaseInfo.setLocationName("A455C1B8500104E0"); + baseInfoService.updateBaseInfoForApi(updateBaseInfo); + // service.updateRecord(code); return success("关锁，打开成功"); + }else { + return error(myResult.getMsg()); } } }catch (Exception e){ @@ -80,7 +90,7 @@ public class PdaApiController { public AjaxResult openDeviceLock(@RequestBody BaseInfo baseInfo) { String openCode = baseInfo.getOpenCode(); String openPassword = baseInfo.getOpenPassword(); - System.out.println("开锁"); + System.out.println("开锁："+openCode+",密码："+openPassword); ResponseEntity response = null; try { RestTemplate restTemplate = new RestTemplate(); @@ -91,7 +101,8 @@ public class PdaApiController { if (response.getStatusCode().is2xxSuccessful()) { // {"code":200/500,"isSuc":true,"msg":"开锁指令下发成功，已收到设备回复","buffer":null,"data":null} MyResult myResult = JSONObject.parseObject(response.getBody(), MyResult.class); - System.out.println(myResult.toString()); + + System.out.println("返回值："+myResult.toString()); if (myResult.getCode() == 200) { /** * 插入记录 diff --git a/ruoyi-device/src/main/java/com/ruoyi/device/mapper/PdaApiMapper.java b/ruoyi-device/src/main/java/com/ruoyi/device/mapper/PdaApiMapper.java index 24e352c..1054d1e 100644 --- a/ruoyi-device/src/main/java/com/ruoyi/device/mapper/PdaApiMapper.java +++ b/ruoyi-device/src/main/java/com/ruoyi/device/mapper/PdaApiMapper.java @@ -8,4 +8,6 @@ import java.util.List; @Repository public interface PdaApiMapper { List selectUseList(); + + void updateRecord(String code); } diff --git a/ruoyi-device/src/main/java/com/ruoyi/device/service/IPdaApiService.java b/ruoyi-device/src/main/java/com/ruoyi/device/service/IPdaApiService.java index 596d6cf..c302b74 100644 --- a/ruoyi-device/src/main/java/com/ruoyi/device/service/IPdaApiService.java +++ b/ruoyi-device/src/main/java/com/ruoyi/device/service/IPdaApiService.java @@ -6,4 +6,6 @@ import java.util.List; public interface IPdaApiService { List selectUseList(); + + void updateRecord(String code); } diff --git a/ruoyi-device/src/main/java/com/ruoyi/device/service/impl/PdaServiceImpl.java b/ruoyi-device/src/main/java/com/ruoyi/device/service/impl/PdaServiceImpl.java index 8fff076..e70ad73 100644 --- a/ruoyi-device/src/main/java/com/ruoyi/device/service/impl/PdaServiceImpl.java +++ b/ruoyi-device/src/main/java/com/ruoyi/device/service/impl/PdaServiceImpl.java @@ -17,4 +17,9 @@ public class PdaServiceImpl implements IPdaApiService { public List selectUseList() { return mapper.selectUseList(); } + + @Override + public void updateRecord(String code) { + mapper.updateRecord(code); + } } diff --git a/ruoyi-device/src/main/resources/PdaApiMapper.xml b/ruoyi-device/src/main/resources/PdaApiMapper.xml index 7252f38..fe6ed3d 100644 --- a/ruoyi-device/src/main/resources/PdaApiMapper.xml +++ b/ruoyi-device/src/main/resources/PdaApiMapper.xml @@ -15,4 +15,8 @@ END as use_time FROM device_record_use order by open_time desc + + + +