App端诊断日志上传

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

@@ -4,11 +4,9 @@ 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.*;
-import com.om.entity.vo.PcbInfoVO;
 import com.om.entity.vo.SDKInfoVO;
 import com.om.mapper.SdkVersionInfoMapper;
 import com.om.service.ISdkClientsService;
-import com.om.service.IclientsService;
 import com.om.service.ISdkVersionDescribeService;
 import com.om.service.ISdkVersionInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -41,26 +39,26 @@ public class SdkVersionInfoServiceImpl extends ServiceImpl<SdkVersionInfoMapper,
 
     @Override
     public Result getPageList(Integer pageIndex, Integer pageSize, String username) {
-        Page<PcbVersionInfo> page = this.lambdaQuery()
-                .like(StringUtils.isNotBlank(username), PcbVersionInfo::getAdminName, username)
+        Page<SdkVersionInfo> page = this.lambdaQuery()
+                .like(StringUtils.isNotBlank(username), SdkVersionInfo::getAdminName, username)
                 .page(new Page<>(pageIndex, pageSize));
-        List<PcbVersionInfo> infoList = page.getRecords();
+        List<SdkVersionInfo> infoList = page.getRecords();
 
         //返回的List集合
-        List<PcbInfoVO> pcbInfoVOS = new ArrayList<>();
+        List<SDKInfoVO> sdkInfoVOS = new ArrayList<>();
         for (int i = 0; i < infoList.size(); i++) {
             //传输的类型
-            PcbInfoVO pcbInfoVO = new PcbInfoVO();
+            SDKInfoVO sdkInfoVO = new SDKInfoVO();
 
-            PcbVersionInfo pcbVersionInfo = infoList.get(i);
+            SdkVersionInfo sdkVersionInfo = infoList.get(i);
             //先copy基本数据
-            BeanUtil.copyProperties(pcbVersionInfo,pcbInfoVO);
+            BeanUtil.copyProperties(sdkVersionInfo,sdkInfoVO);
 
-            Integer id = pcbVersionInfo.getId();
+            Integer id = sdkVersionInfo.getId();
             //先取语言和描述信息
-            LambdaQueryWrapper<PcbVersionDescribe> describeQueryWrapper = new LambdaQueryWrapper<>();
-            describeQueryWrapper.eq(PcbVersionDescribe::getPcbId,id);
-            List<PcbVersionDescribe> describeList = describeService.list(describeQueryWrapper);
+            LambdaQueryWrapper<SdkVersionDescribe> describeQueryWrapper = new LambdaQueryWrapper<>();
+            describeQueryWrapper.eq(SdkVersionDescribe::getSdkId,id);
+            List<SdkVersionDescribe> describeList = describeService.list(describeQueryWrapper);
             //把取出来的数据存入俩个字符串中
             String [] l = new String[describeList.size()];
             String [] d = new String[describeList.size()];
@@ -69,26 +67,26 @@ public class SdkVersionInfoServiceImpl extends ServiceImpl<SdkVersionInfoMapper,
                 l[i1] = describeList.get(i1).getLanguage();
                 d[i1] = describeList.get(i1).getDescription();
             }
-            pcbInfoVO.setDescription(d);
-            pcbInfoVO.setLanguage(l);
+            sdkInfoVO.setDescription(d);
+            sdkInfoVO.setLanguage(l);
 
             //在取出来客户端编号
             LambdaQueryWrapper<SdkClients> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(SdkClients::getPcbId,id);
+            queryWrapper.eq(SdkClients::getSdkId,id);
             List<SdkClients> list = clientsService.list(queryWrapper);
             String [] n = new String[list.size()];
             for (int j = 0; j < n.length; j++) {
                 n[j] = list.get(j).getClientNum();
             }
-            pcbInfoVO.setClientNum(n);
-            pcbInfoVOS.add(pcbInfoVO);
+            sdkInfoVO.setClientNum(n);
+            sdkInfoVOS.add(sdkInfoVO);
         }
 
-        Page<PcbInfoVO> pcbVOPage = new Page<>();
-        BeanUtil.copyProperties(page,pcbVOPage);
-        pcbVOPage.setRecords(pcbInfoVOS);
+        Page<SDKInfoVO> sdkVOPage = new Page<>();
+        BeanUtil.copyProperties(page,sdkVOPage);
+        sdkVOPage.setRecords(sdkInfoVOS);
 
-        return Result.ok(pcbVOPage);
+        return Result.ok(sdkVOPage);
     }
 
     @Override
@@ -112,6 +110,18 @@ public class SdkVersionInfoServiceImpl extends ServiceImpl<SdkVersionInfoMapper,
         }
 
         //没有进行描述和语言进行修改
+        String[] language = infoVO.getLanguage();
+        String[] description = infoVO.getDescription();
+        LambdaQueryWrapper<SdkVersionDescribe> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SdkVersionDescribe::getSdkId,infoVO.getId());
+        describeService.remove(queryWrapper);
+        for (int i = 0; i < language.length; i++) {
+            SdkVersionDescribe describe = new SdkVersionDescribe();
+            describe.setSdkId(infoVO.getId());
+            describe.setDescription(description[i]);
+            describe.setLanguage(language[i]);
+            describeService.save(describe);
+        }
 
         return Result.ok();
 
@@ -124,7 +134,7 @@ public class SdkVersionInfoServiceImpl extends ServiceImpl<SdkVersionInfoMapper,
 
     @Override
     public Result delete(Integer id) {
-        boolean pcb = removeById(id);
+        boolean sdk = removeById(id);
         LambdaQueryWrapper<SdkVersionDescribe> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SdkVersionDescribe::getSdkId,id);
         boolean info = describeService.remove(queryWrapper);