Commit c6ad9f82 authored by suhuiguang's avatar suhuiguang

1.字典脚本维护

2.发送手机验证码时 进行手机号是否已经注册 平台增加接口
parent 7b0d6959
...@@ -202,7 +202,7 @@ public class DataDictionaryController extends BaseController { ...@@ -202,7 +202,7 @@ public class DataDictionaryController extends BaseController {
} }
} }
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/dataDictionary", method = RequestMethod.GET) @RequestMapping(value = "/dataDictionary", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典2", notes = "根据字典类型查询字典2") @ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典2", notes = "根据字典类型查询字典2")
public ResponseModel<Object> getDictionary(@RequestParam String type) throws Exception { public ResponseModel<Object> getDictionary(@RequestParam String type) throws Exception {
......
package com.yeejoin.amos.boot.module.tzs.flc.biz.controller; package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
import com.baomidou.mybatisplus.extension.api.R;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary; import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey; import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.tzs.api.service.IRegUnitInfoService; import com.yeejoin.amos.boot.module.tzs.api.service.IRegUnitInfoService;
import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitInfoDto; import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitInfoDto;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege; import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel; import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.CompanyModel; import com.yeejoin.amos.feign.privilege.model.CompanyModel;
...@@ -97,6 +99,11 @@ public class RegUnitInfoController extends BaseController { ...@@ -97,6 +99,11 @@ public class RegUnitInfoController extends BaseController {
if (ValidationUtil.isEmpty(tel)) { if (ValidationUtil.isEmpty(tel)) {
throw new BadRequest("手机号不能为空"); throw new BadRequest("手机号不能为空");
} }
try {
Privilege.authClient.mobileVerify(tel);
} catch (Exception e) {
throw new RuntimeException("该手机号已注册!");
}
Boolean flag; Boolean flag;
HashMap<String, String> params = new HashMap<>(); HashMap<String, String> params = new HashMap<>();
String code = this.getRandomCode(); String code = this.getRandomCode();
...@@ -158,7 +165,7 @@ public class RegUnitInfoController extends BaseController { ...@@ -158,7 +165,7 @@ public class RegUnitInfoController extends BaseController {
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@DeleteMapping(value = "/{unitCode}/logOut") @DeleteMapping(value = "/{unitCode}/logOut")
@ApiOperation(httpMethod = "DELETE", value = "企业注销", notes = "企业注销") @ApiOperation(httpMethod = "DELETE", value = "企业注销", notes = "企业注销")
public ResponseModel unitLogOut(@PathVariable String unitCode){ public ResponseModel unitLogOut(@PathVariable String unitCode){
......
...@@ -199,6 +199,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI ...@@ -199,6 +199,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Boolean unitLogOut(String unitCode) { public Boolean unitLogOut(String unitCode) {
tzsAuthServiceImpl.setRequestContext();
RegUnitInfo regUnitInfo = this.getOne(new LambdaQueryWrapper<RegUnitInfo>().eq(RegUnitInfo::getUnitCode, unitCode)); RegUnitInfo regUnitInfo = this.getOne(new LambdaQueryWrapper<RegUnitInfo>().eq(RegUnitInfo::getUnitCode, unitCode));
if(regUnitInfo == null){ if(regUnitInfo == null){
return Boolean.FALSE; return Boolean.FALSE;
......
...@@ -29,5 +29,10 @@ ...@@ -29,5 +29,10 @@
<artifactId>commons-text</artifactId> <artifactId>commons-text</artifactId>
<version>1.9</version> <version>1.9</version>
</dependency> </dependency>
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-feign-privilege</artifactId>
<version>1.7.11-SNAPSHOT</version>
</dependency>
</dependencies> </dependencies>
</project> </project>
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