app端登录接口联调修改

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

@@ -38,7 +38,7 @@ public class UserVci implements Serializable {
     private Integer vciInfoId;
 
     @ApiModelProperty(value = "是否为默认VCI设备")
-    private Boolean isDefault;
+    private Integer isDefault;
 
 
 }

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

@@ -45,7 +45,7 @@ public class VciInfo implements Serializable {
     private String receiver;
 
     @ApiModelProperty(value = "状态 (0: 启用, 1: 禁用)")
-    private Integer state;
+    private Integer state = 0;
 
     @ApiModelProperty(value = "出库人")
     private String stockOutPerson;

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

@@ -15,6 +15,7 @@ import com.om.utils.JwtUtils;
 import com.om.utils.Result;
 import org.springframework.stereotype.Service;
 
+
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;

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

@@ -101,17 +101,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if (!password.equals(user.getPassword())) {
             throw new BadReqException("密码错误");
         }
-        if (user.getState()==0){
+        if (user.getState() == 0) {
             throw new BadReqException("该用户已被禁用");
         }
         //  绑定 客户端编号 和 设备 序列号  ( 判断type是登录（0）还是激活（1） )
-        if (type==1){
+        if (type == 1) {
             user.setDeviceSn(deviceSn);
         }
         Client client = clientService.lambdaQuery()
                 .eq(Client::getNumber, clientNum)
                 .one();
-        if (BeanUtil.isEmpty(client)){
+        if (BeanUtil.isEmpty(client)) {
             throw new BadReqException("该客户端不存在");
         }
 
@@ -119,8 +119,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         Map<String, Object> claims = new HashMap<>();
         claims.put("u_id", user.getId());
         claims.put("deviceSn", deviceSn);
-        claims.put("appVersion",appVersion);
-        claims.put("clientNum",clientNum);
+        claims.put("appVersion", appVersion);
+        claims.put("clientNum", clientNum);
         String guid = jwtUtils.generateToken(claims);
 
         //封装vo返回
@@ -128,20 +128,27 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         // 查询 该用户所属的 维修厂
         Integer distributorId = user.getDistributorId();//用户所属的维修厂id
         Distributor distributor = distributorService.getById(distributorId);
-        BeanUtil.copyProperties(distributor,userLoginVO);
+        BeanUtil.copyProperties(distributor, userLoginVO);
 
         // 查询用户 所绑定的vci设备
         List<UserVci> userVciList = userVciService.lambdaQuery()
                 .eq(UserVci::getUserId, user.getId())
                 .list();
 
-        if (!BeanUtil.isEmpty(userVciList)){
+        if (!BeanUtil.isEmpty(userVciList)) {
             List<VciInfoVO> vciInfoVOList = new ArrayList<>();
             for (UserVci userVci : userVciList) {
                 VciInfoVO vciInfoVO = new VciInfoVO();
                 Integer vciInfoId = userVci.getVciInfoId();
                 VciInfo vciInfo = vciInfoService.getById(vciInfoId);
-                BeanUtil.copyProperties(vciInfo,vciInfoVO);
+                if (userVci.getIsDefault() == 1) {
+                    userLoginVO.setVciSn(vciInfo.getVciNum());
+                }
+                vciInfoVO.setVciNum(vciInfo.getVciNum());
+                vciInfoVO.setState(vciInfo.getState());
+                vciInfoVO.setPairingPwd(vciInfo.getPairingPwd());
+                vciInfoVO.setBluetoothAddress(vciInfo.getBluetoothAddress());
+                vciInfoVO.setIsDefault(userVci.getIsDefault());
 
                 vciInfoVOList.add(vciInfoVO);
             }
@@ -186,14 +193,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         User user = getById(userId);
 
         LambdaQueryWrapper<UserVci> vciLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        vciLambdaQueryWrapper.eq(UserVci::getUserId,userId);
+        vciLambdaQueryWrapper.eq(UserVci::getUserId, userId);
         List<UserVci> list = userVciService.list(vciLambdaQueryWrapper);
-        Integer [] vciId = new Integer[list.size()];
-        String [] vciNum = new String[list.size()];
+        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());
+            queryWrapper.eq(VciInfo::getVciNum, list.get(i).getVciInfoId());
             VciInfo vciInfo = vciInfoService.getOne(queryWrapper);
             vciId[i] = vciInfo.getId();
             vciNum[i] = vciInfo.getVciNum();
@@ -224,7 +231,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         vo.setSize((int) page.getSize());
         vo.setPages((int) page.getPages());
         vo.setTotal((int) page.getTotal());
-        if (searchUsername!=null || searchPhone !=null){
+        if (searchUsername != null || searchPhone != null) {
             vo.setSearchCount(true);
         }
         List<User> records = page.getRecords();
@@ -251,13 +258,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Override
     public Result updateState(Integer id, Integer state) {
         User selectUser = getById(id);
-        if (BeanUtil.isEmpty(selectUser)){
+        if (BeanUtil.isEmpty(selectUser)) {
             throw new BadReqException("该用户不存在");
         }
 
         selectUser.setState(state);
         LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(User::getId,id);
+        queryWrapper.eq(User::getId, id);
         userMapper.update(selectUser, queryWrapper);
 
         return Result.ok();
@@ -265,13 +272,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
     @Override
     public Result updateType(Integer id, Integer type) {
-         User selectUser = getById(id);
-         if (BeanUtil.isEmpty(selectUser)){
-             throw new BadReqException("该用户不存在");
-         }
+        User selectUser = getById(id);
+        if (BeanUtil.isEmpty(selectUser)) {
+            throw new BadReqException("该用户不存在");
+        }
         selectUser.setUserType(type);
         LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(User::getId,id);
+        queryWrapper.eq(User::getId, id);
         userMapper.update(selectUser, queryWrapper);
         return Result.ok();
     }
@@ -289,7 +296,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Override
     public Result password(AppUserUpdatePwdDTO dto) {
 
-        if (BeanUtil.isEmpty(dto)){
+        if (BeanUtil.isEmpty(dto)) {
             throw new BadReqException("参数为空");
         }
         String guid = dto.getGuid();
@@ -297,7 +304,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         Integer userId = guidDTO.getUserId();
 
         User user = getById(userId);
-        if (user==null){
+        if (user == null) {
             return Result.error();
         }
         user.setPassword(DigestUtils.md5DigestAsHex(dto.getNewPassword().getBytes()));
@@ -310,13 +317,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Override
     public Result register(UserLoginDTO userLoginDTO) {
         User user = new User();
-        if (userLoginDTO.getUsername() == null || userLoginDTO.getPassword()==null) {
+        if (userLoginDTO.getUsername() == null || userLoginDTO.getPassword() == null) {
             return Result.error();
         }
         user.setUsername(userLoginDTO.getUsername());
         user.setPassword(userLoginDTO.getPassword());
         boolean save = save(user);
-        if (!save){
+        if (!save) {
             return Result.error();
         }
         return Result.ok();
@@ -329,13 +336,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         Integer userId = guidDTO.getUserId();
 
         User user = getById(userId);
-        if (user==null){
+        if (user == null) {
             return Result.error();
         }
         user.setUsername(dto.getUsername());
         LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(User::getId,userId);
-        this.update(user,queryWrapper);
+        queryWrapper.eq(User::getId, userId);
+        this.update(user, queryWrapper);
         return Result.ok();
 
     }
@@ -353,7 +360,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
 
         //判断redis中是否存在token信息
-        String tokenKey = RedisConstant.USER_TOKEN_PREFIX +uId;
+        String tokenKey = RedisConstant.USER_TOKEN_PREFIX + uId;
         redisTemplate.delete(tokenKey);
 
         return Result.ok();
@@ -362,7 +369,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Override
     public Result updateVci(AppBaseDTO dto) {
 
-        if (BeanUtil.isEmpty(dto)){
+        if (BeanUtil.isEmpty(dto)) {
             throw new BadReqException("参数为空");
         }
         String guid = dto.getGuid();
@@ -372,7 +379,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         VciInfo vciInfo = vciInfoService.lambdaQuery()
                 .eq(VciInfo::getVciNum, vciSn)
                 .one();
-        if (vciInfo == null){
+        if (vciInfo == null) {
             return Result.error();
         }
         UserVci userVci = userVciService.lambdaQuery()
@@ -382,9 +389,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         userVci.setVciInfoId(vciInfo.getId());
 
         LambdaQueryWrapper<VciInfo> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(VciInfo::getId,vciInfo.getId());
+        queryWrapper.eq(VciInfo::getId, vciInfo.getId());
         boolean update = vciInfoService.update(vciInfo, queryWrapper);
-        if (!update){
+        if (!update) {
             return Result.error();
         }
 
@@ -397,7 +404,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         String vciNum = bindVO.getSn();
 
         LambdaQueryWrapper<VciInfo> vciInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        vciInfoLambdaQueryWrapper.eq(VciInfo::getVciNum,vciNum);
+        vciInfoLambdaQueryWrapper.eq(VciInfo::getVciNum, vciNum);
         VciInfo vciInfo = vciInfoService.getOne(vciInfoLambdaQueryWrapper);
 
         UserVci userVci = new UserVci();
@@ -405,7 +412,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         userVci.setVciInfoId(vciInfo.getId());
         userVciService.save(userVci);
 
-        return  Result.ok();
+        return Result.ok();
 
 
     }