Commit 9c9ad17f authored by wzp's avatar wzp

修改bug

parent 103afbf4
...@@ -23,4 +23,6 @@ public interface TUserService extends IService<TUser> { ...@@ -23,4 +23,6 @@ public interface TUserService extends IService<TUser> {
TUser selectById(String id); TUser selectById(String id);
List<TUser> getUserList(TUser user); List<TUser> getUserList(TUser user);
boolean addBox(TUser user);
} }
...@@ -3,8 +3,10 @@ package cn.wisenergy.chnmuseum.party.service.impl; ...@@ -3,8 +3,10 @@ package cn.wisenergy.chnmuseum.party.service.impl;
import cn.wisenergy.chnmuseum.party.common.enums.AuditOperationEnum; import cn.wisenergy.chnmuseum.party.common.enums.AuditOperationEnum;
import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum; import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum;
import cn.wisenergy.chnmuseum.party.mapper.TAreaMapper; import cn.wisenergy.chnmuseum.party.mapper.TAreaMapper;
import cn.wisenergy.chnmuseum.party.model.TBoxOperation;
import cn.wisenergy.chnmuseum.party.model.TUser; import cn.wisenergy.chnmuseum.party.model.TUser;
import cn.wisenergy.chnmuseum.party.mapper.TUserMapper; import cn.wisenergy.chnmuseum.party.mapper.TUserMapper;
import cn.wisenergy.chnmuseum.party.model.TUserRole;
import cn.wisenergy.chnmuseum.party.service.TUserService; import cn.wisenergy.chnmuseum.party.service.TUserService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
...@@ -15,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -15,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
...@@ -28,6 +31,7 @@ import java.util.List; ...@@ -28,6 +31,7 @@ import java.util.List;
*/ */
@Slf4j @Slf4j
@Service @Service
@Transactional
public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements TUserService { public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements TUserService {
@Resource @Resource
...@@ -36,6 +40,13 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements ...@@ -36,6 +40,13 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
@Resource @Resource
private TAreaMapper areaMapper; private TAreaMapper areaMapper;
@Resource
TBoxOperationServiceImpl boxOperationService;
@Resource
TUserRoleServiceImpl tUserRoleService;
@Override @Override
public TUser selectByUsername(String userName) { public TUser selectByUsername(String userName) {
return tUserMapper.selectByUsername(userName); return tUserMapper.selectByUsername(userName);
...@@ -43,15 +54,15 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements ...@@ -43,15 +54,15 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
@Override @Override
public Page<TUser> getList(Page<TUser> page, TUser user) { public Page<TUser> getList(Page<TUser> page, TUser user) {
List<TUser> list = tUserMapper.getList(page,user); List<TUser> list = tUserMapper.getList(page, user);
for (TUser u : list) { for (TUser u : list) {
if (AuditStatusEnum.REFUSED.name().equals(u.getAuditStatus())||AuditStatusEnum.APPROVED_FINAL.name().equals(u.getAuditStatus())){ if (AuditStatusEnum.REFUSED.name().equals(u.getAuditStatus()) || AuditStatusEnum.APPROVED_FINAL.name().equals(u.getAuditStatus())) {
if (AuditOperationEnum.ENABLE.name().equals(u.getStatus())){ if (AuditOperationEnum.ENABLE.name().equals(u.getStatus())) {
u.setStatusName("活跃"); u.setStatusName("活跃");
}else { } else {
u.setStatusName("禁用"); u.setStatusName("禁用");
} }
}else { } else {
u.setStatusName("待审核"); u.setStatusName("待审核");
} }
} }
...@@ -61,7 +72,7 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements ...@@ -61,7 +72,7 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
@Override @Override
public TUser selectById(String id) { public TUser selectById(String id) {
TUser user = tUserMapper.getById(id); TUser user = tUserMapper.getById(id);
if (user.getAreaId()!=null) { if (user.getAreaId() != null) {
String s = areaMapper.selectParent(user.getAreaId()); String s = areaMapper.selectParent(user.getAreaId());
user.setAreas(Arrays.asList(s.split(","))); user.setAreas(Arrays.asList(s.split(",")));
} }
...@@ -74,4 +85,27 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements ...@@ -74,4 +85,27 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
return list; return list;
} }
@Override
public boolean addBox(TUser user) {
boolean ret = false;
ret = save(user);
TBoxOperation tBoxOperation = new TBoxOperation();
tBoxOperation.setOrganId(user.getOrgId());
tBoxOperation.setAreaId(user.getAreaId());
tBoxOperation.setStatus(1);
tBoxOperation.setCreateTime(LocalDateTime.now());
tBoxOperation.setUpdateTime(LocalDateTime.now());
ret = boxOperationService.save(tBoxOperation);
TUserRole userRole = new TUserRole();
userRole.setUserId(user.getId());
userRole.setRoleId("3");
userRole.setIsDeleted(false);
ret = tUserRoleService.save(userRole);
return ret;
}
} }
...@@ -649,7 +649,7 @@ public class TUserController extends BaseController { ...@@ -649,7 +649,7 @@ public class TUserController extends BaseController {
List<TUser> list = this.userService.list(ew); List<TUser> list = this.userService.list(ew);
if (list != null&&list.size()>1&&list.get(0)!=null) { if (list != null&&list.size()>1&&list.get(0)!=null) {
resultMap.put("resultCode", "500"); resultMap.put("resultCode", "500");
resultMap.put("message", "每个单位只能有一个机顶盒账号!"); resultMap.put("message", "该单位机顶盒账号已存在!");
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap); return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
} }
} }
...@@ -667,21 +667,7 @@ public class TUserController extends BaseController { ...@@ -667,21 +667,7 @@ public class TUserController extends BaseController {
user.setAuditStatus(AuditStatusEnum.APPROVED_FINAL.name()); user.setAuditStatus(AuditStatusEnum.APPROVED_FINAL.name());
user.setType("3"); user.setType("3");
boolean ret = this.userService.save(user); boolean ret = this.userService.addBox(user);
TBoxOperation tBoxOperation = new TBoxOperation();
tBoxOperation.setOrganId(user.getOrgId());
tBoxOperation.setAreaId(user.getAreaId());
tBoxOperation.setStatus(1);
tBoxOperation.setCreateTime(LocalDateTime.now());
tBoxOperation.setUpdateTime(LocalDateTime.now());
ret = boxOperationService.save(tBoxOperation);
TUserRole userRole = new TUserRole();
userRole.setUserId(user.getId());
userRole.setRoleId("3");
userRole.setIsDeleted(false);
tUserRoleService.save(userRole);
if (!ret) { if (!ret) {
// 新增失败, 500 // 新增失败, 500
......
...@@ -40,7 +40,7 @@ left join t_organ r on r.id = b.organ_id ...@@ -40,7 +40,7 @@ left join t_organ r on r.id = b.organ_id
from t_user u from t_user u
left join t_organ o on o.id = u.org_id left join t_organ o on o.id = u.org_id
left join t_area a on u.area_id = a.id left join t_area a on u.area_id = a.id
left join t_box_operation b on b.organ_id = o.id inner join t_box_operation b on b.organ_id = o.id
where 1=1 where 1=1
<if test="user.orgId!= null and user.orgId != '' "> <if test="user.orgId!= null and user.orgId != '' ">
and b.organ_id =#{user.orgId} and b.organ_id =#{user.orgId}
......
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