增加master缺失文件，3.11

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

@@ -35,11 +35,11 @@ public class AppController {
         return appService.add(app);
     }
 
-    @PostMapping("/delete")
     @ApiOperation("删除应用软件")
-    Result delete(@RequestBody AppVO app){
+    @GetMapping("/delete")
+    public Result delete(@RequestParam Integer id){
 
-        return appService.delete(app);
+        return appService.delete(id);
     }
 
     @PostMapping("/downloadFile")
@@ -49,11 +49,14 @@ public class AppController {
         return appService.downloadFile(app);
     }
 
-    @PostMapping("/getPageList")
+
     @ApiOperation("分页查询应用软件")
-    Result getPageList(@RequestBody DignosisPageVO dignosisPageVO){
+    @GetMapping("/getPageList")
+    public Result getPageList(@RequestParam Integer pageIndex,
+                              @RequestParam Integer pageSize,
+                              @RequestParam String username){
 
-        return appService.getPageList(dignosisPageVO);
+        return appService.getPageList(pageIndex,pageSize,username);
     }
 
     @PostMapping("/edit")

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

@@ -54,7 +54,7 @@ public class App implements Serializable {
     private Integer sdkId;
 
     @ApiModelProperty(value = "状态")
-    private Integer state;
+    private Integer status;
 
     @ApiModelProperty(value = "版本编号")
     private String versionNum;

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

@@ -5,18 +5,50 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.time.LocalDateTime;
+
 @Data
 @NoArgsConstructor
 public class AppVO {
     @ApiModelProperty(value = "客户端id")
     int id;
+    @ApiModelProperty(value = "文件名")
+    private String fileName;
+
+    @ApiModelProperty(value = "文件大小")
+    private String fileSize;
+
+    @ApiModelProperty(value = "上传人")
+    private String admin;
+
     @ApiModelProperty(value = "客户端编号")
-    String clientNums;
-    @ApiModelProperty(value = "描述")
-    String description;
-    @ApiModelProperty(value = "文件")
-     MultipartFile file;
-    @ApiModelProperty(value = "是否强制升级")
-     Integer isupdate;
+    private String[] clientNums;
+
+    @ApiModelProperty(value = "语言描述")
+    private String[] description;
+
+    @ApiModelProperty(value = "语言")
+    private String[] language;
+
+    @ApiModelProperty(value = "发布时间")
+    private LocalDateTime releaseTime;
+
+    @ApiModelProperty(value = "保存路径")
+    private String savePath;
+
+    @ApiModelProperty(value = "SDK版本ID")
+    private Integer sdkId;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "版本编号")
+    private String versionNum;
+
+    @ApiModelProperty(value = "更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createTime;
 
 }

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

@@ -18,11 +18,11 @@ public interface IAppService extends IService<App> {
 
     Result add(AppVO app);
 
-    Result delete(AppVO app);
+    Result delete(Integer id);
 
     Result downloadFile(AppVO app);
 
-    Result getPageList(DignosisPageVO dignosisPageVO);
+    Result getPageList(Integer pageIndex,Integer pageSize,String username);
 
     Result edit(AppVO app);
 }

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

@@ -3,16 +3,13 @@ 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.App;
-import com.om.entity.po.AppVersionDescribe;
-import com.om.entity.po.User;
+import com.om.entity.po.*;
 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.service.IAppService;
+import com.om.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.om.service.IAppVersionDescribeService;
-import com.om.service.IUserService;
 import com.om.utils.CommonUtil;
 import com.om.utils.Result;
 import com.om.utils.UserContext;
@@ -20,6 +17,8 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -36,41 +35,49 @@ public class AppServiceImpl extends ServiceImpl<AppMapper, App> implements IAppS
    private IUserService userService;
     @Resource
    private IAppVersionDescribeService describeService;
+
+  @Resource
+    private IAppsClientsService clientsService;
+
     @Override
-    public Result add(AppVO app) {
-        if (StringUtils.isEmpty(app.getClientNums())){
-            return Result.error();
+    public Result add(AppVO appVO) {
+        App app = new App();
+        BeanUtil.copyProperties(appVO,app);
+        this.save(app);
+        Integer appId = app.getId();
+
+        //appClient
+        for (int i = 0; i < appVO.getClientNums().length; i++) {
+
+            AppsClients appsClients = new AppsClients();
+            appsClients.setAppId(appId);
+            appsClients.setClientNum(appVO.getClientNums()[i]);
+            clientsService.save(appsClients);
         }
-        //保存app表
-        App appSave = new App();
-        appSave.setClientNums(app.getClientNums());
-        appSave.setVersionNum(CommonUtil.appVersion(null));
-        User user = userService.getById(UserContext.getUserId());
-        appSave.setAdmin(user.getNickName());
-        this.save(appSave);
-        //获取保存表的id
-
-        Integer id = appSave.getId();
 
-        //保存到另一个表
-        AppVersionDescribe describe = new AppVersionDescribe();
-        describe.setAppId(id);
-        describe.setDescription(app.getDescription());
-        describeService.save(describe);
 
+        for (int i = 0; i < appVO.getLanguage().length; i++) {
 
-        return Result.ok();
+            AppVersionDescribe describe = new AppVersionDescribe();
+            describe.setAppId(appId);
+            describe.setLanguage(appVO.getLanguage()[i]);
+            describe.setDescription(appVO.getDescription()[i]);
+            describeService.save(describe);
+        }
+        return  Result.ok();
     }
 
     @Override
-    public Result delete(AppVO app) {
-        //删除当前表
-        int appId = app.getId();
-        this.removeById(appId);
-        //删除描述表
+    public Result delete(Integer id) {
+
+        removeById(id);
         LambdaQueryWrapper<AppVersionDescribe> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(AppVersionDescribe::getAppId,appId);
-        describeService.remove(queryWrapper);
+        queryWrapper.eq(AppVersionDescribe::getAppId,id);
+        boolean info = describeService.remove(queryWrapper);
+        //还有关联表删除
+        LambdaQueryWrapper<AppsClients> clientsLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        clientsLambdaQueryWrapper.eq(AppsClients::getAppId,id);
+        clientsService.remove(clientsLambdaQueryWrapper);
         return Result.ok();
     }
 
@@ -80,30 +87,77 @@ public class AppServiceImpl extends ServiceImpl<AppMapper, App> implements IAppS
     }
 
     @Override
-    public Result getPageList(DignosisPageVO dignosisPageVO) {
-
+    public Result getPageList(Integer pageIndex, Integer pageSize, String username) {
         Page<App> page = this.lambdaQuery()
-                .like(StringUtils.isNotBlank(dignosisPageVO.getQuery()),App::getAdmin,dignosisPageVO.getQuery())
-                .page(new Page<>(dignosisPageVO.getPageIndex(),dignosisPageVO.getPageSize()));
+                .like(StringUtils.isNotBlank(username), App::getAdmin, username)
+                .page(new Page<>(pageIndex, pageSize));
+        List<App> infoList = page.getRecords();
+
+        //返回的List集合
+        List<AppVO> appInfoVOS = new ArrayList<>();
+        for (int i = 0; i < infoList.size(); i++) {
+            //传输的类型
+            AppVO appVO = new AppVO();
+
+            App appInfo = infoList.get(i);
+            //先copy基本数据
+            BeanUtil.copyProperties(appInfo,appVO);
+
+            Integer id = appInfo.getId();
+            //先取语言和描述信息
+            LambdaQueryWrapper<AppVersionDescribe> describeQueryWrapper = new LambdaQueryWrapper<>();
+            describeQueryWrapper.eq(AppVersionDescribe::getAppId,id);
+            List<AppVersionDescribe> describeList = describeService.list(describeQueryWrapper);
+            //把取出来的数据存入俩个字符串中
+            String [] l = new String[describeList.size()];
+            String [] d = new String[describeList.size()];
+
+            for (int i1 = 0; i1 < describeList.size(); i1++) {
+                l[i1] = describeList.get(i1).getLanguage();
+                d[i1] = describeList.get(i1).getDescription();
+            }
+            appVO.setDescription(d);
+            appVO.setLanguage(l);
+
+            //在取出来客户端编号
+            LambdaQueryWrapper<AppsClients> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(AppsClients::getAppId,id);
+            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();
+            }
+            appVO.setClientNums(n);
+            appInfoVOS.add(appVO);
+        }
 
+        Page<AppVO> appVOPage = new Page<>();
+        BeanUtil.copyProperties(page,appVOPage);
+        appVOPage.setRecords(appInfoVOS);
 
-        return Result.ok(page);
+        return Result.ok(appVOPage);
     }
 
     @Override
-    public Result edit(AppVO app) {
-
-        int appId = app.getId();
-        App newApp = this.getById(appId);
-        newApp.setClientNums(app.getClientNums());
-        this.update(newApp,null);
+    public Result edit(AppVO appVO) {
+        App app = getById(appVO.getId());
+        LambdaQueryWrapper<App> infoQueryWapper = new LambdaQueryWrapper<>();
+        infoQueryWapper.eq(App::getId,app.getId());
+        BeanUtil.copyProperties(appVO,app);
+        this.update(app,infoQueryWapper);
+
+        //修改客户端id
+        String[] clientNum = appVO.getClientNums();
+        LambdaQueryWrapper<AppsClients> clientQueryWrapper = new LambdaQueryWrapper<>();
+        clientQueryWrapper.eq(AppsClients::getAppId,appVO.getId());
+        clientsService.remove(clientQueryWrapper);
+        for (int i = 0; i < clientNum.length; i++) {
+            AppsClients clients = new AppsClients();
+            clients.setAppId(appVO.getId());
+            clients.setClientNum(clientNum[i]);
+        }
 
-        //此处运用单表删
-        LambdaQueryWrapper<AppVersionDescribe> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(AppVersionDescribe::getAppId,appId);
-        AppVersionDescribe one = describeService.getOne(queryWrapper);
-        one.setDescription(app.getDescription());
-        describeService.update(one,null);
+        //没有进行描述和语言进行修改
 
         return Result.ok();
     }

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

@@ -2,17 +2,22 @@ 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.PcbClients;
 import com.om.entity.po.PcbVersionDescribe;
 import com.om.entity.po.PcbVersionInfo;
 import com.om.entity.vo.PcbInfoVO;
 import com.om.mapper.PcbVersionInfoMapper;
+import com.om.service.IPcbClientsService;
 import com.om.service.IPcbVersionDescribeService;
 import com.om.service.IPcbVersionInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.om.utils.Result;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -29,9 +34,59 @@ public class PcbVersionInfoServiceImpl extends ServiceImpl<PcbVersionInfoMapper,
     @Resource
     private IPcbVersionDescribeService describeService;
 
+    @Resource
+    private IPcbClientsService pcbClientsService;
+
     @Override
     public Result getPageList(Integer pageIndex, Integer pageSize, String username) {
-        return null;
+        Page<PcbVersionInfo> page = this.lambdaQuery()
+                .like(StringUtils.isNotBlank(username), PcbVersionInfo::getAdminName, username)
+                .page(new Page<>(pageIndex, pageSize));
+        List<PcbVersionInfo> infoList = page.getRecords();
+
+        //返回的List集合
+        List<PcbInfoVO> pcbInfoVOS = new ArrayList<>();
+        for (int i = 0; i < infoList.size(); i++) {
+            //传输的类型
+            PcbInfoVO pcbInfoVO = new PcbInfoVO();
+
+            PcbVersionInfo pcbVersionInfo = infoList.get(i);
+            //先copy基本数据
+            BeanUtil.copyProperties(pcbVersionInfo,pcbInfoVO);
+
+            Integer id = pcbVersionInfo.getId();
+            //先取语言和描述信息
+            LambdaQueryWrapper<PcbVersionDescribe> describeQueryWrapper = new LambdaQueryWrapper<>();
+            describeQueryWrapper.eq(PcbVersionDescribe::getPcbId,id);
+            List<PcbVersionDescribe> describeList = describeService.list(describeQueryWrapper);
+            //把取出来的数据存入俩个字符串中
+            String [] l = new String[describeList.size()];
+            String [] d = new String[describeList.size()];
+
+            for (int i1 = 0; i1 < describeList.size(); i1++) {
+                l[i1] = describeList.get(i1).getLanguage();
+                d[i1] = describeList.get(i1).getDescription();
+            }
+            pcbInfoVO.setDescription(d);
+            pcbInfoVO.setLanguage(l);
+
+            //在取出来客户端编号
+            LambdaQueryWrapper<PcbClients> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(PcbClients::getPcbId,id);
+            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();
+            }
+            pcbInfoVO.setClientNum(n);
+            pcbInfoVOS.add(pcbInfoVO);
+        }
+
+        Page<PcbInfoVO> pcbVOPage = new Page<>();
+        BeanUtil.copyProperties(page,pcbVOPage);
+        pcbVOPage.setRecords(pcbInfoVOS);
+
+        return Result.ok(pcbVOPage);
     }
 
     @Override
@@ -42,13 +97,22 @@ public class PcbVersionInfoServiceImpl extends ServiceImpl<PcbVersionInfoMapper,
         BeanUtil.copyProperties(pcbInfoVO,info);
         this.update(info,infoQueryWapper);
 
-        LambdaQueryWrapper<PcbVersionDescribe> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(PcbVersionDescribe::getPcbId,pcbInfoVO.getId());
-        List<PcbVersionDescribe> describes = describeService.list(queryWrapper);
+        //修改客户端id
+        String[] clientNum = pcbInfoVO.getClientNum();
+        LambdaQueryWrapper<PcbClients> clientQueryWrapper = new LambdaQueryWrapper<>();
+        clientQueryWrapper.eq(PcbClients::getPcbId,pcbInfoVO.getId());
+        pcbClientsService.remove(clientQueryWrapper);
+        for (int i = 0; i < clientNum.length; i++) {
+            PcbClients pcbClients = new PcbClients();
+            pcbClients.setPcbId(pcbInfoVO.getId());
+            pcbClients.setClientNum(clientNum[i]);
+            pcbClientsService.save(pcbClients);
+        }
 
+        //没有进行描述和语言进行修改
 
+        return Result.ok();
 
-        return null;
     }
 
     @Override
@@ -63,7 +127,9 @@ public class PcbVersionInfoServiceImpl extends ServiceImpl<PcbVersionInfoMapper,
         queryWrapper.eq(PcbVersionDescribe::getPcbId,id);
         boolean info = describeService.remove(queryWrapper);
         //还有关联表删除
-
+        LambdaQueryWrapper<PcbClients> clientsLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        clientsLambdaQueryWrapper.eq(PcbClients::getPcbId,id);
+        pcbClientsService.remove(clientsLambdaQueryWrapper);
         return Result.ok();
     }
 
@@ -74,7 +140,14 @@ public class PcbVersionInfoServiceImpl extends ServiceImpl<PcbVersionInfoMapper,
         this.save(pcbVersionInfo);
         Integer pcbInfoId = pcbVersionInfo.getId();
 
-        //PcbClient表关联num没写
+        //PcbClient表关联
+        for (int i = 0; i < pcbInfoVO.getClientNum().length; i++) {
+
+            PcbClients pcbClients = new PcbClients();
+            pcbClients.setPcbId(pcbInfoId);
+            pcbClients.setClientNum(pcbInfoVO.getClientNum()[i]);
+            pcbClientsService.save(pcbClients);
+        }
 
 
         for (int i = 0; i < pcbInfoVO.getLanguage().length; i++) {