diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 9b3827ed7..bacd01613 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -68,6 +68,12 @@ ruoyi-cms ${ruoyi.version} + + + com.ruoyi + ruoyi-weixin + ${ruoyi.version} + diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 2daab407e..6eae7b860 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -56,7 +56,7 @@ spring: date-format: yyyy-MM-dd HH:mm:ss profiles: - active: druid + active: druid,weixin # 文件上传 servlet: multipart: diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java index 71faa9c5c..3022759ef 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java @@ -249,6 +249,7 @@ public class ShiroConfig filterChainDefinitionMap.put("/api/**", "anon"); //前端网站展示 filterChainDefinitionMap.put("/web/**", "anon"); + filterChainDefinitionMap.put("/weixin/**", "anon"); filterChainDefinitionMap.put("/profile/**", "anon"); filterChainDefinitionMap.put("/captcha/captchaImage**", "anon"); // 退出 logout地址,shiro去清除session diff --git a/ruoyi-weixin/src/main/java/com/ruoyi/wx/cp/controller/WxUserGroupController.java b/ruoyi-weixin/src/main/java/com/ruoyi/wx/cp/controller/WxUserGroupController.java index d84bc3c94..c3f3bbd95 100644 --- a/ruoyi-weixin/src/main/java/com/ruoyi/wx/cp/controller/WxUserGroupController.java +++ b/ruoyi-weixin/src/main/java/com/ruoyi/wx/cp/controller/WxUserGroupController.java @@ -35,7 +35,7 @@ public class WxUserGroupController { private WxCpProperties properties; - @Log(title = "上传文件", businessType = BusinessType.INSERT) + @Log(title = "获取组织机构列表", businessType = BusinessType.INSERT) @GetMapping("/departAllList") public AjaxResult departAllList() { this.logger.info("\n获取组织机构"); @@ -50,6 +50,7 @@ public class WxUserGroupController { } } + @Log(title = "新增组织机构", businessType = BusinessType.INSERT) @GetMapping("/insert") public AjaxResult insert(WxCpDepart wxCpDepart) { this.logger.info("新增组织机构"); @@ -62,32 +63,46 @@ public class WxUserGroupController { return AjaxResult.error("新增组织机构出错"); } } - + @Log(title = "全量新增组织机构", businessType = BusinessType.INSERT) + @GetMapping("/insertList") + public AjaxResult insertList(List wxCpDeparts) { + this.logger.info("全量新增组织机构"); + try { + WxCpDepartmentService departmentService = WxCpConfiguration.getCpService(999999).getDepartmentService(); + for (WxCpDepart wxCpDepart : wxCpDeparts) { + Integer id = departmentService.create(wxCpDepart); + } + return AjaxResult.success(wxCpDeparts.size(),"全量新增组织机构"); + } catch (Exception e) { + this.logger.info("\n全量新增组织机构" + e.getMessage()); + return AjaxResult.error("全量新增组织机构"); + } + } + @Log(title = "获取组织机构", businessType = BusinessType.INSERT) @GetMapping("/update") public AjaxResult update(WxCpDepart wxCpDepart) { - this.logger.info("\n获取组织机构"); try { WxCpDepartmentService departmentService = WxCpConfiguration.getCpService(999999).getDepartmentService(); departmentService.update(wxCpDepart); return AjaxResult.success("更新组织机构成功"); } catch (Exception e) { - this.logger.info("\n获取组织机构出错" + e.getMessage()); + this.logger.info("\n更新组织机构成功" + e.getMessage()); + return AjaxResult.error("更新组织机构成功"); } - return null; } + @Log(title = "删除组织机构", businessType = BusinessType.INSERT) @GetMapping("/delete") public AjaxResult delete(Long id) { - this.logger.info("\n获取组织机构"); try { WxCpDepartmentService departmentService = WxCpConfiguration.getCpService(999999).getDepartmentService(); departmentService.delete(id); return AjaxResult.success("删除组织机构成功"); } catch (Exception e) { this.logger.info("\n删除组织机构出错" + e.getMessage()); + return AjaxResult.error("删除组织机构出错"); } - return null; } }