Skip to content

A
amos-boot-zx-biz
Commit a13e95b9 authored by wujiang's avatar wujiang
Browse files
Options

修改安全上传

parent b73bc0b7
Show whitespace changes
Inline Side-by-side
Showing with 327 additions and 308 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UnitInfoController.java
View file @ a13e95b9
...@@ -48,6 +48,8 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel; ...@@ -48,6 +48,8 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.io.File; import java.io.File;
import java.util.*; import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/** /**
* 经销商人员信息 * 经销商人员信息
...@@ -77,7 +79,6 @@ public class UnitInfoController extends BaseController { ...@@ -77,7 +79,6 @@ public class UnitInfoController extends BaseController {
@Value("${dealer.group}") @Value("${dealer.group}")
private Long group; private Long group;
@Autowired @Autowired
RegionalCompaniesMapper regionalCompaniesMapper; RegionalCompaniesMapper regionalCompaniesMapper;
...@@ -102,7 +103,10 @@ public class UnitInfoController extends BaseController { ...@@ -102,7 +103,10 @@ public class UnitInfoController extends BaseController {
/** /**
* 验证码过期时间 * 验证码过期时间
*/ */
private long time = 180L; private long time = 60L;
// 常见的手机号正则表达式（以中国大陆手机号为例）
private static final String PHONE_NUMBER_REGEX = "^1[3-9]\\d{9}$";
/** /**
* 根据sequenceNbr更新 * 根据sequenceNbr更新
...@@ -113,7 +117,8 @@ public class UnitInfoController extends BaseController { ...@@ -113,7 +117,8 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}") @PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新经销商人员信息", notes = "根据sequenceNbr更新经销商人员信息") @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新经销商人员信息", notes = "根据sequenceNbr更新经销商人员信息")
public ResponseModel<UnitInfoDto> updateBySequenceNbrUnitInfo(@RequestBody UnitInfoDto model,@ApiParam(value = "主键", example = "1706869110685569025")@PathVariable(value = "sequenceNbr") Long sequenceNbr) { public ResponseModel<UnitInfoDto> updateBySequenceNbrUnitInfo(@RequestBody UnitInfoDto model,
@ApiParam(value = "主键", example = "1706869110685569025") @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr); model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(unitInfoServiceImpl.updateWithModel(model)); return ResponseHelper.buildResponse(unitInfoServiceImpl.updateWithModel(model));
} }
...@@ -127,7 +132,8 @@ public class UnitInfoController extends BaseController { ...@@ -127,7 +132,8 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}") @DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除经销商人员信息", notes = "根据sequenceNbr删除经销商人员信息") @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除经销商人员信息", notes = "根据sequenceNbr删除经销商人员信息")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,@ApiParam(value = "主键", example = "1706869110685569025") @PathVariable(value = "sequenceNbr") Long sequenceNbr){ public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,
@ApiParam(value = "主键", example = "1706869110685569025") @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(unitInfoServiceImpl.removeById(sequenceNbr)); return ResponseHelper.buildResponse(unitInfoServiceImpl.removeById(sequenceNbr));
} }
...@@ -139,25 +145,27 @@ public class UnitInfoController extends BaseController { ...@@ -139,25 +145,27 @@ public class UnitInfoController extends BaseController {
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}") @GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个经销商人员信息", notes = "根据sequenceNbr查询单个经销商人员信息") @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个经销商人员信息", notes = "根据sequenceNbr查询单个经销商人员信息")
public ResponseModel<UnitInfoDto> selectOne(@ApiParam(value = "主键", example = "1706869110685569025")@PathVariable Long sequenceNbr) { public ResponseModel<UnitInfoDto> selectOne(
@ApiParam(value = "主键", example = "1706869110685569025") @PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(unitInfoServiceImpl.queryBySeq(sequenceNbr)); return ResponseHelper.buildResponse(unitInfoServiceImpl.queryBySeq(sequenceNbr));
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getOne/{sequenceNbr}") @GetMapping(value = "/getOne/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个经销商人员信息", notes = "根据sequenceNbr查询单个经销商人员信息") @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个经销商人员信息", notes = "根据sequenceNbr查询单个经销商人员信息")
public ResponseModel<UnitInfoData> getOne(@ApiParam(value = "主键", example = "1706869110685569025")@PathVariable String sequenceNbr) { public ResponseModel<UnitInfoData> getOne(
@ApiParam(value = "主键", example = "1706869110685569025") @PathVariable String sequenceNbr) {
UnitInfo unitInfo= unitInfoServiceImpl.getById(sequenceNbr); UnitInfo unitInfo = unitInfoServiceImpl.getById(sequenceNbr);
unitInfo.setHeadCardPhotoBackList(toCommonFile(unitInfo.getHeadCardPhotoBack())); unitInfo.setHeadCardPhotoBackList(toCommonFile(unitInfo.getHeadCardPhotoBack()));
unitInfo.setHeadCardPhotoFrontList(toCommonFile(unitInfo.getHeadCardPhotoFront())); unitInfo.setHeadCardPhotoFrontList(toCommonFile(unitInfo.getHeadCardPhotoFront()));
CommerceInfo commerceInfo= commerceInfoMapper.selectOne(new QueryWrapper<CommerceInfo>().eq("unit_seq", sequenceNbr)); CommerceInfo commerceInfo = commerceInfoMapper
.selectOne(new QueryWrapper<CommerceInfo>().eq("unit_seq", sequenceNbr));
commerceInfo.setLegalPersonCardPhotoBackList(toCommonFile(commerceInfo.getLegalPersonCardPhotoBack())); commerceInfo.setLegalPersonCardPhotoBackList(toCommonFile(commerceInfo.getLegalPersonCardPhotoBack()));
commerceInfo.setBusinessLicensePhotoList(toCommonFile(commerceInfo.getBusinessLicensePhoto())); commerceInfo.setBusinessLicensePhotoList(toCommonFile(commerceInfo.getBusinessLicensePhoto()));
commerceInfo.setLegalPersonCardPhotoFrontList(toCommonFile(commerceInfo.getLegalPersonCardPhotoFront())); commerceInfo.setLegalPersonCardPhotoFrontList(toCommonFile(commerceInfo.getLegalPersonCardPhotoFront()));
UnitInfoData unitInfoData=new UnitInfoData(unitInfo, unitInfo, commerceInfo); UnitInfoData unitInfoData = new UnitInfoData(unitInfo, unitInfo, commerceInfo);
return ResponseHelper.buildResponse(unitInfoData); return ResponseHelper.buildResponse(unitInfoData);
} }
...@@ -170,40 +178,38 @@ public class UnitInfoController extends BaseController { ...@@ -170,40 +178,38 @@ public class UnitInfoController extends BaseController {
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page") @GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "经销商人员信息分页查询", notes = "经销商人员信息分页查询") @ApiOperation(httpMethod = "GET", value = "经销商人员信息分页查询", notes = "经销商人员信息分页查询")
public ResponseModel<Page<UnitInfoDto>> queryForPage(@ApiParam(value = "页码", example = "1")@RequestParam(value = "current") int current,@ApiParam(value = "页数大小", example = "20")@RequestParam public ResponseModel<Page<UnitInfoDto>> queryForPage(
(value = "size") int size) { @ApiParam(value = "页码", example = "1") @RequestParam(value = "current") int current,
@ApiParam(value = "页数大小", example = "20") @RequestParam(value = "size") int size) {
Page<UnitInfoDto> page = new Page<UnitInfoDto>(); Page<UnitInfoDto> page = new Page<UnitInfoDto>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
return ResponseHelper.buildResponse(unitInfoServiceImpl.queryForUnitInfoPage(page)); return ResponseHelper.buildResponse(unitInfoServiceImpl.queryForUnitInfoPage(page));
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/queryForDealerReviewPage") @GetMapping(value = "/queryForDealerReviewPage")
@ApiOperation(httpMethod = "GET",value = "经销商人员信息分页查询", notes = "经销商人员信息分页查询") @ApiOperation(httpMethod = "GET", value = "经销商人员信息分页查询", notes = "经销商人员信息分页查询")
public ResponseModel<Page<ReviewDto>> queryForDealerReviewPage(@ApiParam(value = "页码", example = "1")@RequestParam(value = "current") int current, @ApiParam(value = "页数大小", example = "20")@RequestParam public ResponseModel<Page<ReviewDto>> queryForDealerReviewPage(
(value = "size") int size, ReviewDto reviewDto) { @ApiParam(value = "页码", example = "1") @RequestParam(value = "current") int current,
Page<ReviewDto> page=dealerReviewServiceImpl.queryForDealerReviewPage(current,size,reviewDto); @ApiParam(value = "页数大小", example = "20") @RequestParam(value = "size") int size, ReviewDto reviewDto) {
Page<ReviewDto> page = dealerReviewServiceImpl.queryForDealerReviewPage(current, size, reviewDto);
return ResponseHelper.buildResponse(page); return ResponseHelper.buildResponse(page);
} }
/** /**
* 列表全部数据查询 * 列表全部数据查询
* *
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "经销商人员信息列表全部数据查询", notes = "经销商人员信息列表全部数据查询") @ApiOperation(httpMethod = "GET", value = "经销商人员信息列表全部数据查询", notes = "经销商人员信息列表全部数据查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public ResponseModel<List<UnitInfoDto>> selectForList() { public ResponseModel<List<UnitInfoDto>> selectForList() {
return ResponseHelper.buildResponse(unitInfoServiceImpl.queryForUnitInfoList()); return ResponseHelper.buildResponse(unitInfoServiceImpl.queryForUnitInfoList());
} }
/** /**
* 管理员身份证图片上传 无token * 管理员身份证图片上传 无token
* *
...@@ -212,20 +218,25 @@ public class UnitInfoController extends BaseController { ...@@ -212,20 +218,25 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@PostMapping(value = "/uploadFile") @PostMapping(value = "/uploadFile")
@ApiOperation(httpMethod = "POST", value = "管理员身份证图片上传 无token", notes = "管理员身份证图片上传 无token") @ApiOperation(httpMethod = "POST", value = "管理员身份证图片上传 无token", notes = "管理员身份证图片上传 无token")
public ResponseModel<String> uploadFile(@ApiParam(value = "文件", required = true)@RequestParam MultipartFile file) { public ResponseModel<String> uploadFile(@ApiParam(value = "文件", required = true) @RequestParam MultipartFile file) {
if (ValidationUtil.isEmpty(file)){ if (ValidationUtil.isEmpty(file)) {
throw new BadRequest("参数校验失败."); throw new BadRequest("参数校验失败.");
} }
/// List<String> NOT_ALLOWED_TYPES =Arrays.asList("text/html");
// 只支持图片类型
if (file.getContentType() == null || !file.getContentType().startsWith("image/")) {
throw new BadRequest("只支持图片类型上传");
}
RequestContext.setAppKey("AMOS_STUDIO"); RequestContext.setAppKey("AMOS_STUDIO");
RequestContext.setProduct("AMOS_STUDIO_WEB"); RequestContext.setProduct("AMOS_STUDIO_WEB");
RequestContext.setToken(requestContext.getToken()); RequestContext.setToken(requestContext.getToken());
FeignClientResult<Map<String, String>> date = Systemctl.fileStorageClient.updateCommonFile(file); FeignClientResult<Map<String, String>> date = Systemctl.fileStorageClient.updateCommonFile(file);
String urlString=""; String urlString = "";
if (date != null) { if (date != null) {
Map<String, String> map = date.getResult(); Map<String, String> map = date.getResult();
Iterator<String> it = map.keySet().iterator(); Iterator<String> it = map.keySet().iterator();
while (it.hasNext()) { while (it.hasNext()) {
urlString=it.next(); urlString = it.next();
} }
} }
return ResponseHelper.buildResponse(urlString); return ResponseHelper.buildResponse(urlString);
...@@ -233,6 +244,7 @@ public class UnitInfoController extends BaseController { ...@@ -233,6 +244,7 @@ public class UnitInfoController extends BaseController {
/** /**
* 获取组织机构树 * 获取组织机构树
*
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
...@@ -248,14 +260,16 @@ public class UnitInfoController extends BaseController { ...@@ -248,14 +260,16 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@GetMapping(value = "/management-unit/tree") @GetMapping(value = "/management-unit/tree")
@ApiOperation(httpMethod = "GET", value = "管辖机构树", notes = "管辖机构树") @ApiOperation(httpMethod = "GET", value = "管辖机构树", notes = "管辖机构树")
public ResponseModel<Collection<CompanyModel>> managementUnitTree(@ApiParam(value = "区域Code", example = "86*355*443*479")@RequestParam(required = false)String orgCode) { public ResponseModel<Collection<CompanyModel>> managementUnitTree(
@ApiParam(value = "区域Code", example = "86*355*443*479") @RequestParam(required = false) String orgCode) {
RequestContext.setAppKey("AMOS_STUDIO"); RequestContext.setAppKey("AMOS_STUDIO");
RequestContext.setProduct("AMOS_STUDIO_WEB"); RequestContext.setProduct("AMOS_STUDIO_WEB");
RequestContext.setToken(requestContext.getToken()); RequestContext.setToken(requestContext.getToken());
FeignClientResult<Collection<CompanyModel>> feignClientResult= Privilege.companyClient.querySubAgencyTree(regionalCompanies); FeignClientResult<Collection<CompanyModel>> feignClientResult = Privilege.companyClient
.querySubAgencyTree(regionalCompanies);
Collection<CompanyModel> companyModel = (List<CompanyModel>)feignClientResult.getResult(); Collection<CompanyModel> companyModel = (List<CompanyModel>) feignClientResult.getResult();
return ResponseHelper.buildResponse(companyModel); return ResponseHelper.buildResponse(companyModel);
} }
...@@ -266,45 +280,44 @@ public class UnitInfoController extends BaseController { ...@@ -266,45 +280,44 @@ public class UnitInfoController extends BaseController {
public ResponseModel<UnitRegisterDto> save(@RequestBody UnitRegisterDto model) { public ResponseModel<UnitRegisterDto> save(@RequestBody UnitRegisterDto model) {
try { try {
//判断公司名称重复， // 判断公司名称重复，
LambdaQueryWrapper<UnitInfo> qudg=new LambdaQueryWrapper<>(); LambdaQueryWrapper<UnitInfo> qudg = new LambdaQueryWrapper<>();
qudg.eq(UnitInfo::getName,model.getUnitInfoDto().getName()); qudg.eq(UnitInfo::getName, model.getUnitInfoDto().getName());
qudg.eq(UnitInfo::getIsDelete,0); qudg.eq(UnitInfo::getIsDelete, 0);
qudg.ne(UnitInfo::getAuditStatus,3); qudg.ne(UnitInfo::getAuditStatus, 3);
List<UnitInfo> unitInfo= unitInfoMapper.selectList(qudg); List<UnitInfo> unitInfo = unitInfoMapper.selectList(qudg);
if(unitInfo!=null&&!unitInfo.isEmpty()){ if (unitInfo != null && !unitInfo.isEmpty()) {
throw new BadRequest("公司名称重复"); throw new BadRequest("公司名称重复");
} }
//判断公司统一信息用代码重复 // 判断公司统一信息用代码重复
List<CommerceInfo> commerceInfo= commerceInfoMapper.selectListby( model.getCommerceInfoDto().getCreditCode()); List<CommerceInfo> commerceInfo = commerceInfoMapper
if(commerceInfo!=null&&!commerceInfo.isEmpty()){ .selectListby(model.getCommerceInfoDto().getCreditCode());
if (commerceInfo != null && !commerceInfo.isEmpty()) {
throw new BadRequest("统一信用代码重复"); throw new BadRequest("统一信用代码重复");
} }
//用户名重复 // 用户名重复
LambdaQueryWrapper<UnitInfo> qudg1=new LambdaQueryWrapper<>(); LambdaQueryWrapper<UnitInfo> qudg1 = new LambdaQueryWrapper<>();
qudg1.eq(UnitInfo::getAdminLoginName,model.getUnitInfoDto().getAdminLoginName()); qudg1.eq(UnitInfo::getAdminLoginName, model.getUnitInfoDto().getAdminLoginName());
qudg1.eq(UnitInfo::getIsDelete,0); qudg1.eq(UnitInfo::getIsDelete, 0);
qudg1.ne(UnitInfo::getAuditStatus,3); qudg1.ne(UnitInfo::getAuditStatus, 3);
List<UnitInfo> unitInfo1= unitInfoMapper.selectList(qudg1); List<UnitInfo> unitInfo1 = unitInfoMapper.selectList(qudg1);
if(unitInfo1!=null&&!unitInfo1.isEmpty()){ if (unitInfo1 != null && !unitInfo1.isEmpty()) {
throw new BadRequest("管理员账户名重复,请更换"); throw new BadRequest("管理员账户名重复,请更换");
} }
LambdaQueryWrapper<PublicAgencyUser> qud2=new LambdaQueryWrapper<>(); LambdaQueryWrapper<PublicAgencyUser> qud2 = new LambdaQueryWrapper<>();
qud2.eq(PublicAgencyUser::getAmosUserName,model.getUnitInfoDto().getAdminLoginName()); qud2.eq(PublicAgencyUser::getAmosUserName, model.getUnitInfoDto().getAdminLoginName());
List<PublicAgencyUser> publicAgencyUse= publicAgencyUserMapper.selectList(qud2); List<PublicAgencyUser> publicAgencyUse = publicAgencyUserMapper.selectList(qud2);
if(publicAgencyUse!=null&&!publicAgencyUse.isEmpty()){ if (publicAgencyUse != null && !publicAgencyUse.isEmpty()) {
throw new BadRequest("管理员账户名重复,请更换"); throw new BadRequest("管理员账户名重复,请更换");
} }
RequestContext.setAppKey("AMOS_STUDIO"); RequestContext.setAppKey("AMOS_STUDIO");
RequestContext.setProduct("AMOS_STUDIO_WEB"); RequestContext.setProduct("AMOS_STUDIO_WEB");
RequestContext.setToken(requestContext.getToken()); RequestContext.setToken(requestContext.getToken());
...@@ -312,7 +325,8 @@ public class UnitInfoController extends BaseController { ...@@ -312,7 +325,8 @@ public class UnitInfoController extends BaseController {
return ResponseHelper.buildResponse(model); return ResponseHelper.buildResponse(model);
} catch (Exception e) { } catch (Exception e) {
ResponseModel<UnitRegisterDto> response = new ResponseModel<>(); ResponseModel<UnitRegisterDto> response = new ResponseModel<>();
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
.getRequest();
response.setResult(null); response.setResult(null);
response.setDevMessage(e.getMessage()); response.setDevMessage(e.getMessage());
response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value()); response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
...@@ -323,17 +337,15 @@ public class UnitInfoController extends BaseController { ...@@ -323,17 +337,15 @@ public class UnitInfoController extends BaseController {
} }
public List<CommonFile> toCommonFile(String url){ public List<CommonFile> toCommonFile(String url) {
List<CommonFile> list=new ArrayList<>(); List<CommonFile> list = new ArrayList<>();
CommonFile commonFile=new CommonFile(url, url.substring(url.lastIndexOf(File.separator)+1), UUID.randomUUID().toString(), "done"); CommonFile commonFile = new CommonFile(url, url.substring(url.lastIndexOf(File.separator) + 1),
UUID.randomUUID().toString(), "done");
list.add(commonFile); list.add(commonFile);
return list; return list;
} }
/** /**
* 判断用户名是否存在 * 判断用户名是否存在
* *
...@@ -342,7 +354,8 @@ public class UnitInfoController extends BaseController { ...@@ -342,7 +354,8 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@GetMapping(value = "/hasExistUserName/{userName}") @GetMapping(value = "/hasExistUserName/{userName}")
@ApiOperation(httpMethod = "GET", value = "判断用户名是否存在", notes = "判断用户名是否存在") @ApiOperation(httpMethod = "GET", value = "判断用户名是否存在", notes = "判断用户名是否存在")
public ResponseModel hasExistUserName( @ApiParam(value = "用户名", example = "admin")@PathVariable(value = "userName") String userName) { public ResponseModel hasExistUserName(
@ApiParam(value = "用户名", example = "admin") @PathVariable(value = "userName") String userName) {
try { try {
return CommonResponseNewUtil.success(unitInfoServiceImpl.hasExistPhoneOrUserName(null, userName)); return CommonResponseNewUtil.success(unitInfoServiceImpl.hasExistPhoneOrUserName(null, userName));
} catch (Exception e) { } catch (Exception e) {
...@@ -350,8 +363,6 @@ public class UnitInfoController extends BaseController { ...@@ -350,8 +363,6 @@ public class UnitInfoController extends BaseController {
} }
} }
/** /**
* 判断用户号码是否存在 * 判断用户号码是否存在
* *
...@@ -360,7 +371,8 @@ public class UnitInfoController extends BaseController { ...@@ -360,7 +371,8 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@GetMapping(value = "/hasExistPhone/{phone}") @GetMapping(value = "/hasExistPhone/{phone}")
@ApiOperation(httpMethod = "GET", value = "判断用户号码是否存在", notes = "判断用户号码是否存在") @ApiOperation(httpMethod = "GET", value = "判断用户号码是否存在", notes = "判断用户号码是否存在")
public ResponseModel hasExistPhone(@ApiParam(value = "手机号", example = "15895233587") @PathVariable(value = "phone") String phone) { public ResponseModel hasExistPhone(
@ApiParam(value = "手机号", example = "15895233587") @PathVariable(value = "phone") String phone) {
try { try {
return CommonResponseNewUtil.success(unitInfoServiceImpl.hasExistPhoneOrUserName(phone, null)); return CommonResponseNewUtil.success(unitInfoServiceImpl.hasExistPhoneOrUserName(phone, null));
} catch (Exception e) { } catch (Exception e) {
...@@ -376,25 +388,34 @@ public class UnitInfoController extends BaseController { ...@@ -376,25 +388,34 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@GetMapping(value = "/sendTelCode/{tel}") @GetMapping(value = "/sendTelCode/{tel}")
@ApiOperation(httpMethod = "GET", value = "发送手机号验证码", notes = "发送手机号验证码") @ApiOperation(httpMethod = "GET", value = "发送手机号验证码", notes = "发送手机号验证码")
public ResponseModel<Boolean> sendTelCode(@ApiParam(value = "手机号", example = "15895233587")@PathVariable(value = "tel") String tel, public ResponseModel<Boolean> sendTelCode(
@ApiParam(value = "手机号", example = "15895233587") @PathVariable(value = "tel") String tel,
@ApiParam(value = "类型", example = "1") @RequestParam(value = "type", required = false) String type) { @ApiParam(value = "类型", example = "1") @RequestParam(value = "type", required = false) String type) {
if (ValidationUtil.isEmpty(tel)) { if (ValidationUtil.isEmpty(tel)) {
throw new BadRequest("参数校验失败."); throw new BadRequest("参数校验失败");
}
Pattern pattern = Pattern.compile(PHONE_NUMBER_REGEX);
Matcher matcher = pattern.matcher(tel);
if (!matcher.matches()) {
throw new BadRequest("请输入单个正确手机号");
}
String key = HYGF_USER_TEL + tel;
if (redisUtil.get(key) != null) {
throw new BadRequest("请稍后再试");
} }
Boolean flag = true; Boolean flag = true;
HashMap<String, String> params = new HashMap<>(3); HashMap<String, String> params = new HashMap<>(3);
String code = this.getRandomCode(); String code = this.getRandomCode();
params.put("code",code); params.put("code", code);
params.put("mobile",tel); params.put("mobile", tel);
params.put("smsCode", smsTempCode); params.put("smsCode", smsTempCode);
try { try {
// sendSmsCode.sendSmsCode(tel, s); // sendSmsCode.sendSmsCode(tel, s);
Systemctl.smsClient.sendCommonSms(params).getResult(); Systemctl.smsClient.sendCommonSms(params).getResult();
// code 保存到缓存中 // code 保存到缓存中
redisUtil.set(HYGF_USER_TEL + tel, code, time); redisUtil.set(key, code, time);
} catch (Exception e) { } catch (Exception e) {
throw new BadRequest("发送短信失败：" + e.getMessage()); throw new BadRequest("发送短信失败：" + e.getMessage());
} }
return ResponseHelper.buildResponse(flag); return ResponseHelper.buildResponse(flag);
...@@ -408,28 +429,29 @@ public class UnitInfoController extends BaseController { ...@@ -408,28 +429,29 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@GetMapping(value = "/verifyTelCode/{tel}/{code}") @GetMapping(value = "/verifyTelCode/{tel}/{code}")
@ApiOperation(httpMethod = "GET", value = "验证手机号验证码是否成功", notes = "验证手机号验证码是否成功") @ApiOperation(httpMethod = "GET", value = "验证手机号验证码是否成功", notes = "验证手机号验证码是否成功")
public ResponseModel<Boolean> verifyTelCode(@ApiParam(value = "手机号", example = "15895233587")@PathVariable(value = "tel") String adminTel, public ResponseModel<Boolean> verifyTelCode(
@ApiParam(value = "验证码", example = "258546")@PathVariable(value = "code") String code) { @ApiParam(value = "手机号", example = "15895233587") @PathVariable(value = "tel") String adminTel,
@ApiParam(value = "验证码", example = "258546") @PathVariable(value = "code") String code) {
Boolean flag = false; Boolean flag = false;
if (ValidationUtil.isEmpty(adminTel) || ValidationUtil.isEmpty(code)) { if (ValidationUtil.isEmpty(adminTel) || ValidationUtil.isEmpty(code)) {
throw new BadRequest("参数校验失败."); throw new BadRequest("参数校验失败.");
} }
if(redisUtil.hasKey(HYGF_USER_TEL + adminTel)) { if (redisUtil.hasKey(HYGF_USER_TEL + adminTel)) {
String redisCode = redisUtil.get(HYGF_USER_TEL + adminTel).toString(); String redisCode = redisUtil.get(HYGF_USER_TEL + adminTel).toString();
if(code.equals(redisCode)) { if (code.equals(redisCode)) {
flag = true; flag = true;
} }
} }
return ResponseHelper.buildResponse(flag); return ResponseHelper.buildResponse(flag);
} }
private String getRandomCode(){ private String getRandomCode() {
String code = ""; String code = "";
Random random = new Random(); Random random = new Random();
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
int r = random.nextInt(10); int r = random.nextInt(10);
if(r==0){ if (r == 0) {
r=1; r = 1;
} }
code = code + r; code = code + r;
} }
...@@ -437,103 +459,98 @@ public class UnitInfoController extends BaseController { ...@@ -437,103 +459,98 @@ public class UnitInfoController extends BaseController {
} }
/** /**
* 列表全部数据查询 * 列表全部数据查询
* *
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST",value = "经销商审核", notes = "经销商审核") @ApiOperation(httpMethod = "POST", value = "经销商审核", notes = "经销商审核")
@PostMapping(value = "/powerStationExamine") @PostMapping(value = "/powerStationExamine")
public ResponseModel<String> powerStationExamine(@ApiParam(value = "分页Id", example = "1706974721737756674")@RequestParam(value = "pageId") long pageId, public ResponseModel<String> powerStationExamine(
@ApiParam(value = "分页Id", example = "1706974721737756674") @RequestParam(value = "pageId") long pageId,
@ApiParam(value = "节点Code", example = "1") @RequestParam(value = "nodeCode") String nodeCode, @ApiParam(value = "节点Code", example = "1") @RequestParam(value = "nodeCode") String nodeCode,
@ApiParam(value = "场站Id", example = "1711627029541031938") @RequestParam(value = "stationId") String stationId, @ApiParam(value = "场站Id", example = "1711627029541031938") @RequestParam(value = "stationId") String stationId,
@ApiParam(value = "任务Id", example = "1712383951215005697") @RequestParam(value = "taskId") String taskId, @ApiParam(value = "任务Id", example = "1712383951215005697") @RequestParam(value = "taskId") String taskId,
@ApiParam(value = "计划实例Id", example = "64ddb490-7261-11ef-b7e1-02420a1c0012") @RequestParam(value = "planInstanceId") String planInstanceId, @ApiParam(value = "计划实例Id", example = "64ddb490-7261-11ef-b7e1-02420a1c0012") @RequestParam(value = "planInstanceId") String planInstanceId,
@RequestBody Map<String, Object> kv) { @RequestBody Map<String, Object> kv) {
return ResponseHelper.buildResponse(unitInfoServiceImpl.powerStationExamine(pageId, nodeCode, stationId, taskId, planInstanceId, kv)); return ResponseHelper.buildResponse(
unitInfoServiceImpl.powerStationExamine(pageId, nodeCode, stationId, taskId, planInstanceId, kv));
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "经销商人员加入黑名单/撤销黑名单", notes = "经销商人员加入黑名单/撤销黑名单") @ApiOperation(httpMethod = "GET", value = "经销商人员加入黑名单/撤销黑名单", notes = "经销商人员加入黑名单/撤销黑名单")
@GetMapping(value = "/updateUser") @GetMapping(value = "/updateUser")
public ResponseModel<Object> updateUser(@ApiParam(value = "管理员用户Id", example = "8121589")String adminUserId , public ResponseModel<Object> updateUser(@ApiParam(value = "管理员用户Id", example = "8121589") String adminUserId,
@ApiParam(value = "主键", example = "1813102468876234754")String sequenceNbr , @ApiParam(value = "主键", example = "1813102468876234754") String sequenceNbr,
@ApiParam(value = "类型", example = "1")String type) { @ApiParam(value = "类型", example = "1") String type) {
FeignClientResult<List<String>> userResult =null; FeignClientResult<List<String>> userResult = null;
UnitInfo unitInfo= unitInfoServiceImpl.getById(sequenceNbr); UnitInfo unitInfo = unitInfoServiceImpl.getById(sequenceNbr);
if("LOCK".equals(type)){ if ("LOCK".equals(type)) {
userResult = Privilege.agencyUserClient.lockUsers(adminUserId); userResult = Privilege.agencyUserClient.lockUsers(adminUserId);
unitInfo.setBlacklist(1); unitInfo.setBlacklist(1);
}else{ } else {
userResult = Privilege.agencyUserClient.unlockUsers(adminUserId); userResult = Privilege.agencyUserClient.unlockUsers(adminUserId);
unitInfo.setBlacklist(0); unitInfo.setBlacklist(0);
} }
return ResponseHelper.buildResponse(unitInfoServiceImpl.updateById(unitInfo)); return ResponseHelper.buildResponse(unitInfoServiceImpl.updateById(unitInfo));
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "获取经销商单位", notes = "获取经销商单位") @ApiOperation(httpMethod = "GET", value = "获取经销商单位", notes = "获取经销商单位")
@GetMapping(value = "/getUnit") @GetMapping(value = "/getUnit")
public ResponseModel< List<UnitInfo>> getUnit(@ApiParam(value = "经销商公司", example = "1702216914824097794") @RequestParam(required = false)String amosCompanySeq) { public ResponseModel<List<UnitInfo>> getUnit(
@ApiParam(value = "经销商公司", example = "1702216914824097794") @RequestParam(required = false) String amosCompanySeq) {
LambdaQueryWrapper<UnitInfo> unitInfoque=new LambdaQueryWrapper<>(); LambdaQueryWrapper<UnitInfo> unitInfoque = new LambdaQueryWrapper<>();
unitInfoque.eq(!ValidationUtil.isEmpty(amosCompanySeq),UnitInfo::getAmosCompanySeq,amosCompanySeq); unitInfoque.eq(!ValidationUtil.isEmpty(amosCompanySeq), UnitInfo::getAmosCompanySeq, amosCompanySeq);
unitInfoque.eq(UnitInfo::getAuditStatus,2); unitInfoque.eq(UnitInfo::getAuditStatus, 2);
List<UnitInfo> list=unitInfoMapper.selectList(unitInfoque); List<UnitInfo> list = unitInfoMapper.selectList(unitInfoque);
return ResponseHelper.buildResponse(list); return ResponseHelper.buildResponse(list);
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getUnitDataDto") @GetMapping(value = "/getUnitDataDto")
@ApiOperation(httpMethod = "GET", value = "获取组织机构树", notes = "获取组织机构树") @ApiOperation(httpMethod = "GET", value = "获取组织机构树", notes = "获取组织机构树")
public ResponseModel<UnitDataDto> getUnitDataDto() { public ResponseModel<UnitDataDto> getUnitDataDto() {
//获取用户所在经销商单位 // 获取用户所在经销商单位
UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId()); UserUnitInformationDto userUnitInformationDto = personnelBusinessMapper
.getUserUnitInformationDto(getUserInfo().getUserId());
UnitDataDto unitDataDto = unitInfoServiceImpl.getUnitDataDto(userUnitInformationDto.getAmosDealerId()); UnitDataDto unitDataDto = unitInfoServiceImpl.getUnitDataDto(userUnitInformationDto.getAmosDealerId());
return ResponseHelper.buildResponse(unitDataDto); return ResponseHelper.buildResponse(unitDataDto);
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping (value = "/updateUnitDataDto") @PostMapping(value = "/updateUnitDataDto")
@ApiOperation(httpMethod = "POST", value = "修改单位信息", notes = "修改单位信息") @ApiOperation(httpMethod = "POST", value = "修改单位信息", notes = "修改单位信息")
public ResponseModel<Boolean> updateUnitDataDto(@RequestBody UnitDataDto unitDataDto) { public ResponseModel<Boolean> updateUnitDataDto(@RequestBody UnitDataDto unitDataDto) {
return ResponseHelper.buildResponse(unitInfoServiceImpl.updateUnitDataDto(unitDataDto)); return ResponseHelper.buildResponse(unitInfoServiceImpl.updateUnitDataDto(unitDataDto));
} }
//获取经销商组织机构 // 获取经销商组织机构
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getUnit/tree") @GetMapping(value = "/getUnit/tree")
@ApiOperation(httpMethod = "GET", value = "管辖机构树", notes = "管辖机构树") @ApiOperation(httpMethod = "GET", value = "管辖机构树", notes = "管辖机构树")
public ResponseModel<List<CompanyModel>> unitTree() { public ResponseModel<List<CompanyModel>> unitTree() {
// 获取用户所在经销商单位
UserUnitInformationDto userUnitInformationDto = personnelBusinessMapper
.getUserUnitInformationDto(getUserInfo().getUserId());
//获取用户所在经销商单位 CompanyModel companyM = new CompanyModel();
UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
CompanyModel companyM= new CompanyModel();
companyM.setCompanyName(userUnitInformationDto.getAmosDealerName()); companyM.setCompanyName(userUnitInformationDto.getAmosDealerName());
companyM.setSequenceNbr(userUnitInformationDto.getAmosDealerId()); companyM.setSequenceNbr(userUnitInformationDto.getAmosDealerId());
companyM.setOrgCode(userUnitInformationDto.getAmosDealerOrgCode()); companyM.setOrgCode(userUnitInformationDto.getAmosDealerOrgCode());
FeignClientResult<Collection<CompanyModel>> feignClientResult; FeignClientResult<Collection<CompanyModel>> feignClientResult;
Collection<CompanyModel> children=null; Collection<CompanyModel> children = null;
try { try {
feignClientResult = Privilege.companyClient.querySubAgencyTree(userUnitInformationDto.getAmosDealerId()); feignClientResult = Privilege.companyClient.querySubAgencyTree(userUnitInformationDto.getAmosDealerId());
children = feignClientResult.getResult(); children = feignClientResult.getResult();
...@@ -542,43 +559,42 @@ public class UnitInfoController extends BaseController { ...@@ -542,43 +559,42 @@ public class UnitInfoController extends BaseController {
e.printStackTrace(); e.printStackTrace();
} }
companyM.setChildren(children); companyM.setChildren(children);
List<CompanyModel> data=new ArrayList<>(); List<CompanyModel> data = new ArrayList<>();
data.add(companyM); data.add(companyM);
return ResponseHelper.buildResponse(data); return ResponseHelper.buildResponse(data);
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getCompanyModelList") @GetMapping(value = "/getCompanyModelList")
@ApiOperation(httpMethod = "GET",value = "分页查询", notes = "分页查询") @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
public ResponseModel<IPage<CompanyDto>> getCompanyModelList(CompanyDto dto) { public ResponseModel<IPage<CompanyDto>> getCompanyModelList(CompanyDto dto) {
String userid= getUserInfo().getUserId(); String userid = getUserInfo().getUserId();
LambdaQueryWrapper<PublicAgencyUser> qud=new LambdaQueryWrapper<>(); LambdaQueryWrapper<PublicAgencyUser> qud = new LambdaQueryWrapper<>();
qud.eq(PublicAgencyUser::getAmosUserId,userid); qud.eq(PublicAgencyUser::getAmosUserId, userid);
PublicAgencyUser publicAgencyUse= publicAgencyUserMapper.selectOne(qud); PublicAgencyUser publicAgencyUse = publicAgencyUserMapper.selectOne(qud);
LambdaQueryWrapper<PersonnelBusiness> qug=new LambdaQueryWrapper<>(); LambdaQueryWrapper<PersonnelBusiness> qug = new LambdaQueryWrapper<>();
qug.eq(PersonnelBusiness::getFoundationId,publicAgencyUse.getSequenceNbr()); qug.eq(PersonnelBusiness::getFoundationId, publicAgencyUse.getSequenceNbr());
PersonnelBusiness personnelBusines=personnelBusinessMapper.selectOne(qug); PersonnelBusiness personnelBusines = personnelBusinessMapper.selectOne(qug);
dto.setComid(personnelBusines.getAmosDealerId()); dto.setComid(personnelBusines.getAmosDealerId());
Map<String,String> map= personnelBusinessMapper.getorgcode(dto.getCompanyTreeid()); Map<String, String> map = personnelBusinessMapper.getorgcode(dto.getCompanyTreeid());
dto.setOrgCode(map.get("orgCode")); dto.setOrgCode(map.get("orgCode"));
return ResponseHelper.buildResponse(unitInfoServiceImpl.getCompanyDto(dto)); return ResponseHelper.buildResponse(unitInfoServiceImpl.getCompanyDto(dto));
} }
// 获取经销商组织机构
//获取经销商组织机构
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getUnitTree") @GetMapping(value = "/getUnitTree")
@ApiOperation(httpMethod = "GET", value = "管辖机构树", notes = "管辖机构树") @ApiOperation(httpMethod = "GET", value = "管辖机构树", notes = "管辖机构树")
public ResponseModel<Collection<CompanyModel>> getUnitTree() { public ResponseModel<Collection<CompanyModel>> getUnitTree() {
//获取用户所在经销商单位 // 获取用户所在经销商单位
UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId()); UserUnitInformationDto userUnitInformationDto = personnelBusinessMapper
.getUserUnitInformationDto(getUserInfo().getUserId());
FeignClientResult<Collection<CompanyModel>> feignClientResult; FeignClientResult<Collection<CompanyModel>> feignClientResult;
Collection<CompanyModel> children=null; Collection<CompanyModel> children = null;
try { try {
feignClientResult = Privilege.companyClient.querySubAgencyTree(userUnitInformationDto.getAmosDealerId()); feignClientResult = Privilege.companyClient.querySubAgencyTree(userUnitInformationDto.getAmosDealerId());
children = feignClientResult.getResult(); children = feignClientResult.getResult();
...@@ -587,7 +603,6 @@ public class UnitInfoController extends BaseController { ...@@ -587,7 +603,6 @@ public class UnitInfoController extends BaseController {
e.printStackTrace(); e.printStackTrace();
} }
return ResponseHelper.buildResponse(children); return ResponseHelper.buildResponse(children);
} }
...@@ -595,34 +610,34 @@ public class UnitInfoController extends BaseController { ...@@ -595,34 +610,34 @@ public class UnitInfoController extends BaseController {
@GetMapping(value = "/getRegionalCompaniesTree") @GetMapping(value = "/getRegionalCompaniesTree")
@ApiOperation(httpMethod = "GET", value = "区域公司", notes = "区域公司") @ApiOperation(httpMethod = "GET", value = "区域公司", notes = "区域公司")
public ResponseModel<List<RegionalCompanies>> getRegionalCompaniesTree() { public ResponseModel<List<RegionalCompanies>> getRegionalCompaniesTree() {
String userid= getUserInfo().getUserId(); String userid = getUserInfo().getUserId();
LambdaQueryWrapper<PublicAgencyUser> qud=new LambdaQueryWrapper<>(); LambdaQueryWrapper<PublicAgencyUser> qud = new LambdaQueryWrapper<>();
qud.eq(PublicAgencyUser::getAmosUserId,userid); qud.eq(PublicAgencyUser::getAmosUserId, userid);
PublicAgencyUser publicAgencyUse= publicAgencyUserMapper.selectOne(qud); PublicAgencyUser publicAgencyUse = publicAgencyUserMapper.selectOne(qud);
LambdaQueryWrapper<PersonnelBusiness> qug=new LambdaQueryWrapper<>(); LambdaQueryWrapper<PersonnelBusiness> qug = new LambdaQueryWrapper<>();
qug.eq(PersonnelBusiness::getFoundationId,publicAgencyUse.getSequenceNbr()); qug.eq(PersonnelBusiness::getFoundationId, publicAgencyUse.getSequenceNbr());
PersonnelBusiness personnelBusines=personnelBusinessMapper.selectOne(qug); PersonnelBusiness personnelBusines = personnelBusinessMapper.selectOne(qug);
LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper<>(); LambdaQueryWrapper<RegionalCompanies> qu = new LambdaQueryWrapper<>();
qu.eq(RegionalCompanies::getUnitId,personnelBusines.getAmosDealerId()); qu.eq(RegionalCompanies::getUnitId, personnelBusines.getAmosDealerId());
List<RegionalCompanies> data= regionalCompaniesMapper.selectList(qu); List<RegionalCompanies> data = regionalCompaniesMapper.selectList(qu);
return ResponseHelper.buildResponse(data); return ResponseHelper.buildResponse(data);
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getGroupTree") @GetMapping(value = "/getGroupTree")
@ApiOperation(httpMethod = "GET", value = "经销商用户组", notes = "经销商用户组") @ApiOperation(httpMethod = "GET", value = "经销商用户组", notes = "经销商用户组")
public ResponseModel<Collection<GroupModel>> getGroupTree() { public ResponseModel<Collection<GroupModel>> getGroupTree() {
FeignClientResult<Collection<GroupModel>> feignClientResult= Privilege.groupClient.selectForList(group,null); FeignClientResult<Collection<GroupModel>> feignClientResult = Privilege.groupClient.selectForList(group, null);
Collection<GroupModel> children = feignClientResult.getResult(); Collection<GroupModel> children = feignClientResult.getResult();
Collection<GroupModel> chil =new ArrayList<>(); Collection<GroupModel> chil = new ArrayList<>();
for (GroupModel child : children) { for (GroupModel child : children) {
if("户用光伏-经销商-管理员".equals(child.getGroupName())||"用户光伏-农户".equals(child.getGroupName())||"户用光伏-经销商-空角色".equals(child.getGroupName())){ if ("户用光伏-经销商-管理员".equals(child.getGroupName()) || "用户光伏-农户".equals(child.getGroupName())
//排除其余角色 || "户用光伏-经销商-空角色".equals(child.getGroupName())) {
}else{ // 排除其余角色
} else {
chil.add(child); chil.add(child);
} }
} }
...@@ -634,76 +649,71 @@ public class UnitInfoController extends BaseController { ...@@ -634,76 +649,71 @@ public class UnitInfoController extends BaseController {
@ApiOperation(httpMethod = "GET", value = "经销商用户组全部", notes = "经销商用户组全部") @ApiOperation(httpMethod = "GET", value = "经销商用户组全部", notes = "经销商用户组全部")
public ResponseModel<Collection<GroupModel>> getGroupTreeAll() { public ResponseModel<Collection<GroupModel>> getGroupTreeAll() {
FeignClientResult<Collection<GroupModel>> feignClientResult= Privilege.groupClient.selectForList(group,null); FeignClientResult<Collection<GroupModel>> feignClientResult = Privilege.groupClient.selectForList(group, null);
Collection<GroupModel> children = feignClientResult.getResult(); Collection<GroupModel> children = feignClientResult.getResult();
Collection<GroupModel> chil =new ArrayList<>(); Collection<GroupModel> chil = new ArrayList<>();
for (GroupModel child : children) { for (GroupModel child : children) {
if("用户光伏-农户".equals(child.getGroupName())){ if ("用户光伏-农户".equals(child.getGroupName())) {
//排除其余角色 // 排除其余角色
}else{ } else {
chil.add(child); chil.add(child);
} }
} }
return ResponseHelper.buildResponse(chil); return ResponseHelper.buildResponse(chil);
} }
// 根据角色获取区域公司
//根据角色获取区域公司
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getRegionalCompanies") @GetMapping(value = "/getRegionalCompanies")
@ApiOperation(httpMethod = "GET", value = "根据角色获取区域公司", notes = "根据角色获取区域公司") @ApiOperation(httpMethod = "GET", value = "根据角色获取区域公司", notes = "根据角色获取区域公司")
public ResponseModel<Collection<CompanyModel>> getRegionalCompanies() { public ResponseModel<Collection<CompanyModel>> getRegionalCompanies() {
AgencyUserModel agencyUserModel= getUserInfo(); AgencyUserModel agencyUserModel = getUserInfo();
String org=agencyUserModel.getOrgNames(); String org = agencyUserModel.getOrgNames();
Collection<CompanyModel> companyModel=new ArrayList<>(); Collection<CompanyModel> companyModel = new ArrayList<>();
if(org.contains("-经销商")){ if (org.contains("-经销商")) {
String userid= agencyUserModel.getUserId(); String userid = agencyUserModel.getUserId();
LambdaQueryWrapper<PublicAgencyUser> qud=new LambdaQueryWrapper<>(); LambdaQueryWrapper<PublicAgencyUser> qud = new LambdaQueryWrapper<>();
qud.eq(PublicAgencyUser::getAmosUserId,userid); qud.eq(PublicAgencyUser::getAmosUserId, userid);
PublicAgencyUser publicAgencyUse= publicAgencyUserMapper.selectOne(qud); PublicAgencyUser publicAgencyUse = publicAgencyUserMapper.selectOne(qud);
LambdaQueryWrapper<PersonnelBusiness> qug=new LambdaQueryWrapper<>(); LambdaQueryWrapper<PersonnelBusiness> qug = new LambdaQueryWrapper<>();
qug.eq(PersonnelBusiness::getFoundationId,publicAgencyUse.getSequenceNbr()); qug.eq(PersonnelBusiness::getFoundationId, publicAgencyUse.getSequenceNbr());
PersonnelBusiness personnelBusines=personnelBusinessMapper.selectOne(qug); PersonnelBusiness personnelBusines = personnelBusinessMapper.selectOne(qug);
if(org.contains("户用光伏-经销商-管理员")){ if (org.contains("户用光伏-经销商-管理员")) {
//如果是经销商管理员 // 如果是经销商管理员
LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper<>(); LambdaQueryWrapper<RegionalCompanies> qu = new LambdaQueryWrapper<>();
qu.eq(RegionalCompanies::getUnitId,personnelBusines.getAmosDealerId()); qu.eq(RegionalCompanies::getUnitId, personnelBusines.getAmosDealerId());
List<RegionalCompanies> data= regionalCompaniesMapper.selectList(qu); List<RegionalCompanies> data = regionalCompaniesMapper.selectList(qu);
if(data!=null&&!data.isEmpty()){ if (data != null && !data.isEmpty()) {
for (RegionalCompanies datum : data) { for (RegionalCompanies datum : data) {
CompanyModel co=new CompanyModel(); CompanyModel co = new CompanyModel();
co.setSequenceNbr(datum.getRegionalCompaniesSeq()); co.setSequenceNbr(datum.getRegionalCompaniesSeq());
co.setCompanyName(datum.getRegionalCompaniesName()); co.setCompanyName(datum.getRegionalCompaniesName());
co.setOrgCode(datum.getRegionalCompaniesCode()); co.setOrgCode(datum.getRegionalCompaniesCode());
companyModel.add(co); companyModel.add(co);
} }
} }
}else{ } else {
//如果是经销商普通员工 // 如果是经销商普通员工
CompanyModel co=new CompanyModel(); CompanyModel co = new CompanyModel();
co.setSequenceNbr(personnelBusines.getRegionalCompaniesSeq()); co.setSequenceNbr(personnelBusines.getRegionalCompaniesSeq());
co.setCompanyName(personnelBusines.getRegionalCompaniesName()); co.setCompanyName(personnelBusines.getRegionalCompaniesName());
co.setOrgCode(personnelBusines.getRegionalCompaniesCode()); co.setOrgCode(personnelBusines.getRegionalCompaniesCode());
companyModel.add(co); companyModel.add(co);
} }
}else{ } else {
//如果是管理端 // 如果是管理端
FeignClientResult<Collection<CompanyModel>> feignClientResult= Privilege.companyClient.querySubAgencyTree(regionalCompanies); FeignClientResult<Collection<CompanyModel>> feignClientResult = Privilege.companyClient
.querySubAgencyTree(regionalCompanies);
companyModel = (List<CompanyModel>)feignClientResult.getResult(); companyModel = (List<CompanyModel>) feignClientResult.getResult();
} }
return ResponseHelper.buildResponse(companyModel); return ResponseHelper.buildResponse(companyModel);
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "获取审核通过的经销商", notes = "获取审核通过的经销商") @ApiOperation(httpMethod = "GET", value = "获取审核通过的经销商", notes = "获取审核通过的经销商")
@GetMapping(value = "/getlistUnitInfo") @GetMapping(value = "/getlistUnitInfo")
@UserLimits @UserLimits
public ResponseModel<List<UnitInfo>> getlistUnitInfo() { public ResponseModel<List<UnitInfo>> getlistUnitInfo() {
...@@ -713,217 +723,221 @@ public class UnitInfoController extends BaseController { ...@@ -713,217 +723,221 @@ public class UnitInfoController extends BaseController {
// qu.eq(UnitInfo::getAuditStatus,2); // qu.eq(UnitInfo::getAuditStatus,2);
// List<UnitInfo> list=unitInfoMapper.selectList(qu); // List<UnitInfo> list=unitInfoMapper.selectList(qu);
List<UnitInfo> list=unitInfoMapper.getlistUnitInfo(); List<UnitInfo> list = unitInfoMapper.getlistUnitInfo();
return ResponseHelper.buildResponse(list); return ResponseHelper.buildResponse(list);
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询") @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getRegionalCompanie") @GetMapping(value = "/getRegionalCompanie")
@UserLimits @UserLimits
public ResponseModel< List<RegionalCompanies> > getRegionalCompanie( public ResponseModel<List<RegionalCompanies>> getRegionalCompanie(
@ApiParam(value = "主键", example = "1702216914824097794") @RequestParam(required=false) Long sequenceNbr @ApiParam(value = "主键", example = "1702216914824097794") @RequestParam(required = false) Long sequenceNbr) {
) {
// LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper(); // LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper();
// qu.eq(RegionalCompanies::getUnitInfoId,sequenceNbr); // qu.eq(RegionalCompanies::getUnitInfoId,sequenceNbr);
// qu.eq(RegionalCompanies::getIsDelete,false); // qu.eq(RegionalCompanies::getIsDelete,false);
// List<RegionalCompanies> list=regionalCompaniesMapper.selectList(qu); // List<RegionalCompanies> list=regionalCompaniesMapper.selectList(qu);
List<RegionalCompanies> list=regionalCompaniesMapper.selectListRegionalCompanies(sequenceNbr); List<RegionalCompanies> list = regionalCompaniesMapper.selectListRegionalCompanies(sequenceNbr);
return ResponseHelper.buildResponse(list); return ResponseHelper.buildResponse(list);
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询") @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getRegionalCompanieById") @GetMapping(value = "/getRegionalCompanieById")
public ResponseModel< RegionalCompanies > getRegionalCompanieById( public ResponseModel<RegionalCompanies> getRegionalCompanieById(
@ApiParam(value = "注册公司ID", example = "1702216914824097794") @RequestParam(required=false) Long regionalCompaniesSeq, @ApiParam(value = "注册公司ID", example = "1702216914824097794") @RequestParam(required = false) Long regionalCompaniesSeq,
@ApiParam(value = "人员Id", example = "1715318790759149570") @RequestParam(required=false) Long unitInfoId @ApiParam(value = "人员Id", example = "1715318790759149570") @RequestParam(required = false) Long unitInfoId) {
) { LambdaQueryWrapper<RegionalCompanies> qu = new LambdaQueryWrapper();
LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper(); qu.eq(RegionalCompanies::getRegionalCompaniesSeq, regionalCompaniesSeq);
qu.eq(RegionalCompanies::getRegionalCompaniesSeq,regionalCompaniesSeq); qu.eq(RegionalCompanies::getUnitInfoId, unitInfoId);
qu.eq(RegionalCompanies::getUnitInfoId,unitInfoId); qu.eq(RegionalCompanies::getIsDelete, false);
qu.eq(RegionalCompanies::getIsDelete,false); RegionalCompanies list = regionalCompaniesMapper.selectOne(qu);
RegionalCompanies list=regionalCompaniesMapper.selectOne(qu);
return ResponseHelper.buildResponse(list); return ResponseHelper.buildResponse(list);
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询") @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getRegionalCompanieUnitInfo") @GetMapping(value = "/getRegionalCompanieUnitInfo")
public ResponseModel< List<RegionalCompanies> > getRegionalCompanieUnitInfo( public ResponseModel<List<RegionalCompanies>> getRegionalCompanieUnitInfo(
@ApiParam(value = "人员Id", example = "1715318790759149570") @RequestParam(required=false) Long unitInfoId, @ApiParam(value = "人员Id", example = "1715318790759149570") @RequestParam(required = false) Long unitInfoId,
@ApiParam(value = "注册公司ID", example = "1702216914824097794") @RequestParam(required=false) Long regionalCompaniesSeq @ApiParam(value = "注册公司ID", example = "1702216914824097794") @RequestParam(required = false) Long regionalCompaniesSeq) {
) { LambdaQueryWrapper<RegionalCompanies> qu = new LambdaQueryWrapper();
LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper(); qu.eq(RegionalCompanies::getRegionalCompaniesSeq, regionalCompaniesSeq);
qu.eq(RegionalCompanies::getRegionalCompaniesSeq,regionalCompaniesSeq); qu.eq(RegionalCompanies::getUnitInfoId, unitInfoId);
qu.eq(RegionalCompanies::getUnitInfoId,unitInfoId); RegionalCompanies list = regionalCompaniesMapper.selectOne(qu);
RegionalCompanies list=regionalCompaniesMapper.selectOne(qu); UnitInfo unitInfo = unitInfoMapper.selectById(unitInfoId);
UnitInfo unitInfo=unitInfoMapper.selectById(unitInfoId); List<RegionalCompanies> date = null;
List<RegionalCompanies> date=null; if (list != null && unitInfo != null) {
if(list!=null&&unitInfo!=null){ list.setRegionalCompaniesName(unitInfo.getName() + "-" + list.getRegionalCompaniesName());
list.setRegionalCompaniesName(unitInfo.getName()+"-"+list.getRegionalCompaniesName()); date = new ArrayList();
date=new ArrayList();
date.add(list); date.add(list);
} }
return ResponseHelper.buildResponse(date); return ResponseHelper.buildResponse(date);
} }
//获取电站列表 // 获取电站列表
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询") @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getUnitInfoListData") @GetMapping(value = "/getUnitInfoListData")
public ResponseModel< List<Map<String,Object>> > getUnitInfoListData( public ResponseModel<List<Map<String, Object>>> getUnitInfoListData(
@ApiParam(value = "人员Id", example = "1715318790759149570") @RequestParam(required=false) Long unitInfoId, @ApiParam(value = "人员Id", example = "1715318790759149570") @RequestParam(required = false) Long unitInfoId,
@ApiParam(value = "注册公司ID", example = "1702216914824097794") @RequestParam(required=false) Long regionalCompaniesSeq @ApiParam(value = "注册公司ID", example = "1702216914824097794") @RequestParam(required = false) Long regionalCompaniesSeq) {
) { UnitInfo unitInfo = unitInfoMapper.selectById(unitInfoId);
UnitInfo unitInfo=unitInfoMapper.selectById(unitInfoId); List<PeasantHousehold> list = peasantHouseholdMapper.selectPeasantHouseholdList(unitInfo.getAmosCompanySeq(),
List<PeasantHousehold> list=peasantHouseholdMapper.selectPeasantHouseholdList(unitInfo.getAmosCompanySeq(),regionalCompaniesSeq,null,null,null,null); regionalCompaniesSeq, null, null, null, null);
List<Map<String,Object>> date=new ArrayList<>(); List<Map<String, Object>> date = new ArrayList<>();
if(list!=null){ if (list != null) {
for (PeasantHousehold peasantHousehold : list) { for (PeasantHousehold peasantHousehold : list) {
Map<String,Object> map=new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("children",new ArrayList<>()); map.put("children", new ArrayList<>());
map.put("title",peasantHousehold.getPeasantHouseholdNo()+"-"+peasantHousehold.getOwnersName()); map.put("title", peasantHousehold.getPeasantHouseholdNo() + "-" + peasantHousehold.getOwnersName());
map.put("value",peasantHousehold.getSequenceNbr()); map.put("value", peasantHousehold.getSequenceNbr());
map.put("key",peasantHousehold.getSequenceNbr()); map.put("key", peasantHousehold.getSequenceNbr());
date.add(map); date.add(map);
} }
} }
return ResponseHelper.buildResponse(date); return ResponseHelper.buildResponse(date);
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询") @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getPeasantHouseholdData") @GetMapping(value = "/getPeasantHouseholdData")
public ResponseModel<Page<PeasantHousehold>> getPeasantHouseholdData( public ResponseModel<Page<PeasantHousehold>> getPeasantHouseholdData(
@ApiParam(value = "人员Id", example = "1715318790759149570") @RequestParam(required=false) Long unitInfoId, @ApiParam(value = "人员Id", example = "1715318790759149570") @RequestParam(required = false) Long unitInfoId,
@ApiParam(value = "注册公司ID", example = "1702216914824097794") @RequestParam(required=false) Long regionalCompaniesSeq, @ApiParam(value = "注册公司ID", example = "1702216914824097794") @RequestParam(required = false) Long regionalCompaniesSeq,
@ApiParam(value = "页码", example = "1") @RequestParam(value = "current") int current, @ApiParam(value = "页码", example = "1") @RequestParam(value = "current") int current,
@ApiParam(value = "页数大小", example = "20") @RequestParam (value = "size") int size, @ApiParam(value = "页数大小", example = "20") @RequestParam(value = "size") int size,
@ApiParam(value = "农户ID", example = "1710823964114186242") @RequestParam (required=false) String peasantHouseholdNo, @ApiParam(value = "农户ID", example = "1710823964114186242") @RequestParam(required = false) String peasantHouseholdNo,
@ApiParam(value = "电站名称", example = "admin") @RequestParam (required=false) String ownersName, @ApiParam(value = "电站名称", example = "admin") @RequestParam(required = false) String ownersName,
@ApiParam(value = "id", example = "1710823964114186242,1717088938155339777") @RequestParam (required=false) String ids @ApiParam(value = "id", example = "1710823964114186242,1717088938155339777") @RequestParam(required = false) String ids
) { ) {
return ResponseHelper.buildResponse(unitInfoServiceImpl.getPeasantHouseholdData( unitInfoId,regionalCompaniesSeq, current,size,peasantHouseholdNo,ownersName,ids)); return ResponseHelper.buildResponse(unitInfoServiceImpl.getPeasantHouseholdData(unitInfoId,
regionalCompaniesSeq, current, size, peasantHouseholdNo, ownersName, ids));
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询") @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getPeasantHouseholdDataNew") @GetMapping(value = "/getPeasantHouseholdDataNew")
public ResponseModel<Page<PeasantHousehold>> getPeasantHouseholdDataNew( public ResponseModel<Page<PeasantHousehold>> getPeasantHouseholdDataNew(
@ApiParam(value = "人员Id", example = "1715318790759149570") @RequestParam(required=false) Long unitInfoId, @ApiParam(value = "人员Id", example = "1715318790759149570") @RequestParam(required = false) Long unitInfoId,
@ApiParam(value = "注册公司ID", example = "1702216914824097794") @RequestParam(required=false) Long regionalCompaniesSeq, @ApiParam(value = "注册公司ID", example = "1702216914824097794") @RequestParam(required = false) Long regionalCompaniesSeq,
@ApiParam(value = "页码", example = "1") @RequestParam(value = "current") int current, @ApiParam(value = "页码", example = "1") @RequestParam(value = "current") int current,
@ApiParam(value = "页数大小", example = "20") @RequestParam (value = "size") int size, @ApiParam(value = "页数大小", example = "20") @RequestParam(value = "size") int size,
@ApiParam(value = "农户ID", example = "1710823964114186242") @RequestParam (required=false) String peasantHouseholdNo, @ApiParam(value = "农户ID", example = "1710823964114186242") @RequestParam(required = false) String peasantHouseholdNo,
@ApiParam(value = "电站名称", example = "admin") @RequestParam (required=false) String ownersName, @ApiParam(value = "电站名称", example = "admin") @RequestParam(required = false) String ownersName,
@ApiParam(value = "id", example = "1710823964114186242,1717088938155339777") @RequestParam (required=false) String ids @ApiParam(value = "id", example = "1710823964114186242,1717088938155339777") @RequestParam(required = false) String ids
) { ) {
return ResponseHelper.buildResponse(unitInfoServiceImpl.getPeasantHouseholdDataNew(unitInfoId, regionalCompaniesSeq, current, size, peasantHouseholdNo, ownersName, ids)); return ResponseHelper.buildResponse(unitInfoServiceImpl.getPeasantHouseholdDataNew(unitInfoId,
regionalCompaniesSeq, current, size, peasantHouseholdNo, ownersName, ids));
} }
/** 获取当前登录人区域公司 */
@TycloudOperation(ApiLevel = UserType.AGENCY)
/**获取当前登录人区域公司*/ @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getRegionalCompanieByuser")
@TycloudOperation(ApiLevel = UserType.AGENCY) public ResponseModel<List<Map<String, Object>>> getRegionalCompanieByuser() {
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getRegionalCompanieByuser") UserUnitInformationDto userUnitInformationDto = personnelBusinessMapper
public ResponseModel< List<Map<String,Object>> > getRegionalCompanieByuser( .getUserUnitInformationDto(getUserInfo().getUserId());
) { List<Map<String, Object>> date = new ArrayList<>();
if (userUnitInformationDto != null && userUnitInformationDto.getRegionalCompaniesSeq() != null
&& userUnitInformationDto.getRegionalCompaniesName() != null) {
UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId()); Map<String, Object> map = new HashMap<>();
List<Map<String,Object>> date=new ArrayList<>();
if(userUnitInformationDto!=null&&userUnitInformationDto.getRegionalCompaniesSeq()!=null&&userUnitInformationDto.getRegionalCompaniesName()!=null){ map.put("value", userUnitInformationDto.getRegionalCompaniesSeq());
Map<String,Object> map=new HashMap<>(); map.put("name", userUnitInformationDto.getRegionalCompaniesName());
map.put("value",userUnitInformationDto.getRegionalCompaniesSeq());
map.put("name",userUnitInformationDto.getRegionalCompaniesName());
date.add(map); date.add(map);
} }
return ResponseHelper.buildResponse(date); return ResponseHelper.buildResponse(date);
} }
/***获取经销商，区域公司下 工程负责人**/ /*** 获取经销商，区域公司下 工程负责人 **/
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询") @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getuserList") @GetMapping(value = "/getuserList")
public ResponseModel< List<Map<String,Object>> > getuserList( @ApiParam(value = "角色Id", example = "6582473") @RequestParam(required=false) Long role, public ResponseModel<List<Map<String, Object>>> getuserList(
@ApiParam(value = "注册区域Id", example = "1710823964114186242") @RequestParam(required=false) Long regionalCompaniesSeq @ApiParam(value = "角色Id", example = "6582473") @RequestParam(required = false) Long role,
@ApiParam(value = "注册区域Id", example = "1710823964114186242") @RequestParam(required = false) Long regionalCompaniesSeq
) { ) {
UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId()); UserUnitInformationDto userUnitInformationDto = personnelBusinessMapper
// List<Map<String,Object>> date= unitInfoMapper.getuserList(null,role,regionalCompaniesSeq,userUnitInformationDto.getAmosDealerId()); .getUserUnitInformationDto(getUserInfo().getUserId());
List<Map<String,Object>> date= unitInfoMapper.getuserListByOrgCode(null,role,regionalCompaniesSeq,userUnitInformationDto.getAmosDealerOrgCode()); // List<Map<String,Object>> date=
// unitInfoMapper.getuserList(null,role,regionalCompaniesSeq,userUnitInformationDto.getAmosDealerId());
List<Map<String, Object>> date = unitInfoMapper.getuserListByOrgCode(null, role, regionalCompaniesSeq,
userUnitInformationDto.getAmosDealerOrgCode());
return ResponseHelper.buildResponse(date); return ResponseHelper.buildResponse(date);
} }
/*** 获取经销商，区域公司下 工程负责人 **/
/***获取经销商，区域公司下 工程负责人**/
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询") @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getuserListAll") @GetMapping(value = "/getuserListAll")
public ResponseModel< List<Map<String,Object>> > getuserListAll( @ApiParam(value = "角色Id", example = "6582473") @RequestParam(required=false) Long role, public ResponseModel<List<Map<String, Object>>> getuserListAll(
@ApiParam(value = "注册区域Id", example = "1710823964114186242") @RequestParam(required=false) Long regionalCompaniesSeq @ApiParam(value = "角色Id", example = "6582473") @RequestParam(required = false) Long role,
@ApiParam(value = "注册区域Id", example = "1710823964114186242") @RequestParam(required = false) Long regionalCompaniesSeq
) { ) {
UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId()); UserUnitInformationDto userUnitInformationDto = personnelBusinessMapper
List<Map<String,Object>> date= unitInfoMapper.getuserListAllByOrgCode(null,role,regionalCompaniesSeq,userUnitInformationDto.getAmosDealerOrgCode()); .getUserUnitInformationDto(getUserInfo().getUserId());
List<Map<String, Object>> date = unitInfoMapper.getuserListAllByOrgCode(null, role, regionalCompaniesSeq,
userUnitInformationDto.getAmosDealerOrgCode());
return ResponseHelper.buildResponse(date); return ResponseHelper.buildResponse(date);
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询") @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getuserTelephone") @GetMapping(value = "/getuserTelephone")
public ResponseModel< Map<String,Object> > getuserTelephone(@ApiParam(value = "用户名称", example = "admin") @RequestParam(required=false) String userName public ResponseModel<Map<String, Object>> getuserTelephone(
) { Map<String,Object> data=null; @ApiParam(value = "用户名称", example = "admin") @RequestParam(required = false) String userName) {
if(StringUtils.isNotEmpty(userName)){ Map<String, Object> data = null;
List<Map<String,Object>> date= unitInfoMapper.getuserListtelephone(userName,null,null,null); if (StringUtils.isNotEmpty(userName)) {
if(date!=null&&!date.isEmpty()){ List<Map<String, Object>> date = unitInfoMapper.getuserListtelephone(userName, null, null, null);
data=date.get(0); if (date != null && !date.isEmpty()) {
data = date.get(0);
} }
} }
return ResponseHelper.buildResponse(data); return ResponseHelper.buildResponse(data);
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "根据userId查询手机号", notes = "根据userId查询手机号") @ApiOperation(httpMethod = "GET", value = "根据userId查询手机号", notes = "根据userId查询手机号")
@GetMapping(value = "/getUserTelephoneByUserId") @GetMapping(value = "/getUserTelephoneByUserId")
public ResponseModel< Map<String,Object> > getUserTelephoneByUserId( @ApiParam(value = "用户Id", example = "8542741")@RequestParam(required=false) String userId public ResponseModel<Map<String, Object>> getUserTelephoneByUserId(
) { Map<String,Object> data=null; @ApiParam(value = "用户Id", example = "8542741") @RequestParam(required = false) String userId) {
if(StringUtils.isNotEmpty(userId)){ Map<String, Object> data = null;
List<Map<String,Object>> date= unitInfoMapper.getUserTelephoneByUserId(userId); if (StringUtils.isNotEmpty(userId)) {
if(date!=null&&!date.isEmpty()){ List<Map<String, Object>> date = unitInfoMapper.getUserTelephoneByUserId(userId);
data=date.get(0); if (date != null && !date.isEmpty()) {
data = date.get(0);
} }
} }
return ResponseHelper.buildResponse(data); return ResponseHelper.buildResponse(data);
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询") @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/selectPeasantHouseholdListsg") @GetMapping(value = "/selectPeasantHouseholdListsg")
public ResponseModel<Page<PeasantHousehold>> selectPeasantHouseholdListsg( public ResponseModel<Page<PeasantHousehold>> selectPeasantHouseholdListsg(
@RequestParam(required=false) Long regionalCompaniesSeq, @RequestParam(required = false) Long regionalCompaniesSeq, @RequestParam(value = "current") int current,
@RequestParam(value = "current") int current, @RequestParam(value = "size") int size, @RequestParam(required = false) String peasantHouseholdNo,
@RequestParam (value = "size") int size, @RequestParam(required = false) String ownersName, @RequestParam(required = false) String ids
@RequestParam (required=false) String peasantHouseholdNo,
@RequestParam (required=false) String ownersName,
@RequestParam (required=false) String ids
) { ) {
UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId()); UserUnitInformationDto userUnitInformationDto = personnelBusinessMapper
return ResponseHelper.buildResponse(unitInfoServiceImpl.selectPeasantHouseholdListsg( userUnitInformationDto.getAmosDealerOrgCode(),regionalCompaniesSeq, current,size,peasantHouseholdNo,ownersName, ids)); .getUserUnitInformationDto(getUserInfo().getUserId());
return ResponseHelper.buildResponse(
unitInfoServiceImpl.selectPeasantHouseholdListsg(userUnitInformationDto.getAmosDealerOrgCode(),
regionalCompaniesSeq, current, size, peasantHouseholdNo, ownersName, ids));
} }
} }
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PreparationMoneyServiceImpl.java
View file @ a13e95b9
...@@ -300,10 +300,15 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto ...@@ -300,10 +300,15 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
ids.add(documentStation.getStationId()); ids.add(documentStation.getStationId());
} }
//获取所有电站Bom，分组合并，暂时不相加 //获取所有电站Bom，分组合并，暂时不相加
List<DesignInformation> li= new ArrayList<>();
if(!ids.isEmpty())
{
QueryWrapper<DesignInformation> designInformationQueryWrapper = new QueryWrapper<>(); QueryWrapper<DesignInformation> designInformationQueryWrapper = new QueryWrapper<>();
designInformationQueryWrapper.in("peasant_household_id", ids); designInformationQueryWrapper.in("peasant_household_id", ids);
List<DesignInformation> li = designInformationMapper.selectList(designInformationQueryWrapper); li = designInformationMapper.selectList(designInformationQueryWrapper);
}
DesignInformation designInformation = new DesignInformation(); DesignInformation designInformation = new DesignInformation();
//组件 //组件
List<Object> assembly = new ArrayList<>(); List<Object> assembly = new ArrayList<>();
......
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