Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks

ruoyi-modules/Sis/src/main/java/org/dromara/sis/config/RestTemplateConfig.java

@@ -0,0 +1,15 @@
+package org.dromara.sis.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+@Configuration
+public class RestTemplateConfig {
+
+    @Bean
+    public RestTemplate restTemplate() {
+        // 使用JDK自带的HttpURLConnection作为客户端
+        return new RestTemplate();
+    }
+}

ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TbPersonLibServiceImpl.java

@@ -27,8 +27,8 @@ import java.util.Collection;
  * @date 2025-06-24
  */
 @Slf4j
-@RequiredArgsConstructor
 @Service
+@RequiredArgsConstructor
 public class TbPersonLibServiceImpl implements ITbPersonLibService {
 
     private final TbPersonLibMapper baseMapper;

ruoyi-modules/Sis/src/main/resources/mapper/sis/TbAccessControlMapper.xml

@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.iot.mapper.TbAccessControlMapper">
+<mapper namespace="org.dromara.sis.mapper.TbAccessControlMapper">
 
 </mapper>

ruoyi-modules/Sis/src/main/resources/mapper/sis/TdFactoryMapper.xml

@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.iot.mapper.TdFactoryMapper">
+<mapper namespace="org.dromara.sis.mapper.TdFactoryMapper">
 
 </mapper>

ruoyi-modules/Sis/src/main/resources/mapper/sis/TdMeterConfigMapper.xml

@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.iot.mapper.TdMeterConfigMapper">
+<mapper namespace="org.dromara.sis.mapper.TdMeterConfigMapper">
 
 </mapper>

ruoyi-modules/Sis/src/main/resources/mapper/sis/TdMeterMapper.xml

@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.iot.mapper.TdMeterMapper">
+<mapper namespace="org.dromara.sis.mapper.TdMeterMapper">
 
 </mapper>

ruoyi-modules/Sis/src/main/resources/mapper/sis/TdMeterRoomMapper.xml

@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.iot.mapper.TdMeterRoomMapper">
+<mapper namespace="org.dromara.sis.mapper.TdMeterRoomMapper">
 
 </mapper>