修改bug

src/main/java/com/chuanghai/ihotel/component/DoorLockComponent.java

@@ -93,7 +93,7 @@ public class DoorLockComponent {
         log.info("门锁服务请求结果【{}】", body);
         JsonNode jsonNode = objectMapper.readTree(body);
         String result = jsonNode.get("result").asText();
-        if (!"1".equals(result)) {
+        if (!"1 ".equals(result)) {
             throw new RRException(BizCodeEnume.THIRD_PARTY_SERVICE_CALL_FAILED, "门锁服务-请求结果状态不为1");
         }
 

src/main/java/com/chuanghai/ihotel/component/WaterElectricComponent.java

@@ -83,7 +83,7 @@ public class WaterElectricComponent {
     }
 
     /**
-     * 获取电表实时数据
+     * 获取水表历史数据
      * @param pointId
      * @return
      */
@@ -93,10 +93,10 @@ public class WaterElectricComponent {
         map.put("pointType", "2");
         try {
             JsonNode jsonNode = queryData("queryLastHistoryCumulantInfo", map, queryToken());
-            log.info("读取水表数据【{}】", jsonNode.toString());
+            log.info("读取水电表数据【{}】", jsonNode.toString());
             return jsonNode.get("bm").asText();
         } catch (Exception e) {
-            throw new RRException(BizCodeEnume.THIRD_PARTY_SERVICE_CALL_FAILED, "请求水电接口-获取电表实时数据异常");
+            throw new RRException(BizCodeEnume.THIRD_PARTY_SERVICE_CALL_FAILED, "请求水电接口-获取水电表实时数据异常");
         }
     }
 

src/main/java/com/chuanghai/ihotel/config/RedissionConfiguration.java

@@ -17,8 +17,8 @@ public class RedissionConfiguration {
     private String redisHost;
     @Value("${spring.redis.port}")
     private String redisPort;
-    @Value("${spring.redis.password}")
-    private String redisPwd;
+//    @Value("${spring.redis.password}")
+//    private String redisPwd;
 
     /**
      * 配置分布式锁的redisson
@@ -30,7 +30,7 @@ public class RedissionConfiguration {
 
         //单机方式
         config.useSingleServer()
-                .setPassword(redisPwd)
+//                .setPassword(redisPwd)
                 .setAddress("redis://"+redisHost+":"+redisPort);
 
         //集群

src/main/java/com/chuanghai/ihotel/service/impl/RoomThirdSettingServiceImpl.java

@@ -41,13 +41,13 @@ public class RoomThirdSettingServiceImpl extends ServiceImpl<RoomThirdSettingDao
         waterElectricComponent.remoteDisconnect(electricId, operType);
     }
 
-    @CacheEvict(value = "roomThirdSetting", key = "findByRoomId + '-' + #entity.roomId")
+    @CacheEvict(value = "roomThirdSetting", key = "'findByRoomId-' + #entity.roomId")
     @Override
     public void myUpdate(RoomThirdSettingEntity entity) {
         this.updateById(entity);
     }
 
-    @CacheEvict(value = "roomThirdSetting", key = "findByRoomId + '-' + #entity.roomId")
+    @CacheEvict(value = "roomThirdSetting", key = "'findByRoomId-' + #entity.roomId")
     @Override
     public void mySave(RoomThirdSettingEntity entity) {
         this.save(entity);

src/main/resources/application.yml

@@ -11,7 +11,7 @@ spring:
   datasource:
     username: root
     password: root
-    url: jdbc:mysql://192.168.161.230:3306/ihotel?characterEncoding=UTF-8&useSSL=false&useUnicode=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://172.16.20.68:3306/ihotel?characterEncoding=UTF-8&useSSL=false&useUnicode=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     driver-class-name: com.mysql.cj.jdbc.Driver
   cache:
     type: redis
@@ -22,7 +22,7 @@ spring:
       use-key-prefix: true
       cache-null-values: true
   redis:
-    host: localhost
+    host: 172.16.20.68
     port: 6379
     password: chuanghai.redis
     jedis:
@@ -32,12 +32,11 @@ spring:
         min-idle: 100
         max-wait: 60000
   rabbitmq:
-    host: 192.168.126.131
+    host: 172.16.20.68
     port: 5672
     virtual-host: dev
-    username: guest
-    password: guest
-    # password: chuanghai
+    username: admin
+    password: chuanghai
     # 消息重试机制
     listener:
       simple: