Merge branch 'master' of http://47.113.197.148:13000/bmmx/OperationSystem

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

@@ -2,6 +2,7 @@ package com.om.entity.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -22,6 +23,7 @@ public class PcbInfoVO {
     @ApiModelProperty(value = "上传人名称")
     private String adminName;
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private LocalDateTime createTime;
     @ApiModelProperty(value = "语言")
     private String[] language;

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

@@ -13,8 +13,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.om.utils.CommonUtil;
 import com.om.utils.Result;
 import com.om.utils.UserContext;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -29,6 +31,7 @@ import java.util.List;
  * @since 2024-03-11
  */
 @Service
+@Slf4j
 public class AppServiceImpl extends ServiceImpl<AppMapper, App> implements IAppService {
 
     @Resource
@@ -125,9 +128,12 @@ 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();
+
             }
             appVO.setClientNums(n);
+
             appInfoVOS.add(appVO);
         }
 
@@ -139,15 +145,18 @@ public class AppServiceImpl extends ServiceImpl<AppMapper, App> implements IAppS
     }
 
     @Override
+    @Transactional
     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);
@@ -155,9 +164,23 @@ public class AppServiceImpl extends ServiceImpl<AppMapper, App> implements IAppS
             AppsClients clients = new AppsClients();
             clients.setAppId(appVO.getId());
             clients.setClientNum(clientNum[i]);
+            log.info("修改之后添加的");
+            clientsService.save(clients);
         }
 
         //没有进行描述和语言进行修改
+        String[] language = appVO.getLanguage();
+        String[] description = appVO.getDescription();
+        LambdaQueryWrapper<AppVersionDescribe> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AppVersionDescribe::getAppId,appVO.getId());
+        describeService.remove(queryWrapper);
+        for (int i = 0; i < language.length; i++) {
+            AppVersionDescribe describe = new AppVersionDescribe();
+            describe.setAppId(appVO.getId());
+            describe.setDescription(description[i]);
+            describe.setLanguage(language[i]);
+            describeService.save(describe);
+        }
 
         return Result.ok();
     }

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

@@ -3,6 +3,7 @@ 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;
@@ -13,8 +14,10 @@ import com.om.service.IPcbVersionDescribeService;
 import com.om.service.IPcbVersionInfoService;
 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.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -29,6 +32,7 @@ import java.util.List;
  * @since 2024-03-12
  */
 @Service
+@Slf4j
 public class PcbVersionInfoServiceImpl extends ServiceImpl<PcbVersionInfoMapper, PcbVersionInfo> implements IPcbVersionInfoService {
 
     @Resource
@@ -90,6 +94,7 @@ public class PcbVersionInfoServiceImpl extends ServiceImpl<PcbVersionInfoMapper,
     }
 
     @Override
+    @Transactional
     public Result edit(PcbInfoVO pcbInfoVO) {
         PcbVersionInfo info = getById(pcbInfoVO.getId());
         LambdaQueryWrapper<PcbVersionInfo> infoQueryWapper = new LambdaQueryWrapper<>();
@@ -110,12 +115,25 @@ public class PcbVersionInfoServiceImpl extends ServiceImpl<PcbVersionInfoMapper,
         }
 
         //没有进行描述和语言进行修改
+        String[] language = pcbInfoVO.getLanguage();
+        String[] description = pcbInfoVO.getDescription();
+        LambdaQueryWrapper<PcbVersionDescribe> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(PcbVersionDescribe::getPcbId,pcbInfoVO.getId());
+        describeService.remove(queryWrapper);
+        for (int i = 0; i < language.length; i++) {
+            PcbVersionDescribe describe = new PcbVersionDescribe();
+            describe.setPcbId(pcbInfoVO.getId());
+            describe.setDescription(description[i]);
+            describe.setLanguage(language[i]);
+            describeService.save(describe);
+        }
 
         return Result.ok();
 
     }
 
     @Override
+    @Transactional
     public Result downloadFile(Integer id) {
         return null;
     }
@@ -137,6 +155,7 @@ public class PcbVersionInfoServiceImpl extends ServiceImpl<PcbVersionInfoMapper,
     public Result add(PcbInfoVO pcbInfoVO) {
         PcbVersionInfo pcbVersionInfo = new PcbVersionInfo();
         BeanUtil.copyProperties(pcbInfoVO,pcbVersionInfo);
+        log.info("-----{}",pcbVersionInfo);
         this.save(pcbVersionInfo);
         Integer pcbInfoId = pcbVersionInfo.getId();