修改文件上传、新增用户、新增部门
parent
ae0f84b10d
commit
4f6f629885
|
|
@ -66,14 +66,14 @@ public class ImgFilesE extends BaseE {
|
|||
//环境
|
||||
private String env;
|
||||
|
||||
public String initAdd(Long tenantId, ImgFilesE baseImgFilesE) {
|
||||
public String initAdd(Long tenantId, ImgFilesE baseImgFilesE) throws Exception {
|
||||
|
||||
MultipartFile[] files = baseImgFilesE.getFiles();
|
||||
Long corpinfoId = ObjectUtils.isEmpty(baseImgFilesE.getCorpinfoId()) ? tenantId : baseImgFilesE.getCorpinfoId();
|
||||
String filePath = corpinfoId.toString() + "/" + DateUtil.getMonth() + "/" + baseImgFilesE.getPath() + "/";
|
||||
String filePath = corpinfoId.toString() + "/" + DateUtil.getMonth() + "/" + baseImgFilesE.getPath();
|
||||
// 文件上传并获取上传路径
|
||||
String resultFilePath = FileUpload.fileUp(files[0], filePath, Tools.get32UUID());
|
||||
return filePath + resultFilePath;
|
||||
String resultFilePath = Smb.saveFile(files[0], filePath);
|
||||
return resultFilePath;
|
||||
}
|
||||
|
||||
public List<ImgFilesE> initBatchAdd(Long tenantId, ImgFilesE baseImgFilesE) throws Exception {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,13 @@
|
|||
package com.zcloud.basic.info.gatewayimpl;
|
||||
|
||||
import com.alibaba.cola.dto.Response;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.jjb.saas.framework.auth.model.SSOUser;
|
||||
import com.jjb.saas.framework.auth.utils.AuthContext;
|
||||
import com.jjb.saas.system.client.dept.facade.DeptFacade;
|
||||
import com.jjb.saas.system.client.dept.request.DeptAddCmd;
|
||||
import com.jjb.saas.system.client.dept.request.FacadeAddDeptCmd;
|
||||
import com.jjb.saas.system.client.dept.response.DeptDetailCO;
|
||||
import com.jjb.saas.system.enums.org.DeptTypeEnum;
|
||||
import com.zcloud.basic.info.domain.gateway.DepartmentGateway;
|
||||
import com.zcloud.basic.info.domain.model.DepartmentE;
|
||||
|
|
@ -47,18 +50,18 @@ public class DepartmentGatewayImpl implements DepartmentGateway {
|
|||
if(StringUtils.isEmpty(d.getDepartmentId())){
|
||||
d.setDepartmentId(Tools.get32UUID());
|
||||
}
|
||||
departmentRepository.save(d);
|
||||
|
||||
SSOUser ssoUser = AuthContext.getCurrentUser();
|
||||
System.out.println(ssoUser.getTenantId());
|
||||
SingleResponse<DeptDetailCO> deptDetailCO = deptFacade.getDetail(departmentE.getParentId());
|
||||
// 需要调用GBS,新增
|
||||
FacadeAddDeptCmd deptCmd = new FacadeAddDeptCmd();
|
||||
deptCmd.setLinkId(d.getId());
|
||||
deptCmd.setLinkName(departmentE.getName());
|
||||
deptCmd.setParentId(departmentE.getParentId());
|
||||
deptCmd.setDeptTypeEnum(DeptTypeEnum.DEPARTMENT.getValue());
|
||||
DeptAddCmd deptCmd = new DeptAddCmd();
|
||||
deptCmd.setDeptName(departmentE.getName());
|
||||
deptCmd.setParentIds(deptDetailCO.getData().getParentIds());
|
||||
//TODO gbs部门表 sys_dept tenant_id,parent_ids,add_type_enum,存储错误,导致gbs页面看不到,参数还没有,待定
|
||||
Response response = deptFacade.addDept(deptCmd);
|
||||
SingleResponse<Long> response = deptFacade.add(deptCmd);
|
||||
d.setId(response.getData());
|
||||
departmentRepository.save(d);
|
||||
log.info("DepartmentAddExe,新增部门调用GBS返回:"+response.toString());
|
||||
return d.getId();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -171,8 +171,8 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
|
|||
List<RoleDeptAddCmd> roleDeptAddCmdList = Collections.singletonList(roleDeptAddCmd);
|
||||
userAddCmd.setRoleDepts(roleDeptAddCmdList);
|
||||
|
||||
Response userid = userFacade.add(userAddCmd);
|
||||
|
||||
SingleResponse<Long> gbsResult = userFacade.add(userAddCmd);
|
||||
userDO.setId(gbsResult.getData());
|
||||
save(userDO);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue