diff --git a/basic-interface/src/main/java/ink/wgink/interfaces/menu/IMenuBaseService.java b/basic-interface/src/main/java/ink/wgink/interfaces/menu/IMenuBaseService.java new file mode 100644 index 00000000..7ea2737e --- /dev/null +++ b/basic-interface/src/main/java/ink/wgink/interfaces/menu/IMenuBaseService.java @@ -0,0 +1,118 @@ +package ink.wgink.interfaces.menu; + +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.dtos.ZTreeDTO; +import ink.wgink.pojo.dtos.menu.MenuDTO; +import ink.wgink.pojo.result.SuccessResultList; + +import java.util.List; +import java.util.Map; + +/** + * When you feel like quitting. Think about why you started + * 当你想要放弃的时候，想想当初你为何开始 + * + * @ClassName: IMenuBaseService + * @Description: 菜单接口 + * @Author: wanggeng + * @Date: 2021/2/10 9:17 下午 + * @Version: 1.0 + */ +public interface IMenuBaseService { + + /** + * 统一用户菜单 + */ + String MENU_UNIFIED_USER = "unified-user"; + + /** + * 菜单详情 + * + * @param params + * @return + */ + MenuDTO get(Map params); + + /** + * 菜单列表 + * + * @param params + * @return + */ + List list(Map params); + + /** + * 菜单列表 + * + * @param menuParentId 上级ID + * @return + */ + List listByParentId(String menuParentId); + + /** + * 菜单列表 + * + * @param menuIds 菜单ID列表 + * @return + */ + List listByIds(List menuIds); + + /** + * 菜单列表 + * + * @param menuParentId 上级菜单ID + * @param menuIds 菜单ID列表 + * @return + */ + List listByParentIdAndIds(String menuParentId, List menuIds); + + /** + * 菜单列表，递归获取全部内容 + * + * @param params + * @return + */ + List listAll(Map params); + + /** + * 菜单列表，递归获取全部内容 + * + * @param menuParentId 上级菜单ID + * @return + */ + List listAllByParentId(String menuParentId); + + /** + * 菜单列表，递归获取全部内容 + * + * @param menuParentId 上级菜单ID + * @param menuIds 菜单ID列表 + * @return + */ + List listAllByParentIdAndIds(String menuParentId, List menuIds); + + /** + * zTree列表 + * + * @param params + * @return + */ + List listZTree(Map params); + + /** + * easyui菜单列表 + * + * @param page + * @return + */ + SuccessResultList> listPage(ListPage page); + + /** + * 通过用户获取菜单 + * + * @param params + * @return + */ + List listMenuIdByUser(Map params); + +} diff --git a/basic-interface/src/main/java/ink/wgink/interfaces/user/IUserCheckService.java b/basic-interface/src/main/java/ink/wgink/interfaces/user/IUserCheckService.java new file mode 100644 index 00000000..4d0bd31e --- /dev/null +++ b/basic-interface/src/main/java/ink/wgink/interfaces/user/IUserCheckService.java @@ -0,0 +1,14 @@ +package ink.wgink.interfaces.user; + +/** + * When you feel like quitting. Think about why you started + * 当你想要放弃的时候，想想当初你为何开始 + * + * @ClassName: IUserCheckService + * @Description: 用户检查 + * @Author: wanggeng + * @Date: 2021/2/10 2:06 下午 + * @Version: 1.0 + */ +public interface IUserCheckService { +} diff --git a/basic-pojo/src/main/java/ink/wgink/pojo/dtos/menu/MenuDTO.java b/basic-pojo/src/main/java/ink/wgink/pojo/dtos/menu/MenuDTO.java index 9ff63402..24a166d8 100644 --- a/basic-pojo/src/main/java/ink/wgink/pojo/dtos/menu/MenuDTO.java +++ b/basic-pojo/src/main/java/ink/wgink/pojo/dtos/menu/MenuDTO.java @@ -27,14 +27,10 @@ public class MenuDTO implements Serializable { private Boolean isParent; @ApiModelProperty(name = "menuName", value = "菜单名称") private String menuName; + @ApiModelProperty(name = "menuSummary", value = "菜单说明") + private String menuSummary; @ApiModelProperty(name = "menuCode", value = "菜单编码") private String menuCode; - @ApiModelProperty(name = "apiPrefix", value = "接口前缀", required = true, example = "api/menu") - private String apiPrefix; - @ApiModelProperty(name = "resourcePrefix", value = "资源前缀", required = true, example = "resource/menu") - private String resourcePrefix; - @ApiModelProperty(name = "routePrefix", value = "路由前缀", required = true, example = "route/menu") - private String routePrefix; @ApiModelProperty(name = "menuUrl", value = "菜单链接") private String menuUrl; @ApiModelProperty(name = "menuIcon", value = "菜单图标") @@ -100,28 +96,12 @@ public class MenuDTO implements Serializable { this.menuCode = menuCode; } - public String getApiPrefix() { - return apiPrefix == null ? "" : apiPrefix.trim(); + public String getMenuSummary() { + return menuSummary == null ? "" : menuSummary; } - public void setApiPrefix(String apiPrefix) { - this.apiPrefix = apiPrefix; - } - - public String getResourcePrefix() { - return resourcePrefix == null ? "" : resourcePrefix.trim(); - } - - public void setResourcePrefix(String resourcePrefix) { - this.resourcePrefix = resourcePrefix; - } - - public String getRoutePrefix() { - return routePrefix == null ? "" : routePrefix.trim(); - } - - public void setRoutePrefix(String routePrefix) { - this.routePrefix = routePrefix; + public void setMenuSummary(String menuSummary) { + this.menuSummary = menuSummary; } public String getMenuUrl() { @@ -191,28 +171,24 @@ public class MenuDTO implements Serializable { @Override public String toString() { final StringBuilder sb = new StringBuilder("{"); - sb.append("\"menuId\":") - .append("\"").append(menuId).append("\""); - sb.append(",\"menuParentId\":") - .append("\"").append(menuParentId).append("\""); - sb.append(",\"menuParentName\":") - .append("\"").append(menuParentName).append("\""); + sb.append("\"menuId\":\"") + .append(menuId).append('\"'); + sb.append(",\"menuParentId\":\"") + .append(menuParentId).append('\"'); + sb.append(",\"menuParentName\":\"") + .append(menuParentName).append('\"'); sb.append(",\"isParent\":") .append(isParent); - sb.append(",\"menuName\":") - .append("\"").append(menuName).append("\""); - sb.append(",\"menuCode\":") - .append("\"").append(menuCode).append("\""); - sb.append(",\"apiPrefix\":") - .append("\"").append(apiPrefix).append("\""); - sb.append(",\"resourcePrefix\":") - .append("\"").append(resourcePrefix).append("\""); - sb.append(",\"routePrefix\":") - .append("\"").append(routePrefix).append("\""); - sb.append(",\"menuUrl\":") - .append("\"").append(menuUrl).append("\""); - sb.append(",\"menuIcon\":") - .append("\"").append(menuIcon).append("\""); + sb.append(",\"menuName\":\"") + .append(menuName).append('\"'); + sb.append(",\"menuSummary\":\"") + .append(menuSummary).append('\"'); + sb.append(",\"menuCode\":\"") + .append(menuCode).append('\"'); + sb.append(",\"menuUrl\":\"") + .append(menuUrl).append('\"'); + sb.append(",\"menuIcon\":\"") + .append(menuIcon).append('\"'); sb.append(",\"menuType\":") .append(menuType); sb.append(",\"menuOrder\":") diff --git a/common/src/main/java/ink/wgink/common/base/DefaultBaseController.java b/common/src/main/java/ink/wgink/common/base/DefaultBaseController.java index a6672740..eed3c038 100644 --- a/common/src/main/java/ink/wgink/common/base/DefaultBaseController.java +++ b/common/src/main/java/ink/wgink/common/base/DefaultBaseController.java @@ -1,5 +1,8 @@ package ink.wgink.common.base; +import ink.wgink.interfaces.menu.IMenuBaseService; +import ink.wgink.interfaces.user.IUserCheckService; +import ink.wgink.pojo.dtos.menu.MenuDTO; import ink.wgink.util.map.HashMapUtil; import ink.wgink.util.request.RequestUtil; import org.slf4j.Logger; @@ -14,7 +17,9 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import java.net.URLDecoder; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -31,10 +36,29 @@ public class DefaultBaseController { @Autowired private HttpSession httpSession; + @Autowired(required = false) + private IMenuBaseService menuBaseService; + @Autowired(required = false) + private IUserCheckService userCheckService; @GetMapping("index") public ModelAndView goIndex() { ModelAndView mv = new ModelAndView("index"); + + if (menuBaseService != null) { + List menus; + // 加载菜单 + if (userCheckService != null) { + // 引入用户模块，是统一用户系统，加载统一用户系统菜单 + menus = menuBaseService.listAllByParentId(IMenuBaseService.MENU_UNIFIED_USER); + } else { + // 未引入用户模块，是客户端系统，加载客户端菜单 + menus = new ArrayList<>(); + } + + mv.addObject("menus", menus); + } + return mv; } diff --git a/common/src/main/java/ink/wgink/common/config/TransactionConfig.java b/common/src/main/java/ink/wgink/common/config/TransactionConfig.java index c8849d8e..1bf0cd2e 100644 --- a/common/src/main/java/ink/wgink/common/config/TransactionConfig.java +++ b/common/src/main/java/ink/wgink/common/config/TransactionConfig.java @@ -1,6 +1,7 @@ package ink.wgink.common.config; import ink.wgink.common.config.properties.TransactionProperties; +import ink.wgink.exceptions.SaveException; import org.aspectj.lang.annotation.Aspect; import org.springframework.aop.Advisor; import org.springframework.aop.aspectj.AspectJExpressionPointcut; @@ -66,7 +67,7 @@ public class TransactionConfig { required.setIsolationLevel(TransactionDefinition.ISOLATION_SERIALIZABLE); DefaultTransactionAttribute readOnly = new DefaultTransactionAttribute(); - required.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); + readOnly.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); readOnly.setReadOnly(true); List saveList = transactionProperties.getSaveList(); @@ -105,14 +106,8 @@ public class TransactionConfig { @Bean public Advisor txAdviceAdvisor() { - StringBuilder expressionSB = new StringBuilder("execution(* *..service..*(..))"); -// List servicePackageList = transactionProperties.getServicePackageList(); -// for (String servicePackage : servicePackageList) { -// expressionSB.append(" or execution(* " + servicePackage + "..*.service..*(..))"); -// } - AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut(); - pointcut.setExpression(expressionSB.toString()); + pointcut.setExpression("execution(* *..*Service*.*(..))"); return new DefaultPointcutAdvisor(pointcut, txAdvice()); } diff --git a/common/src/main/java/ink/wgink/common/config/properties/TransactionProperties.java b/common/src/main/java/ink/wgink/common/config/properties/TransactionProperties.java index 661f1829..f9c8b924 100644 --- a/common/src/main/java/ink/wgink/common/config/properties/TransactionProperties.java +++ b/common/src/main/java/ink/wgink/common/config/properties/TransactionProperties.java @@ -20,24 +20,12 @@ import java.util.List; @ConfigurationProperties(prefix = "transaction") public class TransactionProperties { - private List servicePackageList; private List saveList; private List removeList; private List updateList; private List otherList; private List queryList; - public List getServicePackageList() { - if (servicePackageList == null) { - return new ArrayList<>(); - } - return servicePackageList; - } - - public void setServicePackageList(List servicePackageList) { - this.servicePackageList = servicePackageList; - } - public List getSaveList() { if (saveList == null) { return new ArrayList<>(); @@ -96,9 +84,7 @@ public class TransactionProperties { @Override public String toString() { final StringBuilder sb = new StringBuilder("{"); - sb.append("\"servicePackageList\":") - .append(servicePackageList); - sb.append(",\"saveList\":") + sb.append("\"saveList\":") .append(saveList); sb.append(",\"removeList\":") .append(removeList); diff --git a/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/api/AreaController.java b/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/api/AreaController.java similarity index 97% rename from module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/api/AreaController.java rename to module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/api/AreaController.java index 5e7a5314..0b0247de 100644 --- a/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/api/AreaController.java +++ b/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/api/AreaController.java @@ -1,11 +1,11 @@ -package ink.wgink.module.dictionary.controller.api; +package ink.wgink.service.dictionary.controller.api; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.module.dictionary.pojo.dtos.AreaDTO; -import ink.wgink.module.dictionary.pojo.vos.AreaVO; -import ink.wgink.module.dictionary.service.IAreaService; +import ink.wgink.service.dictionary.pojo.dtos.AreaDTO; +import ink.wgink.service.dictionary.pojo.vos.AreaVO; +import ink.wgink.service.dictionary.service.IAreaService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.result.ErrorResult; diff --git a/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/api/DataController.java b/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/api/DataController.java similarity index 96% rename from module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/api/DataController.java rename to module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/api/DataController.java index 79d4d5d1..36f85a69 100644 --- a/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/api/DataController.java +++ b/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/api/DataController.java @@ -1,11 +1,11 @@ -package ink.wgink.module.dictionary.controller.api; +package ink.wgink.service.dictionary.controller.api; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.module.dictionary.pojo.dtos.DataDTO; -import ink.wgink.module.dictionary.pojo.vos.DataVO; -import ink.wgink.module.dictionary.service.IDataService; +import ink.wgink.service.dictionary.pojo.dtos.DataDTO; +import ink.wgink.service.dictionary.pojo.vos.DataVO; +import ink.wgink.service.dictionary.service.IDataService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.result.ErrorResult; diff --git a/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/app/api/AreaAppController.java b/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/app/api/AreaAppController.java similarity index 98% rename from module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/app/api/AreaAppController.java rename to module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/app/api/AreaAppController.java index 70b7af26..01f7df6b 100644 --- a/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/app/api/AreaAppController.java +++ b/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/app/api/AreaAppController.java @@ -1,9 +1,9 @@ -package ink.wgink.module.dictionary.controller.app.api; +package ink.wgink.service.dictionary.controller.app.api; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.module.dictionary.pojo.dtos.AreaDTO; -import ink.wgink.module.dictionary.service.IAreaService; +import ink.wgink.service.dictionary.pojo.dtos.AreaDTO; +import ink.wgink.service.dictionary.service.IAreaService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.result.ErrorResult; diff --git a/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/app/api/DataAppController.java b/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/app/api/DataAppController.java similarity index 98% rename from module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/app/api/DataAppController.java rename to module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/app/api/DataAppController.java index cba9f416..8197e74a 100644 --- a/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/app/api/DataAppController.java +++ b/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/app/api/DataAppController.java @@ -1,9 +1,9 @@ -package ink.wgink.module.dictionary.controller.app.api; +package ink.wgink.service.dictionary.controller.app.api; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.module.dictionary.pojo.dtos.DataDTO; -import ink.wgink.module.dictionary.service.IDataService; +import ink.wgink.service.dictionary.pojo.dtos.DataDTO; +import ink.wgink.service.dictionary.service.IDataService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.result.ErrorResult; diff --git a/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/route/AreaRouteController.java b/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/route/AreaRouteController.java similarity index 96% rename from module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/route/AreaRouteController.java rename to module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/route/AreaRouteController.java index 2db6d585..d795ab86 100644 --- a/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/route/AreaRouteController.java +++ b/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/route/AreaRouteController.java @@ -1,4 +1,4 @@ -package ink.wgink.module.dictionary.controller.route; +package ink.wgink.service.dictionary.controller.route; import ink.wgink.interfaces.consts.ISystemConstant; import io.swagger.annotations.Api; diff --git a/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/route/DataRouteController.java b/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/route/DataRouteController.java similarity index 96% rename from module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/route/DataRouteController.java rename to module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/route/DataRouteController.java index 20575205..8311bea7 100644 --- a/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/route/DataRouteController.java +++ b/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/route/DataRouteController.java @@ -1,4 +1,4 @@ -package ink.wgink.module.dictionary.controller.route; +package ink.wgink.service.dictionary.controller.route; import ink.wgink.interfaces.consts.ISystemConstant; import io.swagger.annotations.Api; diff --git a/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/wechat/AreaWechatController.java b/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/wechat/AreaWechatController.java similarity index 96% rename from module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/wechat/AreaWechatController.java rename to module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/wechat/AreaWechatController.java index 5ad19437..65569dba 100644 --- a/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/wechat/AreaWechatController.java +++ b/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/wechat/AreaWechatController.java @@ -1,9 +1,9 @@ -package ink.wgink.module.dictionary.controller.wechat; +package ink.wgink.service.dictionary.controller.wechat; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.module.dictionary.pojo.dtos.AreaDTO; -import ink.wgink.module.dictionary.service.IAreaService; +import ink.wgink.service.dictionary.pojo.dtos.AreaDTO; +import ink.wgink.service.dictionary.service.IAreaService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.result.ErrorResult; diff --git a/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/wechat/DataWechatController.java b/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/wechat/DataWechatController.java similarity index 96% rename from module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/wechat/DataWechatController.java rename to module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/wechat/DataWechatController.java index b4dd17fc..d1a5a963 100644 --- a/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/wechat/DataWechatController.java +++ b/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/wechat/DataWechatController.java @@ -1,9 +1,9 @@ -package ink.wgink.module.dictionary.controller.wechat; +package ink.wgink.service.dictionary.controller.wechat; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.module.dictionary.pojo.dtos.DataDTO; -import ink.wgink.module.dictionary.service.IDataService; +import ink.wgink.service.dictionary.pojo.dtos.DataDTO; +import ink.wgink.service.dictionary.service.IDataService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.result.ErrorResult; diff --git a/module-dictionary/src/main/java/ink/wgink/module/dictionary/dao/IAreaDao.java b/module-dictionary/src/main/java/ink/wgink/service/dictionary/dao/IAreaDao.java similarity index 95% rename from module-dictionary/src/main/java/ink/wgink/module/dictionary/dao/IAreaDao.java rename to module-dictionary/src/main/java/ink/wgink/service/dictionary/dao/IAreaDao.java index 82418dfe..d16d441a 100644 --- a/module-dictionary/src/main/java/ink/wgink/module/dictionary/dao/IAreaDao.java +++ b/module-dictionary/src/main/java/ink/wgink/service/dictionary/dao/IAreaDao.java @@ -1,10 +1,10 @@ -package ink.wgink.module.dictionary.dao; +package ink.wgink.service.dictionary.dao; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.UpdateException; -import ink.wgink.module.dictionary.pojo.dtos.AreaDTO; +import ink.wgink.service.dictionary.pojo.dtos.AreaDTO; import ink.wgink.pojo.dtos.ZTreeDTO; import org.springframework.stereotype.Repository; diff --git a/module-dictionary/src/main/java/ink/wgink/module/dictionary/dao/IDataDao.java b/module-dictionary/src/main/java/ink/wgink/service/dictionary/dao/IDataDao.java similarity index 95% rename from module-dictionary/src/main/java/ink/wgink/module/dictionary/dao/IDataDao.java rename to module-dictionary/src/main/java/ink/wgink/service/dictionary/dao/IDataDao.java index ceb39685..2acdc753 100644 --- a/module-dictionary/src/main/java/ink/wgink/module/dictionary/dao/IDataDao.java +++ b/module-dictionary/src/main/java/ink/wgink/service/dictionary/dao/IDataDao.java @@ -1,10 +1,10 @@ -package ink.wgink.module.dictionary.dao; +package ink.wgink.service.dictionary.dao; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.UpdateException; -import ink.wgink.module.dictionary.pojo.dtos.DataDTO; +import ink.wgink.service.dictionary.pojo.dtos.DataDTO; import ink.wgink.pojo.dtos.ZTreeDTO; import org.springframework.stereotype.Repository; diff --git a/module-dictionary/src/main/java/ink/wgink/module/dictionary/pojo/dtos/AreaDTO.java b/module-dictionary/src/main/java/ink/wgink/service/dictionary/pojo/dtos/AreaDTO.java similarity index 99% rename from module-dictionary/src/main/java/ink/wgink/module/dictionary/pojo/dtos/AreaDTO.java rename to module-dictionary/src/main/java/ink/wgink/service/dictionary/pojo/dtos/AreaDTO.java index 3a00f73c..090e0520 100644 --- a/module-dictionary/src/main/java/ink/wgink/module/dictionary/pojo/dtos/AreaDTO.java +++ b/module-dictionary/src/main/java/ink/wgink/service/dictionary/pojo/dtos/AreaDTO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.dictionary.pojo.dtos; +package ink.wgink.service.dictionary.pojo.dtos; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/module-dictionary/src/main/java/ink/wgink/module/dictionary/pojo/dtos/DataDTO.java b/module-dictionary/src/main/java/ink/wgink/service/dictionary/pojo/dtos/DataDTO.java similarity index 98% rename from module-dictionary/src/main/java/ink/wgink/module/dictionary/pojo/dtos/DataDTO.java rename to module-dictionary/src/main/java/ink/wgink/service/dictionary/pojo/dtos/DataDTO.java index 6c023eb5..2506ca86 100644 --- a/module-dictionary/src/main/java/ink/wgink/module/dictionary/pojo/dtos/DataDTO.java +++ b/module-dictionary/src/main/java/ink/wgink/service/dictionary/pojo/dtos/DataDTO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.dictionary.pojo.dtos; +package ink.wgink.service.dictionary.pojo.dtos; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/module-dictionary/src/main/java/ink/wgink/module/dictionary/pojo/vos/AreaVO.java b/module-dictionary/src/main/java/ink/wgink/service/dictionary/pojo/vos/AreaVO.java similarity index 99% rename from module-dictionary/src/main/java/ink/wgink/module/dictionary/pojo/vos/AreaVO.java rename to module-dictionary/src/main/java/ink/wgink/service/dictionary/pojo/vos/AreaVO.java index 88ccfac9..2aa13eb9 100644 --- a/module-dictionary/src/main/java/ink/wgink/module/dictionary/pojo/vos/AreaVO.java +++ b/module-dictionary/src/main/java/ink/wgink/service/dictionary/pojo/vos/AreaVO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.dictionary.pojo.vos; +package ink.wgink.service.dictionary.pojo.vos; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/module-dictionary/src/main/java/ink/wgink/module/dictionary/pojo/vos/DataVO.java b/module-dictionary/src/main/java/ink/wgink/service/dictionary/pojo/vos/DataVO.java similarity index 97% rename from module-dictionary/src/main/java/ink/wgink/module/dictionary/pojo/vos/DataVO.java rename to module-dictionary/src/main/java/ink/wgink/service/dictionary/pojo/vos/DataVO.java index dcfc5539..ccdd3fc8 100644 --- a/module-dictionary/src/main/java/ink/wgink/module/dictionary/pojo/vos/DataVO.java +++ b/module-dictionary/src/main/java/ink/wgink/service/dictionary/pojo/vos/DataVO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.dictionary.pojo.vos; +package ink.wgink.service.dictionary.pojo.vos; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; diff --git a/module-dictionary/src/main/java/ink/wgink/module/dictionary/service/IAreaService.java b/module-dictionary/src/main/java/ink/wgink/service/dictionary/service/IAreaService.java similarity index 92% rename from module-dictionary/src/main/java/ink/wgink/module/dictionary/service/IAreaService.java rename to module-dictionary/src/main/java/ink/wgink/service/dictionary/service/IAreaService.java index 0c036bc5..a369583a 100644 --- a/module-dictionary/src/main/java/ink/wgink/module/dictionary/service/IAreaService.java +++ b/module-dictionary/src/main/java/ink/wgink/service/dictionary/service/IAreaService.java @@ -1,7 +1,7 @@ -package ink.wgink.module.dictionary.service; +package ink.wgink.service.dictionary.service; -import ink.wgink.module.dictionary.pojo.dtos.AreaDTO; -import ink.wgink.module.dictionary.pojo.vos.AreaVO; +import ink.wgink.service.dictionary.pojo.dtos.AreaDTO; +import ink.wgink.service.dictionary.pojo.vos.AreaVO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.result.SuccessResultList; diff --git a/module-dictionary/src/main/java/ink/wgink/module/dictionary/service/IDataService.java b/module-dictionary/src/main/java/ink/wgink/service/dictionary/service/IDataService.java similarity index 92% rename from module-dictionary/src/main/java/ink/wgink/module/dictionary/service/IDataService.java rename to module-dictionary/src/main/java/ink/wgink/service/dictionary/service/IDataService.java index e3bb0b7a..93417505 100644 --- a/module-dictionary/src/main/java/ink/wgink/module/dictionary/service/IDataService.java +++ b/module-dictionary/src/main/java/ink/wgink/service/dictionary/service/IDataService.java @@ -1,7 +1,7 @@ -package ink.wgink.module.dictionary.service; +package ink.wgink.service.dictionary.service; -import ink.wgink.module.dictionary.pojo.dtos.DataDTO; -import ink.wgink.module.dictionary.pojo.vos.DataVO; +import ink.wgink.service.dictionary.pojo.dtos.DataDTO; +import ink.wgink.service.dictionary.pojo.vos.DataVO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.result.SuccessResultList; diff --git a/module-dictionary/src/main/java/ink/wgink/module/dictionary/service/impl/AreaServiceImpl.java b/module-dictionary/src/main/java/ink/wgink/service/dictionary/service/impl/AreaServiceImpl.java similarity index 92% rename from module-dictionary/src/main/java/ink/wgink/module/dictionary/service/impl/AreaServiceImpl.java rename to module-dictionary/src/main/java/ink/wgink/service/dictionary/service/impl/AreaServiceImpl.java index efd205ca..f50e56ed 100644 --- a/module-dictionary/src/main/java/ink/wgink/module/dictionary/service/impl/AreaServiceImpl.java +++ b/module-dictionary/src/main/java/ink/wgink/service/dictionary/service/impl/AreaServiceImpl.java @@ -1,12 +1,12 @@ -package ink.wgink.module.dictionary.service.impl; +package ink.wgink.service.dictionary.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import ink.wgink.common.base.DefaultBaseService; -import ink.wgink.module.dictionary.dao.IAreaDao; -import ink.wgink.module.dictionary.pojo.dtos.AreaDTO; -import ink.wgink.module.dictionary.pojo.vos.AreaVO; -import ink.wgink.module.dictionary.service.IAreaService; +import ink.wgink.service.dictionary.dao.IAreaDao; +import ink.wgink.service.dictionary.pojo.dtos.AreaDTO; +import ink.wgink.service.dictionary.pojo.vos.AreaVO; +import ink.wgink.service.dictionary.service.IAreaService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.result.SuccessResultList; @@ -14,7 +14,6 @@ import ink.wgink.util.map.HashMapUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Arrays; import java.util.List; import java.util.Map; diff --git a/module-dictionary/src/main/java/ink/wgink/module/dictionary/service/impl/DataServiceImpl.java b/module-dictionary/src/main/java/ink/wgink/service/dictionary/service/impl/DataServiceImpl.java similarity index 94% rename from module-dictionary/src/main/java/ink/wgink/module/dictionary/service/impl/DataServiceImpl.java rename to module-dictionary/src/main/java/ink/wgink/service/dictionary/service/impl/DataServiceImpl.java index 489a0778..9bced3ed 100644 --- a/module-dictionary/src/main/java/ink/wgink/module/dictionary/service/impl/DataServiceImpl.java +++ b/module-dictionary/src/main/java/ink/wgink/service/dictionary/service/impl/DataServiceImpl.java @@ -1,13 +1,13 @@ -package ink.wgink.module.dictionary.service.impl; +package ink.wgink.service.dictionary.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.module.dictionary.dao.IDataDao; -import ink.wgink.module.dictionary.pojo.dtos.DataDTO; -import ink.wgink.module.dictionary.pojo.vos.DataVO; -import ink.wgink.module.dictionary.service.IDataService; +import ink.wgink.service.dictionary.dao.IDataDao; +import ink.wgink.service.dictionary.pojo.dtos.DataDTO; +import ink.wgink.service.dictionary.pojo.vos.DataVO; +import ink.wgink.service.dictionary.service.IDataService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.result.SuccessResultList; diff --git a/module-dictionary/src/main/resources/mybatis/mapper/area-mapper.xml b/module-dictionary/src/main/resources/mybatis/mapper/area-mapper.xml index 1a390119..6d3dbe5d 100644 --- a/module-dictionary/src/main/resources/mybatis/mapper/area-mapper.xml +++ b/module-dictionary/src/main/resources/mybatis/mapper/area-mapper.xml @@ -1,10 +1,10 @@ - + - + diff --git a/module-dictionary/src/main/resources/mybatis/mapper/data-mapper.xml b/module-dictionary/src/main/resources/mybatis/mapper/data-mapper.xml index 9386636c..94c3776c 100644 --- a/module-dictionary/src/main/resources/mybatis/mapper/data-mapper.xml +++ b/module-dictionary/src/main/resources/mybatis/mapper/data-mapper.xml @@ -1,10 +1,10 @@ - + - + diff --git a/module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaAppMaxDurationProperties.java b/module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaAppMaxDurationProperties.java similarity index 88% rename from module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaAppMaxDurationProperties.java rename to module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaAppMaxDurationProperties.java index 63151533..aa3c6227 100644 --- a/module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaAppMaxDurationProperties.java +++ b/module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaAppMaxDurationProperties.java @@ -1,4 +1,4 @@ -package ink.wgink.module.file.config.properties; +package ink.wgink.service.file.config.properties; /** * When you feel like quitting. Think about why you started diff --git a/module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaBackendMaxDurationProperties.java b/module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaBackendMaxDurationProperties.java similarity index 88% rename from module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaBackendMaxDurationProperties.java rename to module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaBackendMaxDurationProperties.java index 6b9d1112..165f8c60 100644 --- a/module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaBackendMaxDurationProperties.java +++ b/module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaBackendMaxDurationProperties.java @@ -1,4 +1,4 @@ -package ink.wgink.module.file.config.properties; +package ink.wgink.service.file.config.properties; /** * When you feel like quitting. Think about why you started diff --git a/module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaBaseMaxDurationProperties.java b/module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaBaseMaxDurationProperties.java similarity index 95% rename from module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaBaseMaxDurationProperties.java rename to module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaBaseMaxDurationProperties.java index 85b57409..9d4807dd 100644 --- a/module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaBaseMaxDurationProperties.java +++ b/module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaBaseMaxDurationProperties.java @@ -1,4 +1,4 @@ -package ink.wgink.module.file.config.properties; +package ink.wgink.service.file.config.properties; /** * When you feel like quitting. Think about why you started diff --git a/module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaMaxDurationProperties.java b/module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaMaxDurationProperties.java similarity index 96% rename from module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaMaxDurationProperties.java rename to module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaMaxDurationProperties.java index c3066bfe..8529f21e 100644 --- a/module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaMaxDurationProperties.java +++ b/module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaMaxDurationProperties.java @@ -1,4 +1,4 @@ -package ink.wgink.module.file.config.properties; +package ink.wgink.service.file.config.properties; /** * When you feel like quitting. Think about why you started diff --git a/module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaWechatMaxDurationProperties.java b/module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaWechatMaxDurationProperties.java similarity index 88% rename from module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaWechatMaxDurationProperties.java rename to module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaWechatMaxDurationProperties.java index be1f0f7c..a64e4dd2 100644 --- a/module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaWechatMaxDurationProperties.java +++ b/module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaWechatMaxDurationProperties.java @@ -1,4 +1,4 @@ -package ink.wgink.module.file.config.properties; +package ink.wgink.service.file.config.properties; /** * When you feel like quitting. Think about why you started diff --git a/module-file/src/main/java/ink/wgink/module/file/config/properties/FileProperties.java b/module-file/src/main/java/ink/wgink/service/file/config/properties/FileProperties.java similarity index 98% rename from module-file/src/main/java/ink/wgink/module/file/config/properties/FileProperties.java rename to module-file/src/main/java/ink/wgink/service/file/config/properties/FileProperties.java index 7fc46d09..e65b8b06 100644 --- a/module-file/src/main/java/ink/wgink/module/file/config/properties/FileProperties.java +++ b/module-file/src/main/java/ink/wgink/service/file/config/properties/FileProperties.java @@ -1,4 +1,4 @@ -package ink.wgink.module.file.config.properties; +package ink.wgink.service.file.config.properties; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/module-file/src/main/java/ink/wgink/module/file/controller/api/FileController.java b/module-file/src/main/java/ink/wgink/service/file/controller/api/FileController.java similarity index 95% rename from module-file/src/main/java/ink/wgink/module/file/controller/api/FileController.java rename to module-file/src/main/java/ink/wgink/service/file/controller/api/FileController.java index 56aa26a5..8bc98bee 100644 --- a/module-file/src/main/java/ink/wgink/module/file/controller/api/FileController.java +++ b/module-file/src/main/java/ink/wgink/service/file/controller/api/FileController.java @@ -1,13 +1,13 @@ -package ink.wgink.module.file.controller.api; +package ink.wgink.service.file.controller.api; import com.alibaba.fastjson.JSONObject; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.module.file.config.properties.FileProperties; -import ink.wgink.module.file.enums.UploadTypeEnum; -import ink.wgink.module.file.pojo.dtos.FileDTO; -import ink.wgink.module.file.pojo.dtos.FileInfoDTO; -import ink.wgink.module.file.service.IFileService; +import ink.wgink.service.file.config.properties.FileProperties; +import ink.wgink.service.file.enums.UploadTypeEnum; +import ink.wgink.service.file.pojo.dtos.FileDTO; +import ink.wgink.service.file.pojo.dtos.FileInfoDTO; +import ink.wgink.service.file.service.IFileService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; diff --git a/module-file/src/main/java/ink/wgink/module/file/controller/app/api/FileAppController.java b/module-file/src/main/java/ink/wgink/service/file/controller/app/api/FileAppController.java similarity index 95% rename from module-file/src/main/java/ink/wgink/module/file/controller/app/api/FileAppController.java rename to module-file/src/main/java/ink/wgink/service/file/controller/app/api/FileAppController.java index 826b16cd..7fbae5a5 100644 --- a/module-file/src/main/java/ink/wgink/module/file/controller/app/api/FileAppController.java +++ b/module-file/src/main/java/ink/wgink/service/file/controller/app/api/FileAppController.java @@ -1,12 +1,12 @@ -package ink.wgink.module.file.controller.app.api; +package ink.wgink.service.file.controller.app.api; import com.alibaba.fastjson.JSONObject; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.module.file.config.properties.FileProperties; -import ink.wgink.module.file.enums.UploadTypeEnum; -import ink.wgink.module.file.pojo.dtos.FileDTO; -import ink.wgink.module.file.service.IFileService; +import ink.wgink.service.file.config.properties.FileProperties; +import ink.wgink.service.file.enums.UploadTypeEnum; +import ink.wgink.service.file.pojo.dtos.FileDTO; +import ink.wgink.service.file.service.IFileService; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResultData; import io.swagger.annotations.*; diff --git a/module-file/src/main/java/ink/wgink/module/file/controller/route/FileRouteController.java b/module-file/src/main/java/ink/wgink/service/file/controller/route/FileRouteController.java similarity index 97% rename from module-file/src/main/java/ink/wgink/module/file/controller/route/FileRouteController.java rename to module-file/src/main/java/ink/wgink/service/file/controller/route/FileRouteController.java index f3ad6226..f3347aa3 100644 --- a/module-file/src/main/java/ink/wgink/module/file/controller/route/FileRouteController.java +++ b/module-file/src/main/java/ink/wgink/service/file/controller/route/FileRouteController.java @@ -1,10 +1,10 @@ -package ink.wgink.module.file.controller.route; +package ink.wgink.service.file.controller.route; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.exceptions.ParamsException; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.module.file.config.properties.FileProperties; -import ink.wgink.module.file.service.IFileService; +import ink.wgink.service.file.config.properties.FileProperties; +import ink.wgink.service.file.service.IFileService; import ink.wgink.pojo.result.ErrorResult; import io.swagger.annotations.*; import org.apache.commons.lang3.StringUtils; diff --git a/module-file/src/main/java/ink/wgink/module/file/controller/wechat/FileWechatController.java b/module-file/src/main/java/ink/wgink/service/file/controller/wechat/FileWechatController.java similarity index 95% rename from module-file/src/main/java/ink/wgink/module/file/controller/wechat/FileWechatController.java rename to module-file/src/main/java/ink/wgink/service/file/controller/wechat/FileWechatController.java index a05b805d..cd921154 100644 --- a/module-file/src/main/java/ink/wgink/module/file/controller/wechat/FileWechatController.java +++ b/module-file/src/main/java/ink/wgink/service/file/controller/wechat/FileWechatController.java @@ -1,11 +1,11 @@ -package ink.wgink.module.file.controller.wechat; +package ink.wgink.service.file.controller.wechat; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.module.file.config.properties.FileProperties; -import ink.wgink.module.file.enums.UploadTypeEnum; -import ink.wgink.module.file.pojo.dtos.FileDTO; -import ink.wgink.module.file.service.IFileService; +import ink.wgink.service.file.config.properties.FileProperties; +import ink.wgink.service.file.enums.UploadTypeEnum; +import ink.wgink.service.file.pojo.dtos.FileDTO; +import ink.wgink.service.file.service.IFileService; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResultData; import io.swagger.annotations.*; diff --git a/module-file/src/main/java/ink/wgink/module/file/dao/IFileDao.java b/module-file/src/main/java/ink/wgink/service/file/dao/IFileDao.java similarity index 93% rename from module-file/src/main/java/ink/wgink/module/file/dao/IFileDao.java rename to module-file/src/main/java/ink/wgink/service/file/dao/IFileDao.java index 780dad48..b522b06c 100644 --- a/module-file/src/main/java/ink/wgink/module/file/dao/IFileDao.java +++ b/module-file/src/main/java/ink/wgink/service/file/dao/IFileDao.java @@ -1,11 +1,11 @@ -package ink.wgink.module.file.dao; +package ink.wgink.service.file.dao; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; -import ink.wgink.module.file.pojo.dtos.FileDTO; -import ink.wgink.module.file.pojo.dtos.FileInfoDTO; +import ink.wgink.service.file.pojo.dtos.FileDTO; +import ink.wgink.service.file.pojo.dtos.FileInfoDTO; import ink.wgink.pojo.pos.FilePO; import org.springframework.stereotype.Repository; diff --git a/module-file/src/main/java/ink/wgink/module/file/enums/UploadTypeEnum.java b/module-file/src/main/java/ink/wgink/service/file/enums/UploadTypeEnum.java similarity index 90% rename from module-file/src/main/java/ink/wgink/module/file/enums/UploadTypeEnum.java rename to module-file/src/main/java/ink/wgink/service/file/enums/UploadTypeEnum.java index 561e476d..8dd93625 100644 --- a/module-file/src/main/java/ink/wgink/module/file/enums/UploadTypeEnum.java +++ b/module-file/src/main/java/ink/wgink/service/file/enums/UploadTypeEnum.java @@ -1,4 +1,4 @@ -package ink.wgink.module.file.enums; +package ink.wgink.service.file.enums; /** * @ClassName: UploadTypeEnum diff --git a/module-file/src/main/java/ink/wgink/module/file/excel/error/AbstractErrorExcelHandler.java b/module-file/src/main/java/ink/wgink/service/file/excel/error/AbstractErrorExcelHandler.java similarity index 92% rename from module-file/src/main/java/ink/wgink/module/file/excel/error/AbstractErrorExcelHandler.java rename to module-file/src/main/java/ink/wgink/service/file/excel/error/AbstractErrorExcelHandler.java index 0cf74361..ac6c2817 100644 --- a/module-file/src/main/java/ink/wgink/module/file/excel/error/AbstractErrorExcelHandler.java +++ b/module-file/src/main/java/ink/wgink/service/file/excel/error/AbstractErrorExcelHandler.java @@ -1,9 +1,8 @@ -package ink.wgink.module.file.excel.error; +package ink.wgink.service.file.excel.error; import com.alibaba.excel.EasyExcel; -import ink.wgink.module.file.service.IFileService; +import ink.wgink.service.file.service.IFileService; import ink.wgink.util.UUIDUtil; -import ink.wgink.util.request.RequestUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/module-file/src/main/java/ink/wgink/module/file/pojo/dtos/FileDTO.java b/module-file/src/main/java/ink/wgink/service/file/pojo/dtos/FileDTO.java similarity index 98% rename from module-file/src/main/java/ink/wgink/module/file/pojo/dtos/FileDTO.java rename to module-file/src/main/java/ink/wgink/service/file/pojo/dtos/FileDTO.java index 266c2526..e2630a19 100644 --- a/module-file/src/main/java/ink/wgink/module/file/pojo/dtos/FileDTO.java +++ b/module-file/src/main/java/ink/wgink/service/file/pojo/dtos/FileDTO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.file.pojo.dtos; +package ink.wgink.service.file.pojo.dtos; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/module-file/src/main/java/ink/wgink/module/file/pojo/dtos/FileInfoDTO.java b/module-file/src/main/java/ink/wgink/service/file/pojo/dtos/FileInfoDTO.java similarity index 97% rename from module-file/src/main/java/ink/wgink/module/file/pojo/dtos/FileInfoDTO.java rename to module-file/src/main/java/ink/wgink/service/file/pojo/dtos/FileInfoDTO.java index 92d930d8..23e45472 100644 --- a/module-file/src/main/java/ink/wgink/module/file/pojo/dtos/FileInfoDTO.java +++ b/module-file/src/main/java/ink/wgink/service/file/pojo/dtos/FileInfoDTO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.file.pojo.dtos; +package ink.wgink.service.file.pojo.dtos; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/module-file/src/main/java/ink/wgink/module/file/service/IFileService.java b/module-file/src/main/java/ink/wgink/service/file/service/IFileService.java similarity index 96% rename from module-file/src/main/java/ink/wgink/module/file/service/IFileService.java rename to module-file/src/main/java/ink/wgink/service/file/service/IFileService.java index fd82c030..de6c936e 100644 --- a/module-file/src/main/java/ink/wgink/module/file/service/IFileService.java +++ b/module-file/src/main/java/ink/wgink/service/file/service/IFileService.java @@ -1,9 +1,9 @@ -package ink.wgink.module.file.service; +package ink.wgink.service.file.service; import com.alibaba.fastjson.JSONObject; -import ink.wgink.module.file.enums.UploadTypeEnum; -import ink.wgink.module.file.pojo.dtos.FileDTO; -import ink.wgink.module.file.pojo.dtos.FileInfoDTO; +import ink.wgink.service.file.enums.UploadTypeEnum; +import ink.wgink.service.file.pojo.dtos.FileDTO; +import ink.wgink.service.file.pojo.dtos.FileInfoDTO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.pos.FilePO; import ink.wgink.pojo.result.SuccessResultData; diff --git a/module-file/src/main/java/ink/wgink/module/file/service/impl/FileServiceImpl.java b/module-file/src/main/java/ink/wgink/service/file/service/impl/FileServiceImpl.java similarity index 98% rename from module-file/src/main/java/ink/wgink/module/file/service/impl/FileServiceImpl.java rename to module-file/src/main/java/ink/wgink/service/file/service/impl/FileServiceImpl.java index cdd7b8aa..1a35c86d 100644 --- a/module-file/src/main/java/ink/wgink/module/file/service/impl/FileServiceImpl.java +++ b/module-file/src/main/java/ink/wgink/service/file/service/impl/FileServiceImpl.java @@ -1,4 +1,4 @@ -package ink.wgink.module.file.service.impl; +package ink.wgink.service.file.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -12,12 +12,12 @@ import ink.wgink.exceptions.ParamsException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.base.SystemException; -import ink.wgink.module.file.config.properties.FileProperties; -import ink.wgink.module.file.dao.IFileDao; -import ink.wgink.module.file.enums.UploadTypeEnum; -import ink.wgink.module.file.pojo.dtos.FileDTO; -import ink.wgink.module.file.pojo.dtos.FileInfoDTO; -import ink.wgink.module.file.service.IFileService; +import ink.wgink.service.file.config.properties.FileProperties; +import ink.wgink.service.file.dao.IFileDao; +import ink.wgink.service.file.enums.UploadTypeEnum; +import ink.wgink.service.file.pojo.dtos.FileDTO; +import ink.wgink.service.file.pojo.dtos.FileInfoDTO; +import ink.wgink.service.file.service.IFileService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.pos.FilePO; import ink.wgink.pojo.result.SuccessResultData; diff --git a/module-file/src/main/java/ink/wgink/module/file/startup/ModuleFileStartUp.java b/module-file/src/main/java/ink/wgink/service/file/startup/ModuleFileStartUp.java similarity index 82% rename from module-file/src/main/java/ink/wgink/module/file/startup/ModuleFileStartUp.java rename to module-file/src/main/java/ink/wgink/service/file/startup/ModuleFileStartUp.java index aca247c9..daa71a4e 100644 --- a/module-file/src/main/java/ink/wgink/module/file/startup/ModuleFileStartUp.java +++ b/module-file/src/main/java/ink/wgink/service/file/startup/ModuleFileStartUp.java @@ -1,8 +1,6 @@ -package ink.wgink.module.file.startup; +package ink.wgink.service.file.startup; -import ink.wgink.module.file.dao.IFileDao; -import ink.wgink.pojo.dtos.user.UserDTO; -import ink.wgink.util.date.DateUtil; +import ink.wgink.service.file.dao.IFileDao; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -10,9 +8,6 @@ import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.stereotype.Component; -import java.util.HashMap; -import java.util.Map; - /** * When you feel like quitting. Think about why you started * 当你想要放弃的时候，想想当初你为何开始 diff --git a/module-file/src/main/resources/mybatis/mapper/file-mapper.xml b/module-file/src/main/resources/mybatis/mapper/file-mapper.xml index ec919816..a23c5fa4 100644 --- a/module-file/src/main/resources/mybatis/mapper/file-mapper.xml +++ b/module-file/src/main/resources/mybatis/mapper/file-mapper.xml @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/module-permission/src/main/java/ink/wgink/module/permission/controller/api/PermissionController.java b/module-permission/src/main/java/ink/wgink/service/permission/controller/api/PermissionController.java similarity index 96% rename from module-permission/src/main/java/ink/wgink/module/permission/controller/api/PermissionController.java rename to module-permission/src/main/java/ink/wgink/service/permission/controller/api/PermissionController.java index 91c67d09..9e71f565 100644 --- a/module-permission/src/main/java/ink/wgink/module/permission/controller/api/PermissionController.java +++ b/module-permission/src/main/java/ink/wgink/service/permission/controller/api/PermissionController.java @@ -1,4 +1,4 @@ -package ink.wgink.module.permission.controller.api; +package ink.wgink.service.permission.controller.api; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; @@ -10,8 +10,8 @@ import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.module.permission.pojo.vos.PermissionVO; -import ink.wgink.module.permission.service.IPermissionService; +import ink.wgink.service.permission.pojo.vos.PermissionVO; +import ink.wgink.service.permission.service.IPermissionService; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.AntPathMatcher; diff --git a/module-permission/src/main/java/ink/wgink/module/permission/dao/IPermissionDao.java b/module-permission/src/main/java/ink/wgink/service/permission/dao/IPermissionDao.java similarity index 97% rename from module-permission/src/main/java/ink/wgink/module/permission/dao/IPermissionDao.java rename to module-permission/src/main/java/ink/wgink/service/permission/dao/IPermissionDao.java index 0886a909..4956d095 100644 --- a/module-permission/src/main/java/ink/wgink/module/permission/dao/IPermissionDao.java +++ b/module-permission/src/main/java/ink/wgink/service/permission/dao/IPermissionDao.java @@ -1,4 +1,4 @@ -package ink.wgink.module.permission.dao; +package ink.wgink.service.permission.dao; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; diff --git a/module-permission/src/main/java/ink/wgink/module/permission/enums/PermissionTypeEnum.java b/module-permission/src/main/java/ink/wgink/service/permission/enums/PermissionTypeEnum.java similarity index 93% rename from module-permission/src/main/java/ink/wgink/module/permission/enums/PermissionTypeEnum.java rename to module-permission/src/main/java/ink/wgink/service/permission/enums/PermissionTypeEnum.java index 58b248b3..5e186762 100644 --- a/module-permission/src/main/java/ink/wgink/module/permission/enums/PermissionTypeEnum.java +++ b/module-permission/src/main/java/ink/wgink/service/permission/enums/PermissionTypeEnum.java @@ -1,4 +1,4 @@ -package ink.wgink.module.permission.enums; +package ink.wgink.service.permission.enums; /** * When you feel like quitting. Think about why you started diff --git a/module-permission/src/main/java/ink/wgink/module/permission/pojo/vos/PermissionVO.java b/module-permission/src/main/java/ink/wgink/service/permission/pojo/vos/PermissionVO.java similarity index 98% rename from module-permission/src/main/java/ink/wgink/module/permission/pojo/vos/PermissionVO.java rename to module-permission/src/main/java/ink/wgink/service/permission/pojo/vos/PermissionVO.java index 623ea776..b46e1d9b 100644 --- a/module-permission/src/main/java/ink/wgink/module/permission/pojo/vos/PermissionVO.java +++ b/module-permission/src/main/java/ink/wgink/service/permission/pojo/vos/PermissionVO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.permission.pojo.vos; +package ink.wgink.service.permission.pojo.vos; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; diff --git a/module-permission/src/main/java/ink/wgink/module/permission/service/IPermissionService.java b/module-permission/src/main/java/ink/wgink/service/permission/service/IPermissionService.java similarity index 94% rename from module-permission/src/main/java/ink/wgink/module/permission/service/IPermissionService.java rename to module-permission/src/main/java/ink/wgink/service/permission/service/IPermissionService.java index 9e11bcd3..c95029dc 100644 --- a/module-permission/src/main/java/ink/wgink/module/permission/service/IPermissionService.java +++ b/module-permission/src/main/java/ink/wgink/service/permission/service/IPermissionService.java @@ -1,10 +1,10 @@ -package ink.wgink.module.permission.service; +package ink.wgink.service.permission.service; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.permission.PermissionDTO; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.module.permission.pojo.vos.PermissionVO; +import ink.wgink.service.permission.pojo.vos.PermissionVO; import java.util.List; import java.util.Map; diff --git a/module-permission/src/main/java/ink/wgink/module/permission/service/impl/PermissionServiceImpl.java b/module-permission/src/main/java/ink/wgink/service/permission/service/impl/PermissionServiceImpl.java similarity index 93% rename from module-permission/src/main/java/ink/wgink/module/permission/service/impl/PermissionServiceImpl.java rename to module-permission/src/main/java/ink/wgink/service/permission/service/impl/PermissionServiceImpl.java index 47b7fe00..3b58660d 100644 --- a/module-permission/src/main/java/ink/wgink/module/permission/service/impl/PermissionServiceImpl.java +++ b/module-permission/src/main/java/ink/wgink/service/permission/service/impl/PermissionServiceImpl.java @@ -1,4 +1,4 @@ -package ink.wgink.module.permission.service.impl; +package ink.wgink.service.permission.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -7,9 +7,9 @@ import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.permission.PermissionDTO; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.module.permission.dao.IPermissionDao; -import ink.wgink.module.permission.pojo.vos.PermissionVO; -import ink.wgink.module.permission.service.IPermissionService; +import ink.wgink.service.permission.dao.IPermissionDao; +import ink.wgink.service.permission.pojo.vos.PermissionVO; +import ink.wgink.service.permission.service.IPermissionService; import ink.wgink.util.UUIDUtil; import ink.wgink.util.map.HashMapUtil; import org.springframework.beans.factory.annotation.Autowired; diff --git a/module-permission/src/main/resources/mybatis/mapper/permission-mapper.xml b/module-permission/src/main/resources/mybatis/mapper/permission-mapper.xml index 294ccbf0..d36fdcd3 100644 --- a/module-permission/src/main/resources/mybatis/mapper/permission-mapper.xml +++ b/module-permission/src/main/resources/mybatis/mapper/permission-mapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service-department/src/main/java/ink/wgink/module/department/controller/api/DepartmentController.java b/service-department/src/main/java/ink/wgink/service/department/controller/api/DepartmentController.java similarity index 96% rename from service-department/src/main/java/ink/wgink/module/department/controller/api/DepartmentController.java rename to service-department/src/main/java/ink/wgink/service/department/controller/api/DepartmentController.java index 992674f1..c2dac7d6 100644 --- a/service-department/src/main/java/ink/wgink/module/department/controller/api/DepartmentController.java +++ b/service-department/src/main/java/ink/wgink/service/department/controller/api/DepartmentController.java @@ -1,4 +1,4 @@ -package ink.wgink.module.department.controller.api; +package ink.wgink.service.department.controller.api; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; @@ -8,11 +8,11 @@ import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.dtos.department.DepartmentDTO; import ink.wgink.pojo.result.*; -import ink.wgink.module.department.pojo.vos.DepartmentVO; -import ink.wgink.module.department.pojo.vos.MergeDepartmentInfoVO; -import ink.wgink.module.department.pojo.vos.MergeNewDepartmentInfoVO; -import ink.wgink.module.department.pojo.vos.SplitDepartmentVO; -import ink.wgink.module.department.service.IDepartmentService; +import ink.wgink.service.department.pojo.vos.DepartmentVO; +import ink.wgink.service.department.pojo.vos.MergeDepartmentInfoVO; +import ink.wgink.service.department.pojo.vos.MergeNewDepartmentInfoVO; +import ink.wgink.service.department.pojo.vos.SplitDepartmentVO; +import ink.wgink.service.department.service.IDepartmentService; import io.swagger.annotations.*; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service-department/src/main/java/ink/wgink/module/department/controller/api/DepartmentUserController.java b/service-department/src/main/java/ink/wgink/service/department/controller/api/DepartmentUserController.java similarity index 92% rename from service-department/src/main/java/ink/wgink/module/department/controller/api/DepartmentUserController.java rename to service-department/src/main/java/ink/wgink/service/department/controller/api/DepartmentUserController.java index 4d4547a4..1fff5e5e 100644 --- a/service-department/src/main/java/ink/wgink/module/department/controller/api/DepartmentUserController.java +++ b/service-department/src/main/java/ink/wgink/service/department/controller/api/DepartmentUserController.java @@ -1,4 +1,4 @@ -package ink.wgink.module.department.controller.api; +package ink.wgink.service.department.controller.api; import ink.wgink.interfaces.consts.ISystemConstant; import io.swagger.annotations.Api; diff --git a/service-department/src/main/java/ink/wgink/module/department/controller/route/DepartmentRouteController.java b/service-department/src/main/java/ink/wgink/service/department/controller/route/DepartmentRouteController.java similarity index 97% rename from service-department/src/main/java/ink/wgink/module/department/controller/route/DepartmentRouteController.java rename to service-department/src/main/java/ink/wgink/service/department/controller/route/DepartmentRouteController.java index e0237f69..eb267e93 100644 --- a/service-department/src/main/java/ink/wgink/module/department/controller/route/DepartmentRouteController.java +++ b/service-department/src/main/java/ink/wgink/service/department/controller/route/DepartmentRouteController.java @@ -1,4 +1,4 @@ -package ink.wgink.module.department.controller.route; +package ink.wgink.service.department.controller.route; import ink.wgink.interfaces.consts.ISystemConstant; import io.swagger.annotations.Api; diff --git a/service-department/src/main/java/ink/wgink/module/department/dao/IDepartmentAdjustmentDao.java b/service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentAdjustmentDao.java similarity index 93% rename from service-department/src/main/java/ink/wgink/module/department/dao/IDepartmentAdjustmentDao.java rename to service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentAdjustmentDao.java index 9b92a162..2b538a59 100644 --- a/service-department/src/main/java/ink/wgink/module/department/dao/IDepartmentAdjustmentDao.java +++ b/service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentAdjustmentDao.java @@ -1,4 +1,4 @@ -package ink.wgink.module.department.dao; +package ink.wgink.service.department.dao; import ink.wgink.exceptions.SaveException; import org.springframework.stereotype.Repository; diff --git a/service-department/src/main/java/ink/wgink/module/department/dao/IDepartmentDao.java b/service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentDao.java similarity index 98% rename from service-department/src/main/java/ink/wgink/module/department/dao/IDepartmentDao.java rename to service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentDao.java index 217cdede..d3ce88fe 100644 --- a/service-department/src/main/java/ink/wgink/module/department/dao/IDepartmentDao.java +++ b/service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentDao.java @@ -1,4 +1,4 @@ -package ink.wgink.module.department.dao; +package ink.wgink.service.department.dao; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; diff --git a/service-department/src/main/java/ink/wgink/module/department/dao/IDepartmentUserAdjustmentDao.java b/service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentUserAdjustmentDao.java similarity index 93% rename from service-department/src/main/java/ink/wgink/module/department/dao/IDepartmentUserAdjustmentDao.java rename to service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentUserAdjustmentDao.java index 78c04986..aa031235 100644 --- a/service-department/src/main/java/ink/wgink/module/department/dao/IDepartmentUserAdjustmentDao.java +++ b/service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentUserAdjustmentDao.java @@ -1,4 +1,4 @@ -package ink.wgink.module.department.dao; +package ink.wgink.service.department.dao; import ink.wgink.exceptions.SaveException; import org.springframework.stereotype.Repository; diff --git a/service-department/src/main/java/ink/wgink/module/department/dao/IDepartmentUserDao.java b/service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentUserDao.java similarity index 96% rename from service-department/src/main/java/ink/wgink/module/department/dao/IDepartmentUserDao.java rename to service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentUserDao.java index d569df9d..86470835 100644 --- a/service-department/src/main/java/ink/wgink/module/department/dao/IDepartmentUserDao.java +++ b/service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentUserDao.java @@ -1,4 +1,4 @@ -package ink.wgink.module.department.dao; +package ink.wgink.service.department.dao; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; diff --git a/service-department/src/main/java/ink/wgink/module/department/enmus/DepartmentAdjustmentTypeEnum.java b/service-department/src/main/java/ink/wgink/service/department/enmus/DepartmentAdjustmentTypeEnum.java similarity index 93% rename from service-department/src/main/java/ink/wgink/module/department/enmus/DepartmentAdjustmentTypeEnum.java rename to service-department/src/main/java/ink/wgink/service/department/enmus/DepartmentAdjustmentTypeEnum.java index 1c515dc5..fa4b5e16 100644 --- a/service-department/src/main/java/ink/wgink/module/department/enmus/DepartmentAdjustmentTypeEnum.java +++ b/service-department/src/main/java/ink/wgink/service/department/enmus/DepartmentAdjustmentTypeEnum.java @@ -1,4 +1,4 @@ -package ink.wgink.module.department.enmus; +package ink.wgink.service.department.enmus; /** * When you feel like quitting. Think about why you started diff --git a/service-department/src/main/java/ink/wgink/module/department/listener/excel/DepartmentExcel.java b/service-department/src/main/java/ink/wgink/service/department/listener/excel/DepartmentExcel.java similarity index 98% rename from service-department/src/main/java/ink/wgink/module/department/listener/excel/DepartmentExcel.java rename to service-department/src/main/java/ink/wgink/service/department/listener/excel/DepartmentExcel.java index c418b9e2..f010ea38 100644 --- a/service-department/src/main/java/ink/wgink/module/department/listener/excel/DepartmentExcel.java +++ b/service-department/src/main/java/ink/wgink/service/department/listener/excel/DepartmentExcel.java @@ -1,4 +1,4 @@ -package ink.wgink.module.department.listener.excel; +package ink.wgink.service.department.listener.excel; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/service-department/src/main/java/ink/wgink/module/department/listener/excel/DepartmentExcelError.java b/service-department/src/main/java/ink/wgink/service/department/listener/excel/DepartmentExcelError.java similarity index 98% rename from service-department/src/main/java/ink/wgink/module/department/listener/excel/DepartmentExcelError.java rename to service-department/src/main/java/ink/wgink/service/department/listener/excel/DepartmentExcelError.java index a8409a08..ddd8082d 100644 --- a/service-department/src/main/java/ink/wgink/module/department/listener/excel/DepartmentExcelError.java +++ b/service-department/src/main/java/ink/wgink/service/department/listener/excel/DepartmentExcelError.java @@ -1,4 +1,4 @@ -package ink.wgink.module.department.listener.excel; +package ink.wgink.service.department.listener.excel; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/service-department/src/main/java/ink/wgink/module/department/listener/excel/DepartmentExcelListener.java b/service-department/src/main/java/ink/wgink/service/department/listener/excel/DepartmentExcelListener.java similarity index 96% rename from service-department/src/main/java/ink/wgink/module/department/listener/excel/DepartmentExcelListener.java rename to service-department/src/main/java/ink/wgink/service/department/listener/excel/DepartmentExcelListener.java index 589cb50e..b3779fa0 100644 --- a/service-department/src/main/java/ink/wgink/module/department/listener/excel/DepartmentExcelListener.java +++ b/service-department/src/main/java/ink/wgink/service/department/listener/excel/DepartmentExcelListener.java @@ -1,4 +1,4 @@ -package ink.wgink.module.department.listener.excel; +package ink.wgink.service.department.listener.excel; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; diff --git a/service-department/src/main/java/ink/wgink/module/department/pojo/vos/DepartmentVO.java b/service-department/src/main/java/ink/wgink/service/department/pojo/vos/DepartmentVO.java similarity index 99% rename from service-department/src/main/java/ink/wgink/module/department/pojo/vos/DepartmentVO.java rename to service-department/src/main/java/ink/wgink/service/department/pojo/vos/DepartmentVO.java index 53cb8321..6436ee99 100644 --- a/service-department/src/main/java/ink/wgink/module/department/pojo/vos/DepartmentVO.java +++ b/service-department/src/main/java/ink/wgink/service/department/pojo/vos/DepartmentVO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.department.pojo.vos; +package ink.wgink.service.department.pojo.vos; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; diff --git a/service-department/src/main/java/ink/wgink/module/department/pojo/vos/MergeDepartmentInfoVO.java b/service-department/src/main/java/ink/wgink/service/department/pojo/vos/MergeDepartmentInfoVO.java similarity index 96% rename from service-department/src/main/java/ink/wgink/module/department/pojo/vos/MergeDepartmentInfoVO.java rename to service-department/src/main/java/ink/wgink/service/department/pojo/vos/MergeDepartmentInfoVO.java index e795d505..2073252e 100644 --- a/service-department/src/main/java/ink/wgink/module/department/pojo/vos/MergeDepartmentInfoVO.java +++ b/service-department/src/main/java/ink/wgink/service/department/pojo/vos/MergeDepartmentInfoVO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.department.pojo.vos; +package ink.wgink.service.department.pojo.vos; import ink.wgink.annotation.CheckEmptyAnnotation; import io.swagger.annotations.ApiModel; diff --git a/service-department/src/main/java/ink/wgink/module/department/pojo/vos/MergeNewDepartmentInfoVO.java b/service-department/src/main/java/ink/wgink/service/department/pojo/vos/MergeNewDepartmentInfoVO.java similarity index 96% rename from service-department/src/main/java/ink/wgink/module/department/pojo/vos/MergeNewDepartmentInfoVO.java rename to service-department/src/main/java/ink/wgink/service/department/pojo/vos/MergeNewDepartmentInfoVO.java index 8749c002..10d7de67 100644 --- a/service-department/src/main/java/ink/wgink/module/department/pojo/vos/MergeNewDepartmentInfoVO.java +++ b/service-department/src/main/java/ink/wgink/service/department/pojo/vos/MergeNewDepartmentInfoVO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.department.pojo.vos; +package ink.wgink.service.department.pojo.vos; import ink.wgink.annotation.CheckEmptyAnnotation; import io.swagger.annotations.ApiModel; diff --git a/service-department/src/main/java/ink/wgink/module/department/pojo/vos/SplitDepartmentInfoVO.java b/service-department/src/main/java/ink/wgink/service/department/pojo/vos/SplitDepartmentInfoVO.java similarity index 95% rename from service-department/src/main/java/ink/wgink/module/department/pojo/vos/SplitDepartmentInfoVO.java rename to service-department/src/main/java/ink/wgink/service/department/pojo/vos/SplitDepartmentInfoVO.java index 961b95e7..24ace62f 100644 --- a/service-department/src/main/java/ink/wgink/module/department/pojo/vos/SplitDepartmentInfoVO.java +++ b/service-department/src/main/java/ink/wgink/service/department/pojo/vos/SplitDepartmentInfoVO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.department.pojo.vos; +package ink.wgink.service.department.pojo.vos; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/service-department/src/main/java/ink/wgink/module/department/pojo/vos/SplitDepartmentVO.java b/service-department/src/main/java/ink/wgink/service/department/pojo/vos/SplitDepartmentVO.java similarity index 96% rename from service-department/src/main/java/ink/wgink/module/department/pojo/vos/SplitDepartmentVO.java rename to service-department/src/main/java/ink/wgink/service/department/pojo/vos/SplitDepartmentVO.java index f9a818ad..07508aa9 100644 --- a/service-department/src/main/java/ink/wgink/module/department/pojo/vos/SplitDepartmentVO.java +++ b/service-department/src/main/java/ink/wgink/service/department/pojo/vos/SplitDepartmentVO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.department.pojo.vos; +package ink.wgink.service.department.pojo.vos; import ink.wgink.annotation.CheckListAnnotation; import io.swagger.annotations.ApiModel; diff --git a/service-department/src/main/java/ink/wgink/module/department/service/IDepartmentAdjustmentService.java b/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentAdjustmentService.java similarity index 91% rename from service-department/src/main/java/ink/wgink/module/department/service/IDepartmentAdjustmentService.java rename to service-department/src/main/java/ink/wgink/service/department/service/IDepartmentAdjustmentService.java index 36714368..f7cf03a1 100644 --- a/service-department/src/main/java/ink/wgink/module/department/service/IDepartmentAdjustmentService.java +++ b/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentAdjustmentService.java @@ -1,6 +1,6 @@ -package ink.wgink.module.department.service; +package ink.wgink.service.department.service; -import ink.wgink.module.department.enmus.DepartmentAdjustmentTypeEnum; +import ink.wgink.service.department.enmus.DepartmentAdjustmentTypeEnum; import java.util.List; diff --git a/service-department/src/main/java/ink/wgink/module/department/service/IDepartmentService.java b/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentService.java similarity index 94% rename from service-department/src/main/java/ink/wgink/module/department/service/IDepartmentService.java rename to service-department/src/main/java/ink/wgink/service/department/service/IDepartmentService.java index fb0691de..301ab112 100644 --- a/service-department/src/main/java/ink/wgink/module/department/service/IDepartmentService.java +++ b/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentService.java @@ -1,4 +1,4 @@ -package ink.wgink.module.department.service; +package ink.wgink.service.department.service; import ink.wgink.interfaces.department.IDepartmentBaseService; import ink.wgink.pojo.ListPage; @@ -8,10 +8,10 @@ import ink.wgink.pojo.dtos.department.DepartmentDTO; import ink.wgink.pojo.dtos.department.DepartmentSimpleDTO; import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.pojo.result.UploadExcelResultDTO; -import ink.wgink.module.department.pojo.vos.DepartmentVO; -import ink.wgink.module.department.pojo.vos.MergeDepartmentInfoVO; -import ink.wgink.module.department.pojo.vos.MergeNewDepartmentInfoVO; -import ink.wgink.module.department.pojo.vos.SplitDepartmentVO; +import ink.wgink.service.department.pojo.vos.DepartmentVO; +import ink.wgink.service.department.pojo.vos.MergeDepartmentInfoVO; +import ink.wgink.service.department.pojo.vos.MergeNewDepartmentInfoVO; +import ink.wgink.service.department.pojo.vos.SplitDepartmentVO; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; diff --git a/service-department/src/main/java/ink/wgink/module/department/service/IDepartmentUserAdjustmentService.java b/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentUserAdjustmentService.java similarity index 91% rename from service-department/src/main/java/ink/wgink/module/department/service/IDepartmentUserAdjustmentService.java rename to service-department/src/main/java/ink/wgink/service/department/service/IDepartmentUserAdjustmentService.java index 2fe29cea..a0ceb9b1 100644 --- a/service-department/src/main/java/ink/wgink/module/department/service/IDepartmentUserAdjustmentService.java +++ b/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentUserAdjustmentService.java @@ -1,4 +1,4 @@ -package ink.wgink.module.department.service; +package ink.wgink.service.department.service; import java.util.Map; diff --git a/service-department/src/main/java/ink/wgink/module/department/service/IDepartmentUserService.java b/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentUserService.java similarity index 97% rename from service-department/src/main/java/ink/wgink/module/department/service/IDepartmentUserService.java rename to service-department/src/main/java/ink/wgink/service/department/service/IDepartmentUserService.java index d9e0e7cc..381bd0d1 100644 --- a/service-department/src/main/java/ink/wgink/module/department/service/IDepartmentUserService.java +++ b/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentUserService.java @@ -1,4 +1,4 @@ -package ink.wgink.module.department.service; +package ink.wgink.service.department.service; import ink.wgink.interfaces.department.IDepartmentUserBaseService; diff --git a/service-department/src/main/java/ink/wgink/module/department/service/impl/DepartmentAdjustmentServiceImpl.java b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentAdjustmentServiceImpl.java similarity index 86% rename from service-department/src/main/java/ink/wgink/module/department/service/impl/DepartmentAdjustmentServiceImpl.java rename to service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentAdjustmentServiceImpl.java index edd8378e..b56626ae 100644 --- a/service-department/src/main/java/ink/wgink/module/department/service/impl/DepartmentAdjustmentServiceImpl.java +++ b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentAdjustmentServiceImpl.java @@ -1,12 +1,12 @@ -package ink.wgink.module.department.service.impl; +package ink.wgink.service.department.service.impl; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.pojo.dtos.user.UserDTO; -import ink.wgink.module.department.dao.IDepartmentAdjustmentDao; -import ink.wgink.module.department.enmus.DepartmentAdjustmentTypeEnum; -import ink.wgink.module.department.service.IDepartmentAdjustmentService; -import ink.wgink.module.department.service.IDepartmentUserAdjustmentService; -import ink.wgink.module.user.service.IUserService; +import ink.wgink.service.department.dao.IDepartmentAdjustmentDao; +import ink.wgink.service.department.enmus.DepartmentAdjustmentTypeEnum; +import ink.wgink.service.department.service.IDepartmentAdjustmentService; +import ink.wgink.service.department.service.IDepartmentUserAdjustmentService; +import ink.wgink.service.user.service.IUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/service-department/src/main/java/ink/wgink/module/department/service/impl/DepartmentServiceImpl.java b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java similarity index 97% rename from service-department/src/main/java/ink/wgink/module/department/service/impl/DepartmentServiceImpl.java rename to service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java index f81aabd7..010f37a6 100644 --- a/service-department/src/main/java/ink/wgink/module/department/service/impl/DepartmentServiceImpl.java +++ b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java @@ -1,4 +1,4 @@ -package ink.wgink.module.department.service.impl; +package ink.wgink.service.department.service.impl; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSONArray; @@ -9,10 +9,10 @@ import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.module.dictionary.pojo.dtos.AreaDTO; -import ink.wgink.module.dictionary.service.IAreaService; -import ink.wgink.module.file.excel.error.AbstractErrorExcelHandler; -import ink.wgink.module.file.service.IFileService; +import ink.wgink.service.dictionary.pojo.dtos.AreaDTO; +import ink.wgink.service.dictionary.service.IAreaService; +import ink.wgink.service.file.excel.error.AbstractErrorExcelHandler; +import ink.wgink.service.file.service.IFileService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.bos.DepartmentBO; import ink.wgink.pojo.dtos.ZTreeDTO; @@ -20,15 +20,15 @@ import ink.wgink.pojo.dtos.department.DepartmentDTO; import ink.wgink.pojo.dtos.department.DepartmentSimpleDTO; import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.pojo.result.UploadExcelResultDTO; -import ink.wgink.module.department.dao.IDepartmentDao; -import ink.wgink.module.department.enmus.DepartmentAdjustmentTypeEnum; -import ink.wgink.module.department.listener.excel.DepartmentExcel; -import ink.wgink.module.department.listener.excel.DepartmentExcelError; -import ink.wgink.module.department.listener.excel.DepartmentExcelListener; -import ink.wgink.module.department.pojo.vos.*; -import ink.wgink.module.department.service.IDepartmentAdjustmentService; -import ink.wgink.module.department.service.IDepartmentService; -import ink.wgink.module.department.service.IDepartmentUserService; +import ink.wgink.service.department.dao.IDepartmentDao; +import ink.wgink.service.department.enmus.DepartmentAdjustmentTypeEnum; +import ink.wgink.service.department.listener.excel.DepartmentExcel; +import ink.wgink.service.department.listener.excel.DepartmentExcelError; +import ink.wgink.service.department.listener.excel.DepartmentExcelListener; +import ink.wgink.service.department.pojo.vos.*; +import ink.wgink.service.department.service.IDepartmentAdjustmentService; +import ink.wgink.service.department.service.IDepartmentService; +import ink.wgink.service.department.service.IDepartmentUserService; import ink.wgink.util.UUIDUtil; import ink.wgink.util.map.HashMapUtil; import org.apache.commons.lang3.StringUtils; diff --git a/service-department/src/main/java/ink/wgink/module/department/service/impl/DepartmentUserAdjustmentServiceImpl.java b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserAdjustmentServiceImpl.java similarity index 80% rename from service-department/src/main/java/ink/wgink/module/department/service/impl/DepartmentUserAdjustmentServiceImpl.java rename to service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserAdjustmentServiceImpl.java index b0491305..0d912631 100644 --- a/service-department/src/main/java/ink/wgink/module/department/service/impl/DepartmentUserAdjustmentServiceImpl.java +++ b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserAdjustmentServiceImpl.java @@ -1,8 +1,8 @@ -package ink.wgink.module.department.service.impl; +package ink.wgink.service.department.service.impl; import ink.wgink.common.base.DefaultBaseService; -import ink.wgink.module.department.dao.IDepartmentUserAdjustmentDao; -import ink.wgink.module.department.service.IDepartmentUserAdjustmentService; +import ink.wgink.service.department.dao.IDepartmentUserAdjustmentDao; +import ink.wgink.service.department.service.IDepartmentUserAdjustmentService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/service-department/src/main/java/ink/wgink/module/department/service/impl/DepartmentUserServiceImpl.java b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java similarity index 93% rename from service-department/src/main/java/ink/wgink/module/department/service/impl/DepartmentUserServiceImpl.java rename to service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java index 62786e51..5d56a12a 100644 --- a/service-department/src/main/java/ink/wgink/module/department/service/impl/DepartmentUserServiceImpl.java +++ b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java @@ -1,12 +1,12 @@ -package ink.wgink.module.department.service.impl; +package ink.wgink.service.department.service.impl; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.SearchException; import ink.wgink.pojo.dtos.department.DepartmentSimpleDTO; -import ink.wgink.module.department.dao.IDepartmentUserDao; -import ink.wgink.module.department.service.IDepartmentAdjustmentService; -import ink.wgink.module.department.service.IDepartmentService; -import ink.wgink.module.department.service.IDepartmentUserService; +import ink.wgink.service.department.dao.IDepartmentUserDao; +import ink.wgink.service.department.service.IDepartmentAdjustmentService; +import ink.wgink.service.department.service.IDepartmentService; +import ink.wgink.service.department.service.IDepartmentUserService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/service-department/src/main/resources/mybatis/mapper/department-adjustment-mapper.xml b/service-department/src/main/resources/mybatis/mapper/department-adjustment-mapper.xml index 400c465b..b75d40ff 100644 --- a/service-department/src/main/resources/mybatis/mapper/department-adjustment-mapper.xml +++ b/service-department/src/main/resources/mybatis/mapper/department-adjustment-mapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service-department/src/main/resources/mybatis/mapper/department-mapper.xml b/service-department/src/main/resources/mybatis/mapper/department-mapper.xml index 7ae78321..b9bdbb96 100644 --- a/service-department/src/main/resources/mybatis/mapper/department-mapper.xml +++ b/service-department/src/main/resources/mybatis/mapper/department-mapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service-department/src/main/resources/mybatis/mapper/department-user-adjustment-mapper.xml b/service-department/src/main/resources/mybatis/mapper/department-user-adjustment-mapper.xml index ae733f79..42e6f17a 100644 --- a/service-department/src/main/resources/mybatis/mapper/department-user-adjustment-mapper.xml +++ b/service-department/src/main/resources/mybatis/mapper/department-user-adjustment-mapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service-department/src/main/resources/mybatis/mapper/department-user-mapper.xml b/service-department/src/main/resources/mybatis/mapper/department-user-mapper.xml index e89d5c8e..cfe29043 100644 --- a/service-department/src/main/resources/mybatis/mapper/department-user-mapper.xml +++ b/service-department/src/main/resources/mybatis/mapper/department-user-mapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service-menu/src/main/java/ink/wgink/service/controller/api/MenuController.java b/service-menu/src/main/java/ink/wgink/service/menu/controller/api/MenuController.java similarity index 88% rename from service-menu/src/main/java/ink/wgink/service/controller/api/MenuController.java rename to service-menu/src/main/java/ink/wgink/service/menu/controller/api/MenuController.java index 3c4299ce..5407d025 100644 --- a/service-menu/src/main/java/ink/wgink/service/controller/api/MenuController.java +++ b/service-menu/src/main/java/ink/wgink/service/menu/controller/api/MenuController.java @@ -1,4 +1,4 @@ -package ink.wgink.service.controller.api; +package ink.wgink.service.menu.controller.api; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.exceptions.ParamsException; @@ -9,8 +9,8 @@ import ink.wgink.pojo.dtos.menu.MenuDTO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.service.pojo.vos.MenuVO; -import ink.wgink.service.service.IMenuService; +import ink.wgink.service.menu.pojo.vos.MenuVO; +import ink.wgink.service.menu.service.IMenuService; import io.swagger.annotations.*; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -154,11 +154,11 @@ public class MenuController extends DefaultBaseController { @ApiImplicitParam(name = "menuId", value = "菜单ID", paramType = "path") }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("getmenu/{menuId}") - public MenuDTO getMenu(@PathVariable("menuId") String menuId) { + @GetMapping("get/{menuId}") + public MenuDTO get(@PathVariable("menuId") String menuId) { Map params = getParams(); params.put("menuId", menuId); - return menuService.getMenu(params); + return menuService.get(params); } @ApiOperation(value = "菜单列表", notes = "菜单列表接口") @@ -166,11 +166,9 @@ public class MenuController extends DefaultBaseController { @ApiImplicitParam(name = "menuParentId", value = "菜单父ID", paramType = "path") }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("listmenus/{menuParentId}") - public List listMenus(@PathVariable("menuParentId") String menuParentId) { - Map params = requestParams(); - params.put("menuParentId", menuParentId); - return menuService.listMenuAllJson(params); + @GetMapping("listallbyparentid/{menuParentId}") + public List listAllByParentId(@PathVariable("menuParentId") String menuParentId) { + return menuService.listAllByParentId(menuParentId); } @ApiOperation(value = "zTree列表", notes = "zTree列表接口") @@ -178,18 +176,18 @@ public class MenuController extends DefaultBaseController { @ApiImplicitParam(name = "id", value = "父ID", paramType = "query", dataType = "String") }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("listztreemenus") - public List listZTreeMenus() { + @GetMapping("listztree") + public List listZTree() { Map params = requestParams(); String menuParentId = "0"; - if (!StringUtils.isBlank(params.get("id") == null ? null : params.get("id").toString())) { + if (!StringUtils.isBlank(params.get(ISystemConstant.PARAMS_ID) == null ? null : params.get(ISystemConstant.PARAMS_ID).toString())) { menuParentId = params.get("id").toString(); } params.put("menuParentId", menuParentId); - return menuService.listZTreeMenus(params); + return menuService.listZTree(params); } - @ApiOperation(value = "easyui菜单列表", notes = "easyui菜单列表接口") + @ApiOperation(value = "菜单列表", notes = "菜单列表接口") @ApiImplicitParams({ @ApiImplicitParam(name = "parentId", value = "上级ID", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), @@ -199,8 +197,8 @@ public class MenuController extends DefaultBaseController { @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("listpagemenus") - public SuccessResultList> listPageMenus(ListPage page) { + @GetMapping("listpage") + public SuccessResultList> listPage(ListPage page) { Map params = requestParams(); String menuParentId = "0"; if (!StringUtils.isBlank(params.get("parentId") == null ? null : params.get("parentId").toString())) { @@ -208,7 +206,7 @@ public class MenuController extends DefaultBaseController { } params.put("menuParentId", menuParentId); page.setParams(params); - return menuService.listPageMenus(page); + return menuService.listPage(page); } } diff --git a/service-menu/src/main/java/ink/wgink/service/menu/controller/route/MenuRouteController.java b/service-menu/src/main/java/ink/wgink/service/menu/controller/route/MenuRouteController.java new file mode 100644 index 00000000..b634a9fe --- /dev/null +++ b/service-menu/src/main/java/ink/wgink/service/menu/controller/route/MenuRouteController.java @@ -0,0 +1,50 @@ +package ink.wgink.service.menu.controller.route; + +import ink.wgink.interfaces.consts.ISystemConstant; +import io.swagger.annotations.Api; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; + +/** + * When you feel like quitting. Think about why you started + * 当你想要放弃的时候，想想当初你为何开始 + * + * @ClassName: MenuRouteController + * @Description: 菜单路由 + * @Author: wanggeng + * @Date: 2021/2/10 1:43 下午 + * @Version: 1.0 + */ +@Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "菜单路由接口") +@Controller +@RequestMapping(ISystemConstant.ROUTE_PREFIX + "/menu") +public class MenuRouteController { + + @GetMapping("list-tree") + public ModelAndView listTree() { + return new ModelAndView("menu/list-tree"); + } + + @GetMapping("list") + public ModelAndView list() { + return new ModelAndView("menu/list"); + } + + @GetMapping("icon") + public ModelAndView icon() { + return new ModelAndView("menu/icon"); + } + + @GetMapping("save") + public ModelAndView save() { + return new ModelAndView("menu/save"); + } + + @GetMapping("update") + public ModelAndView update() { + return new ModelAndView("menu/update"); + } + +} diff --git a/service-menu/src/main/java/ink/wgink/service/dao/IMenuDao.java b/service-menu/src/main/java/ink/wgink/service/menu/dao/IMenuDao.java similarity index 63% rename from service-menu/src/main/java/ink/wgink/service/dao/IMenuDao.java rename to service-menu/src/main/java/ink/wgink/service/menu/dao/IMenuDao.java index 73f279d9..a6ee6f8b 100644 --- a/service-menu/src/main/java/ink/wgink/service/dao/IMenuDao.java +++ b/service-menu/src/main/java/ink/wgink/service/menu/dao/IMenuDao.java @@ -1,5 +1,6 @@ -package ink.wgink.service.dao; +package ink.wgink.service.menu.dao; +import ink.wgink.exceptions.UpdateException; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.dtos.menu.MenuDTO; import org.springframework.stereotype.Repository; @@ -17,22 +18,36 @@ import java.util.Map; @Repository public interface IMenuDao { + /** + * 建表 + * + * @throws UpdateException + */ + void createTable() throws UpdateException; + /** * 菜单列表 * * @param params * @return */ - List listMenus(Map params); + List list(Map params); /** * 菜单详情 * * @param params * @return - * @throws SearchException */ - MenuDTO getMenu(Map params); + MenuDTO get(Map params); + + /** + * 菜单详情 + * + * @param params + * @return + */ + MenuDTO getSimple(Map params); /** * zTree菜单列表 @@ -40,7 +55,7 @@ public interface IMenuDao { * @param params * @return */ - List listZTreeMenus(Map params); + List listZTree(Map params); /** * 子节点数量 @@ -63,21 +78,21 @@ public interface IMenuDao { * * @param params */ - void saveMenu(Map params); + void save(Map params); /** * 删除菜单 * * @param params */ - void removeMenu(Map params); + void remove(Map params); /** * 修改菜单 * * @param params */ - void updateMenu(Map params); + void update(Map params); /** * 通过用户获取菜单ID @@ -85,5 +100,6 @@ public interface IMenuDao { * @param params * @return */ - List listMenuIdByUser(Map params); + List listIdByUser(Map params); + } diff --git a/service-menu/src/main/java/ink/wgink/service/pojo/vos/MenuVO.java b/service-menu/src/main/java/ink/wgink/service/menu/pojo/vos/MenuVO.java similarity index 99% rename from service-menu/src/main/java/ink/wgink/service/pojo/vos/MenuVO.java rename to service-menu/src/main/java/ink/wgink/service/menu/pojo/vos/MenuVO.java index dbbd5ef3..c1ed2d87 100644 --- a/service-menu/src/main/java/ink/wgink/service/pojo/vos/MenuVO.java +++ b/service-menu/src/main/java/ink/wgink/service/menu/pojo/vos/MenuVO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.pojo.vos; +package ink.wgink.service.menu.pojo.vos; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/service-menu/src/main/java/ink/wgink/service/service/IMenuService.java b/service-menu/src/main/java/ink/wgink/service/menu/service/IMenuService.java similarity index 58% rename from service-menu/src/main/java/ink/wgink/service/service/IMenuService.java rename to service-menu/src/main/java/ink/wgink/service/menu/service/IMenuService.java index 54902cbb..85422359 100644 --- a/service-menu/src/main/java/ink/wgink/service/service/IMenuService.java +++ b/service-menu/src/main/java/ink/wgink/service/menu/service/IMenuService.java @@ -1,5 +1,6 @@ -package ink.wgink.service.service; +package ink.wgink.service.menu.service; +import ink.wgink.interfaces.menu.IMenuBaseService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.dtos.menu.MenuDTO; @@ -17,47 +18,7 @@ import java.util.Map; * @Date: 2018/12/27 10:18 PM * @Version: 1.0 **/ -public interface IMenuService { - - /** - * 菜单列表 - * - * @param params - * @return - */ - List listMenuAllJson(Map params); - - /** - * 菜单列表，递归获取全部内容 - * - * @param params - * @return - */ - List listMenusAll(Map params); - - /** - * 菜单详情 - * - * @param params - * @return - */ - MenuDTO getMenu(Map params); - - /** - * zTree列表 - * - * @param params - * @return - */ - List listZTreeMenus(Map params); - - /** - * easyui菜单列表 - * - * @param page - * @return - */ - SuccessResultList> listPageMenus(ListPage page); +public interface IMenuService extends IMenuBaseService { /** * 保存菜单 @@ -107,11 +68,4 @@ public interface IMenuService { */ // SuccessResultData> listMenuByClientIdAndUserId(String clientId, String userId); - /** - * 通过用户获取菜单 - * - * @param params - * @return - */ - List listMenuIdByUser(Map params); } diff --git a/service-menu/src/main/java/ink/wgink/service/service/impl/MenuServiceImpl.java b/service-menu/src/main/java/ink/wgink/service/menu/service/impl/MenuServiceImpl.java similarity index 71% rename from service-menu/src/main/java/ink/wgink/service/service/impl/MenuServiceImpl.java rename to service-menu/src/main/java/ink/wgink/service/menu/service/impl/MenuServiceImpl.java index 705ea161..064a21c6 100644 --- a/service-menu/src/main/java/ink/wgink/service/service/impl/MenuServiceImpl.java +++ b/service-menu/src/main/java/ink/wgink/service/menu/service/impl/MenuServiceImpl.java @@ -1,25 +1,21 @@ -package ink.wgink.service.service.impl; +package ink.wgink.service.menu.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import ink.wgink.common.base.DefaultBaseService; -import ink.wgink.common.component.SecurityComponent; import ink.wgink.exceptions.SearchException; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.dtos.menu.MenuDTO; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.service.dao.IMenuDao; -import ink.wgink.service.service.IMenuService; +import ink.wgink.service.menu.dao.IMenuDao; +import ink.wgink.service.menu.service.IMenuService; import ink.wgink.util.UUIDUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @ClassName: MenuServiceImpl @@ -43,29 +39,64 @@ public class MenuServiceImpl extends DefaultBaseService implements IMenuService // private IUserService userService; @Override - public List listMenuAllJson(Map params) { - if (!SecurityComponent.USERNAME_ADMIN.equals(securityComponent.getCurrentUsername())) { - LOG.debug("非管理员菜单查询"); - // params.put("menuIds", listUserMenuId()); - } - return listMenusAll(params); + public MenuDTO get(Map params) { + return menuDao.get(params); } @Override - public List listMenusAll(Map params) { - List menuDTOs = new ArrayList<>(menuDao.listMenus(params)); - // listSubMenus(menuDTOs, params); + public List list(Map params) { + List srcMenuDTOs = menuDao.list(params); + List desMenuDTOs = Arrays.asList(new MenuDTO[srcMenuDTOs.size()]); + Collections.copy(desMenuDTOs, srcMenuDTOs); + return srcMenuDTOs; + } + + @Override + public List listByParentId(String menuParentId) { + Map params = getHashMap(2); + params.put("menuParentId", menuParentId); + return list(params); + } + + @Override + public List listByIds(List menuIds) { + Map params = getHashMap(2); + params.put("menuIds", menuIds); + return list(params); + } + + @Override + public List listByParentIdAndIds(String menuParentId, List menuIds) { + Map params = getHashMap(4); + params.put("menuParentId", menuParentId); + params.put("menuIds", menuIds); + return list(params); + } + + @Override + public List listAll(Map params) { + List menuDTOs = list(params); + listSub(menuDTOs); return menuDTOs; } @Override - public MenuDTO getMenu(Map params) { - return menuDao.getMenu(params); + public List listAllByParentId(String menuParentId) { + List menuDTOs = listByParentId(menuParentId); + listSub(menuDTOs); + return menuDTOs; } @Override - public List listZTreeMenus(Map params) { - List zTreeDTOs = menuDao.listZTreeMenus(params); + public List listAllByParentIdAndIds(String menuParentId, List menuIds) { + List menuDTOs = listByParentIdAndIds(menuParentId, menuIds); + listSubByIds(menuDTOs, menuIds); + return menuDTOs; + } + + @Override + public List listZTree(Map params) { + List zTreeDTOs = menuDao.listZTree(params); for (ZTreeDTO zTreeDTO : zTreeDTOs) { Integer subCount = menuDao.countByParentId(zTreeDTO.getId()); setZTreeInfo(zTreeDTO, subCount); @@ -74,9 +105,9 @@ public class MenuServiceImpl extends DefaultBaseService implements IMenuService } @Override - public SuccessResultList> listPageMenus(ListPage page) { + public SuccessResultList> listPage(ListPage page) { PageHelper.startPage(page.getPage(), page.getRows()); - List menuDTOs = new ArrayList<>(menuDao.listMenus(page.getParams())); + List menuDTOs = list(page.getParams()); PageInfo pageInfo = new PageInfo<>(menuDTOs); return new SuccessResultList<>(menuDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); } @@ -87,14 +118,14 @@ public class MenuServiceImpl extends DefaultBaseService implements IMenuService String menuParentId = params.get("menuParentId").toString(); if (!"0".equals(menuParentId)) { params.put("menuId", menuParentId); - MenuDTO menuDTO = menuDao.getMenu(params); + MenuDTO menuDTO = menuDao.get(params); parentCode = menuDTO.getMenuCode(); } String menuCode = getCode(parentCode, menuParentId); params.put("menuCode", menuCode); params.put("menuId", UUIDUtil.getUUID()); setSaveInfo(params); - menuDao.saveMenu(params); + menuDao.save(params); return new SuccessResult(); } @@ -102,7 +133,7 @@ public class MenuServiceImpl extends DefaultBaseService implements IMenuService public SuccessResult removeMenu(Map params) { params.put("menuIds", Arrays.asList(params.get("menuIds").toString().split("_"))); setUpdateInfo(params); - menuDao.removeMenu(params); + menuDao.remove(params); return new SuccessResult(); } @@ -170,13 +201,13 @@ public class MenuServiceImpl extends DefaultBaseService implements IMenuService @Override public List listMenuIdByUser(Map params) { - return menuDao.listMenuIdByUser(params); + return menuDao.listIdByUser(params); } @Override public SuccessResult updateMenu(Map params) { setUpdateInfo(params); - menuDao.updateMenu(params); + menuDao.update(params); return new SuccessResult(); } @@ -227,40 +258,34 @@ public class MenuServiceImpl extends DefaultBaseService implements IMenuService * 递归查询子菜单 * * @param menuDTOs - * @param params */ -// private void listSubMenus(List menuDTOs, Map params) { -// if (!StringUtils.isBlank(params.get("roleId") == null ? null : params.get("roleId").toString())) { -// String type = params.get("type").toString(); -// if (IRoleService.AUTH_TYPE_INSERT.equals(type)) { -// params.put(IRoleService.ROLE_TYPE, IRoleService.ROLE_INSERT); -// } else if (IRoleService.AUTH_TYPE_DELETE.equals(type)) { -// params.put(IRoleService.ROLE_TYPE, IRoleService.ROLE_DELETE); -// } else if (IRoleService.AUTH_TYPE_UPDATE.equals(type)) { -// params.put(IRoleService.ROLE_TYPE, IRoleService.ROLE_UPDATE); -// } else if (IRoleService.AUTH_TYPE_QUERY.equals(type)) { -// params.put(IRoleService.ROLE_TYPE, IRoleService.ROLE_QUERY); -// } else { -// params.put(IRoleService.ROLE_TYPE, IRoleService.ROLE_MENU); -// } -// log.debug("管理员菜单查询"); -// if (StringUtils.equals(SecurityComponent.USERNAME_ADMIN, params.get("roleId").toString())) { -// List roleMenuBOs = listAdminMenu(); -// if (!Objects.isNull(roleMenuBOs) && !roleMenuBOs.isEmpty()) { -// List menuIds = new ArrayList<>(); -// for (RoleMenuBO roleMenuBO : roleMenuBOs) { -// menuIds.add(roleMenuBO.getMenuId()); -// } -// } -// listSubMenus(menuDTOs, params, roleMenuBOs); -// } else { -// List roleMenuBOs = roleDao.listRoleMenuInfo(params); -// listSubMenus(menuDTOs, params, roleMenuBOs); -// } -// } else { -// listSubMenus(menuDTOs, params, null); -// } -// } + private void listSub(List menuDTOs) { + if (menuDTOs.isEmpty()) { + return; + } + for (MenuDTO menuDTO : menuDTOs) { + List subMenuDTOs = listByParentId(menuDTO.getMenuId()); + menuDTO.setSubMenus(subMenuDTOs); + if (!subMenuDTOs.isEmpty()) { + menuDTO.setParent(true); + } + listSub(subMenuDTOs); + } + } + + private void listSubByIds(List menuDTOs, List menuIds) { + if (menuDTOs.isEmpty()) { + return; + } + for (MenuDTO menuDTO : menuDTOs) { + List subMenuDTOs = listByParentIdAndIds(menuDTO.getMenuId(), menuIds); + menuDTO.setSubMenus(subMenuDTOs); + if (!subMenuDTOs.isEmpty()) { + menuDTO.setParent(true); + } + listSubByIds(subMenuDTOs, menuIds); + } + } /** * 子菜单权限 diff --git a/service-menu/src/main/java/ink/wgink/service/menu/startup/ServiceMenuStartUp.java b/service-menu/src/main/java/ink/wgink/service/menu/startup/ServiceMenuStartUp.java new file mode 100644 index 00000000..0c7cffaa --- /dev/null +++ b/service-menu/src/main/java/ink/wgink/service/menu/startup/ServiceMenuStartUp.java @@ -0,0 +1,209 @@ +package ink.wgink.service.menu.startup; + +import ink.wgink.interfaces.menu.IMenuBaseService; +import ink.wgink.interfaces.user.IUserCheckService; +import ink.wgink.pojo.dtos.menu.MenuDTO; +import ink.wgink.service.menu.dao.IMenuDao; +import ink.wgink.util.UUIDUtil; +import ink.wgink.util.date.DateUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.stereotype.Component; + +import java.util.HashMap; +import java.util.Map; + +/** + * When you feel like quitting. Think about why you started + * 当你想要放弃的时候，想想当初你为何开始 + * + * @ClassName: ServiceMenuStartUp + * @Description: 菜单业务启动 + * @Author: wanggeng + * @Date: 2021/2/10 1:12 下午 + * @Version: 1.0 + */ +@Component +public class ServiceMenuStartUp implements ApplicationRunner { + private static final Logger LOG = LoggerFactory.getLogger(ServiceMenuStartUp.class); + @Autowired + private IMenuDao menuDao; + @Autowired(required = false) + private IUserCheckService userCheckService; + + @Override + public void run(ApplicationArguments args) throws Exception { + initTable(); + } + + /** + * 建表 + */ + private void initTable() { + LOG.debug("创建 sys_menu 表"); + menuDao.createTable(); + initMenu(); + } + + private void initMenu() { + Map params = new HashMap<>(20); + String gmt = DateUtil.getTime(); + params.put("gmtCreate", gmt); + params.put("gmtModified", gmt); + params.put("creator", "1"); + params.put("modifier", "1"); + params.put("isDelete", 0); + + params.put("menuCode", "0001"); + MenuDTO menuDTO = menuDao.getSimple(params); + String menuId = IMenuBaseService.MENU_UNIFIED_USER; + if (menuDTO == null) { + params.put("menuId", menuId); + params.put("menuParentId", "0"); + params.put("menuName", "统一用户系统"); + params.put("menuSummary", "统一用户系统"); + params.put("menuUrl", "javascript:void(0);"); + params.put("menuType", "1"); + params.put("menuIcon", "fa-icon-color-white fa fa-cogs"); + params.put("menuOrder", "1"); + params.put("menuStatus", "0"); + params.put("openType", "1"); + menuDao.save(params); + } + initSystemManage(params, menuId); + initUserPermissionManage(params, menuId); + } + + private void initSystemManage(Map params, String menuParentId) { + LOG.debug("初始化菜单：系统管理"); + params.remove("menuId"); + params.put("menuCode", "00010001"); + MenuDTO menuDTO = menuDao.getSimple(params); + String menuId = UUIDUtil.getUUID(); + if (menuDTO == null) { + params.put("menuId", menuId); + params.put("menuParentId", menuParentId); + params.put("menuName", "系统管理"); + params.put("menuSummary", "系统管理"); + params.put("menuUrl", "javascript:void(0);"); + params.put("menuType", "1"); + params.put("menuIcon", "fa-icon-color-white fa fa-cogs"); + params.put("menuOrder", "1"); + params.put("menuStatus", "0"); + params.put("openType", "1"); + menuDao.save(params); + } + initMenuManage(params, menuId); + } + + /** + * 菜单管理 + * + * @param params + * @param menuParentId + */ + private void initMenuManage(Map params, String menuParentId) { + LOG.debug("初始化菜单：菜单管理"); + params.remove("menuId"); + params.put("menuCode", "000100010001"); + MenuDTO menuDTO = menuDao.getSimple(params); + if (menuDTO == null) { + params.put("menuId", UUIDUtil.getUUID()); + params.put("menuParentId", menuParentId); + params.put("menuName", "菜单管理"); + params.put("menuSummary", "菜单管理"); + params.put("menuUrl", "/route/menu/list-tree"); + params.put("menuType", "1"); + params.put("menuIcon", "fa-icon-color-white fa fa-list"); + params.put("menuOrder", "1"); + params.put("menuStatus", "0"); + params.put("openType", "1"); + menuDao.save(params); + } + } + + /** + * 用户权限管理 + * + * @param params + * @param menuParentId + */ + private void initUserPermissionManage(Map params, String menuParentId) { + LOG.debug("初始化菜单：用户与权限"); + params.remove("menuId"); + params.put("menuCode", "00010002"); + MenuDTO menuDTO = menuDao.getSimple(params); + String menuId = UUIDUtil.getUUID(); + if (menuDTO == null) { + params.put("menuId", menuId); + params.put("menuParentId", menuParentId); + params.put("menuName", "用户与权限"); + params.put("menuSummary", "用户与权限"); + params.put("menuUrl", "javascript:void(0);"); + params.put("menuType", "1"); + params.put("menuIcon", "fa-icon-color-white fa fa-users"); + params.put("menuOrder", "2"); + params.put("menuStatus", "0"); + params.put("openType", "1"); + menuDao.save(params); + } + initUserManage(params, menuId); + } + + /** + * 用户管理 + * + * @param params + * @param menuParentId + */ + private void initUserManage(Map params, String menuParentId) { + if (userCheckService == null) { + return; + } + LOG.debug("初始化菜单：用户管理"); + params.remove("menuId"); + params.put("menuCode", "000100020001"); + MenuDTO menuDTO = menuDao.getSimple(params); + String menuId = UUIDUtil.getUUID(); + if (menuDTO == null) { + params.put("menuId", menuId); + params.put("menuParentId", menuParentId); + params.put("menuName", "用户管理"); + params.put("menuSummary", "用户管理"); + params.put("menuUrl", "/route/user/list"); + params.put("menuType", "1"); + params.put("menuIcon", "fa-icon-color-white fa fa-address-book"); + params.put("menuOrder", "1"); + params.put("menuStatus", "0"); + params.put("openType", "1"); + menuDao.save(params); + } + } + + private void initMenuDepartment() { + LOG.debug("初始化菜单：组织机构管理"); + LOG.debug("初始化菜单：用户组管理"); + LOG.debug("初始化菜单：职位管理"); + LOG.debug("初始化菜单：权限管理"); + LOG.debug("初始化菜单：角色管理"); + } + + private void initMenuGroup() { + + } + + private void initMenuPosition() { + + } + + private void initMenuPermission() { + + } + + private void initMenuRole() { + + } +} diff --git a/service-menu/src/main/resources/mybatis/mapper/menu-mapper.xml b/service-menu/src/main/resources/mybatis/mapper/menu-mapper.xml new file mode 100644 index 00000000..da15b3e7 --- /dev/null +++ b/service-menu/src/main/resources/mybatis/mapper/menu-mapper.xml @@ -0,0 +1,333 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CREATE TABLE IF NOT EXISTS `sys_menu` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `menu_id` char(36) NOT NULL, + `menu_parent_id` char(36) DEFAULT '0' COMMENT '父ID', + `menu_name` varchar(255) DEFAULT NULL COMMENT '菜单名称', + `menu_summary` varchar(255) DEFAULT NULL COMMENT '菜单说明', + `menu_code` varchar(255) DEFAULT NULL COMMENT '菜单编码', + `menu_url` varchar(255) DEFAULT 'javascript:void(0);' COMMENT '菜单链接', + `menu_type` int(2) DEFAULT '0' COMMENT '菜单类型', + `menu_icon` varchar(255) DEFAULT 'fa-icon-color-white fa fa-list' COMMENT '菜单图标', + `menu_order` int(11) DEFAULT '0' COMMENT '菜单排序', + `menu_status` int(2) DEFAULT '0' COMMENT '菜单状态', + `open_type` int(2) DEFAULT '1' COMMENT '打开方式：1: 默认，2: 弹窗，3: 页面', + `gmt_create` datetime DEFAULT NULL, + `creator` char(36) DEFAULT NULL, + `gmt_modified` datetime DEFAULT NULL, + `modifier` char(36) DEFAULT NULL, + `is_delete` int(2) DEFAULT '0', + PRIMARY KEY (`id`,`menu_id`) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8; + + + + + INSERT INTO sys_menu ( + menu_id, + menu_parent_id, + menu_name, + menu_summary, + menu_code, + menu_url, + menu_type, + menu_icon, + menu_order, + menu_status, + open_type, + creator, + gmt_create, + modifier, + gmt_modified, + is_delete + ) VALUES ( + #{menuId}, + #{menuParentId}, + #{menuName}, + #{menuSummary}, + #{menuCode}, + #{menuUrl}, + #{menuType}, + #{menuIcon}, + #{menuOrder}, + #{menuStatus}, + #{openType}, + #{creator}, + #{gmtCreate}, + #{modifier}, + #{gmtModified}, + #{isDelete} + ) + + + + + UPDATE + sys_menu + SET + is_delete = 1, + modifier = #{modifier}, + gmt_modified = #{gmtModified} + WHERE + menu_id IN + + #{menuIds[${index}]} + + + + + + UPDATE + sys_menu + SET + + menu_name = #{menuName}, + + + menu_summary = #{menuSummary}, + + + menu_code = #{menuCode}, + + + menu_url = #{menuUrl}, + + + menu_type = #{menuType}, + + + menu_icon = #{menuIcon}, + + + menu_order = #{menuOrder}, + + + menu_status = #{menuStatus}, + + + open_type = #{openType}, + + modifier = #{modifier}, + gmt_modified = #{gmtModified} + WHERE + menu_id = #{menuId} + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/service-menu/src/main/resources/templates/menu/icon.html b/service-menu/src/main/resources/templates/menu/icon.html new file mode 100644 index 00000000..5f9be8c2 --- /dev/null +++ b/service-menu/src/main/resources/templates/menu/icon.html @@ -0,0 +1,1015 @@ + + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+
+
+
+
+ + +
+
+
+
+
+
+ + + + \ No newline at end of file diff --git a/service-menu/src/main/resources/templates/menu/list-tree.html b/service-menu/src/main/resources/templates/menu/list-tree.html new file mode 100644 index 00000000..6b04ee07 --- /dev/null +++ b/service-menu/src/main/resources/templates/menu/list-tree.html @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + +
+
+
+
+
+
+
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/service-menu/src/main/resources/templates/menu/list.html b/service-menu/src/main/resources/templates/menu/list.html new file mode 100644 index 00000000..eac3fc96 --- /dev/null +++ b/service-menu/src/main/resources/templates/menu/list.html @@ -0,0 +1,265 @@ + + + + + + + + + + + + + +
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/service-menu/src/main/resources/templates/menu/save.html b/service-menu/src/main/resources/templates/menu/save.html new file mode 100644 index 00000000..beee18dc --- /dev/null +++ b/service-menu/src/main/resources/templates/menu/save.html @@ -0,0 +1,201 @@ + + + + + + + + + + + + + +
    +
    +
    + + 上级列表/ + 新增内容 + +
    +
    +
    +
    + +
    + + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + + +
    +
    +
    + +
    + + + + + +
    +
    +
    + +
    +
    + +
    + +
    +
    + +
    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    + + + + diff --git a/service-menu/src/main/resources/templates/menu/update.html b/service-menu/src/main/resources/templates/menu/update.html new file mode 100644 index 00000000..d1f3f7d0 --- /dev/null +++ b/service-menu/src/main/resources/templates/menu/update.html @@ -0,0 +1,200 @@ + + + + + + + + + + + + + +
    +
    +
    + + 上级列表/ + 编辑内容 + +
    +
    +
    +
    + +
    + + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + + +
    +
    +
    + +
    + + + + + +
    +
    +
    + +
    +
    + +
    + +
    +
    + +
    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    + + + + diff --git a/service-role/src/main/java/ink/wgink/module/role/controller/api/RoleController.java b/service-role/src/main/java/ink/wgink/service/role/controller/api/RoleController.java similarity index 97% rename from service-role/src/main/java/ink/wgink/module/role/controller/api/RoleController.java rename to service-role/src/main/java/ink/wgink/service/role/controller/api/RoleController.java index 5486f095..e2aa9402 100644 --- a/service-role/src/main/java/ink/wgink/module/role/controller/api/RoleController.java +++ b/service-role/src/main/java/ink/wgink/service/role/controller/api/RoleController.java @@ -1,4 +1,4 @@ -package ink.wgink.module.role.controller.api; +package ink.wgink.service.role.controller.api; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; @@ -6,16 +6,15 @@ import ink.wgink.exceptions.*; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; -import ink.wgink.pojo.dtos.menu.MenuDTO; import ink.wgink.pojo.dtos.role.RoleDTO; import ink.wgink.pojo.dtos.role.RoleDataAuthorityTypeDTO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.module.role.pojo.vos.RoleDataAuthorityVO; -import ink.wgink.module.role.pojo.vos.RoleUserAuthorizationVO; -import ink.wgink.module.role.pojo.vos.RoleVO; -import ink.wgink.module.role.service.IRoleService; +import ink.wgink.service.role.pojo.vos.RoleDataAuthorityVO; +import ink.wgink.service.role.pojo.vos.RoleUserAuthorizationVO; +import ink.wgink.service.role.pojo.vos.RoleVO; +import ink.wgink.service.role.service.IRoleService; import io.swagger.annotations.*; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service-role/src/main/java/ink/wgink/module/role/controller/api/RoleGroupController.java b/service-role/src/main/java/ink/wgink/service/role/controller/api/RoleGroupController.java similarity index 85% rename from service-role/src/main/java/ink/wgink/module/role/controller/api/RoleGroupController.java rename to service-role/src/main/java/ink/wgink/service/role/controller/api/RoleGroupController.java index 09abc80d..32168ced 100644 --- a/service-role/src/main/java/ink/wgink/module/role/controller/api/RoleGroupController.java +++ b/service-role/src/main/java/ink/wgink/service/role/controller/api/RoleGroupController.java @@ -1,17 +1,4 @@ -package ink.wgink.module.role.controller.api; - -import ink.wgink.pojo.ListPage; -import ink.wgink.pojo.result.ErrorResult; -import ink.wgink.pojo.result.SuccessResult; -import ink.wgink.pojo.result.SuccessResultList; -import io.swagger.annotations.*; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; - -import java.util.List; -import java.util.Map; +package ink.wgink.service.role.controller.api; /** * When you feel like quitting. Think about why you started diff --git a/service-role/src/main/java/ink/wgink/module/role/dao/IRoleDao.java b/service-role/src/main/java/ink/wgink/service/role/dao/IRoleDao.java similarity index 98% rename from service-role/src/main/java/ink/wgink/module/role/dao/IRoleDao.java rename to service-role/src/main/java/ink/wgink/service/role/dao/IRoleDao.java index 883ab6e1..12d78baa 100644 --- a/service-role/src/main/java/ink/wgink/module/role/dao/IRoleDao.java +++ b/service-role/src/main/java/ink/wgink/service/role/dao/IRoleDao.java @@ -1,10 +1,10 @@ -package ink.wgink.module.role.dao; +package ink.wgink.service.role.dao; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.UpdateException; -import ink.wgink.module.role.pojo.pos.RolePO; +import ink.wgink.service.role.pojo.pos.RolePO; import ink.wgink.pojo.bos.RoleBO; import ink.wgink.pojo.bos.RoleMenuBO; import ink.wgink.pojo.dtos.ZTreeDTO; diff --git a/service-role/src/main/java/ink/wgink/module/role/dao/IRoleGroupDao.java b/service-role/src/main/java/ink/wgink/service/role/dao/IRoleGroupDao.java similarity index 88% rename from service-role/src/main/java/ink/wgink/module/role/dao/IRoleGroupDao.java rename to service-role/src/main/java/ink/wgink/service/role/dao/IRoleGroupDao.java index 4698cd40..0a181a4b 100644 --- a/service-role/src/main/java/ink/wgink/module/role/dao/IRoleGroupDao.java +++ b/service-role/src/main/java/ink/wgink/service/role/dao/IRoleGroupDao.java @@ -1,11 +1,8 @@ -package ink.wgink.module.role.dao; +package ink.wgink.service.role.dao; import ink.wgink.exceptions.SearchException; import org.springframework.stereotype.Repository; -import java.util.List; -import java.util.Map; - /** * When you feel like quitting. Think about why you started * 当你想要放弃的时候，想想当初你为何开始 diff --git a/service-role/src/main/java/ink/wgink/module/role/dao/IRoleMenuDao.java b/service-role/src/main/java/ink/wgink/service/role/dao/IRoleMenuDao.java similarity index 89% rename from service-role/src/main/java/ink/wgink/module/role/dao/IRoleMenuDao.java rename to service-role/src/main/java/ink/wgink/service/role/dao/IRoleMenuDao.java index 82c7875b..befa2884 100644 --- a/service-role/src/main/java/ink/wgink/module/role/dao/IRoleMenuDao.java +++ b/service-role/src/main/java/ink/wgink/service/role/dao/IRoleMenuDao.java @@ -1,4 +1,4 @@ -package ink.wgink.module.role.dao; +package ink.wgink.service.role.dao; /** * When you feel like quitting. Think about why you started diff --git a/service-role/src/main/java/ink/wgink/module/role/dao/IRolePermissionDao.java b/service-role/src/main/java/ink/wgink/service/role/dao/IRolePermissionDao.java similarity index 97% rename from service-role/src/main/java/ink/wgink/module/role/dao/IRolePermissionDao.java rename to service-role/src/main/java/ink/wgink/service/role/dao/IRolePermissionDao.java index 1308d95c..bec055f3 100644 --- a/service-role/src/main/java/ink/wgink/module/role/dao/IRolePermissionDao.java +++ b/service-role/src/main/java/ink/wgink/service/role/dao/IRolePermissionDao.java @@ -1,4 +1,4 @@ -package ink.wgink.module.role.dao; +package ink.wgink.service.role.dao; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; diff --git a/service-role/src/main/java/ink/wgink/module/role/pojo/pos/RolePO.java b/service-role/src/main/java/ink/wgink/service/role/pojo/pos/RolePO.java similarity index 98% rename from service-role/src/main/java/ink/wgink/module/role/pojo/pos/RolePO.java rename to service-role/src/main/java/ink/wgink/service/role/pojo/pos/RolePO.java index e6253d4e..ed9e6196 100644 --- a/service-role/src/main/java/ink/wgink/module/role/pojo/pos/RolePO.java +++ b/service-role/src/main/java/ink/wgink/service/role/pojo/pos/RolePO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.role.pojo.pos; +package ink.wgink.service.role.pojo.pos; import java.io.Serializable; diff --git a/service-role/src/main/java/ink/wgink/module/role/pojo/vos/RoleDataAuthorityVO.java b/service-role/src/main/java/ink/wgink/service/role/pojo/vos/RoleDataAuthorityVO.java similarity index 97% rename from service-role/src/main/java/ink/wgink/module/role/pojo/vos/RoleDataAuthorityVO.java rename to service-role/src/main/java/ink/wgink/service/role/pojo/vos/RoleDataAuthorityVO.java index 7d29dbb0..66d9a981 100644 --- a/service-role/src/main/java/ink/wgink/module/role/pojo/vos/RoleDataAuthorityVO.java +++ b/service-role/src/main/java/ink/wgink/service/role/pojo/vos/RoleDataAuthorityVO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.role.pojo.vos; +package ink.wgink.service.role.pojo.vos; import ink.wgink.annotation.CheckEmptyAnnotation; import io.swagger.annotations.ApiModel; diff --git a/service-role/src/main/java/ink/wgink/module/role/pojo/vos/RolePermissionVO.java b/service-role/src/main/java/ink/wgink/service/role/pojo/vos/RolePermissionVO.java similarity index 97% rename from service-role/src/main/java/ink/wgink/module/role/pojo/vos/RolePermissionVO.java rename to service-role/src/main/java/ink/wgink/service/role/pojo/vos/RolePermissionVO.java index f110e9e4..134fdfdd 100644 --- a/service-role/src/main/java/ink/wgink/module/role/pojo/vos/RolePermissionVO.java +++ b/service-role/src/main/java/ink/wgink/service/role/pojo/vos/RolePermissionVO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.role.pojo.vos; +package ink.wgink.service.role.pojo.vos; import ink.wgink.annotation.CheckBooleanAnnotation; import ink.wgink.annotation.CheckListAnnotation; diff --git a/service-role/src/main/java/ink/wgink/module/role/pojo/vos/RoleUserAuthorityVO.java b/service-role/src/main/java/ink/wgink/service/role/pojo/vos/RoleUserAuthorityVO.java similarity index 97% rename from service-role/src/main/java/ink/wgink/module/role/pojo/vos/RoleUserAuthorityVO.java rename to service-role/src/main/java/ink/wgink/service/role/pojo/vos/RoleUserAuthorityVO.java index 80b80a6e..dd837baa 100644 --- a/service-role/src/main/java/ink/wgink/module/role/pojo/vos/RoleUserAuthorityVO.java +++ b/service-role/src/main/java/ink/wgink/service/role/pojo/vos/RoleUserAuthorityVO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.role.pojo.vos; +package ink.wgink.service.role.pojo.vos; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/service-role/src/main/java/ink/wgink/module/role/pojo/vos/RoleUserAuthorizationVO.java b/service-role/src/main/java/ink/wgink/service/role/pojo/vos/RoleUserAuthorizationVO.java similarity index 95% rename from service-role/src/main/java/ink/wgink/module/role/pojo/vos/RoleUserAuthorizationVO.java rename to service-role/src/main/java/ink/wgink/service/role/pojo/vos/RoleUserAuthorizationVO.java index 36381e88..d3b56f94 100644 --- a/service-role/src/main/java/ink/wgink/module/role/pojo/vos/RoleUserAuthorizationVO.java +++ b/service-role/src/main/java/ink/wgink/service/role/pojo/vos/RoleUserAuthorizationVO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.role.pojo.vos; +package ink.wgink.service.role.pojo.vos; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/service-role/src/main/java/ink/wgink/module/role/pojo/vos/RoleVO.java b/service-role/src/main/java/ink/wgink/service/role/pojo/vos/RoleVO.java similarity index 97% rename from service-role/src/main/java/ink/wgink/module/role/pojo/vos/RoleVO.java rename to service-role/src/main/java/ink/wgink/service/role/pojo/vos/RoleVO.java index 98bf7ee9..05ce2d0f 100644 --- a/service-role/src/main/java/ink/wgink/module/role/pojo/vos/RoleVO.java +++ b/service-role/src/main/java/ink/wgink/service/role/pojo/vos/RoleVO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.role.pojo.vos; +package ink.wgink.service.role.pojo.vos; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/service-role/src/main/java/ink/wgink/module/role/service/IRoleGroupService.java b/service-role/src/main/java/ink/wgink/service/role/service/IRoleGroupService.java similarity index 78% rename from service-role/src/main/java/ink/wgink/module/role/service/IRoleGroupService.java rename to service-role/src/main/java/ink/wgink/service/role/service/IRoleGroupService.java index fd452710..7b51b44d 100644 --- a/service-role/src/main/java/ink/wgink/module/role/service/IRoleGroupService.java +++ b/service-role/src/main/java/ink/wgink/service/role/service/IRoleGroupService.java @@ -1,10 +1,4 @@ -package ink.wgink.module.role.service; - -import ink.wgink.pojo.ListPage; -import ink.wgink.pojo.result.SuccessResultList; - -import java.util.List; -import java.util.Map; +package ink.wgink.service.role.service; /** * When you feel like quitting. Think about why you started diff --git a/service-role/src/main/java/ink/wgink/module/role/service/IRoleMenuService.java b/service-role/src/main/java/ink/wgink/service/role/service/IRoleMenuService.java similarity index 88% rename from service-role/src/main/java/ink/wgink/module/role/service/IRoleMenuService.java rename to service-role/src/main/java/ink/wgink/service/role/service/IRoleMenuService.java index 4d513d92..d7f91f8b 100644 --- a/service-role/src/main/java/ink/wgink/module/role/service/IRoleMenuService.java +++ b/service-role/src/main/java/ink/wgink/service/role/service/IRoleMenuService.java @@ -1,4 +1,4 @@ -package ink.wgink.module.role.service; +package ink.wgink.service.role.service; /** * When you feel like quitting. Think about why you started diff --git a/service-role/src/main/java/ink/wgink/module/role/service/IRolePermissionService.java b/service-role/src/main/java/ink/wgink/service/role/service/IRolePermissionService.java similarity index 91% rename from service-role/src/main/java/ink/wgink/module/role/service/IRolePermissionService.java rename to service-role/src/main/java/ink/wgink/service/role/service/IRolePermissionService.java index faa36694..0f8266bc 100644 --- a/service-role/src/main/java/ink/wgink/module/role/service/IRolePermissionService.java +++ b/service-role/src/main/java/ink/wgink/service/role/service/IRolePermissionService.java @@ -1,9 +1,9 @@ -package ink.wgink.module.role.service; +package ink.wgink.service.role.service; import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.UpdateException; import ink.wgink.pojo.dtos.role.RolePermissionDTO; -import ink.wgink.module.role.pojo.vos.RolePermissionVO; +import ink.wgink.service.role.pojo.vos.RolePermissionVO; import java.util.List; diff --git a/service-role/src/main/java/ink/wgink/module/role/service/IRoleService.java b/service-role/src/main/java/ink/wgink/service/role/service/IRoleService.java similarity index 98% rename from service-role/src/main/java/ink/wgink/module/role/service/IRoleService.java rename to service-role/src/main/java/ink/wgink/service/role/service/IRoleService.java index 72f199fb..12a841ad 100644 --- a/service-role/src/main/java/ink/wgink/module/role/service/IRoleService.java +++ b/service-role/src/main/java/ink/wgink/service/role/service/IRoleService.java @@ -1,4 +1,4 @@ -package ink.wgink.module.role.service; +package ink.wgink.service.role.service; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; @@ -16,7 +16,7 @@ import ink.wgink.pojo.dtos.role.RoleDataAuthorityDTO; import ink.wgink.pojo.dtos.role.RoleDataAuthorityTypeDTO; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.module.role.pojo.vos.RoleDataAuthorityVO; +import ink.wgink.service.role.pojo.vos.RoleDataAuthorityVO; import java.util.List; import java.util.Map; diff --git a/service-role/src/main/java/ink/wgink/module/role/service/impl/RoleGroupServiceImpl.java b/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleGroupServiceImpl.java similarity index 79% rename from service-role/src/main/java/ink/wgink/module/role/service/impl/RoleGroupServiceImpl.java rename to service-role/src/main/java/ink/wgink/service/role/service/impl/RoleGroupServiceImpl.java index 2327b770..88f51fe2 100644 --- a/service-role/src/main/java/ink/wgink/module/role/service/impl/RoleGroupServiceImpl.java +++ b/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleGroupServiceImpl.java @@ -1,14 +1,7 @@ -package ink.wgink.module.role.service.impl; +package ink.wgink.service.role.service.impl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import ink.wgink.pojo.ListPage; -import ink.wgink.pojo.result.SuccessResultList; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Map; - /** * When you feel like quitting. Think about why you started * 当你想要放弃的时候，想想当初你为何开始 diff --git a/service-role/src/main/java/ink/wgink/module/role/service/impl/RoleMenuServiceImpl.java b/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleMenuServiceImpl.java similarity index 82% rename from service-role/src/main/java/ink/wgink/module/role/service/impl/RoleMenuServiceImpl.java rename to service-role/src/main/java/ink/wgink/service/role/service/impl/RoleMenuServiceImpl.java index c94688aa..bfb62c01 100644 --- a/service-role/src/main/java/ink/wgink/module/role/service/impl/RoleMenuServiceImpl.java +++ b/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleMenuServiceImpl.java @@ -1,7 +1,7 @@ -package ink.wgink.module.role.service.impl; +package ink.wgink.service.role.service.impl; import ink.wgink.common.base.DefaultBaseService; -import ink.wgink.module.role.service.IRoleMenuService; +import ink.wgink.service.role.service.IRoleMenuService; import org.springframework.stereotype.Service; /** diff --git a/service-role/src/main/java/ink/wgink/module/role/service/impl/RolePermissionServiceImpl.java b/service-role/src/main/java/ink/wgink/service/role/service/impl/RolePermissionServiceImpl.java similarity index 94% rename from service-role/src/main/java/ink/wgink/module/role/service/impl/RolePermissionServiceImpl.java rename to service-role/src/main/java/ink/wgink/service/role/service/impl/RolePermissionServiceImpl.java index a4a9b3f5..8bbc0dbf 100644 --- a/service-role/src/main/java/ink/wgink/module/role/service/impl/RolePermissionServiceImpl.java +++ b/service-role/src/main/java/ink/wgink/service/role/service/impl/RolePermissionServiceImpl.java @@ -1,12 +1,12 @@ -package ink.wgink.module.role.service.impl; +package ink.wgink.service.role.service.impl; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.pojo.dtos.permission.PermissionDTO; import ink.wgink.pojo.dtos.role.RolePermissionDTO; -import ink.wgink.module.permission.service.IPermissionService; -import ink.wgink.module.role.dao.IRolePermissionDao; -import ink.wgink.module.role.pojo.vos.RolePermissionVO; -import ink.wgink.module.role.service.IRolePermissionService; +import ink.wgink.service.permission.service.IPermissionService; +import ink.wgink.service.role.dao.IRolePermissionDao; +import ink.wgink.service.role.pojo.vos.RolePermissionVO; +import ink.wgink.service.role.service.IRolePermissionService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/service-role/src/main/java/ink/wgink/module/role/service/impl/RoleServiceImpl.java b/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleServiceImpl.java similarity index 97% rename from service-role/src/main/java/ink/wgink/module/role/service/impl/RoleServiceImpl.java rename to service-role/src/main/java/ink/wgink/service/role/service/impl/RoleServiceImpl.java index dcd21f1b..8fac611e 100644 --- a/service-role/src/main/java/ink/wgink/module/role/service/impl/RoleServiceImpl.java +++ b/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleServiceImpl.java @@ -1,4 +1,4 @@ -package ink.wgink.module.role.service.impl; +package ink.wgink.service.role.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -17,15 +17,15 @@ import ink.wgink.pojo.dtos.role.RoleDataAuthorityTypeDTO; import ink.wgink.pojo.dtos.role.RolePermissionDTO; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.module.department.service.IDepartmentUserService; -import ink.wgink.module.permission.enums.PermissionTypeEnum; -import ink.wgink.module.permission.service.IPermissionService; -import ink.wgink.module.role.dao.IRoleDao; -import ink.wgink.module.role.pojo.vos.RoleDataAuthorityVO; -import ink.wgink.module.role.pojo.vos.RoleUserAuthorityVO; -import ink.wgink.module.role.service.IRolePermissionService; -import ink.wgink.module.role.service.IRoleService; -import ink.wgink.module.user.service.IUserService; +import ink.wgink.service.department.service.IDepartmentUserService; +import ink.wgink.service.permission.enums.PermissionTypeEnum; +import ink.wgink.service.permission.service.IPermissionService; +import ink.wgink.service.role.dao.IRoleDao; +import ink.wgink.service.role.pojo.vos.RoleDataAuthorityVO; +import ink.wgink.service.role.pojo.vos.RoleUserAuthorityVO; +import ink.wgink.service.role.service.IRolePermissionService; +import ink.wgink.service.role.service.IRoleService; +import ink.wgink.service.user.service.IUserService; import ink.wgink.util.UUIDUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service-role/src/main/resources/mybatis/mapper/role-permission-mapper.xml b/service-role/src/main/resources/mybatis/mapper/role-permission-mapper.xml index eda0bced..84a1fded 100644 --- a/service-role/src/main/resources/mybatis/mapper/role-permission-mapper.xml +++ b/service-role/src/main/resources/mybatis/mapper/role-permission-mapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service-user/src/main/java/ink/wgink/module/user/controller/api/UserController.java b/service-user/src/main/java/ink/wgink/service/user/controller/api/UserController.java similarity index 96% rename from service-user/src/main/java/ink/wgink/module/user/controller/api/UserController.java rename to service-user/src/main/java/ink/wgink/service/user/controller/api/UserController.java index a8027ff5..f6f1745d 100644 --- a/service-user/src/main/java/ink/wgink/module/user/controller/api/UserController.java +++ b/service-user/src/main/java/ink/wgink/service/user/controller/api/UserController.java @@ -1,19 +1,19 @@ -package ink.wgink.module.user.controller.api; +package ink.wgink.service.user.controller.api; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.exceptions.ParamsException; import ink.wgink.interfaces.consts.IFileConstant; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.module.user.pojo.vos.RestPasswordVO; -import ink.wgink.module.user.pojo.vos.UpdateUsernameVO; +import ink.wgink.service.user.pojo.vos.RestPasswordVO; +import ink.wgink.service.user.pojo.vos.UpdateUsernameVO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.user.UserDTO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.module.user.pojo.vos.UserVO; -import ink.wgink.module.user.service.IUserService; +import ink.wgink.service.user.pojo.vos.UserVO; +import ink.wgink.service.user.service.IUserService; import ink.wgink.pojo.result.UploadExcelResultDTO; import ink.wgink.util.RegexUtil; import io.swagger.annotations.*; diff --git a/service-user/src/main/java/ink/wgink/module/user/controller/route/UserRouteController.java b/service-user/src/main/java/ink/wgink/service/user/controller/route/UserRouteController.java similarity index 97% rename from service-user/src/main/java/ink/wgink/module/user/controller/route/UserRouteController.java rename to service-user/src/main/java/ink/wgink/service/user/controller/route/UserRouteController.java index 4eac1351..922105bf 100644 --- a/service-user/src/main/java/ink/wgink/module/user/controller/route/UserRouteController.java +++ b/service-user/src/main/java/ink/wgink/service/user/controller/route/UserRouteController.java @@ -1,4 +1,4 @@ -package ink.wgink.module.user.controller.route; +package ink.wgink.service.user.controller.route; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.util.ResourceUtil; diff --git a/service-user/src/main/java/ink/wgink/module/user/dao/IUserDao.java b/service-user/src/main/java/ink/wgink/service/user/dao/IUserDao.java similarity index 96% rename from service-user/src/main/java/ink/wgink/module/user/dao/IUserDao.java rename to service-user/src/main/java/ink/wgink/service/user/dao/IUserDao.java index a255011f..c851d780 100644 --- a/service-user/src/main/java/ink/wgink/module/user/dao/IUserDao.java +++ b/service-user/src/main/java/ink/wgink/service/user/dao/IUserDao.java @@ -1,11 +1,11 @@ -package ink.wgink.module.user.dao; +package ink.wgink.service.user.dao; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.UpdateException; import ink.wgink.pojo.dtos.user.UserDTO; -import ink.wgink.module.user.pojo.pos.UserPO; +import ink.wgink.service.user.pojo.pos.UserPO; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/service-user/src/main/java/ink/wgink/module/user/excel/UserExcel.java b/service-user/src/main/java/ink/wgink/service/user/excel/UserExcel.java similarity index 98% rename from service-user/src/main/java/ink/wgink/module/user/excel/UserExcel.java rename to service-user/src/main/java/ink/wgink/service/user/excel/UserExcel.java index 6b805ce1..b2619b19 100644 --- a/service-user/src/main/java/ink/wgink/module/user/excel/UserExcel.java +++ b/service-user/src/main/java/ink/wgink/service/user/excel/UserExcel.java @@ -1,4 +1,4 @@ -package ink.wgink.module.user.excel; +package ink.wgink.service.user.excel; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/service-user/src/main/java/ink/wgink/module/user/excel/UserExcelError.java b/service-user/src/main/java/ink/wgink/service/user/excel/UserExcelError.java similarity index 98% rename from service-user/src/main/java/ink/wgink/module/user/excel/UserExcelError.java rename to service-user/src/main/java/ink/wgink/service/user/excel/UserExcelError.java index 33848bd4..a8c9c42b 100644 --- a/service-user/src/main/java/ink/wgink/module/user/excel/UserExcelError.java +++ b/service-user/src/main/java/ink/wgink/service/user/excel/UserExcelError.java @@ -1,4 +1,4 @@ -package ink.wgink.module.user.excel; +package ink.wgink.service.user.excel; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/service-user/src/main/java/ink/wgink/module/user/excel/UserExcelListener.java b/service-user/src/main/java/ink/wgink/service/user/excel/UserExcelListener.java similarity index 97% rename from service-user/src/main/java/ink/wgink/module/user/excel/UserExcelListener.java rename to service-user/src/main/java/ink/wgink/service/user/excel/UserExcelListener.java index baeaaaa2..63529f81 100644 --- a/service-user/src/main/java/ink/wgink/module/user/excel/UserExcelListener.java +++ b/service-user/src/main/java/ink/wgink/service/user/excel/UserExcelListener.java @@ -1,4 +1,4 @@ -package ink.wgink.module.user.excel; +package ink.wgink.service.user.excel; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; diff --git a/service-user/src/main/java/ink/wgink/module/user/pojo/pos/UserPO.java b/service-user/src/main/java/ink/wgink/service/user/pojo/pos/UserPO.java similarity index 99% rename from service-user/src/main/java/ink/wgink/module/user/pojo/pos/UserPO.java rename to service-user/src/main/java/ink/wgink/service/user/pojo/pos/UserPO.java index e020df9f..c1d90a11 100644 --- a/service-user/src/main/java/ink/wgink/module/user/pojo/pos/UserPO.java +++ b/service-user/src/main/java/ink/wgink/service/user/pojo/pos/UserPO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.user.pojo.pos; +package ink.wgink.service.user.pojo.pos; import io.swagger.annotations.ApiModel; diff --git a/service-user/src/main/java/ink/wgink/module/user/pojo/vos/RestPasswordVO.java b/service-user/src/main/java/ink/wgink/service/user/pojo/vos/RestPasswordVO.java similarity index 96% rename from service-user/src/main/java/ink/wgink/module/user/pojo/vos/RestPasswordVO.java rename to service-user/src/main/java/ink/wgink/service/user/pojo/vos/RestPasswordVO.java index de47a922..da25fa93 100644 --- a/service-user/src/main/java/ink/wgink/module/user/pojo/vos/RestPasswordVO.java +++ b/service-user/src/main/java/ink/wgink/service/user/pojo/vos/RestPasswordVO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.user.pojo.vos; +package ink.wgink.service.user.pojo.vos; import ink.wgink.annotation.CheckEmptyAnnotation; import io.swagger.annotations.ApiModel; diff --git a/service-user/src/main/java/ink/wgink/module/user/pojo/vos/UpdateUsernameVO.java b/service-user/src/main/java/ink/wgink/service/user/pojo/vos/UpdateUsernameVO.java similarity index 97% rename from service-user/src/main/java/ink/wgink/module/user/pojo/vos/UpdateUsernameVO.java rename to service-user/src/main/java/ink/wgink/service/user/pojo/vos/UpdateUsernameVO.java index c57371fb..838a3786 100644 --- a/service-user/src/main/java/ink/wgink/module/user/pojo/vos/UpdateUsernameVO.java +++ b/service-user/src/main/java/ink/wgink/service/user/pojo/vos/UpdateUsernameVO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.user.pojo.vos; +package ink.wgink.service.user.pojo.vos; import ink.wgink.annotation.CheckEmptyAnnotation; import io.swagger.annotations.ApiModel; diff --git a/service-user/src/main/java/ink/wgink/module/user/pojo/vos/UserVO.java b/service-user/src/main/java/ink/wgink/service/user/pojo/vos/UserVO.java similarity index 98% rename from service-user/src/main/java/ink/wgink/module/user/pojo/vos/UserVO.java rename to service-user/src/main/java/ink/wgink/service/user/pojo/vos/UserVO.java index 8785e9a2..90b0703d 100644 --- a/service-user/src/main/java/ink/wgink/module/user/pojo/vos/UserVO.java +++ b/service-user/src/main/java/ink/wgink/service/user/pojo/vos/UserVO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.user.pojo.vos; +package ink.wgink.service.user.pojo.vos; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; diff --git a/service-user/src/main/java/ink/wgink/module/user/service/IUserService.java b/service-user/src/main/java/ink/wgink/service/user/service/IUserService.java similarity index 82% rename from service-user/src/main/java/ink/wgink/module/user/service/IUserService.java rename to service-user/src/main/java/ink/wgink/service/user/service/IUserService.java index 1ddd9817..dd66b17f 100644 --- a/service-user/src/main/java/ink/wgink/module/user/service/IUserService.java +++ b/service-user/src/main/java/ink/wgink/service/user/service/IUserService.java @@ -1,16 +1,15 @@ -package ink.wgink.module.user.service; +package ink.wgink.service.user.service; import ink.wgink.interfaces.user.IUserBaseService; -import ink.wgink.module.user.pojo.vos.RestPasswordVO; -import ink.wgink.module.user.pojo.vos.UpdateUsernameVO; -import ink.wgink.pojo.dtos.user.UserDTO; -import ink.wgink.module.user.pojo.vos.UserVO; +import ink.wgink.interfaces.user.IUserCheckService; +import ink.wgink.service.user.pojo.vos.RestPasswordVO; +import ink.wgink.service.user.pojo.vos.UpdateUsernameVO; +import ink.wgink.service.user.pojo.vos.UserVO; import ink.wgink.pojo.result.UploadExcelResultDTO; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; import java.util.List; -import java.util.Map; /** * When you feel like quitting. Think about why you started @@ -22,7 +21,7 @@ import java.util.Map; * @Date: 2021/1/25 3:06 下午 * @Version: 1.0 */ -public interface IUserService extends IUserBaseService { +public interface IUserService extends IUserBaseService, IUserCheckService { /** * 保存用户 diff --git a/service-user/src/main/java/ink/wgink/module/user/service/impl/UserServiceImpl.java b/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java similarity index 93% rename from service-user/src/main/java/ink/wgink/module/user/service/impl/UserServiceImpl.java rename to service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java index fbe4e08f..9c571dfc 100644 --- a/service-user/src/main/java/ink/wgink/module/user/service/impl/UserServiceImpl.java +++ b/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java @@ -1,20 +1,20 @@ -package ink.wgink.module.user.service.impl; +package ink.wgink.service.user.service.impl; import com.alibaba.excel.EasyExcel; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.SearchException; -import ink.wgink.module.file.excel.error.AbstractErrorExcelHandler; -import ink.wgink.module.file.service.IFileService; -import ink.wgink.module.user.dao.IUserDao; -import ink.wgink.module.user.excel.UserExcel; -import ink.wgink.module.user.excel.UserExcelError; -import ink.wgink.module.user.excel.UserExcelListener; -import ink.wgink.module.user.pojo.vos.RestPasswordVO; -import ink.wgink.module.user.pojo.vos.UpdateUsernameVO; -import ink.wgink.module.user.pojo.vos.UserVO; -import ink.wgink.module.user.service.IUserService; +import ink.wgink.service.file.excel.error.AbstractErrorExcelHandler; +import ink.wgink.service.file.service.IFileService; +import ink.wgink.service.user.dao.IUserDao; +import ink.wgink.service.user.excel.UserExcel; +import ink.wgink.service.user.excel.UserExcelError; +import ink.wgink.service.user.excel.UserExcelListener; +import ink.wgink.service.user.pojo.vos.RestPasswordVO; +import ink.wgink.service.user.pojo.vos.UpdateUsernameVO; +import ink.wgink.service.user.pojo.vos.UserVO; +import ink.wgink.service.user.service.IUserService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.user.UserDTO; import ink.wgink.pojo.result.SuccessResultList; diff --git a/service-user/src/main/java/ink/wgink/module/user/startup/ServiceUserStartUp.java b/service-user/src/main/java/ink/wgink/service/user/startup/ServiceUserStartUp.java similarity index 93% rename from service-user/src/main/java/ink/wgink/module/user/startup/ServiceUserStartUp.java rename to service-user/src/main/java/ink/wgink/service/user/startup/ServiceUserStartUp.java index b7a5da2a..10fd4497 100644 --- a/service-user/src/main/java/ink/wgink/module/user/startup/ServiceUserStartUp.java +++ b/service-user/src/main/java/ink/wgink/service/user/startup/ServiceUserStartUp.java @@ -1,6 +1,7 @@ -package ink.wgink.module.user.startup; +package ink.wgink.service.user.startup; -import ink.wgink.module.user.dao.IUserDao; +import ink.wgink.interfaces.user.IUserCheckService; +import ink.wgink.service.user.dao.IUserDao; import ink.wgink.pojo.dtos.user.UserDTO; import ink.wgink.util.date.DateUtil; import org.slf4j.Logger; diff --git a/service-user/src/main/resources/mybatis/mapper/user-mapper.xml b/service-user/src/main/resources/mybatis/mapper/user-mapper.xml index f6fb6f54..3a3eb8cc 100644 --- a/service-user/src/main/resources/mybatis/mapper/user-mapper.xml +++ b/service-user/src/main/resources/mybatis/mapper/user-mapper.xml @@ -1,9 +1,9 @@ - + - +