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

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

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

@@ -4,7 +4,7 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: 127.0.0.1:8848
+  addr: 159.75.188.178: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

@@ -46,7 +46,7 @@ public class CarInformation {
      */
 //    @TableName(value = "car_information_VIN")
             @TableField(value = "car_information_VIN")
-    private String carInformationVIN;
+    private String carInformationVin;
     /**
      * 车牌号
      */
@@ -76,9 +76,9 @@ public class CarInformation {
     @Schema(title = "车辆类型外键ID", type = "Integer")
     private Integer carInformationType;
     /**
-     * 车辆品牌
+     * 车辆品牌外键ID
      */
-    private String carInformationBrand;
+    private Integer carInformationBrand;
     /**
      * 是否重点车辆 (0否默认 1是 )
      */
@@ -135,7 +135,7 @@ public class CarInformation {
 
     public static CarInformation carInformationAddBuilder(CarInformationAddReq carInformation) {
         return CarInformation.builder()
-                .carInformationVIN(carInformation.getCarInformationVin())
+                .carInformationVin(carInformation.getCarInformationVin())
                 .carInformationLicensePlate(carInformation.getCarInformationLicensePlate())
                 .carInformationBrand(carInformation.getCarInformationBrand())
                 .carInformationColor(carInformation.getCarInformationColor())

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

@@ -60,22 +60,7 @@ public class FaultCode {
      *是否警告
      */
     private Integer isWarning;
-    /**
+
-     *故障类型名称
-     */
-    private String faulttypeName;
-    /**
-     * 故障名称
-     */
-    private String messageTypeName;
-    /**
-     * 报文编码
-     */
-    private String messageTypeCode;
-    /**
-     *报文所属类别
-     */
-    private String messageTypeBelongs;
 
 
     public static FaultCode addfaultcode(FaultCodeAddReq faultCodeAddReq){

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.muyu.domain.req.FaultCodeAddReq;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
@@ -51,7 +50,6 @@ public class FaultLabel {
         return FaultLabel.builder()
                 .messageTypeId(0)
                 .messageTypeId(faultCodeAddReq.getMessageTypeId())
-                .messageTypeCode(faultCodeAddReq.getMessageTypeCode())
                 .messageTypeName(faultCodeAddReq.getMessageTypeName())
                 .messageTypeBelongs(faultCodeAddReq.getMessageTypeBelongs())
                 .build();

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

@@ -55,7 +55,7 @@ public class FaultLog {
     /**
      * 车辆VIN
      */
-    private String carInformationVIN;
+    private String carInformationVin;
     /**
      * 开始报警时间
      */

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 String carInformationBrand;
+    private Integer 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 = "String")
+    @Schema(title = "车辆品牌", type = "Integer")
-    private String carInformationBrand;
+    private Integer carInformationBrand;
 
     /**
      * 车辆颜色

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

@@ -21,7 +21,6 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @Builder
 public class FaultCodeListReq {
-
     /**
      *故障码
      */

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

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

@@ -1,12 +1,11 @@
 package com.muyu.domain.resp;
 
 
-import com.muyu.domain.FaultCode;
+import com.muyu.domain.vo.FaultCodeVO;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 /**
  * 故障码信息响应对象
@@ -20,7 +19,6 @@ import lombok.NoArgsConstructor;
 @Data
 @Builder
 @AllArgsConstructor
-@NoArgsConstructor
 @Tag(name="故障码信息响应对象",description = "故障码查询的响应结果")
 public class FaultCodeListResp {
 
@@ -57,13 +55,13 @@ public class FaultCodeListResp {
      */
     private String faulttypeName;
     /**
-     *报文编码
+     * 故障名称
-     */
-    private String messageTypeCode;
-    /**
-     *报文名称
      */
     private String messageTypeName;
+    /**
+     * 报文编码
+     */
+    private String messageTypeCode;
     /**
      *报文所属类别
      */
@@ -71,22 +69,22 @@ public class FaultCodeListResp {
 
     /**
      * 数据库对象构建为返回结果对象
-     * @param faultCode
+     * @param faultCodeVO
      * @return
      */
-    public static FaultCodeListResp faultCodeListResp(FaultCode faultCode){
+    public static FaultCodeListResp faultCodeListResp(FaultCodeVO faultCodeVO){
         return FaultCodeListResp.builder()
-                .faultcodeId(faultCode.getFaultcodeId())
+                .faultcodeId(faultCodeVO.getFaultcodeId())
-                .messageTypeId(faultCode.getMessageTypeId())
+                .messageTypeId(faultCodeVO.getMessageTypeId())
-                .faultcodeNumber(faultCode.getFaultcodeNumber())
+                .faultcodeNumber(faultCodeVO.getFaultcodeNumber())
-                .faultGroup(faultCode.getFaultGroup())
+                .faultGroup(faultCodeVO.getFaultGroup())
-                .faultBit(faultCode.getFaultBit())
+                .faultBit(faultCodeVO.getFaultBit())
-                .faultValue(faultCode.getFaultValue())
+                .faultValue(faultCodeVO.getFaultValue())
-                .isWarning(faultCode.getIsWarning())
+                .isWarning(faultCodeVO.getIsWarning())
-                .faulttypeName(faultCode.getFaulttypeName())
+                .faulttypeName(faultCodeVO.getFaulttypeName())
-                .messageTypeName(faultCode.getMessageTypeName())
+                .messageTypeName(faultCodeVO.getMessageTypeName())
-                .messageTypeCode(faultCode.getMessageTypeCode())
+                .messageTypeCode(faultCodeVO.getMessageTypeCode())
-                .messageTypeBelongs(faultCode.getMessageTypeBelongs())
+                .messageTypeBelongs(faultCodeVO.getMessageTypeBelongs())
                 .build();
     }
 }

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

@@ -77,7 +77,7 @@ public class FaultLogListResp {
                 .startwarningTime(faultLog.getStartwarningTime())
                 .endwarningTime(faultLog.getEndwarningTime())
                 .faultcodeNumber(faultLog.getFaultcodeNumber())
-                .carInformationVIN(faultLog.getCarInformationVIN())
+                .carInformationVIN(faultLog.getCarInformationVin())
                 .build();
     }
 }

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

@@ -0,0 +1,44 @@
+package com.muyu.domain.vo;
+
+import com.muyu.domain.FaultCode;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 故障码视图(故障)
+ * @Author：weiran
+ * @Package：com.muyu.cloud.faultmanage.domain.vo
+ * @Project：cloud-faultmanage
+ * @name：FaultCodeVO
+ * @Date：2024/9/17 15:14
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@SuperBuilder
+@Tag(name = "故障码视图")
+public class FaultCodeVO extends FaultCode {
+    /**
+     *故障类型名称
+     */
+    private String faulttypeName;
+    /**
+     * 故障名称
+     */
+    private String messageTypeName;
+    /**
+     * 报文编码
+     */
+    private String messageTypeCode;
+    /**
+     *报文所属类别
+     */
+    private String messageTypeBelongs;
+
+
+}

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 @RequestParam(name = "carInformationId") Integer carInformationId){
+    public Result delBycarInformationId(@Validated @PathVariable("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

@@ -1,15 +0,0 @@
-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/mapper/FaultCodeMapper.java

@@ -1,9 +1,19 @@
 package com.muyu.server.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
 import com.github.yulichang.base.MPJBaseMapper;
 import com.muyu.domain.FaultCode;
-
+import com.muyu.domain.FaultLabel;
+import com.muyu.domain.req.FaultCodeAddReq;
+import com.muyu.domain.req.FaultCodeListReq;
+import com.muyu.domain.req.FaultCodeUpdReq;
+import com.muyu.domain.resp.FaultCodeListResp;
+import com.muyu.domain.vo.FaultCodeVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 车辆故障码持久层

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

@@ -6,7 +6,9 @@ import com.muyu.domain.FaultCode;
 import com.muyu.domain.req.FaultCodeAddReq;
 import com.muyu.domain.req.FaultCodeListReq;
 import com.muyu.domain.req.FaultCodeUpdReq;
+import com.muyu.domain.resp.FaultCodeListResp;
 import com.muyu.domain.resp.FaultCodeTotalListResp;
+import com.muyu.domain.vo.FaultCodeVO;
 
 
 /**

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

@@ -58,18 +58,17 @@ public class CarInformationServiceImpl
      */
     @Override
     public Page<CarInformationResp> selectCarInformationList(CarInformationListReq carInformationListReq) {
-        return carInformationMapper.selectJoinPage(
+        Page<CarInformationResp> carInformationRespPage = 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(CarFence.class, CarFence::getId, CarInformation::getCarInformationFence)
                         .leftJoin(CarType.class, CarType::getCarTypeId, CarInformation::getCarInformationType)
-
+                        .leftJoin(CarFence.class, CarFence::getId, CarInformation::getCarInformationFence)
                         .eq(StringUtils.isNotEmpty(carInformationListReq.getCarInformationVIN())
-                                ,CarInformation::getCarInformationVIN
+                                ,CarInformation::getCarInformationVin
                                 , carInformationListReq.getCarInformationVIN())
                         .eq(StringUtils.isNotNull(carInformationListReq.getCarTypeId())
                                 ,CarType::getCarTypeId, carInformationListReq.getCarTypeId())
@@ -80,7 +79,7 @@ public class CarInformationServiceImpl
                                 ,CarInformation::getCarInformationState
                                 , carInformationListReq.getCarInformationState())
                         .like(StringUtils.isNotEmpty(carInformationListReq.getCarInformationVIN())
-                                ,CarInformation::getCarInformationVIN
+                                ,CarInformation::getCarInformationVin
                                 , carInformationListReq.getCarInformationVIN())
                         .eq(StringUtils.isNotEmpty( carInformationListReq.getCarInformationMotorModel())
                                 ,CarInformation::getCarInformationMotorModel
@@ -92,6 +91,7 @@ public class CarInformationServiceImpl
                                 ,CarInformation::getCarInformationBatteryModel
                                 ,carInformationListReq.getCarInformationBatteryModel())
         );
+        return carInformationRespPage;
     }
 
     /**
@@ -113,7 +113,8 @@ public class CarInformationServiceImpl
      */
     @Override
     public boolean delBycarInformationId(Integer carInformationId) {
-        return this.removeById(carInformationId);
+        boolean delBycarInformationId = 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,5 +1,6 @@
 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;
@@ -35,7 +36,7 @@ public class CarMessageServiceImpl
                 CarMessage.class
                 ,new MPJLambdaWrapper<CarMessage>()
                         .select(CarMessage::getCarMessageId
-                                ,CarMessage::getCarMessageCartype
+                                ,CarMessage::getCarMessageCarType
                                 ,CarMessage::getCarMessageType
                                 ,CarMessage::getCarMessageStartIndex
                                 ,CarMessage::getCarMessageEndIndex
@@ -47,7 +48,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));
     }
     /**
      * 添加车辆报文规则
@@ -81,14 +82,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/java/com/muyu/server/service/impl/FaultCodeServiceImpl.java

@@ -12,7 +12,7 @@ import com.muyu.domain.req.FaultCodeListReq;
 import com.muyu.domain.req.FaultCodeUpdReq;
 import com.muyu.domain.resp.FaultCodeListResp;
 import com.muyu.domain.resp.FaultCodeTotalListResp;
-import com.muyu.domain.resp.FaultConditionListResp;
+import com.muyu.domain.vo.FaultCodeVO;
 import com.muyu.server.mapper.FaultCodeMapper;
 import com.muyu.server.service.FaultCodeService;
 import com.muyu.server.service.FaultLabelService;
@@ -44,8 +44,6 @@ public class FaultCodeServiceImpl extends ServiceImpl<FaultCodeMapper, FaultCode
      */
     @Override
     public FaultCodeTotalListResp selectfaultcodelist(FaultCodeListReq faultCodeListReq) {
-        LambdaQueryWrapper<FaultCode> queryWrapper = new LambdaQueryWrapper<>();
-        long count = this.count(queryWrapper);
 
         MPJLambdaWrapper<FaultCode> wrapper = new MPJLambdaWrapper<>();
         wrapper.select(
@@ -53,6 +51,7 @@ public class FaultCodeServiceImpl extends ServiceImpl<FaultCodeMapper, FaultCode
                         FaultCode::getMessageTypeId,
                         FaultCode::getFaultcodeNumber,
                         FaultCode::getFaultGroup,
+                        FaultCode::getFaultcodeId,
                         FaultCode::getFaultValue,
                         FaultCode::getIsWarning)
                 .select(
@@ -63,9 +62,10 @@ public class FaultCodeServiceImpl extends ServiceImpl<FaultCodeMapper, FaultCode
                         FaultCode::getFaultcodeNumber,faultCodeListReq.getFaultcodeNumber())
                 .eq(StringUtils.isNotEmpty(faultCodeListReq.getFaultBit()),
                         FaultCode::getFaultBit, faultCodeListReq.getFaultBit());
-        wrapper.last("LIMIT "+ ((faultCodeListReq.getPageNum()-1)*faultCodeListReq.getPageSize())+", "+faultCodeListReq.getPageSize());
+        Page<FaultCodeListResp> page = faultCodeMapper.selectJoinPage(new Page<>(faultCodeListReq.getPageNum(), faultCodeListReq.getPageSize()),
-        List<FaultCodeListResp> faultCodeListResps = faultCodeMapper.selectJoinList(FaultCodeListResp.class, wrapper);
+                FaultCodeListResp.class, wrapper);
-        return FaultCodeTotalListResp.faultCodeTotalListResp(faultCodeListResps,count);
+
+        return FaultCodeTotalListResp.faultCodeTotalListResp(page.getRecords(),page.getTotal());
     }
 
 

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

@@ -5,14 +5,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.muyu.domain.CarType;
-import com.muyu.domain.FaultCode;
 import com.muyu.domain.FaultCondition;
 import com.muyu.domain.FaultLabel;
 import com.muyu.domain.req.FaultConditionAddReq;
 import com.muyu.domain.req.FaultConditionListReq;
 import com.muyu.domain.resp.FaultConditionListResp;
 import com.muyu.domain.resp.FaultConditionTotalListResp;
-import com.muyu.domain.resp.FaultLogListResp;
 import com.muyu.server.mapper.FaultConditionMapper;
 import com.muyu.server.service.FaultConditionService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,14 +42,8 @@ public class FaultConditionServiceImpl extends ServiceImpl<FaultConditionMapper,
      */
     @Override
     public FaultConditionTotalListResp getfaultrulelist(FaultConditionListReq faultConditionListReq) {
-        LambdaQueryWrapper<FaultCondition> queryWrapper = new LambdaQueryWrapper<>();
-        long count = this.count(queryWrapper);
         MPJLambdaWrapper<FaultCondition> wrapper = new MPJLambdaWrapper<>();
-        wrapper.select(FaultCondition::getCarconditionId,
+        wrapper.selectAll(FaultCondition.class)
-                        FaultCondition::getCarTypeId,
-                        FaultCondition::getMessageTypeId,
-                        FaultCondition::getFaultconditionIdentification,
-                        FaultCondition::getFaultconditionParameter)
                 .select(CarType::getCarTypeName)
                 .select(FaultLabel::getMessageTypeName,
                         FaultLabel::getMessageTypeCode)
@@ -63,9 +55,9 @@ public class FaultConditionServiceImpl extends ServiceImpl<FaultConditionMapper,
         if (faultConditionListReq.getMessageTypeId()!=0){
             wrapper.eq(FaultLabel::getMessageTypeId, faultConditionListReq.getMessageTypeId());
         }
-        wrapper.last("LIMIT "+ ((faultConditionListReq.getPageNum()-1)*faultConditionListReq.getPageSize())+", "+faultConditionListReq.getPageSize());
+        Page<FaultConditionListResp> page = faultConditionMapper.selectJoinPage(new Page<>(faultConditionListReq.getPageNum(), faultConditionListReq.getPageSize()),
-        List<FaultConditionListResp> faultConditionListResps = faultConditionMapper.selectJoinList(FaultConditionListResp.class, wrapper);
+                FaultConditionListResp.class, wrapper);
-        return FaultConditionTotalListResp.faultConditionTotalListResp(faultConditionListResps,count);
+        return FaultConditionTotalListResp.faultConditionTotalListResp(page.getRecords(),page.getTotal());
     }
 
 

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

@@ -7,7 +7,6 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.domain.CarInformation;
 import com.muyu.domain.FaultCode;
-import com.muyu.domain.FaultCondition;
 import com.muyu.domain.FaultLog;
 import com.muyu.domain.req.FaultLogListReq;
 import com.muyu.domain.resp.FaultLogListResp;
@@ -16,9 +15,6 @@ import com.muyu.server.mapper.FaultLogMapper;
 import com.muyu.server.service.FaultLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.List;
-
 /**
  * 故障日志业务实现层
  * @Author：weiran
@@ -39,17 +35,11 @@ public class FaultLogServiceImpl extends ServiceImpl<FaultLogMapper, FaultLog> i
      */
     @Override
     public FaultLogTotalListResp selectfaultlog(FaultLogListReq faultLogListReq) {
-        LambdaQueryWrapper<FaultLog> queryWrapper = new LambdaQueryWrapper<>();
+
-        long count = this.count(queryWrapper);
         MPJLambdaWrapper<FaultLog> wrapper = new MPJLambdaWrapper<>();
-        wrapper.select(FaultLog::getLogId,
+        wrapper.selectAll(FaultLog.class)
-                        FaultLog::getFaultcodeId,
-                        FaultLog::getCarInformationId,
-                        FaultLog::getCarVin,
-                        FaultLog::getStartwarningTime,
-                        FaultLog::getEndwarningTime)
                 .select(FaultCode::getFaultcodeNumber)
-                .select(CarInformation::getCarInformationVIN)
+                .select(CarInformation::getCarInformationVin)
                 .leftJoin(FaultCode.class,FaultCode::getFaultcodeId,FaultLog::getFaultcodeId)
                 .leftJoin(CarInformation.class,CarInformation::getCarInformationId,FaultLog::getCarInformationId)
                 .eq(StringUtils.isNotEmpty(faultLogListReq.getCarVin()),
@@ -60,8 +50,8 @@ public class FaultLogServiceImpl extends ServiceImpl<FaultLogMapper, FaultLog> i
                 if (faultLogListReq.getEndwarningTime()!=null){
                     wrapper.eq(FaultLog::getEndwarningTime,faultLogListReq.getEndwarningTime());
                 }
-                wrapper.last("LIMIT "+ ((faultLogListReq.getPageNum()-1)*faultLogListReq.getPageSize())+", "+faultLogListReq.getPageSize());
+        Page<FaultLogListResp> ipage = faultLogMapper.selectJoinPage(new Page<>(faultLogListReq.getPageNum(),
-        List<FaultLogListResp> faultLogListResps = faultLogMapper.selectJoinList(FaultLogListResp.class, wrapper);
+                faultLogListReq.getPageSize()), FaultLogListResp.class, wrapper);
-        return FaultLogTotalListResp.faultLogTotalListResp(faultLogListResps,count);
+        return FaultLogTotalListResp.faultLogTotalListResp(ipage.getRecords(),ipage.getTotal());
     }
 }

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

@@ -4,7 +4,7 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: 127.0.0.1:8848
+  addr: 159.75.188.178: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: 127.0.0.1:8848
+  addr: 159.75.188.178: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: 127.0.0.1:8848
+  addr: 159.75.188.178: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: 127.0.0.1:8848
+  addr: 159.75.188.178: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: 127.0.0.1:8848
+  addr: 159.75.188.178:8848
   user-name: nacos
   password: nacos
   namespace: eight