wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: (REQ-3300) FeignConfig加上thor

Browse Source
This commit is contained in:
xudawei 2025-02-06 16:53:10 +08:00
parent 952f0e3d55
commit 9cea4408d7
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nanopart-server/src/main/java/cn/axzo/nanopart/config/FeignConfig.java
View File

@ -69,6 +69,8 @@ public class FeignConfig implements RequestInterceptor, EnvironmentAware {
private String dataCollectionUrl;
@Value("${attendanceUrl:http://dev-app.axzo.cn/attendance}")
private String attendanceApi;
@Value("${thorUrl:http://dev-app.axzo.cn/thor}")
private String thorApi;
private static String POD_NAMESPACE;
static {
@ -107,6 +109,7 @@ public class FeignConfig implements RequestInterceptor, EnvironmentAware {
url = url.replace("http://karma:8080", karmaEnvUrl);
url = url.replace("http://data-collection:21200", dataCollectionUrl);
url = url.replace("http://attendance:8080", attendanceApi);
url = url.replace("http://thor:8080", thorApi);
String profile = environment.getProperty("spring.profiles.active");
if(Objects.equals(profile, "test") && url.contains("dev-app.axzo.cn")) {
url = url.replace("dev-app", "test-api");

4
visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/enums/VisaButtonTypeEnum.java
View File

@ -117,4 +117,8 @@ public enum VisaButtonTypeEnum {
}
}
public static Set<VisaButtonTypeEnum> all() {
return Sets.newHashSet(VisaButtonTypeEnum.values());
}
}

4
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java
View File

@ -4,6 +4,7 @@ import cn.axzo.framework.domain.web.result.ApiPageResult;
import cn.axzo.framework.domain.web.result.ApiResult;
import cn.axzo.framework.domain.web.result.PageData;
import cn.axzo.nanopart.visa.api.changerecord.ChangeRecordApi;
import cn.axzo.nanopart.visa.api.enums.VisaButtonTypeEnum;
import cn.axzo.nanopart.visa.api.request.ChangeRecordForbidReq;
import cn.axzo.nanopart.visa.api.request.ChangeStatusRequest;
import cn.axzo.nanopart.visa.api.request.FetchVisaAllConfirmReq;
@ -74,7 +75,8 @@ public class ChangeRecordController implements ChangeRecordApi {
*/
public ApiResult<VisaDetailByIdResponse> visaDetailById(@RequestBody @Valid VisaDetailByIdRequest req) {
VisaDetailByIdResponse resp = changeRecordService.detailById(req.getVisaId());
resp.setBtnList(changeRecordConfirmService.fetchBtnsByCondition(req.getVisaId(), req.getPersonId(), req.getOuId(), req.getWorkspaceId(), resp.getStatus()));
resp.setBtnList(VisaButtonTypeEnum.all());
// resp.setBtnList(changeRecordConfirmService.fetchBtnsByCondition(req.getVisaId(), req.getPersonId(), req.getOuId(), req.getWorkspaceId(), resp.getStatus()));
return ApiResult.ok(resp);
}

5
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
View File

@ -320,6 +320,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
return VisaDetailByIdResponse.builder()
.visaId(visaId)
.no(visa.getNo()) //单号
.type(visa.getType()) //单据类型,DESIGN_CHANGE:设计变更,TECHNOLOGY_APPROVED:技术核定,PROJECT_VISA:工程签证
.reason(visa.getReason()) //发生原因
@ -355,7 +356,9 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
if (CollectionUtils.isEmpty(attachList)) {
return Lists.newArrayList();
}
List<String> attachContentList = attachList.stream().map(ChangeRecordRelation::getContent).collect(Collectors.toList());
List<String> attachContentList = attachList.stream()
.filter(item -> StringUtils.hasText(item.getContent()))
.map(ChangeRecordRelation::getContent).collect(Collectors.toList());
if (CollectionUtils.isEmpty(attachContentList)) {
return Lists.newArrayList();
}