修正诊断程序的问题

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

@@ -34,9 +34,9 @@ public class DiagnosisVersionInfo implements Serializable {
 
     @ApiModelProperty(value = "品牌ID")
     private Integer brandId;
-
+    @ApiModelProperty(value = "品牌名称")
     private String brandCode;
-
+    @ApiModelProperty(value = "客户端编号")
     private String clientNumber;
 
 
@@ -94,8 +94,10 @@ public class DiagnosisVersionInfo implements Serializable {
     @ApiModelProperty(value = "版本号")
     private String versionNum;
 
+    @ApiModelProperty(value = "状态")
     private Integer status;
 
+    @ApiModelProperty(value = "管理员名称")
     private String username;
 
 }

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

@@ -12,10 +12,10 @@ public class DiagnosisVersionVO {
     private Integer mark;
     private String diagnosisName;
     private String brandCode;
-    private String clientNums;
-    private String language;
-    private String descriptionList;
-    private MultipartFile file;
+    private String[] clientNums;
+    private String[] language;
+    private String[] descriptionList;
+    private String file;
     private String diagnosisFileSize;
 
 }

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

@@ -44,13 +44,34 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
     public Result add(DiagnosisVersionVO diagnosisVersionVO) {
         DiagnosisVersionInfo info = new DiagnosisVersionInfo();
         //copy了文件地址和名称，品牌名称,文件大小
-        BeanUtil.copyProperties(diagnosisVersionVO,info);
+        info.setBrandCode(diagnosisVersionVO.getBrandCode());
+
         //获取user用户。保存当前操作人
         Integer userId = UserContext.getUserId();
+        //用户信息
         User user = userService.getById(userId);
         info.setUsername(user.getUsername());
+        info.setAdminId(userId);
+        //版本号
         info.setVersionNum("1.0");
+        //状态码
         info.setStatus(0);
+        //文件地址
+        info.setFile(diagnosisVersionVO.getFile());
+        //文件大小
+        info.setDiagnosisFileSize(diagnosisVersionVO.getDiagnosisFileSize());
+        //品牌代码
+        info.setBrandCode(diagnosisVersionVO.getBrandCode());
+        //诊断程序名称
+        info.setDiagnosisName(diagnosisVersionVO.getDiagnosisName());
+        //客户端编号
+        String s = "";
+        for (int i = 0; i < diagnosisVersionVO.getClientNums().length; i++) {
+            s = s +( i != diagnosisVersionVO.getClientNums().length-1?diagnosisVersionVO.getClientNums()[i]+",":diagnosisVersionVO.getClientNums()[i]);
+
+        }
+        info.setClientNumber(s);
+        //保存
         this.save(info);
         LambdaQueryWrapper<DiagnosisVersionInfo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(DiagnosisVersionInfo::getFile,diagnosisVersionVO.getFile());
@@ -58,11 +79,14 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
         queryWrapper.eq(DiagnosisVersionInfo::getBrandCode,diagnosisVersionVO.getBrandCode());
         //保存后获取
         DiagnosisVersionInfo versionInfo = getOne(queryWrapper);
-        DiagnosisVersionDescribe describe = new DiagnosisVersionDescribe();
-        describe.setDiagnosisId(versionInfo.getId());
-        describe.setDescription(diagnosisVersionVO.getDescriptionList());
-        describe.setLanguage(diagnosisVersionVO.getLanguage());
-        describeService.save(describe);
+
+        for (int i = 0; i < diagnosisVersionVO.getDescriptionList().length; i++) {
+            DiagnosisVersionDescribe describe = new DiagnosisVersionDescribe();
+            describe.setDiagnosisId(versionInfo.getId());
+            describe.setDescription(diagnosisVersionVO.getDescriptionList()[i]);
+            describe.setLanguage(diagnosisVersionVO.getLanguage().toString());
+            describeService.save(describe);
+        }
 
         return Result.ok();
     }
@@ -77,14 +101,20 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
         Integer diaId = diagnosisVersionVO.getId();
         DiagnosisVersionInfo versionInfo = getById(diaId);
         versionInfo.setBrandCode(diagnosisVersionVO.getBrandCode());
-        versionInfo.setClientNumber(diagnosisVersionVO.getClientNums());
+        String s = "";
+        for (int i = 0; i < diagnosisVersionVO.getClientNums().length; i++) {
+            s = s +( i != diagnosisVersionVO.getClientNums().length-1?diagnosisVersionVO.getClientNums()[i]+",":diagnosisVersionVO.getClientNums()[i]);
+
+        }
+        versionInfo.setClientNumber(s);
         this.update(versionInfo,null);
 
         LambdaQueryWrapper<DiagnosisVersionDescribe> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(DiagnosisVersionDescribe::getDiagnosisId,diaId);
-        DiagnosisVersionDescribe describe = describeService.getOne(queryWrapper);
-        describe.setDescription(diagnosisVersionVO.getDescriptionList());
-        describeService.update(describe,null);
+        queryWrapper.eq(DiagnosisVersionDescribe::getLanguage,diagnosisVersionVO.getLanguage());
+        DiagnosisVersionDescribe one = describeService.getOne(queryWrapper);
+        one.setDescription(diagnosisVersionVO.getDescriptionList()[0]);
+        describeService.update(one,null);
 
         return Result.ok();
     }
@@ -107,7 +137,6 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
         diagnosisInfo.setCreateTime(versionInfo.getCreateTime());
         diagnosisInfo.setDiagnosisName(versionInfo.getDiagnosisName());
         diagnosisInfo.setFileSize(versionInfo.getDiagnosisFileSize());
-        diagnosisInfo.setSecret(versionInfo.getCipherCode());
         diagnosisInfo.setStatus(diagnosisInfo.getStatus());
         diagnosisInfo.setUsername(diagnosisInfo.getUsername());
         diagnosisInfo.setVersion(versionInfo.getVersionNum());