后端问题修改

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

@@ -9,6 +9,7 @@ import com.om.entity.po.VciInfo;
 import com.om.entity.vo.AppBindVO;
 import com.om.entity.vo.UserAddVO;
 import com.om.entity.vo.UserQueryPageVO;
+import com.om.entity.vo.UserVO;
 import com.om.service.IUserService;
 import com.om.utils.Result;
 import com.om.utils.UserContext;
@@ -64,7 +65,7 @@ public class AppUserController {
     }
     @GetMapping("/getById")
     @ApiOperation("根据id获取指定的客户端用户")
-    public Result getById(@RequestParam Integer userId){
+    public Result<UserVO> getById(@RequestParam Integer userId){
 
         return userService.getByUserId(userId);
     }

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

@@ -25,6 +25,9 @@ public class AppVO {
     @ApiModelProperty(value = "客户端编号")
     private String[] clientNums;
 
+    @ApiModelProperty(value = "客户端名称集合")
+    private String[] clientNames;
+
     @ApiModelProperty(value = "语言描述")
     private String[] description;
 

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

@@ -20,6 +20,8 @@ public class PcbInfoVO {
     private String versionNum;
     @ApiModelProperty(value = "客户端编号")
     private String[] clientNum;
+    @ApiModelProperty(value = "客户端名称集合")
+    private String[] clientNames;
     @ApiModelProperty(value = "上传人名称")
     private String adminName;
     @ApiModelProperty(value = "创建时间")

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

@@ -0,0 +1,58 @@
+package com.om.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author bmmx
+ * @since 2024-02-01
+ */
+@Data
+@NoArgsConstructor
+public class UserVO{
+
+    @ApiModelProperty(value = "标识符")
+    private Integer id;
+
+    @ApiModelProperty(value = "用户名")
+    private String username;
+
+    @ApiModelProperty(value = "密码")
+    private String password;
+
+
+    @ApiModelProperty(value = "维修厂ID")
+    private Integer distributorId;
+
+
+    @ApiModelProperty(value = "修理厂名称")
+    private String distributorName;
+
+
+    @ApiModelProperty(value = "状态")
+    private Integer state;
+
+    @ApiModelProperty(value = "设备sn")
+    private String deviceSn;
+
+    @ApiModelProperty(value = "用户类型: 0 - 正式账号, 1 - 测试账号")
+    private Integer userType;
+
+    @ApiModelProperty(value = "VCI SN")
+    private String[] vciSns;
+}

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

@@ -11,6 +11,7 @@ import com.om.entity.po.VciInfo;
 import com.om.entity.vo.AppBindVO;
 import com.om.entity.vo.UserAddVO;
 import com.om.entity.vo.UserQueryPageVO;
+import com.om.entity.vo.UserVO;
 import com.om.utils.Result;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -32,7 +33,7 @@ public interface IUserService extends IService<User> {
 
     Result delete(Integer id);
 
-    Result getByUserId(Integer userId);
+    Result<UserVO> getByUserId(Integer userId);
 
     Result getListByUserId(Integer userId);
 

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

@@ -8,6 +8,7 @@ import com.om.entity.vo.AppVO;
 import com.om.entity.vo.DignosisPageVO;
 import com.om.entity.vo.PcbInfoVO;
 import com.om.mapper.AppMapper;
+import com.om.mapper.ClientMapper;
 import com.om.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.om.utils.CommonUtil;
@@ -15,6 +16,7 @@ import com.om.utils.Result;
 import com.om.utils.UserContext;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -41,6 +43,8 @@ public class AppServiceImpl extends ServiceImpl<AppMapper, App> implements IAppS
 
   @Resource
     private IAppsClientsService clientsService;
+    @Resource
+    private ClientMapper clientMapper;
 
     @Override
     public Result add(AppVO appVO) {
@@ -121,6 +125,13 @@ public class AppServiceImpl extends ServiceImpl<AppMapper, App> implements IAppS
             }
             appVO.setDescription(d);
             appVO.setLanguage(l);
+            String fileName = appVO.getFileName();
+            int lastIndexOf = fileName.lastIndexOf(".");
+            if (lastIndexOf != -1) {
+                appVO.setVersionNum(fileName.substring(0,lastIndexOf));
+            }else {
+                appVO.setVersionNum("");
+            }
 
             //在取出来客户端编号
             LambdaQueryWrapper<AppsClients> queryWrapper = new LambdaQueryWrapper<>();
@@ -128,17 +139,25 @@ public class AppServiceImpl extends ServiceImpl<AppMapper, App> implements IAppS
             List<AppsClients> list = clientsService.list(queryWrapper);
             String [] n = new String[list.size()];
             for (int j = 0; j < n.length; j++) {
-
-                n[j] = list.get(j).getClientNum();
+                String clientNum = list.get(j).getClientNum();
+                LambdaQueryWrapper<Client> clientLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                clientLambdaQueryWrapper.eq(Client::getNumber,clientNum);
+                Client client = clientMapper.selectOne(clientLambdaQueryWrapper);
+                if (client != null) {
+                    n[j] = client.getName();
+                }else {
+                    n[j] = "";
+                }
 
             }
-            appVO.setClientNums(n);
+            appVO.setClientNames(n);
 
             appInfoVOS.add(appVO);
         }
 
         Page<AppVO> appVOPage = new Page<>();
         BeanUtil.copyProperties(page,appVOPage);
+
         appVOPage.setRecords(appInfoVOS);
 
         return Result.ok(appVOPage);

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

@@ -3,11 +3,9 @@ package com.om.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.om.entity.po.AppVersionDescribe;
-import com.om.entity.po.PcbClients;
-import com.om.entity.po.PcbVersionDescribe;
-import com.om.entity.po.PcbVersionInfo;
+import com.om.entity.po.*;
 import com.om.entity.vo.PcbInfoVO;
+import com.om.mapper.ClientMapper;
 import com.om.mapper.PcbVersionInfoMapper;
 import com.om.service.IPcbClientsService;
 import com.om.service.IPcbVersionDescribeService;
@@ -16,6 +14,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.om.utils.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -40,6 +39,8 @@ public class PcbVersionInfoServiceImpl extends ServiceImpl<PcbVersionInfoMapper,
 
     @Resource
     private IPcbClientsService pcbClientsService;
+    @Autowired
+    private ClientMapper clientMapper;
 
     @Override
     public Result getPageList(Integer pageIndex, Integer pageSize, String username) {
@@ -80,9 +81,16 @@ public class PcbVersionInfoServiceImpl extends ServiceImpl<PcbVersionInfoMapper,
             List<PcbClients> list = pcbClientsService.list(queryWrapper);
             String [] n = new String[list.size()];
             for (int j = 0; j < n.length; j++) {
-                n[j] = list.get(j).getClientNum();
+                String clientNum = list.get(j).getClientNum();
+                LambdaQueryWrapper<Client> clientLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                clientLambdaQueryWrapper.eq(Client::getNumber,clientNum);
+                Client client = clientMapper.selectOne(clientLambdaQueryWrapper);
+                if(client!=null){
+                    n[j] = client.getName();
+                }
+
             }
-            pcbInfoVO.setClientNum(n);
+            pcbInfoVO.setClientNames(n);
             pcbInfoVOS.add(pcbInfoVO);
         }
 

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

@@ -360,13 +360,27 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     }
 
     @Override
-    public Result getByUserId(Integer userId) {
+    public Result<UserVO> getByUserId(Integer userId) {
         User user = this.getById(userId);
         if (user == null) {
-            return Result.error();
+            throw new BadReqException("该用户不存在");
         }
+        UserVO userVO = new UserVO();
+        BeanUtil.copyProperties(user, userVO);
+
+        List<UserVci> userVciList = userVciService.lambdaQuery()
+                .eq(UserVci::getUserId, user.getId())
+                .list();
+        if (!userVciList.isEmpty()) {
+            List<Integer> vciIds = userVciList.stream().map(c -> c.getVciInfoId()).collect(Collectors.toList());
 
-        return Result.ok(user);
+            List<VciInfo> vciInfoList = vciInfoService.listByIds(vciIds);
+            String[] vciSns = new String[vciInfoList.size()];
+            List<String> vciNumList = vciInfoList.stream().map(c -> c.getVciNum()).collect(Collectors.toList());
+            vciSns = vciNumList.toArray(vciSns);
+            userVO.setVciSns(vciSns);
+        }
+        return Result.ok(userVO);
     }
 
     @Override