rename ： core

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/bean/influxdb/SensorData.java → snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/core/bean/influxdb/SensorData.java

@@ -1,4 +1,4 @@
-package vip.xiaonuo.coldchain.modular.bean.influxdb;
+package vip.xiaonuo.coldchain.modular.core.bean.influxdb;
 
 /**
  * @author jackzhou

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/config/ColdChainAsyncConfig.java → snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/core/config/ColdChainAsyncConfig.java

@@ -1,4 +1,4 @@
-package vip.xiaonuo.coldchain.modular.config;
+package vip.xiaonuo.coldchain.modular.core.config;
 
 /**
  * @author jackzhou

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/event/SensorDataEvent.java → snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/core/event/SensorDataEvent.java

@@ -1,4 +1,4 @@
-package vip.xiaonuo.coldchain.modular.event;
+package vip.xiaonuo.coldchain.modular.core.event;
 
 /**
  * @author jackzhou
@@ -10,7 +10,7 @@ package vip.xiaonuo.coldchain.modular.event;
 
 import lombok.Getter;
 import org.springframework.context.ApplicationEvent;
-import vip.xiaonuo.coldchain.modular.bean.influxdb.SensorData;
+import vip.xiaonuo.coldchain.modular.core.bean.influxdb.SensorData;
 
 @Getter
 public class SensorDataEvent extends ApplicationEvent {

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/event/SensorDataEventListener.java → snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/core/event/SensorDataEventListener.java

@@ -1,4 +1,4 @@
-package vip.xiaonuo.coldchain.modular.event;
+package vip.xiaonuo.coldchain.modular.core.event;
 
 /**
  * @author jackzhou
@@ -13,7 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
-import vip.xiaonuo.coldchain.modular.bean.influxdb.SensorData;
+import vip.xiaonuo.coldchain.modular.core.bean.influxdb.SensorData;
 import com.github.jfcloud.influxdb.service.JfcloudInfluxDBService;
 
 @Slf4j

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/renke/RKService.java → snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/core/renke/RKService.java

@@ -1,10 +1,10 @@
-package vip.xiaonuo.coldchain.modular.renke;
+package vip.xiaonuo.coldchain.modular.core.renke;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 import rk.netDevice.sdk.p2.ParamIdsData;
 import rk.netDevice.sdk.p2.RSServer;
-import vip.xiaonuo.coldchain.modular.renke.listener.JfcloudColdChainRenKeDefaultDataListener;
+import vip.xiaonuo.coldchain.modular.core.renke.listener.JfcloudColdChainRenKeDefaultDataListener;
 
 /**
  * @author jackzhou

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/renke/RenKeTest.java → snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/core/renke/RenKeTest.java

@@ -1,4 +1,4 @@
-package vip.xiaonuo.coldchain.modular.renke;
+package vip.xiaonuo.coldchain.modular.core.renke;
 
 import rk.netDevice.sdk.p2.*;
 

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/renke/config/JfcloudColdChainConstants.java → snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/core/renke/config/JfcloudColdChainConstants.java

@@ -1,4 +1,4 @@
-package vip.xiaonuo.coldchain.modular.renke.config;
+package vip.xiaonuo.coldchain.modular.core.renke.config;
 
 /**
  * @author jackzhou

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/renke/config/JfcloudColdChainServerAutoConfiguration.java → snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/core/renke/config/JfcloudColdChainServerAutoConfiguration.java

@@ -1,4 +1,4 @@
-package vip.xiaonuo.coldchain.modular.renke.config;
+package vip.xiaonuo.coldchain.modular.core.renke.config;
 
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -10,9 +10,9 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
 import rk.netDevice.sdk.p2.IDataListener;
 import rk.netDevice.sdk.p2.RSServer;
-import vip.xiaonuo.coldchain.modular.renke.listener.JfcloudColdChainRenKeDefaultDataListener;
-import vip.xiaonuo.coldchain.modular.renke.util.IPUtils;
-import vip.xiaonuo.coldchain.modular.service.dataprocess.handler.impl.RenKeColdChainDataHandler;
+import vip.xiaonuo.coldchain.modular.core.renke.util.IPUtils;
+import vip.xiaonuo.coldchain.modular.core.service.dataprocess.handler.impl.RenKeColdChainDataHandler;
+import vip.xiaonuo.coldchain.modular.core.renke.listener.JfcloudColdChainRenKeDefaultDataListener;
 
 import javax.annotation.PreDestroy;
 import java.util.concurrent.ExecutorService;

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/renke/config/JfcloudColdChainServerProperties.java → snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/core/renke/config/JfcloudColdChainServerProperties.java

@@ -1,4 +1,4 @@
-package vip.xiaonuo.coldchain.modular.renke.config;
+package vip.xiaonuo.coldchain.modular.core.renke.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/renke/listener/JfcloudColdChainRenKeDefaultDataListener.java → snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/core/renke/listener/JfcloudColdChainRenKeDefaultDataListener.java

@@ -1,10 +1,10 @@
-package vip.xiaonuo.coldchain.modular.renke.listener;
+package vip.xiaonuo.coldchain.modular.core.renke.listener;
 
 import cn.hutool.json.JSONUtil;
 import lombok.extern.slf4j.Slf4j;
 import rk.netDevice.sdk.p2.*;
-import vip.xiaonuo.coldchain.modular.service.dataprocess.handler.impl.RenKeColdChainDataHandler;
-import vip.xiaonuo.coldchain.modular.service.dataprocess.model.RenKeColdChainMessageData;
+import vip.xiaonuo.coldchain.modular.core.service.dataprocess.handler.impl.RenKeColdChainDataHandler;
+import vip.xiaonuo.coldchain.modular.core.service.dataprocess.model.RenKeColdChainMessageData;
 
 /**
  * 默认的 RK 数据监听器，用于处理设备通信中的各种事件。

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/renke/util/IPUtils.java → snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/core/renke/util/IPUtils.java

@@ -1,4 +1,4 @@
-package vip.xiaonuo.coldchain.modular.renke.util;
+package vip.xiaonuo.coldchain.modular.core.renke.util;
 
 /**
  * @author jackzhou

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/service/dataprocess/handler/AbstractColdChainDataHandler.java → snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/core/service/dataprocess/handler/AbstractColdChainDataHandler.java

@@ -1,6 +1,6 @@
-package vip.xiaonuo.coldchain.modular.service.dataprocess.handler;
+package vip.xiaonuo.coldchain.modular.core.service.dataprocess.handler;
 
-import vip.xiaonuo.coldchain.modular.service.dataprocess.model.ColdChainMessageData;
+import vip.xiaonuo.coldchain.modular.core.service.dataprocess.model.ColdChainMessageData;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/service/dataprocess/handler/ColdChainDataHandler.java → snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/core/service/dataprocess/handler/ColdChainDataHandler.java

@@ -1,6 +1,6 @@
-package vip.xiaonuo.coldchain.modular.service.dataprocess.handler;
+package vip.xiaonuo.coldchain.modular.core.service.dataprocess.handler;
 
-import vip.xiaonuo.coldchain.modular.service.dataprocess.model.ColdChainMessageData;
+import vip.xiaonuo.coldchain.modular.core.service.dataprocess.model.ColdChainMessageData;
 
 /**
  * @author jackzhou

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/service/dataprocess/handler/ColdChainHandlerRegistry.java → snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/core/service/dataprocess/handler/ColdChainHandlerRegistry.java

@@ -1,6 +1,6 @@
-package vip.xiaonuo.coldchain.modular.service.dataprocess.handler;
+package vip.xiaonuo.coldchain.modular.core.service.dataprocess.handler;
 
-import vip.xiaonuo.coldchain.modular.service.dataprocess.model.ColdChainMessageData;
+import vip.xiaonuo.coldchain.modular.core.service.dataprocess.model.ColdChainMessageData;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/service/dataprocess/handler/DataHandlerFactory.java → snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/core/service/dataprocess/handler/DataHandlerFactory.java

@@ -1,7 +1,7 @@
-package vip.xiaonuo.coldchain.modular.service.dataprocess.handler;
+package vip.xiaonuo.coldchain.modular.core.service.dataprocess.handler;
 
 import org.springframework.stereotype.Component;
-import vip.xiaonuo.coldchain.modular.service.dataprocess.model.ColdChainMessageData;
+import vip.xiaonuo.coldchain.modular.core.service.dataprocess.model.ColdChainMessageData;
 
 /**
  * DataHandlerFactory - 工厂类通过 Map 注册并返回适合的处理器

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/service/dataprocess/handler/beanprocessor/ColdChainDataHandlerBeanPostProcessor.java → snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/core/service/dataprocess/handler/beanprocessor/ColdChainDataHandlerBeanPostProcessor.java

@@ -1,11 +1,11 @@
-package vip.xiaonuo.coldchain.modular.service.dataprocess.handler.beanprocessor;
+package vip.xiaonuo.coldchain.modular.core.service.dataprocess.handler.beanprocessor;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.stereotype.Component;
-import vip.xiaonuo.coldchain.modular.service.dataprocess.handler.AbstractColdChainDataHandler;
-import vip.xiaonuo.coldchain.modular.service.dataprocess.handler.ColdChainDataHandler;
-import vip.xiaonuo.coldchain.modular.service.dataprocess.handler.ColdChainHandlerRegistry;
+import vip.xiaonuo.coldchain.modular.core.service.dataprocess.handler.ColdChainHandlerRegistry;
+import vip.xiaonuo.coldchain.modular.core.service.dataprocess.handler.AbstractColdChainDataHandler;
+import vip.xiaonuo.coldchain.modular.core.service.dataprocess.handler.ColdChainDataHandler;
 
 /**
  * @author jackzhou

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/service/dataprocess/handler/impl/HaierColdChainDataHandler.java → snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/core/service/dataprocess/handler/impl/HaierColdChainDataHandler.java

@@ -1,9 +1,9 @@
-package vip.xiaonuo.coldchain.modular.service.dataprocess.handler.impl;
+package vip.xiaonuo.coldchain.modular.core.service.dataprocess.handler.impl;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
-import vip.xiaonuo.coldchain.modular.service.dataprocess.handler.AbstractColdChainDataHandler;
-import vip.xiaonuo.coldchain.modular.service.dataprocess.model.HaierColdChainMessageData;
+import vip.xiaonuo.coldchain.modular.core.service.dataprocess.handler.AbstractColdChainDataHandler;
+import vip.xiaonuo.coldchain.modular.core.service.dataprocess.model.HaierColdChainMessageData;
 
 /**
  * @author jackzhou

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/service/dataprocess/handler/impl/RenKeColdChainDataHandler.java → snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/core/service/dataprocess/handler/impl/RenKeColdChainDataHandler.java

@@ -1,14 +1,14 @@
-package vip.xiaonuo.coldchain.modular.service.dataprocess.handler.impl;
+package vip.xiaonuo.coldchain.modular.core.service.dataprocess.handler.impl;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Component;
 import rk.netDevice.sdk.p2.RealTimeData;
-import vip.xiaonuo.coldchain.modular.bean.influxdb.SensorData;
-import vip.xiaonuo.coldchain.modular.event.SensorDataEvent;
-import vip.xiaonuo.coldchain.modular.service.dataprocess.handler.AbstractColdChainDataHandler;
-import vip.xiaonuo.coldchain.modular.service.dataprocess.model.RenKeColdChainMessageData;
+import vip.xiaonuo.coldchain.modular.core.bean.influxdb.SensorData;
+import vip.xiaonuo.coldchain.modular.core.event.SensorDataEvent;
+import vip.xiaonuo.coldchain.modular.core.service.dataprocess.handler.AbstractColdChainDataHandler;
+import vip.xiaonuo.coldchain.modular.core.service.dataprocess.model.RenKeColdChainMessageData;
 
 import java.time.Instant;
 

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/service/dataprocess/model/ColdChainMessageData.java → snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/core/service/dataprocess/model/ColdChainMessageData.java

@@ -1,4 +1,4 @@
-package vip.xiaonuo.coldchain.modular.service.dataprocess.model;
+package vip.xiaonuo.coldchain.modular.core.service.dataprocess.model;
 
 import java.time.LocalDateTime;
 

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/service/dataprocess/model/HaierColdChainMessageData.java → snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/core/service/dataprocess/model/HaierColdChainMessageData.java

@@ -1,4 +1,4 @@
-package vip.xiaonuo.coldchain.modular.service.dataprocess.model;
+package vip.xiaonuo.coldchain.modular.core.service.dataprocess.model;
 
 import lombok.Data;
 

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/service/dataprocess/model/RenKeColdChainMessageData.java → snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/core/service/dataprocess/model/RenKeColdChainMessageData.java

@@ -1,4 +1,4 @@
-package vip.xiaonuo.coldchain.modular.service.dataprocess.model;
+package vip.xiaonuo.coldchain.modular.core.service.dataprocess.model;
 
 import lombok.Data;
 import rk.netDevice.sdk.p2.RealTimeData;

snowy-plugin/snowy-plugin-coldchain/src/main/resources/META-INF/spring.factories

@@ -1 +1 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=vip.xiaonuo.coldchain.modular.renke.config.JfcloudColdChainServerAutoConfiguration
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=vip.xiaonuo.coldchain.modular.core.renke.config.JfcloudColdChainServerAutoConfiguration

snowy-web-app/src/main/java/vip/xiaonuo/Application.java

@@ -22,7 +22,7 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.Environment;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
-import vip.xiaonuo.coldchain.modular.renke.RKService;
+import vip.xiaonuo.coldchain.modular.core.renke.RKService;
 
 /**
  * SpringBoot方式启动类

snowy-web-app/src/main/resources/_sql/冷链管理系统.sql

@@ -2,19 +2,6 @@ SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 
 
--- ----------------------------
--- Table structure for device_type
--- ----------------------------
-DROP TABLE IF EXISTS `device_type`;
-CREATE TABLE `device_type`  (
-  `id` VARCHAR(50) NOT NULL,
-  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称',
-  `remarks` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述',
-  `type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '类型（0：监控设备，1：目标设备）',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '设备类型' ROW_FORMAT = Dynamic;
-
-
 -- ----------------------------
 -- Table structure for monitor_device 监控设备表
 -- ----------------------------
@@ -35,7 +22,7 @@ CREATE TABLE `monitor_device` (
   `created_by` VARCHAR(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '记录创建用户',  -- 创建用户
   `updated_at` DATETIME NULL DEFAULT NULL COMMENT '记录修改时间',  -- 记录的修改时间
   `updated_by` VARCHAR(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '记录修改用户',  -- 修改用户
-  PRIMARY KEY (`device_id`) USING BTREE
+  PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '监控设备管理表，存储设备信息及其状态管理' ROW_FORMAT = Dynamic;
 
 
@@ -50,7 +37,6 @@ CREATE TABLE `monitor_target`  (
   `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态（1：正常，2：闲置）',
   `monitor_point` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '监控位置区域',
   `sensor_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '传感器类型',
-  `device_type_id` VARCHAR(50) NULL DEFAULT NULL COMMENT '设备类型id',
   `monitor_device_id` VARCHAR(50) NULL DEFAULT NULL COMMENT '监控设备编号',  -- 监控目标设备的UUID
   `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '冷链编号',
   `limit_up` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '报警上限',
@@ -103,7 +89,7 @@ CREATE TABLE monitor_device_parameters (
     value_description TEXT COMMENT '可选的值描述，存储该参数可能的取值描述或枚举值',                   -- 可选的值描述 (如关联继电器)
     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间', -- 创建时间
     updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录更新时间', -- 更新时间
-    UNIQUE KEY(device_id, param_id) COMMENT '确保每个设备的每个参数唯一'           -- 唯一约束，确保每个设备的每个参数唯一
+    UNIQUE KEY(id, param_id) COMMENT '确保每个设备的每个参数唯一'           -- 唯一约束，确保每个设备的每个参数唯一
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='存储设备参数及其配置的数据表';  -- 表级注释