refactor(manhole): 重构设备基础信息模块的实体和服务类

- 将 BaseDevices 类重命名为 BaseDevicesManhole
- 将 BaseDevicesMapper 接口重命名为 BaseDevicesManholeMapper
- 将 BaseDevicesService 接口重命名为 BaseDevicesManholeService
- 创建新的 BaseDevicesManholeServiceImpl 实现类
- 移除旧的 BaseDevicesServiceImpl 实现类
- 更新 mybatis-plus 配置中的 type-aliases-package 包路径
- 在生产环境配置中添加 nacos 配置中心和注册中心设置
- 修改 ApplicationConfig 中的 MapperScan 扫描路径配置

environment-service/src/main/resources/application-dev.yaml

@@ -17,5 +17,5 @@ spring:
         server-addr: 192.168.110.30:8848
 
 mybatis-plus:
-  type-aliases-package: com.zksy.environment.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain
+  type-aliases-package: com.zksy.environment.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain,com.zksy.system.domain
   mapper-locations: classpath*:mapper/**/*Mapper.xml

firefighting-pressure-service/src/main/resources/application-dev.yaml

@@ -16,5 +16,5 @@ spring:
       config:
         server-addr: 192.168.110.30:8848
 mybatis-plus:
-  type-aliases-package: com.zksy.pressure.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain
+  type-aliases-package: com.zksy.pressure.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain,com.zksy.system.domain
   mapper-locations: classpath*:mapper/**/*Mapper.xml

flammable-gas-service/src/main/resources/application-dev.yaml

@@ -16,5 +16,5 @@ spring:
       config:
         server-addr: 192.168.110.30:8848
 mybatis-plus:
-  type-aliases-package: com.zksy.gas.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain
+  type-aliases-package: com.zksy.gas.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain,com.zksy.system.domain
   mapper-locations: classpath*:mapper/**/*Mapper.xml

manhole-service/src/main/java/com/zksy/manhole/domain/BaseDevices.java → manhole-service/src/main/java/com/zksy/manhole/domain/BaseDevicesManhole.java

@@ -10,7 +10,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -21,7 +20,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value = "设备基础信息")
-public class BaseDevices implements Serializable {
+public class BaseDevicesManhole implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

manhole-service/src/main/java/com/zksy/manhole/mapper/BaseDevicesMapper.java → manhole-service/src/main/java/com/zksy/manhole/mapper/BaseDevicesManholeMapper.java

@@ -2,7 +2,7 @@ package com.zksy.manhole.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zksy.manhole.domain.BaseDevices;
+import com.zksy.manhole.domain.BaseDevicesManhole;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Mapper;
 * @Entity com.zksy.basicData.domain.BaseDevices
 */
 @Mapper
-public interface BaseDevicesMapper extends BaseMapper<BaseDevices> {
+public interface BaseDevicesManholeMapper extends BaseMapper<BaseDevicesManhole> {
 
 }
 

manhole-service/src/main/java/com/zksy/manhole/service/BaseDevicesService.java → manhole-service/src/main/java/com/zksy/manhole/service/BaseDevicesManholeService.java

@@ -2,14 +2,14 @@ package com.zksy.manhole.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zksy.manhole.domain.BaseDevices;
+import com.zksy.manhole.domain.BaseDevicesManhole;
 
 /**
 * @author Administrator
 * @description 针对表【base_devices(设备基础信息)】的数据库操作Service
 * @createDate 2025-03-13 11:50:13
 */
-public interface BaseDevicesService extends IService<BaseDevices> {
+public interface BaseDevicesManholeService extends IService<BaseDevicesManhole> {
 
     void getByDeviceNumberStatus(String deviceNumber,Integer queryStatus,Integer updateStatus);
 }

manhole-service/src/main/java/com/zksy/manhole/service/impl/BaseDevicesManholeServiceImpl.java

@@ -0,0 +1,58 @@
+package com.zksy.manhole.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import com.zksy.base.domain.EquipmentStatus;
+import com.zksy.common.exception.ServiceException;
+import com.zksy.manhole.domain.BaseDevicesManhole;
+import com.zksy.manhole.domain.EquipmentStatusManhole;
+import com.zksy.manhole.mapper.BaseDevicesManholeMapper;
+import com.zksy.manhole.mapper.EquipmentStatusManholeMapper;
+import com.zksy.manhole.service.BaseDevicesManholeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【base_devices(设备基础信息)】的数据库操作Service实现
+* @createDate 2025-03-13 11:50:13
+*/
+@Service
+public class BaseDevicesManholeServiceImpl extends ServiceImpl<BaseDevicesManholeMapper, BaseDevicesManhole> implements BaseDevicesManholeService {
+
+    @Autowired
+    private BaseDevicesManholeMapper baseDevicesBaseDevicesMapper;
+
+    @Autowired
+    private EquipmentStatusManholeMapper equipmentStatusBaseDevicesMapper;
+
+    @Override
+    public void getByDeviceNumberStatus(String deviceNumber,Integer queryStatus,Integer updateStatus) {
+        LambdaQueryWrapper<BaseDevicesManhole> wrapper = new LambdaQueryWrapper<>();
+        //设备编号
+        wrapper.eq(BaseDevicesManhole::getEquipmentCode, deviceNumber);
+        //根据设备编号获取到设备id
+        BaseDevicesManhole device = baseDevicesBaseDevicesMapper.selectOne(wrapper);
+        if(device==null){
+            throw new ServiceException("设备不存在");
+        }
+        //在线状态，从状态表中获取
+        String deviceEquipmentId = device.getEquipmentId();
+        LambdaQueryWrapper<EquipmentStatusManhole> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(EquipmentStatusManhole::getEquipmentId,deviceEquipmentId);
+        queryWrapper.eq(EquipmentStatusManhole::getOnlineStatus,queryStatus);
+
+        EquipmentStatusManhole equipmentStatus = equipmentStatusBaseDevicesMapper.selectOne(queryWrapper);
+
+        //修改状态表
+        if(equipmentStatus != null){
+            equipmentStatus.setOnlineStatus(updateStatus);
+            equipmentStatusBaseDevicesMapper.updateById(equipmentStatus);
+        }
+    }
+}
+
+
+
+

manhole-service/src/main/java/com/zksy/manhole/service/impl/BaseDevicesServiceImpl.java

@@ -1,57 +0,0 @@
-package com.zksy.manhole.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import com.zksy.common.exception.ServiceException;
-import com.zksy.manhole.domain.BaseDevices;
-import com.zksy.manhole.domain.EquipmentStatus;
-import com.zksy.manhole.mapper.BaseDevicesMapper;
-import com.zksy.manhole.mapper.EquipmentStatusMapper;
-import com.zksy.manhole.service.BaseDevicesService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
-* @author Administrator
-* @description 针对表【base_devices(设备基础信息)】的数据库操作Service实现
-* @createDate 2025-03-13 11:50:13
-*/
-@Service
-public class BaseDevicesServiceImpl extends ServiceImpl<BaseDevicesMapper, BaseDevices> implements BaseDevicesService {
-
-    @Autowired
-    private BaseDevicesMapper baseDevicesMapper;
-
-    @Autowired
-    private EquipmentStatusMapper equipmentStatusMapper;
-
-    @Override
-    public void getByDeviceNumberStatus(String deviceNumber,Integer queryStatus,Integer updateStatus) {
-        LambdaQueryWrapper<BaseDevices> wrapper = new LambdaQueryWrapper<>();
-        //设备编号
-        wrapper.eq(BaseDevices::getEquipmentCode, deviceNumber);
-        //根据设备编号获取到设备id
-        BaseDevices device = baseDevicesMapper.selectOne(wrapper);
-        if(device==null){
-            throw new ServiceException("设备不存在");
-        }
-        //在线状态，从状态表中获取
-        String deviceEquipmentId = device.getEquipmentId();
-        LambdaQueryWrapper<EquipmentStatus> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(EquipmentStatus::getEquipmentId,deviceEquipmentId);
-        queryWrapper.eq(EquipmentStatus::getOnlineStatus,queryStatus);
-
-        EquipmentStatus equipmentStatus = equipmentStatusMapper.selectOne(queryWrapper);
-
-        //修改状态表
-        if(equipmentStatus != null){
-            equipmentStatus.setOnlineStatus(updateStatus);
-            equipmentStatusMapper.updateById(equipmentStatus);
-        }
-    }
-}
-
-
-
-

manhole-service/src/main/resources/application-dev.yaml

@@ -14,4 +14,7 @@ spring:
       discovery:
         server-addr: 192.168.110.30:8848
       config:
-        server-addr: 192.168.110.30:8848
+        server-addr: 192.168.110.30:8848
+mybatis-plus:
+  type-aliases-package: com.zksy.manhole.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain,com.zksy.system.domain
+  mapper-locations: classpath*:mapper/**/*Mapper.xml

manhole-service/src/main/resources/application-prod.yaml

@@ -8,4 +8,13 @@ zksy:
 spring:
   redis:
     host: 47.107.107.47
-    port: 6379
+    port: 6379
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 47.107.107.47:8848
+      config:
+        server-addr: 47.107.107.47:8848
+mybatis-plus:
+  type-aliases-package: com.zksy.manhole.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain,com.zksy.system.domain
+  mapper-locations: classpath*:mapper/**/*Mapper.xml

pipe-network-service/zksy-framework/src/main/java/com/zksy/framework/config/ApplicationConfig.java

@@ -17,7 +17,7 @@ import java.util.TimeZone;
 // 表示通过aop框架暴露该代理对象,AopContext能够访问
 @EnableAspectJAutoProxy(exposeProxy = true)
 // 指定要扫描的Mapper类的包的路径
-@MapperScan("com.zksy.**.mapper")
+@MapperScan({"com.zksy.base.**.mapper", "com.zksy.system.**.mapper", "com.zksy.quartz.**.mapper", "com.zksy.generator.**.mapper"})
 public class ApplicationConfig
 {
     /**

telemetry-service/src/main/resources/application-dev.yaml

@@ -14,4 +14,7 @@ spring:
       discovery:
         server-addr: 192.168.110.30:8848
       config:
-        server-addr: 192.168.110.30:8848
+        server-addr: 192.168.110.30:8848
+mybatis-plus:
+  type-aliases-package: com.zksy.telemetry.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain,com.zksy.system.domain
+  mapper-locations: classpath*:mapper/**/*Mapper.xml

telemetry-service/src/main/resources/application-prod.yaml

@@ -8,4 +8,13 @@ zksy:
 spring:
   redis:
     host: 47.107.107.47
-    port: 6379
+    port: 6379
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 47.107.107.47:8848
+      config:
+        server-addr: 47.107.107.47:8848
+mybatis-plus:
+  type-aliases-package: com.zksy.telemetry.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain,com.zksy.system.domain
+  mapper-locations: classpath*:mapper/**/*Mapper.xml