diff --git a/cloud-common/cloud-common-cache/pom.xml b/cloud-common/cloud-common-cache/pom.xml new file mode 100644 index 0000000..488b785 --- /dev/null +++ b/cloud-common/cloud-common-cache/pom.xml @@ -0,0 +1,32 @@ + + + 4.0.0 + + com.muyu + cloud-common + 3.6.3 + + + + cloud-common-cache 缓存基准 + + + cloud-common-cache + + + 23 + 23 + UTF-8 + + + + + + com.muyu + cloud-common-redis + + + + diff --git a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheAbsBasic.java b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheAbsBasic.java new file mode 100644 index 0000000..7d54ada --- /dev/null +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheAbsBasic.java @@ -0,0 +1,63 @@ +package com.muyu.common.cache; + +import com.muyu.common.core.web.domain.BaseEntity; +import com.muyu.common.redis.service.RedisService; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.concurrent.TimeUnit; + +/** + * 抽象缓存层 + * * @className: CacheAbsBasic ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/29 16:08 ⏰ + * * @Version: 1.0 + * * @description: + */ +public abstract class CacheAbsBasic implements CacheBasic{ + + @Autowired + private RedisService redisService; + + @Override + public void put(K key, V value) { + + try { + redisService.setCacheObject(encode(key), value,30L,TimeUnit.MINUTES); + } catch (Exception e) { + throw new RuntimeException("运行时异常，异常信息为：{}"+e.getMessage()); + } + } + + @Override + public V get(K key) { + + try { + return redisService.getCacheObject(encode(key)); + } catch (Exception e) { + throw new RuntimeException("运行时异常，异常信息为：{}"+e.getMessage()); + } + } + + @Override + public void remove(K key) { + + try { + redisService.deleteObject(encode(key)); + } catch (Exception e) { + throw new RuntimeException("运行时异常，异常信息为：{}"+e.getMessage()); + } + } + + @Override + public boolean hashKey(K key){ + Boolean b = false; + + try { + b = redisService.hasKey(encode(key)); + } catch (Exception e) { + throw new RuntimeException("运行时异常，异常信息为：{}"+e.getMessage()); + } + return b; + } +} diff --git a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheBasic.java b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheBasic.java new file mode 100644 index 0000000..8b2ffb3 --- /dev/null +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheBasic.java @@ -0,0 +1,24 @@ +package com.muyu.common.cache; + +import org.springframework.data.redis.core.TimeoutUtils; + +import java.util.Date; +import java.util.concurrent.TimeUnit; + +/** + * 缓存基础 + * * @className: CacheBasic ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/29 16:08 ⏰ + * * @Version: 1.0 + * * @description: + */ +public interface CacheBasic extends PrimaryKeyBasic { + void put(K key, V value); + + V get(K key); + + void remove(K key); + + boolean hashKey(K key); +} diff --git a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java new file mode 100644 index 0000000..50f2341 --- /dev/null +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java @@ -0,0 +1,36 @@ +package com.muyu.common.cache; + +/** + * 主键基础 + * * @className: PrimaryKeyBasic ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/29 16:08 ⏰ + * * @Version: 1.0 + * * @description: + */ +public interface PrimaryKeyBasic { + + /** + * 主键前缀 + * @return + */ + public String keyPre(); + + /** + * 主键编码 + * @param key 缓存建 + * @return 装修建 + */ + public default String encode(K key){ + return keyPre() + key.toString(); + } + + /** + * 主键解码 + * @param key 缓存建 + * @return 装修建 + */ + public default K decode(String key) { + return (K) key.substring(keyPre().length()); + } +} diff --git a/cloud-common/cloud-common-core/pom.xml b/cloud-common/cloud-common-core/pom.xml index 57cf128..77190a1 100644 --- a/cloud-common/cloud-common-core/pom.xml +++ b/cloud-common/cloud-common-core/pom.xml @@ -132,10 +132,10 @@ - - - - + + + + javax.annotation @@ -165,5 +165,4 @@ hutool-all - diff --git a/cloud-common/cloud-common-iotdb/pom.xml b/cloud-common/cloud-common-iotdb/pom.xml new file mode 100644 index 0000000..4604b63 --- /dev/null +++ b/cloud-common/cloud-common-iotdb/pom.xml @@ -0,0 +1,40 @@ + + + 4.0.0 + + com.muyu + cloud-common + 3.6.3 + + + cloud-common-iotdb + + + cloud-common-iotdb 时序性数据存储服务 + + + + 17 + 17 + UTF-8 + + + + + org.apache.iotdb + iotdb-session + 1.3.1 + + + com.alibaba.fastjson2 + fastjson2 + + + org.projectlombok + lombok + + + + diff --git a/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/config/IotDBSessionConfig.java b/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/config/IotDBSessionConfig.java new file mode 100644 index 0000000..042acf0 --- /dev/null +++ b/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/config/IotDBSessionConfig.java @@ -0,0 +1,149 @@ + +package com.muyu.common.iotdb.config; + +import com.alibaba.fastjson2.JSONObject; +import lombok.extern.log4j.Log4j2; +import org.apache.iotdb.isession.SessionDataSet; +import org.apache.iotdb.isession.pool.SessionDataSetWrapper; +import org.apache.iotdb.rpc.IoTDBConnectionException; +import org.apache.iotdb.rpc.StatementExecutionException; +import org.apache.iotdb.session.pool.SessionPool; +import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; +import org.apache.iotdb.tsfile.read.common.Field; +import org.apache.iotdb.tsfile.read.common.RowRecord; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @Author WangXin + * @Data 2024/9/30 + * @Description IotDBSessionConfig配置类 + * @Version 1.0.0 + */ +@Log4j2 +@Component +@Configuration +public class IotDBSessionConfig { + + @Value("${spring.iotdb.username:root}") + private String username; + + @Value("${spring.iotdb.password:root}") + private String password; + + @Value("${spring.iotdb.ip:127.0.0.1}") + private String ip; + + @Value("${spring.iotdb.port:6667}") + private int port; + + @Value("${spring.iotdb.maxSize:10}") + private int maxSize; + + private static SessionPool sessionPool; + + /** + * 获取IotDBSession对象 + * @return iotDBSession对象 + */ + public SessionPool getSessionPool() { + if (sessionPool == null) { + sessionPool = new SessionPool(ip, port, username, password, maxSize); + } + return sessionPool; + } + + /** + * 添加数据 + * @param deviceId + * @param time + * @param measurements + * @param values + */ + public void insertRecord(SessionPool sessionPool,String deviceId, long time, List measurements, List values) { + try { + log.info("iotdb数据入库：device_id:[{}], measurements:[{}], values:[{}]", deviceId, measurements, values); + sessionPool.insertRecord(deviceId, time, measurements, values); + } catch (Exception e) { + log.error("IotDBSession insertRecord失败: deviceId={}, time={}, measurements={}, values={}, error={}", + deviceId, time, measurements, values, e.getMessage()); + } + } + + public SessionDataSet selectRecord(SessionPool sessionPool,String sql) { + log.info("iotdb数据查询：sql:[{}]",sql); + SessionDataSetWrapper sessionDataSetWrapper = null; + try { + log.info("iotdb SQL查询：sql:[{}]", sql); + sessionDataSetWrapper = sessionPool.executeQueryStatement(sql); + return sessionDataSetWrapper.getSessionDataSet(); + } catch (Exception e) { + log.error("IotDBSession executeQueryStatement失败:sql:[{}],error={}", sql, e.getMessage()); + throw new RuntimeException(e); + } + } + + + + public static void main(String[] args) { + SessionPool sessionPool = new SessionPool("127.0.0.1", 6667, "root", "root", 10); + String ROOT_DATA_DATAJSON = "root.car.data.datajson"; + String SELECT_ROOT_DATA_DATAJSON_DATASOURCE = "select * from root.car.data.datajson"; + + String jsonValue = """ + { + "name": "张三", + "age": 28, + "email": "zhangsan@example.com", + "isStudent": false, + "hobbies": ["阅读", "旅行", "编程"], + "address": { + "street": "长安街100号", + "city": "北京", + "postalCode": "100000" + } + } + """; + + IotDBSessionConfig iotDBSessionConfig = new IotDBSessionConfig(); + + List values = new ArrayList<>(); + values.add(jsonValue); + ArrayList objects = new ArrayList<>(); + objects.add("datasource"); + iotDBSessionConfig.insertRecord(sessionPool,ROOT_DATA_DATAJSON,System.currentTimeMillis(),objects,values); + + SessionDataSet sessionDataSet = iotDBSessionConfig.selectRecord(sessionPool,SELECT_ROOT_DATA_DATAJSON_DATASOURCE); + + HashMap> longMapHashMap = new HashMap<>(); + + try { + while (sessionDataSet.hasNext()){ + RowRecord next = sessionDataSet.next(); + long timestamp = next.getTimestamp(); + Map fieldMap = new HashMap<>(); + for (Field field : next.getFields()) { + TSDataType dataType = field.getDataType(); + String stringValue = field.getStringValue(); + fieldMap.put(dataType.name(), stringValue); + } + longMapHashMap.put(timestamp, fieldMap); + } + } catch (StatementExecutionException e) { + throw new RuntimeException(e); + } catch (IoTDBConnectionException e) { + throw new RuntimeException(e); + } + + log.info("数据为：{}", JSONObject.toJSONString(longMapHashMap)); + } + +} + + diff --git a/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/domain/EventActuate.java b/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/domain/EventActuate.java new file mode 100644 index 0000000..f0fad39 --- /dev/null +++ b/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/domain/EventActuate.java @@ -0,0 +1,29 @@ +package com.muyu.common.iotdb.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.List; + +/** + * @Author WangXin + * @Data 2024/9/29 + * @Description 事件驱动对象 + * @Version 1.0.0 + */ +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +public class EventActuate { + /** + * json数据 + */ + private String jsonData; + /** + * 事件驱动key集合 + */ + private List eventKeys; +} diff --git a/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/domain/InsertDataDTO.java b/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/domain/InsertDataDTO.java new file mode 100644 index 0000000..47ceee9 --- /dev/null +++ b/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/domain/InsertDataDTO.java @@ -0,0 +1,40 @@ +package com.muyu.common.iotdb.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.ArrayList; +import java.util.List; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class InsertDataDTO { + private Float temperature; + private String hardware; + private Boolean status; + + public InsertDataDTO buildOne() { + InsertDataDTO insertDataDTO = new InsertDataDTO(); + insertDataDTO.setHardware("ss"); + insertDataDTO.setStatus(true); + insertDataDTO.setTemperature(12.0F); + return insertDataDTO; + } + + public List buildList() { + List insertDataDTOS = new ArrayList<>(); + int buildNum = 10; + for (int i = 0; i < buildNum; i++) { + InsertDataDTO insertDataDTO = new InsertDataDTO(); + insertDataDTO.setHardware(i % 2 == 0 ? "pp" + i : null); + insertDataDTO.setStatus(i % 2 == 0); + insertDataDTO.setTemperature(12.0F + i); + insertDataDTOS.add(insertDataDTO); + } + return insertDataDTOS; + } +} diff --git a/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/domain/ResultEntity.java b/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/domain/ResultEntity.java new file mode 100644 index 0000000..f9ac7ba --- /dev/null +++ b/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/domain/ResultEntity.java @@ -0,0 +1,20 @@ +package com.muyu.common.iotdb.domain; + + +import com.muyu.common.iotdb.domain.dto.IotDbRecordAble; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +public class ResultEntity extends IotDbRecordAble { + + private Float temperature; + + private String hardware; + + private Boolean status; + + private String time; + +} diff --git a/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/domain/TestDataType.java b/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/domain/TestDataType.java new file mode 100644 index 0000000..1b68224 --- /dev/null +++ b/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/domain/TestDataType.java @@ -0,0 +1,18 @@ +package com.muyu.common.iotdb.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class TestDataType { + private Float temperature; + private String hardware; + private Boolean status; + private Double testDouble; + private Long testLong; +} diff --git a/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/domain/dto/IotDbRecordAble.java b/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/domain/dto/IotDbRecordAble.java new file mode 100644 index 0000000..621ae7c --- /dev/null +++ b/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/domain/dto/IotDbRecordAble.java @@ -0,0 +1,14 @@ +package com.muyu.common.iotdb.domain.dto; + +import lombok.Data; + +/** + * @Author WangXin + * @Data 2024/9/30 + * @Description IotDBServiceImpl业务实现层 + * @Version 1.0.0 + */ + +@Data +public class IotDbRecordAble { +} diff --git a/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/domain/dto/MeasurementSchemaValuesDTO.java b/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/domain/dto/MeasurementSchemaValuesDTO.java new file mode 100644 index 0000000..5b4b5e5 --- /dev/null +++ b/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/domain/dto/MeasurementSchemaValuesDTO.java @@ -0,0 +1,23 @@ +package com.muyu.common.iotdb.domain.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; + +import java.util.List; + + +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +public class MeasurementSchemaValuesDTO { + + private List schemaList; + + private List values; + + private List valueIsNullIndex; +} diff --git a/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/service/IotDBService.java b/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/service/IotDBService.java new file mode 100644 index 0000000..b2e068e --- /dev/null +++ b/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/service/IotDBService.java @@ -0,0 +1,105 @@ +package com.muyu.common.iotdb.service; + +import com.muyu.common.iotdb.domain.dto.IotDbRecordAble; +import com.muyu.common.iotdb.domain.dto.MeasurementSchemaValuesDTO; +import org.apache.iotdb.common.rpc.thrift.TAggregationType; +import org.apache.iotdb.isession.SessionDataSet; +import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; +import org.apache.iotdb.tsfile.write.record.Tablet; +import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; + +import java.util.List; +import java.util.Map; + +/** + * @Author WangXin + * @Data 2024/9/28 + * @Description IotDBServiceImpl业务层 + * @Version 1.0.0 + */ +public interface IotDBService { + + void insertTablet(Tablet tablet); + + void insertTablets(Map tablets); + + void insertStringRecord(String deviceId, long time, List measurements, List values); + + void insertRecord(String deviceId, long time, List measurements, List types, List values); + + void insertStringRecords(List deviceIds, List times, List> measurementsList, List> valuesList); + + void insertRecords(List deviceIds, List times, List> measurementsList, List> typesList, List> valuesList); + + void insertStringRecordsOfOneDevice(String deviceId, List times, List> measurementsList, List> valuesList); + + void insertRecordsOfOneDevice(String deviceId, List times, List> measurementsList, List> typesList, List> valuesList); + + void deleteData(String path, long endTime); + + void deleteData(List paths, long endTime); + + SessionDataSet executeRawDataQuery(List paths, long startTime, long endTime, long timeOut); + + List executeRawDataQuery(List paths, long startTime, long endTime, long timeOut, Class clazz); + + SessionDataSet executeLastDataQuery(List paths, long lastTime); + + List executeLastDataQuery(List paths, long lastTime, Class clazz); + + SessionDataSet executeLastDataQueryForOneDevice(String db, String device, List sensors, boolean isLegalPathNodes); + + List executeLastDataQueryForOneDevice(String db, String device, List sensors, boolean isLegalPathNodes, Class clazz); + + SessionDataSet executeAggregationQuery(List paths, List aggregations); + + SessionDataSet executeAggregationQuery(List paths, List aggregations, long startTime, long endTime); + + SessionDataSet executeAggregationQuery(List paths, List aggregations, long startTime, long endTime, long interval); + + SessionDataSet executeAggregationQuery(List paths, List aggregations, long startTime, long endTime, long interval, long slidingStep); + + SessionDataSet executeQueryStatement(String sql); + + + /** + * SQL非查询 + * + * @param sql + */ + void executeNonQueryStatement(String sql); + + /** + * 封装处理数据 + * + * @param sessionDataSet + * @param titleList + */ + List> packagingMapData(SessionDataSet sessionDataSet, List columnNames); + + /** + * 封装处理数据（不支持聚合查询） + * + * @param sessionDataSet 查询返回的结果集 + * @param titleList 查询返回的结果集内的字段名 + * @param clazz 返回数据对应的对象（对象属性必须与字段名对应） + * @param + * @return + */ + List packagingObjectData(SessionDataSet sessionDataSet, List titleList, Class clazz); + + /** + * 根据对象构建MeasurementSchemas + * + * @param object 对象 + * @return + */ + List buildMeasurementSchemas(Object object); + /** + * 根据对象构建MeasurementSchemaValuesDTO + * + * @param object 对象 + * @return + */ + MeasurementSchemaValuesDTO buildMeasurementSchemasAndValues(Object object); +} diff --git a/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/service/impl/IotDBServiceImpl.java b/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/service/impl/IotDBServiceImpl.java new file mode 100644 index 0000000..4bf659a --- /dev/null +++ b/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/service/impl/IotDBServiceImpl.java @@ -0,0 +1,711 @@ +package com.muyu.common.iotdb.service.impl; + +import com.alibaba.fastjson2.JSON; +import com.muyu.common.iotdb.config.IotDBSessionConfig; +import com.muyu.common.iotdb.domain.dto.IotDbRecordAble; +import com.muyu.common.iotdb.domain.dto.MeasurementSchemaValuesDTO; +import com.muyu.common.iotdb.service.IotDBService; +import jakarta.annotation.Resource; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.apache.iotdb.common.rpc.thrift.TAggregationType; +import org.apache.iotdb.isession.SessionDataSet; +import org.apache.iotdb.isession.pool.SessionDataSetWrapper; +import org.apache.iotdb.session.pool.SessionPool; +import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; +import org.apache.iotdb.tsfile.read.common.Field; +import org.apache.iotdb.tsfile.read.common.RowRecord; +import org.apache.iotdb.tsfile.write.record.Tablet; +import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; +import org.springframework.stereotype.Service; + +import java.lang.reflect.Type; +import java.util.*; +import java.util.stream.Collectors; + +/** + * @Author WangXin + * @Data 2024/9/28 + * @Description IotDBServiceImpl业务实现层 + * @Version 1.0.0 + */ +@Service +@Slf4j +public class IotDBServiceImpl implements IotDBService { + + @Resource + private IotDBSessionConfig iotDBSessionConfig; + + /** + * 单设备批量插入数据 + * + * @param tablet + */ + @Override + public void insertTablet(Tablet tablet) { + SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); + try { + log.info("iotdb数据入库：tablet:[{}]", tablet); + sessionPool.insertTablet(tablet); + } catch (Exception e) { + log.error("IotDBSession insertTablet失败: tablet={}, error={}", tablet, e.getMessage()); + } + } + + /** + * 多设备批量插入数据 + * + * @param tablets + */ + @Override + public void insertTablets(Map tablets) { + SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); + try { + log.info("iotdb数据入库：tablets:[{}]", tablets); + sessionPool.insertTablets(tablets); + } catch (Exception e) { + log.error("IotDBSession insertTablets失败: tablets={}, error={}", tablets, e.getMessage()); + } + } + + /** + * 单条数据插入（string类型数据项） + * + * @param deviceId 设备名（表名）root.ln.wf01.wt01 + * @param time 时间戳 + * @param measurements 数据项列表 + * @param values 数据项对应值列表 + */ + @Override + public void insertStringRecord(String deviceId, long time, List measurements, List values) { + SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); + try { + log.info("iotdb数据入库：device_id:[{}], measurements:[{}], values:[{}]", deviceId, measurements, values); + sessionPool.insertRecord(deviceId, time, measurements, values); + } catch (Exception e) { + log.error("IotDBSession insertRecord失败: deviceId={}, time={}, measurements={}, values={}, error={}", + deviceId, time, measurements, values, e.getMessage()); + } + } + + /** + * 单条数据插入（不同类型数据项） + * + * @param deviceId 设备名（表名）root.ln.wf01.wt01 + * @param time 时间戳 + * @param measurements 数据项列表 + * @param types 数据项对应类型列表 + * @param values 数据项对应值列表 + */ + @Override + public void insertRecord(String deviceId, long time, List measurements, List types, List values) { + SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); + try { + log.info("iotdb数据入库：device_id:[{}], measurements:[{}], types:[{}], values:[{}]", deviceId, measurements, types, values); + sessionPool.insertRecord(deviceId, time, measurements, types, values); + } catch (Exception e) { + log.error("IotDBSession insertRecordHasTypes失败: deviceId={}, time={}, measurements={},types={}, values={}, error={}", + deviceId, time, measurements, types, values, e.getMessage()); + } + } + + + /** + * 多个设备多条数据插入（string类型数据项） + * + * @param deviceIds 多个设备名（表名）root.ln.wf01.wt01 + * @param times 时间戳的列表 + * @param measurementsList 数据项列表的列表 + * @param valuesList 数据项对应值列表的列表 + */ + @Override + public void insertStringRecords(List deviceIds, List times, List> measurementsList, List> valuesList) { + SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); + try { + log.info("iotdb数据入库：deviceIds:[{}], measurementsList:[{}], valuesList:[{}]", deviceIds, measurementsList, valuesList); + sessionPool.insertRecords(deviceIds, times, measurementsList, valuesList); + } catch (Exception e) { + log.error("IotDBSession insertRecords失败: deviceIds={}, times={}, measurementsList={}, valuesList={}, error={}", + deviceIds, times, measurementsList, valuesList, e.getMessage()); + } + } + + /** + * 多个设备多条数据插入（不同类型数据项） + * + * @param deviceIds 多个设备名（表名））root.ln.wf01.wt01 + * @param times 时间戳的列表 + * @param measurementsList 数据项列表的列表 + * @param typesList 数据项对应类型列表的列表 + * @param valuesList 数据项对应值列表的列表 + */ + @Override + public void insertRecords(List deviceIds, List times, List> measurementsList, List> typesList, List> valuesList) { + SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); + try { + log.info("iotdb数据入库：deviceIds:[{}], measurementsList:[{}], typesList：[{}], valuesList:[{}]", deviceIds, measurementsList, typesList, valuesList); + sessionPool.insertRecords(deviceIds, times, measurementsList, typesList, valuesList); + } catch (Exception e) { + log.error("IotDBSession insertRecords失败: deviceIds={}, times={}, measurementsList={}, typesList=[],valuesList={}, error={}", + deviceIds, times, measurementsList, typesList, valuesList, e.getMessage()); + } + } + + /** + * 单个设备多条数据插入（string类型数据项） + * + * @param deviceId 单个设备名（表名））root.ln.wf01.wt01 + * @param times 时间戳的列表 + * @param measurementsList 数据项列表的列表 + * @param valuesList 数据项对应值列表的列表 + */ + @Override + public void insertStringRecordsOfOneDevice(String deviceId, List times, List> measurementsList, List> valuesList) { + SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); + try { + log.info("iotdb数据入库：deviceId:[{}], measurementsList:[{}], valuesList:[{}]", deviceId, measurementsList, valuesList); + sessionPool.insertStringRecordsOfOneDevice(deviceId, times, measurementsList, valuesList); + } catch (Exception e) { + log.error("IotDBSession insertStringRecordsOfOneDevice失败: deviceId={}, times={}, measurementsList={}, valuesList={}, error={}", + deviceId, times, measurementsList, valuesList, e.getMessage()); + } + } + + /** + * 单个设备多条数据插入（不同类型数据项） + * + * @param deviceId 单个设备名（表名））root.ln.wf01.wt01 + * @param times 时间戳的列表 + * @param measurementsList 数据项列表的列表 + * @param typesList 数据项对应类型列表的列表 + * @param valuesList 数据项对应值列表的列表 + */ + @Override + public void insertRecordsOfOneDevice(String deviceId, List times, List> measurementsList, List> typesList, List> valuesList) { + SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); + try { + log.info("iotdb数据入库：deviceId:[{}], measurementsList:[{}], typesList：[{}], valuesList:[{}]", deviceId, measurementsList, typesList, valuesList); + sessionPool.insertRecordsOfOneDevice(deviceId, times, measurementsList, typesList, valuesList); + } catch (Exception e) { + log.error("IotDBSession insertRecordsOfOneDevice失败: deviceId={}, times={}, measurementsList={}, typesList=[],valuesList={}, error={}", deviceId, times, measurementsList, typesList, valuesList, e.getMessage()); + } + } + + /** + * 删除数据（删除一个时间序列在某个时间点前或这个时间点的数据） + * + * @param path 单个字段 root.ln.wf01.wt01.temperature + * @param endTime 删除时间点 + */ + @Override + public void deleteData(String path, long endTime) { + SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); + try { + log.info("iotdb数据删除：path:[{}], endTime:[{}]", path, endTime); + sessionPool.deleteData(path, endTime); + } catch (Exception e) { + log.error("IotDBSession deleteData失败: deviceId={}, times={},error={}", path, endTime, e.getMessage()); + } + } + + /** + * 删除数据（删除多个时间序列在某个时间点前或这个时间点的数据） + * + * @param paths 多个字段（表名）） root.ln.wf01.wt01.temperature + * @param endTime 删除时间点 + */ + @Override + public void deleteData(List paths, long endTime) { + SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); + try { + log.info("iotdb数据删除：paths:[{}], endTime:[{}]", paths, endTime); + sessionPool.deleteData(paths, endTime); + } catch (Exception e) { + log.error("IotDBSession deleteData失败: paths={}, times={},error={}", paths, endTime, e.getMessage()); + } + } + + /** + * 数据查询（时间序列原始数据范围查询，时间范围为左闭右开区间，包含开始时间但不包含结束时间） + * + * @param paths 多个字段（表名）） root.ln.wf01.wt01.temperature + * @param startTime 开始时间 + * @param endTime 结束时间 + * @param outTime 超时时间 + * @return SessionDataSet (Time,paths) + */ + @Override + public SessionDataSet executeRawDataQuery(List paths, long startTime, long endTime, long outTime) { + SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); + SessionDataSetWrapper sessionDataSetWrapper = null; + try { + log.info("iotdb数据查询：paths:[{}], startTime：[{}], endTime:[{}],outTime:[{}]", paths, startTime, endTime, outTime); + sessionDataSetWrapper = sessionPool.executeRawDataQuery(paths, startTime, endTime, outTime); + return sessionDataSetWrapper.getSessionDataSet(); + } catch (Exception e) { + log.error("IotDBSession executeRawDataQuery失败: paths={}, startTime：[{}], endTime:[{}],outTime:[{}],error={}", paths, startTime, endTime, outTime, e.getMessage()); + } finally { + sessionPool.closeResultSet(sessionDataSetWrapper); + } + return null; + } + + /** + * 数据查询（时间序列原始数据范围查询，时间范围为左闭右开区间，包含开始时间但不包含结束时间） + * + * @param paths 多个字段（表名）） root.ln.wf01.wt01.temperature + * @param startTime 开始时间 + * @param endTime 结束时间 + * @param outTime 超时时间 + * @param clazz 返回数据对应的对象（对象属性必须与字段名对应） + * @param + * @return + */ + @Override + public List executeRawDataQuery(List paths, long startTime, long endTime, long outTime, Class clazz) { + SessionDataSet sessionDataSet = executeRawDataQuery(paths, startTime, endTime, outTime); + List columnNames = sessionDataSet.getColumnNames(); + List resultEntities = null; + try { + resultEntities = packagingObjectData(sessionDataSet, columnNames, clazz); + } catch (Exception e) { + log.error("IotDBSession executeRawDataQuery失败: paths={}, startTime：[{}], endTime:[{}],outTime:[{}],error={}", paths, startTime, endTime, outTime, e.getMessage()); + } + return resultEntities; + } + + /** + * 最新点查询(查询最后一条时间戳大于等于某个时间点的数据) + * + * @param paths 多个字段（表名）） root.ln.wf01.wt01.temperature + * @param lastTime 结束时间 + * @return SessionDataSet + */ + @Override + public SessionDataSet executeLastDataQuery(List paths, long lastTime) { + SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); + SessionDataSetWrapper sessionDataSetWrapper = null; + try { + log.info("iotdb数据查询：paths:[{}], lastTime:[{}]", paths, lastTime); + sessionDataSetWrapper = sessionPool.executeLastDataQuery(paths, lastTime); + return sessionDataSetWrapper.getSessionDataSet(); + } catch (Exception e) { + log.error("IotDBSession executeLastDataQuery失败: paths={}, lastTime：[{}], error={}", paths, lastTime, e.getMessage()); + } finally { + sessionPool.closeResultSet(sessionDataSetWrapper); + } + return null; + } + + /** + * 最新点查询(查询最后一条时间戳大于等于某个时间点的数据) + * + * @param + * @param paths 多个字段（表名）） root.ln.wf01.wt01.temperature + * @param lastTime 结束时间 + * @param clazz 返回数据对应的对象（对象属性必须与字段名对应） + * @return + */ + @Override + public List executeLastDataQuery(List paths, long lastTime, Class clazz) { + SessionDataSet sessionDataSet = executeLastDataQuery(paths, lastTime); + List columnNames = sessionDataSet.getColumnNames(); + List resultEntities = null; + try { + resultEntities = packagingObjectData(sessionDataSet, columnNames, clazz); + } catch (Exception e) { + log.error("IotDBSession executeLastDataQuery失败: paths={}, lastTime：[{}], error={}", paths, lastTime, e.getMessage()); + } + return resultEntities; + } + + /** + * 最新点查询（快速查询单设备下指定序列最新点） + * + * @param db root.ln.wf01 + * @param device root.ln.wf01.wt01 + * @param sensors temperature，status(字段名) + * @param isLegalPathNodes true(避免路径校验) + * @return SessionDataSet + */ + @Override + public SessionDataSet executeLastDataQueryForOneDevice(String db, String device, List sensors, boolean isLegalPathNodes) { + SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); + SessionDataSetWrapper sessionDataSetWrapper = null; + try { + log.info("iotdb数据查询：db:[{}], device:[{}],sensors:[{}], isLegalPathNodes:[{}]", db, device, sensors, isLegalPathNodes); + sessionDataSetWrapper = sessionPool.executeLastDataQueryForOneDevice(db, device, sensors, isLegalPathNodes); + return sessionDataSetWrapper.getSessionDataSet(); + } catch (Exception e) { + log.error("IotDBSession executeLastDataQueryForOneDevice失败: db:[{}], device:[{}],sensors:[{}], isLegalPathNodes:[{}], error={}", db, device, sensors, isLegalPathNodes, e.getMessage()); + } finally { + sessionPool.closeResultSet(sessionDataSetWrapper); + } + return null; + } + + /** + * @param db root.ln.wf01 + * @param device root.ln.wf01.wt01 + * @param sensors temperature，status(字段名) + * @param isLegalPathNodes true(避免路径校验) + * @param clazz 返回数据对应的对象（对象属性必须与字段名对应） + * @param + * @return + */ + @Override + public List executeLastDataQueryForOneDevice(String db, String device, List sensors, boolean isLegalPathNodes, Class clazz) { + SessionDataSet sessionDataSet = executeLastDataQueryForOneDevice(db, device, sensors, isLegalPathNodes); + List columnNames = sessionDataSet.getColumnNames(); + List resultEntities = null; + try { + resultEntities = packagingObjectData(sessionDataSet, columnNames, clazz); + } catch (Exception e) { + log.error("IotDBSession executeLastDataQueryForOneDevice失败: db:[{}], device:[{}],sensors:[{}], isLegalPathNodes:[{}], error={}", db, device, sensors, isLegalPathNodes, e.getMessage()); + } + return resultEntities; + } + + /** + * 聚合查询 + * + * @param paths 多个字段（表名）） root.ln.wf01.wt01.temperature + * @param aggregations 聚合操作 TAggregationType.SUM,TAggregationType.COUNT + * @return SessionDataSet + */ + @Override + public SessionDataSet executeAggregationQuery(List paths, List aggregations) { + SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); + SessionDataSetWrapper sessionDataSetWrapper = null; + try { + log.info("iotdb聚合查询：paths:[{}], aggregations：[{}]", paths, aggregations); + sessionDataSetWrapper = sessionPool.executeAggregationQuery(paths, aggregations); + return sessionDataSetWrapper.getSessionDataSet(); + } catch (Exception e) { + log.error("IotDBSession executeAggregationQuery失败: paths:[{}], aggregations：[{}] ,error={}", paths, aggregations, e.getMessage()); + } finally { + sessionPool.closeResultSet(sessionDataSetWrapper); + } + return null; + } + + /** + * 聚合查询(时间序列原始数据范围查询，时间范围为左闭右开区间，包含开始时间但不包含结束时间) + * + * @param paths 多个字段（表名）） root.ln.wf01.wt01.temperature + * @param aggregations 聚合操作 TAggregationType.SUM,TAggregationType.COUNT + * @param startTime 开始时间(包含) + * @param endTime 结束时间 + * @return SessionDataSet + */ + @Override + public SessionDataSet executeAggregationQuery(List paths, List aggregations, long startTime, long endTime) { + SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); + SessionDataSetWrapper sessionDataSetWrapper = null; + try { + log.info("iotdb聚合查询：paths:[{}], aggregations：[{}],startTime：[{}], endTime:[{}]", paths, aggregations, startTime, endTime); + sessionDataSetWrapper = sessionPool.executeAggregationQuery(paths, aggregations, startTime, endTime); + return sessionDataSetWrapper.getSessionDataSet(); + } catch (Exception e) { + log.error("IotDBSession executeAggregationQuery失败: paths:[{}], aggregations：[{}] ,startTime：[{}], endTime:[{}],error={}", paths, aggregations, startTime, endTime, e.getMessage()); + } finally { + sessionPool.closeResultSet(sessionDataSetWrapper); + } + return null; + } + + /** + * 聚合查询(支持按照时间区间分段查询) + * + * @param paths 多个字段（表名）） root.ln.wf01.wt01.temperature + * @param aggregations 聚合操作 TAggregationType.SUM,TAggregationType.COUNT + * @param startTime 开始时间(包含) + * @param endTime 结束时间 + * @param interval + * @return SessionDataSet + */ + @Override + public SessionDataSet executeAggregationQuery(List paths, List aggregations, long startTime, long endTime, long interval) { + SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); + SessionDataSetWrapper sessionDataSetWrapper = null; + try { + log.info("iotdb聚合查询：paths:[{}], aggregations：[{}],startTime：[{}], endTime:[{}] ,interval:[{}]", paths, aggregations, startTime, endTime, interval); + sessionDataSetWrapper = sessionPool.executeAggregationQuery(paths, aggregations, startTime, endTime, interval); + return sessionDataSetWrapper.getSessionDataSet(); + } catch (Exception e) { + log.error("IotDBSession executeAggregationQuery失败: paths:[{}], aggregations：[{}] ,startTime：[{}], endTime:[{}], interval:[{}], error={}", paths, aggregations, startTime, endTime, interval, e.getMessage()); + } finally { + sessionPool.closeResultSet(sessionDataSetWrapper); + } + return null; + } + + /** + * 聚合查询(支持按照时间区间分段查询) + * + * @param paths 多个字段（表名）） root.ln.wf01.wt01.temperature + * @param aggregations 聚合操作 TAggregationType.SUM,TAggregationType.COUNT + * @param startTime 开始时间(包含) + * @param endTime 结束时间 + * @param interval + * @param slidingStep + * @return SessionDataSet + */ + @Override + public SessionDataSet executeAggregationQuery(List paths, List aggregations, long startTime, long endTime, long interval, long slidingStep) { + SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); + SessionDataSetWrapper sessionDataSetWrapper = null; + + try { + log.info("iotdb聚合查询：paths:[{}], aggregations：[{}],startTime：[{}], endTime:[{}] ,interval:[{}], slidingStep:[{}]", paths, aggregations, startTime, endTime, interval, slidingStep); + sessionDataSetWrapper = sessionPool.executeAggregationQuery(paths, aggregations, startTime, endTime, interval, slidingStep); + return sessionDataSetWrapper.getSessionDataSet(); + } catch (Exception e) { + log.error("IotDBSession executeAggregationQuery失败: paths:[{}], aggregations：[{}] ,startTime：[{}], endTime:[{}], interval:[{}], slidingStep:[{}] ,error={}", paths, aggregations, startTime, endTime, interval, slidingStep, e.getMessage()); + } finally { + sessionPool.closeResultSet(sessionDataSetWrapper); + } + return null; + } + + /** + * SQL查询 + * + * @param sql + * @return + */ + @Override + public SessionDataSet executeQueryStatement(String sql) { + SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); + SessionDataSetWrapper sessionDataSetWrapper = null; + + try { + log.info("iotdb SQL查询：sql:[{}]", sql); + sessionDataSetWrapper = sessionPool.executeQueryStatement(sql); + return sessionDataSetWrapper.getSessionDataSet(); + } catch (Exception e) { + log.error("IotDBSession executeQueryStatement失败:sql:[{}],error={}", sql, e.getMessage()); + } finally { + sessionPool.closeResultSet(sessionDataSetWrapper); + } + return null; + } + + /** + * SQL非查询 + * + * @param sql + */ + @Override + public void executeNonQueryStatement(String sql) { + SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); + try { + log.info("iotdb SQL无查询：sql:[{}]", sql); + sessionPool.executeNonQueryStatement(sql); + } catch (Exception e) { + log.error("IotDBSession executeNonQueryStatement失败:sql:[{}],error={}", sql, e.getMessage()); + } + } + + /** + * 封装处理数据 + * + * @param sessionDataSet + * @param titleList + */ + @SneakyThrows + @Override + public List> packagingMapData(SessionDataSet sessionDataSet, List titleList) { + int fetchSize = sessionDataSet.getFetchSize(); + List> resultList = new ArrayList<>(); + titleList.remove("Time"); + if (fetchSize > 0) { + while (sessionDataSet.hasNext()) { + Map resultMap = new HashMap<>(); + RowRecord next = sessionDataSet.next(); + List fields = next.getFields(); + String timeString = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(next.getTimestamp()); + resultMap.put("time", timeString); + for (int i = 0; i < fields.size(); i++) { + Field field = fields.get(i); + if (field.getDataType() == null || field.getObjectValue(field.getDataType()) == null) { + resultMap.put(splitString(titleList.get(i)), null); + } else { + resultMap.put(splitString(titleList.get(i)), field.getObjectValue(field.getDataType()).toString()); + } + } + resultList.add(resultMap); + } + } + return resultList; + } + + /** + * 封装处理数据（不支持聚合查询） + * + * @param sessionDataSet 查询返回的结果集 + * @param titleList 查询返回的结果集内的字段名 + * @param clazz 返回数据对应的对象（对象属性必须与字段名对应） + * @param + * @return + */ + @SneakyThrows + @Override + public List packagingObjectData(SessionDataSet sessionDataSet, List titleList, Class clazz) { + int fetchSize = sessionDataSet.getFetchSize(); + List resultList = new ArrayList<>(); + titleList.remove("Time"); + if (fetchSize > 0) { + while (sessionDataSet.hasNext()) { + Map resultMap = new HashMap<>(); + RowRecord next = sessionDataSet.next(); + List fields = next.getFields(); + String timeString = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(next.getTimestamp()); + resultMap.put("time", timeString); + if (titleList.stream().anyMatch(str -> str.contains("."))) { + for (int i = 0; i < fields.size(); i++) { + Field field = fields.get(i); + String title = titleList.get(i); + if (field.getDataType() == null || field.getObjectValue(field.getDataType()) == null) { + resultMap.put(splitString(title), null); + } else { + resultMap.put(splitString(title), field.getObjectValue(field.getDataType()).toString()); + } + } + } else { + Field fieldName = fields.get(0); + Field fieldValue = fields.get(1); + Field fieldDataType = fields.get(2); + if (fieldName.getDataType() != null && fieldName.getObjectValue(fieldName.getDataType()) != null) { + String mapKey = fieldName.getObjectValue(fieldName.getDataType()).toString(); + Object mapValue = convertStringToType(fieldValue.getObjectValue(fieldValue.getDataType()).toString(), fieldDataType.getObjectValue(fieldDataType.getDataType()).toString()); + resultMap.put(splitString(mapKey), mapValue); + } + } + + String jsonString = JSON.toJSONString(resultMap); + resultList.add(JSON.parseObject(jsonString, (Type) clazz)); + } + } + return resultList; + } + + /** + * 分割获取字段名 + * + * @param str + * @return 字段名 + */ + public static String splitString(String str) { + String[] parts = str.split("\\."); + if (parts.length <= 0) { + return str; + } else { + return parts[parts.length - 1]; + } + } + + /** + * 根据数据值和数据类型返回对应数据类型数据 + * + * @param value 数据值 + * @param typeName 数据类型 + * @return 转换后的数据值 + */ + public static Object convertStringToType(String value, String typeName) { + String type = typeName.toLowerCase(); + if (type.isEmpty()) { + return value; + } + if ("boolean".equals(type)) { + return Boolean.parseBoolean(value); + } else if ("double".equals(type)) { + return Double.parseDouble(value); + } else if ("int32".equals(type)) { + return Integer.parseInt(value); + } else if ("int64".equals(type)) { + return Long.parseLong(value); + } else if ("float".equals(type)) { + return Float.parseFloat(value); + } else if ("text".equals(type)) { + return value; + } else { + return value; + } + } + + /** + * 根据对象属性的数据类型返回对应的TSDataType + * + * @param type 属性的数据类型 + * @return TSDataType + */ + public static TSDataType getTsDataTypeByString(String type) { + String typeName = splitString(type).toLowerCase(); + if ("boolean".equals(typeName)) { + return TSDataType.BOOLEAN; + } else if ("double".equals(typeName)) { + return TSDataType.DOUBLE; + } else if ("int".equals(typeName) || "integer".equals(typeName)) { + return TSDataType.INT32; + } else if ("long".equals(typeName)) { + return TSDataType.INT64; + } else if ("float".equals(typeName)) { + return TSDataType.FLOAT; + } else if ("text".equals(typeName)) { + return TSDataType.TEXT; + } else if ("string".equals(typeName)) { + return TSDataType.TEXT; + } else { + return TSDataType.UNKNOWN; + } + } + + /** + * 根据对象构建MeasurementSchemas + * + * @param obj 对象 + * @return + */ + @Override + public List buildMeasurementSchemas(Object obj) { + java.lang.reflect.Field[] fields = obj.getClass().getDeclaredFields(); + List schemaList = Arrays.stream(fields).map(field -> + new MeasurementSchema(field.getName(), + getTsDataTypeByString( + field.getType().getName() + ))). + collect(Collectors.toList()); + return schemaList; + } + + /** + * 根据对象构建MeasurementSchemaValuesDTO + * + * @param obj 对象 + * @return + */ + @SneakyThrows + @Override + public MeasurementSchemaValuesDTO buildMeasurementSchemasAndValues(Object obj) { + MeasurementSchemaValuesDTO measurementSchemaValuesDTO = new MeasurementSchemaValuesDTO(); + java.lang.reflect.Field[] fields = obj.getClass().getDeclaredFields(); + List schemaList = new ArrayList<>(); + List values = new ArrayList<>(); + List valuesIsNullIndex = new ArrayList<>(); + int valueIndex = 0; + for (java.lang.reflect.Field field : fields) { + MeasurementSchema measurementSchema = new MeasurementSchema(field.getName(), getTsDataTypeByString(field.getType().getName())); + schemaList.add(measurementSchema); + Object value = field.get(obj); + if (value == null) { + valuesIsNullIndex.add(valueIndex); + } + values.add(value); + valueIndex++; + } + measurementSchemaValuesDTO.setSchemaList(schemaList); + measurementSchemaValuesDTO.setValues(values); + return measurementSchemaValuesDTO; + } +} diff --git a/cloud-common/cloud-common-iotdb/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-common/cloud-common-iotdb/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..cc3e2eb --- /dev/null +++ b/cloud-common/cloud-common-iotdb/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.muyu.data.iotdb.config.IotDBSessionConfig diff --git a/cloud-common/pom.xml b/cloud-common/pom.xml index 0aef952..bc1af9b 100644 --- a/cloud-common/pom.xml +++ b/cloud-common/pom.xml @@ -20,6 +20,8 @@ cloud-common-system cloud-common-xxl cloud-common-rabbit + cloud-common-cache + cloud-common-iotdb cloud-common @@ -29,12 +31,5 @@ cloud-common通用模块 - - - com.muyu - cloud-server - 3.6.3 - - diff --git a/cloud-modules/cloud-modules-enterprise/.gitignore b/cloud-modules/cloud-modules-enterpise/.gitignore similarity index 100% rename from cloud-modules/cloud-modules-enterprise/.gitignore rename to cloud-modules/cloud-modules-enterpise/.gitignore diff --git a/cloud-modules/cloud-modules-enterpise/enterpise-cache/pom.xml b/cloud-modules/cloud-modules-enterpise/enterpise-cache/pom.xml new file mode 100644 index 0000000..780d646 --- /dev/null +++ b/cloud-modules/cloud-modules-enterpise/enterpise-cache/pom.xml @@ -0,0 +1,37 @@ + + + 4.0.0 + + com.muyu + cloud-modules-enterpise + 3.6.3 + + + enterpise-cache + + + 17 + 17 + UTF-8 + + + + + + + + com.muyu + cloud-common-cache + 3.6.3 + + + + com.muyu + enterpise-common + 3.6.3 + + + + diff --git a/cloud-modules/cloud-modules-enterpise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/MessageValueCacheService.java b/cloud-modules/cloud-modules-enterpise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/MessageValueCacheService.java new file mode 100644 index 0000000..758cf5d --- /dev/null +++ b/cloud-modules/cloud-modules-enterpise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/MessageValueCacheService.java @@ -0,0 +1,41 @@ +package com.muyu.enterpise.cache; + +import com.muyu.common.cache.CacheAbsBasic; +import com.muyu.domain.MessageValue; +import org.springframework.stereotype.Component; + +/** + * @version 1.0 + * @Author xie ya ru + * @Date 2024/9/29 20:04 + * @注释 + */ +@Component +public class MessageValueCacheService extends CacheAbsBasic { + + /** + * 前缀 + * @return + */ + @Override + public String keyPre() { + return"messageValue:info:"; + } + + + @Override + public String encode(String key) { + return super.encode(key); + } + + + /** + * 解密 + * @param key 缓存建 + * @return + */ + @Override + public String decode(String key) { + return key.replace("messageValue:info:",""); + } +} diff --git a/cloud-modules/cloud-modules-enterpise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/SysCarCacheService.java b/cloud-modules/cloud-modules-enterpise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/SysCarCacheService.java new file mode 100644 index 0000000..898694f --- /dev/null +++ b/cloud-modules/cloud-modules-enterpise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/SysCarCacheService.java @@ -0,0 +1,32 @@ +package com.muyu.enterpise.cache; + +import com.muyu.common.cache.CacheAbsBasic; +import com.muyu.domain.SysCar; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @version 1.0 + * @Author xie ya ru + * @Date 2024/9/30 11:06 + * @注释 + */ +@Component +public class SysCarCacheService extends CacheAbsBasic { + + @Override + public String keyPre() { + return "sysCar:info:"; + } + + @Override + public String encode(String key) { + return super.encode(key); + } + + @Override + public String decode(String key) { + return super.decode(key); + } +} diff --git a/cloud-modules/cloud-modules-enterpise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/SysCarTypeCacheService.java b/cloud-modules/cloud-modules-enterpise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/SysCarTypeCacheService.java new file mode 100644 index 0000000..112439d --- /dev/null +++ b/cloud-modules/cloud-modules-enterpise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/SysCarTypeCacheService.java @@ -0,0 +1,29 @@ +package com.muyu.enterpise.cache; + +import com.muyu.common.cache.CacheAbsBasic; +import com.muyu.domain.SysCarType; +import org.springframework.stereotype.Component; + +/** + * @version 1.0 + * @Author xie ya ru + * @Date 2024/9/30 11:18 + * @注释 + */ +@Component +public class SysCarTypeCacheService extends CacheAbsBasic { + @Override + public String keyPre() { + return "sysCarType:info:"; + } + + @Override + public String encode(String key) { + return super.encode(key); + } + + @Override + public String decode(String key) { + return super.decode(key); + } +} diff --git a/cloud-modules/cloud-modules-enterpise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/WarnStrategyCacjeService.java b/cloud-modules/cloud-modules-enterpise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/WarnStrategyCacjeService.java new file mode 100644 index 0000000..46fa854 --- /dev/null +++ b/cloud-modules/cloud-modules-enterpise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/WarnStrategyCacjeService.java @@ -0,0 +1,32 @@ +package com.muyu.enterpise.cache; + +import com.muyu.common.cache.CacheAbsBasic; +import com.muyu.domain.WarnStrategy; +import org.springframework.stereotype.Component; + +/** + * @Author：yan + * @Package：com.muyu.enterpise.cache + * @Project：plus + * @name：WarnStrategyCacjeService + * @Date：2024/10/6 19:26 + */ +@Component +public class WarnStrategyCacjeService extends CacheAbsBasic { + + + @Override + public String keyPre() { + return "sysCarType:info:"; + } + + @Override + public String encode(String key) { + return super.encode(key); + } + + @Override + public String decode(String key) { + return super.decode(key); + } +} diff --git a/cloud-modules/cloud-modules-enterpise/enterpise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-modules/cloud-modules-enterpise/enterpise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..98352f9 --- /dev/null +++ b/cloud-modules/cloud-modules-enterpise/enterpise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.muyu.enterpise.cache.MessageValueCacheService diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-client/.gitignore b/cloud-modules/cloud-modules-enterpise/enterpise-client/.gitignore similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-client/.gitignore rename to cloud-modules/cloud-modules-enterpise/enterpise-client/.gitignore diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-client/pom.xml b/cloud-modules/cloud-modules-enterpise/enterpise-client/pom.xml similarity index 92% rename from cloud-modules/cloud-modules-enterprise/enterpise-client/pom.xml rename to cloud-modules/cloud-modules-enterpise/enterpise-client/pom.xml index f580ecb..e0b8787 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-client/pom.xml +++ b/cloud-modules/cloud-modules-enterpise/enterpise-client/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.muyu - cloud-modules-enterprise + cloud-modules-enterpise 3.6.3 diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-client/src/main/java/com/muyu/Main.java b/cloud-modules/cloud-modules-enterpise/enterpise-client/src/main/java/com/muyu/Main.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-client/src/main/java/com/muyu/Main.java rename to cloud-modules/cloud-modules-enterpise/enterpise-client/src/main/java/com/muyu/Main.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/.gitignore b/cloud-modules/cloud-modules-enterpise/enterpise-common/.gitignore similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/.gitignore rename to cloud-modules/cloud-modules-enterpise/enterpise-common/.gitignore diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml b/cloud-modules/cloud-modules-enterpise/enterpise-common/pom.xml similarity index 87% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml rename to cloud-modules/cloud-modules-enterpise/enterpise-common/pom.xml index 8c64509..7521c10 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml +++ b/cloud-modules/cloud-modules-enterpise/enterpise-common/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.muyu - cloud-modules-enterprise + cloud-modules-enterpise 3.6.3 @@ -19,17 +19,6 @@ - - com.muyu - cloud-common - 3.6.3 - - - - com.muyu - enterpise-common - ${muyu.version} - org.eclipse.paho diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarAndGroupMiddle.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/CarAndGroupMiddle.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarAndGroupMiddle.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/CarAndGroupMiddle.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFaultMessage.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/CarFaultMessage.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFaultMessage.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/CarFaultMessage.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFaultRule.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/CarFaultRule.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFaultRule.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/CarFaultRule.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFence.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/CarFence.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFence.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/CarFence.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFenceClazz.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/CarFenceClazz.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFenceClazz.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/CarFenceClazz.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFenceType.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/CarFenceType.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFenceType.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/CarFenceType.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarInformation.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/CarInformation.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarInformation.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/CarInformation.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarMiddle.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/CarMiddle.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarMiddle.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/CarMiddle.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarType.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/CarType.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarType.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/CarType.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultCode.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/FaultCode.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultCode.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/FaultCode.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultCondition.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/FaultCondition.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultCondition.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/FaultCondition.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultLabel.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/FaultLabel.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultLabel.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/FaultLabel.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultLog.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/FaultLog.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultLog.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/FaultLog.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultReport.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/FaultReport.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultReport.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/FaultReport.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultRule.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/FaultRule.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultRule.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/FaultRule.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultType.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/FaultType.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultType.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/FaultType.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FenceGroup.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/FenceGroup.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FenceGroup.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/FenceGroup.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageDao.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/MessageDao.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageDao.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/MessageDao.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageTemplate.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/MessageTemplate.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageTemplate.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/MessageTemplate.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageValue.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/MessageValue.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageValue.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/MessageValue.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCar.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/SysCar.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCar.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/SysCar.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCarFault.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/SysCarFault.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCarFault.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/SysCarFault.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCarType.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/SysCarType.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCarType.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/SysCarType.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnLevel.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/WarnLevel.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnLevel.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/WarnLevel.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnLogs.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/WarnLogs.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnLogs.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/WarnLogs.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnRule.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/WarnRule.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnRule.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/WarnRule.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnStrategy.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/WarnStrategy.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnStrategy.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/WarnStrategy.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/Message.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/message/Message.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/Message.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/message/Message.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/MessageReq.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/message/MessageReq.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/MessageReq.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/message/MessageReq.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/MessageSendReq.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/message/MessageSendReq.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/MessageSendReq.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/message/MessageSendReq.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/User.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/message/User.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/User.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/message/User.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageReq.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageReq.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageReq.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageReq.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageSendReq.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageSendReq.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageSendReq.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageSendReq.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/User.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/message/message/User.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/User.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/message/message/User.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceAdd.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceAdd.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceAdd.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceAdd.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceGroup.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceGroup.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceGroup.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceGroup.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceReq.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceReq.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceReq.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceReq.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeListReq.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeListReq.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeListReq.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeListReq.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionListReq.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionListReq.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionListReq.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionListReq.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultLogListReq.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/FaultLogListReq.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultLogListReq.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/FaultLogListReq.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FenceGroupUpdateReq.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/FenceGroupUpdateReq.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FenceGroupUpdateReq.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/FenceGroupUpdateReq.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/MessageTemplateAddReq.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/MessageTemplateAddReq.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/MessageTemplateAddReq.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/MessageTemplateAddReq.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/MessageValueAddReq.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/MessageValueAddReq.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/MessageValueAddReq.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/MessageValueAddReq.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/MessageValueReq.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/MessageValueReq.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/MessageValueReq.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/MessageValueReq.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/SysCar.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/SysCar.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/SysCar.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/req/SysCar.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/CarFenceResq.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/resp/CarFenceResq.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/CarFenceResq.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/resp/CarFenceResq.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeTotalListResp.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeTotalListResp.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeTotalListResp.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeTotalListResp.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionTotalListResp.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionTotalListResp.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionTotalListResp.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionTotalListResp.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogListResp.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogListResp.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogListResp.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogListResp.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogTotalListResp.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogTotalListResp.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogTotalListResp.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogTotalListResp.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/MessageTemplateListResp.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/resp/MessageTemplateListResp.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/MessageTemplateListResp.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/resp/MessageTemplateListResp.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/MessageValueListResp.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/resp/MessageValueListResp.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/MessageValueListResp.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/resp/MessageValueListResp.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/SysCarResp.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/resp/SysCarResp.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/SysCarResp.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/resp/SysCarResp.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/vo/FaultCodeVo.java b/cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/vo/FaultCodeVo.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/vo/FaultCodeVo.java rename to cloud-modules/cloud-modules-enterpise/enterpise-common/src/main/java/com/muyu/domain/vo/FaultCodeVo.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-remote/.gitignore b/cloud-modules/cloud-modules-enterpise/enterpise-remote/.gitignore similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-remote/.gitignore rename to cloud-modules/cloud-modules-enterpise/enterpise-remote/.gitignore diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-remote/pom.xml b/cloud-modules/cloud-modules-enterpise/enterpise-remote/pom.xml similarity index 92% rename from cloud-modules/cloud-modules-enterprise/enterpise-remote/pom.xml rename to cloud-modules/cloud-modules-enterpise/enterpise-remote/pom.xml index 70cc121..8fe1986 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-remote/pom.xml +++ b/cloud-modules/cloud-modules-enterpise/enterpise-remote/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.muyu - cloud-modules-enterprise + cloud-modules-enterpise 3.6.3 diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/java/com/muyu/Main.java b/cloud-modules/cloud-modules-enterpise/enterpise-remote/src/main/java/com/muyu/Main.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/java/com/muyu/Main.java rename to cloud-modules/cloud-modules-enterpise/enterpise-remote/src/main/java/com/muyu/Main.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/.gitignore b/cloud-modules/cloud-modules-enterpise/enterpise-server/.gitignore similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/.gitignore rename to cloud-modules/cloud-modules-enterpise/enterpise-server/.gitignore diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/pom.xml b/cloud-modules/cloud-modules-enterpise/enterpise-server/pom.xml similarity index 98% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/pom.xml rename to cloud-modules/cloud-modules-enterpise/enterpise-server/pom.xml index edde0b2..27345af 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-server/pom.xml +++ b/cloud-modules/cloud-modules-enterpise/enterpise-server/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.muyu - cloud-modules-enterprise + cloud-modules-enterpise 3.6.3 diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/CloudEnterpiseApplication.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/CloudEnterpiseApplication.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/CloudEnterpiseApplication.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/CloudEnterpiseApplication.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/CarAndFenceGroupMiddleController.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/CarAndFenceGroupMiddleController.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/CarAndFenceGroupMiddleController.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/CarAndFenceGroupMiddleController.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/CarFenceClazzController.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/CarFenceClazzController.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/CarFenceClazzController.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/CarFenceClazzController.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/CarFenceController.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/CarFenceController.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/CarFenceController.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/CarFenceController.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/CarFenceTypeController.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/CarFenceTypeController.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/CarFenceTypeController.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/CarFenceTypeController.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/CarFenceUpdateController.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/CarFenceUpdateController.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/CarFenceUpdateController.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/CarFenceUpdateController.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/CarTypeController.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/CarTypeController.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/CarTypeController.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/CarTypeController.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/FaultCodeController.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/FaultCodeController.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/FaultCodeController.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/FaultCodeController.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/FaultConditionController.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/FaultConditionController.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/FaultConditionController.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/FaultConditionController.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/FaultLabelController.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/FaultLabelController.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/FaultLabelController.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/FaultLabelController.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/FaultLogController.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/FaultLogController.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/FaultLogController.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/FaultLogController.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/FaultRuleController.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/FaultRuleController.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/FaultRuleController.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/FaultRuleController.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/FaultTypeController.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/FaultTypeController.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/FaultTypeController.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/FaultTypeController.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/FenceGroupController.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/FenceGroupController.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/FenceGroupController.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/FenceGroupController.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/MessageController.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/MessageController.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/MessageController.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/MessageController.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/MessageTemplateController.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/MessageTemplateController.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/MessageTemplateController.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/MessageTemplateController.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/MessageValueController.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/MessageValueController.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/MessageValueController.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/MessageValueController.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/MiddleController.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/MiddleController.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/MiddleController.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/MiddleController.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/SysCarController.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/SysCarController.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/SysCarController.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/SysCarController.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/SysCarFaultController.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/SysCarFaultController.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/SysCarFaultController.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/SysCarFaultController.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/SysTypeController.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/SysTypeController.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/SysTypeController.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/SysTypeController.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/WarnLogsController.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/WarnLogsController.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/WarnLogsController.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/WarnLogsController.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/WarnRuleController.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/WarnRuleController.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/WarnRuleController.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/WarnRuleController.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/WarnStrategyController.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/WarnStrategyController.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/controller/WarnStrategyController.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/controller/WarnStrategyController.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/CarAndFenceGroupMiddleMapper.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/CarAndFenceGroupMiddleMapper.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/CarAndFenceGroupMiddleMapper.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/CarAndFenceGroupMiddleMapper.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/CarFenceClazzMapper.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/CarFenceClazzMapper.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/CarFenceClazzMapper.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/CarFenceClazzMapper.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/CarFenceMapper.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/CarFenceMapper.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/CarFenceMapper.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/CarFenceMapper.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/CarFenceServiceMybaitsMapper.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/CarFenceServiceMybaitsMapper.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/CarFenceServiceMybaitsMapper.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/CarFenceServiceMybaitsMapper.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/CarFenceTypeMapper.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/CarFenceTypeMapper.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/CarFenceTypeMapper.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/CarFenceTypeMapper.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/CarFenceUpdateMapper.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/CarFenceUpdateMapper.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/CarFenceUpdateMapper.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/CarFenceUpdateMapper.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/CarTypeMapper.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/CarTypeMapper.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/CarTypeMapper.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/CarTypeMapper.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/FaultCodeMapper.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/FaultCodeMapper.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/FaultCodeMapper.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/FaultCodeMapper.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/FaultConditionMapper.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/FaultConditionMapper.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/FaultConditionMapper.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/FaultConditionMapper.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/FaultLabelMapper.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/FaultLabelMapper.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/FaultLabelMapper.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/FaultLabelMapper.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/FaultLogMapper.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/FaultLogMapper.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/FaultLogMapper.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/FaultLogMapper.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/FaultRuleMapper.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/FaultRuleMapper.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/FaultRuleMapper.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/FaultRuleMapper.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/FaultTypeMapper.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/FaultTypeMapper.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/FaultTypeMapper.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/FaultTypeMapper.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/FenceGroupMapper.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/FenceGroupMapper.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/FenceGroupMapper.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/FenceGroupMapper.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/MessageMapper.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/MessageMapper.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/MessageMapper.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/MessageMapper.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/MessageTemplateMapper.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/MessageTemplateMapper.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/MessageTemplateMapper.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/MessageTemplateMapper.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/MessageValueMapper.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/MessageValueMapper.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/MessageValueMapper.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/MessageValueMapper.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/MiddleMapper.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/MiddleMapper.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/MiddleMapper.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/MiddleMapper.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/SysCarFaultMapper.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/SysCarFaultMapper.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/SysCarFaultMapper.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/SysCarFaultMapper.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/SysCarMapper.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/SysCarMapper.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/SysCarMapper.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/SysCarMapper.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/SysTypeMapper.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/SysTypeMapper.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/SysTypeMapper.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/SysTypeMapper.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/WarnLogsMapper.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/WarnLogsMapper.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/WarnLogsMapper.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/WarnLogsMapper.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/WarnRuleMapper.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/WarnRuleMapper.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/WarnRuleMapper.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/WarnRuleMapper.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/WarnStrategyMapper.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/WarnStrategyMapper.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/mapper/WarnStrategyMapper.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/mapper/WarnStrategyMapper.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/CarAndFenceGroupMiddleService.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/CarAndFenceGroupMiddleService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/CarAndFenceGroupMiddleService.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/CarAndFenceGroupMiddleService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/CarFenceClazzService.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/CarFenceClazzService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/CarFenceClazzService.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/CarFenceClazzService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/CarFenceService.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/CarFenceService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/CarFenceService.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/CarFenceService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/CarFenceServiceMybaits.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/CarFenceServiceMybaits.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/CarFenceServiceMybaits.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/CarFenceServiceMybaits.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/CarFenceTypeService.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/CarFenceTypeService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/CarFenceTypeService.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/CarFenceTypeService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/CarFenceUpdateService.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/CarFenceUpdateService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/CarFenceUpdateService.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/CarFenceUpdateService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/CarTypeService.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/CarTypeService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/CarTypeService.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/CarTypeService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/FaultCodeService.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/FaultCodeService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/FaultCodeService.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/FaultCodeService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/FaultConditionService.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/FaultConditionService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/FaultConditionService.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/FaultConditionService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/FaultDetectionStrategy.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/FaultDetectionStrategy.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/FaultDetectionStrategy.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/FaultDetectionStrategy.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/FaultDetectionStrategyService.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/FaultDetectionStrategyService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/FaultDetectionStrategyService.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/FaultDetectionStrategyService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/FaultLabelService.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/FaultLabelService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/FaultLabelService.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/FaultLabelService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/FaultLogService.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/FaultLogService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/FaultLogService.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/FaultLogService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/FaultRuleService.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/FaultRuleService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/FaultRuleService.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/FaultRuleService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/FaultTypeService.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/FaultTypeService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/FaultTypeService.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/FaultTypeService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/FenceGroupService.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/FenceGroupService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/FenceGroupService.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/FenceGroupService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/ISysCarFaultService.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/ISysCarFaultService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/ISysCarFaultService.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/ISysCarFaultService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/IWarnLogsService.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/IWarnLogsService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/IWarnLogsService.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/IWarnLogsService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/IWarnRuleService.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/IWarnRuleService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/IWarnRuleService.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/IWarnRuleService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/IWarnStrategyService.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/IWarnStrategyService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/IWarnStrategyService.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/IWarnStrategyService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/MessageService.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/MessageService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/MessageService.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/MessageService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/MessageTemplateService.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/MessageTemplateService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/MessageTemplateService.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/MessageTemplateService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/MessageValueService.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/MessageValueService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/MessageValueService.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/MessageValueService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/MiddleService.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/MiddleService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/MiddleService.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/MiddleService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/SysCarService.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/SysCarService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/SysCarService.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/SysCarService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/SysTypeService.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/SysTypeService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/SysTypeService.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/SysTypeService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/CarAndFenceGroupMiddleServiceImpl.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/CarAndFenceGroupMiddleServiceImpl.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/CarAndFenceGroupMiddleServiceImpl.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/CarAndFenceGroupMiddleServiceImpl.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/CarFenceClazzServiceImpl.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/CarFenceClazzServiceImpl.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/CarFenceClazzServiceImpl.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/CarFenceClazzServiceImpl.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/CarFenceServiceImpl.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/CarFenceServiceImpl.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/CarFenceServiceImpl.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/CarFenceServiceImpl.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/CarFenceServiceMybaitsImpl.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/CarFenceServiceMybaitsImpl.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/CarFenceServiceMybaitsImpl.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/CarFenceServiceMybaitsImpl.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/CarFenceTypeServiceImpl.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/CarFenceTypeServiceImpl.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/CarFenceTypeServiceImpl.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/CarFenceTypeServiceImpl.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/CarFenceUpdateServiceImpl.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/CarFenceUpdateServiceImpl.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/CarFenceUpdateServiceImpl.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/CarFenceUpdateServiceImpl.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/FaultCodeServiceImpl.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/FaultCodeServiceImpl.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/FaultCodeServiceImpl.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/FaultCodeServiceImpl.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/FaultConditionServiceImpl.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/FaultConditionServiceImpl.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/FaultConditionServiceImpl.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/FaultConditionServiceImpl.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/FaultLabelServiceImpl.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/FaultLabelServiceImpl.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/FaultLabelServiceImpl.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/FaultLabelServiceImpl.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/FaultLogServiceImpl.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/FaultLogServiceImpl.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/FaultLogServiceImpl.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/FaultLogServiceImpl.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/FaultRuleServiceImpl.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/FaultRuleServiceImpl.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/FaultRuleServiceImpl.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/FaultRuleServiceImpl.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/FaultTypeServiceImpl.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/FaultTypeServiceImpl.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/FaultTypeServiceImpl.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/FaultTypeServiceImpl.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/FenceGroupServiceImpl.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/FenceGroupServiceImpl.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/FenceGroupServiceImpl.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/FenceGroupServiceImpl.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/MessageServiceImpl.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/MessageServiceImpl.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/MessageServiceImpl.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/MessageServiceImpl.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/MessageTemplateServiceImpl.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/MessageTemplateServiceImpl.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/MessageTemplateServiceImpl.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/MessageTemplateServiceImpl.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/MessageValueServiceImpl.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/MessageValueServiceImpl.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/MessageValueServiceImpl.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/MessageValueServiceImpl.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/MiddleServiceImpl.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/MiddleServiceImpl.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/MiddleServiceImpl.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/MiddleServiceImpl.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/SysCarFaultServiceImpl.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/SysCarFaultServiceImpl.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/SysCarFaultServiceImpl.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/SysCarFaultServiceImpl.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/SysTypeServiceImpl.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/SysTypeServiceImpl.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/SysTypeServiceImpl.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/SysTypeServiceImpl.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/WarnLogsServiceImpl.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/WarnLogsServiceImpl.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/WarnLogsServiceImpl.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/WarnLogsServiceImpl.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/WarnRuleServiceImpl.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/WarnRuleServiceImpl.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/WarnRuleServiceImpl.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/WarnRuleServiceImpl.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/WarnStrategyServiceImpl.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/WarnStrategyServiceImpl.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/WarnStrategyServiceImpl.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/WarnStrategyServiceImpl.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/java/com/muyu/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/java/com/muyu/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/resources/banner.txt b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/resources/banner.txt similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/resources/banner.txt rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/resources/banner.txt diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/resources/bootstrap.yml similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/resources/bootstrap.yml rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/resources/bootstrap.yml diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/resources/logback/dev.xml similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/resources/logback/dev.xml rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/resources/logback/dev.xml diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/resources/logback/prod.xml similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/resources/logback/prod.xml rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/resources/logback/prod.xml diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/resources/logback/test.xml similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/resources/logback/test.xml rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/resources/logback/test.xml diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/resources/mapper/CarFenceServiceMybaitsMapper.xml b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/resources/mapper/CarFenceServiceMybaitsMapper.xml similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/resources/mapper/CarFenceServiceMybaitsMapper.xml rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/resources/mapper/CarFenceServiceMybaitsMapper.xml diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/resources/mapper/FaultCodeMapper.xml b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/resources/mapper/FaultCodeMapper.xml similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/resources/mapper/FaultCodeMapper.xml rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/resources/mapper/FaultCodeMapper.xml diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/resources/mapper/FaultConditionMapper.xml b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/resources/mapper/FaultConditionMapper.xml similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/resources/mapper/FaultConditionMapper.xml rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/resources/mapper/FaultConditionMapper.xml diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/resources/mapper/FaultLogMapper.xml b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/resources/mapper/FaultLogMapper.xml similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/resources/mapper/FaultLogMapper.xml rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/resources/mapper/FaultLogMapper.xml diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/resources/mapper/MessageMapper.xml b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/resources/mapper/MessageMapper.xml similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/resources/mapper/MessageMapper.xml rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/resources/mapper/MessageMapper.xml diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/resources/mapper/MiddleMapper.xml b/cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/resources/mapper/MiddleMapper.xml similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterpise-server/src/main/resources/mapper/MiddleMapper.xml rename to cloud-modules/cloud-modules-enterpise/enterpise-server/src/main/resources/mapper/MiddleMapper.xml diff --git a/cloud-modules/cloud-modules-enterprise/pom.xml b/cloud-modules/cloud-modules-enterpise/pom.xml similarity index 91% rename from cloud-modules/cloud-modules-enterprise/pom.xml rename to cloud-modules/cloud-modules-enterpise/pom.xml index c378e62..c1c64df 100644 --- a/cloud-modules/cloud-modules-enterprise/pom.xml +++ b/cloud-modules/cloud-modules-enterpise/pom.xml @@ -9,7 +9,7 @@ 3.6.3 - cloud-modules-enterprise + cloud-modules-enterpise pom @@ -27,6 +27,7 @@ enterpise-common enterpise-remote enterpise-server + enterpise-cache diff --git a/cloud-modules/pom.xml b/cloud-modules/pom.xml index c03e5c2..af22a58 100644 --- a/cloud-modules/pom.xml +++ b/cloud-modules/pom.xml @@ -12,7 +12,7 @@ cloud-modules-system cloud-modules-gen cloud-modules-file - cloud-modules-enterprise + cloud-modules-enterpise cloud-modules