cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheAbsBasic.java

@@ -1,11 +1,8 @@
 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  ️✈️
@@ -21,43 +18,16 @@ public abstract class CacheAbsBasic <K, V> implements CacheBasic<K, V>{
 
     @Override
     public void put(K key, V value) {
-
+        redisService.setCacheObject(encode(key), value);
-        try {
-            redisService.setCacheObject(encode(key), value,30L,TimeUnit.MINUTES);
-        } catch (Exception e) {
-            throw new RuntimeException("运行时异常，异常信息为：{}"+e.getMessage());
-        }
     }
 
     @Override
     public V get(K key) {
-
+        return redisService.getCacheObject(encode(key));
-        try {
-            return redisService.getCacheObject(encode(key));
-        } catch (Exception e) {
-            throw new RuntimeException("运行时异常，异常信息为：{}"+e.getMessage());
-        }
     }
 
     @Override
     public void remove(K key) {
-
+        redisService.deleteObject(encode(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;
     }
 }

cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheBasic.java

@@ -1,10 +1,5 @@
 package com.muyu.common.cache;
 
-import org.springframework.data.redis.core.TimeoutUtils;
-
-import java.util.Date;
-import java.util.concurrent.TimeUnit;
-
 /**
  * 缓存基础
  * * @className: CacheBasic  ️✈️
@@ -19,6 +14,4 @@ public interface CacheBasic<K, V> extends PrimaryKeyBasic<K> {
     V get(K key);
 
     void remove(K key);
-
-    boolean hashKey(K key);
 }

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java

@@ -1,7 +1,6 @@
 package com.muyu.common.core.web.controller;
 
 import com.github.pagehelper.PageInfo;
-
 import com.muyu.common.core.utils.DateUtils;
 import com.muyu.common.core.utils.PageUtils;
 import com.muyu.common.core.domain.Result;

cloud-common/cloud-common-iotdb/pom.xml

@@ -34,11 +34,6 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
 </project>

cloud-common/pom.xml

@@ -20,8 +20,8 @@
         <module>cloud-common-system</module>
         <module>cloud-common-xxl</module>
         <module>cloud-common-rabbit</module>
-        <module>cloud-common-cache</module>
         <module>cloud-common-kafka</module>
+        <module>cloud-common-cache</module>
         <module>cloud-common-iotdb</module>
         <module>cloud-common-caffeine</module>
     </modules>

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

@@ -34,11 +34,6 @@
             <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-annotations-jakarta</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
 </project>

cloud-modules/cloud-modules-data-process/cloud-modules-data-process-common/src/main/java/com/muyu/data/basics/EventQueueConfig.java

@@ -1,37 +0,0 @@
-package com.muyu.data.basics;
-
-
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.concurrent.LinkedBlockingDeque;
-
-/**
- * @Author WangXin
- * @Data 2024/9/29
- * @Description 事件队列配置
- * @Version 1.0.0
- */
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class EventQueueConfig {
-
-    private LinkedBlockingDeque<EventProcessBasics> taskNodeQueue = new LinkedBlockingDeque<>();
-
-    public void addEvent(EventProcessBasics obj){
-        this.taskNodeQueue.add(obj);
-    }
-
-    public boolean hashEventNext(){
-        return !taskNodeQueue.isEmpty();
-    }
-
-    private EventProcessBasics nextTaskNode(){
-        return taskNodeQueue.poll();
-    }
-}

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

@@ -4,10 +4,10 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: 123.57.152.124:8848
+  addr: 127.0.0.1:8848
   user-name: nacos
   password: nacos
-  namespace: five
+  namespace: wx
 # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
 # Spring
 spring:
@@ -59,3 +59,7 @@ spring:
           - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
           # xxl-job 配置文件
           - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
+logging:
+  level:
+    com.muyu.system.mapper: DEBUG

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

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.muyu</groupId>
-        <artifactId>cloud-modules-enterprise</artifactId>
-        <version>3.6.3</version>
-    </parent>
-
-    <artifactId>enterpise-cache</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-
-
-
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-cache</artifactId>
-            <version>${muyu.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>enterpise-common</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>

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

@@ -1,43 +0,0 @@
-package com.muyu.enterpise.cache;
-
-import com.muyu.common.cache.CacheAbsBasic;
-import com.muyu.domain.MessageValue;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * @version 1.0
- * @Author xie ya ru
- * @Date 2024/9/29 20:04
- * @注释
- */
-@Component
-public class MessageValueCacheService extends CacheAbsBasic<String, List<MessageValue>>{
-
-    /**
-     *  前缀
-     * @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:","");
-    }
-}

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

@@ -1,30 +0,0 @@
-package com.muyu.enterpise.cache;
-
-import com.muyu.common.cache.CacheAbsBasic;
-import com.muyu.domain.SysCar;
-import org.springframework.stereotype.Component;
-
-/**
- * @version 1.0
- * @Author xie ya ru
- * @Date 2024/9/30 11:06
- * @注释
- */
-@Component
-public class SysCarCacheService extends CacheAbsBasic<String, SysCar> {
-
-    @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);
-    }
-}

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

@@ -1,29 +0,0 @@
-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<String, SysCarType> {
-    @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);
-    }
-}

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

@@ -1,2 +0,0 @@
-com.muyu.enterpise.cache.MessageValueCacheService
-com.muyu.enterpise.cache.SysCarCacheService

cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarAndGroupMiddle.java

@@ -1,45 +0,0 @@
-package com.muyu.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 车辆电子围栏中间表
- * * @Author：yan
- *  * @Package：com.muyu.car.domain
- *  * @Project：plues
- *  * @name：FenceAndGroupMiddle
- *  * @Date：2024/9/22 09:59
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@Tag(name = "车辆和电子围栏组中间表")
-@TableName(value = "car_group_middle",autoResultMap = true)
-public class CarAndGroupMiddle {
-    /**
-     * id
-     */
-    @TableId(value = "id",type = IdType.AUTO)
-    @Schema(name = "id")
-    private Long id;
-    /**
-     * 车id
-     */
-    @Schema(name = "围栏id")
-    private Integer carId;
-    /**
-     * 围栏组id
-     */
-    @Schema(name = "围栏组id")
-    private Long groupId;
-
-}

cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FenceGroup.java

@@ -3,7 +3,6 @@ package com.muyu.domain;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.muyu.domain.req.FenceGroupUpdateReq;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
@@ -31,7 +30,7 @@ public class FenceGroup {
      */
     @TableId(value = "group_id",type = IdType.AUTO)
     @Schema(name = "围栏组id")
-    private Long  groupId;
+    private Integer  groupId;
     /**
      * 围栏组名称
      */
@@ -43,18 +42,5 @@ public class FenceGroup {
     @Schema(name = "围栏组状态")
     private Integer  groupStates;
 
-    public static FenceGroup carFenceUpdateById(Integer states, FenceGroupUpdateReq fenceGroupBuilder ){
-        return FenceGroup.builder()
-                .groupId(fenceGroupBuilder.getGroupId())
-                .groupStates(states)
-                .build();
-    }
-
-    public static FenceGroup closeCarFenceUpdateById(Integer states, Long groupId ){
-        return FenceGroup.builder()
-                .groupId(groupId)
-                .groupStates(states)
-                .build();
-    }
 
 }

cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageValue.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.muyu.common.core.web.domain.BaseEntity;
 import com.muyu.domain.req.MessageValueAddReq;
-import com.muyu.domain.resp.MessageValueListResp;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
@@ -83,14 +82,4 @@ public class MessageValue extends BaseEntity {
                 .messageEndIndex(messageValueAddReq.getMessageEndIndex())
                 .build();
     }
-    public static MessageValue addRollback(MessageValueListResp messageValueListResp){
-        return MessageValue.builder()
-                .templateId(messageValueListResp.getMessageId())
-                .messageType(messageValueListResp.getMessageType())
-                .messageCode(messageValueListResp.getMessageCode())
-                .messageLabel(messageValueListResp.getMessageLabel())
-                .messageStartIndex(messageValueListResp.getMessageStartIndex())
-                .messageEndIndex(messageValueListResp.getMessageEndIndex())
-                .build();
-    }
 }

cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCarType.java

@@ -31,7 +31,7 @@ public class SysCarType extends BaseEntity {
      */
     @TableId(value = "id", type = IdType.AUTO)
     @Schema(name = "车辆类型主键")
-    private Long id;
+    private String id;
 
     /**
      * 车辆类型名称

cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FenceGroupUpdateReq.java

@@ -1,31 +0,0 @@
-package com.muyu.domain.req;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 修改围栏的状态
- * @Author：yan
- * @Package：com.muyu.domain.req
- * @Project：plues
- * @name：CarFenceUpdateReq
- * @Date：2024/9/29 20:22
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Tag(name = "修改围栏的状态", description = "修改围栏的状态")
-public class FenceGroupUpdateReq {
-    /**
-     * id
-     */
-    @TableId(value = "group_id", type = IdType.AUTO)
-    @Schema(title = "围栏组Id")
-    private Long groupId;
-
-}

cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/SysCar.java

@@ -6,7 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.muyu.common.core.web.domain.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -18,13 +21,14 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @date 2024-09-18
  */
 
+@EqualsAndHashCode(callSuper = true)
 @Data
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName(value = "sys_car", autoResultMap = true)
 @Tag(name = "车辆基础信息对象")
-public class SysCarReq {
+public class SysCar extends BaseEntity{
 
     /** 自增主键 */
     @TableId( type = IdType.AUTO)
@@ -64,4 +68,24 @@ public class SysCarReq {
     private Integer state;
 
 
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("carVin", getCarVin())
+            .append("carPlate", getCarPlate())
+            .append("carBrand", getCarBrand())
+            .append("carModel", getCarModel())
+            .append("carType", getCarType())
+            .append("warnStrategy", getWarnStrategy())
+            .append("groupCode", getGroupCode())
+            .append("state", getState())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
 }

cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/SysCarResp.java

@@ -3,7 +3,6 @@ package com.muyu.domain.resp;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.muyu.domain.SysCar;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
@@ -90,19 +89,19 @@ public class SysCarResp {
     @Schema(description = "启用状态")
     private Integer state;
 
-
+    @Override
-    public  static SysCarResp reverseResp(SysCar sysCar){
+    public String toString() {
-        return SysCarResp.builder()
+        return "SysCarResp{" +
-                .id(sysCar.getId())
+                "id=" + id +
-                .carVin(sysCar.getCarVin())
+                ", carVin='" + carVin + '\'' +
-                .carPlate(sysCar.getCarPlate())
+                ", carPlate='" + carPlate + '\'' +
-                .carBrand(sysCar.getCarBrand())
+                ", carBrand='" + carBrand + '\'' +
-                .carModel(sysCar.getCarModel())
+                ", carModel='" + carModel + '\'' +
-                .carType(sysCar.getCarType())
+                ", carType=" + carType +
-                .warnStrategy(sysCar.getWarnStrategy())
+                ", sysTypeName='" + sysTypeName + '\'' +
-                .groupCode(sysCar.getGroupCode())
+                ", warnStrategy=" + warnStrategy +
-                .state(sysCar.getState())
+                ", groupCode='" + groupCode + '\'' +
-                .build();
+                ", state=" + state +
-
+                '}';
     }
 }

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

@@ -83,14 +83,6 @@
             <groupId>com.muyu</groupId>
             <artifactId>cloud-common-xxl</artifactId>
         </dependency>
-
-        <!--    cache缓存框架    -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>enterpise-cache</artifactId>
-            <version>${muyu.version}</version>
-        </dependency>
-
     </dependencies>
 
     <build>

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

@@ -1,9 +1,9 @@
-package com.muyu.enterpise.controller;
+package com.muyu.controller;
 
 import com.muyu.common.core.domain.Result;
 
 import com.muyu.domain.CarFenceClazz;
-import com.muyu.enterpise.service.CarFenceClazzService;
+import com.muyu.service.CarFenceClazzService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;

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

@@ -1,12 +1,12 @@
-package com.muyu.enterpise.controller;
+package com.muyu.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.muyu.common.core.domain.Result;
 import com.muyu.domain.CarFence;
 import com.muyu.domain.req.CarFenceReq;
 import com.muyu.domain.resp.CarFenceResq;
-import com.muyu.enterpise.service.CarFenceService;
+import com.muyu.service.CarFenceService;
-import com.muyu.enterpise.service.CarFenceServiceMybaits;
+import com.muyu.service.CarFenceServiceMybaits;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;

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

@@ -1,8 +1,8 @@
-package com.muyu.enterpise.controller;
+package com.muyu.controller;
 
 import com.muyu.common.core.domain.Result;
 import com.muyu.domain.CarFenceType;
-import com.muyu.enterpise.service.CarFenceTypeService;
+import com.muyu.service.CarFenceTypeService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;

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

@@ -1,8 +1,8 @@
-package com.muyu.enterpise.controller;
+package com.muyu.controller;
 
 
 import com.muyu.common.core.domain.Result;
-import com.muyu.enterpise.service.CarTypeService;
+import com.muyu.service.CarTypeService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.controller;
+package com.muyu.controller;
 
 
 
@@ -7,7 +7,7 @@ import com.muyu.domain.req.FaultCodeAddReq;
 import com.muyu.domain.req.FaultCodeListReq;
 import com.muyu.domain.req.FaultCodeUpdReq;
 import com.muyu.domain.resp.FaultCodeTotalListResp;
-import com.muyu.enterpise.service.FaultCodeService;
+import com.muyu.service.FaultCodeService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.controller;
+package com.muyu.controller;
 
 
 
@@ -7,7 +7,7 @@ import com.muyu.domain.FaultCondition;
 import com.muyu.domain.req.FaultConditionAddReq;
 import com.muyu.domain.req.FaultConditionListReq;
 import com.muyu.domain.req.FaultConditionUpdReq;
-import com.muyu.enterpise.service.FaultConditionService;
+import com.muyu.service.FaultConditionService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,6 +1,6 @@
-package com.muyu.enterpise.controller;
+package com.muyu.controller;
 import com.muyu.common.core.domain.Result;
-import com.muyu.enterpise.service.FaultLabelService;
+import com.muyu.service.FaultLabelService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,7 +1,7 @@
-package com.muyu.enterpise.controller;
+package com.muyu.controller;
 import com.muyu.common.core.domain.Result;
 import com.muyu.domain.req.FaultLogListReq;
-import com.muyu.enterpise.service.FaultLogService;
+import com.muyu.service.FaultLogService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,10 +1,10 @@
-package com.muyu.enterpise.controller;
+package com.muyu.controller;
 
 
 import com.muyu.common.core.domain.Result;
 import com.muyu.domain.CarFaultRule;
 import com.muyu.domain.FaultRule;
-import com.muyu.enterpise.service.FaultRuleService;
+import com.muyu.service.FaultRuleService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,6 +1,6 @@
-package com.muyu.enterpise.controller;
+package com.muyu.controller;
 import com.muyu.common.core.domain.Result;
-import com.muyu.enterpise.service.FaultTypeService;
+import com.muyu.service.FaultTypeService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,8 +1,8 @@
-package com.muyu.enterpise.controller;
+package com.muyu.controller;
 
 import com.muyu.common.core.domain.Result;
 import com.muyu.domain.FenceGroup;
-import com.muyu.enterpise.service.FenceGroupService;
+import com.muyu.service.FenceGroupService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;

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

@@ -1,11 +1,11 @@
-package com.muyu.enterpise.controller;
+package com.muyu.controller;
 
 
 import com.muyu.common.core.domain.Result;
 import com.muyu.domain.message.Message;
 import com.muyu.domain.message.MessageReq;
 import com.muyu.domain.message.MessageSendReq;
-import com.muyu.enterpise.service.MessageService;
+import com.muyu.service.MessageService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,10 +1,10 @@
-package com.muyu.enterpise.controller;
+package com.muyu.controller;
 
 import com.muyu.common.core.domain.Result;
 import com.muyu.domain.MessageTemplate;
 import com.muyu.domain.req.MessageTemplateAddReq;
 import com.muyu.domain.resp.MessageTemplateListResp;
-import com.muyu.enterpise.service.MessageTemplateService;
+import com.muyu.service.MessageTemplateService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.controller;
+package com.muyu.controller;
 
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.controller.BaseController;
@@ -6,14 +6,15 @@ 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.service.MessageValueService;
-import com.muyu.enterpise.service.MessageValueService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -32,8 +33,8 @@ public class MessageValueController extends BaseController {
     @Autowired
     private MessageValueService messageValueService;
 
-    @Autowired
+    @Resource
-    private MessageValueCacheService messageValueCacheService;
+    private RedisTemplate<String,MessageValue> redisTemplate;
 
     /**
      * 报文数据列表查询
@@ -55,6 +56,7 @@ public class MessageValueController extends BaseController {
     @PostMapping("/")
     @Operation(summary = "添加报文数据", description = "新增报文数据")
     public Result<String> save(@RequestBody MessageValueAddReq messageValueAddReq){
+        redisTemplate.boundValueOps("messageValue:" +messageValueAddReq.getTemplateId()).increment(1);
         messageValueService.save(MessageValue.addBuild(messageValueAddReq));
         return Result.success("添加成功");
     }
@@ -80,4 +82,12 @@ public class MessageValueController extends BaseController {
     }
 
 
+    @PostMapping({"/findByTemplateId/{stringVin}"})
+    @Operation(
+            summary = "根据车辆类型查询报文模版ID",
+            description = "根据车辆类型查询报文模版ID"
+    )
+    public Result<Long> findByTemplateId(@PathVariable("stringVin") String stringVin) {
+        return Result.success(this.messageValueService.findByTemplateId(stringVin), "查询成功");
+    }
 }

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

@@ -3,7 +3,6 @@ package com.muyu.controller;
 import com.muyu.common.core.domain.Result;
 import com.muyu.domain.FenceGroup;
 import com.muyu.domain.req.CarFenceAdd;
-import com.muyu.domain.req.FenceGroupUpdateReq;
 import com.muyu.service.CarFenceServiceMybaits;
 import com.muyu.service.MiddleService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -29,17 +28,23 @@ import java.util.List;
 @Tag(name = "中间表添加",description = "添加")
 @Log4j2
 public class MiddleController {
+    @Autowired
+    private MiddleService middleService;
     @Autowired
     private CarFenceServiceMybaits carFenceServiceMybaits;
 
+
+
     /**
      * 添加围栏组 多对多
      */
     @PostMapping("/addCarFence")
-    @Operation(summary = "添加中间围栏和围栏组",description = "添加中间")
+    @Operation(summary = "添加中间",description = "添加中间")
     public Result addCarFence(@RequestParam("fenceGroupId") Integer fenceGroupId, @RequestBody List<CarFenceAdd> carFences){
-        boolean i  = carFenceServiceMybaits.saveBatch(carFences,fenceGroupId);
+         carFenceServiceMybaits.addFenceGroup(fenceGroupId,carFences);
-        return i?Result.success("添加成功"):Result.error("失败");
+        System.out.println("围栏组Id"+fenceGroupId);
+        System.out.println("围栏Id"+carFences);
+        return Result.success("成功");
     }
 
     /**
@@ -50,11 +55,18 @@ public class MiddleController {
     @GetMapping("/updateFenceGroupById")
     @Operation(summary = "修改围栏状态",description = "修改围栏状态")
     public Result updateFenceGroupById(@RequestParam("groupId") Integer groupId){
-        carFenceServiceMybaits.updateFenceGroupById(groupId);
 
-        return Result.success();
+        return Result.success(carFenceServiceMybaits.updateFenceGroupById(groupId));
     }
 
+    /**
+     * 启动围栏
+     */
+    @GetMapping("/activate")
+    @Operation(summary = "启动围栏状态",description = "启动围栏状态")
+    public Result activate(@RequestParam("groupId") Integer groupId){
+        return Result.success(carFenceServiceMybaits.activate(groupId));
+    }
 
     /**
      * 根据围栏组的id查询绑定的围栏的中间表
@@ -62,11 +74,19 @@ public class MiddleController {
     @GetMapping("/BoundFenceGroup")
     @Operation(summary = "根据围栏组的id查询绑定的围栏的中间表",description = "根据围栏组的id查询绑定的围栏的中间表")
     public Result BoundFenceGroup(@RequestParam("groupId") Integer groupId){
-        carFenceServiceMybaits.BoundFenceGroup(groupId);
+
-        return Result.success();
+        return Result.success(carFenceServiceMybaits.BoundFenceGroup(groupId));
     }
 
-
+    /**
+     * 根据围栏组和车辆的id添加中间表
+     */
+    @PostMapping("/addFenceGroupAddCarMiddle")
+    @Operation(summary = "根据围栏组和车辆的id添加中间表",description = "根据围栏组和车辆的id添加中间表")
+    public Result addFenceGroupAddCarMiddle(@RequestParam("carId") Integer carId , @RequestBody List<FenceGroup> fenceGroups ){
+        carFenceServiceMybaits.addFenceGroupAddCarMiddle(carId,fenceGroups);
+        return Result.success();
+    }
 
     /**
      * 获取绑定的围栏组

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.controller;
+package com.muyu.controller;
 
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.controller.BaseController;
@@ -6,10 +6,8 @@ import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.security.annotation.RequiresPermissions;
 import com.muyu.common.security.utils.SecurityUtils;
 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.service.SysCarService;
-import com.muyu.enterpise.service.SysCarService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -31,18 +29,15 @@ public class SysCarController extends BaseController
     @Resource
     private SysCarService sysCarService;
 
-    @Resource
-    private SysCarCacheService sysCarCacheService;
-
     /**
      * 查询车辆基础信息列表
      */
     @RequiresPermissions("car:car:list")
     @GetMapping("/list")
-    public Result<TableDataInfo<SysCarResp>> list(SysCarReq sysCarReq)
+    public Result<TableDataInfo<SysCarResp>> list(SysCar sysCar)
     {
         startPage();
-        List<SysCarResp> list = sysCarService.selectSysCarList(sysCarReq);
+        List<SysCarResp> list = sysCarService.selectSysCarList(sysCar);
         return getDataTable(list);
     }
 
@@ -67,9 +62,7 @@ public class SysCarController extends BaseController
         if (sysCarService.checkIdUnique(sysCar)) {
             return error("新增 车辆基础信息 '" + sysCar + "'失败，车辆基础信息已存在");
         }
-
         sysCar.setCreateBy(SecurityUtils.getUsername());
-        sysCarCacheService.put(sysCar.getCarVin(),sysCar);
         return toAjax(sysCarService.save(sysCar));
     }
 

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.controller;
+package com.muyu.controller;
 
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
@@ -7,7 +7,7 @@ import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.security.annotation.RequiresPermissions;
 import com.muyu.common.security.utils.SecurityUtils;
 import com.muyu.domain.SysCarFault;
-import com.muyu.enterpise.service.ISysCarFaultService;
+import com.muyu.service.ISysCarFaultService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.validation.annotation.Validated;

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

@@ -1,12 +1,10 @@
-package com.muyu.enterpise.controller;
+package com.muyu.controller;
 
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.domain.SysCarType;
-import com.muyu.enterpise.cache.SysCarCacheService;
+import com.muyu.service.SysTypeService;
-import com.muyu.enterpise.cache.SysCarTypeCacheService;
-import com.muyu.enterpise.service.SysTypeService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,9 +29,6 @@ public class SysTypeController extends BaseController {
     @Resource
     private SysTypeService sysTypeService;
 
-    @Resource
-    private SysCarTypeCacheService sysCarTypeCacheService;
-
 
     /**
      * 查询车辆类型列表
@@ -42,10 +37,6 @@ public class SysTypeController extends BaseController {
     public Result<TableDataInfo<SysCarType>> list() {
         startPage();
         List<SysCarType> list = sysTypeService.selectSysTypeList();
-        for (SysCarType sysCarType : list) {
-            sysCarTypeCacheService.put(String.valueOf(sysCarType.getId()),sysCarType);
-        }
         return getDataTable(list);
     }
-
 }

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.controller;
+package com.muyu.controller;
 
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
@@ -6,7 +6,7 @@ import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.security.utils.SecurityUtils;
 import com.muyu.domain.WarnLogs;
-import com.muyu.enterpise.service.IWarnLogsService;
+import com.muyu.service.IWarnLogsService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.validation.annotation.Validated;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.controller;
+package com.muyu.controller;
 
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
@@ -6,7 +6,7 @@ import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.security.utils.SecurityUtils;
 import com.muyu.domain.WarnRule;
-import com.muyu.enterpise.service.IWarnRuleService;
+import com.muyu.service.IWarnRuleService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.validation.annotation.Validated;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.controller;
+package com.muyu.controller;
 
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
@@ -6,7 +6,7 @@ import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.security.utils.SecurityUtils;
 import com.muyu.domain.WarnStrategy;
-import com.muyu.enterpise.service.IWarnStrategyService;
+import com.muyu.service.IWarnStrategyService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.validation.annotation.Validated;

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

@@ -1,42 +0,0 @@
-package com.muyu.controller;
-
-import com.muyu.common.core.domain.Result;
-import com.muyu.domain.FenceGroup;
-import com.muyu.service.CarAndFenceGroupMiddleService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.AllArgsConstructor;
-import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 车辆和围栏组中间表
- * @Author：yan
- * @Package：com.muyu.controller
- * @Project：plues
- * @name：CarAndFenceGroupMiddleController
- * @Date：2024/9/29 20:09
- */
-@RequestMapping("/carandfencemiddle")
-@RestController
-@AllArgsConstructor
-@Log4j2
-@Tag(name = "车辆和围栏组中间表")
-public class CarAndFenceGroupMiddleController {
-    @Autowired
-    private CarAndFenceGroupMiddleService carAndFenceGroupMiddleService;
-
-    /**
-     * 根据围栏组和车辆的id添加中间表
-     */
-    @PostMapping("/addFenceGroupAddCarMiddle")
-    @Operation(summary = "根据围栏组和车辆的id添加中间表",description = "根据围栏组和车辆的id添加中间表")
-    public Result addFenceGroupAddCarMiddle(@RequestParam("carId") Integer carId , @RequestBody List<FenceGroup> fenceGroups ){
-        boolean b = carAndFenceGroupMiddleService.saveBatch(fenceGroups,carId);
-        return Result.success("成功");
-    }
-
-}

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

@@ -1,58 +0,0 @@
-package com.muyu.controller;
-
-import com.muyu.common.core.domain.Result;
-import com.muyu.domain.FenceGroup;
-import com.muyu.domain.req.FenceGroupUpdateReq;
-import com.muyu.service.CarFenceUpdateService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.AllArgsConstructor;
-import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 围栏组的修改状态
- * @Author：yan
- * @Package：com.muyu.controller
- * @Project：plues
- * @name：CarFenceUpdateController
- * @Date：2024/9/30 09:10
- *
- */
-@RestController
-@RequestMapping("/fenceUpdate")
-@AllArgsConstructor
-@Log4j2
-@Tag(name = "修改围栏组的状态")
-public class CarFenceUpdateController {
-    @Autowired
-    private CarFenceUpdateService carFenceUpdateService;
-
-    /**
-     * 启动围栏组
-     */
-    @PutMapping("/activate")
-    @Operation(summary = "启动围栏状态",description = "启动围栏状态")
-    public Result activate(@RequestBody FenceGroupUpdateReq fenceGroupUpdateReq){
-        Integer states = 0;
-        boolean b = carFenceUpdateService.updateById(FenceGroup.carFenceUpdateById(states, fenceGroupUpdateReq));
-        return Result.success("成功");
-    }
-
-    /**
-     * 修改围栏状态为关闭
-     * @param groupId
-     * @return
-     */
-    @GetMapping("/updateFenceGroupById")
-    @Operation(summary = "修改围栏状态为关闭",description = "修改围栏状态为关闭")
-    public Result updateFenceGroupById(@RequestParam("groupId") Long groupId){
-        Integer states = 1;
-        carFenceUpdateService.updateById(FenceGroup.closeCarFenceUpdateById(states,groupId));
-
-        return Result.success("成功");
-    }
-
-
-}

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

@@ -1,19 +0,0 @@
-package com.muyu.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.domain.CarAndGroupMiddle;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 车辆和围栏组中间表
- * @Author：yan
- * @Package：com.muyu.mapper
- * @Project：plues
- * @name：CarAndFenceGroupMiddleMapper
- * @Date：2024/9/29 20:12
- */
-@Mapper
-public interface CarAndFenceGroupMiddleMapper extends BaseMapper<CarAndGroupMiddle> {
-
-}

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

@@ -1,18 +0,0 @@
-package com.muyu.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.muyu.domain.CarFence;
-import com.muyu.domain.FenceGroup;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 围栏组的修改状态
- * @Author：yan
- * @Package：com.muyu.mapper
- * @Project：plues
- * @name：CarFenceUpdateMapper
- * @Date：2024/9/30 09:13
- */
-@Mapper
-public interface CarFenceUpdateMapper extends BaseMapper<FenceGroup> {
-}

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

@@ -1,22 +0,0 @@
-package com.muyu.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.muyu.domain.CarAndGroupMiddle;
-import com.muyu.domain.FenceGroup;
-
-import java.util.List;
-
-/**
- * 车辆和围栏组中间表
- * @Author：yan
- * @Package：com.muyu.service
- * @Project：plues
- * @name：CarAndFenceGroupMiddleService
- * @Date：2024/9/29 20:10
- */
-public interface CarAndFenceGroupMiddleService extends IService<CarAndGroupMiddle> {
-    /**
-     * 根据围栏组和车辆的id添加中间表
-     */
-    boolean saveBatch(List<FenceGroup> fenceGroups, Integer carId);
-}

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

@@ -1,16 +0,0 @@
-package com.muyu.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.muyu.domain.CarFence;
-import com.muyu.domain.FenceGroup;
-
-/**
- * 围栏组的修改状态
- * @Author：yan
- * @Package：com.muyu.service
- * @Project：plues
- * @name：CarFenceUpdateService
- * @Date：2024/9/30 09:12
- */
-public interface CarFenceUpdateService extends IService<FenceGroup> {
-}

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

@@ -1,41 +0,0 @@
-package com.muyu.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.muyu.domain.CarAndGroupMiddle;
-import com.muyu.domain.FenceGroup;
-import com.muyu.mapper.CarAndFenceGroupMiddleMapper;
-import com.muyu.service.CarAndFenceGroupMiddleService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 车辆和围栏组中间表
- * @Author：yan
- * @Package：com.muyu.service.impl
- * @Project：plues
- * @name：CarAndFenceGroupMiddleServiceImpl
- * @Date：2024/9/29 20:11
- */
-@Service
-public class CarAndFenceGroupMiddleServiceImpl extends ServiceImpl<CarAndFenceGroupMiddleMapper, CarAndGroupMiddle> implements CarAndFenceGroupMiddleService {
-    @Autowired
-    private CarAndFenceGroupMiddleMapper carAndFenceGroupMiddleMapper;
-
-    /**
-     * 根据围栏组和车辆的id添加中间表
-     */
-    @Override
-    public boolean saveBatch(List<FenceGroup> fenceGroups, Integer carId) {
-        List<CarAndGroupMiddle> list = fenceGroups.stream().map(fenceGroup -> {
-            CarAndGroupMiddle carAndGroupMiddle = new CarAndGroupMiddle();
-            //获取围栏组的id
-            carAndGroupMiddle.setGroupId(fenceGroup.getGroupId());
-            carAndGroupMiddle.setCarId(carId);
-            return carAndGroupMiddle;
-        }).toList();
-        boolean b = this.saveBatch(list);
-        return b;
-    }
-}

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

@@ -1,26 +0,0 @@
-package com.muyu.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.muyu.domain.CarFence;
-import com.muyu.domain.FenceGroup;
-import com.muyu.mapper.CarFenceUpdateMapper;
-import com.muyu.service.CarFenceUpdateService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 围栏组的修改状态
- * @Author：yan
- * @Package：com.muyu.service.impl
- * @Project：plues
- * @name：CarFenceUpdateServiceImpl
- * @Date：2024/9/30 09:12
- * 围栏组的修改状态
- */
-
-@Service
-public class CarFenceUpdateServiceImpl extends ServiceImpl<CarFenceUpdateMapper, FenceGroup> implements CarFenceUpdateService {
-    @Autowired
-    private CarFenceUpdateMapper carFenceUpdateMapper;
-
-}

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.mapper;
+package com.muyu.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.domain.CarFenceClazz;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.mapper;
+package com.muyu.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.domain.CarFence;

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

@@ -1,9 +1,8 @@
-package com.muyu.enterpise.mapper;
+package com.muyu.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.domain.CarFence;
 import com.muyu.domain.CarMiddle;
-import com.muyu.domain.CarAndGroupMiddle;
+import com.muyu.domain.FenceAndGroupMiddle;
 import com.muyu.domain.FenceGroup;
 import com.muyu.domain.req.CarFenceGroup;
 import org.apache.ibatis.annotations.Mapper;
@@ -20,7 +19,7 @@ import java.util.List;
  *  * @Date：2024/9/22 19:25
  */
 @Mapper
-public interface CarFenceServiceMybaitsMapper extends BaseMapper<CarMiddle> {
+public interface CarFenceServiceMybaitsMapper {
 
     void fenceAdd(CarFenceGroup carFence);
 
@@ -33,6 +32,17 @@ public interface CarFenceServiceMybaitsMapper extends BaseMapper<CarMiddle> {
      */
     Integer addFenceGroup(@Param("fenceGroupId") Integer fenceGroupId, @Param("id") Integer id);
 
+    /**
+     * 修改围栏组状态
+     * @param groupId
+     * @return
+     */
+    void updateFenceGroupById(@Param("groupId") Integer groupId);
+
+    /**
+     * 启动围栏
+     */
+    void activate(@Param("groupId") Integer groupId);
 
     /**
      * 根据围栏组的id查询绑定的围栏的中间表
@@ -61,12 +71,12 @@ public interface CarFenceServiceMybaitsMapper extends BaseMapper<CarMiddle> {
      * @param carId
      * @return
      */
-    List<CarAndGroupMiddle> selectBoundGFenceGroup(@Param("carId") Integer carId);
+    List<FenceAndGroupMiddle> selectBoundGFenceGroup(@Param("carId") Integer carId);
 
     /**
      * 获取围栏组的数据
      * @param carGroupId 参数
      * @return
      */
-    FenceGroup selectGroup(@Param("carGroupId") Long carGroupId);
+    FenceGroup selectGroup(@Param("carGroupId") Integer carGroupId);
 }

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.mapper;
+package com.muyu.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.domain.CarFenceType;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.mapper;
+package com.muyu.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.domain.CarType;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.mapper;
+package com.muyu.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.domain.FaultCode;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.mapper;
+package com.muyu.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.domain.FaultCondition;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.mapper;
+package com.muyu.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.domain.FaultLabel;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.mapper;
+package com.muyu.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.domain.FaultLog;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.mapper;
+package com.muyu.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.domain.FaultRule;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.mapper;
+package com.muyu.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.domain.FaultType;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.mapper;
+package com.muyu.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.domain.FenceGroup;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.mapper;
+package com.muyu.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.domain.message.Message;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.mapper;
+package com.muyu.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.domain.MessageTemplate;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.mapper;
+package com.muyu.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.domain.MessageValue;
@@ -14,5 +14,6 @@ import org.apache.ibatis.annotations.Select;
  */
 @Mapper
 public interface MessageValueMapper extends BaseMapper<MessageValue> {
-
+    @Select({"SELECT sct.message_template_id FROM sys_car sc LEFT JOIN sys_car_type sct on sct.id = sc.car_type WHERE sc.car_vin = ${stringVin}"})
+    Long findByTemplateId(String stringVin);
 }

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.mapper;
+package com.muyu.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.mapper;
+package com.muyu.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.domain.SysCarFault;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.mapper;
+package com.muyu.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.domain.SysCar;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.mapper;
+package com.muyu.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.domain.SysCarType;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.mapper;
+package com.muyu.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.domain.WarnLogs;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.mapper;
+package com.muyu.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.mapper;
+package com.muyu.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.service;
+package com.muyu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.domain.CarFenceClazz;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.service;
+package com.muyu.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;

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

@@ -1,8 +1,6 @@
-package com.muyu.enterpise.service;
+package com.muyu.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.domain.CarFence;
-import com.muyu.domain.CarMiddle;
 import com.muyu.domain.FenceGroup;
 import com.muyu.domain.req.CarFenceAdd;
 
@@ -16,18 +14,15 @@ import java.util.List;
  *  * @name：CarFenceServiceMybaits
  *  * @Date：2024/9/22 19:24
  */
-public interface CarFenceServiceMybaits extends IService<CarMiddle> {
+public interface CarFenceServiceMybaits {
-
+    void add(Integer fenceGroupId, List<Integer> carFenceId);
 
     /**
      * 添加多对多围栏组
-     *
      * @param fenceGroupId
      * @param carFences
-     * @return
      */
-    boolean saveBatch(List<CarFenceAdd> carFences, Integer fenceGroupId);
+    void addFenceGroup(Integer fenceGroupId, List<CarFenceAdd> carFences);
-
 
     /**
      * 修改围栏状态
@@ -36,18 +31,19 @@ public interface CarFenceServiceMybaits extends IService<CarMiddle> {
      */
     Object updateFenceGroupById(Integer groupId);
 
-
     /**
      * 启动围栏
      */
     Object activate(Integer groupId);
-
     /**
      * 根据围栏组的id查询绑定的围栏的中间表
      */
     List<CarFence> BoundFenceGroup(Integer groupId);
 
-
+    /**
+     * 根据围栏组和车辆的id添加中间表
+     */
+    void addFenceGroupAddCarMiddle(Integer id, List<FenceGroup> fenceGroups);
 
     /**
      * 获取绑定的围栏组
@@ -55,6 +51,4 @@ public interface CarFenceServiceMybaits extends IService<CarMiddle> {
      */
     List<FenceGroup> selectBoundGFenceGroup(Integer carId);
 
-
-
 }

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.service;
+package com.muyu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.domain.CarFenceType;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.service;
+package com.muyu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.domain.CarType;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.service;
+package com.muyu.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.service;
+package com.muyu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.domain.FaultCondition;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.service;
+package com.muyu.service;
 
 import com.muyu.domain.CarFaultRule;
 import com.muyu.domain.FaultReport;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.service;
+package com.muyu.service;
 
 /**
  * 故障检测策略的接口

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.service;
+package com.muyu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.domain.FaultLabel;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.service;
+package com.muyu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.domain.FaultLog;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.service;
+package com.muyu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.domain.FaultRule;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.service;
+package com.muyu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.domain.FaultType;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.service;
+package com.muyu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.domain.FenceGroup;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.service;
+package com.muyu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.domain.SysCarFault;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.service;
+package com.muyu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.domain.WarnLogs;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.service;
+package com.muyu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.domain.WarnRule;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.service;
+package com.muyu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.domain.WarnStrategy;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.service;
+package com.muyu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.domain.message.Message;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.service;
+package com.muyu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.domain.MessageTemplate;

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.service;
+package com.muyu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.domain.MessageValue;
@@ -27,6 +27,6 @@ public interface MessageValueService extends IService<MessageValue> {
      * @param str
      */
     void test(String str);
-
+    Long findByTemplateId(String stringVin);
 
 }

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.service;
+package com.muyu.service;
 
 /**
  * 中间表服务接口

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

@@ -1,8 +1,7 @@
-package com.muyu.enterpise.service;
+package com.muyu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.domain.SysCar;
-import com.muyu.domain.req.SysCarReq;
 import com.muyu.domain.resp.SysCarResp;
 
 import java.util.List;
@@ -27,7 +26,7 @@ public interface SysCarService extends IService<SysCar> {
      * @param sysCar 车辆基础信息
      * @return 车辆基础信息集合
      */
-    public List<SysCarResp> selectSysCarList(SysCarReq sysCarReq);
+    public List<SysCarResp> selectSysCarList(SysCar sysCar);
 
     /**
      * 判断 车辆基础信息 id是否唯一

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.service;
+package com.muyu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.domain.SysCarType;

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

@@ -1,9 +1,9 @@
-package com.muyu.enterpise.service.impl;
+package com.muyu.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.domain.CarFenceClazz;
-import com.muyu.enterpise.mapper.CarFenceClazzMapper;
+import com.muyu.mapper.CarFenceClazzMapper;
-import com.muyu.enterpise.service.CarFenceClazzService;
+import com.muyu.service.CarFenceClazzService;
 import org.springframework.stereotype.Service;
 
 /**

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

@@ -1,4 +1,4 @@
-package com.muyu.enterpise.service.impl;
+package com.muyu.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -9,10 +9,10 @@ import com.muyu.domain.CarFenceClazz;
 import com.muyu.domain.CarFenceType;
 import com.muyu.domain.req.CarFenceReq;
 import com.muyu.domain.resp.CarFenceResq;
-import com.muyu.enterpise.mapper.CarFenceMapper;
+import com.muyu.mapper.CarFenceMapper;
-import com.muyu.enterpise.service.CarFenceClazzService;
+import com.muyu.service.CarFenceClazzService;
-import com.muyu.enterpise.service.CarFenceService;
+import com.muyu.service.CarFenceService;
-import com.muyu.enterpise.service.CarFenceTypeService;
+import com.muyu.service.CarFenceTypeService;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -1,16 +1,12 @@
 package com.muyu.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.domain.CarFence;
 import com.muyu.domain.CarMiddle;
-import com.muyu.domain.CarAndGroupMiddle;
+import com.muyu.domain.FenceAndGroupMiddle;
 import com.muyu.domain.FenceGroup;
 import com.muyu.domain.req.CarFenceAdd;
 import com.muyu.mapper.CarFenceServiceMybaitsMapper;
 import com.muyu.service.CarFenceServiceMybaits;
-import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -26,36 +22,59 @@ import java.util.List;
  *  * @Date：2024/9/22 19:24
  */
 @Service
-@Log4j2
+public class CarFenceServiceMybaitsImpl implements CarFenceServiceMybaits {
-public class CarFenceServiceMybaitsImpl extends ServiceImpl<CarFenceServiceMybaitsMapper,CarMiddle> implements CarFenceServiceMybaits {
     @Autowired
     private CarFenceServiceMybaitsMapper carFenceServiceMybaitsMapper;
 
 
+    /**
+     * 添加多对多围栏组
+     * @param fenceGroupId
+     * @param carFenceId
+     */
+    @Override
+    public void add(Integer fenceGroupId, List<Integer> carFenceId) {
 
+        for (Integer integer : carFenceId) {
+            Integer addMiddle = carFenceServiceMybaitsMapper.addGroup(fenceGroupId,integer);
+        }
+
+
+
+    }
 
     /**
      * 添加多对多围栏组
-     *
      * @param fenceGroupId
      * @param carFences
+     */
+    @Override
+    public void addFenceGroup(Integer fenceGroupId, List<CarFenceAdd> carFences) {
+        for (CarFenceAdd carFence : carFences) {
+            Integer id = carFence.getId();
+            Integer addMiddle = carFenceServiceMybaitsMapper.addFenceGroup(fenceGroupId,id);
+        }
+    }
+
+    /**
+     * 修改围栏组状态
+     * @param groupId
      * @return
      */
     @Override
-    public boolean saveBatch(List<CarFenceAdd> carFences, Integer fenceGroupId) {
+    public Object updateFenceGroupById(Integer groupId) {
-        List<CarMiddle> list = carFences.stream().map(carFenceAdd -> {
+        carFenceServiceMybaitsMapper.updateFenceGroupById(groupId);
-            CarMiddle carMiddle = new CarMiddle();
+        return null;
-            carMiddle.setCarFenceId(carFenceAdd.getId());
-            carMiddle.setCarGroupId(fenceGroupId);
-            return carMiddle;
-        }).toList();
-        boolean b = this.saveBatch(list);
-        return b;
     }
 
-
+    /**
-
+     * 启动围栏
-
+     */
+    @Override
+    public Object activate(Integer groupId) {
+        carFenceServiceMybaitsMapper.activate(groupId);
+        return null;
+    }
 
     /**
      * 根据围栏组的id查询绑定的围栏的中间表
@@ -74,9 +93,20 @@ public class CarFenceServiceMybaitsImpl extends ServiceImpl<CarFenceServiceMybai
         return carFences;
     }
 
+    /**
+     * 根据围栏组和车辆的id添加中间表
+     */
+    @Override
+    public void addFenceGroupAddCarMiddle(Integer id, List<FenceGroup> fenceGroups) {
 
+        //遍历集合
+        for (FenceGroup fenceGroup : fenceGroups) {
+            //获取围栏组的id
+            Integer groupId = fenceGroup.getGroupId();
+            carFenceServiceMybaitsMapper.addFenceGroupAddCarMiddle(id,groupId);
+        }
 
-
+    }
 
     /**
      * 获取绑定的围栏组
@@ -85,22 +115,18 @@ public class CarFenceServiceMybaitsImpl extends ServiceImpl<CarFenceServiceMybai
     @Override
     public List<FenceGroup> selectBoundGFenceGroup(Integer carId) {
         /*根据id查询围栏组的id*/
-        List<CarAndGroupMiddle> list =  carFenceServiceMybaitsMapper.selectBoundGFenceGroup(carId);
+        List<FenceAndGroupMiddle> list =  carFenceServiceMybaitsMapper.selectBoundGFenceGroup(carId);
         ArrayList<FenceGroup> fenceGroups = new ArrayList<>();
 
         /*循环*/
-        for (CarAndGroupMiddle fenceAndGroupMiddle : list) {
+        for (FenceAndGroupMiddle fenceAndGroupMiddle : list) {
             /**
              * 获取围栏组的id
              */
-            Long carGroupId = fenceAndGroupMiddle.getGroupId();
+            Integer carGroupId = fenceAndGroupMiddle.getGroupId();
             //获取围栏组的数据 并 存入list
             fenceGroups.add(carFenceServiceMybaitsMapper.selectGroup(carGroupId));
         }
         return fenceGroups;
     }
-
-
-
-
 }

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

@@ -1,9 +1,9 @@
-package com.muyu.enterpise.service.impl;
+package com.muyu.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.domain.CarFenceType;
-import com.muyu.enterpise.mapper.CarFenceTypeMapper;
+import com.muyu.mapper.CarFenceTypeMapper;
-import com.muyu.enterpise.service.CarFenceTypeService;
+import com.muyu.service.CarFenceTypeService;
 import org.springframework.stereotype.Service;
 
 /**