App端诊断日志上传

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

@@ -5,6 +5,7 @@ import com.om.entity.dto.UserLoginDTO;
 import com.om.entity.dto.UserLoginDTO;
 import com.om.entity.dto.UserQueryPageDTO;
 import com.om.entity.po.User;
+import com.om.entity.vo.AppBindVO;
 import com.om.entity.vo.UserAddVO;
 import com.om.entity.vo.UserQueryPageVO;
 import com.om.service.IUserService;
@@ -66,10 +67,9 @@ public class AppUserController {
         return userService.getByUserId(userId);
     }
     @GetMapping("/getListByUserId")
-    @ApiOperation("通过user获得vci相关的用户信息（未写）")
+    @ApiOperation("通过user获得vci相关的用户信息(返回集合)")
     public Result getListByUserId(@RequestParam Integer userId){
 
-        //此处未写，主要设计vci
         return userService.getListByUserId(userId);
     }
 
@@ -100,16 +100,16 @@ public class AppUserController {
         return userService.updateType(id,type);
     }
 
-    @GetMapping("/updateUserInfo")
+    @PostMapping("/updateUserInfo")
     @ApiOperation("更新用户信息")
     Result updateUserInfo(@RequestBody UserAddVO user){
 
         return userService.updateUserInfo(user);
     }
     @PostMapping("/bindingVci")
-    @ApiOperation("绑定vci(未写)")
-    Result bindingVci(){
+    @ApiOperation("绑定vci")
+    Result bindingVci(AppBindVO bindVO){
 
-        return null;
+        return userService.bindingVci(bindVO);
     }
 }

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

@@ -67,6 +67,10 @@ public class User implements Serializable {
     @ApiModelProperty(value = "原因")
     private String reason;
 
+    @ApiModelProperty(value = "修理厂名称")
+    private String distributorName;
+
+
     @ApiModelProperty(value = "状态")
     private Integer state;
 

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

@@ -0,0 +1,16 @@
+package com.om.entity.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class AppBindVO {
+
+    private Integer appUserId;
+
+    private String sn;
+
+}

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

@@ -0,0 +1,16 @@
+package com.om.entity.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserVciNumVO {
+
+    private Integer [] vciId;
+
+    private String [] vciNum;
+}
+

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

@@ -6,6 +6,7 @@ import com.om.entity.dto.AppUserUpdatePwdDTO;
 import com.om.entity.dto.UserLoginDTO;
 import com.om.entity.dto.UserQueryPageDTO;
 import com.om.entity.po.User;
+import com.om.entity.vo.AppBindVO;
 import com.om.entity.vo.UserAddVO;
 import com.om.entity.vo.UserQueryPageVO;
 import com.om.utils.Result;
@@ -50,4 +51,6 @@ public interface IUserService extends IService<User> {
     Result logout();
 
     Result updateVci(AppBaseDTO dto);
+
+    Result bindingVci(AppBindVO bindVO);
 }

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

@@ -8,10 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.om.constant.RedisConstant;
 import com.om.entity.dto.*;
 import com.om.entity.po.*;
-import com.om.entity.vo.UserAddVO;
-import com.om.entity.vo.UserLoginVO;
-import com.om.entity.vo.UserQueryPageVO;
-import com.om.entity.vo.VciInfoVO;
+import com.om.entity.vo.*;
 import com.om.exception.BadReqException;
 import com.om.exception.CustomerAuthenticationException;
 import com.om.mapper.UserMapper;
@@ -168,10 +165,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             return Result.error();
         }
         this.save(addUser);
-        //差保存维修厂的公司
 
-
-        return null;
+        return Result.ok();
     }
 
     @Override
@@ -188,9 +183,27 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
     @Override
     public Result getListByUserId(Integer userId) {
+        User user = getById(userId);
 
+        LambdaQueryWrapper<UserVci> vciLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        vciLambdaQueryWrapper.eq(UserVci::getUserId,userId);
+        List<UserVci> list = userVciService.list(vciLambdaQueryWrapper);
+        Integer [] vciId = new Integer[list.size()];
+        String [] vciNum = new String[list.size()];
+
+        for (int i = 0; i < list.size(); i++) {
+            LambdaQueryWrapper<VciInfo> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(VciInfo::getVciNum,list.get(i).getVciInfoId());
+            VciInfo vciInfo = vciInfoService.getOne(queryWrapper);
+            vciId[i] = vciInfo.getId();
+            vciNum[i] = vciInfo.getVciNum();
+        }
+        UserVciNumVO userVciNumVO = new UserVciNumVO();
+        userVciNumVO.setVciId(vciId);
+        userVciNumVO.setVciNum(vciNum);
 
-        return null;
+
+        return Result.ok(userVciNumVO);
     }
 
     @Override
@@ -243,7 +256,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
 
         selectUser.setState(state);
-        userMapper.update(selectUser, null);
+        LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(User::getId,id);
+        userMapper.update(selectUser, queryWrapper);
 
         return Result.ok();
     }
@@ -255,7 +270,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
              throw new BadReqException("该用户不存在");
          }
         selectUser.setUserType(type);
-        userMapper.update(selectUser, null);
+        LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(User::getId,id);
+        userMapper.update(selectUser, queryWrapper);
         return Result.ok();
     }
 
@@ -316,7 +333,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             return Result.error();
         }
         user.setUsername(dto.getUsername());
-        this.update(user,null);
+        LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(User::getId,userId);
+        this.update(user,queryWrapper);
         return Result.ok();
 
     }
@@ -362,11 +381,32 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 .one();
         userVci.setVciInfoId(vciInfo.getId());
 
-        boolean update = vciInfoService.update(vciInfo, null);
+        LambdaQueryWrapper<VciInfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(VciInfo::getId,vciInfo.getId());
+        boolean update = vciInfoService.update(vciInfo, queryWrapper);
         if (!update){
             return Result.error();
         }
 
         return Result.ok();
     }
+
+    @Override
+    public Result bindingVci(AppBindVO bindVO) {
+        Integer userId = bindVO.getAppUserId();
+        String vciNum = bindVO.getSn();
+
+        LambdaQueryWrapper<VciInfo> vciInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        vciInfoLambdaQueryWrapper.eq(VciInfo::getVciNum,vciNum);
+        VciInfo vciInfo = vciInfoService.getOne(vciInfoLambdaQueryWrapper);
+
+        UserVci userVci = new UserVci();
+        userVci.setUserId(userId);
+        userVci.setVciInfoId(vciInfo.getId());
+        userVciService.save(userVci);
+
+        return  Result.ok();
+
+
+    }
 }