From 7f98e49f98c146253526b462bea07f6ac64b4a46 Mon Sep 17 00:00:00 2001 From: ajaxfan <909938737@qq.com> Date: Wed, 17 Mar 2021 10:47:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=93=BE=E8=B7=AF?= =?UTF-8?q?=E8=BF=BD=E8=B8=AA=E5=92=8C=E6=80=A7=E8=83=BD=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile-test | 4 ++-- deployment-test.yaml | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile-test b/Dockerfile-test index 0646be2..7267f32 100644 --- a/Dockerfile-test +++ b/Dockerfile-test @@ -1,7 +1,7 @@ -FROM harbor.dcos.guangzhou.unicom.local/eshop/skywalking_agent_springboot_8.1.0:v1.0 +FROM harbor.dcos.guangzhou.unicom.local/eshop/jdk8_springboot_agent:v1.6 ENV LC_ALL=zh_CN.utf8 ENV LANG=zh_CN.utf8 ENV LANGUAGE=zh_CN.utf8 RUN localedef -c -f UTF-8 -i zh_CN zh_CN.utf8 ADD /target/biz_service_ebtp_project-0.0.1.jar /biz_service_ebtp_project-0.0.1.jar -ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=test", "-jar", "/biz_service_ebtp_project-0.0.1.jar"] +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-javaagent:/skywalking/agent/skywalking-agent.jar", "-Dspring.profiles.active=test", "-jar", "/biz_service_ebtp_project-0.0.1.jar"] diff --git a/deployment-test.yaml b/deployment-test.yaml index 0cb2ef1..312372a 100644 --- a/deployment-test.yaml +++ b/deployment-test.yaml @@ -46,7 +46,11 @@ spec: env: # Apollo 配置中心变量设置 - name: APOLLO_CONFIGSERVICE - value: http://10.242.37.148:6001 + value: http://10.242.37.148:6001 + - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES + value: skywalking-oap-cluster.skywalking:11800 + - name: SW_AGENT_NAME + value: biz-service-ebtp-project --- kind: Service apiVersion: v1 From 1601a7540cb9d833ee7d19ed96c6865ffece4818 Mon Sep 17 00:00:00 2001 From: dxc Date: Thu, 18 Mar 2021 14:15:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1=E3=80=81=E9=87=8D=E6=96=B0=E8=AF=84?= =?UTF-8?q?=E5=AE=A1=E6=B5=81=E7=A8=8B=E8=BF=BD=E8=B8=AA=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=202=E3=80=81=E5=A2=9E=E5=8A=A0=E6=A0=87?= =?UTF-8?q?=E6=AE=B5=E9=87=91=E9=A2=9D=E7=B4=AF=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/project/feign/WfapApi.java | 9 +++++++ .../project/feign/entity/TraceDetail.java | 25 +++++++++++++++++++ .../feign/fallback/WfapApiClientFallback.java | 6 +++++ .../controller/ProjectRecordController.java | 15 ++++++++++- .../service/IProjectRecordService.java | 8 ++++++ .../impl/ProjectRecordServiceImpl.java | 19 ++++++++++++++ .../ProjectReEvaluationController.java | 13 ++++++++++ .../service/IProjectReEvaluationService.java | 8 ++++++ .../impl/ProjectReEvaluationServiceImpl.java | 9 +++++++ 9 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/TraceDetail.java diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/WfapApi.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/WfapApi.java index e4dab93..08215e5 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/WfapApi.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/WfapApi.java @@ -3,6 +3,7 @@ package com.chinaunicom.mall.ebtp.project.feign; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.project.feign.entity.Approve; import com.chinaunicom.mall.ebtp.project.feign.entity.ProjectReEvaluationTaskVO; +import com.chinaunicom.mall.ebtp.project.feign.entity.TraceDetail; import com.chinaunicom.mall.ebtp.project.feign.fallback.WfapApiClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -24,4 +25,12 @@ public interface WfapApi { */ @PostMapping("/api/wfap/v1/approve/auto/audit/start") BaseResponse start(@RequestBody Approve approve); + + /** + * @param traceDetail 查询流程跟踪 + * @return 返回结果 + */ + @PostMapping("/api/wfap/v1/approve/find/trace/detail") + BaseResponse findTraceDetail(TraceDetail traceDetail); + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/TraceDetail.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/TraceDetail.java new file mode 100644 index 0000000..1d67c08 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/TraceDetail.java @@ -0,0 +1,25 @@ +package com.chinaunicom.mall.ebtp.project.feign.entity; + + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 实体类 TraceDetail + * + * @author daixc + */ +@Data +@Accessors(chain = true) +@ApiModel +public class TraceDetail { + + @ApiModelProperty(value = "流程实例id") + private String processInstId; + + @ApiModelProperty(value = "访问url") + private String traceDetailUrl; + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/WfapApiClientFallback.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/WfapApiClientFallback.java index 507e2d5..a994ed6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/WfapApiClientFallback.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/WfapApiClientFallback.java @@ -3,6 +3,7 @@ package com.chinaunicom.mall.ebtp.project.feign.fallback; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.project.feign.WfapApi; import com.chinaunicom.mall.ebtp.project.feign.entity.Approve; +import com.chinaunicom.mall.ebtp.project.feign.entity.TraceDetail; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -18,6 +19,11 @@ public class WfapApiClientFallback implements FallbackFactory { public BaseResponse start(Approve approve) { return null; } + + @Override + public BaseResponse findTraceDetail(TraceDetail traceDetail) { + return null; + } }; } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/controller/ProjectRecordController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/controller/ProjectRecordController.java index 9700557..f216579 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/controller/ProjectRecordController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/controller/ProjectRecordController.java @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; +import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -197,11 +198,23 @@ public class ProjectRecordController{ */ @ApiOperation("根据询价单id查询数据") @GetMapping("/getByInquiryId/{inquiryId}") - public BaseResponse getByInquiryId(@ApiParam(value = "主键id", required = true) @PathVariable String inquiryId){ + public BaseResponse getByInquiryId(@ApiParam(value = "询价单id", required = true) @PathVariable String inquiryId){ ProjectRecord projectRecord = projectRecordService.getByInquiryId(inquiryId); return BaseResponse.success(BeanUtil.toBean(projectRecord,ProjectRecordVO.class)); } + /** + * 根据id查询标段所有的预算金额合计 + * @param id 主键id + * @return 返回结果 + */ + @ApiOperation("根据id查询标段所有的预算金额合计") + @GetMapping("/getBudgetAmountById/{id}") + public BaseResponse getBudgetAmountById(@ApiParam(value = "主键id", required = true) @PathVariable String id){ + + return BaseResponse.success(projectRecordService.getBudgetAmountById(id)); + } + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/IProjectRecordService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/IProjectRecordService.java index 6e375b0..004fe8f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/IProjectRecordService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/IProjectRecordService.java @@ -7,6 +7,7 @@ import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ProjectEntrustVO; import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecord; import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecordVO; +import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; import java.util.Map; @@ -136,4 +137,11 @@ public interface IProjectRecordService extends IBaseService{ void inquiryInitialize(String id, Map sectionMaps, LocalDateTime reviewStartTime); ProjectRecord getByInquiryId(String inquiryId); + + /** + * 获取 + * @param id + * @return + */ + BigDecimal getBudgetAmountById(String id); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index d381b31..8914167 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -36,6 +36,7 @@ import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecord; import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecordVO; import com.chinaunicom.mall.ebtp.project.projectrecord.service.IProjectRecordService; import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSection; +import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSectionVO; import com.chinaunicom.mall.ebtp.project.projectsection.service.IProjectSectionFlowService; import com.chinaunicom.mall.ebtp.project.projectsection.service.IProjectSectionService; import com.chinaunicom.mall.ebtp.project.projectupdatefield.entity.ProjectUpdateField; @@ -48,6 +49,7 @@ import com.chinaunicom.mall.ebtp.project.sectionsupplier.entity.SectionSupplierV import com.chinaunicom.mall.ebtp.project.sectionsupplier.service.ISectionSupplierService; import io.seata.core.context.RootContext; import io.seata.spring.annotation.GlobalTransactional; +import io.seata.tm.api.transaction.SuspendedResourcesHolder; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.security.core.parameters.P; @@ -55,6 +57,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; @@ -428,6 +431,22 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl sectionList = projectSectionService.getList(section); + BigDecimal budgetAmount = new BigDecimal(0); + for (ProjectSection projectSection : sectionList) { + if (null != projectSection.getBidSectContractPrice()) { + budgetAmount = budgetAmount.add(projectSection.getBidSectContractPrice()); + } + } + + return budgetAmount.setScale(4,BigDecimal.ROUND_HALF_UP); + } + @Override public boolean assent(String entrustId) { diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java index 1deae67..4bf73ee 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java @@ -4,6 +4,7 @@ package com.chinaunicom.mall.ebtp.project.projectreevaluation.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.project.baseoperlog.aop.OperLog; +import com.chinaunicom.mall.ebtp.project.feign.entity.TraceDetail; import com.chinaunicom.mall.ebtp.project.feign.entity.WasUpdateBizDTO; import com.chinaunicom.mall.ebtp.project.projectreevaluation.entity.ProjectReEvaluationVO; import org.springframework.validation.annotation.Validated; @@ -197,4 +198,16 @@ public class ProjectReEvaluationController { return BaseResponse.success(projectReEvaluationService.getByIdToWfap(id)); } + + /** + * 查询流程跟踪 + * @param instanceId 主键ID + * @return 返回结果 + */ + @ApiOperation("查询流程跟踪") + @PostMapping("/findTraceDetail") + public BaseResponse findTraceDetail(@ApiParam(value = "流程实例id", required = true) @RequestParam("instanceId") String instanceId) { + + return BaseResponse.success(projectReEvaluationService.findTraceDetail(instanceId)); + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/IProjectReEvaluationService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/IProjectReEvaluationService.java index 6981e0e..4fd6072 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/IProjectReEvaluationService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/IProjectReEvaluationService.java @@ -4,6 +4,7 @@ package com.chinaunicom.mall.ebtp.project.projectreevaluation.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; import com.chinaunicom.mall.ebtp.project.feign.entity.BizAgainSection; +import com.chinaunicom.mall.ebtp.project.feign.entity.TraceDetail; import com.chinaunicom.mall.ebtp.project.feign.entity.WasUpdateBizDTO; import com.chinaunicom.mall.ebtp.project.projectreevaluation.entity.ProjectReEvaluation; import com.chinaunicom.mall.ebtp.project.projectreevaluation.entity.ProjectReEvaluationVO; @@ -97,4 +98,11 @@ public interface IProjectReEvaluationService extends IBaseService response = wfapApi.findTraceDetail(traceDetail); + ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(response.getMessage(),!response.isSuccess()); + return response.getData(); + } + /** * 初始化标段信息 From 0fd01d6bfddd1bfb3e94a50756f8912911018e11 Mon Sep 17 00:00:00 2001 From: dxc Date: Thu, 18 Mar 2021 14:20:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=AF=84=E5=AE=A1?= =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=8F=82=E6=95=B0=E4=BC=A0=E9=80=92=E5=BD=A2?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectReEvaluationController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java index 4bf73ee..1e3fcf5 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java @@ -205,8 +205,8 @@ public class ProjectReEvaluationController { * @return 返回结果 */ @ApiOperation("查询流程跟踪") - @PostMapping("/findTraceDetail") - public BaseResponse findTraceDetail(@ApiParam(value = "流程实例id", required = true) @RequestParam("instanceId") String instanceId) { + @PostMapping("/findTraceDetail/{instanceId}") + public BaseResponse findTraceDetail(@ApiParam(value = "流程实例id", required = true) @PathVariable("instanceId") String instanceId) { return BaseResponse.success(projectReEvaluationService.findTraceDetail(instanceId)); }