Browse Source

整体修改

test
ma 4 years ago
parent
commit
30d4d3fbfb
  1. 8
      src/main/java/com/ccsens/carbasics/api/ProjectController.java
  2. 10
      src/main/java/com/ccsens/carbasics/service/IOrganizationService.java
  3. 13
      src/main/java/com/ccsens/carbasics/service/OrganizationService.java

8
src/main/java/com/ccsens/carbasics/api/ProjectController.java

@ -3,6 +3,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.IOrganizationService;
import com.ccsens.carbasics.service.IQcpProjectService;
import com.ccsens.cloudutil.annotation.MustLogin;
import com.ccsens.common.bean.dto.CProjectDto;
@ -40,11 +41,16 @@ public class ProjectController {
private IQcpProjectService qcpProjectService;
@Resource
private IAsyncService asyncService;
@Resource
private IOrganizationService organizationService;
@ApiOperation(value = "根据id查询项目信息", notes = "根据id查询项目信息")
@RequestMapping(value = "/findProjectById", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<CProjectVo.ProjectInfo> findProjectById(@ApiParam @Validated @RequestBody QueryDto<CProjectDto.ProjectById> params) throws Exception{
CProjectVo.ProjectInfo projectById = projectService.findProjectById(params.getParam(), params.getUserId());
// CProjectVo.ProjectInfo projectById = projectService.findProjectById(params.getParam(), params.getUserId());
log.info("根据id查询项目信息开始:{}",params);
CProjectVo.ProjectInfo projectById = organizationService.findProjectById(params.getParam(), params.getUserId());
log.info("根据id查询项目信息结束:{}",params);
return JsonResponse.newInstance().ok(projectById);
}

10
src/main/java/com/ccsens/carbasics/service/IOrganizationService.java

@ -2,6 +2,8 @@ package com.ccsens.carbasics.service;
import com.ccsens.carbasics.bean.dto.OrganizationDto;
import com.ccsens.carbasics.bean.vo.OrganizationVo;
import com.ccsens.common.bean.dto.CProjectDto;
import com.ccsens.common.bean.vo.CProjectVo;
import java.util.List;
@ -45,4 +47,12 @@ public interface IOrganizationService {
* @return 规则列表
*/
List<OrganizationVo.RankRule> queryRankRule(Long userId);
/**
* 根据项目id查询项目信息
* @param param 项目id(机构id)
* @param userId 用户id
* @return 项目信息
*/
CProjectVo.ProjectInfo findProjectById(CProjectDto.ProjectById param, Long userId);
}

13
src/main/java/com/ccsens/carbasics/service/OrganizationService.java

@ -9,6 +9,8 @@ import com.ccsens.carbasics.bean.vo.OrganizationVo;
import com.ccsens.carbasics.persist.dao.OrganizationDao;
import com.ccsens.carbasics.persist.mapper.OrganizationParentMapper;
import com.ccsens.carbasics.util.Constant;
import com.ccsens.common.bean.dto.CProjectDto;
import com.ccsens.common.bean.vo.CProjectVo;
import com.ccsens.util.WebConstant;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@ -183,4 +185,15 @@ public class OrganizationService implements IOrganizationService {
public List<OrganizationVo.RankRule> queryRankRule(Long userId) {
return new ArrayList<>(Constant.RANK_RULE);
}
@Override
public CProjectVo.ProjectInfo findProjectById(CProjectDto.ProjectById param, Long userId) {
CProjectVo.ProjectInfo projectInfo = new CProjectVo.ProjectInfo();
Organization organization = organizationDao.selectByPrimaryKey(param.getProjectId());
projectInfo.setId(organization.getId());
projectInfo.setName(organization.getName());
return projectInfo;
}
}

Loading…
Cancel
Save