diff --git a/README.md b/README.md index 2a8eee32..737686a8 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,13 @@ # kangarooDataCenterV3 -中台后端kangarooDataCenterV3 \ No newline at end of file +中台后端kangarooDataCenterV3 + +标准方法名 + +分页查询 queryEntityPage +查询全部 queryEntity +保存 saveEntity +获取单个对象 getEntity +修改 updateEntity +删除 deleteEntity +启用停用 enableDisableEntity \ No newline at end of file diff --git a/common/src/main/java/com/hzya/frame/basedao/dao/IBaseDao.java b/common/src/main/java/com/hzya/frame/basedao/dao/IBaseDao.java index e69bb46c..a999a9fa 100644 --- a/common/src/main/java/com/hzya/frame/basedao/dao/IBaseDao.java +++ b/common/src/main/java/com/hzya/frame/basedao/dao/IBaseDao.java @@ -173,10 +173,10 @@ public interface IBaseDao { /** * 获取数据条数 - * @param paramObject 条件参数 + * @param paramE 条件参数 * @return */ - Integer getCount(Object paramObject); + Integer getCount(E paramE); /** * 分页查询 diff --git a/common/src/main/java/com/hzya/frame/basedao/dao/MybatisGenericDao.java b/common/src/main/java/com/hzya/frame/basedao/dao/MybatisGenericDao.java index 178e24e2..3326056d 100644 --- a/common/src/main/java/com/hzya/frame/basedao/dao/MybatisGenericDao.java +++ b/common/src/main/java/com/hzya/frame/basedao/dao/MybatisGenericDao.java @@ -284,10 +284,8 @@ public abstract class MybatisGenericDao subUserIdList; /** * 创建时间ID */ @@ -46,22 +44,18 @@ public class BaseEntity implements Serializable { * 修改人ID */ private String modify_user_id; - /** - * 创建人名称 - */ - private String createUserName; /** * 所属组织机构 */ private String org_id; - /** - * 企业会员ID - */ - private String company_org_id; + + /** 公司id */ + private String companyId; /** * 状态 */ private String sts; + //==========分页用============== private Long start; private Long limit; @@ -72,8 +66,6 @@ public class BaseEntity implements Serializable { private Long rows; private Long page; //==========分页用============== - //账套名 - private String acc_name; //区分数据库类型 private String dialect_type; private Integer pageNum; @@ -109,14 +101,6 @@ public class BaseEntity implements Serializable { this.create_user_id = create_user_id; } - public List getSubUserIdList() { - return subUserIdList; - } - - public void setSubUserIdList(List subUserIdList) { - this.subUserIdList = subUserIdList; - } - public Date getCreate_time() { return create_time; } @@ -141,14 +125,6 @@ public class BaseEntity implements Serializable { this.modify_user_id = modify_user_id; } - public String getCreateUserName() { - return createUserName; - } - - public void setCreateUserName(String createUserName) { - this.createUserName = createUserName; - } - public String getOrg_id() { return org_id; } @@ -157,14 +133,6 @@ public class BaseEntity implements Serializable { this.org_id = org_id; } - public String getCompany_org_id() { - return company_org_id; - } - - public void setCompany_org_id(String company_org_id) { - this.company_org_id = company_org_id; - } - public String getSts() { return sts; } @@ -237,14 +205,6 @@ public class BaseEntity implements Serializable { this.page = page; } - public String getAcc_name() { - return acc_name; - } - - public void setAcc_name(String acc_name) { - this.acc_name = acc_name; - } - public String getDialect_type() { return dialect_type; } @@ -289,4 +249,28 @@ public class BaseEntity implements Serializable { public void setSorts(Long sorts) { this.sorts = sorts; } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public void setCreate() { + this.setId(UUIDUtils.getUUID()); + this.setSts("Y"); + this.setCreate_user_id(StpUtil.getLoginIdAsString()); + this.setModify_user_id(StpUtil.getLoginIdAsString()); + this.setCreate_time(new Date()); + this.setModify_time(new Date()); + this.setOrg_id("0"); + this.setCompanyId("0"); + } + //修改信息 + public void setUpdate() { + this.setModify_user_id(StpUtil.getLoginIdAsString()); + this.setModify_time(new Date()); + } } diff --git a/service/src/main/java/com/hzya/frame/sys/buttonConfig/entity/SysButtonConfigEntity.xml b/service/src/main/java/com/hzya/frame/sys/buttonConfig/entity/SysButtonConfigEntity.xml index af98bf79..b6bbaf04 100644 --- a/service/src/main/java/com/hzya/frame/sys/buttonConfig/entity/SysButtonConfigEntity.xml +++ b/service/src/main/java/com/hzya/frame/sys/buttonConfig/entity/SysButtonConfigEntity.xml @@ -41,6 +41,12 @@ ,org_id ,company_id + + @@ -156,7 +160,7 @@ - + insert into sys_button_config( id , @@ -176,7 +180,6 @@ sts , org_id , company_id , - sorts, sts, )values( @@ -198,13 +201,12 @@ #{sts} , #{org_id} , #{companyId} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_button_config a WHERE a.sts = 'Y' ), 'Y', ) - + insert into sys_button_config(code, name_ch, name_en, menu_id, ico_name, styles, btn_function, remark, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) values @@ -212,7 +214,7 @@ - + insert into sys_button_config(code, name_ch, name_en, menu_id, ico_name, styles, btn_function, remark, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) values diff --git a/service/src/main/java/com/hzya/frame/sys/dataSource/entity/SysDataSourceEntity.xml b/service/src/main/java/com/hzya/frame/sys/dataSource/entity/SysDataSourceEntity.xml index 4d7404d6..233162da 100644 --- a/service/src/main/java/com/hzya/frame/sys/dataSource/entity/SysDataSourceEntity.xml +++ b/service/src/main/java/com/hzya/frame/sys/dataSource/entity/SysDataSourceEntity.xml @@ -128,8 +128,6 @@ and org_id = #{org_id} and sts='Y' - order by sorts asc - order by ${sort} ${order} @@ -282,8 +280,8 @@ - + insert into sys_data_source( id , @@ -335,7 +333,7 @@ ) - + insert into sys_data_source(source_code, source_name, source_ip, source_port, db_name, source_type, login_name, password, service_name, use_state, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, sts) @@ -346,7 +344,7 @@ - + insert into sys_data_source(source_code, source_name, source_ip, source_port, db_name, source_type, login_name, password, service_name, use_state, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id) values diff --git a/service/src/main/java/com/hzya/frame/sys/menuConfig/entity/ModuleVo.java b/service/src/main/java/com/hzya/frame/sys/menuConfig/entity/ModuleVo.java new file mode 100644 index 00000000..5dc9d9bd --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sys/menuConfig/entity/ModuleVo.java @@ -0,0 +1,116 @@ +package com.hzya.frame.sys.menuConfig.entity; + +import com.alibaba.fastjson.JSONObject; + +import java.util.List; + +/** + * @description: 菜单表 + * @tableName: + * @entityName: Module + * @author: llg + * @history: 1.0 + */ +public class ModuleVo { + + /** 主键ID */ + private String id; + /** 路由地址 */ + private String path; + /** 名称 */ + private String name; + /** 一级Layout 二级 ParntView 三级component */ + private String component; + /** 隐藏 */ + private boolean hidden; + /** redirevt */ + private String redirect; + /** 标题 */ + private String label; + /** alwaysShow */ + private boolean alwaysShow; + /** alwaysShow */ + private JSONObject meta; + //下级菜单 + private List children; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getComponent() { + return component; + } + + public void setComponent(String component) { + this.component = component; + } + + public boolean isHidden() { + return hidden; + } + + public void setHidden(boolean hidden) { + this.hidden = hidden; + } + + public String getRedirect() { + return redirect; + } + + public void setRedirect(String redirect) { + this.redirect = redirect; + } + + public boolean isAlwaysShow() { + return alwaysShow; + } + + public void setAlwaysShow(boolean alwaysShow) { + this.alwaysShow = alwaysShow; + } + + public JSONObject getMeta() { + return meta; + } + + public void setMeta(JSONObject meta) { + this.meta = meta; + } + + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } +} diff --git a/service/src/main/java/com/hzya/frame/sys/menuConfig/entity/SysMenuConfigEntity.xml b/service/src/main/java/com/hzya/frame/sys/menuConfig/entity/SysMenuConfigEntity.xml index c73f10e2..b683bdac 100644 --- a/service/src/main/java/com/hzya/frame/sys/menuConfig/entity/SysMenuConfigEntity.xml +++ b/service/src/main/java/com/hzya/frame/sys/menuConfig/entity/SysMenuConfigEntity.xml @@ -47,6 +47,12 @@ ,org_id ,company_id + + @@ -186,8 +190,8 @@ - + insert into sys_menu_config( id , @@ -210,7 +214,6 @@ sts , org_id , company_id , - sorts, sts, )values( @@ -235,15 +238,12 @@ #{sts} , #{org_id} , #{companyId} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_menu_config a WHERE a.sts - = 'Y' ), - 'Y', ) - + insert into sys_menu_config(parent_menu_id, menu_entity, depth, menu_name, menu_english_name, menu_icon, route, menu_page, remark, visibles, show_type, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) @@ -254,7 +254,7 @@ - + insert into sys_menu_config(parent_menu_id, menu_entity, depth, menu_name, menu_english_name, menu_icon, route, menu_page, remark, visibles, show_type, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) diff --git a/service/src/main/java/com/hzya/frame/sys/menuConfig/service/ISysMenuConfigService.java b/service/src/main/java/com/hzya/frame/sys/menuConfig/service/ISysMenuConfigService.java index c5c04b35..bd93b6f1 100644 --- a/service/src/main/java/com/hzya/frame/sys/menuConfig/service/ISysMenuConfigService.java +++ b/service/src/main/java/com/hzya/frame/sys/menuConfig/service/ISysMenuConfigService.java @@ -1,7 +1,9 @@ package com.hzya.frame.sys.menuConfig.service; +import com.alibaba.fastjson.JSONObject; import com.hzya.frame.sys.menuConfig.entity.SysMenuConfigEntity; import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.web.entity.JsonResultEntity; /** * 系统菜单表(SysMenuConfig)表服务接口 @@ -10,4 +12,13 @@ import com.hzya.frame.basedao.service.IBaseService; * @since 2024-03-26 15:23:53 */ public interface ISysMenuConfigService extends IBaseService { + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 根据用户id查询菜单树 + * @Date 9:40 上午 2022/12/7 + **/ + JsonResultEntity queryTree(JSONObject jsonObject); } diff --git a/service/src/main/java/com/hzya/frame/sys/menuConfig/service/impl/SysMenuConfigServiceImpl.java b/service/src/main/java/com/hzya/frame/sys/menuConfig/service/impl/SysMenuConfigServiceImpl.java index e5813176..8540fa79 100644 --- a/service/src/main/java/com/hzya/frame/sys/menuConfig/service/impl/SysMenuConfigServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sys/menuConfig/service/impl/SysMenuConfigServiceImpl.java @@ -1,8 +1,13 @@ package com.hzya.frame.sys.menuConfig.service.impl; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.hzya.frame.sys.menuConfig.entity.ModuleVo; import com.hzya.frame.sys.menuConfig.entity.SysMenuConfigEntity; import com.hzya.frame.sys.menuConfig.dao.ISysMenuConfigDao; import com.hzya.frame.sys.menuConfig.service.ISysMenuConfigService; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; @@ -10,6 +15,9 @@ import javax.annotation.Resource; import com.hzya.frame.basedao.service.impl.BaseService; +import java.util.ArrayList; +import java.util.List; + /** * 系统菜单表(SysMenuConfig)表服务实现类 * @@ -26,4 +34,12 @@ public class SysMenuConfigServiceImpl extends BaseService returnModuleVo = JSON.parseArray(a,ModuleVo.class); + return BaseResult.getSuccessMessageEntity("查询组织树成功", returnModuleVo); + } } diff --git a/service/src/main/java/com/hzya/frame/sys/organ/entity/SysOrganEntity.java b/service/src/main/java/com/hzya/frame/sys/organ/entity/SysOrganEntity.java index 73db3a1d..896ac0c9 100644 --- a/service/src/main/java/com/hzya/frame/sys/organ/entity/SysOrganEntity.java +++ b/service/src/main/java/com/hzya/frame/sys/organ/entity/SysOrganEntity.java @@ -1,6 +1,7 @@ package com.hzya.frame.sys.organ.entity; import java.util.Date; +import java.util.List; import com.hzya.frame.web.entity.BaseEntity; @@ -24,14 +25,6 @@ public class SysOrganEntity extends BaseEntity { * 组织机构父级ID */ private String parentOrganId; - /** - * 组织机构深度 - */ - private Long depth; - /** - * 组织机构层级 - */ - private String hierarchy; /** * 状态: 0启用 1 停用 */ @@ -53,6 +46,10 @@ public class SysOrganEntity extends BaseEntity { */ private String companyId; + /** + * 子集 + */ + private List children; public String getOrganName() { return organName; @@ -78,22 +75,6 @@ public class SysOrganEntity extends BaseEntity { this.parentOrganId = parentOrganId; } - public Long getDepth() { - return depth; - } - - public void setDepth(Long depth) { - this.depth = depth; - } - - public String getHierarchy() { - return hierarchy; - } - - public void setHierarchy(String hierarchy) { - this.hierarchy = hierarchy; - } - public String getState() { return state; } @@ -134,5 +115,12 @@ public class SysOrganEntity extends BaseEntity { this.companyId = companyId; } + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } } diff --git a/service/src/main/java/com/hzya/frame/sys/organ/entity/SysOrganEntity.xml b/service/src/main/java/com/hzya/frame/sys/organ/entity/SysOrganEntity.xml index 98ecc410..46a2e713 100644 --- a/service/src/main/java/com/hzya/frame/sys/organ/entity/SysOrganEntity.xml +++ b/service/src/main/java/com/hzya/frame/sys/organ/entity/SysOrganEntity.xml @@ -7,8 +7,6 @@ - - @@ -28,9 +26,7 @@ ,organ_name ,organ_code ,parent_organ_id - ,depth - ,hierarchy - ,state + ,state ,company ,manager_id ,remark @@ -43,6 +39,12 @@ ,org_id ,company_id + + @@ -115,8 +111,6 @@ and parent_organ_id like concat('%',#{parentOrganId},'%') - and depth like concat('%',#{depth},'%') - and hierarchy like concat('%',#{hierarchy},'%') and state like concat('%',#{state},'%') and company like concat('%',#{company},'%') and manager_id like concat('%',#{managerId},'%') @@ -150,8 +144,6 @@ or organ_name = #{organName} or organ_code = #{organCode} or parent_organ_id = #{parentOrganId} - or depth = #{depth} - or hierarchy = #{hierarchy} or state = #{state} or company = #{company} or manager_id = #{managerId} @@ -171,16 +163,14 @@ - + insert into sys_organ( id , organ_name , organ_code , parent_organ_id , - depth , - hierarchy , state , company , manager_id , @@ -193,7 +183,6 @@ sts , org_id , company_id , - sorts, sts, )values( @@ -202,8 +191,6 @@ #{organName} , #{organCode} , #{parentOrganId} , - #{depth} , - #{hierarchy} , #{state} , #{company} , #{managerId} , @@ -216,37 +203,32 @@ #{sts} , #{org_id} , #{companyId} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_organ a WHERE a.sts = 'Y' - ), - 'Y', ) - - insert into sys_organ(organ_name, organ_code, parent_organ_id, depth, hierarchy, state, company, manager_id, + + insert into sys_organ(organ_name, organ_code, parent_organ_id, state, company, manager_id, remark, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) values - (#{entity.organName},#{entity.organCode},#{entity.parentOrganId},#{entity.depth},#{entity.hierarchy},#{entity.state},#{entity.company},#{entity.managerId},#{entity.remark},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, + (#{entity.organName},#{entity.organCode},#{entity.parentOrganId},#{entity.state},#{entity.company},#{entity.managerId},#{entity.remark},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') - - insert into sys_organ(organ_name, organ_code, parent_organ_id, depth, hierarchy, state, company, manager_id, + + insert into sys_organ(organ_name, organ_code, parent_organ_id, state, company, manager_id, remark, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) values - (#{entity.organName},#{entity.organCode},#{entity.parentOrganId},#{entity.depth},#{entity.hierarchy},#{entity.state},#{entity.company},#{entity.managerId},#{entity.remark},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + (#{entity.organName},#{entity.organCode},#{entity.parentOrganId},#{entity.state},#{entity.company},#{entity.managerId},#{entity.remark},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) on duplicate key update organ_name = values(organ_name), organ_code = values(organ_code), parent_organ_id = values(parent_organ_id), - depth = values(depth), - hierarchy = values(hierarchy), state = values(state), company = values(company), manager_id = values(manager_id), @@ -267,8 +249,6 @@ organ_name = #{organName}, organ_code = #{organCode}, parent_organ_id = #{parentOrganId}, - depth = #{depth}, - hierarchy = #{hierarchy}, state = #{state}, company = #{company}, manager_id = #{managerId}, @@ -297,8 +277,6 @@ where id = #{id} and organ_name = #{organName} and organ_code = #{organCode} and parent_organ_id = #{parentOrganId} - and depth = #{depth} - and hierarchy = #{hierarchy} and state = #{state} and company = #{company} and manager_id = #{managerId} diff --git a/service/src/main/java/com/hzya/frame/sys/organ/service/ISysOrganService.java b/service/src/main/java/com/hzya/frame/sys/organ/service/ISysOrganService.java index cc7ee6a9..bf2c308f 100644 --- a/service/src/main/java/com/hzya/frame/sys/organ/service/ISysOrganService.java +++ b/service/src/main/java/com/hzya/frame/sys/organ/service/ISysOrganService.java @@ -1,7 +1,9 @@ package com.hzya.frame.sys.organ.service; +import com.alibaba.fastjson.JSONObject; import com.hzya.frame.sys.organ.entity.SysOrganEntity; import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.web.entity.JsonResultEntity; /** * 组织机构表(Sys_Organ)(SysOrgan)表服务接口 @@ -10,4 +12,59 @@ import com.hzya.frame.basedao.service.IBaseService; * @since 2024-03-26 15:24:28 */ public interface ISysOrganService extends IBaseService { + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询组织树 + * @Date 11:52 上午 2024/3/27 + **/ + JsonResultEntity queryEntityTree(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 保存组织 + * @Date 2:36 下午 2024/3/27 + **/ + JsonResultEntity saveEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 获取组织 + * @Date 2:36 下午 2024/3/27 + **/ + JsonResultEntity getEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 修改组织 + * @Date 2:37 下午 2024/3/27 + **/ + JsonResultEntity updateEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 删除组织 + * @Date 2:37 下午 2024/3/27 + **/ + JsonResultEntity deleteEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 启用停用组织 + * @Date 2:37 下午 2024/3/27 + **/ + JsonResultEntity enableDisableEntity(JSONObject jsonObject); + } diff --git a/service/src/main/java/com/hzya/frame/sys/organ/service/impl/SysOrganServiceImpl.java b/service/src/main/java/com/hzya/frame/sys/organ/service/impl/SysOrganServiceImpl.java index 5c80e86c..0235acfa 100644 --- a/service/src/main/java/com/hzya/frame/sys/organ/service/impl/SysOrganServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sys/organ/service/impl/SysOrganServiceImpl.java @@ -1,8 +1,17 @@ package com.hzya.frame.sys.organ.service.impl; +import com.alibaba.fastjson.JSONObject; import com.hzya.frame.sys.organ.entity.SysOrganEntity; import com.hzya.frame.sys.organ.dao.ISysOrganDao; import com.hzya.frame.sys.organ.service.ISysOrganService; +import com.hzya.frame.sys.person.dao.ISysPersonDao; +import com.hzya.frame.sys.person.entity.SysPersonEntity; +import com.hzya.frame.sys.role.entity.SysRoleEntity; +import com.hzya.frame.sys.userCompany.dao.ISysUserCompanyDao; +import com.hzya.frame.sys.userCompany.entity.SysUserCompanyEntity; +import com.hzya.frame.sys.userRoles.entity.SysUserRolesEntity; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; @@ -10,6 +19,9 @@ import javax.annotation.Resource; import com.hzya.frame.basedao.service.impl.BaseService; +import java.util.ArrayList; +import java.util.List; + /** * 组织机构表(Sys_Organ)(SysOrgan)表服务实现类 * @@ -20,10 +32,229 @@ import com.hzya.frame.basedao.service.impl.BaseService; public class SysOrganServiceImpl extends BaseService implements ISysOrganService { private ISysOrganDao sysOrganDao; - + @Resource + private ISysPersonDao sysPersonDao; + @Resource + private ISysUserCompanyDao sysUserCompanyDao; @Autowired public void setSysOrganDao(ISysOrganDao dao) { this.sysOrganDao = dao; this.dao = dao; } + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询组织树 + * @Date 11:52 上午 2024/3/27 + **/ + @Override + public JsonResultEntity queryEntityTree(JSONObject jsonObject) { + SysOrganEntity entity = getData("jsonStr", jsonObject, SysOrganEntity.class); + if(entity == null ){ + entity = new SysOrganEntity(); + } + List returnOrg = new ArrayList<>(); + //查询符合条件的组织数据 + List sysOrganEntityList = sysOrganDao.queryByLike(entity); + if(sysOrganEntityList != null && sysOrganEntityList.size() > 0){ + for (int i = 0; i < sysOrganEntityList.size(); i++) { + if("0".equals(sysOrganEntityList.get(i).getParentOrganId())){ + recursiveSetTree(sysOrganEntityList.get(i),sysOrganEntityList); + returnOrg.add(sysOrganEntityList.get(i)); + } + } + } + return BaseResult.getSuccessMessageEntity("查询组织树成功", returnOrg); + } + + /** + * @Author lvleigang + * @Description 递归设置树 + * @Date 9:19 上午 2024/3/28 + * @param sysOrganEntity + * @param sysOrganEntityList + * @return void + **/ + private void recursiveSetTree(SysOrganEntity sysOrganEntity, List sysOrganEntityList) { + List children = new ArrayList<>(); + for (int i = 0; i < sysOrganEntityList.size(); i++) { + if(sysOrganEntityList.get(i).getParentOrganId() != null && !"".equals(sysOrganEntityList.get(i).getParentOrganId())){ + if(sysOrganEntity.getId().equals(sysOrganEntityList.get(i).getParentOrganId())){ + children.add(sysOrganEntityList.get(i)); + recursiveSetTree(sysOrganEntity,sysOrganEntityList); + } + } + } + sysOrganEntity.setChildren(children); + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 保存组织 + * @Date 2:36 下午 2024/3/27 + **/ + @Override + public JsonResultEntity saveEntity(JSONObject jsonObject) { + SysOrganEntity entity = getData("jsonStr", jsonObject, SysOrganEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getOrganName() == null || "".equals(entity.getOrganName())) { + return BaseResult.getFailureMessageEntity("请先输入组织名称"); + } + if (entity.getOrganCode() == null || "".equals(entity.getOrganCode())) { + return BaseResult.getFailureMessageEntity("请先输入组织代码"); + } + if (entity.getParentOrganId() == null || "".equals(entity.getParentOrganId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity.setCreate(); + //保存 + sysOrganDao.save(entity); + return BaseResult.getSuccessMessageEntity("保存组织成功", entity); + } + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 获取组织 + * @Date 2:36 下午 2024/3/27 + **/ + @Override + public JsonResultEntity getEntity(JSONObject jsonObject) { + SysOrganEntity entity = getData("jsonStr", jsonObject, SysOrganEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity = sysOrganDao.get(entity.getId()); + if(entity == null ){ + return BaseResult.getFailureMessageEntity("获取组织失败"); + } + return BaseResult.getSuccessMessageEntity("获取组织成功", entity); + } + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 修改组织 + * @Date 2:37 下午 2024/3/27 + **/ + @Override + public JsonResultEntity updateEntity(JSONObject jsonObject) { + SysOrganEntity entity = getData("jsonStr", jsonObject, SysOrganEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if (entity.getOrganName() == null || "".equals(entity.getOrganName())) { + return BaseResult.getFailureMessageEntity("请先输入组织名称"); + } + if (entity.getOrganCode() == null || "".equals(entity.getOrganCode())) { + return BaseResult.getFailureMessageEntity("请先输入组织代码"); + } + if (entity.getParentOrganId() == null || "".equals(entity.getParentOrganId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity.setUpdate(); + //保存 + sysOrganDao.update(entity); + return BaseResult.getSuccessMessageEntity("修改组织成功", entity); + + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 删除组织,只能删除最后一层 + * @Date 2:37 下午 2024/3/27 + **/ + @Override + public JsonResultEntity deleteEntity(JSONObject jsonObject) { + SysOrganEntity entity = getData("jsonStr", jsonObject, SysOrganEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if(!checkOrgUse(entity)){ + return BaseResult.getFailureMessageEntity("当前组织已经使用，不允许删除"); + } + entity.setUpdate(); + sysOrganDao.logicRemove(entity); + return BaseResult.getSuccessMessageEntity("删除组织成功"); + } + /** + * @Author lvleigang + * @Description 校验组织是否使用 目前只校验（用户\人员） + * @Date 3:27 下午 2024/3/27 + * @param entity + * @return boolean + **/ + private boolean checkOrgUse(SysOrganEntity entity) { + SysPersonEntity sysPersonEntity = new SysPersonEntity(); + sysPersonEntity.setOrganId(entity.getId()); + if(sysPersonDao.getCount(sysPersonEntity) > 0){ + return false; + } + SysUserCompanyEntity sysUserCompanyEntity = new SysUserCompanyEntity(); + sysUserCompanyEntity.setUserCompanyId(entity.getId()); + if(sysUserCompanyDao.getCount(sysUserCompanyEntity) > 0){ + return false; + } + return true; + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 启用停用组织 + * @Date 2:37 下午 2024/3/27 + **/ + @Override + public JsonResultEntity enableDisableEntity(JSONObject jsonObject) { + SysOrganEntity entity = getData("jsonStr", jsonObject, SysOrganEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if (entity.getState() == null || "".equals(entity.getState())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + //0启用 1 停用 + if("0".equals(entity.getState())){ + entity.setUpdate(); + sysOrganDao.update(entity); + return BaseResult.getSuccessMessageEntity("启用组织成功"); + }else { + //人员修改为停用状态 + SysPersonEntity sysPersonEntity = new SysPersonEntity(); + sysPersonEntity.setOrganId(entity.getId()); + sysPersonEntity.setState(entity.getState()); + sysPersonEntity.setUpdate(); + sysPersonDao.update(sysPersonEntity); + + //删除用户关联的公司 + SysUserCompanyEntity sysUserCompanyEntity = new SysUserCompanyEntity(); + sysUserCompanyEntity.setUserCompanyId(entity.getId()); + sysUserCompanyEntity.setUpdate(); + sysUserCompanyDao.logicRemoveMultiCondition(sysUserCompanyEntity); + + entity.setUpdate(); + sysOrganDao.update(entity); + return BaseResult.getSuccessMessageEntity("停用组织成功"); + } + } } diff --git a/service/src/main/java/com/hzya/frame/sys/person/entity/SysPersonEntity.java b/service/src/main/java/com/hzya/frame/sys/person/entity/SysPersonEntity.java index 9064175b..577f6f5c 100644 --- a/service/src/main/java/com/hzya/frame/sys/person/entity/SysPersonEntity.java +++ b/service/src/main/java/com/hzya/frame/sys/person/entity/SysPersonEntity.java @@ -77,7 +77,7 @@ public class SysPersonEntity extends BaseEntity { */ private Date leaveTime; /** - * 人员状态1停用 0\空 启用 + * 人员状态0启用 1 停用 */ private String state; /** diff --git a/service/src/main/java/com/hzya/frame/sys/person/entity/SysPersonEntity.xml b/service/src/main/java/com/hzya/frame/sys/person/entity/SysPersonEntity.xml index 62934300..2e01d51a 100644 --- a/service/src/main/java/com/hzya/frame/sys/person/entity/SysPersonEntity.xml +++ b/service/src/main/java/com/hzya/frame/sys/person/entity/SysPersonEntity.xml @@ -67,6 +67,13 @@ ,org_id ,company_id + + + @@ -243,8 +248,8 @@ - + insert into sys_person( id , @@ -277,7 +282,6 @@ sts , org_id , company_id , - sorts, sts, )values( @@ -312,15 +316,12 @@ #{sts} , #{org_id} , #{companyId} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_person a WHERE a.sts = - 'Y' ), - 'Y', ) - + insert into sys_person(organ_id, person_code, person_name, sex, moible_phone, entry_time, email, degree_id, post_id, level_id, birth_day, tel_phone, hometown, id_card, address, leave_time, state, remark, dd_user_id, wx_user_id, head_image_id, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, @@ -332,7 +333,7 @@ - + insert into sys_person(organ_id, person_code, person_name, sex, moible_phone, entry_time, email, degree_id, post_id, level_id, birth_day, tel_phone, hometown, id_card, address, leave_time, state, remark, dd_user_id, wx_user_id, head_image_id, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, diff --git a/service/src/main/java/com/hzya/frame/sys/person/service/ISysPersonService.java b/service/src/main/java/com/hzya/frame/sys/person/service/ISysPersonService.java index f33564f4..9e97ea45 100644 --- a/service/src/main/java/com/hzya/frame/sys/person/service/ISysPersonService.java +++ b/service/src/main/java/com/hzya/frame/sys/person/service/ISysPersonService.java @@ -1,7 +1,9 @@ package com.hzya.frame.sys.person.service; +import com.alibaba.fastjson.JSONObject; import com.hzya.frame.sys.person.entity.SysPersonEntity; import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.web.entity.JsonResultEntity; /** * 人员表(SysPerson)表服务接口 @@ -10,4 +12,67 @@ import com.hzya.frame.basedao.service.IBaseService; * @since 2024-03-26 15:25:12 */ public interface ISysPersonService extends IBaseService { + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询人员列表分页 + * @Date 11:52 上午 2024/3/27 + **/ + JsonResultEntity queryEntityPage(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询人员列表 + * @Date 11:52 上午 2024/3/27 + **/ + JsonResultEntity queryEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 保存人员 + * @Date 2:36 下午 2024/3/27 + **/ + JsonResultEntity saveEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 获取人员 + * @Date 2:36 下午 2024/3/27 + **/ + JsonResultEntity getEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 修改人员 + * @Date 2:37 下午 2024/3/27 + **/ + JsonResultEntity updateEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 删除人员 + * @Date 2:37 下午 2024/3/27 + **/ + JsonResultEntity deleteEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 启用停用人员 + * @Date 2:37 下午 2024/3/27 + **/ + JsonResultEntity enableDisableEntity(JSONObject jsonObject); } diff --git a/service/src/main/java/com/hzya/frame/sys/person/service/impl/SysPersonServiceImpl.java b/service/src/main/java/com/hzya/frame/sys/person/service/impl/SysPersonServiceImpl.java index 087420a6..7c88f920 100644 --- a/service/src/main/java/com/hzya/frame/sys/person/service/impl/SysPersonServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sys/person/service/impl/SysPersonServiceImpl.java @@ -1,8 +1,21 @@ package com.hzya.frame.sys.person.service.impl; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.hzya.frame.sys.person.entity.SysPersonEntity; import com.hzya.frame.sys.person.dao.ISysPersonDao; import com.hzya.frame.sys.person.service.ISysPersonService; +import com.hzya.frame.sys.popedomData.entity.SysPopedomDataEntity; +import com.hzya.frame.sys.popedomHome.entity.SysPopedomHomeEntity; +import com.hzya.frame.sys.popedomMenu.entity.SysPopedomMenuEntity; +import com.hzya.frame.sys.popedomOperate.entity.SysPopedomOperateEntity; +import com.hzya.frame.sys.role.entity.SysRoleEntity; +import com.hzya.frame.sys.user.dao.ISysUserDao; +import com.hzya.frame.sys.user.entity.SysUserEntity; +import com.hzya.frame.sys.userRoles.entity.SysUserRolesEntity; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; @@ -10,6 +23,8 @@ import javax.annotation.Resource; import com.hzya.frame.basedao.service.impl.BaseService; +import java.util.List; + /** * 人员表(SysPerson)表服务实现类 * @@ -21,9 +36,207 @@ public class SysPersonServiceImpl extends BaseService i private ISysPersonDao sysPersonDao; + @Resource + private ISysUserDao sysUserDao; @Autowired public void setSysPersonDao(ISysPersonDao dao) { this.sysPersonDao = dao; this.dao = dao; } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询人员列表分页 + * @Date 11:52 上午 2024/3/27 + **/ + @Override + public JsonResultEntity queryEntityPage(JSONObject jsonObject) { + SysPersonEntity entity = getData("jsonStr", jsonObject, SysPersonEntity.class); + //判断分页 + if (entity == null || entity.getPageNum() == null || entity.getPageSize() == null) { + return BaseResult.getFailureMessageEntity("分页查询参数不存在"); + } + PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); + List list = sysPersonDao.queryByLike(entity); + PageInfo pageInfo = new PageInfo(list); + return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo); + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询人员列表 + * @Date 11:52 上午 2024/3/27 + **/ + @Override + public JsonResultEntity queryEntity(JSONObject jsonObject) { + SysPersonEntity entity = getData("jsonStr", jsonObject, SysPersonEntity.class); + if(entity == null ){ + entity = new SysPersonEntity(); + } + List list = sysPersonDao.queryByLike(entity); + return BaseResult.getSuccessMessageEntity("查询数据成功", list); + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 保存人员 + * @Date 2:36 下午 2024/3/27 + **/ + @Override + public JsonResultEntity saveEntity(JSONObject jsonObject) { + SysPersonEntity entity = getData("jsonStr", jsonObject, SysPersonEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getPersonName() == null || "".equals(entity.getPersonName())) { + return BaseResult.getFailureMessageEntity("请先输入人员名称"); + } + if (entity.getPersonCode() == null || "".equals(entity.getPersonCode())) { + return BaseResult.getFailureMessageEntity("请先输入工号"); + } + if (entity.getMoiblePhone() == null || "".equals(entity.getMoiblePhone())) { + return BaseResult.getFailureMessageEntity("请先输入手机号码"); + } + entity.setCreate(); + //保存 + sysPersonDao.save(entity); + return BaseResult.getSuccessMessageEntity("保存人员成功", entity); + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 获取人员 + * @Date 2:36 下午 2024/3/27 + **/ + @Override + public JsonResultEntity getEntity(JSONObject jsonObject) { + SysPersonEntity entity = getData("jsonStr", jsonObject, SysPersonEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity = sysPersonDao.get(entity.getId()); + if(entity == null ){ + return BaseResult.getFailureMessageEntity("获取人员失败"); + } + return BaseResult.getSuccessMessageEntity("获取人员成功", entity); + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 修改人员 + * @Date 2:37 下午 2024/3/27 + **/ + @Override + public JsonResultEntity updateEntity(JSONObject jsonObject) { + SysPersonEntity entity = getData("jsonStr", jsonObject, SysPersonEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if (entity.getPersonName() == null || "".equals(entity.getPersonName())) { + return BaseResult.getFailureMessageEntity("请先输入人员名称"); + } + if (entity.getPersonCode() == null || "".equals(entity.getPersonCode())) { + return BaseResult.getFailureMessageEntity("请先输入工号"); + } + if (entity.getMoiblePhone() == null || "".equals(entity.getMoiblePhone())) { + return BaseResult.getFailureMessageEntity("请先输入手机号码"); + } + entity.setUpdate(); + //保存 + sysPersonDao.update(entity); + return BaseResult.getSuccessMessageEntity("修改人员成功", entity); + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 删除人员 + * @Date 2:37 下午 2024/3/27 + **/ + @Override + public JsonResultEntity deleteEntity(JSONObject jsonObject) { + SysPersonEntity entity = getData("jsonStr", jsonObject, SysPersonEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if(!checkUse(entity)){ + return BaseResult.getFailureMessageEntity("当前人员已经使用，不允许删除"); + } + entity.setUpdate(); + sysPersonDao.logicRemove(entity); + return BaseResult.getSuccessMessageEntity("删除人员成功"); + } + + /** + * @Author lvleigang + * @Description 判断当前人员是否已经被使用 + * @Date 10:04 上午 2024/3/28 + * @param entity + * @return boolean + **/ + private boolean checkUse(SysPersonEntity entity) { + SysUserEntity sysUserEntity = new SysUserEntity(); + sysUserEntity.setPersonId(entity.getId()); + if(sysUserDao.getCount(sysUserEntity) > 0){ + return false; + } + return true; + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 启用停用人员 + * @Date 2:37 下午 2024/3/27 + **/ + @Override + public JsonResultEntity enableDisableEntity(JSONObject jsonObject) { + SysPersonEntity entity = getData("jsonStr", jsonObject, SysPersonEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if (entity.getState() == null || "".equals(entity.getState())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + //0启用 1 停用 + if("0".equals(entity.getState())){ + entity.setUpdate(); + sysPersonDao.update(entity); + return BaseResult.getSuccessMessageEntity("启用人员成功"); + }else { + //删除用户角色表 + SysUserEntity sysUserEntity = new SysUserEntity(); + sysUserEntity.setPersonId(entity.getId()); + sysUserEntity.setState(entity.getState()); + sysUserEntity.setUpdate(); + sysUserDao.update(sysUserEntity); + entity.setUpdate(); + sysPersonDao.update(entity); + return BaseResult.getSuccessMessageEntity("停用人员成功"); + } + } } diff --git a/service/src/main/java/com/hzya/frame/sys/popedomData/dao/ISysPopedomDataDao.java b/service/src/main/java/com/hzya/frame/sys/popedomData/dao/ISysPopedomDataDao.java index 1404b811..c48bf284 100644 --- a/service/src/main/java/com/hzya/frame/sys/popedomData/dao/ISysPopedomDataDao.java +++ b/service/src/main/java/com/hzya/frame/sys/popedomData/dao/ISysPopedomDataDao.java @@ -1,13 +1,13 @@ package com.hzya.frame.sys.popedomData.dao; import com.hzya.frame.sys.popedomData.entity.SysPopedomDataEntity; -import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.basedao.dao.IBaseDao; /** * 数据权限(sys_popedom_data: table)表数据库访问层 * * @author makejava - * @since 2024-03-26 15:25:51 + * @since 2024-03-27 15:45:31 */ public interface ISysPopedomDataDao extends IBaseDao { diff --git a/service/src/main/java/com/hzya/frame/sys/popedomData/dao/impl/SysPopedomDataDaoImpl.java b/service/src/main/java/com/hzya/frame/sys/popedomData/dao/impl/SysPopedomDataDaoImpl.java index 3f825bd4..5ce41198 100644 --- a/service/src/main/java/com/hzya/frame/sys/popedomData/dao/impl/SysPopedomDataDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sys/popedomData/dao/impl/SysPopedomDataDaoImpl.java @@ -4,15 +4,14 @@ import com.hzya.frame.sys.popedomData.entity.SysPopedomDataEntity; import com.hzya.frame.sys.popedomData.dao.ISysPopedomDataDao; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; - /** * 数据权限(SysPopedomData)表数据库访问层 * * @author makejava - * @since 2024-03-26 15:25:52 + * @since 2024-03-27 15:45:32 */ @Repository(value = "SysPopedomDataDaoImpl") -public class SysPopedomDataDaoImpl extends MybatisGenericDao implements ISysPopedomDataDao { - +public class SysPopedomDataDaoImpl extends MybatisGenericDao implements ISysPopedomDataDao{ + } diff --git a/service/src/main/java/com/hzya/frame/sys/popedomData/entity/SysPopedomDataEntity.java b/service/src/main/java/com/hzya/frame/sys/popedomData/entity/SysPopedomDataEntity.java index 2913204f..f4b30051 100644 --- a/service/src/main/java/com/hzya/frame/sys/popedomData/entity/SysPopedomDataEntity.java +++ b/service/src/main/java/com/hzya/frame/sys/popedomData/entity/SysPopedomDataEntity.java @@ -1,38 +1,26 @@ package com.hzya.frame.sys.popedomData.entity; import java.util.Date; - import com.hzya.frame.web.entity.BaseEntity; - /** * 数据权限(SysPopedomData)实体类 * * @author makejava - * @since 2024-03-26 15:25:52 + * @since 2024-03-27 15:45:33 */ public class SysPopedomDataEntity extends BaseEntity { - - /** - * 权限赋予对象id - */ - private String objectId; - private String billKindId; - /** - * 数据权限设置id - */ - private String dataSetId; - /** - * 数据权限id值集合 - */ - private String popeList; - /** - * 权限分类（1、人员、2、部门、3、角色） - */ - private String kindId; - /** - * 公司id - */ - private String companyId; + + /** 权限赋予对象id */ + private String objectId; + private String billKindId; + /** 数据权限设置id */ + private String dataSetId; + /** 数据权限id值集合 */ + private String popeList; + /** 权限分类（1、人员、2、角色） */ + private String kindId; + /** 公司id */ + private String companyId; public String getObjectId() { diff --git a/service/src/main/java/com/hzya/frame/sys/popedomData/entity/SysPopedomDataEntity.xml b/service/src/main/java/com/hzya/frame/sys/popedomData/entity/SysPopedomDataEntity.xml index dd8d99e1..1ca0e1e6 100644 --- a/service/src/main/java/com/hzya/frame/sys/popedomData/entity/SysPopedomDataEntity.xml +++ b/service/src/main/java/com/hzya/frame/sys/popedomData/entity/SysPopedomDataEntity.xml @@ -2,24 +2,24 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + id ,object_id ,bill_kind_id @@ -35,238 +35,222 @@ ,org_id ,company_id - - select - - from sys_popedom_data - - and id = #{id} - and object_id = #{objectId} - and bill_kind_id = #{billKindId} - and data_set_id = #{dataSetId} - and pope_list = #{popeList} - and kind_id = #{kindId} - and sorts = #{sorts} - and create_user_id = #{create_user_id} - and create_time = #{create_time} - and modify_user_id = #{modify_user_id} - and modify_time = #{modify_time} - and sts = #{sts} - and org_id = #{org_id} - and company_id = #{companyId} - and sts='Y' - - order by sorts asc - order by ${sort} ${order} + + from sys_popedom_data where id = #{ id } and sts='Y' - - - + select + + from sys_popedom_data + + and id = #{id} + and object_id = #{objectId} + and bill_kind_id = #{billKindId} + and data_set_id = #{dataSetId} + and pope_list = #{popeList} + and kind_id = #{kindId} + and sorts = #{sorts} + and create_user_id = #{create_user_id} + and create_time = #{create_time} + and modify_user_id = #{modify_user_id} + and modify_time = #{modify_time} + and sts = #{sts} + and org_id = #{org_id} + and company_id = #{companyId} and sts='Y' - - order by sorts asc - order by ${sort} ${order} + + order by sorts asc + order by ${sort} ${order} + + + + - + select + + from sys_popedom_data + + and id like concat('%',#{id},'%') + and object_id like concat('%',#{objectId},'%') + and bill_kind_id like concat('%',#{billKindId},'%') + and data_set_id like concat('%',#{dataSetId},'%') + and pope_list like concat('%',#{popeList},'%') + and kind_id like concat('%',#{kindId},'%') + and sorts like concat('%',#{sorts},'%') + and create_user_id like concat('%',#{create_user_id},'%') + and create_time like concat('%',#{create_time},'%') + and modify_user_id like concat('%',#{modify_user_id},'%') + and modify_time like concat('%',#{modify_time},'%') + and sts like concat('%',#{sts},'%') + and org_id like concat('%',#{org_id},'%') + and company_id like concat('%',#{companyId},'%') and sts='Y' - - order by sorts asc - order by ${sort} ${order} - + + order by sorts asc + order by ${sort} ${order} + - - + select + + from sys_popedom_data + + or id = #{id} + or object_id = #{objectId} + or bill_kind_id = #{billKindId} + or data_set_id = #{dataSetId} + or pope_list = #{popeList} + or kind_id = #{kindId} + or sorts = #{sorts} + or create_user_id = #{create_user_id} + or create_time = #{create_time} + or modify_user_id = #{modify_user_id} + or modify_time = #{modify_time} + or sts = #{sts} + or org_id = #{org_id} + or company_id = #{companyId} and sts='Y' - - order by sorts asc - order by ${sort} ${order} - + + order by sorts asc + order by ${sort} ${order} + - - - insert into sys_popedom_data( - - id , - object_id , - bill_kind_id , - data_set_id , - pope_list , - kind_id , - sorts , - create_user_id , - create_time , - modify_user_id , - modify_time , - sts , - org_id , - company_id , - sorts, - sts, - - )values( - - #{id} , - #{objectId} , - #{billKindId} , - #{dataSetId} , - #{popeList} , - #{kindId} , - #{sorts} , - #{create_user_id} , - #{create_time} , - #{modify_user_id} , - #{modify_time} , - #{sts} , - #{org_id} , - #{companyId} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_popedom_data a WHERE - a.sts = 'Y' ), - - 'Y', - - ) - - - - insert into sys_popedom_data(object_id, bill_kind_id, data_set_id, pope_list, kind_id, sorts, create_user_id, - create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) - values - - (#{entity.objectId},#{entity.billKindId},#{entity.dataSetId},#{entity.popeList},#{entity.kindId},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, - 'Y') - - - - - insert into sys_popedom_data(object_id, bill_kind_id, data_set_id, pope_list, kind_id, sorts, create_user_id, - create_time, modify_user_id, modify_time, sts, org_id, company_id) - values - - (#{entity.objectId},#{entity.billKindId},#{entity.dataSetId},#{entity.popeList},#{entity.kindId},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) - - on duplicate key update - object_id = values(object_id), - bill_kind_id = values(bill_kind_id), - data_set_id = values(data_set_id), - pope_list = values(pope_list), - kind_id = values(kind_id), - sorts = values(sorts), - create_user_id = values(create_user_id), - create_time = values(create_time), - modify_user_id = values(modify_user_id), - modify_time = values(modify_time), - sts = values(sts), - org_id = values(org_id), - company_id = values(company_id) - - - - update sys_popedom_data set - - object_id = #{objectId}, - bill_kind_id = #{billKindId}, - data_set_id = #{dataSetId}, - pope_list = #{popeList}, - kind_id = #{kindId}, - sorts = #{sorts}, - create_user_id = #{create_user_id}, - create_time = #{create_time}, - modify_user_id = #{modify_user_id}, - modify_time = #{modify_time}, - sts = #{sts}, - org_id = #{org_id}, - company_id = #{companyId}, - - where id = #{id} - - - + + + insert into sys_popedom_data( + + id , + object_id , + bill_kind_id , + data_set_id , + pope_list , + kind_id , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sts, + + )values( + + #{id} , + #{objectId} , + #{billKindId} , + #{dataSetId} , + #{popeList} , + #{kindId} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + 'Y', + + ) + + + + insert into sys_popedom_data(object_id, bill_kind_id, data_set_id, pope_list, kind_id, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) + values + + (#{entity.objectId},#{entity.billKindId},#{entity.dataSetId},#{entity.popeList},#{entity.kindId},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') + + + + + insert into sys_popedom_data(object_id, bill_kind_id, data_set_id, pope_list, kind_id, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) + values + + (#{entity.objectId},#{entity.billKindId},#{entity.dataSetId},#{entity.popeList},#{entity.kindId},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + + on duplicate key update + object_id = values(object_id), + bill_kind_id = values(bill_kind_id), + data_set_id = values(data_set_id), + pope_list = values(pope_list), + kind_id = values(kind_id), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id) + + +update sys_popedom_data set + + object_id = #{objectId}, + bill_kind_id = #{billKindId}, + data_set_id = #{dataSetId}, + pope_list = #{popeList}, + kind_id = #{kindId}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + +where id = #{id} + + + update sys_popedom_data set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - - - update sys_popedom_data set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} - - and id = #{id} - and object_id = #{objectId} - and bill_kind_id = #{billKindId} - and data_set_id = #{dataSetId} - and pope_list = #{popeList} - and kind_id = #{kindId} - and sorts = #{sorts} - and sts = #{sts} - and company_id = #{companyId} + + +update sys_popedom_data set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and object_id = #{objectId} + and bill_kind_id = #{billKindId} + and data_set_id = #{dataSetId} + and pope_list = #{popeList} + and kind_id = #{kindId} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} and sts='Y' - - - - + + + + delete from sys_popedom_data where id = #{id} diff --git a/service/src/main/java/com/hzya/frame/sys/popedomData/service/ISysPopedomDataService.java b/service/src/main/java/com/hzya/frame/sys/popedomData/service/ISysPopedomDataService.java index fc2754b3..aa9687f9 100644 --- a/service/src/main/java/com/hzya/frame/sys/popedomData/service/ISysPopedomDataService.java +++ b/service/src/main/java/com/hzya/frame/sys/popedomData/service/ISysPopedomDataService.java @@ -2,12 +2,11 @@ package com.hzya.frame.sys.popedomData.service; import com.hzya.frame.sys.popedomData.entity.SysPopedomDataEntity; import com.hzya.frame.basedao.service.IBaseService; - /** * 数据权限(SysPopedomData)表服务接口 * * @author makejava - * @since 2024-03-26 15:25:52 + * @since 2024-03-27 15:45:34 */ -public interface ISysPopedomDataService extends IBaseService { +public interface ISysPopedomDataService extends IBaseService{ } diff --git a/service/src/main/java/com/hzya/frame/sys/popedomData/service/impl/SysPopedomDataServiceImpl.java b/service/src/main/java/com/hzya/frame/sys/popedomData/service/impl/SysPopedomDataServiceImpl.java index 29c6511f..be2e8ed7 100644 --- a/service/src/main/java/com/hzya/frame/sys/popedomData/service/impl/SysPopedomDataServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sys/popedomData/service/impl/SysPopedomDataServiceImpl.java @@ -3,27 +3,24 @@ package com.hzya.frame.sys.popedomData.service.impl; import com.hzya.frame.sys.popedomData.entity.SysPopedomDataEntity; import com.hzya.frame.sys.popedomData.dao.ISysPopedomDataDao; import com.hzya.frame.sys.popedomData.service.ISysPopedomDataService; -import org.springframework.stereotype.Service; +import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; - import javax.annotation.Resource; - import com.hzya.frame.basedao.service.impl.BaseService; - /** * 数据权限(SysPopedomData)表服务实现类 * * @author makejava - * @since 2024-03-26 15:25:52 + * @since 2024-03-27 15:45:34 */ @Service(value = "sysPopedomDataService") public class SysPopedomDataServiceImpl extends BaseService implements ISysPopedomDataService { - + private ISysPopedomDataDao sysPopedomDataDao; - + @Autowired - public void setSysPopedomDataDao(ISysPopedomDataDao dao) { - this.sysPopedomDataDao = dao; - this.dao = dao; - } + public void setSysPopedomDataDao(ISysPopedomDataDao dao) { + this.sysPopedomDataDao = dao; + this.dao = dao; + } } diff --git a/service/src/main/java/com/hzya/frame/sys/popedomHome/dao/ISysPopedomHomeDao.java b/service/src/main/java/com/hzya/frame/sys/popedomHome/dao/ISysPopedomHomeDao.java new file mode 100644 index 00000000..92cffba7 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sys/popedomHome/dao/ISysPopedomHomeDao.java @@ -0,0 +1,15 @@ +package com.hzya.frame.sys.popedomHome.dao; + +import com.hzya.frame.sys.popedomHome.entity.SysPopedomHomeEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +/** + * 首页权限(sys_popedom_home: table)表数据库访问层 + * + * @author makejava + * @since 2024-03-27 15:47:12 + */ +public interface ISysPopedomHomeDao extends IBaseDao { + +} + diff --git a/service/src/main/java/com/hzya/frame/sys/popedomHome/dao/impl/SysPopedomHomeDaoImpl.java b/service/src/main/java/com/hzya/frame/sys/popedomHome/dao/impl/SysPopedomHomeDaoImpl.java new file mode 100644 index 00000000..72b3bb61 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sys/popedomHome/dao/impl/SysPopedomHomeDaoImpl.java @@ -0,0 +1,18 @@ +package com.hzya.frame.sys.popedomHome.dao.impl; + +import com.hzya.frame.sys.popedomHome.entity.SysPopedomHomeEntity; +import com.hzya.frame.sys.popedomHome.dao.ISysPopedomHomeDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; + +/** + * 首页权限(SysPopedomHome)表数据库访问层 + * + * @author makejava + * @since 2024-03-27 15:47:12 + */ +@Repository(value = "SysPopedomHomeDaoImpl") +public class SysPopedomHomeDaoImpl extends MybatisGenericDao implements ISysPopedomHomeDao { + +} + diff --git a/service/src/main/java/com/hzya/frame/sys/popedomHome/entity/SysPopedomHomeEntity.java b/service/src/main/java/com/hzya/frame/sys/popedomHome/entity/SysPopedomHomeEntity.java new file mode 100644 index 00000000..e81884df --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sys/popedomHome/entity/SysPopedomHomeEntity.java @@ -0,0 +1,66 @@ +package com.hzya.frame.sys.popedomHome.entity; + +import java.util.Date; + +import com.hzya.frame.web.entity.BaseEntity; + +/** + * 首页权限(SysPopedomHome)实体类 + * + * @author makejava + * @since 2024-03-27 15:47:12 + */ +public class SysPopedomHomeEntity extends BaseEntity { + + /** + * 权限赋予对象id + */ + private String objectId; + /** + * 首页ID + */ + private String homeId; + /** + * 权限类型（1、人员、2、角色） + */ + private String kindId; + /** + * 公司id + */ + private String companyId; + + + public String getObjectId() { + return objectId; + } + + public void setObjectId(String objectId) { + this.objectId = objectId; + } + + public String getHomeId() { + return homeId; + } + + public void setHomeId(String homeId) { + this.homeId = homeId; + } + + public String getKindId() { + return kindId; + } + + public void setKindId(String kindId) { + this.kindId = kindId; + } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + +} + diff --git a/service/src/main/java/com/hzya/frame/sys/popedomHome/entity/SysPopedomHomeEntity.xml b/service/src/main/java/com/hzya/frame/sys/popedomHome/entity/SysPopedomHomeEntity.xml new file mode 100644 index 00000000..28479c0b --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sys/popedomHome/entity/SysPopedomHomeEntity.xml @@ -0,0 +1,250 @@ + + + + + + + + + + + + + + + + + + + + + id + ,object_id + ,home_id + ,kind_id + ,sorts + ,create_user_id + ,create_time + ,modify_user_id + ,modify_time + ,sts + ,org_id + ,company_id + + + + + + + + + + + + + + + + + + insert into sys_popedom_home( + + id , + object_id , + home_id , + kind_id , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sts, + + )values( + + #{id} , + #{objectId} , + #{homeId} , + #{kindId} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + 'Y', + + ) + + + + insert into sys_popedom_home(object_id, home_id, kind_id, create_user_id, create_time, modify_user_id, + modify_time, sts, org_id, company_id, sts) + values + + (#{entity.objectId},#{entity.homeId},#{entity.kindId},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, + 'Y') + + + + + insert into sys_popedom_home(object_id, home_id, kind_id, create_user_id, create_time, modify_user_id, + modify_time, sts, org_id, company_id) + values + + (#{entity.objectId},#{entity.homeId},#{entity.kindId},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + + on duplicate key update + object_id = values(object_id), + home_id = values(home_id), + kind_id = values(kind_id), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id) + + + + update sys_popedom_home set + + object_id = #{objectId}, + home_id = #{homeId}, + kind_id = #{kindId}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + + where id = #{id} + + + +update sys_popedom_home set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} +where id = #{id} + + + + update sys_popedom_home set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and object_id = #{objectId} + and home_id = #{homeId} + and kind_id = #{kindId} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} + and sts='Y' + + + + + delete from sys_popedom_home where id = #{id} + + + + diff --git a/service/src/main/java/com/hzya/frame/sys/popedomHome/service/ISysPopedomHomeService.java b/service/src/main/java/com/hzya/frame/sys/popedomHome/service/ISysPopedomHomeService.java new file mode 100644 index 00000000..3194e632 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sys/popedomHome/service/ISysPopedomHomeService.java @@ -0,0 +1,13 @@ +package com.hzya.frame.sys.popedomHome.service; + +import com.hzya.frame.sys.popedomHome.entity.SysPopedomHomeEntity; +import com.hzya.frame.basedao.service.IBaseService; + +/** + * 首页权限(SysPopedomHome)表服务接口 + * + * @author makejava + * @since 2024-03-27 15:47:13 + */ +public interface ISysPopedomHomeService extends IBaseService { +} diff --git a/service/src/main/java/com/hzya/frame/sys/popedomHome/service/impl/SysPopedomHomeServiceImpl.java b/service/src/main/java/com/hzya/frame/sys/popedomHome/service/impl/SysPopedomHomeServiceImpl.java new file mode 100644 index 00000000..0ae5bca0 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sys/popedomHome/service/impl/SysPopedomHomeServiceImpl.java @@ -0,0 +1,29 @@ +package com.hzya.frame.sys.popedomHome.service.impl; + +import com.hzya.frame.sys.popedomHome.entity.SysPopedomHomeEntity; +import com.hzya.frame.sys.popedomHome.dao.ISysPopedomHomeDao; +import com.hzya.frame.sys.popedomHome.service.ISysPopedomHomeService; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.annotation.Resource; + +import com.hzya.frame.basedao.service.impl.BaseService; + +/** + * 首页权限(SysPopedomHome)表服务实现类 + * + * @author makejava + * @since 2024-03-27 15:47:13 + */ +@Service(value = "sysPopedomHomeService") +public class SysPopedomHomeServiceImpl extends BaseService implements ISysPopedomHomeService { + + private ISysPopedomHomeDao sysPopedomHomeDao; + + @Autowired + public void setSysPopedomHomeDao(ISysPopedomHomeDao dao) { + this.sysPopedomHomeDao = dao; + this.dao = dao; + } +} diff --git a/service/src/main/java/com/hzya/frame/sys/popedomMenu/dao/ISysPopedomMenuDao.java b/service/src/main/java/com/hzya/frame/sys/popedomMenu/dao/ISysPopedomMenuDao.java index 9e4d1bc3..589a45c2 100644 --- a/service/src/main/java/com/hzya/frame/sys/popedomMenu/dao/ISysPopedomMenuDao.java +++ b/service/src/main/java/com/hzya/frame/sys/popedomMenu/dao/ISysPopedomMenuDao.java @@ -1,13 +1,13 @@ package com.hzya.frame.sys.popedomMenu.dao; import com.hzya.frame.sys.popedomMenu.entity.SysPopedomMenuEntity; -import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.basedao.dao.IBaseDao; /** * 系统模块权限(sys_popedom_menu: table)表数据库访问层 * * @author makejava - * @since 2024-03-26 15:26:30 + * @since 2024-03-27 15:47:29 */ public interface ISysPopedomMenuDao extends IBaseDao { diff --git a/service/src/main/java/com/hzya/frame/sys/popedomMenu/dao/impl/SysPopedomMenuDaoImpl.java b/service/src/main/java/com/hzya/frame/sys/popedomMenu/dao/impl/SysPopedomMenuDaoImpl.java index 02995ffb..fffc1296 100644 --- a/service/src/main/java/com/hzya/frame/sys/popedomMenu/dao/impl/SysPopedomMenuDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sys/popedomMenu/dao/impl/SysPopedomMenuDaoImpl.java @@ -4,15 +4,14 @@ import com.hzya.frame.sys.popedomMenu.entity.SysPopedomMenuEntity; import com.hzya.frame.sys.popedomMenu.dao.ISysPopedomMenuDao; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; - /** * 系统模块权限(SysPopedomMenu)表数据库访问层 * * @author makejava - * @since 2024-03-26 15:26:30 + * @since 2024-03-27 15:47:30 */ @Repository(value = "SysPopedomMenuDaoImpl") -public class SysPopedomMenuDaoImpl extends MybatisGenericDao implements ISysPopedomMenuDao { - +public class SysPopedomMenuDaoImpl extends MybatisGenericDao implements ISysPopedomMenuDao{ + } diff --git a/service/src/main/java/com/hzya/frame/sys/popedomMenu/entity/SysPopedomMenuEntity.java b/service/src/main/java/com/hzya/frame/sys/popedomMenu/entity/SysPopedomMenuEntity.java index cd96779a..37779574 100644 --- a/service/src/main/java/com/hzya/frame/sys/popedomMenu/entity/SysPopedomMenuEntity.java +++ b/service/src/main/java/com/hzya/frame/sys/popedomMenu/entity/SysPopedomMenuEntity.java @@ -1,33 +1,23 @@ package com.hzya.frame.sys.popedomMenu.entity; import java.util.Date; - import com.hzya.frame.web.entity.BaseEntity; - /** * 系统模块权限(SysPopedomMenu)实体类 * * @author makejava - * @since 2024-03-26 15:26:30 + * @since 2024-03-27 15:47:30 */ public class SysPopedomMenuEntity extends BaseEntity { - - /** - * 权限赋予对象id - */ - private String objectId; - /** - * 菜单id集 - */ - private String menuIdList; - /** - * 权限类型（1、人员、2、部门、3、角色） - */ - private String kindId; - /** - * 公司id - */ - private String companyId; + + /** 权限赋予对象id */ + private String objectId; + /** 菜单id */ + private String menuId; + /** 权限类型（1、人员、2、角色） */ + private String kindId; + /** 公司id */ + private String companyId; public String getObjectId() { @@ -38,12 +28,12 @@ public class SysPopedomMenuEntity extends BaseEntity { this.objectId = objectId; } - public String getMenuIdList() { - return menuIdList; + public String getMenuId() { + return menuId; } - public void setMenuIdList(String menuIdList) { - this.menuIdList = menuIdList; + public void setMenuId(String menuId) { + this.menuId = menuId; } public String getKindId() { diff --git a/service/src/main/java/com/hzya/frame/sys/popedomMenu/entity/SysPopedomMenuEntity.xml b/service/src/main/java/com/hzya/frame/sys/popedomMenu/entity/SysPopedomMenuEntity.xml index 053aec38..3077309d 100644 --- a/service/src/main/java/com/hzya/frame/sys/popedomMenu/entity/SysPopedomMenuEntity.xml +++ b/service/src/main/java/com/hzya/frame/sys/popedomMenu/entity/SysPopedomMenuEntity.xml @@ -2,25 +2,25 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + id ,object_id - ,menu_id_list + ,menu_id ,kind_id ,sorts ,create_user_id @@ -31,220 +31,204 @@ ,org_id ,company_id - - select - - from sys_popedom_menu - - and id = #{id} - and object_id = #{objectId} - and menu_id_list = #{menuIdList} - and kind_id = #{kindId} - and sorts = #{sorts} - and create_user_id = #{create_user_id} - and create_time = #{create_time} - and modify_user_id = #{modify_user_id} - and modify_time = #{modify_time} - and sts = #{sts} - and org_id = #{org_id} - and company_id = #{companyId} - and sts='Y' - - order by sorts asc - order by ${sort} ${order} + + from sys_popedom_menu where id = #{ id } and sts='Y' - - - + select + + from sys_popedom_menu + + and id = #{id} + and object_id = #{objectId} + and menu_id = #{menuId} + and kind_id = #{kindId} + and sorts = #{sorts} + and create_user_id = #{create_user_id} + and create_time = #{create_time} + and modify_user_id = #{modify_user_id} + and modify_time = #{modify_time} + and sts = #{sts} + and org_id = #{org_id} + and company_id = #{companyId} and sts='Y' - - order by sorts asc - order by ${sort} ${order} + + order by sorts asc + order by ${sort} ${order} + + + + - + select + + from sys_popedom_menu + + and id like concat('%',#{id},'%') + and object_id like concat('%',#{objectId},'%') + and menu_id like concat('%',#{menuId},'%') + and kind_id like concat('%',#{kindId},'%') + and sorts like concat('%',#{sorts},'%') + and create_user_id like concat('%',#{create_user_id},'%') + and create_time like concat('%',#{create_time},'%') + and modify_user_id like concat('%',#{modify_user_id},'%') + and modify_time like concat('%',#{modify_time},'%') + and sts like concat('%',#{sts},'%') + and org_id like concat('%',#{org_id},'%') + and company_id like concat('%',#{companyId},'%') and sts='Y' - - order by sorts asc - order by ${sort} ${order} - + + order by sorts asc + order by ${sort} ${order} + - - + select + + from sys_popedom_menu + + or id = #{id} + or object_id = #{objectId} + or menu_id = #{menuId} + or kind_id = #{kindId} + or sorts = #{sorts} + or create_user_id = #{create_user_id} + or create_time = #{create_time} + or modify_user_id = #{modify_user_id} + or modify_time = #{modify_time} + or sts = #{sts} + or org_id = #{org_id} + or company_id = #{companyId} and sts='Y' - - order by sorts asc - order by ${sort} ${order} - + + order by sorts asc + order by ${sort} ${order} + - - - insert into sys_popedom_menu( - - id , - object_id , - menu_id_list , - kind_id , - sorts , - create_user_id , - create_time , - modify_user_id , - modify_time , - sts , - org_id , - company_id , - sorts, - sts, - - )values( - - #{id} , - #{objectId} , - #{menuIdList} , - #{kindId} , - #{sorts} , - #{create_user_id} , - #{create_time} , - #{modify_user_id} , - #{modify_time} , - #{sts} , - #{org_id} , - #{companyId} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_popedom_menu a WHERE - a.sts = 'Y' ), - - 'Y', - - ) - - - - insert into sys_popedom_menu(object_id, menu_id_list, kind_id, sorts, create_user_id, create_time, - modify_user_id, modify_time, sts, org_id, company_id, sts) - values - - (#{entity.objectId},#{entity.menuIdList},#{entity.kindId},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, - 'Y') - - - - - insert into sys_popedom_menu(object_id, menu_id_list, kind_id, sorts, create_user_id, create_time, - modify_user_id, modify_time, sts, org_id, company_id) - values - - (#{entity.objectId},#{entity.menuIdList},#{entity.kindId},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) - - on duplicate key update - object_id = values(object_id), - menu_id_list = values(menu_id_list), - kind_id = values(kind_id), - sorts = values(sorts), - create_user_id = values(create_user_id), - create_time = values(create_time), - modify_user_id = values(modify_user_id), - modify_time = values(modify_time), - sts = values(sts), - org_id = values(org_id), - company_id = values(company_id) - - - - update sys_popedom_menu set - - object_id = #{objectId}, - menu_id_list = #{menuIdList}, - kind_id = #{kindId}, - sorts = #{sorts}, - create_user_id = #{create_user_id}, - create_time = #{create_time}, - modify_user_id = #{modify_user_id}, - modify_time = #{modify_time}, - sts = #{sts}, - org_id = #{org_id}, - company_id = #{companyId}, - - where id = #{id} - - - + + + insert into sys_popedom_menu( + + id , + object_id , + menu_id , + kind_id , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sts, + + )values( + + #{id} , + #{objectId} , + #{menuId} , + #{kindId} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + 'Y', + + ) + + + + insert into sys_popedom_menu(object_id, menu_id, kind_id, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) + values + + (#{entity.objectId},#{entity.menuId},#{entity.kindId},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') + + + + + insert into sys_popedom_menu(object_id, menu_id, kind_id, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) + values + + (#{entity.objectId},#{entity.menuId},#{entity.kindId},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + + on duplicate key update + object_id = values(object_id), + menu_id = values(menu_id), + kind_id = values(kind_id), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id) + + +update sys_popedom_menu set + + object_id = #{objectId}, + menu_id = #{menuId}, + kind_id = #{kindId}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + +where id = #{id} + + + update sys_popedom_menu set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - - - update sys_popedom_menu set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} - - and id = #{id} - and object_id = #{objectId} - and menu_id_list = #{menuIdList} - and kind_id = #{kindId} - and sorts = #{sorts} - and sts = #{sts} - and company_id = #{companyId} + + +update sys_popedom_menu set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and object_id = #{objectId} + and menu_id = #{menuId} + and kind_id = #{kindId} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} and sts='Y' - - - - + + + + delete from sys_popedom_menu where id = #{id} diff --git a/service/src/main/java/com/hzya/frame/sys/popedomMenu/service/ISysPopedomMenuService.java b/service/src/main/java/com/hzya/frame/sys/popedomMenu/service/ISysPopedomMenuService.java index 7187c8c7..e8c0d52f 100644 --- a/service/src/main/java/com/hzya/frame/sys/popedomMenu/service/ISysPopedomMenuService.java +++ b/service/src/main/java/com/hzya/frame/sys/popedomMenu/service/ISysPopedomMenuService.java @@ -2,12 +2,11 @@ package com.hzya.frame.sys.popedomMenu.service; import com.hzya.frame.sys.popedomMenu.entity.SysPopedomMenuEntity; import com.hzya.frame.basedao.service.IBaseService; - /** * 系统模块权限(SysPopedomMenu)表服务接口 * * @author makejava - * @since 2024-03-26 15:26:30 + * @since 2024-03-27 15:47:32 */ -public interface ISysPopedomMenuService extends IBaseService { +public interface ISysPopedomMenuService extends IBaseService{ } diff --git a/service/src/main/java/com/hzya/frame/sys/popedomMenu/service/impl/SysPopedomMenuServiceImpl.java b/service/src/main/java/com/hzya/frame/sys/popedomMenu/service/impl/SysPopedomMenuServiceImpl.java index c107ca5a..5c10c084 100644 --- a/service/src/main/java/com/hzya/frame/sys/popedomMenu/service/impl/SysPopedomMenuServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sys/popedomMenu/service/impl/SysPopedomMenuServiceImpl.java @@ -3,27 +3,24 @@ package com.hzya.frame.sys.popedomMenu.service.impl; import com.hzya.frame.sys.popedomMenu.entity.SysPopedomMenuEntity; import com.hzya.frame.sys.popedomMenu.dao.ISysPopedomMenuDao; import com.hzya.frame.sys.popedomMenu.service.ISysPopedomMenuService; -import org.springframework.stereotype.Service; +import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; - import javax.annotation.Resource; - import com.hzya.frame.basedao.service.impl.BaseService; - /** * 系统模块权限(SysPopedomMenu)表服务实现类 * * @author makejava - * @since 2024-03-26 15:26:31 + * @since 2024-03-27 15:47:33 */ @Service(value = "sysPopedomMenuService") public class SysPopedomMenuServiceImpl extends BaseService implements ISysPopedomMenuService { - + private ISysPopedomMenuDao sysPopedomMenuDao; - + @Autowired - public void setSysPopedomMenuDao(ISysPopedomMenuDao dao) { - this.sysPopedomMenuDao = dao; - this.dao = dao; - } + public void setSysPopedomMenuDao(ISysPopedomMenuDao dao) { + this.sysPopedomMenuDao = dao; + this.dao = dao; + } } diff --git a/service/src/main/java/com/hzya/frame/sys/popedomOperate/dao/ISysPopedomOperateDao.java b/service/src/main/java/com/hzya/frame/sys/popedomOperate/dao/ISysPopedomOperateDao.java index 0efaae3d..02fe1e38 100644 --- a/service/src/main/java/com/hzya/frame/sys/popedomOperate/dao/ISysPopedomOperateDao.java +++ b/service/src/main/java/com/hzya/frame/sys/popedomOperate/dao/ISysPopedomOperateDao.java @@ -1,13 +1,13 @@ package com.hzya.frame.sys.popedomOperate.dao; import com.hzya.frame.sys.popedomOperate.entity.SysPopedomOperateEntity; -import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.basedao.dao.IBaseDao; /** * 操作权限(sys_popedom_operate: table)表数据库访问层 * * @author makejava - * @since 2024-03-26 15:27:11 + * @since 2024-03-27 15:47:39 */ public interface ISysPopedomOperateDao extends IBaseDao { diff --git a/service/src/main/java/com/hzya/frame/sys/popedomOperate/dao/impl/SysPopedomOperateDaoImpl.java b/service/src/main/java/com/hzya/frame/sys/popedomOperate/dao/impl/SysPopedomOperateDaoImpl.java index 120cfdda..60469611 100644 --- a/service/src/main/java/com/hzya/frame/sys/popedomOperate/dao/impl/SysPopedomOperateDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sys/popedomOperate/dao/impl/SysPopedomOperateDaoImpl.java @@ -4,15 +4,14 @@ import com.hzya.frame.sys.popedomOperate.entity.SysPopedomOperateEntity; import com.hzya.frame.sys.popedomOperate.dao.ISysPopedomOperateDao; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; - /** * 操作权限(SysPopedomOperate)表数据库访问层 * * @author makejava - * @since 2024-03-26 15:27:11 + * @since 2024-03-27 15:47:40 */ @Repository(value = "SysPopedomOperateDaoImpl") -public class SysPopedomOperateDaoImpl extends MybatisGenericDao implements ISysPopedomOperateDao { - +public class SysPopedomOperateDaoImpl extends MybatisGenericDao implements ISysPopedomOperateDao{ + } diff --git a/service/src/main/java/com/hzya/frame/sys/popedomOperate/entity/SysPopedomOperateEntity.java b/service/src/main/java/com/hzya/frame/sys/popedomOperate/entity/SysPopedomOperateEntity.java index 77d40407..b831ea37 100644 --- a/service/src/main/java/com/hzya/frame/sys/popedomOperate/entity/SysPopedomOperateEntity.java +++ b/service/src/main/java/com/hzya/frame/sys/popedomOperate/entity/SysPopedomOperateEntity.java @@ -1,37 +1,25 @@ package com.hzya.frame.sys.popedomOperate.entity; import java.util.Date; - import com.hzya.frame.web.entity.BaseEntity; - /** * 操作权限(SysPopedomOperate)实体类 * * @author makejava - * @since 2024-03-26 15:27:11 + * @since 2024-03-27 15:47:41 */ public class SysPopedomOperateEntity extends BaseEntity { - - /** - * 权限赋予对象id - */ - private String objectId; - /** - * 菜单id - */ - private String menuId; - /** - * 操作权限分类id集 - */ - private String operateKindList; - /** - * 权限分类（1、人员、2、部门、3、角色） - */ - private String kindId; - /** - * 公司id - */ - private String companyId; + + /** 权限赋予对象id */ + private String objectId; + /** 菜单id */ + private String menuId; + /** 操作权限分类id集 */ + private String operateKindList; + /** 权限分类（1、人员、2、角色） */ + private String kindId; + /** 公司id */ + private String companyId; public String getObjectId() { diff --git a/service/src/main/java/com/hzya/frame/sys/popedomOperate/entity/SysPopedomOperateEntity.xml b/service/src/main/java/com/hzya/frame/sys/popedomOperate/entity/SysPopedomOperateEntity.xml index 54113182..d6e8afb8 100644 --- a/service/src/main/java/com/hzya/frame/sys/popedomOperate/entity/SysPopedomOperateEntity.xml +++ b/service/src/main/java/com/hzya/frame/sys/popedomOperate/entity/SysPopedomOperateEntity.xml @@ -2,24 +2,23 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + id ,object_id ,menu_id @@ -34,231 +33,213 @@ ,org_id ,company_id - - select - - from sys_popedom_operate - - and id = #{id} - and object_id = #{objectId} - and menu_id = #{menuId} - and operate_kind_list = #{operateKindList} - and kind_id = #{kindId} - and sorts = #{sorts} - and create_user_id = #{create_user_id} - and create_time = #{create_time} - and modify_user_id = #{modify_user_id} - and modify_time = #{modify_time} - and sts = #{sts} - and org_id = #{org_id} - and company_id = #{companyId} - and sts='Y' - - order by sorts asc - order by ${sort} ${order} + + from sys_popedom_operate where id = #{ id } and sts='Y' - - - + select + + from sys_popedom_operate + + and id = #{id} + and object_id = #{objectId} + and menu_id = #{menuId} + and operate_kind_list = #{operateKindList} + and kind_id = #{kindId} + and sorts = #{sorts} + and create_user_id = #{create_user_id} + and create_time = #{create_time} + and modify_user_id = #{modify_user_id} + and modify_time = #{modify_time} + and sts = #{sts} + and org_id = #{org_id} + and company_id = #{companyId} and sts='Y' - - order by sorts asc - order by ${sort} ${order} + + order by sorts asc + order by ${sort} ${order} + + + + - + select + + from sys_popedom_operate + + and id like concat('%',#{id},'%') + and object_id like concat('%',#{objectId},'%') + and menu_id like concat('%',#{menuId},'%') + and operate_kind_list like concat('%',#{operateKindList},'%') + and kind_id like concat('%',#{kindId},'%') + and sorts like concat('%',#{sorts},'%') + and create_user_id like concat('%',#{create_user_id},'%') + and create_time like concat('%',#{create_time},'%') + and modify_user_id like concat('%',#{modify_user_id},'%') + and modify_time like concat('%',#{modify_time},'%') + and sts like concat('%',#{sts},'%') + and org_id like concat('%',#{org_id},'%') + and company_id like concat('%',#{companyId},'%') and sts='Y' - - order by sorts asc - order by ${sort} ${order} - + + order by sorts asc + order by ${sort} ${order} + - - + select + + from sys_popedom_operate + + or id = #{id} + or object_id = #{objectId} + or menu_id = #{menuId} + or operate_kind_list = #{operateKindList} + or kind_id = #{kindId} + or sorts = #{sorts} + or create_user_id = #{create_user_id} + or create_time = #{create_time} + or modify_user_id = #{modify_user_id} + or modify_time = #{modify_time} + or sts = #{sts} + or org_id = #{org_id} + or company_id = #{companyId} and sts='Y' - - order by sorts asc - order by ${sort} ${order} - + + order by sorts asc + order by ${sort} ${order} + - - - insert into sys_popedom_operate( - - id , - object_id , - menu_id , - operate_kind_list , - kind_id , - sorts , - create_user_id , - create_time , - modify_user_id , - modify_time , - sts , - org_id , - company_id , - sorts, - sts, - - )values( - - #{id} , - #{objectId} , - #{menuId} , - #{operateKindList} , - #{kindId} , - #{sorts} , - #{create_user_id} , - #{create_time} , - #{modify_user_id} , - #{modify_time} , - #{sts} , - #{org_id} , - #{companyId} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_popedom_operate a WHERE - a.sts = 'Y' ), - - 'Y', - - ) - - - - insert into sys_popedom_operate(object_id, menu_id, operate_kind_list, kind_id, sorts, create_user_id, - create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) - values - - (#{entity.objectId},#{entity.menuId},#{entity.operateKindList},#{entity.kindId},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, - 'Y') - - - - - insert into sys_popedom_operate(object_id, menu_id, operate_kind_list, kind_id, sorts, create_user_id, - create_time, modify_user_id, modify_time, sts, org_id, company_id) - values - - (#{entity.objectId},#{entity.menuId},#{entity.operateKindList},#{entity.kindId},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) - - on duplicate key update - object_id = values(object_id), - menu_id = values(menu_id), - operate_kind_list = values(operate_kind_list), - kind_id = values(kind_id), - sorts = values(sorts), - create_user_id = values(create_user_id), - create_time = values(create_time), - modify_user_id = values(modify_user_id), - modify_time = values(modify_time), - sts = values(sts), - org_id = values(org_id), - company_id = values(company_id) - - - - update sys_popedom_operate set - - object_id = #{objectId}, - menu_id = #{menuId}, - operate_kind_list = #{operateKindList}, - kind_id = #{kindId}, - sorts = #{sorts}, - create_user_id = #{create_user_id}, - create_time = #{create_time}, - modify_user_id = #{modify_user_id}, - modify_time = #{modify_time}, - sts = #{sts}, - org_id = #{org_id}, - company_id = #{companyId}, - - where id = #{id} - - - + + + insert into sys_popedom_operate( + + id , + object_id , + menu_id , + operate_kind_list , + kind_id , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sts, + + )values( + + #{id} , + #{objectId} , + #{menuId} , + #{operateKindList} , + #{kindId} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + 'Y', + + ) + + + + insert into sys_popedom_operate(object_id, menu_id, operate_kind_list, kind_id, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) + values + + (#{entity.objectId},#{entity.menuId},#{entity.operateKindList},#{entity.kindId},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') + + + + + insert into sys_popedom_operate(object_id, menu_id, operate_kind_list, kind_id, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) + values + + (#{entity.objectId},#{entity.menuId},#{entity.operateKindList},#{entity.kindId},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + + on duplicate key update + object_id = values(object_id), + menu_id = values(menu_id), + operate_kind_list = values(operate_kind_list), + kind_id = values(kind_id), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id) + + +update sys_popedom_operate set + + object_id = #{objectId}, + menu_id = #{menuId}, + operate_kind_list = #{operateKindList}, + kind_id = #{kindId}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + +where id = #{id} + + + update sys_popedom_operate set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - - - update sys_popedom_operate set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} - - and id = #{id} - and object_id = #{objectId} - and menu_id = #{menuId} - and operate_kind_list = #{operateKindList} - and kind_id = #{kindId} - and sorts = #{sorts} - and sts = #{sts} - and company_id = #{companyId} + + +update sys_popedom_operate set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and object_id = #{objectId} + and menu_id = #{menuId} + and operate_kind_list = #{operateKindList} + and kind_id = #{kindId} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} and sts='Y' - - - - + + + + delete from sys_popedom_operate where id = #{id} diff --git a/service/src/main/java/com/hzya/frame/sys/popedomOperate/service/ISysPopedomOperateService.java b/service/src/main/java/com/hzya/frame/sys/popedomOperate/service/ISysPopedomOperateService.java index fea732e5..3355b9d0 100644 --- a/service/src/main/java/com/hzya/frame/sys/popedomOperate/service/ISysPopedomOperateService.java +++ b/service/src/main/java/com/hzya/frame/sys/popedomOperate/service/ISysPopedomOperateService.java @@ -2,12 +2,11 @@ package com.hzya.frame.sys.popedomOperate.service; import com.hzya.frame.sys.popedomOperate.entity.SysPopedomOperateEntity; import com.hzya.frame.basedao.service.IBaseService; - /** * 操作权限(SysPopedomOperate)表服务接口 * * @author makejava - * @since 2024-03-26 15:27:12 + * @since 2024-03-27 15:47:42 */ -public interface ISysPopedomOperateService extends IBaseService { +public interface ISysPopedomOperateService extends IBaseService{ } diff --git a/service/src/main/java/com/hzya/frame/sys/popedomOperate/service/impl/SysPopedomOperateServiceImpl.java b/service/src/main/java/com/hzya/frame/sys/popedomOperate/service/impl/SysPopedomOperateServiceImpl.java index eb5f008f..a6cca06b 100644 --- a/service/src/main/java/com/hzya/frame/sys/popedomOperate/service/impl/SysPopedomOperateServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sys/popedomOperate/service/impl/SysPopedomOperateServiceImpl.java @@ -3,27 +3,24 @@ package com.hzya.frame.sys.popedomOperate.service.impl; import com.hzya.frame.sys.popedomOperate.entity.SysPopedomOperateEntity; import com.hzya.frame.sys.popedomOperate.dao.ISysPopedomOperateDao; import com.hzya.frame.sys.popedomOperate.service.ISysPopedomOperateService; -import org.springframework.stereotype.Service; +import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; - import javax.annotation.Resource; - import com.hzya.frame.basedao.service.impl.BaseService; - /** * 操作权限(SysPopedomOperate)表服务实现类 * * @author makejava - * @since 2024-03-26 15:27:12 + * @since 2024-03-27 15:47:42 */ @Service(value = "sysPopedomOperateService") public class SysPopedomOperateServiceImpl extends BaseService implements ISysPopedomOperateService { - + private ISysPopedomOperateDao sysPopedomOperateDao; - + @Autowired - public void setSysPopedomOperateDao(ISysPopedomOperateDao dao) { - this.sysPopedomOperateDao = dao; - this.dao = dao; - } + public void setSysPopedomOperateDao(ISysPopedomOperateDao dao) { + this.sysPopedomOperateDao = dao; + this.dao = dao; + } } diff --git a/service/src/main/java/com/hzya/frame/sys/role/dao/ISysRoleDao.java b/service/src/main/java/com/hzya/frame/sys/role/dao/ISysRoleDao.java index 4fe01f73..e13d4889 100644 --- a/service/src/main/java/com/hzya/frame/sys/role/dao/ISysRoleDao.java +++ b/service/src/main/java/com/hzya/frame/sys/role/dao/ISysRoleDao.java @@ -7,7 +7,7 @@ import com.hzya.frame.basedao.dao.IBaseDao; * 角色表(sys_role: table)表数据库访问层 * * @author makejava - * @since 2024-03-26 15:21:56 + * @since 2024-03-27 11:49:34 */ public interface ISysRoleDao extends IBaseDao { diff --git a/service/src/main/java/com/hzya/frame/sys/role/dao/impl/SysRoleDaoImpl.java b/service/src/main/java/com/hzya/frame/sys/role/dao/impl/SysRoleDaoImpl.java index de1799e1..02afcd5c 100644 --- a/service/src/main/java/com/hzya/frame/sys/role/dao/impl/SysRoleDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sys/role/dao/impl/SysRoleDaoImpl.java @@ -8,7 +8,7 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao; * 角色表(SysRole)表数据库访问层 * * @author makejava - * @since 2024-03-26 15:21:57 + * @since 2024-03-27 11:49:36 */ @Repository(value = "SysRoleDaoImpl") public class SysRoleDaoImpl extends MybatisGenericDao implements ISysRoleDao{ diff --git a/service/src/main/java/com/hzya/frame/sys/role/entity/SysRoleEntity.java b/service/src/main/java/com/hzya/frame/sys/role/entity/SysRoleEntity.java index c7e414ca..4c0a8f2b 100644 --- a/service/src/main/java/com/hzya/frame/sys/role/entity/SysRoleEntity.java +++ b/service/src/main/java/com/hzya/frame/sys/role/entity/SysRoleEntity.java @@ -1,12 +1,15 @@ package com.hzya.frame.sys.role.entity; import java.util.Date; + +import cn.dev33.satoken.stp.StpUtil; +import com.hzya.frame.uuid.UUIDUtils; import com.hzya.frame.web.entity.BaseEntity; /** * 角色表(SysRole)实体类 * * @author makejava - * @since 2024-03-26 15:22:01 + * @since 2024-03-27 11:49:36 */ public class SysRoleEntity extends BaseEntity { @@ -16,8 +19,9 @@ public class SysRoleEntity extends BaseEntity { private String roleName; /** 角色说明 */ private String description; - /** 公司id */ - private String companyId; + /** 状态: 0启用 1 停用 */ + private String enableState; + public String getRoleCode() { @@ -44,13 +48,14 @@ public class SysRoleEntity extends BaseEntity { this.description = description; } - public String getCompanyId() { - return companyId; + public String getEnableState() { + return enableState; } - public void setCompanyId(String companyId) { - this.companyId = companyId; + public void setEnableState(String enableState) { + this.enableState = enableState; } + } diff --git a/service/src/main/java/com/hzya/frame/sys/role/entity/SysRoleEntity.xml b/service/src/main/java/com/hzya/frame/sys/role/entity/SysRoleEntity.xml index c8934c46..9679c188 100644 --- a/service/src/main/java/com/hzya/frame/sys/role/entity/SysRoleEntity.xml +++ b/service/src/main/java/com/hzya/frame/sys/role/entity/SysRoleEntity.xml @@ -2,26 +2,28 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + id ,role_code ,role_name ,description + ,enable_state ,sorts ,create_user_id ,create_time @@ -31,223 +33,220 @@ ,org_id ,company_id - - select - - from sys_role - - and id = #{id} - and role_code = #{roleCode} - and role_name = #{roleName} - and description = #{description} - and sorts = #{sorts} - and create_user_id = #{create_user_id} - and create_time = #{create_time} - and modify_user_id = #{modify_user_id} - and modify_time = #{modify_time} - and sts = #{sts} - and org_id = #{org_id} - and company_id = #{companyId} - and sts='Y' - - order by sorts asc - order by ${sort} ${order} + + from sys_role where id = #{ id } and sts='Y' - - + select + + from sys_role + + and id = #{id} + and role_code = #{roleCode} + and role_name = #{roleName} + and description = #{description} + and enable_state = #{enableState} + and sorts = #{sorts} + and create_user_id = #{create_user_id} + and create_time = #{create_time} + and modify_user_id = #{modify_user_id} + and modify_time = #{modify_time} + and sts = #{sts} + and org_id = #{org_id} + and company_id = #{companyId} and sts='Y' - - order by sorts asc - order by ${sort} ${order} + + order by sorts asc + order by ${sort} ${order} + + + + - + select + + from sys_role + + and id like concat('%',#{id},'%') + and role_code like concat('%',#{roleCode},'%') + and role_name like concat('%',#{roleName},'%') + and description like concat('%',#{description},'%') + and enable_state like concat('%',#{enableState},'%') + and sorts like concat('%',#{sorts},'%') + and create_user_id like concat('%',#{create_user_id},'%') + and create_time like concat('%',#{create_time},'%') + and modify_user_id like concat('%',#{modify_user_id},'%') + and modify_time like concat('%',#{modify_time},'%') + and sts like concat('%',#{sts},'%') + and org_id like concat('%',#{org_id},'%') + and company_id like concat('%',#{companyId},'%') and sts='Y' - - order by sorts asc - order by ${sort} ${order} - + + order by sorts asc + order by ${sort} ${order} + - - + select + + from sys_role + + or id = #{id} + or role_code = #{roleCode} + or role_name = #{roleName} + or description = #{description} + or enable_state = #{enableState} + or sorts = #{sorts} + or create_user_id = #{create_user_id} + or create_time = #{create_time} + or modify_user_id = #{modify_user_id} + or modify_time = #{modify_time} + or sts = #{sts} + or org_id = #{org_id} + or company_id = #{companyId} and sts='Y' - - order by sorts asc - order by ${sort} ${order} - + + order by sorts asc + order by ${sort} ${order} + - - - insert into sys_role( - - id , - role_code , - role_name , - description , - sorts , - create_user_id , - create_time , - modify_user_id , - modify_time , - sts , - org_id , - company_id , - sorts, - sts, - - )values( - - #{id} , - #{roleCode} , - #{roleName} , - #{description} , - #{sorts} , - #{create_user_id} , - #{create_time} , - #{modify_user_id} , - #{modify_time} , - #{sts} , - #{org_id} , - #{companyId} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_role a WHERE a.sts = 'Y' - ), - - 'Y', - - ) - - - - insert into sys_role(id, role_code, role_name, description, sorts, create_user_id, create_time, modify_user_id, - modify_time, sts, org_id, company_id, sts) - values - - (#{entity.id},#{entity.roleCode},#{entity.roleName},#{entity.description},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, - 'Y') - - - - - insert into sys_role(id, role_code, role_name, description, sorts, create_user_id, create_time, modify_user_id, - modify_time, sts, org_id, company_id) - values - - (#{entity.id},#{entity.roleCode},#{entity.roleName},#{entity.description},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) - - on duplicate key update - id = values(id), - role_code = values(role_code), - role_name = values(role_name), - description = values(description), - sorts = values(sorts), - create_user_id = values(create_user_id), - create_time = values(create_time), - modify_user_id = values(modify_user_id), - modify_time = values(modify_time), - sts = values(sts), - org_id = values(org_id), - company_id = values(company_id) - - - - update sys_role set - - id = #{id}, - role_code = #{roleCode}, - role_name = #{roleName}, - description = #{description}, - sorts = #{sorts}, - create_user_id = #{create_user_id}, - create_time = #{create_time}, - modify_user_id = #{modify_user_id}, - modify_time = #{modify_time}, - sts = #{sts}, - org_id = #{org_id}, - company_id = #{companyId}, - - where = #{id} - - - -update sys_role set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} -where = #{id} + + + insert into sys_role( + + id , + role_code , + role_name , + description , + enable_state , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sts, + + )values( + + #{id} , + #{roleCode} , + #{roleName} , + #{description} , + #{enableState} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + 'Y', + + ) + + + + insert into sys_role(role_code, role_name, description, enable_state, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) + values + + (#{entity.roleCode},#{entity.roleName},#{entity.description},#{entity.enableState},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') + + + + + insert into sys_role(role_code, role_name, description, enable_state, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) + values + + (#{entity.roleCode},#{entity.roleName},#{entity.description},#{entity.enableState},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + + on duplicate key update + role_code = values(role_code), + role_name = values(role_name), + description = values(description), + enable_state = values(enable_state), + sorts = values(sorts), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id) + + +update sys_role set + + role_code = #{roleCode}, + role_name = #{roleName}, + description = #{description}, + enable_state = #{enableState}, + sorts = #{sorts}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + +where id = #{id} - - - update sys_role set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} - - and id = #{id} - and role_code = #{roleCode} - and role_name = #{roleName} - and description = #{description} - and sorts = #{sorts} - and sts = #{sts} - and company_id = #{companyId} + + +update sys_role set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} +where id = #{id} + + + +update sys_role set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and role_code = #{roleCode} + and role_name = #{roleName} + and description = #{description} + and enable_state = #{enableState} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} and sts='Y' - - - - - delete from sys_role where = #{id} + + + + + delete from sys_role where id = #{id} + diff --git a/service/src/main/java/com/hzya/frame/sys/role/service/ISysRoleService.java b/service/src/main/java/com/hzya/frame/sys/role/service/ISysRoleService.java index a6cdd0cd..16346d2d 100644 --- a/service/src/main/java/com/hzya/frame/sys/role/service/ISysRoleService.java +++ b/service/src/main/java/com/hzya/frame/sys/role/service/ISysRoleService.java @@ -1,12 +1,80 @@ package com.hzya.frame.sys.role.service; +import com.alibaba.fastjson.JSONObject; import com.hzya.frame.sys.role.entity.SysRoleEntity; import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.web.entity.JsonResultEntity; + /** * 角色表(SysRole)表服务接口 * * @author makejava - * @since 2024-03-26 15:22:05 + * @since 2024-03-27 11:49:39 */ -public interface ISysRoleService extends IBaseService{ +public interface ISysRoleService extends IBaseService { + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询角色列表分页 + * @Date 11:52 上午 2024/3/27 + **/ + JsonResultEntity queryEntityPage(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询角色列表 + * @Date 11:52 上午 2024/3/27 + **/ + JsonResultEntity queryEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 保存角色 + * @Date 2:36 下午 2024/3/27 + **/ + JsonResultEntity saveEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 获取角色 + * @Date 2:36 下午 2024/3/27 + **/ + JsonResultEntity getEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 修改角色 + * @Date 2:37 下午 2024/3/27 + **/ + JsonResultEntity updateEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 删除角色 + * @Date 2:37 下午 2024/3/27 + **/ + JsonResultEntity deleteEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 启用停用角色 + * @Date 2:37 下午 2024/3/27 + **/ + JsonResultEntity enableDisableEntity(JSONObject jsonObject); + + } diff --git a/service/src/main/java/com/hzya/frame/sys/role/service/impl/SysRoleServiceImpl.java b/service/src/main/java/com/hzya/frame/sys/role/service/impl/SysRoleServiceImpl.java index b7e7e3e9..4fe355e9 100644 --- a/service/src/main/java/com/hzya/frame/sys/role/service/impl/SysRoleServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sys/role/service/impl/SysRoleServiceImpl.java @@ -1,26 +1,267 @@ package com.hzya.frame.sys.role.service.impl; -import com.hzya.frame.sys.role.entity.SysRoleEntity; -import com.hzya.frame.sys.role.dao.ISysRoleDao; -import com.hzya.frame.sys.role.service.ISysRoleService; -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.Resource; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.sys.popedomData.dao.ISysPopedomDataDao; +import com.hzya.frame.sys.popedomData.entity.SysPopedomDataEntity; +import com.hzya.frame.sys.popedomHome.dao.ISysPopedomHomeDao; +import com.hzya.frame.sys.popedomHome.entity.SysPopedomHomeEntity; +import com.hzya.frame.sys.popedomMenu.dao.ISysPopedomMenuDao; +import com.hzya.frame.sys.popedomMenu.entity.SysPopedomMenuEntity; +import com.hzya.frame.sys.popedomOperate.dao.ISysPopedomOperateDao; +import com.hzya.frame.sys.popedomOperate.entity.SysPopedomOperateEntity; +import com.hzya.frame.sys.role.dao.ISysRoleDao; +import com.hzya.frame.sys.role.entity.SysRoleEntity; +import com.hzya.frame.sys.role.service.ISysRoleService; +import com.hzya.frame.sys.userRoles.dao.ISysUserRolesDao; +import com.hzya.frame.sys.userRoles.entity.SysUserRolesEntity; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + /** * 角色表(SysRole)表服务实现类 * * @author makejava - * @since 2024-03-26 15:22:08 + * @since 2024-03-27 11:49:39 */ @Service(value = "sysRoleService") public class SysRoleServiceImpl extends BaseService implements ISysRoleService { private ISysRoleDao sysRoleDao; - + @Resource + private ISysUserRolesDao sysUserRolesDao; + @Resource + private ISysPopedomDataDao sysPopedomDataDao; + @Resource + private ISysPopedomHomeDao sysPopedomHomeDao; + @Resource + private ISysPopedomMenuDao sysPopedomMenuDao; + @Resource + private ISysPopedomOperateDao sysPopedomOperateDao; @Autowired public void setSysRoleDao(ISysRoleDao dao) { this.sysRoleDao = dao; this.dao = dao; } + + /** + * @Author lvleigang + * @Description 查询角色列表分页 + * @Date 11:52 上午 2024/3/27 + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + **/ + @Override + public JsonResultEntity queryEntityPage(JSONObject jsonObject) { + SysRoleEntity entity = getData("jsonStr", jsonObject, SysRoleEntity.class); + //判断分页 + if (entity == null || entity.getPageNum() == null || entity.getPageSize() == null) { + return BaseResult.getFailureMessageEntity("分页查询参数不存在"); + } + PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); + List sysApplicationVos = sysRoleDao.queryByLike(entity); + PageInfo pageInfo = new PageInfo(sysApplicationVos); + return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo); + } + + + /** + * @Author lvleigang + * @Description 查询角色列表 + * @Date 11:52 上午 2024/3/27 + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + **/ + @Override + public JsonResultEntity queryEntity(JSONObject jsonObject) { + SysRoleEntity entity = getData("jsonStr", jsonObject, SysRoleEntity.class); + if(entity == null ){ + entity = new SysRoleEntity(); + } + List sysApplicationVos = sysRoleDao.queryByLike(entity); + return BaseResult.getSuccessMessageEntity("查询数据成功", sysApplicationVos); + } + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 保存角色 + * @Date 2:36 下午 2024/3/27 + **/ + @Override + public JsonResultEntity saveEntity(JSONObject jsonObject) { + SysRoleEntity entity = getData("jsonStr", jsonObject, SysRoleEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getRoleName() == null || "".equals(entity.getRoleName())) { + return BaseResult.getFailureMessageEntity("请先输入角色名称"); + } + if (entity.getRoleCode() == null || "".equals(entity.getRoleCode())) { + return BaseResult.getFailureMessageEntity("请先输入角色编码"); + } + entity.setCreate(); + //保存 + sysRoleDao.save(entity); + return BaseResult.getSuccessMessageEntity("保存角色成功", entity); + } + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 获取角色 + * @Date 2:36 下午 2024/3/27 + **/ + @Override + public JsonResultEntity getEntity(JSONObject jsonObject) { + SysRoleEntity entity = getData("jsonStr", jsonObject, SysRoleEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity = sysRoleDao.get(entity.getId()); + if(entity == null ){ + return BaseResult.getFailureMessageEntity("获取角色失败"); + } + return BaseResult.getSuccessMessageEntity("获取角色成功", entity); + } + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 修改角色 + * @Date 2:37 下午 2024/3/27 + **/ + @Override + public JsonResultEntity updateEntity(JSONObject jsonObject) { + SysRoleEntity entity = getData("jsonStr", jsonObject, SysRoleEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if (entity.getRoleName() == null || "".equals(entity.getRoleName())) { + return BaseResult.getFailureMessageEntity("请先输入角色名称"); + } + if (entity.getRoleCode() == null || "".equals(entity.getRoleCode())) { + return BaseResult.getFailureMessageEntity("请先输入角色编码"); + } + entity.setUpdate(); + //保存 + sysRoleDao.update(entity); + return BaseResult.getSuccessMessageEntity("修改角色成功", entity); + + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 删除角色 + * @Date 2:37 下午 2024/3/27 + **/ + @Override + public JsonResultEntity deleteEntity(JSONObject jsonObject) { + SysRoleEntity entity = getData("jsonStr", jsonObject, SysRoleEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if(!checkRoleUse(entity)){ + return BaseResult.getFailureMessageEntity("当前角色已经使用，不允许删除"); + } + entity.setUpdate(); + sysRoleDao.logicRemove(entity); + return BaseResult.getSuccessMessageEntity("删除角色成功"); + } + + /** + * @Author lvleigang + * @Description 校验角色是否使用 目前只校验（用户角色、角色权限配置下的） + * @Date 3:27 下午 2024/3/27 + * @param entity + * @return boolean + **/ + private boolean checkRoleUse(SysRoleEntity entity) { + SysUserRolesEntity sysUserRolesEntity = new SysUserRolesEntity(); + sysUserRolesEntity.setRoleId(entity.getId()); + if(sysUserRolesDao.getCount(sysUserRolesEntity) > 0){ + return false; + } + SysPopedomDataEntity sysPopedomDataEntity = new SysPopedomDataEntity(); + sysPopedomDataEntity.setObjectId(entity.getId()); + sysPopedomDataEntity.setKindId("2"); + if(sysPopedomDataDao.getCount(sysPopedomDataEntity) > 0){ + return false; + } + SysPopedomHomeEntity sysPopedomHomeEntity = new SysPopedomHomeEntity(); + sysPopedomHomeEntity.setObjectId(entity.getId()); + sysPopedomHomeEntity.setKindId("2"); + if(sysPopedomHomeDao.getCount(sysPopedomHomeEntity) > 0){ + return false; + } + SysPopedomMenuEntity sysPopedomMenuEntity = new SysPopedomMenuEntity(); + sysPopedomMenuEntity.setObjectId(entity.getId()); + sysPopedomMenuEntity.setKindId("2"); + if(sysPopedomMenuDao.getCount(sysPopedomMenuEntity) > 0){ + return false; + } + SysPopedomOperateEntity sysPopedomOperateEntity = new SysPopedomOperateEntity(); + sysPopedomOperateEntity.setObjectId(entity.getId()); + sysPopedomOperateEntity.setKindId("2"); + if(sysPopedomOperateDao.getCount(sysPopedomOperateEntity) > 0){ + return false; + } + return true; + } + + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 启用停用角色 + * @Date 2:37 下午 2024/3/27 + **/ + @Override + public JsonResultEntity enableDisableEntity(JSONObject jsonObject) { + SysRoleEntity entity = getData("jsonStr", jsonObject, SysRoleEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if (entity.getEnableState() == null || "".equals(entity.getEnableState())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + //0启用 1 停用 + if("0".equals(entity.getEnableState())){ + entity.setUpdate(); + sysRoleDao.update(entity); + return BaseResult.getSuccessMessageEntity("启用角色成功"); + }else { + //删除用户角色表 + SysUserRolesEntity sysUserRolesEntity = new SysUserRolesEntity(); + sysUserRolesEntity.setRoleId(entity.getId()); + sysUserRolesEntity.setUpdate(); + sysUserRolesDao.logicRemoveMultiCondition(sysUserRolesEntity); + + entity.setUpdate(); + sysRoleDao.update(entity); + return BaseResult.getSuccessMessageEntity("停用角色成功"); + } + } } diff --git a/service/src/main/java/com/hzya/frame/sys/user/entity/SysUserEntity.xml b/service/src/main/java/com/hzya/frame/sys/user/entity/SysUserEntity.xml index 32fb756e..39a50d18 100644 --- a/service/src/main/java/com/hzya/frame/sys/user/entity/SysUserEntity.xml +++ b/service/src/main/java/com/hzya/frame/sys/user/entity/SysUserEntity.xml @@ -43,6 +43,12 @@ ,org_id ,company_id + + @@ -171,8 +175,8 @@ - + insert into sys_user( id , @@ -193,7 +197,6 @@ sts , org_id , company_id , - sorts, sts, )values( @@ -216,15 +219,12 @@ #{sts} , #{org_id} , #{companyId} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_user a WHERE a.sts = 'Y' - ), - 'Y', ) - + insert into sys_user(person_id, login_code, password, salt, last_login_time, last_connection_time, last_login_ip, state, remark, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) @@ -235,7 +235,7 @@ - + insert into sys_user(person_id, login_code, password, salt, last_login_time, last_connection_time, last_login_ip, state, remark, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) diff --git a/service/src/main/java/com/hzya/frame/sys/userCompany/entity/SysUserCompanyEntity.xml b/service/src/main/java/com/hzya/frame/sys/userCompany/entity/SysUserCompanyEntity.xml index 3d7bcc02..aa8246d0 100644 --- a/service/src/main/java/com/hzya/frame/sys/userCompany/entity/SysUserCompanyEntity.xml +++ b/service/src/main/java/com/hzya/frame/sys/userCompany/entity/SysUserCompanyEntity.xml @@ -31,6 +31,12 @@ ,org_id ,company_id + + @@ -137,7 +141,7 @@ + > insert into sys_user_company( id , @@ -152,7 +156,6 @@ sts , org_id , company_id , - sorts, sts, )values( @@ -169,15 +172,12 @@ #{sts} , #{org_id} , #{companyId} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_user_company a WHERE - a.sts = 'Y' ), - 'Y', ) - + insert into sys_user_company(user_id, user_company_id, remark, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) values @@ -187,7 +187,7 @@ - + insert into sys_user_company(user_id, user_company_id, remark, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) values diff --git a/service/src/main/java/com/hzya/frame/sys/userRoles/entity/SysUserRolesEntity.xml b/service/src/main/java/com/hzya/frame/sys/userRoles/entity/SysUserRolesEntity.xml index a2c58c43..a04ebb04 100644 --- a/service/src/main/java/com/hzya/frame/sys/userRoles/entity/SysUserRolesEntity.xml +++ b/service/src/main/java/com/hzya/frame/sys/userRoles/entity/SysUserRolesEntity.xml @@ -31,6 +31,12 @@ ,org_id ,company_id + + @@ -136,8 +140,8 @@ - + insert into sys_user_roles( id , @@ -152,7 +156,6 @@ sts , org_id , company_id , - sorts, sts, )values( @@ -169,15 +172,13 @@ #{sts} , #{org_id} , #{companyId} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_user_roles a WHERE a.sts - = 'Y' ), - + 'Y', ) - + insert into sys_user_roles(user_id, role_id, user_role_note, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) values @@ -187,7 +188,7 @@ - + insert into sys_user_roles(user_id, role_id, user_role_note, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) values diff --git a/webapp/src/main/java/com/hzya/frame/web/init/ApplicationContextInitialized.java b/webapp/src/main/java/com/hzya/frame/web/init/ApplicationContextInitialized.java index 3cd24762..292152e8 100644 --- a/webapp/src/main/java/com/hzya/frame/web/init/ApplicationContextInitialized.java +++ b/webapp/src/main/java/com/hzya/frame/web/init/ApplicationContextInitialized.java @@ -18,39 +18,10 @@ public class ApplicationContextInitialized implements ApplicationContextInitiali @Override public void initialize(ConfigurableApplicationContext configurableApplicationContext) { - logger.info("**************************系统已经启动开始初始化********************************"); - logger.info("**************************初始化数据源*****************************************"); -// -//// SqlSession sqlSession = DataSourceUtil.getDefaultSqlSession(); -//// IExecSqlService execSqlService = configurableApplicationContext.getBean(IExecSqlService.class); -//// try { -//// List> data = execSqlService.execSelectSql(" SELECT * from sys_user ", "322"); -//// System.out.println("dataSize" + data.size()); -//// } catch (Exception e) { -//// e.printStackTrace(); -//// } -//// System.out.println("sqlSession" + sqlSession); -// String path = ApplicationContextInitialized.class.getClass().getResource("/").getPath(); -// System.out.println(path); -//// path = path.substring(1, path.indexOf("classes")); -// System.out.println(path); -// -// path += "cfgHome\\plugin\\A8YundaProjectToEsb\\spring\\spring-A8YundaProjectToEsb-manager.xml"; -// path = "cfgHome\\plugin\\A8YundaProjectToEsb\\spring\\spring-A8YundaProjectToEsb-manager.xml"; -// -//// DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); -//// -//// XmlBeanDefinitionReader beanDefinitionReader = new XmlBeanDefinitionReader(beanFactory); -////// FileSystemXmlApplicationContext fileSystemXmlApplicationContext = new FileSystemXmlApplicationContext(); -//// beanDefinitionReader.loadBeanDefinitions(path); } - private void closeApplication(ConfigurableApplicationContext configurableApplicationContext) { - - System.exit(1); - } } diff --git a/webapp/src/main/java/com/hzya/frame/web/init/MyApplicationListener.java b/webapp/src/main/java/com/hzya/frame/web/init/MyApplicationListener.java index 46d9c1c5..3a7a0cad 100644 --- a/webapp/src/main/java/com/hzya/frame/web/init/MyApplicationListener.java +++ b/webapp/src/main/java/com/hzya/frame/web/init/MyApplicationListener.java @@ -32,10 +32,6 @@ public class MyApplicationListener implements ApplicationListener