修改 关锁修改状态

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

ruoyi-device/src/main/java/com/ruoyi/device/controller/PdaApiController.java

@@ -56,6 +56,7 @@ public class PdaApiController {
 
         ResponseEntity<String> 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<String> 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) {
                     /**
                      * 插入记录

ruoyi-device/src/main/java/com/ruoyi/device/mapper/PdaApiMapper.java

@@ -8,4 +8,6 @@ import java.util.List;
 @Repository
 public interface PdaApiMapper {
     List<RecordUse> selectUseList();
+
+    void updateRecord(String code);
 }

ruoyi-device/src/main/java/com/ruoyi/device/service/IPdaApiService.java

@@ -6,4 +6,6 @@ import java.util.List;
 
 public interface IPdaApiService {
     List<RecordUse> selectUseList();
+
+    void updateRecord(String code);
 }

ruoyi-device/src/main/java/com/ruoyi/device/service/impl/PdaServiceImpl.java

@@ -17,4 +17,9 @@ public class PdaServiceImpl implements IPdaApiService {
     public List<RecordUse> selectUseList() {
         return mapper.selectUseList();
     }
+
+    @Override
+    public void updateRecord(String code) {
+        mapper.updateRecord(code);
+    }
 }

ruoyi-device/src/main/resources/PdaApiMapper.xml

@@ -15,4 +15,8 @@
                 END as use_time
         FROM device_record_use order by open_time desc
     </select>
+
+    <update id="updateRecord">
+
+    </update>
 </mapper>