诊断报告bug修改

src/main/java/com/om/controller/admin/DiagnosticLogController.java

@@ -2,9 +2,8 @@ package com.om.controller.admin;
 
 
 import com.om.entity.dto.DiaLogQueryPageDTO;
-import com.om.entity.po.DiagnosticLog;
 import com.om.entity.vo.DiaLogQueryPageVO;
-import com.om.entity.vo.DistributorQueryPageVO;
+
 import com.om.service.IDiagnosticLogService;
 import com.om.utils.Result;
 import io.swagger.annotations.Api;
@@ -49,4 +48,7 @@ public class DiagnosticLogController {
     }
 
 
+
+
+
 }

src/main/java/com/om/controller/admin/RepairController.java

@@ -2,6 +2,8 @@ package com.om.controller.admin;
 
 
 import com.om.entity.dto.RepairDTO;
+import com.om.entity.dto.RepairQueryPageDTO;
+import com.om.entity.vo.RepairQueryPageVO;
 import com.om.service.IRepairService;
 import com.om.utils.Result;
 import io.swagger.annotations.Api;
@@ -33,24 +35,23 @@ public class RepairController {
         return repairService.create(repairDTO);
     }
 
-    @PostMapping("/delete")
+    @GetMapping("/delete")
     @ApiOperation("删除诊断报告")
-    Result delete (@RequestBody Integer id){
+    Result delete (@RequestParam Integer id){
 
         return repairService.delete(id);
     }
-    @PostMapping("/getById")
+    @GetMapping("/getById")
     @ApiOperation("获取指定指定报告")
-    Result  getById(@RequestBody Integer reportId){
+    Result  getById(@RequestParam Integer id){
 
-        return repairService.getByIds(reportId);
+        return repairService.getByIds(id);
     }
 
     @PostMapping("/getPageList")
     @ApiOperation("获取报告分页集合")
-    Result  getPageList(@RequestBody RepairDTO repairDTO){
-
-        return repairService.getPageList(repairDTO);
+    Result<RepairQueryPageVO>  getPageList(@RequestBody RepairQueryPageDTO dto){
+        return repairService.getPageList(dto);
     }
 
 

src/main/java/com/om/controller/user/APPBrandController.java

@@ -0,0 +1,28 @@
+package com.om.controller.user;
+
+import com.om.entity.vo.BrandVO;
+import com.om.service.IBrandService;
+import com.om.utils.Result;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@RequestMapping("/app/brand")
+@Api(tags = "app端品牌相关接口")
+public class APPBrandController {
+
+    @Resource
+    private IBrandService brandService;
+
+
+    @GetMapping("getList")
+    public Result<List<BrandVO>> getAPPList(){
+       return brandService.getAPPList();
+    }
+
+}

src/main/java/com/om/controller/user/APPDistributorController.java

@@ -27,7 +27,7 @@ public class APPDistributorController {
     }
 
 
-    @PostMapping("/Appupdate")
+    @PostMapping("/AppUpdate")
     @ApiOperation("用户修改维修厂信息")
     public Result Appupdate(@RequestBody APpDistributorVO distributorVO){
         return distributorService.Appupdate(distributorVO);

src/main/java/com/om/entity/dto/APPRepairQueryPageDTO.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDateTime;
+
 @Data
 @NoArgsConstructor
 public class APPRepairQueryPageDTO {
@@ -12,4 +14,19 @@ public class APPRepairQueryPageDTO {
 
     @ApiModelProperty(value = "每个页码的大小")
     private Integer pageSize;
+
+    @ApiModelProperty(value = "搜索字段---搜索编号")
+    private String searchNum;
+
+    @ApiModelProperty(value = "搜索字段---搜索VIN码")
+    private String searchVIN;
+
+    @ApiModelProperty(value = "搜索字段---开始时间")
+    private LocalDateTime beginTime;
+
+    @ApiModelProperty(value = "搜索字段---结束时间")
+    private LocalDateTime endTime;
+
+    @ApiModelProperty(value = "搜索字段---搜索维修厂")
+    private String searchDistributor;
 }

src/main/java/com/om/entity/dto/RepairDTO.java

@@ -1,9 +1,5 @@
 package com.om.entity.dto;
 
-import com.om.entity.po.Distributor;
-import com.om.entity.po.EcuInfo;
-import com.om.entity.po.FaultCode;
-import com.om.entity.po.Repair;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

src/main/java/com/om/entity/dto/RepairQueryPageDTO.java

@@ -0,0 +1,32 @@
+package com.om.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Data
+@NoArgsConstructor
+public class RepairQueryPageDTO {
+    @ApiModelProperty(value = "当前页码")
+    private Integer pageIndex;
+
+    @ApiModelProperty(value = "每个页码的大小")
+    private Integer pageSize;
+
+    @ApiModelProperty(value = "搜索字段---搜索编号")
+    private String searchNum;
+
+    @ApiModelProperty(value = "搜索字段---搜索VIN码")
+    private String searchVIN;
+
+    @ApiModelProperty(value = "搜索字段---开始时间")
+    private LocalDateTime beginTime;
+
+    @ApiModelProperty(value = "搜索字段---结束时间")
+    private LocalDateTime endTime;
+
+    @ApiModelProperty(value = "搜索字段---搜索维修厂")
+    private String searchDistributor;
+}

src/main/java/com/om/entity/po/Repair.java

@@ -2,8 +2,8 @@ package com.om.entity.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,9 +12,12 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
+ * <p>
+ * 
+ * </p>
  *
  * @author bmmx
- * @since 2024-02-18
+ * @since 2024-03-08
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -56,8 +59,17 @@ public class Repair implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createTime;
 
-    @ApiModelProperty(value = "用户id")
-    private Integer userId;
+    @ApiModelProperty(value = "用户名")
+    private String username;
+
+    @ApiModelProperty(value = "维修厂名称")
+    private String departmentName;
+
+    @ApiModelProperty(value = "报告编号")
+    private String repairNum;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
 
 
 }

src/main/java/com/om/entity/vo/QueryRepairVO.java

@@ -0,0 +1,56 @@
+package com.om.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bmmx
+ * @since 2024-02-15
+ */
+@Data
+@NoArgsConstructor
+public class QueryRepairVO implements Serializable {
+
+    @ApiModelProperty(value = "报告id")
+    private Integer id;
+
+    @ApiModelProperty(value = "系统数")
+    private Integer systemCount;
+
+    @ApiModelProperty(value = "故障数")
+    private Integer FaultCount;
+
+    @ApiModelProperty(value = "里程")
+    private String mileage;
+
+    @ApiModelProperty(value = "设备编号")
+    private String sn;
+
+    @ApiModelProperty(value = "用户名")
+    private String username;
+
+    @ApiModelProperty(value = "维修厂名称")
+    private String departmentName;
+
+    @ApiModelProperty(value = "报告编号")
+    private String repairNum;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+
+
+}

src/main/java/com/om/entity/vo/RepairQueryPageVO.java

@@ -0,0 +1,32 @@
+package com.om.entity.vo;
+
+import com.om.entity.dto.RepairDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+public class RepairQueryPageVO {
+
+    @ApiModelProperty(value = "当前页码")
+    private Integer current;
+
+    @ApiModelProperty(value = "总页码")
+    private Integer pages;
+
+    @ApiModelProperty(value = "每个页码的大小")
+    private Integer size;
+
+    @ApiModelProperty(value = "总数量")
+    private Integer total;
+
+    @ApiModelProperty(value = "是否是查询")
+    private Boolean searchCount = false;
+
+    @ApiModelProperty(value = "结果集")
+    private List<QueryRepairVO> records;
+
+}

src/main/java/com/om/mapper/RepairMapper.java

@@ -1,6 +1,5 @@
 package com.om.mapper;
 
-import com.om.entity.po.Repair;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/om/service/IBrandService.java

@@ -31,4 +31,7 @@ public interface IBrandService extends IService<Brand> {
     Result<List<BrandVO>> queryList();
 
     Result<BrandQueryPageVO> queryPageList(BrandQueryPageDTO dto);
+
+    Result<List<BrandVO>> getAPPList();
+
 }

src/main/java/com/om/service/IRepairService.java

@@ -3,9 +3,10 @@ package com.om.service;
 import com.om.entity.dto.APPRepairQueryPageDTO;
 import com.om.entity.dto.APPReportCreateDTO;
 import com.om.entity.dto.RepairDTO;
-import com.om.entity.po.Repair;
+import com.om.entity.dto.RepairQueryPageDTO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.om.entity.vo.AppRepairQueryPageVO;
+import com.om.entity.vo.RepairQueryPageVO;
 import com.om.utils.Result;
 
 /**
@@ -33,7 +34,7 @@ public interface IRepairService extends IService<Repair> {
 
     Result getByIds(Integer reportId);
 
-    Result getPageList(RepairDTO repairDTO);
+    Result<RepairQueryPageVO> getPageList(RepairQueryPageDTO dto);
 
 
 

src/main/java/com/om/service/impl/BrandServiceImpl.java

@@ -15,6 +15,7 @@ import com.om.service.IBrandClientService;
 import com.om.service.IBrandService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.om.utils.Result;
+import com.om.utils.UserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -23,7 +24,6 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 /**
@@ -77,9 +77,9 @@ public class BrandServiceImpl extends ServiceImpl<BrandMapper, Brand> implements
     @Override
     @Transactional
     public Result deleteBrand(Integer id) {
-        //根据id查询数据库
+        // 根据id查询数据库
         Brand brand = this.getById(id);
-        //判断是否存在
+        // 判断是否存在
         if (BeanUtil.isEmpty(brand)) {
             throw new BadReqException("该品牌不存在");
         }
@@ -243,4 +243,14 @@ public class BrandServiceImpl extends ServiceImpl<BrandMapper, Brand> implements
         brandQueryPageVO.setRecords(list);
         return Result.ok(brandQueryPageVO);
     }
+
+    @Override
+    public Result<List<BrandVO>> getAPPList() {
+        //获取当前登录用户
+        Integer userId = UserContext.getUserId();
+
+
+
+        return null;
+    }
 }

src/main/java/com/om/service/impl/DiagnosticLogServiceImpl.java

@@ -2,7 +2,6 @@ package com.om.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.collection.ListUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.om.entity.dto.DiaLogQueryPageDTO;
 import com.om.entity.po.*;
@@ -14,6 +13,7 @@ import com.om.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.om.utils.HuaweiObsUtil;
 import com.om.utils.Result;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -55,30 +55,36 @@ public class DiagnosticLogServiceImpl extends ServiceImpl<DiagnosticLogMapper, D
         //从dto中获取数据
         Integer pageIndex = dto.getPageIndex();
         Integer pageSize = dto.getPageSize();
-        String account = dto.getAccount();
-        String vciSn = dto.getVciSn();
         LocalDateTime beginTime = dto.getBeginTime();
         LocalDateTime endTime = dto.getEndTime();
-        User one = null;
-        if (account != null) {
+        User one = new User();
+        if (StringUtils.isNotBlank(dto.getAccount())) {
             //根据用户名查询用户
             one = userService.lambdaQuery()
-                    .eq(User::getUsername, account)
+                    .eq(User::getUsername, dto.getAccount())
                     .one();
+
+            if (BeanUtil.isEmpty(one)){
+                throw new BadReqException("该查询用户不存在");
+            }
         }
 
 
-        VciInfo vciInfo = null;
-        if (vciSn != null) {
+        VciInfo vciInfo = new VciInfo();
+        if (StringUtils.isNotBlank(dto.getVciSn())) {
             //根据vciSn查询VCI
             vciInfo = vciInfoService.lambdaQuery()
-                    .eq(VciInfo::getVciNum, vciSn)
+                    .eq(VciInfo::getVciNum, dto.getVciSn())
                     .one();
+
+            if (BeanUtil.isEmpty(vciInfo)){
+                throw new BadReqException("该查询vci不存在");
+            }
         }
 
         Page<DiagnosticLog> page = this.lambdaQuery()
-                .like(one != null, DiagnosticLog::getUserId, one.getId())
-                .like(vciInfo != null, DiagnosticLog::getVciId, vciInfo.getId())
+                .like(StringUtils.isNotBlank(dto.getAccount()), DiagnosticLog::getUserId, one.getId())
+                .like(StringUtils.isNotBlank(dto.getVciSn()), DiagnosticLog::getVciId, vciInfo.getId())
                 .ge(beginTime != null, DiagnosticLog::getCreateTime, beginTime)
                 .le(endTime != null, DiagnosticLog::getCreateTime, endTime)
                 .orderByDesc(DiagnosticLog::getCreateTime)
@@ -90,7 +96,7 @@ public class DiagnosticLogServiceImpl extends ServiceImpl<DiagnosticLogMapper, D
         vo.setPages((int) page.getPages());
         vo.setTotal((int) page.getTotal());
 
-        if (account != null || vciSn != null || beginTime != null || endTime != null) {
+        if (dto.getAccount() != null || dto.getVciSn()!= null || beginTime != null || endTime != null) {
             vo.setSearchCount(true);
         }
 

src/main/java/com/om/service/impl/RepairServiceImpl.java

@@ -6,9 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.om.entity.dto.*;
 import com.om.entity.po.*;
-import com.om.entity.vo.AppRepairQueryPageVO;
-import com.om.entity.vo.DiagnosticReportVO;
-import com.om.entity.vo.RepairCreateVO;
+import com.om.entity.vo.*;
 import com.om.exception.BadReqException;
 import com.om.exception.BizException;
 import com.om.mapper.RepairMapper;
@@ -16,6 +14,7 @@ import com.om.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.om.utils.Result;
 import com.om.utils.UserContext;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -274,14 +273,36 @@ public class RepairServiceImpl extends ServiceImpl<RepairMapper, Repair> impleme
     }
 
     @Override
-    public Result getPageList(RepairDTO repairDTO) {
-        Integer userId = UserContext.getUserId();
-        User user = userService.getById(userId);
-        QueryWrapper<Repair> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(Repair::getUserId,userId);
-        List<Repair> repairs = repairMapper.selectList(queryWrapper);
+    public Result<RepairQueryPageVO> getPageList(RepairQueryPageDTO dto) {
+
+        //从dto中获取数据
+        Integer pageIndex = dto.getPageIndex();
+        Integer pageSize = dto.getPageSize();
+        LocalDateTime beginTime = dto.getBeginTime();
+        LocalDateTime endTime = dto.getEndTime();
+        String searchNum = dto.getSearchNum();
+       // String searchVIN = dto.getSearchVIN();
+        String searchDistributor = dto.getSearchDistributor();
+
+        //分页查询
+        Page<Repair> page = this.lambdaQuery()
+                .like(StringUtils.isNotBlank(searchNum), Repair::getRepairNum, searchNum)
+                // .like(StringUtils.isNotBlank(searchVIN),Repair::)
+                .like(StringUtils.isNotBlank(searchDistributor), Repair::getDepartmentName, searchDistributor)
+                .ge(beginTime != null, Repair::getCreateTime, beginTime)
+                .le(endTime != null, Repair::getCreateTime, endTime)
+                .page(new Page<>(pageIndex, pageSize));
+
+
+        RepairQueryPageVO vo = new RepairQueryPageVO();
+        vo.setCurrent((int) page.getCurrent());
+        vo.setSize((int) page.getSize());
+        vo.setPages((int) page.getPages());
+        vo.setTotal((int) page.getTotal());
+
 
-        return Result.ok(repairs);
+
+        return Result.ok();
     }
 }