From 143ff00a7cc865c2951979de6eccf4df850b57e1 Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Thu, 9 Sep 2021 17:42:44 +0800 Subject: [PATCH] bug --- .../carbasics/api/OrganizationController.java | 1 - .../carbasics/api/ProjectController.java | 8 ++--- .../com/ccsens/carbasics/bean/vo/OcrVo.java | 4 +-- .../carbasics/service/AsyncService.java | 35 +++++++++++++++++++ .../carbasics/service/IAsyncService.java | 11 ++++++ src/main/resources/application.yml | 4 +-- 6 files changed, 54 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/ccsens/carbasics/service/AsyncService.java create mode 100644 src/main/java/com/ccsens/carbasics/service/IAsyncService.java diff --git a/src/main/java/com/ccsens/carbasics/api/OrganizationController.java b/src/main/java/com/ccsens/carbasics/api/OrganizationController.java index 291e52b..65e1de6 100644 --- a/src/main/java/com/ccsens/carbasics/api/OrganizationController.java +++ b/src/main/java/com/ccsens/carbasics/api/OrganizationController.java @@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.List; /** * @description: diff --git a/src/main/java/com/ccsens/carbasics/api/ProjectController.java b/src/main/java/com/ccsens/carbasics/api/ProjectController.java index 428f7bc..30fb50d 100644 --- a/src/main/java/com/ccsens/carbasics/api/ProjectController.java +++ b/src/main/java/com/ccsens/carbasics/api/ProjectController.java @@ -2,6 +2,7 @@ package com.ccsens.carbasics.api; import com.ccsens.carbasics.bean.dto.ProjectDto; import com.ccsens.carbasics.bean.vo.ProjectVo; +import com.ccsens.carbasics.service.IAsyncService; import com.ccsens.carbasics.service.IQcpProjectService; import com.ccsens.cloudutil.annotation.MustLogin; import com.ccsens.common.bean.dto.CProjectDto; @@ -37,6 +38,8 @@ public class ProjectController { private IProjectService projectService; @Resource private IQcpProjectService qcpProjectService; + @Resource + private IAsyncService asyncService; @ApiOperation(value = "根据id查询项目信息", notes = "根据id查询项目信息") @RequestMapping(value = "/findProjectById", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) @@ -61,10 +64,7 @@ public class ProjectController { @RequestMapping(value = "/switchProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse switchProject(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { log.info("切换项目：{}", params); - Set userIds = new HashSet<>(); - userIds.add(params.getUserId().toString()); - ProjectDto.SwitchProject param = params.getParam(); - SwitchoverProjectUtil.switchoverProject(userIds,param.getProjectId(), param.getUrl()); + asyncService.switchProject(params); log.info("切换项目"); return JsonResponse.newInstance().ok(); } diff --git a/src/main/java/com/ccsens/carbasics/bean/vo/OcrVo.java b/src/main/java/com/ccsens/carbasics/bean/vo/OcrVo.java index 6efebf1..36b981f 100644 --- a/src/main/java/com/ccsens/carbasics/bean/vo/OcrVo.java +++ b/src/main/java/com/ccsens/carbasics/bean/vo/OcrVo.java @@ -19,11 +19,11 @@ public class OcrVo { @ApiModelProperty("姓名") private String name; @ApiModelProperty("性别") - private byte sex; + private Byte sex; @ApiModelProperty("身份证号") private String idCardNo; @ApiModelProperty("年龄") - private int age; + private Integer age; @ApiModelProperty("民族") private String nation; diff --git a/src/main/java/com/ccsens/carbasics/service/AsyncService.java b/src/main/java/com/ccsens/carbasics/service/AsyncService.java new file mode 100644 index 0000000..dd0743c --- /dev/null +++ b/src/main/java/com/ccsens/carbasics/service/AsyncService.java @@ -0,0 +1,35 @@ +package com.ccsens.carbasics.service; + +import com.ccsens.carbasics.bean.dto.ProjectDto; +import com.ccsens.util.bean.dto.QueryDto; +import com.ccsens.util.message.SwitchoverProjectUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.HashSet; +import java.util.Set; + +/** + * @description: + * @author: whj + * @time: 2021/9/9 15:37 + */ +@Slf4j +@Service +@Async +@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) +public class AsyncService implements IAsyncService { + @Override + public void switchProject(QueryDto params) throws Exception { + log.info("开始接受切换项目"); + Thread.sleep(1000); + log.info("切换项目"); + Set userIds = new HashSet<>(); + userIds.add(params.getUserId().toString()); + ProjectDto.SwitchProject param = params.getParam(); + SwitchoverProjectUtil.switchoverProject(userIds,param.getProjectId(), param.getUrl()); + } +} diff --git a/src/main/java/com/ccsens/carbasics/service/IAsyncService.java b/src/main/java/com/ccsens/carbasics/service/IAsyncService.java new file mode 100644 index 0000000..8e0ec43 --- /dev/null +++ b/src/main/java/com/ccsens/carbasics/service/IAsyncService.java @@ -0,0 +1,11 @@ +package com.ccsens.carbasics.service; + +import com.ccsens.carbasics.bean.dto.ProjectDto; +import com.ccsens.util.bean.dto.QueryDto; + +public interface IAsyncService { + /** + * 通知TALL切换项目 + * */ + void switchProject(QueryDto params) throws Exception; +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c3b11fb..5abf242 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: test - include: common, util-test + active: prod + include: common, util-prod