From 39da7452d30fd5812bd905f235fef2d8565da6f4 Mon Sep 17 00:00:00 2001 From: xudawei Date: Wed, 26 Feb 2025 17:10:00 +0800 Subject: [PATCH 1/7] =?UTF-8?q?feat:=20(REQ-3300)=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=94=BE=E5=8E=BB=E6=8E=89mock?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visa/server/rpc/DataObjectApiGateway.java | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/DataObjectApiGateway.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/DataObjectApiGateway.java index c243c40d..a691f4ff 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/DataObjectApiGateway.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/DataObjectApiGateway.java @@ -33,35 +33,10 @@ public class DataObjectApiGateway { ApiResult match = dataObjectApi.match(req); log.info("DataObjectApiGateway match, result:{}", JSON.toJSONString(match)); return match.getData(); -// return mockDataObject(); } catch (Exception e) { log.warn("DataObjectApiGateway match exception", e); throw e; } } - /** - * mock数据 - */ - private MatchDataObjectResp mockDataObject() { - MergeMatchDataResp.DataItem dt1 = MergeMatchDataResp.DataItem.builder() - .personIds(Lists.newArrayList(9000398292L,89511L)) -// .ouId(6122L) -// .workspaceId(399L) -// .nodeId(10345L) -// .projectIds(Lists.newArrayList(424L)) - .build(); - - MergeMatchDataResp.DataItem dt2 = MergeMatchDataResp.DataItem.builder() - .personIds(Lists.newArrayList(9000506L,89636L)) -// .ouId(6158L) -// .workspaceId(399L) -// .nodeId(10345L) -// .projectIds(Lists.newArrayList(763L)) - .build(); - - MergeMatchDataResp matchDataResp = MergeMatchDataResp.builder().dataItems(Lists.newArrayList(dt1, dt2)).build(); - return MatchDataObjectResp.builder().mergedDataObject(matchDataResp).build(); - } - } From 39d21c1449d6ab654c2a437f679873f5132b4eeb Mon Sep 17 00:00:00 2001 From: xudawei Date: Wed, 26 Feb 2025 17:58:57 +0800 Subject: [PATCH 2/7] =?UTF-8?q?feat:=20(REQ-3300)=20=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=97=A5=E5=BF=97=E5=8E=BB=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visa/server/service/impl/ChangeRecordLogServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordLogServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordLogServiceImpl.java index 6a1c55ef..c82204bf 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordLogServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordLogServiceImpl.java @@ -298,7 +298,7 @@ public class ChangeRecordLogServiceImpl extends ServiceImpl Date: Wed, 26 Feb 2025 19:24:52 +0800 Subject: [PATCH 3/7] =?UTF-8?q?feat(REQ-3300):=20=E5=85=B3=E8=81=94?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=8F=90=E7=A4=BA=E6=96=87=E6=A1=88=E7=BB=9F?= =?UTF-8?q?=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visa/server/service/impl/ChangeRecordServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java index e87aa0e0..d22c46eb 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java @@ -1591,7 +1591,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl { log.info("{} bill {} is related by {} visa {}", m.getBillType(), m.getBillId(), m.getVisaType(), m.getVisaId()); - throw new ServiceException(String.format("%s：单据%s已被其他单据关联，请重新选择", m.getBillType(), m.getBillNo())); + throw new ServiceException(String.format("%s已被其他%s关联，请重新选择", m.getBillType().name(), visaType.name())); })); } @@ -1609,7 +1609,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl { log.info("{} bill {} is related by {} visa {}", m.getBillType(), m.getBillId(), m.getVisaType(), m.getVisaId()); - throw new ServiceException(String.format("%s：单据%s已被其他单据关联，请重新选择", m.getBillType(), m.getBillNo())); + throw new ServiceException(String.format("%s已被其他%s关联，请重新选择", m.getBillType().name(), visaType.name())); })); } From bded0f5621a2b2f2e7509887d8376b9073d20715 Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Wed, 26 Feb 2025 19:48:56 +0800 Subject: [PATCH 4/7] =?UTF-8?q?feat(REQ-3300):=20=E5=85=B3=E8=81=94?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=8F=90=E7=A4=BA=E6=96=87=E6=A1=88=E7=BB=9F?= =?UTF-8?q?=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visa/server/service/impl/ChangeRecordServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java index d22c46eb..f889fb92 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java @@ -1591,7 +1591,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl { log.info("{} bill {} is related by {} visa {}", m.getBillType(), m.getBillId(), m.getVisaType(), m.getVisaId()); - throw new ServiceException(String.format("%s已被其他%s关联，请重新选择", m.getBillType().name(), visaType.name())); + throw new ServiceException(String.format("%s已被其他%s关联，请重新选择", m.getBillType().getDesc(), visaType.getDesc())); })); } @@ -1609,7 +1609,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl { log.info("{} bill {} is related by {} visa {}", m.getBillType(), m.getBillId(), m.getVisaType(), m.getVisaId()); - throw new ServiceException(String.format("%s已被其他%s关联，请重新选择", m.getBillType().name(), visaType.name())); + throw new ServiceException(String.format("%s已被其他%s关联，请重新选择", m.getBillType().getDesc(), visaType.getDesc())); })); } From 4829fa2d7fb061c4c30663abed8432ea459afbed Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Wed, 26 Feb 2025 19:52:18 +0800 Subject: [PATCH 5/7] =?UTF-8?q?feat(REQ-3300):=20=E4=B8=93=E4=B8=9A?= =?UTF-8?q?=E9=9D=9E=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nanopart/visa/api/request/CheckVisaWithVisaIdReq.java | 4 ++-- .../nanopart/visa/api/request/VisaChangeTempCreateReq.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java index 093946af..6e70aee7 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java @@ -38,10 +38,10 @@ public class CheckVisaWithVisaIdReq { AssertUtil.notNull(response.getRelationProject(), "关联工程不能为空"); AssertUtil.notEmpty(response.getHappenTime(), "提出时间不能为空"); AssertUtil.notEmpty(response.getReason(), "发生原因不能为空"); - AssertUtil.notEmpty(response.getRelationProfessionalList(), "专业不能为空"); +// AssertUtil.notEmpty(response.getRelationProfessionalList(), "专业不能为空"); if (CollectionUtils.isNotEmpty(response.getRelationOuAndPersonList())) { response.getRelationOuAndPersonList().forEach(item -> { - AssertUtil.notEmpty(item.getRelationPersonList(), "专业不能为空"); + AssertUtil.notEmpty(item.getRelationPersonList(), "确认人不能为空"); }); } diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java index 70b79257..c63e693a 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java @@ -98,7 +98,7 @@ public class VisaChangeTempCreateReq { * ] * */ - @NotNull(message = "请选择专业") +// @NotNull(message = "请选择专业") private JSONArray relationProfessional; /** From 9e8d5769c7de1e48f5826d16ddd6f9a7c6d0870c Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Wed, 26 Feb 2025 20:06:40 +0800 Subject: [PATCH 6/7] =?UTF-8?q?feat(REQ-3581)=20-=20=E8=B0=83=E6=95=B4=20g?= =?UTF-8?q?ateway=20=E7=9A=84=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/nanopart/visa/server/rpc/MsgCenterGateway.java | 6 ++++++ .../nanopart/visa/server/rpc/OrganizationalUnitGateway.java | 2 ++ .../axzo/nanopart/visa/server/rpc/VisaProfileGateway.java | 2 ++ 3 files changed, 10 insertions(+) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/MsgCenterGateway.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/MsgCenterGateway.java index df32c20a..081af854 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/MsgCenterGateway.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/MsgCenterGateway.java @@ -1,5 +1,6 @@ package cn.axzo.nanopart.visa.server.rpc; +import cn.axzo.basics.common.util.AssertUtil; import cn.axzo.framework.domain.web.result.ApiResult; import cn.axzo.im.center.api.feign.GroupApi; import cn.axzo.im.center.api.feign.MessageApi; @@ -44,6 +45,7 @@ public class MsgCenterGateway { if(group.isSuccess() && Objects.nonNull(group.getData())) { return group.getData(); } + AssertUtil.isTrue(group.isSuccess(), group.getMsg()); return null; } @@ -58,6 +60,7 @@ public class MsgCenterGateway { if(members.isSuccess() && Objects.nonNull(members.getData())) { return members.getData(); } + AssertUtil.isTrue(members.isSuccess(), members.getMsg()); return null; } @@ -67,6 +70,7 @@ public class MsgCenterGateway { if(owner.isSuccess() && Objects.nonNull(owner.getData())) { return owner.getData(); } + AssertUtil.isTrue(owner.isSuccess(), owner.getMsg()); return null; } @@ -76,6 +80,7 @@ public class MsgCenterGateway { if(mesageId.isSuccess() && Objects.nonNull(mesageId.getData())) { return mesageId.getData(); } + AssertUtil.isTrue(mesageId.isSuccess(), mesageId.getMsg()); return null; } @@ -85,6 +90,7 @@ public class MsgCenterGateway { if (Objects.nonNull(sendCard) && sendCard.getCode() == 200) { return sendCard.getData(); } + AssertUtil.isTrue(sendCard.getCode() == 200, sendCard.getMsg()); return null; } diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/OrganizationalUnitGateway.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/OrganizationalUnitGateway.java index 37c4cf26..46203d30 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/OrganizationalUnitGateway.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/OrganizationalUnitGateway.java @@ -1,5 +1,6 @@ package cn.axzo.nanopart.visa.server.rpc; +import cn.axzo.basics.common.util.AssertUtil; import cn.axzo.framework.domain.web.result.ApiResult; import cn.axzo.maokai.api.client.OrganizationalUnitApi; import cn.axzo.maokai.api.vo.request.OrganizationalUnitQuery; @@ -31,6 +32,7 @@ public class OrganizationalUnitGateway { if (unitResponse.isSuccess() && Objects.nonNull(unitResponse.getData())) { return unitResponse.getData(); } + AssertUtil.isTrue(unitResponse.isSuccess(), unitResponse.getMsg()); return null; } /** diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/VisaProfileGateway.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/VisaProfileGateway.java index 743440d4..154634d4 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/VisaProfileGateway.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/VisaProfileGateway.java @@ -1,5 +1,6 @@ package cn.axzo.nanopart.visa.server.rpc; +import cn.axzo.basics.common.util.AssertUtil; import cn.axzo.basics.profiles.api.UserProfileServiceApi; import cn.axzo.basics.profiles.dto.basic.PersonProfileDto; import cn.azxo.framework.common.logger.MethodAroundLog; @@ -45,6 +46,7 @@ public class VisaProfileGateway { if (Objects.nonNull(personProfile) && personProfile.getCode() == 200) { return personProfile.getData(); } + AssertUtil.isTrue(personProfile.getCode() == 200, personProfile.getMsg()); return null; } From d0c0f4d2b4d171469d0c27b0673bf3dd93a37b91 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Wed, 26 Feb 2025 20:23:28 +0800 Subject: [PATCH 7/7] =?UTF-8?q?feat(REQ-3581)=20-=20=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0visaId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/mq/listener/im/ImGroupAddMembersEventHandler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupAddMembersEventHandler.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupAddMembersEventHandler.java index a9e38e7a..5df5d1d7 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupAddMembersEventHandler.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupAddMembersEventHandler.java @@ -91,6 +91,7 @@ public class ImGroupAddMembersEventHandler implements EventHandler, Initializing "initiatorName", ownerProfile.getRealName(), "visaType", StringUtils.isNotBlank(visaType) ? VisaTypeEnum.valueOf(visaType).getDesc() : "", "topic", group.getName()))); + notice.setRouterParams(new JSONObject(Maps.of("visaId", visaId))); noticeApi.send(notice); } log.info("receive add member event, push notice success!");