Commit 97ee1da3 authored by tianyiming's avatar tianyiming

企业人员修改

parent 40a499f2
...@@ -68,5 +68,6 @@ public class TzsUserInfoDto extends BaseDto { ...@@ -68,5 +68,6 @@ public class TzsUserInfoDto extends BaseDto {
@ApiModelProperty(value = "年龄") @ApiModelProperty(value = "年龄")
private Integer age; private Integer age;
@ApiModelProperty(value = "平台账号锁定状态")
private String lockStatus;
} }
...@@ -117,4 +117,10 @@ public class TzsUserInfo extends BaseEntity { ...@@ -117,4 +117,10 @@ public class TzsUserInfo extends BaseEntity {
*/ */
@TableField("amos_user_id") @TableField("amos_user_id")
private String amosUserId; private String amosUserId;
/**
* 平台账号锁定状态
*/
@TableField("lock_status")
private String lockStatus;
} }
...@@ -22,4 +22,5 @@ public interface ITzsUserInfoService extends IService<TzsUserInfo> { ...@@ -22,4 +22,5 @@ public interface ITzsUserInfoService extends IService<TzsUserInfo> {
Map<String, Object> getDetail(Long id); Map<String, Object> getDetail(Long id);
boolean BindAccount(Map<String, Object> map); boolean BindAccount(Map<String, Object> map);
String startOrStopAccount(Map<String, Object> map);
} }
...@@ -107,4 +107,11 @@ public class TzsUserInfoVo { ...@@ -107,4 +107,11 @@ public class TzsUserInfoVo {
*/ */
@TableField("amos_user_id") @TableField("amos_user_id")
private String amosUserId; private String amosUserId;
/**
* 平台账号锁定状态
*/
@TableField("lock_status")
private String lockStatus;
} }
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
speciality, speciality,
profile, profile,
amos_user_name, amos_user_name,
amos_user_id,
lock_status,
CASE CASE
WHEN gender = 1 THEN WHEN gender = 1 THEN
'男' ELSE '女' '男' ELSE '女'
......
...@@ -126,4 +126,11 @@ public class TzsUserInfoController extends BaseController { ...@@ -126,4 +126,11 @@ public class TzsUserInfoController extends BaseController {
public ResponseModel<Boolean> BindAccount(@RequestBody Map<String, Object> map) { public ResponseModel<Boolean> BindAccount(@RequestBody Map<String, Object> map) {
return ResponseHelper.buildResponse(tzsUserInfoService.BindAccount(map)); return ResponseHelper.buildResponse(tzsUserInfoService.BindAccount(map));
} }
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/startOrStopAccount")
@ApiOperation(httpMethod = "POST", value = "启用或者停用账户", notes = "启用或者停用账户")
public ResponseModel<String> startOrStopAccount(@RequestBody Map<String, Object> map) {
return ResponseHelper.buildResponse(tzsUserInfoService.startOrStopAccount(map));
}
} }
...@@ -51,6 +51,9 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI ...@@ -51,6 +51,9 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
private final String USER_ROLE = "QYRYJS"; private final String USER_ROLE = "QYRYJS";
//企业人员用户组 //企业人员用户组
private final String ROLE_GROUP = "QYRYYHZ"; private final String ROLE_GROUP = "QYRYYHZ";
//平台用户锁定状态
private final String UNLOCK = "UNLOCK";
private final String LOCK = "LOCK";
@Autowired @Autowired
private TzsUserQualificationsServiceImpl tzsUserQualificationsService; private TzsUserQualificationsServiceImpl tzsUserQualificationsService;
...@@ -231,6 +234,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI ...@@ -231,6 +234,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
TzsUserInfo tzsUserInfo = tzsUserInfoMapper.selectById(sequenceNbr); TzsUserInfo tzsUserInfo = tzsUserInfoMapper.selectById(sequenceNbr);
tzsUserInfo.setAmosUserId(userResult.getResult().getUserId()); tzsUserInfo.setAmosUserId(userResult.getResult().getUserId());
tzsUserInfo.setAmosUserName(userResult.getResult().getUserName()); tzsUserInfo.setAmosUserName(userResult.getResult().getUserName());
tzsUserInfo.setLockStatus(status);
tzsUserInfoMapper.updateById(tzsUserInfo); tzsUserInfoMapper.updateById(tzsUserInfo);
} }
return true; return true;
...@@ -244,4 +248,26 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI ...@@ -244,4 +248,26 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
} }
} }
@Override
public String startOrStopAccount(Map<String, Object> map) {
Long sequenceNbr = Long.valueOf(map.get("sequenceNbr").toString());
String amosUserId = map.get("amosUserId").toString();
String lockStatus = null;
FeignClientResult<List<String>> userResult = null;
if (UNLOCK.equals(map.get("lockStatus"))) {
userResult = Privilege.agencyUserClient.lockUsers(amosUserId);
lockStatus = 200 == userResult.getStatus() ? LOCK : UNLOCK;
} else {
userResult = Privilege.agencyUserClient.unlockUsers(amosUserId);
lockStatus = 200 == userResult.getStatus() ? UNLOCK : LOCK;
}
if(!ObjectUtils.isEmpty(lockStatus)){
TzsUserInfo tzsUserInfo = new TzsUserInfo();
tzsUserInfo.setSequenceNbr(sequenceNbr);
tzsUserInfo.setLockStatus(lockStatus);
tzsUserInfoMapper.updateById(tzsUserInfo);
}
return userResult.getResult().get(0);
}
} }
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