zhizhi wu 4 years ago
parent
commit
143ff00a7c
  1. 1
      src/main/java/com/ccsens/carbasics/api/OrganizationController.java
  2. 8
      src/main/java/com/ccsens/carbasics/api/ProjectController.java
  3. 4
      src/main/java/com/ccsens/carbasics/bean/vo/OcrVo.java
  4. 35
      src/main/java/com/ccsens/carbasics/service/AsyncService.java
  5. 11
      src/main/java/com/ccsens/carbasics/service/IAsyncService.java
  6. 4
      src/main/resources/application.yml

1
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:

8
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<ProjectDto.SwitchProject> params) throws Exception {
log.info("切换项目:{}", params);
Set<String> 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();
}

4
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;

35
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<ProjectDto.SwitchProject> params) throws Exception {
log.info("开始接受切换项目");
Thread.sleep(1000);
log.info("切换项目");
Set<String> userIds = new HashSet<>();
userIds.add(params.getUserId().toString());
ProjectDto.SwitchProject param = params.getParam();
SwitchoverProjectUtil.switchoverProject(userIds,param.getProjectId(), param.getUrl());
}
}

11
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<ProjectDto.SwitchProject> params) throws Exception;
}

4
src/main/resources/application.yml

@ -1,4 +1,4 @@
spring:
profiles:
active: test
include: common, util-test
active: prod
include: common, util-prod

Loading…
Cancel
Save