fine()配置类提交

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

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

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

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

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

@@ -76,9 +76,9 @@ public class CarInformation {
     @Schema(title = "车辆类型外键ID", type = "Integer")
     private Integer carInformationType;
     /**
-     * 车辆品牌外键ID
+     * 车辆品牌
      */
-    private Integer carInformationBrand;
+    private String carInformationBrand;
     /**
      * 是否重点车辆 (0否默认 1是 )
      */

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

@@ -1,11 +1,11 @@
 package com.muyu.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.muyu.common.core.web.domain.BaseEntity;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
 
 import java.util.function.Supplier;
 
@@ -16,9 +16,10 @@ import java.util.function.Supplier;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@SuperBuilder
+@Builder
-@TableName(value = "车辆报文模板实体类",autoResultMap = true)
+@Tag(name = "车辆报文模板实体类")
-public class CarMessage extends BaseEntity {
+@TableName(value = "car_message",autoResultMap = true)
+public class CarMessage {
     //报文类型模块表
     /**
      * 自增主键
@@ -45,7 +46,7 @@ public class CarMessage extends BaseEntity {
     /**
      * 车辆类型外键
      */
-    private Integer carMessageCarType;
+    private Integer carMessageCartype;
     /**
      * 车辆报文类型外键
      */
@@ -80,7 +81,7 @@ public class CarMessage extends BaseEntity {
                 .messageTypeName(carMessage.messageTypeName)
                 .messageTypeBelongs(carMessage.messageTypeBelongs)
                 .carMessageId(carMessage.carMessageId)
-                .carMessageCarType(carMessage.carMessageCarType)
+                .carMessageCartype(carMessage.carMessageCartype)
                 .carMessageType(carMessage.carMessageType)
                 .carMessageStartIndex(carMessage.carMessageStartIndex)
                 .carMessageEndIndex(carMessage.carMessageEndIndex)
@@ -100,7 +101,7 @@ public class CarMessage extends BaseEntity {
                 .messageTypeName(carMessage.messageTypeName)
                 .messageTypeBelongs(carMessage.messageTypeBelongs)
                 .carMessageId(carMessage.carMessageId)
-                .carMessageCarType(carMessage.carMessageCarType)
+                .carMessageCartype(carMessage.carMessageCartype)
                 .carMessageType(carMessage.carMessageType)
                 .carMessageStartIndex(carMessage.carMessageStartIndex)
                 .carMessageEndIndex(carMessage.carMessageEndIndex)

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

@@ -1,5 +1,6 @@
 package com.muyu.domain;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -19,6 +20,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 @Tag(name = "车辆报文所属类型")
+@TableName(value = "car_message_type",autoResultMap = true)
 public class CarMessageType {
 
     /**

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

@@ -31,7 +31,7 @@ public class CarInformationAddReq {
     /**
      * 车辆品牌
      */
-    private Integer carInformationBrand;
+    private String carInformationBrand;
 
     /**
      * 车辆颜色

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

@@ -26,8 +26,8 @@ public class CarInformationUpdReq {
     /**
      * 车辆品牌
      */
-    @Schema(title = "车辆品牌", type = "Integer")
+    @Schema(title = "车辆品牌", type = "String")
-    private Integer carInformationBrand;
+    private String carInformationBrand;
 
     /**
      * 车辆颜色

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

@@ -54,7 +54,7 @@ public class CarInformationResp {
     /**
      * 车辆电子围栏外键ID
      */
-    private String carInformationFence;
+    private Integer carInformationFence;
     /**
      * 车检到期日期
      */
@@ -66,9 +66,9 @@ public class CarInformationResp {
      */
     private Integer carInformationType;
     /**
-     * 车辆品牌外键ID
+     * 车辆品牌
      */
-    private Integer carInformationBrand;
+    private String carInformationBrand;
     /**
      * 是否重点车辆 (0否默认 1是 )
      */
@@ -119,10 +119,10 @@ public class CarInformationResp {
     /**
      *电子围栏ID
      */
-    private Integer fenceid;
+    private Integer id;
 
     /**
      * 电子围栏名
      */
-    private String fencename;
+    private String name;
 }

cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformationController.java

@@ -95,7 +95,7 @@ public class CarInformationController {
      */
     @GetMapping("/delBycarInformationId/{carInformationId}")
     @Operation(summary = "企业车辆删除")
-    public Result delBycarInformationId(@Validated @PathVariable("carInformationId") Integer carInformationId){
+    public Result delBycarInformationId(@Validated @RequestParam(name = "carInformationId") Integer carInformationId){
         boolean delBycarInformationId = carInformationService.delBycarInformationId(carInformationId);
         if (delBycarInformationId){
             return Result.success(delBycarInformationId ,"删除车辆成功");

cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarMessageTypeMapper.java

@@ -0,0 +1,15 @@
+package com.muyu.server.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.muyu.domain.CarMessageType;
+import com.thoughtworks.xstream.mapper.SecurityMapper;
+
+/**
+ * @Author：yang
+ * @Package：com.muyu.server.mapper
+ * @Project：cloud-server-8
+ * @name：CarMessageTypeMapper
+ * @Date：2024/9/29 16:48
+ */
+public interface CarMessageTypeMapper extends MPJBaseMapper<CarMessageType> {
+}

cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarInformationServiceImpl.java

@@ -58,15 +58,16 @@ public class CarInformationServiceImpl
      */
     @Override
     public Page<CarInformationResp> selectCarInformationList(CarInformationListReq carInformationListReq) {
-        Page<CarInformationResp> carInformationRespPage = carInformationMapper.selectJoinPage(
+        return carInformationMapper.selectJoinPage(
                 new Page<>(carInformationListReq.getPageNum(), carInformationListReq.getPageSize()),
                 CarInformationResp.class,
                 new MPJLambdaWrapper<CarInformation>()
                         .selectAll(CarInformation.class)
                         .select(CarType::getCarTypeId, CarType::getCarTypeName)
                         .select(CarFence::getId, CarFence::getName)
-                        .leftJoin(CarType.class, CarType::getCarTypeId, CarInformation::getCarInformationType)
                         .leftJoin(CarFence.class, CarFence::getId, CarInformation::getCarInformationFence)
+                        .leftJoin(CarType.class, CarType::getCarTypeId, CarInformation::getCarInformationType)
+
                         .eq(StringUtils.isNotEmpty(carInformationListReq.getCarInformationVIN())
                                 ,CarInformation::getCarInformationVIN
                                 , carInformationListReq.getCarInformationVIN())
@@ -91,7 +92,6 @@ public class CarInformationServiceImpl
                                 ,CarInformation::getCarInformationBatteryModel
                                 ,carInformationListReq.getCarInformationBatteryModel())
         );
-        return carInformationRespPage;
     }
 
     /**
@@ -113,8 +113,7 @@ public class CarInformationServiceImpl
      */
     @Override
     public boolean delBycarInformationId(Integer carInformationId) {
-        boolean delBycarInformationId = this.removeById(carInformationId);
+        return this.removeById(carInformationId);
-        return delBycarInformationId;
     }
 
 

cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarMessageServiceImpl.java

@@ -1,6 +1,5 @@
 package com.muyu.server.service.impl;
 
-import cn.hutool.db.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.muyu.common.core.utils.StringUtils;
@@ -36,7 +35,7 @@ public class CarMessageServiceImpl
                 CarMessage.class
                 ,new MPJLambdaWrapper<CarMessage>()
                         .select(CarMessage::getCarMessageId
-                                ,CarMessage::getCarMessageCarType
+                                ,CarMessage::getCarMessageCartype
                                 ,CarMessage::getCarMessageType
                                 ,CarMessage::getCarMessageStartIndex
                                 ,CarMessage::getCarMessageEndIndex
@@ -48,7 +47,7 @@ public class CarMessageServiceImpl
                         .select(CarType::getCarTypeId
                                 ,CarType::getCarTypeName)
                         .leftJoin(CarMessageType.class,CarMessageType::getMessageTypeId,CarMessage::getCarMessageType)
-                        .leftJoin(CarType.class,CarType::getCarTypeId,CarMessage::getCarMessageCarType));
+                        .leftJoin(CarType.class,CarType::getCarTypeId,CarMessage::getCarMessageCartype));
     }
     /**
      * 添加车辆报文规则
@@ -82,14 +81,14 @@ public class CarMessageServiceImpl
     public List<CarMessageResp> selectJoinList(Long id) {
         return carMessageMapper.selectJoinList(CarMessageResp.class, new MPJLambdaWrapper<CarMessage>()
                 .select(CarMessage::getCarMessageId,
-                        CarMessage::getCarMessageCarType,
+                        CarMessage::getCarMessageCartype,
                         CarMessage::getCarMessageType,
                         CarMessage::getCarMessageStartIndex,
                         CarMessage::getCarMessageEndIndex,
                         CarMessage::getCarMessageState)
                 .select(CarMessageType::getMessageTypeName)
                 .leftJoin(CarMessageType.class, CarMessageType::getMessageTypeId, CarMessage::getCarMessageType)
-                .eq(StringUtils.isNotNull(id),CarMessage::getCarMessageCarType, id));
+                .eq(StringUtils.isNotNull(id),CarMessage::getCarMessageCartype, id));
     }
 
 

cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml

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

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

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

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

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

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

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

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

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