解决冲突文件

cloud-modules/cloud-modules-data-processing/src/main/resources/bootstrap.yml

@@ -1,5 +1,6 @@
 # Tomcat
 server:
+<<<<<<<< HEAD:cloud-modules/cloud-modules-data-processing/src/main/resources/bootstrap.yml
   port: 9711
 
 # nacos线上地址
@@ -8,6 +9,16 @@ nacos:
   user-name: nacos
   password: nacos
   namespace: one-saas
+========
+  port: 10010
+
+# nacos线上地址
+nacos:
+  addr: 110.42.213.184:8848
+  user-name: nacos
+  password: nacos
+  namespace: icecream
+>>>>>>>> dev.saas.customer:cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/bootstrap.yml
 # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
 # Spring
 spring:
@@ -26,7 +37,11 @@ spring:
     allow-bean-definition-overriding: true
   application:
     # 应用名称
+<<<<<<<< HEAD:cloud-modules/cloud-modules-data-processing/src/main/resources/bootstrap.yml
     name: cloud-data-processing
+========
+    name: cloud-car
+>>>>>>>> dev.saas.customer:cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/bootstrap.yml
   profiles:
     # 环境配置
     active: dev
@@ -35,19 +50,19 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: ${nacos.addr}
-        # nacos用户名
+#        # nacos用户名
-        username: ${nacos.user-name}
+#        username: ${nacos.user-name}
-        # nacos密码
+#        # nacos密码
-        password: ${nacos.password}
+#        password: ${nacos.password}
         # 命名空间
         namespace: ${nacos.namespace}
       config:
         # 服务注册地址
         server-addr: ${nacos.addr}
-        # nacos用户名
+#        # nacos用户名
-        username: ${nacos.user-name}
+#        username: ${nacos.user-name}
-        # nacos密码
+#        # nacos密码
-        password: ${nacos.password}
+#        password: ${nacos.password}
         # 命名空间
         namespace: ${nacos.namespace}
         # 配置文件格式
@@ -69,4 +84,7 @@ logging:
   level:
     com.muyu.system.mapper: DEBUG
 
+<<<<<<<< HEAD:cloud-modules/cloud-modules-data-processing/src/main/resources/bootstrap.yml
 cacheNames: fault,fence,warming
+========
+>>>>>>>> dev.saas.customer:cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/bootstrap.yml

cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/CloudFileApplication.java

@@ -16,3 +16,4 @@ public class CloudFileApplication {
         System.out.println("CloudFile 模块启动成功!");
     }
 }
+                         

cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/pom.xml

@@ -54,5 +54,10 @@
             <artifactId>spring-boot-starter-web</artifactId>
             <version>3.3.2</version>
         </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>4.2.2</version>
+        </dependency>
     </dependencies>
 </project>

cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/Animal.java

@@ -0,0 +1,20 @@
+package com.muyu.openbusiness.domain;
+
+import com.muyu.common.core.annotation.Excel;
+import lombok.*;
+
+@Setter
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class Animal {
+    @Excel
+    private String aId;
+    @Excel
+    private String color;
+    @Excel
+    private String hobby;
+    @Excel
+    private String aName;
+}

cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/Person.java

@@ -0,0 +1,20 @@
+package com.muyu.openbusiness.domain;
+
+import io.micrometer.observation.annotation.Observed;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@Data
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+public class Person {
+    private String person;
+    private Integer Age;
+    private String name;
+    private String Nation;
+    private String Animal;
+    private Integer id;
+}

cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/RedisService.java

@@ -0,0 +1,4 @@
+package com.muyu.openbusiness.domain;
+
+public interface RedisService {
+}

cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SerializeUtil.java

@@ -0,0 +1,27 @@
+package com.muyu.openbusiness.domain;
+
+import java.io.*;
+
+public class SerializeUtil {
+    public static byte[] serialize(Object object){
+        ObjectOutputStream oos =null;
+        ByteArrayOutputStream baos =null;
+        try{
+            //序列化
+            baos =new ByteArrayOutputStream();
+            oos =new ObjectOutputStream(baos);
+            oos.writeObject(object);
+            byte[] bytes =baos.toByteArray();
+            return bytes;
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+    public static Object unserialize(byte[] bytes) throws IOException {
+        ByteArrayInputStream bais =null;
+        bais =new ByteArrayInputStream(bytes);
+        ObjectInputStream ois =new ObjectInputStream(bais);
+        return ois.available();
+    }
+}

cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/pom.xml

@@ -18,6 +18,7 @@
     </properties>
 
     <dependencies>
+
         <!-- SpringCloud Alibaba Nacos -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
@@ -41,7 +42,15 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-saas</artifactId>
+        </dependency>
 
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-system</artifactId>
+        </dependency>
         <!-- Mysql Connector -->
         <dependency>
             <groupId>com.mysql</groupId>
@@ -66,6 +75,11 @@
             <artifactId>cloud-common-log</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-redis</artifactId>
+        </dependency>
+
         <!-- 接口模块 -->
         <dependency>
             <groupId>com.muyu</groupId>
@@ -88,12 +102,7 @@
             <artifactId>bcpkix-jdk15on</artifactId>
             <version>1.70</version>
         </dependency>
-        <dependency>
+
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-modules-carmanage</artifactId>
-            <version>3.6.3</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>com.muyu</groupId>
             <artifactId>cloud-modules-openbusiness-common</artifactId>
@@ -101,16 +110,17 @@
             <scope>compile</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-saas</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-system</artifactId>
+            <artifactId>cloud-modules-carmanage</artifactId>
+            <version>3.6.3</version>
+            <scope>compile</scope>
         </dependency>
 
+
+
+
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>

cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/config/SnowflakeIdWorker.java

@@ -0,0 +1,108 @@
+package com.muyu.openbusiness.config;
+
+/**
+ * Description :
+ * Created by ZhangYi
+ * Date :2024/10/04
+ */
+public class SnowflakeIdWorker{
+    /** 开始时间截 (这个用自己业务系统上线的时间) */
+    private final long twepoch = 1575365018000L;
+
+    /** 机器id所占的位数 */
+    private final long workerIdBits = 10L;
+
+    /** 支持的最大机器id，结果是31 (这个移位算法可以很快的计算出几位二进制数所能表示的最大十进制数) */
+    private final long maxWorkerId = -1L ^ (-1L << workerIdBits);
+
+    /** 序列在id中占的位数 */
+    private final long sequenceBits = 12L;
+
+    /** 机器ID向左移12位 */
+    private final long workerIdShift = sequenceBits;
+
+    /** 时间截向左移22位(10+12) */
+    private final long timestampLeftShift = sequenceBits + workerIdBits;
+
+    /** 生成序列的掩码，这里为4095 (0b111111111111=0xfff=4095) */
+    private final long sequenceMask = -1L ^ (-1L << sequenceBits);
+
+    /** 工作机器ID(0~1024) */
+    private long workerId;
+
+    /** 毫秒内序列(0~4095) */
+    private long sequence = 0L;
+
+    /** 上次生成ID的时间截 */
+    private long lastTimestamp = -1L;
+
+    //==============================Constructors=====================================
+    /**
+     * 构造函数
+     * @param workerId 工作ID (0~1024)
+     */
+    public void SnowMaker(long workerId) {
+        if (workerId > maxWorkerId || workerId < 0) {
+            throw new IllegalArgumentException(String.format("workerId can't be greater than %d or less than 0", maxWorkerId));
+        }
+        this.workerId = workerId;
+    }
+
+    // ==============================Methods==========================================
+    /**
+     * 获得下一个ID (该方法是线程安全的)
+     * @return SnowflakeId
+     */
+    public synchronized long nextId() {
+        long timestamp = timeGen();
+
+        //如果当前时间小于上一次ID生成的时间戳，说明系统时钟回退过这个时候应当抛出异常
+        if (timestamp < lastTimestamp) {
+            throw new RuntimeException(
+                    String.format("Clock moved backwards.  Refusing to generate id for %d milliseconds", lastTimestamp - timestamp));
+        }
+
+        //如果是同一时间生成的，则进行毫秒内序列
+        if (lastTimestamp == timestamp) {
+            sequence = (sequence + 1) & sequenceMask;
+            //毫秒内序列溢出
+            if (sequence == 0) {
+                //阻塞到下一个毫秒,获得新的时间戳
+                timestamp = tilNextMillis(lastTimestamp);
+            }
+        }
+        //时间戳改变，毫秒内序列重置
+        else {
+            sequence = 0L;
+        }
+
+        //上次生成ID的时间截
+        lastTimestamp = timestamp;
+
+        //移位并通过或运算拼到一起组成64位的ID
+        return ((timestamp - twepoch) << timestampLeftShift) //
+                | (workerId << workerIdShift) //
+                | sequence;
+    }
+
+    /**
+     * 阻塞到下一个毫秒，直到获得新的时间戳
+     * @param lastTimestamp 上次生成ID的时间截
+     * @return 当前时间戳
+     */
+    protected long tilNextMillis(long lastTimestamp) {
+        long timestamp = timeGen();
+        while (timestamp <= lastTimestamp) {
+            timestamp = timeGen();
+        }
+        return timestamp;
+    }
+
+    /**
+     * 返回以毫秒为单位的当前时间
+     * @return 当前时间(毫秒)
+     */
+    protected long timeGen() {
+        return System.currentTimeMillis();
+    }
+}

cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/RailController.java

@@ -0,0 +1,4 @@
+package com.muyu.openbusiness.controller;
+
+public class RailController {
+}

cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/StationMessageMapper.java

@@ -1,6 +1,5 @@
 package com.muyu.openbusiness.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.muyu.openbusiness.domain.Messages;
 import org.apache.ibatis.annotations.Mapper;

cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarMessageServiceImpl.java

@@ -3,10 +3,12 @@ package com.muyu.openbusiness.service.impl;
 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.openbusiness.config.SnowflakeIdWorker;
 import com.muyu.openbusiness.domain.SysCarMessage;
 import com.muyu.openbusiness.mapper.SysCarMessageMapper;
 import com.muyu.openbusiness.service.ISysCarMessageService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
@@ -18,6 +20,10 @@ import java.util.List;
  * @author muyu
  * @date 2024-09-18
  */
+
+
+
+
 @Service
 public class SysCarMessageServiceImpl
         extends ServiceImpl<SysCarMessageMapper, SysCarMessage>
@@ -30,12 +36,17 @@ public class SysCarMessageServiceImpl
      * @param id 车辆报文记录主键
      * @return 车辆报文记录
      */
+
+    @Autowired
+    RedisTemplate
+    redisTemplate;
     @Override
     public SysCarMessage selectSysCarMessageById(Long id)
     {
         LambdaQueryWrapper<SysCarMessage> queryWrapper = new LambdaQueryWrapper<>();
         Assert.notNull(id, "id不可为空");
         queryWrapper.eq(SysCarMessage::getId, id);
+
         return this.getOne(queryWrapper);
     }
 
@@ -56,6 +67,15 @@ public class SysCarMessageServiceImpl
         if (StringUtils.isNotEmpty(sysCarMessage.getMessageType())){
             queryWrapper.eq(SysCarMessage::getMessageType, sysCarMessage.getMessageType());
         }
+
+        //生成一个时间唯一戳
+        SnowflakeIdWorker snowMaker = new SnowflakeIdWorker();
+        for (int i = 0; i < 100; i++) {
+            long id = snowMaker.nextId();
+            System.out.println(id);
+
+        }
+        redisTemplate.opsForValue().set("id",list(queryWrapper));
         return this.list(queryWrapper);
     }
 
@@ -67,8 +87,7 @@ public class SysCarMessageServiceImpl
     @Override
     public Boolean checkIdUnique(SysCarMessage sysCarMessage) {
         LambdaQueryWrapper<SysCarMessage> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(SysCarMessage::getModelCode, sysCarMessage.getModelCode())
+        queryWrapper.eq(SysCarMessage::getId, sysCarMessage.getId());
-                .eq(SysCarMessage::getMessageTypeCode, sysCarMessage.getMessageTypeCode());
         return this.count(queryWrapper) > 0;
     }
 

cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarServiceImpl.java

@@ -3,9 +3,12 @@ package com.muyu.openbusiness.service.impl;
 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.openbusiness.config.SnowflakeIdWorker;
 import com.muyu.openbusiness.domain.SysCar;
 import com.muyu.openbusiness.mapper.SysCarMapper;
 import com.muyu.openbusiness.service.ISysCarService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
@@ -28,6 +31,9 @@ public class SysCarServiceImpl
      * @param id 车辆基础信息主键
      * @return 车辆基础信息
      */
+
+    @Autowired
+    RedisTemplate redisTemplate;
     @Override
     public SysCar selectSysCarById(Long id)
     {
@@ -72,6 +78,15 @@ public class SysCarServiceImpl
         if (StringUtils.isNotEmpty(sysCar.getState())){
             queryWrapper.eq(SysCar::getState, sysCar.getState());
         }
+        //生成一个时间唯一戳
+        SnowflakeIdWorker snowMaker = new SnowflakeIdWorker();
+        for (int i = 0; i < 100; i++) {
+            long id = snowMaker.nextId();
+            System.out.println(id);
+
+        }
+        redisTemplate.opsForValue().set("id",list(queryWrapper));
+
         return this.list(queryWrapper);
     }
 

cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysFenceServiceImpl.java

@@ -3,11 +3,13 @@ package com.muyu.openbusiness.service.impl;
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
+import com.muyu.openbusiness.config.SnowflakeIdWorker;
 import com.muyu.openbusiness.domain.SysFence;
 import com.muyu.openbusiness.mapper.SysFenceMapper;
 import com.muyu.openbusiness.service.ISysFenceService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -25,7 +27,8 @@ public class SysFenceServiceImpl
         extends ServiceImpl<SysFenceMapper, SysFence>
         implements ISysFenceService {
 
-
+@Autowired
+    RedisTemplate redisTemplate;
     @Override
     public SysFence selectSysFenceById(Long id) {
 
@@ -50,6 +53,14 @@ public class SysFenceServiceImpl
         if (StringUtils.isNotEmpty(sysFence.getState())){
         queryWrapper.eq(SysFence::getState, sysFence.getState());
     }
+        //生成一个时间唯一戳
+        SnowflakeIdWorker snowMaker = new SnowflakeIdWorker();
+        for (int i = 0; i < 100; i++) {
+            long id = snowMaker.nextId();
+            System.out.println(id);
+
+        }
+        redisTemplate.opsForValue().set("id",list(queryWrapper));
         return this.list(queryWrapper);
 
     }

cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysMessageTypeServiceImpl.java

@@ -3,9 +3,12 @@ package com.muyu.openbusiness.service.impl;
 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.openbusiness.config.SnowflakeIdWorker;
 import com.muyu.openbusiness.domain.SysMessageType;
 import com.muyu.openbusiness.mapper.SysMessageTypeMapper;
 import com.muyu.openbusiness.service.ISysMessageTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
@@ -25,9 +28,12 @@ public class SysMessageTypeServiceImpl
     /**
      * 精确查询车辆报文类型
      *
-     * @param
+     * @param id 车辆报文类型主键
      * @return 车辆报文类型
      */
+
+    @Autowired
+    RedisTemplate<Object,Object> redisTemplate;
     @Override
     public SysMessageType selectSysMessageTypeByMessageCode(String messageCode)
     {
@@ -54,6 +60,14 @@ public class SysMessageTypeServiceImpl
         if (StringUtils.isNotEmpty(sysMessageType.getMessageType())){
             queryWrapper.eq(SysMessageType::getMessageType, sysMessageType.getMessageType());
         }
+        //生成一个时间唯一戳
+        SnowflakeIdWorker snowMaker = new SnowflakeIdWorker();
+        for (int i = 0; i < 100; i++) {
+            long id = snowMaker.nextId();
+            System.out.println(id);
+        }
+        redisTemplate.opsForValue().set("id",list(queryWrapper));
+
         return this.list(queryWrapper);
     }
 

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java

@@ -17,13 +17,6 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 //@EnableCustomSwagger2
 @EnableMyFeignClients
 @SpringBootApplication
-//@SpringBootApplication(
-//        exclude = {
-//                DataSourceAutoConfiguration.class,
-//                DruidDataSourceAutoConfigure.class,
-//                DynamicDataSourceAutoConfiguration.class
-//        }
-//)
 public class CloudSystemApplication {
     public static void main (String[] args) {
         SpringApplication.run(CloudSystemApplication.class, args);

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java

@@ -49,6 +49,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
         if (Objects.nonNull(endTime) && endTime instanceof Date endDate){
             queryWrapper.lt(SysConfig::getCreateTime, endDate);
         }
+
         return this.list(queryWrapper);
     }
 
@@ -57,7 +58,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
      *
      * @param configKey
      *
-     * @return
+     * @return+
      */
     @Override
     public String selectConfigByKey (String configKey) {