Эх сурвалжийг харах

refactor(mapper): 调整GasMonitorDataMapper命名空间和实体类路径

- 修改了GasMonitorDataMapper.xml中的namespace路径- 更新了resultMap中实体类的完整限定名
- 统一了不同服务模块中的mapper配置格式
- 调整了domain类的包结构引用路径

refactor(config): 修改Netty服务端口配置- 将flammable-gas-service的Netty端口从20014改为8312
- 将firefighting-pressure-service的Netty端口从20014改为8311
- 避免多个服务使用相同端口导致的冲突问题- 统一了配置文件中的端口管理方式
林仔 7 сар өмнө
parent
commit
d0355f3a75

+ 1 - 1
firefighting-pressure-service/src/main/java/com/zksy/pressure/config/NettyServerThread.java

@@ -20,7 +20,7 @@ import org.springframework.stereotype.Component;
 @Slf4j
 @Component
 public class NettyServerThread {
-	@Value("${netty.port:20014}")
+	@Value("${netty.port:8311}")
 	private int port;
 	private static Logger logger = LoggerFactory.getLogger(NettyServerThread.class);
 	private final MessageHandler messageHandler;

+ 1 - 1
flammable-gas-service/src/main/java/com/zksy/gas/config/NettyServerThread.java

@@ -20,7 +20,7 @@ import org.springframework.stereotype.Component;
 @Slf4j
 @Component
 public class NettyServerThread {
-	@Value("${netty.port:20014}")
+	@Value("${netty.port:8312}")
 	private int port;
 	private static Logger logger = LoggerFactory.getLogger(NettyServerThread.class);
 	private final MessageHandler messageHandler;

+ 2 - 2
flammable-gas-service/src/main/resources/mapper/GasMonitorDataMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zksy.gas.mapper.GasMonitorDataMapper">
+<mapper namespace="com.zksy.mapper.com.zksy.telemetry.GasMonitorDataMapper">
 
-    <resultMap id="BaseResultMap" type="com.zksy.gas.domain.GasMonitorData">
+    <resultMap id="BaseResultMap" type="com.zksy.domain.com.zksy.telemetry.GasMonitorData">
             <id property="id" column="id" jdbcType="VARCHAR"/>
             <result property="frameType" column="frame_type" jdbcType="TINYINT"/>
             <result property="macAddress" column="mac_address" jdbcType="VARCHAR"/>

+ 2 - 2
pipe-network-service/zksy-system/src/main/resources/mapper/base/gas/GasMonitorDataMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zksy.base.gas.mapper.GasMonitorDataMapper">
+<mapper namespace="com.zksy.base.mapper.com.zksy.telemetry.GasMonitorDataMapper">
 
-    <resultMap id="BaseResultMap" type="com.zksy.base.gas.domain.GasMonitorData">
+    <resultMap id="BaseResultMap" type="com.zksy.base.domain.com.zksy.telemetry.GasMonitorData">
             <id property="id" column="id" jdbcType="VARCHAR"/>
             <result property="frameType" column="frame_type" jdbcType="TINYINT"/>
             <result property="macAddress" column="mac_address" jdbcType="VARCHAR"/>