Skip to content

A
amos-boot-biz
Commit 3bb89af2 authored by zhangyingbin's avatar zhangyingbin
Browse files
Options

修改部门新增/更新接口、修改删除查看接口

parent 7f7daa92
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 76 deletions
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/DepartmentDto.java deleted 100644 → 0
View file @ 7f7daa92
package com.yeejoin.amos.boot.module.ugp.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* @Author cpp
* @Description 部门负责人 部门名称
* @Date 2022/10/25
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="DepartmentDto", description="接收参数")
public class DepartmentDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "部门名称")
private String departmentName;
@ApiModelProperty(value = "部门负责人")
private String departmentHead;
}
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/CompanyController.java
View file @ 3bb89af2
package com.yeejoin.amos.boot.module.ugp.biz.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.sun.org.apache.xpath.internal.objects.XObject;
import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
import com.yeejoin.amos.boot.module.ugp.api.Enum.CompanyTypeEnum;
import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
import com.yeejoin.amos.boot.module.ugp.api.dto.DepartmentDto;
import com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant;
import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
import com.yeejoin.amos.boot.module.ugp.api.mapper.CompanyMapper;
import com.yeejoin.amos.boot.module.ugp.biz.service.impl.OrgServiceImpl;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import com.yeejoin.amos.feign.privilege.model.RoleModel;
import com.yeejoin.amos.feign.privilege.util.DesUtil;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.RegionModel;
import org.springframework.beans.factory.annotation.Value;
......@@ -207,16 +193,33 @@ public class CompanyController extends BaseController {
}
/***
* 部門新增
* @param dto
* 部門新增或更新
* @param jsonObject 表单数据
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@PostMapping(value = "department")
@ApiOperation(httpMethod = "POST", value = "部門新增", notes = "部門新增")
public ResponseModel<Boolean> getInfo(@RequestBody DepartmentDto dto) {
return ResponseHelper.buildResponse(companyServiceImpl.saveDepartment(dto));
@ApiOperation(httpMethod = "POST", value = "部門新增或更新", notes = "部門新增或更新")
public ResponseModel<Boolean> getInfo(@RequestBody JSONObject jsonObject, @RequestParam(required = false) String sequenceNbr) {
return ResponseHelper.buildResponse(companyServiceImpl.saveDepartment(jsonObject,sequenceNbr));
}
/***
* 获取当前登录人所在单位下的所有部门
* @param
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@GetMapping(value = "/deptList")
@ApiOperation(httpMethod = "GET", value = "部門新增", notes = "部門新增")
public ResponseModel<IPage> getDept(String size, String current) {
Page<OrgUsr> page = new Page<>();
page.setSize(Long.parseLong(size));
page.setCurrent(Long.parseLong(current));
return ResponseHelper.buildResponse(orgServiceImpl.getCompanyDept(page));
}
/**
* 企业注册：获取单位类型
*/
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/CompanyServiceImpl.java
View file @ 3bb89af2
......@@ -3,9 +3,7 @@ package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
import com.yeejoin.amos.boot.module.ugp.api.dto.DepartmentDto;
import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
import com.yeejoin.amos.boot.module.ugp.api.mapper.CompanyMapper;
import com.yeejoin.amos.boot.module.ugp.api.service.ICompanyService;
......@@ -19,22 +17,14 @@ import com.yeejoin.amos.feign.privilege.model.RoleModel;
import com.yeejoin.amos.feign.privilege.util.DesUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.*;
import java.util.stream.Collectors;
......@@ -90,25 +80,24 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
* @return
*/
@BusinessIdentify
public Boolean saveDepartment(DepartmentDto dto){
if (ValidationUtil.isEmpty(dto)) {
public Boolean saveDepartment(JSONObject jsonObject,String sequenceNbr){
if (ValidationUtil.isEmpty(jsonObject)) {
return false;
}
//平台添加
DepartmentModel departmentModel = new DepartmentModel( );
ReginParams reginParams = orgService.getReginParams();
departmentModel.setCompanySeq(reginParams.getCompany().getSequenceNbr());
departmentModel.setDepartmentName(dto.getDepartmentName());
departmentModel.setLevel("dept");
departmentModel.setParentId(1L);
departmentModel = Privilege.departmentClient.create(departmentModel).getResult();
//业务添加
JSONObject jsonObject = new JSONObject( );
jsonObject.put("amosOrgId",departmentModel.getSequenceNbr());
jsonObject.put("amosOrgCode",departmentModel.getOrgCode());
OrgUsrDto orgUsrDto = orgService.dataHandling(jsonObject, OrgEnum.部门.getKey( ), null);
if (ValidationUtil.isEmpty(sequenceNbr)) {
//平台添加
DepartmentModel departmentModel = new DepartmentModel( );
ReginParams reginParams = orgService.getReginParams();
departmentModel.setCompanySeq(reginParams.getCompany().getSequenceNbr());
departmentModel.setDepartmentName(jsonObject.getString("name"));
departmentModel.setLevel("dept");
departmentModel.setParentId(1L);
departmentModel = Privilege.departmentClient.create(departmentModel).getResult();
//业务添加
jsonObject.put("amosOrgId",departmentModel.getSequenceNbr());
jsonObject.put("amosOrgCode",departmentModel.getOrgCode());
}
orgService.dataHandling(jsonObject, OrgEnum.部门.getKey(), sequenceNbr);
return true;
}
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/OrgServiceImpl.java
View file @ 3bb89af2
......@@ -236,7 +236,19 @@ public class OrgServiceImpl {
*/
public IPage getCompanyWelder(IPage page){
LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()));
wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()))
.eq(OrgUsr::getBizOrgType,OrgEnum.焊工.getKey());
return getInfo(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()),page);
}
/**
* 获取当前登陆人所在公司/单位/企业 下的 所有部门
* @return
*/
public IPage getCompanyDept(IPage page){
LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()))
.eq(OrgUsr::getBizOrgType,OrgEnum.部门.getKey());
return getInfo(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()),page);
}
......
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