diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/base/AjaxResult.java b/ruoyi-common/src/main/java/com/ruoyi/common/base/AjaxResult.java index 1a010ef09..7261f02c3 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/base/AjaxResult.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/base/AjaxResult.java @@ -82,6 +82,19 @@ public class AjaxResult extends HashMap json.put("data", object); return json; } + /** + * 返回成功消息 + * + * @return 成功消息 + */ + public static AjaxResult success(Object object,String msg) + { + AjaxResult json = new AjaxResult(); + json.put("msg", msg); + json.put("code", Constants.SUCCESS); + json.put("data", object); + return json; + } /** * 返回成功消息 * diff --git a/ruoyi-weixin/pom.xml b/ruoyi-weixin/pom.xml index 71adaae93..41a122198 100644 --- a/ruoyi-weixin/pom.xml +++ b/ruoyi-weixin/pom.xml @@ -25,7 +25,12 @@ weixin-java-cp ${weixin-java-cp.version} - + + + com.ruoyi + ruoyi-framework + ${ruoyi.version} + org.projectlombok lombok diff --git a/ruoyi-weixin/src/main/java/com/ruoyi/wx/cp/WxCpDemoApplication.java b/ruoyi-weixin/src/main/java/com/ruoyi/wx/cp/WxCpDemoApplication.java deleted file mode 100644 index 2d895e3b6..000000000 --- a/ruoyi-weixin/src/main/java/com/ruoyi/wx/cp/WxCpDemoApplication.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.ruoyi.wx.cp; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author Binary Wang(https://github.com/binarywang) - */ -@SpringBootApplication -public class WxCpDemoApplication { - - public static void main(String[] args) { - SpringApplication.run(WxCpDemoApplication.class, args); - } -} 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 3b54e2261..d84bc3c94 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 @@ -1,5 +1,8 @@ package com.ruoyi.wx.cp.controller; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.base.AjaxResult; +import com.ruoyi.common.enums.BusinessType; import com.ruoyi.wx.cp.config.WxCpConfiguration; import com.ruoyi.wx.cp.config.WxCpProperties; import com.ruoyi.wx.cp.utils.JsonUtils; @@ -32,41 +35,42 @@ public class WxUserGroupController { private WxCpProperties properties; + @Log(title = "上传文件", businessType = BusinessType.INSERT) @GetMapping("/departAllList") - public List departAllList() { + public AjaxResult departAllList() { this.logger.info("\n获取组织机构"); try { final WxCpService wxCpService = WxCpConfiguration.getCpService(999999); WxCpDepartmentService departmentService = wxCpService.getDepartmentService(); List list = departmentService.list(null); - return list; + return AjaxResult.success(list,"获取组织机构成功"); } catch (Exception e) { this.logger.info("\n获取组织机构出错" + e.getMessage()); + return AjaxResult.error("获取组织机构出错"); } - return null; } @GetMapping("/insert") - public Object insert(WxCpDepart wxCpDepart) { - this.logger.info("\n获取组织机构"); + public AjaxResult insert(WxCpDepart wxCpDepart) { + this.logger.info("新增组织机构"); try { WxCpDepartmentService departmentService = WxCpConfiguration.getCpService(999999).getDepartmentService(); - Integer integer = departmentService.create(wxCpDepart); - return integer; + Integer id = departmentService.create(wxCpDepart); + return AjaxResult.success(id,"新增组织机构成功"); } catch (Exception e) { - this.logger.info("\n获取组织机构出错" + e.getMessage()); + this.logger.info("\n新增组织机构" + e.getMessage()); + return AjaxResult.error("新增组织机构出错"); } - return null; } @GetMapping("/update") - public List update() { + public AjaxResult update(WxCpDepart wxCpDepart) { this.logger.info("\n获取组织机构"); try { - final WxCpService wxCpService = WxCpConfiguration.getCpService(999999); - WxCpDepartmentService departmentService = wxCpService.getDepartmentService(); - List list = departmentService.list(null); - return list; + WxCpDepartmentService departmentService = WxCpConfiguration.getCpService(999999).getDepartmentService(); + + departmentService.update(wxCpDepart); + return AjaxResult.success("更新组织机构成功"); } catch (Exception e) { this.logger.info("\n获取组织机构出错" + e.getMessage()); } @@ -74,15 +78,14 @@ public class WxUserGroupController { } @GetMapping("/delete") - public List delete() { + public AjaxResult delete(Long id) { this.logger.info("\n获取组织机构"); try { - final WxCpService wxCpService = WxCpConfiguration.getCpService(999999); - WxCpDepartmentService departmentService = wxCpService.getDepartmentService(); - List list = departmentService.list(null); - return list; + WxCpDepartmentService departmentService = WxCpConfiguration.getCpService(999999).getDepartmentService(); + departmentService.delete(id); + return AjaxResult.success("删除组织机构成功"); } catch (Exception e) { - this.logger.info("\n获取组织机构出错" + e.getMessage()); + this.logger.info("\n删除组织机构出错" + e.getMessage()); } return null; }