Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

pqbug解决

Browse Source
This commit is contained in:
wr
2023-05-22 15:59:51 +08:00
parent ded7f0f447
commit 682b40c849
4 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java
View File

@@ -58,7 +58,7 @@ public class ProgramVersionController extends BaseController {
@RequestParam("remark") String remark,
@RequestParam(value = "versionType",required = false) String versionType,
@RequestParam("filename") String fileName,
@ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file) {
@ApiParam(value = "文件") @RequestPart(value = "file",required = false) MultipartFile file) {
String methodDescribe = getMethodDescribe("addProgramVersion");
boolean res = programService.addProgramVersion(name,protocol,date,devType,remark,versionType,fileName,file);
if (res) {
@@ -93,7 +93,7 @@ public class ProgramVersionController extends BaseController {
@RequestParam("remark") String remark,
@RequestParam(value = "versionType",required = false) String versionType,
@RequestParam("filename") String fileName,
@ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file) {
@ApiParam(value = "文件") @RequestPart(name = "file",required = false) MultipartFile file) {
String methodDescribe = getMethodDescribe("updateProgramVersion");
boolean res = programService.updateProgramVersion(id,name,protocol,date,devType,remark,versionType,fileName,file);
if (res) {

36
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java
View File

@@ -1,5 +1,6 @@
package com.njcn.device.pq.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -79,17 +80,18 @@ public class ProgramVersionServiceImpl extends ServiceImpl<VersionMapper, Versio
} else {
version.setVersionType("");
}
if(ObjectUtil.isNotNull(file)){
byte[] b = null, bytes = null;
try {
b = file.getBytes();
byte[] b = null, bytes = null;
try {
b = file.getBytes();
InputStream in = file.getInputStream();
bytes = FileCopyUtils.copyToByteArray(in);
} catch (IOException e) {
e.printStackTrace();
InputStream in = file.getInputStream();
bytes = FileCopyUtils.copyToByteArray(in);
} catch (IOException e) {
e.printStackTrace();
}
version.setFile(b);
}
version.setFile(b);
version.setFileName(fileName);
version.setVersionFlag(DataStateEnum.ENABLE.getCode());
version.setState(DataStateEnum.ENABLE.getCode());
@@ -122,13 +124,15 @@ public class ProgramVersionServiceImpl extends ServiceImpl<VersionMapper, Versio
} else {
version.setVersionType("");
}
byte[] b = null;
try {
b = file.getBytes();
} catch (IOException e) {
e.printStackTrace();
if(ObjectUtil.isNotNull(file)){
byte[] b = null;
try {
b = file.getBytes();
} catch (IOException e) {
e.printStackTrace();
}
version.setFile(b);
}
version.setFile(b);
version.setFileName(fileName);
version.setUpdateBy(RequestUtil.getUserIndex());
version.setUpdateTime(LocalDateTime.now());
@@ -169,11 +173,11 @@ public class ProgramVersionServiceImpl extends ServiceImpl<VersionMapper, Versio
nodeLambdaQueryWrapper
.eq(Version::getName, name)
.eq(Version::getState, DataStateEnum.ENABLE.getCode());
int countByAccount = this.count(nodeLambdaQueryWrapper);
//更新的时候，需排除当前记录
if (isExcludeSelf) {
nodeLambdaQueryWrapper.ne(Version::getId, id);
}
int countByAccount = this.count(nodeLambdaQueryWrapper);
//大于等于1个则表示重复
if (countByAccount >= 1) {
throw new BusinessException(DeviceResponseEnum.FLOW_SAME_NAME);