Commit 59914395 authored by 韩桐桐's avatar 韩桐桐

feat(tcm):1,新增接口,从redis获取当前登录用户单位类型获取,避免多角色的单位获取到多个单位类型

parent c1e2758f
...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tcm.api.service; ...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tcm.api.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.tcm.api.dto.GroupAndPersonInfoDto; import com.yeejoin.amos.boot.module.tcm.api.dto.GroupAndPersonInfoDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.TzIndividualityDto; import com.yeejoin.amos.boot.module.tcm.api.dto.TzIndividualityDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.TzsEquipListDto; import com.yeejoin.amos.boot.module.tcm.api.dto.TzsEquipListDto;
...@@ -35,6 +36,8 @@ public interface ITzsUserInfoService extends IService<TzsUserInfo> { ...@@ -35,6 +36,8 @@ public interface ITzsUserInfoService extends IService<TzsUserInfo> {
Map<String,Object> getCompanyType(); Map<String,Object> getCompanyType();
Map<String,Object> getCompanyTypeForRedis(ReginParams selectedOrgInfo);
Page<TzsEquipListDto> getEquipList(String type,String userSeq,TzsEquipListDto dto, Page<TzsEquipListDto> page); Page<TzsEquipListDto> getEquipList(String type,String userSeq,TzsEquipListDto dto, Page<TzsEquipListDto> page);
Boolean equipBind(String type, String userSeq, String creditCode, Map<String,Object> map); Boolean equipBind(String type, String userSeq, String creditCode, Map<String,Object> map);
......
...@@ -181,6 +181,14 @@ public class TzsUserInfoController extends BaseController { ...@@ -181,6 +181,14 @@ public class TzsUserInfoController extends BaseController {
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getCompanyTypeForRedis")
@ApiOperation(httpMethod = "GET", value = "从redis获取当前登录用户单位类型获取,避免多角色的单位获取到多个单位类型", notes = "从redis获取当前登录用户单位类型获取,避免多角色的单位获取到多个单位类型")
public ResponseModel<Map<String, Object>> getCompanyTypeForRedis() {
ReginParams selectedOrgInfo = getSelectedOrgInfo();
return ResponseHelper.buildResponse(tzsUserInfoService.getCompanyTypeForRedis(selectedOrgInfo));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getUserType") @GetMapping(value = "/getUserType")
@ApiOperation(httpMethod = "GET", value = "根据单位类型获取人员类型", notes = "根据单位类型获取人员类型") @ApiOperation(httpMethod = "GET", value = "根据单位类型获取人员类型", notes = "根据单位类型获取人员类型")
public ResponseModel<List<Map<String, Object>>> getUserType(@RequestParam(value = "unitType") String unitType) { public ResponseModel<List<Map<String, Object>>> getUserType(@RequestParam(value = "unitType") String unitType) {
......
...@@ -477,6 +477,50 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI ...@@ -477,6 +477,50 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
} }
@Override @Override
public Map<String, Object> getCompanyTypeForRedis(ReginParams selectedOrgInfo) {
Map<String, Object> result = new HashMap<>();
result.put("companyType", null);
CompanyBo company = selectedOrgInfo.getCompany();
if (ObjectUtils.isEmpty(company)) {
return result;
}
result.put("creditCode", company.getCompanyCode());
boolean productCompany = false;
boolean useCompany = false;
boolean installCompany = false;
boolean inspectionCompany = false;
String companyType = company.getCompanyType();
if (companyType.contains("使用单位") || companyType.contains("个人主体")) {
useCompany = true;
}
if (companyType.contains("充装单位") || companyType.contains("安装改造维修单位") || companyType.contains("制造单位") || companyType.contains("设计单位")) {
productCompany = true;
}
if (companyType.contains("安装改造维修单位")) {
installCompany = true;
}
if (companyType.contains("检验检测机构")) {
inspectionCompany = true;
}
StringBuilder companyTypeStr = new StringBuilder();
if (useCompany) {
companyTypeStr.append("use-");
}
if (productCompany) {
companyTypeStr.append("pro-");
}
if (installCompany) {
companyTypeStr.append("install-");
}
if (inspectionCompany) {
companyTypeStr.append("inspection");
}
result.put("companyType", companyTypeStr);
return result;
}
@Override
public Page<TzsEquipListDto> getEquipList(String type, String userSeq, TzsEquipListDto dto, Page<TzsEquipListDto> page) { public Page<TzsEquipListDto> getEquipList(String type, String userSeq, TzsEquipListDto dto, Page<TzsEquipListDto> page) {
List<CompanyModel> companyModels = FeignUtil.remoteCall(() -> Privilege.companyClient.queryListByChild(RequestContext.getExeUserId())); List<CompanyModel> companyModels = FeignUtil.remoteCall(() -> Privilege.companyClient.queryListByChild(RequestContext.getExeUserId()));
if (companyModels.isEmpty()) { if (companyModels.isEmpty()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment