diff --git a/yanzhu-manage/src/main/java/com/yanzhu/base/controller/BaseAssetsTypeController.java b/yanzhu-manage/src/main/java/com/yanzhu/web/BaseAssetsTypeController.java similarity index 99% rename from yanzhu-manage/src/main/java/com/yanzhu/base/controller/BaseAssetsTypeController.java rename to yanzhu-manage/src/main/java/com/yanzhu/web/BaseAssetsTypeController.java index a21e778..293d3b4 100644 --- a/yanzhu-manage/src/main/java/com/yanzhu/base/controller/BaseAssetsTypeController.java +++ b/yanzhu-manage/src/main/java/com/yanzhu/web/BaseAssetsTypeController.java @@ -1,4 +1,4 @@ -package com.yanzhu.base.controller; +package com.yanzhu.web; import java.util.List; import java.util.concurrent.TimeUnit; diff --git a/yanzhu-manage/src/main/java/com/yanzhu/project/controller/CompanyController.java b/yanzhu-manage/src/main/java/com/yanzhu/web/CompanyController.java similarity index 95% rename from yanzhu-manage/src/main/java/com/yanzhu/project/controller/CompanyController.java rename to yanzhu-manage/src/main/java/com/yanzhu/web/CompanyController.java index 572ea08..0dc4741 100644 --- a/yanzhu-manage/src/main/java/com/yanzhu/project/controller/CompanyController.java +++ b/yanzhu-manage/src/main/java/com/yanzhu/web/CompanyController.java @@ -1,4 +1,4 @@ -package com.yanzhu.project.controller; +package com.yanzhu.web; import com.yanzhu.common.core.controller.BaseController; import com.yanzhu.common.core.domain.AjaxResult; diff --git a/yanzhu-manage/src/main/java/com/yanzhu/project/controller/ProProjectApplyController.java b/yanzhu-manage/src/main/java/com/yanzhu/web/ProProjectApplyController.java similarity index 98% rename from yanzhu-manage/src/main/java/com/yanzhu/project/controller/ProProjectApplyController.java rename to yanzhu-manage/src/main/java/com/yanzhu/web/ProProjectApplyController.java index 2ac0758..f05a748 100644 --- a/yanzhu-manage/src/main/java/com/yanzhu/project/controller/ProProjectApplyController.java +++ b/yanzhu-manage/src/main/java/com/yanzhu/web/ProProjectApplyController.java @@ -1,4 +1,4 @@ -package com.yanzhu.project.controller; +package com.yanzhu.web; import java.util.List; import javax.servlet.http.HttpServletResponse; diff --git a/yanzhu-manage/src/main/java/com/yanzhu/project/controller/ProProjectInfoController.java b/yanzhu-manage/src/main/java/com/yanzhu/web/ProProjectInfoController.java similarity index 99% rename from yanzhu-manage/src/main/java/com/yanzhu/project/controller/ProProjectInfoController.java rename to yanzhu-manage/src/main/java/com/yanzhu/web/ProProjectInfoController.java index 193c962..497de73 100644 --- a/yanzhu-manage/src/main/java/com/yanzhu/project/controller/ProProjectInfoController.java +++ b/yanzhu-manage/src/main/java/com/yanzhu/web/ProProjectInfoController.java @@ -1,4 +1,4 @@ -package com.yanzhu.project.controller; +package com.yanzhu.web; import java.util.List; import javax.servlet.http.HttpServletResponse; diff --git a/yanzhu-manage/src/main/java/com/yanzhu/project/controller/ProjectController.java b/yanzhu-manage/src/main/java/com/yanzhu/web/ProjectController.java similarity index 96% rename from yanzhu-manage/src/main/java/com/yanzhu/project/controller/ProjectController.java rename to yanzhu-manage/src/main/java/com/yanzhu/web/ProjectController.java index 2ea4778..96ca48f 100644 --- a/yanzhu-manage/src/main/java/com/yanzhu/project/controller/ProjectController.java +++ b/yanzhu-manage/src/main/java/com/yanzhu/web/ProjectController.java @@ -1,4 +1,4 @@ -package com.yanzhu.project.controller; +package com.yanzhu.web; import com.yanzhu.common.core.controller.BaseController; import com.yanzhu.common.core.domain.AjaxResult; diff --git a/yanzhu-wechat/src/main/java/com/yanzhu/wechat/controller/WxFlowableController.java b/yanzhu-manage/src/main/java/com/yanzhu/wechat/controller/WxFlowableController.java similarity index 100% rename from yanzhu-wechat/src/main/java/com/yanzhu/wechat/controller/WxFlowableController.java rename to yanzhu-manage/src/main/java/com/yanzhu/wechat/controller/WxFlowableController.java diff --git a/yanzhu-wechat/src/main/java/com/yanzhu/wechat/controller/WxLoginController.java b/yanzhu-manage/src/main/java/com/yanzhu/wechat/controller/WxLoginController.java similarity index 70% rename from yanzhu-wechat/src/main/java/com/yanzhu/wechat/controller/WxLoginController.java rename to yanzhu-manage/src/main/java/com/yanzhu/wechat/controller/WxLoginController.java index 2624c5f..a832c61 100644 --- a/yanzhu-wechat/src/main/java/com/yanzhu/wechat/controller/WxLoginController.java +++ b/yanzhu-manage/src/main/java/com/yanzhu/wechat/controller/WxLoginController.java @@ -9,11 +9,14 @@ import com.yanzhu.common.core.redis.RedisCache; import com.yanzhu.common.enums.LimitType; import com.yanzhu.framework.web.service.SysLoginService; import com.yanzhu.framework.web.service.TokenService; +import com.yanzhu.system.domain.vo.UpdatePwdVo; +import com.yanzhu.system.service.ISysUserService; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.Map; /** * @version : V1.0 @@ -23,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController; * @Date: 2020/7/7 18:03 */ @RestController +@RequestMapping("/wxApi") public class WxLoginController extends BaseController { @Autowired @@ -34,6 +38,9 @@ public class WxLoginController extends BaseController { @Autowired private TokenService tokenService; + @Autowired + private ISysUserService sysUserService; + /** * 登录方法 * @@ -52,4 +59,18 @@ public class WxLoginController extends BaseController { return ajax; } + /** + * 用户修改密码 + * + * @return 结果 + */ + @ApiOperation(value = "修改密码") + @RateLimiter(count = 10, limitType = LimitType.IP) + @PostMapping("/updatePwd") + public AjaxResult updatePwd(@RequestBody @Valid UpdatePwdVo updatePwdVo) + { + sysUserService.updatePwd(updatePwdVo); + return success(); + } + } diff --git a/yanzhu-wechat/src/main/java/com/yanzhu/wechat/controller/WxPublicsController.java b/yanzhu-manage/src/main/java/com/yanzhu/wechat/controller/WxPublicsController.java similarity index 78% rename from yanzhu-wechat/src/main/java/com/yanzhu/wechat/controller/WxPublicsController.java rename to yanzhu-manage/src/main/java/com/yanzhu/wechat/controller/WxPublicsController.java index f1b694e..3729604 100644 --- a/yanzhu-wechat/src/main/java/com/yanzhu/wechat/controller/WxPublicsController.java +++ b/yanzhu-manage/src/main/java/com/yanzhu/wechat/controller/WxPublicsController.java @@ -11,8 +11,11 @@ import com.yanzhu.common.core.domain.entity.SysUser; import com.yanzhu.common.core.page.TableDataInfo; import com.yanzhu.common.core.redis.RedisCache; import com.yanzhu.common.utils.DictUtils; +import com.yanzhu.common.utils.SecurityUtils; import com.yanzhu.common.utils.StringUtils; import com.yanzhu.project.service.IProProjectApplyService; +import com.yanzhu.sur.domain.SurMenuConfig; +import com.yanzhu.sur.service.ISurMenuConfigService; import com.yanzhu.system.service.ISysDeptService; import com.yanzhu.system.service.ISysPostService; import com.yanzhu.system.service.ISysRoleService; @@ -47,6 +50,9 @@ public class WxPublicsController extends BaseController @Autowired private ISysDeptService deptService; + @Autowired + private ISurMenuConfigService surMenuConfigService; + @Autowired private IBaseAssetsTypeService baseAssetsTypeService; @@ -117,4 +123,24 @@ public class WxPublicsController extends BaseController return success(DictUtils.getDictCache(key)); } + /** + * 查询物资类型 + */ + @GetMapping("/v1/selectRoleMenuList") + public AjaxResult selectRoleMenuList(SurMenuConfig surMenuConfig) + { + SysUser sysUser = super.getLoginUser().getUser(); + if(!SysUser.isAdmin(sysUser.getUserId())){ + surMenuConfig.setUsername(sysUser.getPhonenumber()); + } + String key = "YANZHU.SUR.V1.selectRoleMenuList." + sysUser.getUserId() ; + Object object = redisCache.getCacheObject(key); + if (object != null) { + return success(object); + } + List list = surMenuConfigService.selectRoleMenuList(surMenuConfig); + redisCache.setCacheObject(key, list, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES); + return success(list); + } + } diff --git a/yanzhu-wechat/src/main/java/com/yanzhu/wechat/domain/StartProcessInstanceVo.java b/yanzhu-manage/src/main/java/com/yanzhu/wechat/domain/StartProcessInstanceVo.java similarity index 100% rename from yanzhu-wechat/src/main/java/com/yanzhu/wechat/domain/StartProcessInstanceVo.java rename to yanzhu-manage/src/main/java/com/yanzhu/wechat/domain/StartProcessInstanceVo.java diff --git a/yanzhu-wechat/src/main/java/com/yanzhu/wechat/domain/WxLoginVo.java b/yanzhu-manage/src/main/java/com/yanzhu/wechat/domain/WxLoginVo.java similarity index 100% rename from yanzhu-wechat/src/main/java/com/yanzhu/wechat/domain/WxLoginVo.java rename to yanzhu-manage/src/main/java/com/yanzhu/wechat/domain/WxLoginVo.java diff --git a/yanzhu-mapper/src/main/java/com/yanzhu/sur/domain/SurMenuConfig.java b/yanzhu-mapper/src/main/java/com/yanzhu/sur/domain/SurMenuConfig.java new file mode 100644 index 0000000..b5de751 --- /dev/null +++ b/yanzhu-mapper/src/main/java/com/yanzhu/sur/domain/SurMenuConfig.java @@ -0,0 +1,157 @@ +package com.yanzhu.sur.domain; + +import com.yanzhu.common.annotation.Excel; +import com.yanzhu.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.List; + +/** + * 菜单配置对象 sur_menu_config + * + * @author JiangYuQi + * @date 2023-08-24 + */ +public class SurMenuConfig extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 菜单名称 */ + @Excel(name = "菜单名称") + private String menuName; + + /** 菜单标识 */ + @Excel(name = "菜单标识") + private String menuIdenti; + + /** 菜单图片 */ + @Excel(name = "菜单图片") + private String menuImg; + + /** 菜单地址 */ + @Excel(name = "菜单地址") + private String menuUrl; + + /** 删除状态（0 未删除 1 已删除） */ + private Long delFlag; + + /** 菜单排序 */ + @Excel(name = "菜单排序") + private Integer menuSort; + + /** 菜单分类 */ + @Excel(name = "菜单分类") + private String menuType; + + private String username; + + /** 菜单配置角色信息 */ + private List surMenuConfigRoleList; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setMenuName(String menuName) + { + this.menuName = menuName; + } + + public String getMenuName() + { + return menuName; + } + public void setMenuIdenti(String menuIdenti) + { + this.menuIdenti = menuIdenti; + } + + public String getMenuIdenti() + { + return menuIdenti; + } + public void setMenuImg(String menuImg) + { + this.menuImg = menuImg; + } + + public String getMenuImg() + { + return menuImg; + } + public void setMenuUrl(String menuUrl) + { + this.menuUrl = menuUrl; + } + + public String getMenuUrl() + { + return menuUrl; + } + public void setDelFlag(Long delFlag) + { + this.delFlag = delFlag; + } + + public Long getDelFlag() + { + return delFlag; + } + + public List getSurMenuConfigRoleList() + { + return surMenuConfigRoleList; + } + + public void setSurMenuConfigRoleList(List surMenuConfigRoleList) + { + this.surMenuConfigRoleList = surMenuConfigRoleList; + } + + public Integer getMenuSort() { + return menuSort; + } + + public void setMenuSort(Integer menuSort) { + this.menuSort = menuSort; + } + + public String getMenuType() { + return menuType; + } + + public void setMenuType(String menuType) { + this.menuType = menuType; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("menuName", getMenuName()) + .append("menuIdenti", getMenuIdenti()) + .append("menuImg", getMenuImg()) + .append("menuUrl", getMenuUrl()) + .append("delFlag", getDelFlag()) + .append("createTime", getCreateTime()) + .append("surMenuConfigRoleList", getSurMenuConfigRoleList()) + .toString(); + } +} diff --git a/yanzhu-mapper/src/main/java/com/yanzhu/sur/domain/SurMenuConfigRole.java b/yanzhu-mapper/src/main/java/com/yanzhu/sur/domain/SurMenuConfigRole.java new file mode 100644 index 0000000..a3f296a --- /dev/null +++ b/yanzhu-mapper/src/main/java/com/yanzhu/sur/domain/SurMenuConfigRole.java @@ -0,0 +1,64 @@ +package com.yanzhu.sur.domain; + +import com.yanzhu.common.annotation.Excel; +import com.yanzhu.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 菜单配置角色对象 sur_menu_config_role + * + * @author JiangYuQi + * @date 2023-08-24 + */ +public class SurMenuConfigRole extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 菜单关系主键 */ + @Excel(name = "菜单关系主键") + private Long smcid; + + /** 角色主键 */ + @Excel(name = "角色主键") + private Long roleId; + + /** 角色名称 */ + @Excel(name = "角色名称") + private String roleName; + + public void setSmcid(Long smcid) + { + this.smcid = smcid; + } + + public Long getSmcid() + { + return smcid; + } + public void setRoleId(Long roleId) + { + this.roleId = roleId; + } + + public Long getRoleId() + { + return roleId; + } + + public String getRoleName() { + return roleName; + } + + public void setRoleName(String roleName) { + this.roleName = roleName; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("smcid", getSmcid()) + .append("roleId", getRoleId()) + .toString(); + } +} diff --git a/yanzhu-mapper/src/main/java/com/yanzhu/sur/mapper/SurMenuConfigMapper.java b/yanzhu-mapper/src/main/java/com/yanzhu/sur/mapper/SurMenuConfigMapper.java new file mode 100644 index 0000000..551c1de --- /dev/null +++ b/yanzhu-mapper/src/main/java/com/yanzhu/sur/mapper/SurMenuConfigMapper.java @@ -0,0 +1,95 @@ +package com.yanzhu.sur.mapper; + +import com.yanzhu.sur.domain.SurMenuConfig; +import com.yanzhu.sur.domain.SurMenuConfigRole; + +import java.util.List; + +/** + * 菜单配置Mapper接口 + * + * @author JiangYuQi + * @date 2023-08-24 + */ +public interface SurMenuConfigMapper +{ + /** + * 查询菜单配置 + * + * @param id 菜单配置主键 + * @return 菜单配置 + */ + public SurMenuConfig selectSurMenuConfigById(Long id); + + /** + * 查询菜单配置列表 + * + * @param surMenuConfig 菜单配置 + * @return 菜单配置集合 + */ + public List selectSurMenuConfigList(SurMenuConfig surMenuConfig); + + /** + * 新增菜单配置 + * + * @param surMenuConfig 菜单配置 + * @return 结果 + */ + public int insertSurMenuConfig(SurMenuConfig surMenuConfig); + + /** + * 修改菜单配置 + * + * @param surMenuConfig 菜单配置 + * @return 结果 + */ + public int updateSurMenuConfig(SurMenuConfig surMenuConfig); + + /** + * 删除菜单配置 + * + * @param id 菜单配置主键 + * @return 结果 + */ + public int deleteSurMenuConfigById(Long id); + + /** + * 批量删除菜单配置 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSurMenuConfigByIds(Long[] ids); + + /** + * 批量删除菜单配置角色 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSurMenuConfigRoleBySmcids(Long[] ids); + + /** + * 批量新增菜单配置角色 + * + * @param surMenuConfigRoleList 菜单配置角色列表 + * @return 结果 + */ + public int batchSurMenuConfigRole(List surMenuConfigRoleList); + + + /** + * 通过菜单配置主键删除菜单配置角色信息 + * + * @param id 菜单配置ID + * @return 结果 + */ + public int deleteSurMenuConfigRoleBySmcid(Long id); + + /** + * 根据用户查询菜单信息 + * @param surMenuConfig + * @return + */ + public List selectRoleMenuList(SurMenuConfig surMenuConfig); +} diff --git a/yanzhu-mapper/src/main/java/com/yanzhu/sur/service/ISurMenuConfigService.java b/yanzhu-mapper/src/main/java/com/yanzhu/sur/service/ISurMenuConfigService.java new file mode 100644 index 0000000..34bb250 --- /dev/null +++ b/yanzhu-mapper/src/main/java/com/yanzhu/sur/service/ISurMenuConfigService.java @@ -0,0 +1,70 @@ +package com.yanzhu.sur.service; + +import com.yanzhu.sur.domain.SurMenuConfig; + +import java.util.List; +import java.util.Map; + +/** + * 菜单配置Service接口 + * + * @author JiangYuQi + * @date 2023-08-24 + */ +public interface ISurMenuConfigService +{ + /** + * 查询菜单配置 + * + * @param id 菜单配置主键 + * @return 菜单配置 + */ + public SurMenuConfig selectSurMenuConfigById(Long id); + + /** + * 查询菜单配置列表 + * + * @param surMenuConfig 菜单配置 + * @return 菜单配置集合 + */ + public List selectSurMenuConfigList(SurMenuConfig surMenuConfig); + + /** + * 新增菜单配置 + * + * @param surMenuConfig 菜单配置 + * @return 结果 + */ + public int insertSurMenuConfig(SurMenuConfig surMenuConfig); + + /** + * 修改菜单配置 + * + * @param surMenuConfig 菜单配置 + * @return 结果 + */ + public int updateSurMenuConfig(SurMenuConfig surMenuConfig); + + /** + * 批量删除菜单配置 + * + * @param ids 需要删除的菜单配置主键集合 + * @return 结果 + */ + public int deleteSurMenuConfigByIds(Long[] ids); + + /** + * 删除菜单配置信息 + * + * @param id 菜单配置主键 + * @return 结果 + */ + public int deleteSurMenuConfigById(Long id); + + /** + * 根据用户查询菜单信息 + * @param surMenuConfig + * @return + */ + public List selectRoleMenuList(SurMenuConfig surMenuConfig); +} diff --git a/yanzhu-mapper/src/main/java/com/yanzhu/sur/service/impl/SurMenuConfigServiceImpl.java b/yanzhu-mapper/src/main/java/com/yanzhu/sur/service/impl/SurMenuConfigServiceImpl.java new file mode 100644 index 0000000..6342a0e --- /dev/null +++ b/yanzhu-mapper/src/main/java/com/yanzhu/sur/service/impl/SurMenuConfigServiceImpl.java @@ -0,0 +1,144 @@ +package com.yanzhu.sur.service.impl; + +import com.yanzhu.common.utils.DateUtils; +import com.yanzhu.common.utils.SecurityUtils; +import com.yanzhu.common.utils.StringUtils; +import com.yanzhu.sur.domain.SurMenuConfig; +import com.yanzhu.sur.domain.SurMenuConfigRole; +import com.yanzhu.sur.mapper.SurMenuConfigMapper; +import com.yanzhu.sur.service.ISurMenuConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +/** + * 菜单配置Service业务层处理 + * + * @author JiangYuQi + * @date 2023-08-24 + */ +@Service +public class SurMenuConfigServiceImpl implements ISurMenuConfigService +{ + @Autowired + private SurMenuConfigMapper surMenuConfigMapper; + + /** + * 查询菜单配置 + * + * @param id 菜单配置主键 + * @return 菜单配置 + */ + @Override + public SurMenuConfig selectSurMenuConfigById(Long id) + { + return surMenuConfigMapper.selectSurMenuConfigById(id); + } + + /** + * 查询菜单配置列表 + * + * @param surMenuConfig 菜单配置 + * @return 菜单配置 + */ + @Override + public List selectSurMenuConfigList(SurMenuConfig surMenuConfig) + { + return surMenuConfigMapper.selectSurMenuConfigList(surMenuConfig); + } + + /** + * 新增菜单配置 + * + * @param surMenuConfig 菜单配置 + * @return 结果 + */ + @Transactional + @Override + public int insertSurMenuConfig(SurMenuConfig surMenuConfig) + { + surMenuConfig.setCreateTime(DateUtils.getNowDate()); + int rows = surMenuConfigMapper.insertSurMenuConfig(surMenuConfig); + insertSurMenuConfigRole(surMenuConfig); + return rows; + } + + /** + * 修改菜单配置 + * + * @param surMenuConfig 菜单配置 + * @return 结果 + */ + @Transactional + @Override + public int updateSurMenuConfig(SurMenuConfig surMenuConfig) + { + surMenuConfigMapper.deleteSurMenuConfigRoleBySmcid(surMenuConfig.getId()); + insertSurMenuConfigRole(surMenuConfig); + return surMenuConfigMapper.updateSurMenuConfig(surMenuConfig); + } + + /** + * 批量删除菜单配置 + * + * @param ids 需要删除的菜单配置主键 + * @return 结果 + */ + @Transactional + @Override + public int deleteSurMenuConfigByIds(Long[] ids) + { + surMenuConfigMapper.deleteSurMenuConfigRoleBySmcids(ids); + return surMenuConfigMapper.deleteSurMenuConfigByIds(ids); + } + + /** + * 删除菜单配置信息 + * + * @param id 菜单配置主键 + * @return 结果 + */ + @Transactional + @Override + public int deleteSurMenuConfigById(Long id) + { + surMenuConfigMapper.deleteSurMenuConfigRoleBySmcid(id); + return surMenuConfigMapper.deleteSurMenuConfigById(id); + } + + /** + * 新增菜单配置角色信息 + * + * @param surMenuConfig 菜单配置对象 + */ + public void insertSurMenuConfigRole(SurMenuConfig surMenuConfig) + { + List surMenuConfigRoleList = surMenuConfig.getSurMenuConfigRoleList(); + Long id = surMenuConfig.getId(); + if (StringUtils.isNotNull(surMenuConfigRoleList)) + { + List list = new ArrayList(); + for (SurMenuConfigRole surMenuConfigRole : surMenuConfigRoleList) + { + surMenuConfigRole.setSmcid(id); + list.add(surMenuConfigRole); + } + if (list.size() > 0) + { + surMenuConfigMapper.batchSurMenuConfigRole(list); + } + } + } + + /** + * 根据用户查询菜单信息 + * @param surMenuConfig + * @return + */ + public List selectRoleMenuList(SurMenuConfig surMenuConfig) { + return surMenuConfigMapper.selectRoleMenuList(surMenuConfig); + } +} diff --git a/yanzhu-mapper/src/main/resources/mapper/sur/SurMenuConfigMapper.xml b/yanzhu-mapper/src/main/resources/mapper/sur/SurMenuConfigMapper.xml new file mode 100644 index 0000000..9165b9f --- /dev/null +++ b/yanzhu-mapper/src/main/resources/mapper/sur/SurMenuConfigMapper.xml @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, menu_name, menu_identi, menu_img, menu_url, del_flag, create_time, menu_type, menu_sort from sur_menu_config + + + + + + + + insert into sur_menu_config + + menu_name, + menu_identi, + menu_img, + menu_url, + del_flag, + create_time, + menu_sort, + menu_type, + + + #{menuName}, + #{menuIdenti}, + #{menuImg}, + #{menuUrl}, + #{delFlag}, + #{createTime}, + #{menuSort}, + #{menuType}, + + + + + update sur_menu_config + + menu_name = #{menuName}, + menu_identi = #{menuIdenti}, + menu_img = #{menuImg}, + menu_url = #{menuUrl}, + del_flag = #{delFlag}, + create_time = #{createTime}, + menu_sort = #{menuSort}, + menu_type = #{menuType}, + + where id = #{id} + + + + delete from sur_menu_config where id = #{id} + + + + delete from sur_menu_config where id in + + #{id} + + + + + delete from sur_menu_config_role where smcid in + + #{smcid} + + + + + delete from sur_menu_config_role where smcid = #{smcid} + + + + insert into sur_menu_config_role( smcid, role_id) values + + ( #{item.smcid}, #{item.roleId}) + + + + + + \ No newline at end of file diff --git a/yanzhu-system/src/main/java/com/yanzhu/system/domain/vo/UpdatePwdVo.java b/yanzhu-system/src/main/java/com/yanzhu/system/domain/vo/UpdatePwdVo.java new file mode 100644 index 0000000..dd0f855 --- /dev/null +++ b/yanzhu-system/src/main/java/com/yanzhu/system/domain/vo/UpdatePwdVo.java @@ -0,0 +1,26 @@ +package com.yanzhu.system.domain.vo; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * 修改密码 + * + * @author yanZhu + */ +@Data +public class UpdatePwdVo { + + /** 旧密码 */ + @NotBlank(message = "旧密码不能为空") + private String oldPsw; + + /** 新密码 */ + @NotBlank(message = "新密码不能为空") + private String newPsw; + + /** 确认密码 */ + @NotBlank(message = "确认密码不能为空") + private String cfmPsw; +} diff --git a/yanzhu-ui/.env.development b/yanzhu-ui/.env.development index c84c48e..3c4f2e9 100644 --- a/yanzhu-ui/.env.development +++ b/yanzhu-ui/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = 研筑临时项目管理系统 ENV = 'development' # 研筑临时项目管理系统/开发环境 -VUE_APP_BASE_API = '/prjapi' +VUE_APP_BASE_API = '/yanZhuProject' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/yanzhu-ui/.env.production b/yanzhu-ui/.env.production index f30d802..9025ff0 100644 --- a/yanzhu-ui/.env.production +++ b/yanzhu-ui/.env.production @@ -5,4 +5,4 @@ VUE_APP_TITLE = 研筑临时项目管理系统 ENV = 'production' # 研筑临时项目管理系统/生产环境 -VUE_APP_BASE_API = '/prjapi' +VUE_APP_BASE_API = '/yanZhuProject'