Merge branch 'dev' of https://gitea.qinmian.online/wuzudaniu/cloud-plus-server into dev.saas.yp

# Conflicts:
#	cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-modules-parse/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml

cloud-auth/src/main/resources/bootstrap.yml

@@ -4,7 +4,7 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: 127.0.0.1:8848
+  addr: 123.57.152.124:8848
   user-name: nacos
   password: nacos
   namespace: wx

cloud-common/cloud-common-cache/pom.xml

@@ -27,11 +27,6 @@
             <groupId>com.muyu</groupId>
             <artifactId>cloud-common-redis</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>enterpise-common</artifactId>
-            <version>${muyu.version}</version>
-        </dependency>
     </dependencies>
 
 </project>

cloud-gateway/src/main/resources/bootstrap.yml

@@ -4,7 +4,7 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: 127.0.0.1:8848
+  addr: 123.57.152.124:8848
   user-name: nacos
   password: nacos
   namespace: wx

cloud-modules/cloud-modules-data-process/cloud-modules-data-process-common/src/main/java/com/muyu/data/domain/EnterpriseCommon.java

@@ -7,7 +7,9 @@ import lombok.NoArgsConstructor;
 
 import java.util.List;
 
+
 /**
+ * 企业通用信息
  * @version 1.0
  * @Author xie ya ru
  * @Date 2024/10/6 20:21

cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/pom.xml

@@ -122,7 +122,7 @@
         <!--  获取缓存      -->
         <dependency>
             <groupId>com.muyu</groupId>
-            <artifactId>enterprise-cache</artifactId>
+            <artifactId>enterpise-cache</artifactId>
         </dependency>
     </dependencies>
 

cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/java/com/muyu/data/util/Iotdb.java

@@ -10,6 +10,10 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ *IoTDB工具类
+ */
+
 public class Iotdb {
     public static void main(String[] args) throws IoTDBConnectionException, StatementExecutionException {
 

cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/java/com/muyu/data/util/Receive.java

@@ -2,6 +2,9 @@ package com.muyu.data.util;
 
 import org.eclipse.paho.client.mqttv3.*;
 
+/**
+ * 接受MQTT消息
+ */
 public class Receive {
 
     public static void main(String[] args) {

cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/java/com/muyu/data/warn/WarningJudgment.java

@@ -1,15 +1,14 @@
 package com.muyu.data.warn;
 
-import com.muyu.domain.SysCar;
-import com.muyu.enterpise.cache.SysCarCacheService;
-import com.muyu.enterpise.cache.SysCarTypeCacheService;
+import com.muyu.enterprise.cache.SysCarCacheService;
+import com.muyu.enterprise.cache.SysCarTypeCacheService;
 import org.springframework.stereotype.Component;
-import org.apache.catalina.mapper.*;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 
 /**
+ * 事件预警
  * @version 1.0
  * @Author xie ya ru
  * @Date 2024/10/6 15:21

cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/resources/bootstrap.yml

@@ -4,7 +4,7 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: 127.0.0.1:8848
+  addr: 123.57.152.124:8848
   user-name: nacos
   password: nacos
   namespace: wx

cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml

@@ -25,71 +25,12 @@
             <version>${muyu.version}</version>
         </dependency>
 
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-        </dependency>
-
-        <!-- MuYu Common DataSource -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-datasource</artifactId>
-        </dependency>
         <!-- 缓存公共模块  -->
         <dependency>
             <groupId>com.muyu</groupId>
             <artifactId>cloud-common-cache</artifactId>
         </dependency>
 
-        <!-- MuYu Common DataScope -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-datascope</artifactId>
-        </dependency>
-
-        <!-- MuYu Common Log -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-log</artifactId>
-        </dependency>
-
-        <!-- 接口模块 -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-api-doc</artifactId>
-        </dependency>
-
-        <!-- XllJob定时任务 -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-xxl</artifactId>
-        </dependency>
-
     </dependencies>
 
 </project>

cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/InformationDataService.java

@@ -0,0 +1,33 @@
+package com.muyu.enterprise.cache;
+
+import com.muyu.common.cache.CacheAbsBasic;
+import com.muyu.enterprise.cache.domain.InformationData;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 车辆全部缓存
+ * @className: InformationDataService  ️✈️
+ * @author: Yang 鹏  🦅
+ * @date: 2024/10/7 21:50 ⏰
+ * @Version: 1.0
+ * @description:
+ */
+@Component
+public class InformationDataService extends CacheAbsBasic<String, List<InformationData>> {
+    @Override
+    public String keyPre() {
+        return "";
+    }
+
+    @Override
+    public String encode(String key) {
+        return super.encode(key);
+    }
+
+    @Override
+    public String decode(String key) {
+        return super.decode(key);
+    }
+}

cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/MessageValueCacheService.java

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.cache;
+package com.muyu.enterprise.cache;
 
 import com.muyu.common.cache.CacheAbsBasic;
 import com.muyu.domain.MessageValue;
@@ -7,6 +7,7 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 
 /**
+ * 缓存服务
  * @version 1.0
  * @Author xie ya ru
  * @Date 2024/9/29 20:04

cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/SysCarCacheService.java

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.cache;
+package com.muyu.enterprise.cache;
 
 import com.muyu.common.cache.CacheAbsBasic;
 import com.muyu.domain.SysCar;
@@ -7,6 +7,7 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 
 /**
+ * 系统车辆缓存服务
  * @version 1.0
  * @Author xie ya ru
  * @Date 2024/9/30 11:06

cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/SysCarTypeCacheService.java

@@ -1,10 +1,11 @@
-package com.muyu.enterpise.cache;
+package com.muyu.enterprise.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

cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/WarnStrategyCacjeService.java

@@ -1,10 +1,11 @@
-package com.muyu.enterpise.cache;
+package com.muyu.enterprise.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

cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/domain/InformationData.java

@@ -1,4 +1,4 @@
-package com.muyu.common.domain;
+package com.muyu.enterprise.cache.domain;
 
 import com.muyu.common.system.domain.SysDept;
 import com.muyu.domain.SysCar;

cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,5 +1,5 @@
-com.muyu.enterpise.cache.MessageValueCacheService
-com.muyu.enterpise.cache.SysCarCacheService
-com.muyu.enterpise.cache.SysCarTypeCacheService
-com.muyu.enterpise.cache.WarnStrategyCacjeService
+com.muyu.enterprise.cache.MessageValueCacheService
+com.muyu.enterprise.cache.SysCarCacheService
+com.muyu.enterprise.cache.SysCarTypeCacheService
+com.muyu.enterprise.cache.WarnStrategyCacjeService
 

cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml

@@ -46,10 +46,5 @@
             <artifactId>cloud-common-system</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-saas</artifactId>
-        </dependency>
-
     </dependencies>
 </project>

cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/java/com/muyu/remote/RemoteMessageValueService.java

@@ -12,10 +12,10 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 /**
+ * vin查询报文模版类型
  * @version 1.0
  * @Author xie ya ru
  * @Date 2024/9/28 21:00
- * @注释 vin查询报文模版类型
  */
 @FeignClient(contextId = "remoteMessageValueService", value = ServiceNameConstants.ENTERPRISE_SERVICE, fallbackFactory = RemoteMessageValueFallbackFactory.class,path = "messageValue")
 public interface RemoteMessageValueService {

cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/java/com/muyu/remote/factory/RemoteMessageValueFallbackFactory.java

@@ -10,10 +10,10 @@ import org.springframework.cloud.openfeign.FallbackFactory;
 import java.util.List;
 
 /**
+ * 文件服务降级工厂
  * @version 1.0
  * @Author xie ya ru
  * @Date 2024/9/28 21:04
- * @注释
  */
 @Log4j2
 public class RemoteMessageValueFallbackFactory implements FallbackFactory<RemoteMessageValueService> {

cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml

@@ -97,7 +97,11 @@
             <artifactId>cloud-common-xxl</artifactId>
         </dependency>
 
-        <!--    cache缓存框架    -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-saas</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.muyu</groupId>
             <artifactId>enterpise-cache</artifactId>

cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MessageValueController.java

@@ -6,7 +6,7 @@ import com.muyu.domain.MessageValue;
 import com.muyu.domain.req.MessageValueAddReq;
 import com.muyu.domain.req.MessageValueReq;
 import com.muyu.domain.resp.MessageValueListResp;
-import com.muyu.enterpise.cache.MessageValueCacheService;
+import com.muyu.enterprise.cache.MessageValueCacheService;
 import com.muyu.enterpise.service.MessageValueService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -33,7 +33,7 @@ public class MessageValueController extends BaseController {
     private MessageValueService messageValueService;
 
     @Autowired
-    private MessageValueCacheService enterpiseCacheService;
+    private MessageValueCacheService enterpriseCacheService;
 
     /**
      * 报文数据列表查询

cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/SysCarService.java

@@ -1,10 +1,10 @@
 package com.muyu.enterpise.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.muyu.common.domain.InformationData;
 import com.muyu.domain.SysCar;
 import com.muyu.domain.req.SysCarReq;
 import com.muyu.domain.resp.SysCarResp;
+import com.muyu.enterprise.cache.domain.InformationData;
 
 import java.util.List;
 
@@ -25,7 +25,7 @@ public interface SysCarService extends IService<SysCar> {
     /**
      * 查询车辆基础信息列表
      *
-     * @param sysCar 车辆基础信息
+     * @param sysCarReq 车辆基础信息
      * @return 车辆基础信息集合
      */
     public List<SysCarResp> selectSysCarList(SysCarReq sysCarReq);

cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageValueServiceImpl.java

@@ -7,10 +7,9 @@ import com.muyu.common.core.utils.StringUtils;
 import com.muyu.domain.MessageValue;
 import com.muyu.domain.req.MessageValueReq;
 import com.muyu.domain.resp.MessageValueListResp;
-import com.muyu.enterpise.cache.MessageValueCacheService;
+import com.muyu.enterprise.cache.MessageValueCacheService;
 import com.muyu.enterpise.mapper.MessageValueMapper;
 import com.muyu.enterpise.service.MessageValueService;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysCarServiceImpl.java

@@ -2,13 +2,13 @@ package com.muyu.enterpise.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.muyu.common.domain.InformationData;
 import com.muyu.domain.SysCar;
 import com.muyu.domain.req.SysCarReq;
 import com.muyu.domain.resp.SysCarResp;
-import com.muyu.enterpise.cache.SysCarCacheService;
+import com.muyu.enterprise.cache.SysCarCacheService;
 import com.muyu.enterpise.mapper.SysCarMapper;
 import com.muyu.enterpise.service.SysCarService;
+import com.muyu.enterprise.cache.domain.InformationData;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/WarnStrategyServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.domain.WarnStrategy;
-import com.muyu.enterpise.cache.WarnStrategyCacjeService;
+import com.muyu.enterprise.cache.WarnStrategyCacjeService;
 import com.muyu.enterpise.mapper.WarnStrategyMapper;
 import com.muyu.enterpise.service.IWarnStrategyService;
 import org.springframework.beans.factory.annotation.Autowired;

cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml

@@ -4,7 +4,7 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: 127.0.0.1:8848
+  addr: 123.57.152.124:8848
   user-name: nacos
   password: nacos
   namespace: wx

cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml

@@ -4,7 +4,7 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: 127.0.0.1:8848
+  addr: 123.57.152.124:8848
   user-name: nacos
   password: nacos
   namespace: wx

cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml

@@ -4,7 +4,7 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: 127.0.0.1:8848
+  addr: 123.57.152.124:8848
   user-name: nacos
   password: nacos
   namespace: wx

cloud-modules/cloud-modules-parse/src/main/java/com/muyu/parse/process/ProcessData.java

@@ -5,9 +5,9 @@ import com.muyu.common.kafka.config.KafkaProducerConfig;
 import com.muyu.domain.MessageValue;
 import com.muyu.domain.SysCar;
 import com.muyu.domain.SysCarType;
-import com.muyu.enterpise.cache.MessageValueCacheService;
-import com.muyu.enterpise.cache.SysCarCacheService;
-import com.muyu.enterpise.cache.SysCarTypeCacheService;
+import com.muyu.enterprise.cache.MessageValueCacheService;
+import com.muyu.enterprise.cache.SysCarCacheService;
+import com.muyu.enterprise.cache.SysCarTypeCacheService;
 import com.muyu.parse.uitl.DataParseUtil;
 import lombok.extern.log4j.Log4j2;
 import org.apache.kafka.clients.producer.ProducerRecord;

cloud-modules/cloud-modules-parse/src/main/resources/bootstrap.yml

@@ -4,7 +4,7 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: 127.0.0.1:8848
+  addr: 123.57.152.124:8848
   user-name: nacos
   password: nacos
   namespace: wx

cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml

@@ -4,7 +4,7 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: 127.0.0.1:8848
+  addr: 123.57.152.124:8848
   user-name: nacos
   password: nacos
   namespace: wx

cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml

@@ -4,10 +4,10 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: 150.158.33.234:8848
+  addr: 123.57.152.124:8848
   user-name: nacos
   password: nacos
-  namespace: dev
+  namespace: wx
 # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
 # Spring
 spring:

cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml

@@ -4,7 +4,7 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: 127.0.0.1:8848
+  addr: 123.57.152.124:8848
   user-name: nacos
   password: nacos
   namespace: wx

pom.xml

@@ -283,31 +283,6 @@
                 <version>${muyu.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.muyu</groupId>
-                <artifactId>enterpise-remote</artifactId>
-                <version>${muyu.version}</version>
-            </dependency>
-            <!--  实体类      -->
-            <dependency>
-                <groupId>com.muyu</groupId>
-                <artifactId>enterpise-common</artifactId>
-                <version>${muyu.version}</version>
-            </dependency>
-            <!--      缓存框架          -->
-            <dependency>
-                <groupId>com.muyu</groupId>
-                <artifactId>enterprise-cache</artifactId>
-                <version>${muyu.version}</version>
-            </dependency>
-
-            <!--  kafka 公共配置      -->
-            <dependency>
-                <groupId>com.muyu</groupId>
-                <artifactId>cloud-common-kafka</artifactId>
-                <version>${muyu.version}</version>
-            </dependency>
-
 <!--            <dependency>-->
 <!--                <groupId>com.muyu</groupId>-->
 <!--                <artifactId>enterpise-c</artifactId>-->