|
@ -7,12 +7,20 @@ import com.alibaba.fastjson.serializer.SimplePropertyPreFilter;
|
|
|
import com.google.gson.JsonObject;
|
|
|
import com.yihu.jw.base.dao.org.BaseOrgDao;
|
|
|
import com.yihu.jw.base.dao.org.OrgTreeDao;
|
|
|
import com.yihu.jw.base.dao.user.UserDao;
|
|
|
import com.yihu.jw.base.dao.user.UserRoleDao;
|
|
|
import com.yihu.jw.base.service.org.tree.SimpleTree;
|
|
|
import com.yihu.jw.base.service.org.tree.SimpleTreeNode;
|
|
|
import com.yihu.jw.base.service.org.tree.Tree;
|
|
|
import com.yihu.jw.base.service.org.tree.TreeNode;
|
|
|
import com.yihu.jw.base.service.user.UserRoleService;
|
|
|
import com.yihu.jw.base.service.user.UserService;
|
|
|
import com.yihu.jw.base.util.ConstantUtils;
|
|
|
import com.yihu.jw.entity.base.user.UserDO;
|
|
|
import com.yihu.jw.entity.base.user.UserRoleDO;
|
|
|
import com.yihu.jw.rm.base.BaseRequestMapping;
|
|
|
import com.yihu.mysql.query.BaseJpaService;
|
|
|
import com.yihu.utils.security.MD5;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import com.yihu.jw.entity.base.org.BaseOrgDO;
|
|
@ -41,6 +49,12 @@ public class BaseOrgService extends BaseJpaService<BaseOrgDO, BaseOrgDao> {
|
|
|
@Autowired
|
|
|
private OrgTreeDao orgTreeDao;
|
|
|
|
|
|
@Autowired
|
|
|
private UserService userService;
|
|
|
|
|
|
@Autowired
|
|
|
private UserRoleService userRoleService;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
@ -72,6 +86,63 @@ public class BaseOrgService extends BaseJpaService<BaseOrgDO, BaseOrgDao> {
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 新增/修改机构
|
|
|
* @param baseOrgDO
|
|
|
* @param orgAdminJson
|
|
|
*/
|
|
|
public String createOrUpdateOrg(BaseOrgDO baseOrgDO,JSONObject orgAdminJson){
|
|
|
UserDO userDO = null;
|
|
|
String mobile = orgAdminJson.getString("mobile");
|
|
|
String adminName = orgAdminJson.getString("orgAdmin");
|
|
|
if(StringUtils.isEmpty(mobile)){
|
|
|
return "paramter for admin is null";
|
|
|
}
|
|
|
//id为空表示新增
|
|
|
if(StringUtils.isEmpty(baseOrgDO.getId())){
|
|
|
baseOrgDao.save(baseOrgDO);
|
|
|
|
|
|
//新增用户(管理员)
|
|
|
userDO = new UserDO();
|
|
|
userDO.setUsername(adminName);
|
|
|
userDO.setMobile(mobile);
|
|
|
userService.register(userDO);
|
|
|
|
|
|
// 新增用户角色关联关系
|
|
|
UserRoleDO userRoleDO = new UserRoleDO();
|
|
|
userRoleDO.setRoleId("");
|
|
|
userRoleDO.setUserId("");
|
|
|
userRoleService.save(userRoleDO);
|
|
|
}else{
|
|
|
String id = orgAdminJson.getString("id");
|
|
|
if(StringUtils.isEmpty(id)){
|
|
|
return "paramter id for admin is null when update";
|
|
|
}
|
|
|
baseOrgDao.save(baseOrgDO);
|
|
|
userDO = userService.findById(id);
|
|
|
//没有修改就不保存
|
|
|
if(StringUtils.endsWithIgnoreCase(adminName,userDO.getUsername()) && StringUtils.endsWithIgnoreCase(mobile,userDO.getMobile())){
|
|
|
return ConstantUtils.SUCCESS;
|
|
|
}
|
|
|
userDO.setUsername(adminName);
|
|
|
userDO.setMobile(mobile);
|
|
|
userService.save(userDO);
|
|
|
}
|
|
|
return ConstantUtils.SUCCESS;
|
|
|
}
|
|
|
|
|
|
|
|
|
/**
|
|
|
* 判断机构代码是否存在
|
|
|
* @param code
|
|
|
* @return
|
|
|
*/
|
|
|
public Boolean existCode(String code){
|
|
|
if(StringUtils.isEmpty(code)) {
|
|
|
return null;
|
|
|
}
|
|
|
return baseOrgDao.existsByCode(code);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 构建机构区域树形结构
|