aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUGFIX:系统模特高宽默认1050 500;

Browse Source
This commit is contained in:
shahaibo
2023-10-09 10:26:10 +08:00
parent e7ea5c2a2a
commit 26f4566fac
6 changed files with 23 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/ai/da/mapper/entity/SysFile.java
View File

@@ -52,9 +52,6 @@ public class SysFile implements Serializable {
*/
private String md5;
private Integer high;
private Integer width;
/**
* 路径 绝对路径
*

4
src/main/java/com/ai/da/model/vo/SysFileVO.java
View File

@@ -34,8 +34,4 @@ public class SysFileVO implements Serializable {
*/
private String md5;
private Integer high;
private Integer width;
}

2
src/main/java/com/ai/da/python/PythonService.java
View File

@@ -1206,7 +1206,7 @@ public class PythonService {
RequestBody body = RequestBody.create(mediaType, JSON.toJSONString(content));
Request request = new Request.Builder()
// .url(accessPythonIp+":11112/aifda/api/v1.0/attribute_retrieval")
.url(accessPythonIp+":11112/aifda/api/v1.0/attribute_retrieval")
.url(accessPythonIp+":9991/aifda/api/v1.0/attribute_retrieval")
.method("POST", body)
.addHeader("Authorization", "Basic YWlkbGFiOjEyMw==")
.addHeader("Content-Type", "application/json")

34
src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
View File

@@ -110,26 +110,24 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
private void calculateLibraryAndSysFile(DesignCollectionDTO designDTO, ValidateElementVO elementVO, AuthPrincipalVo userInfo) {
//查询用户 sketch library
List<LibraryVo> libraryVos;
// if (CollectionUtil.isNotEmpty(designDTO.getSketchBoards())) {
// List<String> sketchUrlList = elementVO.getSketchBoardElements()
// .stream()
// .map(CollectionElement::getUrl)
// .collect(Collectors.toList());
// DesignAttributeRetrievalDTO designAttributeRetrievalDTO =
// pythonService.generateAttributeRetrieval(sketchUrlList, userInfo.getId());
// if (CollectionUtils.isEmpty(designAttributeRetrievalDTO.getLibraryUrls())) {
// libraryVos = null;
// } else {
// libraryVos = libraryService.getByUrlList(designAttributeRetrievalDTO.getLibraryUrls(), userInfo.getId());
// }
// List<SysFileVO> sysFileVOS = sysFileService.getByUrlList(designAttributeRetrievalDTO.getSysFileUrlS());
// elementVO.setSysFileVo(sysFileVOS);
// } else {
// libraryVos = libraryService.selectByAccountIdAnd1TypeList(userInfo.getId(),
// Collections.singletonList(CollectionLevel1TypeEnum.SKETCH_BOARD.getRealName()));
// }
if (CollectionUtil.isNotEmpty(designDTO.getSketchBoards())) {
List<String> sketchUrlList = elementVO.getSketchBoardElements()
.stream()
.map(CollectionElement::getUrl)
.collect(Collectors.toList());
DesignAttributeRetrievalDTO designAttributeRetrievalDTO =
pythonService.generateAttributeRetrieval(sketchUrlList, userInfo.getId());
if (CollectionUtils.isEmpty(designAttributeRetrievalDTO.getLibraryUrls())) {
libraryVos = null;
} else {
libraryVos = libraryService.getByUrlList(designAttributeRetrievalDTO.getLibraryUrls(), userInfo.getId());
}
List<SysFileVO> sysFileVOS = sysFileService.getByUrlList(designAttributeRetrievalDTO.getSysFileUrlS());
elementVO.setSysFileVo(sysFileVOS);
} else {
libraryVos = libraryService.selectByAccountIdAnd1TypeList(userInfo.getId(),
Collections.singletonList(CollectionLevel1TypeEnum.SKETCH_BOARD.getRealName()));
}
elementVO.setLibraryVos(libraryVos);
//校验比列
validateRatio(designDTO, libraryVos);

2
src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
View File

@@ -278,8 +278,6 @@ public class LibraryServiceImpl extends ServiceImpl<LibraryMapper, Library> impl
sysFile.setUrl(filePath);
sysFile.setMd5(uploadDTO.getMd5());
sysFile.setCreateDate(new Date());
sysFile.setHigh(uploadDTO.getHigh());
sysFile.setWidth(uploadDTO.getWidth());
sysFileMapper.insert(sysFile);
Library library = new Library();
library.setId(sysFile.getId());

7
src/main/resources/application-test.properties
View File

@@ -1,4 +1,4 @@
server.port=5567
server.port=10086
#datasource
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
@@ -42,8 +42,9 @@ spring.servlet.multipart.max-file-size = 5MB
spring.servlet.multipart.max-request-size= 5MB
#访问python服务的ip(对应环境)
#access.python.ip=http://18.167.251.121
access.python.ip=http://43.198.80.117
#access.python.ip=http://43.198.80.117
access.python.ip=http://18.167.251.121
#access.python.ip=http://18.167.251.121:9991/
# minIO服务配置之信息
minio.endpoint=http://18.167.251.121:9000