alwaysfrin 7 years ago
commit e3fa15c69e

@ -1,7 +1,9 @@
package cn.estsh.i3plus.core.api.iservice.busi;
import cn.estsh.i3plus.pojo.platform.bean.Department;
import cn.estsh.i3plus.pojo.platform.bean.Organize;
import cn.estsh.i3plus.pojo.platform.bean.Position;
import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
import java.util.List;
@ -14,7 +16,40 @@ import java.util.List;
**/
public interface ICoreTreeService {
Department getDepartmentTreeByParentId(long depParentId);
/**
*
* @param parentId
* @return
*/
List<Position> findPositionTreeByParentId(long parentId);
/**
*
* @param id
* @return
*/
Position getPositionTreeByParentId(long id);
/**
*
* @param parent
* @param step
*/
void findPositionChildrenTreePack(Position parent,int step);
/**
*
* @param parentId
* @return
*/
List<Department> findDepartmentTreeByParentId(long parentId);
/**
*
* @param id
* @return
*/
Department getDepartmentTreeByParentId(long id);
/**
*
@ -24,24 +59,45 @@ public interface ICoreTreeService {
void findDepartmentChildrenTreePack(Department parent,int step);
/**
*
*
* @param parentId
* @return
*/
List<Position> findPositionTreeByParentId(long parentId);
List<Organize> findOrganizeTreeByParentId(long parentId);
/**
*
*
* @param id
* @return
*/
Position getPositionTreeByParentId(long id);
Organize getOrganizeTreeByParentId(long id);
/**
*
* @param parent
* @param step
*/
void findPositionChildrenTreePack(Position parent,int step);
void findOrganizeChildrenTreePack(Organize parent,int step);
/**
*
* @param parentId
* @return
*/
List<SysMenu> findSysMenuTreeByParentId(long parentId);
/**
*
* @param id
* @return
*/
SysMenu getSysMenuTreeByParentId(long id);
/**
*
* @param parent
* @param step
*/
void findSysMenuChildrenTreePack(SysMenu parent, int step);
}

@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.api.iservice.busi;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.Department;
import cn.estsh.i3plus.pojo.platform.bean.Organize;
import java.util.List;
@ -19,7 +20,7 @@ public interface IDepartmentService {
*
* @param department
*/
void insertDepartment(Department department);
Department insertDepartment(Department department);
/**
* id
@ -28,6 +29,13 @@ public interface IDepartmentService {
void deleteDepartmentById(String id);
/**
* id
* @param ids id
* @return
*/
void deleteDepartmentByIds(String[] ids);
/**
*
* @param department
*/
@ -40,6 +48,14 @@ public interface IDepartmentService {
List<Department> listDepartment();
/**
*
* @param department
* @param pager
* @return
*/
ListPager<Department> queryDepartment(Department department, Pager pager);
/**
* id
* @param id
* @return

@ -1,6 +1,9 @@
package cn.estsh.i3plus.core.api.iservice.busi;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.Organize;
import cn.estsh.i3plus.pojo.platform.bean.Position;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import org.springframework.transaction.annotation.Transactional;
@ -36,6 +39,13 @@ public interface IOrganizeService {
void deleteOrganizeById(String id);
/**
* id
* @param ids id
* @return
*/
void deleteOrganizeByIds(String[] ids);
/**
*
* @param organize
* @return
@ -46,7 +56,15 @@ public interface IOrganizeService {
*
* @return
*/
List<Organize> findOrganizeAll();
List<Organize> listOrganize();
/**
*
* @param organize
* @param pager
* @return
*/
ListPager<Organize> queryOrganize(Organize organize, Pager pager);
/**
* id

@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.api.iservice.busi;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.Position;
import org.springframework.data.domain.Page;
import java.util.List;
@ -30,6 +31,13 @@ public interface IPositionService {
void deletePositionById(String id);
/**
* id
* @param ids id
* @return
*/
void deletePositionByIds(String[] ids);
/**
*
*
* @param position
@ -45,6 +53,14 @@ public interface IPositionService {
List listPosition();
/**
*
* @param position
* @param pager
* @return
*/
ListPager<Position> queryPosition(Position position, Pager pager);
/**
* Key
*
* @param id
@ -60,10 +76,5 @@ public interface IPositionService {
*/
ListPager findPositionByPager(Position position, Pager pager);
/**
* id
* @param ids id
* @return
*/
void deletePositionByIds(String[] ids);
}

@ -1,5 +1,7 @@
package cn.estsh.i3plus.core.api.iservice.busi;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
import java.util.List;
@ -34,7 +36,7 @@ public interface ISysConfigService {
/**
*
*/
List<SysConfig> findSysConfigAll();
List<SysConfig> ListSysConfig();
/**
* id
@ -42,4 +44,11 @@ public interface ISysConfigService {
*/
SysConfig getSysConfigById(String Id);
/**
*
* @param sysConfig
* @param pager
* @return
*/
ListPager querySysConfigByPager(SysConfig sysConfig, Pager pager);
}

@ -1,5 +1,7 @@
package cn.estsh.i3plus.core.api.iservice.busi;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
import java.util.List;
@ -45,9 +47,19 @@ public interface ISysDictionaryService {
SysDictionary getSysDictionaryById(String id);
/**
* id
* @param parentId
*
* @param parentCode
* @return
*/
List<SysDictionary> findSysDictionaryByCode(String parentId);
List<SysDictionary> findSysDictionaryByParentCode(String parentCode);
/**
*
*/
ListPager querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager);
/**
*
*/
List<SysDictionary> findSysDictionaryByTop();
}

@ -1,6 +1,9 @@
package cn.estsh.i3plus.core.api.iservice.busi;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.Department;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
@ -32,6 +35,14 @@ public interface ISysMenuService {
void updateSysMenuStatus(String id, int status, SessionUser user);
/**
*
* @param ids
* @param status
* @param user
*/
void updateSysMenuStatusByIds(String[] ids, int status, SessionUser user);
/**
* Key
* @param id
* @return
@ -61,6 +72,14 @@ public interface ISysMenuService {
*/
SysMenu getSysMenuById(String id);
/**
*
* @param menu
* @param pager
* @return
*/
ListPager<SysMenu> querySysMenu(SysMenu menu, Pager pager);
}

@ -1,6 +1,9 @@
package cn.estsh.i3plus.core.api.iservice.busi;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
import cn.estsh.i3plus.pojo.platform.bean.SysRole;
import org.springframework.transaction.annotation.Transactional;
@ -59,4 +62,12 @@ public interface ISysRoleService {
* @return
*/
SysRole getSysRoleById(String id);
/**
*
* @param role
* @param pager
* @return
*/
ListPager<SysRole> querySysRole(SysRole role, Pager pager);
}

@ -1,6 +1,9 @@
package cn.estsh.i3plus.core.api.iservice.busi;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.Tool;
import cn.estsh.i3plus.pojo.platform.bean.ToolType;
import java.util.List;
@ -43,4 +46,24 @@ public interface IToolService {
* @return
*/
Tool getToolById(String id);
/**
*
* @param tool
* @param pager
* @return
*/
ListPager queryToolByPager(Tool tool, Pager pager);
/**
* id
* @param id
*/
void updateStatusEnable(String id);
/**
* id
* @param id
*/
void updateStatusDisable(String id);
}

@ -1,5 +1,8 @@
package cn.estsh.i3plus.core.api.iservice.busi;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
import cn.estsh.i3plus.pojo.platform.bean.ToolType;
import java.util.List;
@ -43,4 +46,18 @@ public interface IToolTypeService {
* @return
*/
ToolType getToolTypeById(String id);
/**
*
* @param toolType
* @param pager
* @return
*/
ListPager queryToolTypeByPager(ToolType toolType, Pager pager);
/**
*
* @param ids
*/
void deleteToolTypeByIds(String[] ids);
}

@ -7,6 +7,7 @@ import cn.estsh.i3plus.core.apiservice.controller.DemoAuthController;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.Department;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysUser;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
@ -59,7 +60,8 @@ public class AuthController {
AuthUtil.setSessionObject("languageCode",languageCode);
String sessionId = request.getSession().getId();
String token = "{accessToken:'"+sessionId+"',expiresIn:1800}";
return new ResultBean(true,token,AuthUtil.getSessionUser());
SysUser sysUser = AuthUtil.getSessionUser().getUser();
return new ResultBean(true,token,sysUser);
} catch (ImppBusiException e) {
return new ResultBean(false,e.getErrorDetail() + ",so:" + e.getErrorSolution());
}catch (Exception e){

@ -4,11 +4,13 @@ import cn.estsh.i3plus.core.api.iservice.busi.IDepartmentService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.Department;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ResultBean;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
@ -38,7 +40,6 @@ public class DepartmentController {
@Autowired
public IDepartmentService departmentService;
@PostMapping(value = "/insert")
@ApiOperation(value = "添加部门", notes = "返回内容添加部门")
public ResultBean insertDepartment(Department department) {
@ -48,12 +49,15 @@ public class DepartmentController {
//条件验证
ValidatorBean.beginValid(department)
.notNull("departmentName", department.getName())
.notNull("name", department.getName())
.notNull("departmentCode", department.getDepartmentCode())
.checkNotZero("organizeId",department.getOrganizeId());
//新增初始化
ConvertBean.modelInitialize(department, user);
if(department.getParentId() == null || department.getParentId().intValue() == 0){
department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
}
departmentService.insertDepartment(department);
return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@ -80,8 +84,10 @@ public class DepartmentController {
.notNull("departmentCode", department.getDepartmentCode())
.checkNotZero("organizeId",department.getOrganizeId());
//修改初始化
ConvertBean.modelUpdate(department, user);
if(department.getParentId() == null || department.getParentId().intValue() == 0){
department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
}
departmentService.updateDepartment(department);
return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@ -132,14 +138,15 @@ public class DepartmentController {
@ApiOperation(value = "根据id查询部门", notes = "根据id查询部门")
public ResultBean getDepartmentById(@PathVariable("id") String id) {
try {
// todo NULL判断
ValidatorBean.checkNotNull(id, "角色id 不能为空");
Department department = departmentService.getDepartmentById(id);
if (department != null) {
return ResultBean.success("查询成功")
.setResultObject(department).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}else {
return ResultBean.fail("部门不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
}
ValidatorBean.beginValid(department);
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(department);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep.getErrorShow());
@ -168,17 +175,23 @@ public class DepartmentController {
@DeleteMapping(value = "/batch-delete")
@ApiOperation(value = "根据id批量删除", notes = "根据id批量删除")
public ResultBean deleteDepartmentByIds(@RequestBody String[] ids) {
try {
// TODO 集合校验
// departmentService.(ids);
public ResultBean deleteDepartmentByIds(String[] ids){
try{
if(ids.length == 0){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("请选择需要删除的资源。")
.build();
}
departmentService.deleteDepartmentByIds(ids);
return ResultBean.success("删除成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "{}", busExcep.getErrorDetail(), busExcep);
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}", e.getMessage(), e);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}

@ -9,7 +9,9 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
* @Description :
@ -30,13 +32,22 @@ public class EnumController {
Arrays.asList(CommonEnumUtil.METHOD_LEVEL.values()));
}
@GetMapping("/data-status")
@GetMapping("/user-data-status")
@ApiOperation(value = "数据功能状态", notes = "查询全部数据状态功能")
public ResultBean getEnumDataStatus(){
public ResultBean getEnumUserDataStatus(){
return new ResultBean(true, "操作成功",
Arrays.asList(CommonEnumUtil.DATA_STATUS.values()));
}
@GetMapping("/data-status")
@ApiOperation(value = "数据功能状态", notes = "查询全部数据状态功能")
public ResultBean getEnumDataStatus(){
List<CommonEnumUtil.DATA_STATUS> enumList = new ArrayList();
enumList.add(CommonEnumUtil.DATA_STATUS.ENABLE);
enumList.add(CommonEnumUtil.DATA_STATUS.DISABLE);
return new ResultBean(true, "操作成功",enumList);
}
@GetMapping("/organize-type")
@ApiOperation(value = "组织类型", notes = "查询全部组织类型功能")
public ResultBean getEnumOrganizeType(){
@ -114,17 +125,10 @@ public class EnumController {
Arrays.asList(ImppEnumUtil.TOOL_DATA_TYPE.values()));
}
@GetMapping("/sys-param-type")
@GetMapping("/sys-config-type")
@ApiOperation(value = "系统参数类型", notes = "系统参数类型")
public ResultBean getSysParamType(){
return new ResultBean(true, "操作成功",
Arrays.asList(ImppEnumUtil.SYS_PARAM_TYPE.values()));
}
@GetMapping("/comm-status")
@ApiOperation(value = "通用状态", notes = "通用状态")
public ResultBean getCommStatus(){
return new ResultBean(true, "操作成功",
Arrays.asList(ImppEnumUtil.COMM_STATUS.values()));
Arrays.asList(ImppEnumUtil.SYS_CONFIG_TYPE.values()));
}
}

@ -2,10 +2,14 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.IOrganizeService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.Organize;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ResultBean;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
@ -47,6 +51,9 @@ public class OrganizeController {
//新增初始化
ConvertBean.modelInitialize(organize, AuthUtil.getSessionUser());
if(organize.getParentId() == null || organize.getParentId().intValue() == 0){
organize.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
}
organize = organizeService.insertOrganize(organize);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(organize);
@ -69,6 +76,9 @@ public class OrganizeController {
.notNull("organizeTypeId", organize.getOrganizeTypeId());
ConvertBean.modelUpdate(organize, AuthUtil.getSessionUser());
if(organize.getParentId() == null || organize.getParentId().intValue() == 0){
organize.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
}
organizeService.updateOrganize(organize);
return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@ -102,7 +112,7 @@ public class OrganizeController {
@ApiOperation(value = "查询Organize", notes = "查询所有组织")
public ResultBean findOrganizeAll() {
try {
List<Organize> list = organizeService.findOrganizeAll();
List<Organize> list = organizeService.listOrganize();
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(list);
@ -115,6 +125,22 @@ public class OrganizeController {
}
}
@GetMapping(value="/query")
@ApiOperation(value="查询所有组织",notes="查询所有组织")
public ResultBean queryPosition(Organize organize, Pager pager){
try{
ListPager<Organize> listPager = organizeService.queryOrganize(organize, pager);
return ResultBean.success("操作成功").setListPager(listPager)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@GetMapping(value = "/get/{id}")
@ApiOperation(value = "查询组织", notes = "查询根据ID查询组织")
public ResultBean getByOrganizeId(@PathVariable("id") String id) {
@ -155,4 +181,29 @@ public class OrganizeController {
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
}
}
@DeleteMapping(value = "/batch-delete")
@ApiOperation(value = "根据id批量删除", notes = "根据id批量删除")
public ResultBean deleteOrganizeByIds(String[] ids){
try{
if(ids.length == 0){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("请选择需要删除的资源。")
.build();
}
organizeService.deleteOrganizeByIds(ids);
return ResultBean.success("删除成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
}

@ -21,7 +21,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.websocket.server.PathParam;
import java.util.List;
/**
@ -52,8 +51,10 @@ public class PositionController {
.notNull("name",position.getName())
.notNull("positionCode",position.getPositionCode());
//新增初始化
ConvertBean.modelInitialize(position,user);
if(position.getParentId() == null || position.getParentId().intValue() == 0){
position.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
}
positionService.insertPosition(position);
return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@ -81,6 +82,9 @@ public class PositionController {
//修改初始化
ConvertBean.modelUpdate(position,user);
if(position.getParentId() == null || position.getParentId().intValue() == 0){
position.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
}
positionService.updatePosition(position);
return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@ -127,13 +131,12 @@ public class PositionController {
}
}
@GetMapping(value="/get/{id}")
@ApiOperation(value="根据id查询岗位",notes="根据id查询岗位")
public ResultBean getPositionById(@PathVariable("id") String id){
@GetMapping(value="/query")
@ApiOperation(value="查询所有岗位",notes="查询所有岗位")
public ResultBean queryPosition(Position position,Pager pager){
try{
Position position = positionService.getPositionById(id);
return ResultBean.success("查询成功")
.setResultObject(position)
ListPager<Position> listPager = positionService.queryPosition(position, pager);
return ResultBean.success("操作成功").setListPager(listPager)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
@ -144,14 +147,19 @@ public class PositionController {
}
}
@GetMapping(value="/query")
@ApiOperation(value="根据名称和代码查询岗位",notes="根据名称和代码查询岗位")
public ResultBean queryPositionByPager(Position position, Pager pager){
@GetMapping(value="/get/{id}")
@ApiOperation(value="根据id查询岗位",notes="根据id查询岗位")
public ResultBean getPositionById(@PathVariable("id") String id){
try{
ListPager positionListPager = positionService.findPositionByPager(position,pager);
ValidatorBean.checkNotNull(id, "id 不能为空");
Position position = positionService.getPositionById(id);
ValidatorBean.beginValid(position)
.notNull("id",position.getId());
return ResultBean.success("查询成功")
.setListPager(positionListPager)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
.setResultObject(position)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());

@ -2,6 +2,8 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
@ -27,7 +29,7 @@ import java.util.List;
* @Modify :
**/
@RestController
@RequestMapping("/sys_config")
@RequestMapping("/sys-config")
@Api(description = "系统参数管理服务")
public class SysConfigController {
public static final Logger LOGGER = LoggerFactory.getLogger(SysConfigController.class);
@ -35,7 +37,7 @@ public class SysConfigController {
@Autowired
public ISysConfigService sysConfigService;
@PutMapping("/insert")
@PostMapping("/insert")
@ApiOperation(value = "添加系统参数",notes = "添加系统参数")
public ResultBean insertSysConfig(SysConfig sysConfig) {
try {
@ -46,7 +48,8 @@ public class SysConfigController {
ValidatorBean.beginValid(sysConfig)
.notNull("name",sysConfig.getName())
.notNull("configCode",sysConfig.getConfigCode())
.notNull("configTypeId",sysConfig.getConfigTypeId());
.notNull("configTypeId",sysConfig.getConfigTypeId())
.notNull("configValue",sysConfig.getConfigValue());
//修改初始化
ConvertBean.modelInitialize(sysConfig,user);
@ -62,9 +65,9 @@ public class SysConfigController {
}
}
@DeleteMapping(value = "/delete")
@DeleteMapping(value = "/delete/{id}")
@ApiOperation(value = "根据id删除系统参数", notes = "根据id删除系统参数")
public ResultBean deleteSysConfig(String id) {
public ResultBean deleteSysConfig(@PathVariable("id") String id) {
try {
sysConfigService.deleteSysConfigById(id);
return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@ -88,7 +91,8 @@ public class SysConfigController {
ValidatorBean.beginValid(sysConfig)
.notNull("name",sysConfig.getName())
.notNull("configCode",sysConfig.getConfigCode())
.notNull("configTypeId",sysConfig.getConfigTypeId());
.notNull("configTypeId",sysConfig.getConfigTypeId())
.notNull("configValue",sysConfig.getConfigValue());
//添加初始化
ConvertBean.modelUpdate(sysConfig,user);
@ -104,13 +108,13 @@ public class SysConfigController {
}
}
@GetMapping(value = "/find-all")
@GetMapping(value = "/list")
@ApiOperation(value = "查询全部系统参数",notes = "查询全部系统参数")
public ResultBean findSysConfigAll(){
try {
List<SysConfig> sysConfig = sysConfigService.findSysConfigAll();
List<SysConfig> sysConfigList = sysConfigService.ListSysConfig();
return ResultBean.success("查询成功")
.setResultList(sysConfig)
.setResultList(sysConfigList)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
@ -121,12 +125,33 @@ public class SysConfigController {
}
}
@GetMapping(value = "/get-by-id")
public ResultBean getSysConfigById(String id){
@GetMapping(value = "/get/{id}")
@ApiOperation(value = "根据id查询系统参数",notes = "根据id查询系统参数")
public ResultBean getSysConfigById(@PathVariable("id") String id){
try {
SysConfig sysConfig = sysConfigService.getSysConfigById(id);
if (sysConfig != null) {
return ResultBean.success("查询成功")
.setResultObject(sysConfig).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}else {
return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
}
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@GetMapping("/query")
@ApiOperation(value = "系统参数复杂查询,分页,排序",notes = "系统参数复杂查询,分页,排序")
public ResultBean querySysConfigByPager(SysConfig sysConfig,Pager pager) {
try {
ListPager sysConfigListPager = sysConfigService.querySysConfigByPager(sysConfig,pager);
return ResultBean.success("查询成功")
.setResultObject(sysConfig)
.setListPager(sysConfigListPager)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);

@ -2,6 +2,8 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
@ -49,7 +51,7 @@ public class SysDictionaryController {
.notNull("dictionaryValue",sysDictionary.getDictionaryValue())
.notNull("dictionarySort",sysDictionary.getDictionarySort());
//修改初始化
//新增初始化
ConvertBean.modelInitialize(sysDictionary,user);
sysDictionaryService.insertSysDictionary(sysDictionary);
@ -114,8 +116,9 @@ public class SysDictionaryController {
public ResultBean findSysDictionaryAll() {
try {
List<SysDictionary> sysDictionaryList = sysDictionaryService.listSysDictionary();
return ResultBean.success("查询成功").setResultList(sysDictionaryList)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
return ResultBean.success("查询成功")
.setResultList(sysDictionaryList)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep.getErrorShow());
@ -140,19 +143,21 @@ public class SysDictionaryController {
return ResultBean.fail("字典不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
}
} catch (ImppBusiException busExcep) {
busExcep.printStackTrace();
LOGGER.error(busExcep.getErrorMsg() + "{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep.getErrorShow());
} catch (Exception e) {
e.printStackTrace();
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@GetMapping(value = "/find/{code}")
@ApiOperation(value = "根据code查询字典项", notes = "根据code查询字典项")
public ResultBean findSysDictionaryByCode(@PathVariable("code") String code) {
@ApiOperation(value = "根据父级code查询字典项", notes = "根据父级code查询字典项")
public ResultBean findSysDictionaryByParentCode(@PathVariable("code") String code) {
try {
List<SysDictionary> sysDictionaryList = sysDictionaryService.findSysDictionaryByCode(code);
List<SysDictionary> sysDictionaryList = sysDictionaryService.findSysDictionaryByParentCode(code);
return ResultBean.success("查询成功").setResultList(sysDictionaryList)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
@ -163,4 +168,38 @@ public class SysDictionaryController {
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@GetMapping("/query")
@ApiOperation(value = "字典复杂查询,分页,排序",notes = "字典复杂查询,分页,排序")
public ResultBean querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager) {
try {
ListPager sysDictionaryListPager = sysDictionaryService.querySysDictionaryByPager(sysDictionary,pager);
return ResultBean.success("查询成功")
.setListPager(sysDictionaryListPager)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@GetMapping("/find/top")
@ApiOperation(value = "查询顶级字典项",notes = "查询顶级字典项")
public ResultBean findSysDictionaryByTop() {
try {
List<SysDictionary> sysDictionaryList = sysDictionaryService.findSysDictionaryByTop();
return ResultBean.success("查询成功")
.setResultList(sysDictionaryList)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
}

@ -2,7 +2,10 @@
import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.Organize;
import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
@ -114,6 +117,23 @@ public class SysMenuController {
}
}
@GetMapping(value="/query")
@ApiOperation(value="查询所有权限",notes="查询所有权限")
public ResultBean queryPosition(SysMenu menu, Pager pager){
try{
ListPager<SysMenu> listPager = sysMenuService.querySysMenu(menu, pager);
return ResultBean.success("操作成功").setListPager(listPager)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@GetMapping(value = "/get/{id}")
@ApiOperation(value = "查询系统功能", notes = "查询根据ID查询系统功能")
public ResultBean getById(@PathVariable("id") String id) {
@ -155,5 +175,24 @@ public class SysMenuController {
}
}
@PutMapping(value = "/batch-status")
@ApiOperation(value = "批量修改系统功能状态", notes = "根据ID修改系统功能状态")
public ResultBean updateBatchStatus(String[] ids,int status) {
try {
// 数据校验
ValidatorBean.checkNotNull(ids, "功能id 不能为空");
ValidatorBean.checkNotZero(status, "功能状态不能为空");
sysMenuService.updateSysMenuStatusByIds(ids,status,AuthUtil.getSessionUser());
return new ResultBean(true);
} catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
}
}
}

@ -3,6 +3,9 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.IPositionService;
import cn.estsh.i3plus.core.api.iservice.busi.IToolService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.Department;
@ -56,7 +59,7 @@ public class ToolController {
// 添加初始化
ConvertBean.modelInitialize(tool,user);
tool.setToolStatusId(ImppEnumUtil.COMM_STATUS.ENABLE.getValue());
tool.setToolStatusId(CommonEnumUtil.DATA_STATUS.ENABLE.getValue());
toolService.insertTool(tool);
return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@ -69,8 +72,6 @@ public class ToolController {
}
}
@PutMapping("/update")
@ApiOperation(value = "修改硬件",notes = "修改硬件")
public ResultBean updateTool(Tool tool){
@ -159,4 +160,53 @@ public class ToolController {
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@GetMapping(value = "/query")
@ApiOperation(value = "硬件类型复杂查询,分页,排序",notes = "硬件类型复杂查询,分页,排序")
public ResultBean queryToolByPager(Tool tool, Pager pager){
try {
ListPager sysToolListPager = toolService.queryToolByPager(tool,pager);
return ResultBean.success("查询成功")
.setListPager(sysToolListPager)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@PutMapping(value = "/update/status/enable")
@ApiOperation(value = "硬件类型启用",notes = "硬件类型禁用")
public ResultBean updateStatusEnable(String id){
try {
toolService.updateStatusEnable(id);
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@PutMapping(value = "/update/status/disable")
@ApiOperation(value = "硬件类型启用",notes = "硬件类型禁用")
public ResultBean updateStatusDisable(String id){
try {
toolService.updateStatusDisable(id);
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
}

@ -2,11 +2,15 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.IToolTypeService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.ToolType;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ResultBean;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
@ -60,7 +64,7 @@ public class ToolTypeController {
}
@PutMapping("/update")
@ApiOperation(value = "添加硬件类型",notes = "添加硬件类型")
@ApiOperation(value = "修改硬件类型",notes = "修改硬件类型")
public ResultBean updateToolType(ToolType toolType){
try {
// 登录用户
@ -140,4 +144,44 @@ public class ToolTypeController {
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@GetMapping(value = "/query")
@ApiOperation(value = "硬件类型复杂查询,分页,排序",notes = "硬件类型复杂查询,分页,排序")
public ResultBean queryToolTypeByPager(ToolType toolType, Pager pager){
try {
ListPager sysDictionaryListPager = toolTypeService.queryToolTypeByPager(toolType,pager);
return ResultBean.success("查询成功")
.setListPager(sysDictionaryListPager)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@DeleteMapping("/batch-delete")
@ApiOperation(value = "批量删除硬件类型",notes = "批量删除硬件类型")
public ResultBean deleteToolTypeByIds(String[] ids){
try{
if(ids.length == 0){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("请选择需要删除的资源。")
.build();
}
toolTypeService.deleteToolTypeByIds(ids);
return ResultBean.success("删除成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
}

@ -1,8 +1,10 @@
package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService;
import cn.estsh.i3plus.core.api.iservice.busi.IOrganizeService;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.Department;
import cn.estsh.i3plus.pojo.platform.bean.Organize;
import cn.estsh.i3plus.pojo.platform.bean.Position;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
@ -20,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @Description :
* @Description :
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-29 14:56
@ -36,8 +38,11 @@ public class TreeController {
@Autowired
private ICoreTreeService coreTreeService;
@Autowired
private IOrganizeService organizeService;
@GetMapping(value="/position/get/{id}")
@ApiOperation(value="查询部门树",notes="通过部门主键获取部门树,-1为根节点")
@ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树,-1为根节点")
public ResultBean listPositionTree(@PathVariable("id") long id) {
try {
Position position = coreTreeService.getPositionTreeByParentId(id);
@ -56,7 +61,7 @@ public class TreeController {
@GetMapping(value="/position/list/{parentId}")
@ApiOperation(value="查询部门树",notes="通过部门主键获取部门树,-1为根节点")
@ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树,-1为根节点")
public ResultBean listPositionListTree(@PathVariable("parentId") long parentId) {
try {
List<Position> positionList = coreTreeService.findPositionTreeByParentId(parentId);
@ -73,5 +78,76 @@ public class TreeController {
}
}
@GetMapping(value="/organize/get/{id}")
@ApiOperation(value="查询组织树",notes="通过部门主键获取组织树,-1为根节点")
public ResultBean listOrganizeTree(@PathVariable("id") long id) {
try {
Organize obj = coreTreeService.getOrganizeTreeByParentId(id);
return ResultBean.success("查询部门树成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(obj);
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@GetMapping(value="/organize/list/{parentId}")
@ApiOperation(value="查询组织树",notes="通过部门主键获取组织树,-1为根节点")
public ResultBean listOrganizeListTree(@PathVariable("parentId") long parentId) {
try {
List<Organize> resultList = coreTreeService.findOrganizeTreeByParentId(parentId);
return ResultBean.success("查询部门树成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(resultList);
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@GetMapping(value="/department/get/{id}")
@ApiOperation(value="部门树",notes="通过部门主键获取部门树,-1为根节点")
public ResultBean listDepartmentTree(@PathVariable("id") long id) {
try {
Department obj = coreTreeService.getDepartmentTreeByParentId(id);
return ResultBean.success("查询部门树成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(obj);
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@GetMapping(value="/department/list/{parentId}")
@ApiOperation(value="查询组织树",notes="通过部门主键获取组织树,-1为根节点")
public ResultBean listDepartmentListTree(@PathVariable("parentId") long parentId) {
try {
List<Department> resultList = coreTreeService.findDepartmentTreeByParentId(parentId);
return ResultBean.success("查询部门树成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(resultList);
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
}

@ -1,10 +1,11 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService;
import cn.estsh.i3plus.pojo.platform.bean.Department;
import cn.estsh.i3plus.pojo.platform.bean.Position;
import cn.estsh.i3plus.pojo.platform.bean.*;
import cn.estsh.i3plus.pojo.platform.repository.DepartmentRepository;
import cn.estsh.i3plus.pojo.platform.repository.OrganizeRepository;
import cn.estsh.i3plus.pojo.platform.repository.PositionRepository;
import cn.estsh.i3plus.pojo.platform.repository.SysMenuRepository;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import javafx.scene.layout.VBox;
import org.slf4j.Logger;
@ -15,12 +16,13 @@ import org.springframework.stereotype.Service;
import java.util.List;
/**
* @Description :
* @Description : Core
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-24 11:17
* @Modify :
**/
//TODO for -> 传统for
@Service
public class CoreTreeServiceImpl implements ICoreTreeService {
@ -32,35 +34,11 @@ public class CoreTreeServiceImpl implements ICoreTreeService {
@Autowired
private PositionRepository positionRDao;
@Override
public Department getDepartmentTreeByParentId(long depParentId) {
Department depParent = departmentRDao.getById(depParentId);
//封装子集
findDepartmentChildrenTreePack(depParent, 0);
return depParent;
}
/**
*
*
* @param parent
*/
@Override
public void findDepartmentChildrenTreePack(Department parent, int step) {
++step;
List<Department> childDepList = departmentRDao.findByProperty("parentId", parent.getId());
if (childDepList.size() > 0) {
//说明有子集
for (Department depChild : childDepList) {
findDepartmentChildrenTreePack(depChild, step);
}
}
LOGGER.info("【{}】包含子集:{},步长:{}", parent.getName(), childDepList.size(), step);
parent.setChildList(childDepList);
}
@Autowired
private OrganizeRepository organizeRDao;
@Autowired
private SysMenuRepository menuRDao;
@Override
public List<Position> findPositionTreeByParentId(long parentId) {
@ -68,7 +46,6 @@ public class CoreTreeServiceImpl implements ICoreTreeService {
// 循环设置子集
if(result != null && result.size() > 0){
result.stream().forEach(position -> findPositionChildrenTreePack(position,0));
}
@ -102,4 +79,122 @@ public class CoreTreeServiceImpl implements ICoreTreeService {
LOGGER.info("【{}】包含子集:{},步长:{}", parent.getName(), childList.size(), step);
parent.setChildList(childList);
}
@Override
public List<Department> findDepartmentTreeByParentId(long parentId) {
List<Department> result = departmentRDao.findByProperty("parentId", parentId);
// 循环设置子集
if(result != null && result.size() > 0){
result.stream().forEach(department -> findDepartmentChildrenTreePack(department,0));
}
return result;
}
@Override
public Department getDepartmentTreeByParentId(long id) {
// 查找数据
Department department = departmentRDao.getById(id);
// 数据是否真实存在
ValidatorBean.checkNotNull(department,"不存在的部门信息");
// 递归查询子集
findDepartmentChildrenTreePack(department, 0);
return department;
}
@Override
public void findDepartmentChildrenTreePack(Department parent, int step) {
++step;
List<Department> childList = departmentRDao.findByProperty("parentId", parent.getId());
if (childList.size() > 0) {
//说明有子集
for (Department child : childList) {
findDepartmentChildrenTreePack(child, step);
}
}
LOGGER.info("【{}】包含子集:{},步长:{}", parent.getName(), childList.size(), step);
parent.setChildList(childList);
}
@Override
public List<Organize> findOrganizeTreeByParentId(long parentId) {
List<Organize> result = organizeRDao.findByProperty("parentId", parentId);
// 循环设置子集
if(result != null && result.size() > 0){
result.stream().forEach(organize -> findOrganizeChildrenTreePack(organize,0));
}
return result;
}
@Override
public Organize getOrganizeTreeByParentId(long id) {
// 查找数据
Organize organize = organizeRDao.getById(id);
// 数据是否真实存在
ValidatorBean.checkNotNull(organize,"不存在的组织信息");
// 递归查询子集
findOrganizeChildrenTreePack(organize, 0);
return organize;
}
@Override
public void findOrganizeChildrenTreePack(Organize parent, int step) {
++step;
List<Organize> childList = organizeRDao.findByProperty("parentId", parent.getId());
if (childList.size() > 0) { //说明有子集
for (Organize child : childList) {
findOrganizeChildrenTreePack(child, step);
}
}
LOGGER.info("【{}】包含子集:{},步长:{}", parent.getName(), childList.size(), step);
parent.setChildList(childList);
}
@Override
public List<SysMenu> findSysMenuTreeByParentId(long parentId) {
List<SysMenu> result = menuRDao.findByProperty("parentId", parentId);
// 循环设置子集
if(result != null && result.size() > 0){
result.stream().forEach(menu -> findSysMenuChildrenTreePack(menu,0));
}
return result;
}
@Override
public SysMenu getSysMenuTreeByParentId(long id) {
// 查找数据
SysMenu menu = menuRDao.getById(id);
// 数据是否真实存在
ValidatorBean.checkNotNull(menu,"不存在的组织信息");
// 递归查询子集
findSysMenuChildrenTreePack(menu, 0);
return menu;
}
@Override
public void findSysMenuChildrenTreePack(SysMenu parent, int step) {
++step;
List<SysMenu> childList = menuRDao.findByProperty("parentId", parent.getId());
if (childList.size() > 0) { //说明有子集
for (SysMenu child : childList) {
findSysMenuChildrenTreePack(child, step);
}
}
LOGGER.info("【{}】包含子集:{},步长:{}", parent.getName(), childList.size(), step);
parent.setChildList(childList);
}
}

@ -18,7 +18,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.List;
/**
@ -39,9 +38,9 @@ public class DepartmentServiceImpl implements IDepartmentService {
private OrganizeRepository organizeRDao;
@Override
public void insertDepartment(Department department) {
public Department insertDepartment(Department department) {
// 查询父级部门名称
if (department.getParentId() != null && department.getParentId() > 0) {
if (department.getParentId() != null && department.getParentId().intValue() > 0) {
LOGGER.info("部门信息 DEPARTMENT :{}", department.getParentId());
Department parentPosition = departmentRDao.getById(department.getParentId());
ValidatorBean.checkNotNull(parentPosition);
@ -58,7 +57,7 @@ public class DepartmentServiceImpl implements IDepartmentService {
// 新增部门
LOGGER.info("部门信息 DEPARTMENT {}",department);
departmentRDao.insert(department);
return departmentRDao.insert(department);
}
@Override
@ -80,6 +79,25 @@ public class DepartmentServiceImpl implements IDepartmentService {
}
@Override
public void deleteDepartmentByIds(String[] ids) {
long positionCount = departmentRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("parentId",ids));
if (positionCount >= 1) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("存在子节点无法删除!")
.setErrorSolution("请重新操作")
.build();
}else {
long[] array = new long[ids.length];
for (int i = 0; i < ids.length; i++) {
array[i] = Long.parseLong(ids[i]);
}
departmentRDao.deleteByIdIn(array);
}
}
@Override
public void updateDepartment(Department department) {
// 查询父级部门名称
if (department.getParentId() != null && department.getParentId() > 0) {
@ -109,6 +127,23 @@ public class DepartmentServiceImpl implements IDepartmentService {
}
@Override
public ListPager<Department> queryDepartment(Department department, Pager pager) {
LOGGER.info("部门 Department find menu :{} department :{}", department, pager);
if (department == null) {
//不传入实体对象,查询所有
int count = departmentRDao.listCount();
pager = PagerHelper.getPager(pager, count);
return new ListPager(departmentRDao.listPager(pager), pager);
} else {
//生成hql查询语句
String hqlPack = CoreHqlPack.packHqlDepartment(department);
pager = PagerHelper.getPager(pager, departmentRDao.findByHqlWhereCount(hqlPack));
return new ListPager(departmentRDao.findByHqlWherePage(hqlPack + department.orderBy(), pager), pager);
}
}
@Override
public Department getDepartmentById(String id) {
LOGGER.info("部门信息 DEPARTMENT id:{}",id);
return departmentRDao.getById(Long.parseLong(id));
@ -118,13 +153,12 @@ public class DepartmentServiceImpl implements IDepartmentService {
public ListPager<Department> findDepartmentByPager(Department department, Pager pager) {
if (department == null) {
pager = PagerHelper.getPager(pager, departmentRDao.listCount());
// TODO 分页日志格式 排序
return new ListPager(departmentRDao.listPager(pager),pager);
} else {
String hqlPack = CoreHqlPack.packHqlPosition(department);
String hqlPack = CoreHqlPack.packHqlDepartment(department);
pager = PagerHelper.getPager(pager, departmentRDao.findByHqlWhereCount(hqlPack));
// TODO 分页日志格式 排序
return new ListPager(departmentRDao.findByHqlWherePage(hqlPack + department.getOrderByParam(),pager),pager);
hqlPack += department.getOrderByParam() != null ? department.getOrderByParam(): "" ;
return new ListPager(departmentRDao.findByHqlWherePage(hqlPack,pager),pager);
}
}

@ -1,15 +1,17 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.IOrganizeService;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.Organize;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.repository.OrganizeRepository;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import org.aspectj.weaver.ast.Or;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -70,12 +72,30 @@ public class OrganizeServiceImpl implements IOrganizeService {
organizeRDao.deleteById(Long.parseLong(id));
}
@Override
public void deleteOrganizeByIds(String[] ids) {
long positionCount = organizeRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("parentId",ids));
if (positionCount >= 1) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("存在子节点无法删除!")
.setErrorSolution("请重新操作")
.build();
}else {
long[] array = new long[ids.length];
for (int i = 0; i < ids.length; i++) {
array[i] = Long.parseLong(ids[i]);
}
organizeRDao.deleteByIdIn(array);
}
}
@Override
public Organize insertOrganize(Organize organize) {
LOGGER.info("组织 ORGANIZE :{}", organize);
if(organize.getParentId() != null){
if(organize.getParentId() != null && organize.getParentId().intValue() > 0){
Organize org = getOrganizeById(organize.getParentId().toString());
ValidatorBean.checkNotNull(org);
@ -85,12 +105,29 @@ public class OrganizeServiceImpl implements IOrganizeService {
}
@Override
public List<Organize> findOrganizeAll() {
public List<Organize> listOrganize() {
LOGGER.info("组织 ORGANIZE find All");
return organizeRDao.findAll();
}
@Override
public ListPager<Organize> queryOrganize(Organize organize, Pager pager) {
LOGGER.info("组织信息 Organize find Organize page");
if(organize == null){
//不传入实体对象,查询所有
int count = organizeRDao.listCount();
pager = PagerHelper.getPager(pager,count);
return new ListPager(organizeRDao.listPager(pager),pager);
}else {
//生成hql查询语句
String hqlPack = CoreHqlPack.packHqlOrganize(organize);
pager = PagerHelper.getPager(pager,organizeRDao.findByHqlWhereCount(hqlPack));
return new ListPager(organizeRDao.findByHqlWherePage(hqlPack + organize.orderBy(), pager),pager);
}
}
@Override
public Organize getOrganizeById(String id) {
LOGGER.info("组织 ORGANIZE find id:{}", id);
return organizeRDao.getById(Long.parseLong(id));

@ -16,11 +16,13 @@ import cn.estsh.impp.framework.boot.util.ValidatorBean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@ -43,9 +45,9 @@ public class PositionServiceImpl implements IPositionService {
// 查询父级岗位名称
if (position.getParentId() != null && position.getParentId() > 0) {
LOGGER.info("岗位信息 POSITION parentId:{}", position.getParentId());
Position parentPosition = positionRDao.getById(position.getParentId());
ValidatorBean.checkNotNull(parentPosition);
position.setRedParentName(parentPosition.getName());
}
@ -90,12 +92,48 @@ public class PositionServiceImpl implements IPositionService {
}
@Override
public void deletePositionByIds(String[] ids) {
long positionCount = positionRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("parentId",ids));
if (positionCount >= 1) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("存在子节点无法删除!")
.setErrorSolution("请重新操作")
.build();
}else {
long[] array = new long[ids.length];
for (int i = 0; i < ids.length; i++) {
array[i] = Long.parseLong(ids[i]);
}
positionRDao.deleteByIdIn(array);
}
}
@Override
public List listPosition() {
LOGGER.info("岗位信息 Position list");
return positionRDao.list();
}
@Override
public ListPager<Position> queryPosition(Position position, Pager pager) {
LOGGER.info("岗位信息 Position find Position page");
if(position == null){
//不传入实体对象,查询所有
int count = positionRDao.listCount();
pager = PagerHelper.getPager(pager,count);
return new ListPager(positionRDao.listPager(pager),pager);
}else {
//生成hql查询语句
String hqlPack = CoreHqlPack.packHqlPosition(position);
pager = PagerHelper.getPager(pager,positionRDao.findByHqlWhereCount(hqlPack));
return new ListPager(positionRDao.findByHqlWherePage(hqlPack + position.orderBy(), pager),pager);
}
}
@Override
public Position getPositionById(String id) {
LOGGER.info("岗位信息 根据Id查询岗位信息 id:{}", id);
return positionRDao.getById(Long.parseLong(id));
@ -113,21 +151,6 @@ public class PositionServiceImpl implements IPositionService {
}
}
@Override
public void deletePositionByIds(String[] ids) {
long positionCount = positionRDao.findByHqlCount(CoreHqlPack.packHqlIds("id",ids));
if (positionCount >= 1) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("存在子节点无法删除!")
.setErrorSolution("请重新操作")
.build();
}else {
for(String idStr : ids){
positionRDao.deleteById(Long.parseLong(idStr));
}
}
}
}

@ -1,8 +1,12 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
import cn.estsh.i3plus.pojo.platform.repository.SysConfigRepository;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -43,8 +47,8 @@ public class SysConfigServiceImpl implements ISysConfigService {
}
@Override
public List<SysConfig> findSysConfigAll() {
LOGGER.info("系统参数 SYS_CONFIG find-all");
public List<SysConfig> ListSysConfig() {
LOGGER.info("系统参数 SYS_CONFIG list");
return SysConfigRDao.findAll();
}
@ -53,4 +57,18 @@ public class SysConfigServiceImpl implements ISysConfigService {
LOGGER.info("系统参数 SYS_CONFIG id:{}",Id);
return SysConfigRDao.getById(Long.parseLong(Id));
}
@Override
public ListPager querySysConfigByPager(SysConfig sysConfig, Pager pager) {
LOGGER.info("系统参数 SYS_CONFIG SysConfig:{}Pager:{}",sysConfig,pager);
if(sysConfig == null) {
pager = PagerHelper.getPager(pager, SysConfigRDao.listCount());
return new ListPager(SysConfigRDao.listPager(pager),pager);
}else {
String hqlPack = CoreHqlPack.packHqlSysConfig(sysConfig);
pager = PagerHelper.getPager(pager, SysConfigRDao.findByHqlWhereCount(hqlPack));
return new ListPager(SysConfigRDao.findByHqlWherePage(hqlPack + sysConfig.orderBy(),pager),pager);
}
}
}

@ -1,9 +1,13 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService;
import cn.estsh.i3plus.pojo.platform.bean.Position;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
import cn.estsh.i3plus.pojo.platform.repository.SysDictionaryRepository;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -35,6 +39,9 @@ public class SysDictionaryServiceImpl implements ISysDictionaryService {
ValidatorBean.checkNotNull(parentSysDictionary);
sysDictionary.setRedParentName(parentSysDictionary.getName());
sysDictionary.setRedParentCode(parentSysDictionary.getDictionaryCode());
} else {
sysDictionary.setParentId(-1L);
}
LOGGER.info("字典 SYS_DICTIONARY sysDictionary:{}",sysDictionary);
@ -56,6 +63,9 @@ public class SysDictionaryServiceImpl implements ISysDictionaryService {
ValidatorBean.checkNotNull(parentSysDictionary);
sysDictionary.setRedParentName(parentSysDictionary.getName());
sysDictionary.setRedParentCode(parentSysDictionary.getDictionaryCode());
} else {
sysDictionary.setParentId(-1L);
}
LOGGER.info("字典 SYS_DICTIONARY sysDictionary:{}",sysDictionary);
@ -71,12 +81,33 @@ public class SysDictionaryServiceImpl implements ISysDictionaryService {
@Override
public SysDictionary getSysDictionaryById(String id) {
LOGGER.info("字典 SYS_DICTIONARY id:{}",id);
return sysDictionaryRDao.getById(Long.parseLong(id));
SysDictionary ds = sysDictionaryRDao.getById(Long.parseLong(id));
System.out.println(ds);
return ds;
}
@Override
public List<SysDictionary> findSysDictionaryByCode(String code) {
LOGGER.info("字典 SYS_DICTIONARY code:{}",code);
return sysDictionaryRDao.findByHql("select child from SysDictionary dic,SysDictionary child where dic.id = child.parentId and dic.dictionaryCode = '" + code + "'");
public List<SysDictionary> findSysDictionaryByParentCode(String parentCode) {
LOGGER.info("字典 SYS_DICTIONARY parentCode:{}",parentCode);
return sysDictionaryRDao.findByProperty("redParentCode",parentCode);
}
@Override
public ListPager querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager) {
LOGGER.info("字典 SYS_DICTIONARY SysDictionary:{}Pager:{}",sysDictionary,pager);
if(sysDictionary == null) {
pager = PagerHelper.getPager(pager, sysDictionaryRDao.listCount());
return new ListPager(sysDictionaryRDao.listPager(pager),pager);
}else {
String hqlPack = CoreHqlPack.packHqlSysDictionary(sysDictionary);
pager = PagerHelper.getPager(pager, sysDictionaryRDao.findByHqlWhereCount(hqlPack));
return new ListPager(sysDictionaryRDao.findByHqlWherePage(hqlPack + sysDictionary.orderBy(),pager),pager);
}
}
@Override
public List<SysDictionary> findSysDictionaryByTop() {
LOGGER.info("字典 SYS_DICTIONARY parentId:{}", CommonEnumUtil.PARENT.DEFAULT.getValue());
return sysDictionaryRDao.findByProperty("parentId",(long)CommonEnumUtil.PARENT.DEFAULT.getValue());
}
}

@ -1,10 +1,15 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
import cn.estsh.i3plus.pojo.platform.repository.SysMenuRepository;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import org.slf4j.Logger;
@ -45,6 +50,15 @@ public class SysMenuServiceImpl implements ISysMenuService {
}
@Override
public void updateSysMenuStatusByIds(String[] ids, int status, SessionUser user) {
LOGGER.info("系统功能 SYS_MENU ids:{} status:{} user:{}", ids, status, user);
StringBuffer where = new StringBuffer();
HqlPack.getInPack(String.join(",", ids), "id", where);
sysMenuRDao.updateByHqlWhere(where.toString(), "status", status);
}
@Override
public void deleteSysMenuById(String id) {
LOGGER.info("系统功能 SYS_MENU Key:{}", id);
long count = sysMenuRDao.findByPropertyCount("parentId",Long.parseLong(id));
@ -84,4 +98,21 @@ public class SysMenuServiceImpl implements ISysMenuService {
LOGGER.info("系统功能 SYS_MENU find id:{}", id);
return sysMenuRDao.getOne(Long.parseLong(id));
}
@Override
public ListPager<SysMenu> querySysMenu(SysMenu menu, Pager pager) {
LOGGER.info("系统权限 SysMenu find menu :{} page :{}", menu, pager);
if (menu == null) {
//不传入实体对象,查询所有
int count = sysMenuRDao.listCount();
pager = PagerHelper.getPager(pager, count);
return new ListPager(sysMenuRDao.listPager(pager), pager);
} else {
//生成hql查询语句
String hqlPack = CoreHqlPack.packHqlSysMenu(menu);
pager = PagerHelper.getPager(pager, sysMenuRDao.findByHqlWhereCount(hqlPack));
return new ListPager(sysMenuRDao.findByHqlWherePage(hqlPack + menu.orderBy(), pager), pager);
}
}
}

@ -1,10 +1,14 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysRole;
import cn.estsh.i3plus.pojo.platform.repository.SysRoleRepository;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import org.slf4j.Logger;
@ -69,4 +73,21 @@ public class SysRoleServiceImpl implements ISysRoleService {
LOGGER.info("系统角色 SYS_ROLE find id:{}", id);
return sysRoleRDao.getOne(Long.parseLong(id));
}
@Override
public ListPager<SysRole> querySysRole(SysRole role, Pager pager) {
LOGGER.info("系统角色 SysRole find role :{} page :{}", role, pager);
if (role == null) {
//不传入实体对象,查询所有
int count = sysRoleRDao.listCount();
pager = PagerHelper.getPager(pager, count);
return new ListPager(sysRoleRDao.listPager(pager), pager);
} else {
//生成hql查询语句
String hqlPack = CoreHqlPack.packHqlSysRole(role);
pager = PagerHelper.getPager(pager, sysRoleRDao.findByHqlWhereCount(hqlPack));
return new ListPager(sysRoleRDao.findByHqlWherePage(hqlPack + role.orderBy(), pager), pager);
}
}
}

@ -335,6 +335,8 @@ public class SysUserServiceImpl implements ISysUserService {
sessionUser.setDepartmentList(user.getDepartmentList());
sessionUser.setPositionList(user.getPositionList());
sessionUser.setOrganize(user.getOrganize());
sessionUser.setUser(user);
sessionUser.setUserInfo(user.getUserInfo());
if(null != user.getPositionList() && user.getPositionList().size() > 0){
sessionUser.setPosition(user.getPositionList().get(0));

@ -132,7 +132,7 @@ public class SystemResourceService implements ISystemResourceService {
public ListPager<SysLocaleResource> listSysLocaleResourceByPager(SysLocaleResource res, Pager pager) {
if(res == null){
//不传入实体对象,查询所有
int count = sysLocaleResourceRDao.listCount();
int count = (int)sysLocaleResourceRDao.listCount();
pager = PagerHelper.getPager(pager,count);
return new ListPager(sysLocaleResourceRDao.listPager(pager),pager);
}else {

@ -1,11 +1,16 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.IToolService;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.Organize;
import cn.estsh.i3plus.pojo.platform.bean.Tool;
import cn.estsh.i3plus.pojo.platform.bean.ToolType;
import cn.estsh.i3plus.pojo.platform.repository.ToolRepository;
import cn.estsh.i3plus.pojo.platform.repository.ToolTypeRepository;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -74,4 +79,31 @@ public class ToolServiceImpl implements IToolService {
LOGGER.info("硬件 TOOL id:{}",id);
return toolRDao.getById(Long.parseLong(id));
}
@Override
public ListPager queryToolByPager(Tool tool, Pager pager) {
LOGGER.info("硬件 TOOL Tool:{}Pager:{}",tool,pager);
if(tool == null) {
pager = PagerHelper.getPager(pager, toolRDao.listCount());
return new ListPager(toolRDao.listPager(pager),pager);
}else {
String hqlPack = CoreHqlPack.packHqlTool(tool);
pager = PagerHelper.getPager(pager, toolRDao.findByHqlWhereCount(hqlPack));
return new ListPager(toolRDao.findByHqlWherePage(hqlPack + tool.orderBy(),pager),pager);
}
}
@Override
public void updateStatusEnable(String id) {
LOGGER.info("硬件 TOOL id:{}",id);
toolRDao.updateByProperties("id",Long.parseLong(id),
"toolStatusId", CommonEnumUtil.DATA_STATUS.ENABLE.getValue());
}
@Override
public void updateStatusDisable(String id) {
LOGGER.info("硬件 TOOL id:{}",id);
toolRDao.updateByProperties("id",Long.parseLong(id),
"toolStatusId", CommonEnumUtil.DATA_STATUS.DISABLE.getValue());
}
}

@ -1,10 +1,18 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.IToolService;
import cn.estsh.i3plus.core.api.iservice.busi.IToolTypeService;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.Organize;
import cn.estsh.i3plus.pojo.platform.bean.ToolType;
import cn.estsh.i3plus.pojo.platform.repository.ToolRepository;
import cn.estsh.i3plus.pojo.platform.repository.ToolTypeRepository;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -26,6 +34,8 @@ public class ToolTypeServiceImpl implements IToolTypeService {
@Autowired
private ToolTypeRepository toolTypeRDao;
@Autowired
private ToolRepository toolRDao;
@Override
public void insertToolType(ToolType toolType) {
@ -36,14 +46,24 @@ public class ToolTypeServiceImpl implements IToolTypeService {
@Override
public void deleteToolTypeById(String id) {
LOGGER.info("硬件类型 TOOL_TYPE id:{}",id);
toolTypeRDao.deleteById(Long.parseLong(id));
long count = toolRDao.findByPropertyCount("toolTypeId",id);
if(count >= 1){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("存在关联硬件无法删除!")
.setErrorSolution("请重新操作")
.build();
}
toolTypeRDao.deleteById(Long.parseLong(id));
}
@Override
public void updateToolType(ToolType toolType) {
LOGGER.info("硬件类型 TOOL_TYPE toolType:{}",toolType);
toolTypeRDao.update(toolType);
// TODO 修改硬件对象中冗余的硬件类型名称
}
@Override
@ -57,4 +77,37 @@ public class ToolTypeServiceImpl implements IToolTypeService {
LOGGER.info("硬件类型 TOOL_TYPE id:{}",id);
return toolTypeRDao.getById(Long.parseLong(id));
}
@Override
public ListPager queryToolTypeByPager(ToolType toolType, Pager pager) {
LOGGER.info("硬件类型 TOOL_TYPE ToolType:{}Pager:{}",toolType,pager);
if(toolType == null) {
pager = PagerHelper.getPager(pager, toolTypeRDao.listCount());
return new ListPager(toolTypeRDao.listPager(pager),pager);
}else {
String hqlPack = CoreHqlPack.packHqlToolType(toolType);
pager = PagerHelper.getPager(pager, toolTypeRDao.findByHqlWhereCount(hqlPack));
return new ListPager(toolTypeRDao.findByHqlWherePage(hqlPack + toolType.orderBy(),pager),pager);
}
}
@Override
public void deleteToolTypeByIds(String[] ids) {
LOGGER.info("硬件类型 TOOL_TYPE ids:{}", ids.toString());
long count = toolRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("toolTypeId",ids));
if(count >= 1){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("存在关联硬件无法删除!")
.setErrorSolution("请重新操作")
.build();
}else {
long[] array = new long[ids.length];
for (int i = 0; i < ids.length; i++) {
array[i] = Long.parseLong(ids[i]);
}
toolTypeRDao.deleteByIdIn(array);
}
}
}

@ -1,18 +1,14 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.IPositionService;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.FixMethodOrder;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.junit.runners.MethodSorters;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.web.WebAppConfiguration;
import java.util.List;
/**
* @Description :
@ -21,12 +17,10 @@ import java.util.List;
* @Date : 2018-10-29 19:12
* @Modify :
**/
//@SpringBootTest
//@RunWith(SpringRunner.class)
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@AutoConfigureMockMvc
@FixMethodOrder(value = MethodSorters.DEFAULT) // <<--- I will change here for testing ...
public class TestBase {
@Before

@ -0,0 +1,118 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.IDepartmentService;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.Department;
import cn.estsh.i3plus.pojo.platform.bean.Organize;
import com.alibaba.fastjson.JSON;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.annotation.Rollback;
import javax.transaction.Transactional;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-29 19:02
* @Modify :
**/
public class TestDepartmentServiceImpl extends TestBase {
@Autowired
private IDepartmentService departmentService;
/**
*
*/
@Test
@Transactional
public void testInsertDepartment(){
for(int i = 0 ; i < 50 ; i++ ){
Department obj = new Department();
obj.setName("Junit Test " + i);
obj.setDepartmentCode("TEST_JUNIT " + i);
obj.setParentId(1057165194242953216L);
obj.setOrganizeId(1057163974900060160L);
obj = departmentService.insertDepartment(obj);
System.out.println(JSON.toJSONString(obj));
}
}
/**
* Key
* @return
*/
@Test
@Transactional
public void testGetDepartmentById(){
Department obj = departmentService.getDepartmentById("1057163974900060160");
System.out.println(JSON.toJSONString(obj));
}
/**
*
*
* @return
*/
@Test
@Transactional
public void testListDepartment(){
List list = departmentService.listDepartment();
System.out.println(JSON.toJSONString(list));
}
/**
*
* @return
*/
@Test
@Transactional
public void testFindDepartmentByPager(){
Organize obj = new Organize();
Pager pager = new Pager();
pager.setPageSize(10);
pager.setCurrentPage(1);
ListPager list = departmentService.queryDepartment(null, pager);
System.out.println(JSON.toJSONString(list));
}
/**
*
*/
@Test
@Transactional
public void testUpdateDepartment(){
Department obj = departmentService.getDepartmentById("1057108586410414080");
obj.setName("Junit update Name ");
departmentService.updateDepartment(obj);
System.out.println(JSON.toJSONString(obj));
}
/**
* Key
*/
@Test
@Transactional
public void testDeleteDepartmentById(){
// departmentService.deleteOrganizeById("");
}
/**
* id
* @return
*/
@Test
@Transactional
public void deleteDepartmentByIds(){
// departmentService.deleteOrganizeByIds(new String[]{"1057108585445724160","1057108585760296960"});
}
}

@ -0,0 +1,118 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.IOrganizeService;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.Organize;
import cn.estsh.i3plus.pojo.platform.bean.Organize;
import com.alibaba.fastjson.JSON;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.annotation.Rollback;
import javax.transaction.Transactional;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-29 19:02
* @Modify :
**/
public class TestOrganizeServiceImpl extends TestBase {
@Autowired
private IOrganizeService organizeService;
/**
*
*/
@Test
@Transactional
@Rollback(false)
public void testInsertOrganize(){
for(int i = 0 ; i < 50 ; i++ ){
Organize obj = new Organize();
obj.setName("Junit Test " + i);
obj.setOrganizeCode("TEST_JUNIT " + i);
obj.setParentId(-1L);
obj = organizeService.insertOrganize(obj);
System.out.println(JSON.toJSONString(obj));
}
}
/**
* Key
* @return
*/
@Test
@Transactional
public void testGetOrganizeById(){
Organize obj = organizeService.getOrganizeById("1057163974900060160");
System.out.println(JSON.toJSONString(obj));
}
/**
*
*
* @return
*/
@Test
@Transactional
public void testListOrganize(){
List list = organizeService.listOrganize();
System.out.println(JSON.toJSONString(list));
}
/**
*
* @return
*/
@Test
@Transactional
public void testFindOrganizeByPager(){
Organize obj = new Organize();
Pager pager = new Pager();
pager.setPageSize(10);
pager.setCurrentPage(1);
ListPager list = organizeService.queryOrganize(null, pager);
System.out.println(JSON.toJSONString(list));
}
/**
*
*/
@Test
@Transactional
public void testUpdateOrganize(){
Organize obj = organizeService.getOrganizeById("1057108586410414080");
obj.setName("Junit update Name ");
organizeService.updateOrganize(obj);
System.out.println(JSON.toJSONString(obj));
}
/**
* Key
*/
@Test
@Transactional
public void testDeleteOrganizeById(){
// organizeService.deleteOrganizeById("");
}
/**
* id
* @return
*/
@Test
@Transactional
public void deleteOrganizeByIds(){
// organizeService.deleteOrganizeByIds(new String[]{"1057108585445724160","1057108585760296960"});
}
}

@ -1,10 +1,14 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.IPositionService;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.Position;
import com.alibaba.fastjson.JSON;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.annotation.Order;
import org.springframework.test.annotation.Rollback;
import javax.transaction.Transactional;
import java.util.List;
@ -22,57 +26,91 @@ public class TestPositionServiceImpl extends TestBase {
private IPositionService positionService;
/**
*
*
*/
@Test
@Transactional
public void testListPosition() {
List list = positionService.listPosition();
System.out.println(JSON.toJSONString(list));
@Rollback(false)
public void testInsertPosition(){
for(int i = 0 ; i < 50 ; i++ ){
Position position = new Position();
position.setName("Junit Test " + i);
position.setPositionCode("TEST_JUNIT " + i);
position = positionService.insertPosition(position);
System.out.println(JSON.toJSONString(position));
}
}
/**
*
* Key
* @return
*/
@Test
@Transactional
public void testGetPositionById() {
Position position = positionService.getPositionById("1056796316849541120");
System.out.println(JSON.toJSONString(position));
public void testGetPositionById(){
Position pos = positionService.getPositionById("1057108589715525632");
System.out.println(JSON.toJSONString(pos));
}
/**
*
*
*
* @return
*/
@Test
@Transactional
public void testInsertPosition() {
Position position = new Position();
position.setName("张三的岗位");
position.setPositionCode("ZS_CODE");
position.setPositionDescription("描述该岗位的信息");
Position pos = positionService.insertPosition(position);
System.out.println(JSON.toJSONString(pos));
public void testListPosition(){
List list = positionService.listPosition();
System.out.println(JSON.toJSONString(list));
}
/**
*
*
* @return
*/
@Test
@Transactional
public void testDeletePositionById() {
positionService.deletePositionById("105605611393555");
public void testFindPositionByPager(){
Position position = new Position();
Pager pager = new Pager();
pager.setPageSize(10);
pager.setCurrentPage(1);
ListPager list = positionService.findPositionByPager(null, pager);
System.out.println(JSON.toJSONString(list));
}
/**
*
*
*/
@Test
@Transactional
public void testUpdatePosition(){
Position position = positionService.getPositionById("1056878692237709312");
position.setName("===>> 改动后的名称");
Position position = positionService.getPositionById("1057108586410414080");
position.setName("Junit update Name ");
positionService.updatePosition(position);
System.out.println(JSON.toJSONString(position));
}
/**
* Key
*/
@Test
@Transactional
public void testDeletePositionById(){
positionService.deletePositionById("1057108585240203264");
}
/**
* id
* @return
*/
@Test
@Transactional
public void deletePositionByIds(){
positionService.deletePositionByIds(new String[]{"1057108585445724160","1057108585760296960"});
}

@ -0,0 +1,102 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
import com.alibaba.fastjson.JSON;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.annotation.Rollback;
import javax.transaction.Transactional;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @Date : 2018-10-30 10:49
* @Modify :
**/
public class TestSysConfigServiceImpl extends TestBase {
@Autowired
private ISysConfigService sysConfigService;
/**
*
*/
@Test
@Transactional
public void testListSysConfig() {
List list = sysConfigService.ListSysConfig();
System.out.println(JSON.toJSONString(list));
}
/**
* id
*/
@Test
@Transactional
public void testGetSysConfigById() {
SysConfig sysConfig = sysConfigService.getSysConfigById("1057110061127700480");
System.out.println(JSON.toJSONString(sysConfig));
}
/**
*
*/
@Test
@Transactional
@Rollback(false)
public void testInsertSysConfig() {
SysConfig sysConfig = new SysConfig();
sysConfig.setName("系统名称");
sysConfig.setConfigCode("sys_name");
sysConfig.setConfigTypeId(1);
sysConfig.setConfigValue("IMPP");
sysConfig.setConfigDescription("系统名称");
sysConfigService.insertSysConfig(sysConfig);
System.out.println(JSON.toJSONString(sysConfig));
}
/**
*
*/
@Test
@Transactional
public void testUpdateSysConfig(){
SysConfig sysConfig = sysConfigService.getSysConfigById("1057110613261684736");
sysConfig.setConfigDescription("测试修改");
sysConfigService.updateSysConfig(sysConfig);
}
/**
* id
*/
@Test
@Transactional
public void testDeleteSysConfigById(){
sysConfigService.deleteSysConfigById("1057111616417566720");
}
/**
*
*/
@Test
@Transactional
public void testQuerySysConfigByPager(){
SysConfig sysConfig = new SysConfig();
Pager pager = new Pager();
pager.setPageSize(10);
pager.setCurrentPage(1);
ListPager list = sysConfigService.querySysConfigByPager(sysConfig,pager);
System.out.println(list);
}
}

@ -0,0 +1,99 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
import com.alibaba.fastjson.JSON;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.annotation.Rollback;
import javax.transaction.Transactional;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @Date : 2018-10-30 18:52
* @Modify :
**/
public class TestSysDictionaryServiceImpl extends TestBase {
@Autowired
private ISysDictionaryService sysDictionaryService;
/**
*
*/
@Test
@Transactional
public void testListSysDictionary() {
List list = sysDictionaryService.listSysDictionary();
System.out.println(JSON.toJSONString(list));
}
/**
* id
*/
@Test
@Transactional
public void testGetSysDictionaryById() {
SysDictionary sysDictionary = sysDictionaryService.getSysDictionaryById("1057110061127700480");
System.out.println(JSON.toJSONString(sysDictionary));
}
/**
*
*/
@Test
@Transactional
@Rollback(false)
public void testInsertSysDictionary() {
SysDictionary sysDictionary = new SysDictionary();
sysDictionary.setName("字典测试");
sysDictionary.setDictionaryCode("dic_test");
sysDictionary.setDictionaryValue("TEST");
sysDictionary.setDictionaryDescription("字典测试");
sysDictionaryService.insertSysDictionary(sysDictionary);
System.out.println(JSON.toJSONString(sysDictionary));
}
/**
*
*/
@Test
@Transactional
public void testUpdateSysDictionary(){
SysDictionary sysDictionary = sysDictionaryService.getSysDictionaryById("1057110613261684736");
sysDictionary.setName("测试修改");
sysDictionaryService.updateSysDictionary(sysDictionary);
}
/**
* id
*/
@Test
@Transactional
public void testDeleteSysDictionaryById(){
sysDictionaryService.deleteSysDictionaryById("1057111616417566720");
}
/**
*
*/
@Test
@Transactional
public void testQuerySysDictionaryByPager(){
SysDictionary sysDictionary = new SysDictionary();
Pager pager = new Pager();
pager.setPageSize(10);
pager.setCurrentPage(5);
ListPager list = sysDictionaryService.querySysDictionaryByPager(sysDictionary,pager);
System.out.println(list);
}
}

@ -0,0 +1,109 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.IToolService;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.Tool;
import com.alibaba.fastjson.JSON;
import org.apache.commons.lang3.EnumUtils;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.annotation.Rollback;
import javax.transaction.Transactional;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @Date : 2018-10-31 15:30
* @Modify :
**/
public class TestToolServiceImpl extends TestBase {
@Autowired
IToolService toolService;
/**
*
*/
@Test
@Transactional
public void testListTool() {
List list = toolService.listTool();
System.out.println(JSON.toJSONString(list));
}
/**
* id
*/
@Test
@Transactional
public void testGetToolById() {
Tool tool = toolService.getToolById("1057110061127700480");
System.out.println(JSON.toJSONString(tool));
}
/**
*
*/
@Test
@Transactional
@Rollback(false)
public void testInsertTool() {
Tool tool = new Tool();
tool.setName("扫描枪");
tool.setToolTypeId(1057261374348070912L);
tool.setRedToolTypeName("扫描枪22");
tool.setToolConnTypeId(1);
tool.setToolDataTypeId(1);
tool.setToolStatusId(CommonEnumUtil.DATA_STATUS.ENABLE.getValue());
for (int i = 0; i < 50; i++) {
tool.setId(null);
tool.setName("扫描枪"+i);
toolService.insertTool(tool);
}
System.out.println(JSON.toJSONString(tool));
}
/**
*
*/
@Test
@Transactional
public void testUpdateTool(){
Tool tool = toolService.getToolById("1057110613261684736");
tool.setName("测试修改");
toolService.updateTool(tool);
}
/**
* id
*/
@Test
@Transactional
public void testDeleteToolById(){
toolService.deleteToolById("1057111616417566720");
}
/**
*
*/
@Test
@Transactional
public void testQueryToolByPager(){
Tool tool = new Tool();
Pager pager = new Pager();
pager.setPageSize(10);
pager.setCurrentPage(5);
ListPager list = toolService.queryToolByPager(tool,pager);
System.out.println(list);
}
}

@ -0,0 +1,101 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.IToolTypeService;
import cn.estsh.i3plus.core.api.iservice.busi.IToolTypeService;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.ToolType;
import com.alibaba.fastjson.JSON;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.annotation.Rollback;
import javax.transaction.Transactional;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @Date : 2018-10-30 20:36
* @Modify :
**/
public class TestToolTypeServiceImpl extends TestBase {
@Autowired
private IToolTypeService toolTypeService;
/**
*
*/
@Test
@Transactional
public void testListToolType() {
List list = toolTypeService.listToolType();
System.out.println(JSON.toJSONString(list));
}
/**
* id
*/
@Test
@Transactional
public void testGetToolTypeById() {
ToolType toolType = toolTypeService.getToolTypeById("1057110061127700480");
System.out.println(JSON.toJSONString(toolType));
}
/**
*
*/
@Test
@Transactional
@Rollback(false)
public void testInsertToolType() {
ToolType toolType = new ToolType();
toolType.setName("扫描枪");
for (int i = 0; i < 50; i++) {
toolType.setId(null);
toolType.setName("扫描枪"+i);
toolTypeService.insertToolType(toolType);
}
System.out.println(JSON.toJSONString(toolType));
}
/**
*
*/
@Test
@Transactional
public void testUpdateToolType(){
ToolType toolType = toolTypeService.getToolTypeById("1057110613261684736");
toolType.setName("测试修改");
toolTypeService.updateToolType(toolType);
}
/**
* id
*/
@Test
@Transactional
public void testDeleteToolTypeById(){
toolTypeService.deleteToolTypeById("1057111616417566720");
}
/**
*
*/
@Test
@Transactional
public void testQueryToolTypeByPager(){
ToolType toolType = new ToolType();
Pager pager = new Pager();
pager.setPageSize(10);
pager.setCurrentPage(5);
ListPager list = toolTypeService.queryToolTypeByPager(toolType,pager);
System.out.println(list);
}
}
Loading…
Cancel
Save