修改请求和响应

platform-admin/src/main/java/com/platform/controller/SysConfigController.java

@@ -1,11 +1,12 @@
 package com.platform.controller;
 
 import com.platform.annotation.SysLog;
+import com.platform.entity.Result;
 import com.platform.entity.SysConfigEntity;
 import com.platform.service.SysConfigService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 import com.platform.validator.ValidatorUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +37,7 @@ public class SysConfigController extends AbstractController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("sys:config:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
         List<SysConfigEntity> configList = sysConfigService.queryList(query);
@@ -44,7 +45,7 @@ public class SysConfigController extends AbstractController {
 
         PageUtils pageUtil = new PageUtils(configList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success(pageUtil);
     }
 
 
@@ -54,12 +55,12 @@ public class SysConfigController extends AbstractController {
      * @param id 主键
      * @return R
      */
-    @RequestMapping("/info/{id}")
+    @RequestMapping("/info")
     @RequiresPermissions("sys:config:info")
-    public R info(@PathVariable("id") Long id) {
+    public Result info(@RequestParam("id") Long id) {
         SysConfigEntity config = sysConfigService.queryObject(id);
 
-        return R.ok().put("config", config);
+        return Result.success( config);
     }
 
     /**
@@ -71,12 +72,12 @@ public class SysConfigController extends AbstractController {
     @SysLog("新增配置")
     @RequestMapping("/save")
     @RequiresPermissions("sys:config:save")
-    public R save(@RequestBody SysConfigEntity config) {
+    public Result save(@RequestBody SysConfigEntity config) {
         ValidatorUtils.validateEntity(config);
 
         sysConfigService.save(config);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -88,12 +89,12 @@ public class SysConfigController extends AbstractController {
     @SysLog("修改配置")
     @RequestMapping("/update")
     @RequiresPermissions("sys:config:update")
-    public R update(@RequestBody SysConfigEntity config) {
+    public Result update(@RequestBody SysConfigEntity config) {
         ValidatorUtils.validateEntity(config);
 
         sysConfigService.update(config);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -105,10 +106,10 @@ public class SysConfigController extends AbstractController {
     @SysLog("删除配置")
     @RequestMapping("/delete")
     @RequiresPermissions("sys:config:delete")
-    public R delete(@RequestBody Long[] ids) {
+    public Result delete(@RequestBody Long[] ids) {
         sysConfigService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
 }

platform-admin/src/main/java/com/platform/controller/SysDeptController.java

@@ -2,6 +2,7 @@ package com.platform.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.platform.annotation.SysLog;
+import com.platform.entity.Result;
 import com.platform.entity.SysDeptEntity;
 import com.platform.entity.SysUserEntity;
 import com.platform.service.SysDeptService;
@@ -50,17 +51,17 @@ public class SysDeptController extends AbstractController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "deptId", value = "部门ID", dataType = "long"),
     })
-    public R userBindList(@RequestParam(name = "deptId") long deptId) {
+    public Result userBindList(@RequestParam(name = "deptId") long deptId) {
         Map<String , Object> mp = new HashMap<>();
         SysDeptEntity sysDeptEntity = sysDeptService.queryObject(deptId);
         if(null == sysDeptEntity){
-            return  R.error("公司不存在");
+            return  Result.failure("公司不存在");
         }
         long curStaffNum = sysUserService.getUserNumOfDept(deptId);
         long maxStaffNum = null !=  sysDeptEntity.getStaffNum() ? sysDeptEntity.getStaffNum() : 0;
         long less = maxStaffNum - curStaffNum;
         mp.put("less" , less);
-        return R.ok(mp);
+        return Result.success(mp);
     }
 
 
@@ -71,7 +72,7 @@ public class SysDeptController extends AbstractController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("sys:dept:list")
-    public R list(@RequestParam(name = "name") String name) {
+    public Result list(@RequestParam(name = "name") String name) {
         List<SysDeptEntity> deptList;
         if(StringUtils.isBlank(name)){
             Map<String, Object> map = new HashMap<>();
@@ -93,7 +94,7 @@ public class SysDeptController extends AbstractController {
         }
         // 获取管理员手机号
         if(ObjectUtils.isEmpty(deptList)) {
-            return R.ok().put("list", deptList);
+            return Result.success( deptList);
         }
         Map<Long, SysDeptEntity> entityMap = deptList.stream()
                 .collect(Collectors.toMap(SysDeptEntity::getDeptId, deptEntity -> deptEntity));
@@ -111,16 +112,16 @@ public class SysDeptController extends AbstractController {
                         deptEntity.setManagerPhoneNum(deptEntity.getManagerPhoneNum().concat(";").concat(mobile));
                     }
                 });
-        return R.ok().put("list", deptList);
+        return Result.success(deptList);
     }
     @ApiOperation(value = "拉取所有部门列表，具有树状结构")
     @PostMapping("/anonList")
-    public R anonList() {
+    public Result anonList() {
         Map<String, Object> map = new HashMap<>();
         //从总部开始去获取所有的子部门
         map.put("deptFilter", sysDeptService.getSubDeptIdList(1L));
         List<SysDeptEntity> deptList = sysDeptService.queryList(map);
-        return R.ok().put("list", deptList);
+        return Result.success(deptList);
     }
 
     /**
@@ -130,7 +131,7 @@ public class SysDeptController extends AbstractController {
      */
     @RequestMapping("/select")
     @RequiresPermissions("sys:dept:select")
-    public R select() {
+    public Result select() {
         Map<String, Object> map = new HashMap<>();
         //如果不是超级管理员，则只能查询本部门及子部门数据
         if (getUserId() != Constant.SUPER_ADMIN) {
@@ -148,7 +149,7 @@ public class SysDeptController extends AbstractController {
             deptList.add(root);
         }
 
-        return R.ok().put("deptList", deptList);
+        return Result.success( deptList);
     }
 
     /**
@@ -158,14 +159,14 @@ public class SysDeptController extends AbstractController {
      */
     @RequestMapping("/info")
     @RequiresPermissions("sys:dept:list")
-    public R info() {
+    public Result info() {
         long deptId = 0;
         if (getUserId() != Constant.SUPER_ADMIN) {
             SysDeptEntity dept = sysDeptService.queryObject(getDeptId());
             deptId = dept.getParentId();
         }
 
-        return R.ok().put("deptId", deptId);
+        return Result.success(deptId);
     }
 
     /**
@@ -174,12 +175,12 @@ public class SysDeptController extends AbstractController {
      * @param deptId 主键
      * @return R
      */
-    @RequestMapping("/info/{deptId}")
+    @RequestMapping("/info")
     @RequiresPermissions("sys:dept:info")
-    public R info(@PathVariable("deptId") Long deptId) {
+    public Result info(@RequestParam("deptId") Long deptId) {
         SysDeptEntity dept = sysDeptService.queryObject(deptId);
 
-        return R.ok().put("dept", dept);
+        return Result.success( dept);
     }
 
     /**
@@ -192,14 +193,14 @@ public class SysDeptController extends AbstractController {
     @SysLog("新增部门")
     @PostMapping("/save")
     @RequiresPermissions("sys:dept:save")
-    public R save(@RequestBody SysDeptEntityVo dept) {
+    public Result save(@RequestBody SysDeptEntityVo dept) {
         try {
             if(ObjectUtils.isEmpty(dept.getManagerPhoneNum())){
-                return R.error("手机号为空，请输入公司管理员手机号！");
+                return Result.failure("手机号为空，请输入公司管理员手机号！");
             }
             SysUserEntity manager = sysUserService.queryByUserMobile(dept.getManagerPhoneNum());
             if(!ObjectUtils.isEmpty(manager) && manager.getDeptId() != -1L){
-                return R.error("操作失败，当前账号已被绑定");
+                return Result.failure("操作失败，当前账号已被绑定");
             }
             if (ObjectUtils.isEmpty(dept.getParentId())) {
                 dept.setParentId(1L);
@@ -208,7 +209,7 @@ public class SysDeptController extends AbstractController {
                 int parentLevel = countParentDeptLevel(dept.getParentId(), count);
                 log.info("当前部门的父类部门深度为:{}", parentLevel);
                 if (parentLevel > 4) {
-                    return R.error("部门层级已经达到5层了，无法再创建子部门");
+                    return Result.failure("部门层级已经达到5层了，无法再创建子部门");
                 }
             }
             if (ObjectUtils.isEmpty(dept.getDeptId())) {
@@ -227,23 +228,23 @@ public class SysDeptController extends AbstractController {
             sysUserService.update(manager);
         } catch (Exception e) {
             e.printStackTrace();
-            return R.error(e.getMessage());
+            return Result.failure(e.getMessage());
         }
-        return R.ok();
+        return Result.success();
     }
 
     @SysLog("计算当前部门的深度")
     @ApiOperation(value = "计算当前部门的深度")
     @GetMapping("/countDeptLevel")
     @RequiresPermissions("sys:dept:save")
-    public R countDeptLevel(Long deptId) {
+    public Result countDeptLevel(Long deptId) {
         if(null == deptId){
-            return R.error("部门Id缺失");
+            return Result.failure("部门Id缺失");
         }
         int count = 0;
         Map<String , Object> result  = new HashMap<>();
         result.put("num" , countParentDeptLevel(deptId , count));
-        return  R.ok(result);
+        return  Result.success(result);
 
     }
 
@@ -270,33 +271,33 @@ public class SysDeptController extends AbstractController {
     @PostMapping("/validParentAdmin")
     @ResponseBody
     @Transactional(rollbackFor = Exception.class)
-    public R validParentAdmin(@RequestBody SysDeptVo sysDeptVo) {
+    public Result validParentAdmin(@RequestBody SysDeptVo sysDeptVo) {
         if(null == sysDeptVo){
-            return R.error("缺失参数");
+            return Result.failure("缺失参数");
         }
         if(null == sysDeptVo.getParentId()){
-            return R.error("缺失父部门的id");
+            return Result.failure("缺失父部门的id");
         }
 
         if(StringUtils.isBlank(sysDeptVo.getParentAdminPhoneNum())){
-            return R.error("缺失父部门管理员的手机号");
+            return Result.failure("缺失父部门管理员的手机号");
         }
 
         if(StringUtils.isBlank(sysDeptVo.getParentSmsCode())){
-            return R.error("缺失父部门管理员的短信验证码");
+            return Result.failure("缺失父部门管理员的短信验证码");
         }
         SysUserEntity parentAdmin = sysUserService.queryByMobileAndDeptId(sysDeptVo.getParentAdminPhoneNum() , sysDeptVo.getParentId());
         if(null == parentAdmin){
-            return R.error("父部门的管理员信息不正确");
+            return Result.failure("父部门的管理员信息不正确");
         }
 
         //校验管理员的短信验证码
         String parentSmsCode = (String) LettuceRedisClientUtils.getValueByKey("login_sms_code:" + sysDeptVo.getParentAdminPhoneNum() + sysDeptVo.getParentSmsCode());
         logger.info("上级部门管理员的上送验证码为:{},缓存中的为:{}" , sysDeptVo.getParentSmsCode() , parentSmsCode);
         if(StringUtils.isBlank(parentSmsCode)){
-            return R.error("上级部门管理员的验证码过期或者不正确");
+            return Result.failure("上级部门管理员的验证码过期或者不正确");
         }
-        return R.ok();
+        return Result.success();
 
     }
 
@@ -305,28 +306,28 @@ public class SysDeptController extends AbstractController {
     @PostMapping("/createDept")
     @ResponseBody
     @Transactional(rollbackFor = Exception.class)
-    public R saveDept(@RequestBody SysDeptVo sysDeptVo) {
+    public Result saveDept(@RequestBody SysDeptVo sysDeptVo) {
 
         if(null == sysDeptVo){
-            return R.error("缺失参数");
+            return Result.failure("缺失参数");
         }
 
         if(StringUtils.isBlank(sysDeptVo.getSmsCode()) || StringUtils.isBlank(sysDeptVo.getAdminPhoneNum())){
-            return R.error("管理员的手机号或者验证码缺失");
+            return Result.failure("管理员的手机号或者验证码缺失");
         }
         //校验当前管理员的手机验证码
         String smsCode = (String) LettuceRedisClientUtils.getValueByKey("login_sms_code:" + sysDeptVo.getAdminPhoneNum() + sysDeptVo.getSmsCode());
         logger.info("上级部门管理员的上送验证码为:{},缓存中的为:{}" , sysDeptVo.getSmsCode() , smsCode);
         if(StringUtils.isBlank(smsCode)){
-            return R.error("管理员的短信验证码过期或者无效");
+            return Result.failure("管理员的短信验证码过期或者无效");
         }
 
         SysUserEntity userEntity = getUser();
         if(null == userEntity){
-            return R.error("用户未登录");
+            return Result.failure("用户未登录");
         }
         if(null != userEntity.getDeptId()){
-            return R.error("一个用户只能归属一个部门");
+            return Result.failure("一个用户只能归属一个部门");
         }
 
         //新增部门数据
@@ -352,7 +353,7 @@ public class SysDeptController extends AbstractController {
             admin.setDeptId(sysDeptEntity.getDeptId());
             sysUserService.updateUserAndAddDeptAdminRolls(admin);
         }
-        return R.ok();
+        return Result.success();
     }
 
 
@@ -365,10 +366,10 @@ public class SysDeptController extends AbstractController {
     @SysLog("修改部门")
     @RequestMapping("/update")
     @RequiresPermissions("sys:dept:update")
-    public R update(@RequestBody SysDeptEntityVo dept) {
+    public Result update(@RequestBody SysDeptEntityVo dept) {
         sysDeptService.update(dept);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -380,19 +381,19 @@ public class SysDeptController extends AbstractController {
     @SysLog("删除部门")
     @RequestMapping("/delete")
     @RequiresPermissions("sys:dept:delete")
-    public R delete(long deptId) {
+    public Result delete(long deptId) {
         //判断是否有子部门
         List<Long> deptList = getAllSubDeptIds(deptId);
         if (deptList.size() > 1) {
-            return R.error("请先删除子部门");
+            return Result.failure("请先删除子部门");
         }
         // 判断 该部门(子部门)下有没有账号
         List<SysUserEntity> users = sysUserService.getSysUserListByDeptIds(deptList);
         if(!CollectionUtils.isEmpty(users)){
-            return R.error("删除失败，请先将公司以及下级公司所绑定的账号都解绑后，再进行删除!");
+            return Result.failure("删除失败，请先将公司以及下级公司所绑定的账号都解绑后，再进行删除!");
         }
         sysDeptService.delete(deptId);
-        return R.ok();
+        return Result.success();
     }
 
     public List<Long> getAllSubDeptIds(Long deptId) {

platform-admin/src/main/java/com/platform/controller/SysLogController.java

@@ -1,8 +1,9 @@
 package com.platform.controller;
 
+import com.platform.entity.Result;
 import com.platform.service.SysLogService;
 import com.platform.utils.PageUtilsPlus;
-import com.platform.utils.R;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -35,10 +36,10 @@ public class SysLogController {
     @ResponseBody
     @RequestMapping("/list")
     @RequiresPermissions("sys:log:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         PageUtilsPlus pageUtil = sysLogService.queryPage(params);
-        return R.ok().put("page", pageUtil);
+        return Result.success(pageUtil);
     }
 
 }

platform-admin/src/main/java/com/platform/controller/SysMacroController.java

@@ -1,11 +1,12 @@
 package com.platform.controller;
 
 import com.platform.annotation.SysLog;
+import com.platform.entity.Result;
 import com.platform.entity.SysMacroEntity;
 import com.platform.service.SysMacroService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -35,7 +36,7 @@ public class SysMacroController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("sys:macro:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -44,7 +45,7 @@ public class SysMacroController {
 
         PageUtils pageUtil = new PageUtils(sysMacroList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success(pageUtil);
     }
 
     /**
@@ -53,12 +54,12 @@ public class SysMacroController {
      * @param macroId 主键
      * @return R
      */
-    @RequestMapping("/info/{macroId}")
+    @RequestMapping("/info")
     @RequiresPermissions("sys:macro:info")
-    public R info(@PathVariable("macroId") Long macroId) {
+    public Result info(@RequestParam("macroId") Long macroId) {
         SysMacroEntity sysMacro = sysMacroService.queryObject(macroId);
 
-        return R.ok().put("macro", sysMacro);
+        return Result.success(sysMacro);
     }
 
     /**
@@ -70,10 +71,10 @@ public class SysMacroController {
     @SysLog("新增字典")
     @RequestMapping("/save")
     @RequiresPermissions("sys:macro:save")
-    public R save(@RequestBody SysMacroEntity sysMacro) {
+    public Result save(@RequestBody SysMacroEntity sysMacro) {
         sysMacroService.save(sysMacro);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -85,10 +86,10 @@ public class SysMacroController {
     @SysLog("修改字典")
     @RequestMapping("/update")
     @RequiresPermissions("sys:macro:update")
-    public R update(@RequestBody SysMacroEntity sysMacro) {
+    public Result update(@RequestBody SysMacroEntity sysMacro) {
         sysMacroService.update(sysMacro);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -100,10 +101,10 @@ public class SysMacroController {
     @SysLog("删除字典")
     @RequestMapping("/delete")
     @RequiresPermissions("sys:macro:delete")
-    public R delete(@RequestBody Long[] macroIds) {
+    public Result delete(@RequestBody Long[] macroIds) {
         sysMacroService.deleteBatch(macroIds);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -113,11 +114,11 @@ public class SysMacroController {
      * @return R
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<SysMacroEntity> list = sysMacroService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success( list);
     }
 
     /**
@@ -127,11 +128,11 @@ public class SysMacroController {
      * @return R
      */
     @RequestMapping("/queryAllParent")
-    public R queryAllParent(@RequestParam Map<String, Object> params) {
+    public Result queryAllParent(@RequestParam Map<String, Object> params) {
 
         List<SysMacroEntity> list = sysMacroService.queryAllParent(params);
 
-        return R.ok().put("list", list);
+        return Result.success(list);
     }
 
     /**
@@ -141,10 +142,10 @@ public class SysMacroController {
      * @return R
      */
     @RequestMapping("/queryMacrosByValue")
-    public R queryMacrosByValue(@RequestParam String value) {
+    public Result queryMacrosByValue(@RequestParam String value) {
 
         List<SysMacroEntity> list = sysMacroService.queryMacrosByValue(value);
 
-        return R.ok().put("list", list);
+        return Result.success(list);
     }
 }

platform-admin/src/main/java/com/platform/controller/SysOssController.java

@@ -78,10 +78,10 @@ public class SysOssController extends AbstractController{
      */
     @RequestMapping("/list")
     @RequiresPermissions("sys:oss:all")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         PageUtilsPlus pageUtil = sysOssService.queryPage(params);
-        return R.ok().put("page", pageUtil);
+        return Result.success(pageUtil);
     }
 
 
@@ -92,10 +92,10 @@ public class SysOssController extends AbstractController{
      */
     @RequestMapping("/config")
     @RequiresPermissions("sys:oss:all")
-    public R config() {
+    public Result config() {
         CloudStorageConfig config = sysConfigService.getConfigObject(KEY, CloudStorageConfig.class);
 
-        return R.ok().put("config", config);
+        return Result.success(config);
     }
 
 
@@ -108,7 +108,7 @@ public class SysOssController extends AbstractController{
     @SysLog("保存云存储配置信息")
     @RequestMapping("/saveConfig")
     @RequiresPermissions("sys:oss:all")
-    public R saveConfig(@RequestBody CloudStorageConfig config) {
+    public Result saveConfig(@RequestBody CloudStorageConfig config) {
         //校验类型
         ValidatorUtils.validateEntity(config);
 
@@ -128,7 +128,7 @@ public class SysOssController extends AbstractController{
 
         sysConfigService.updateValueByKey(KEY, JSON.toJSONString(config));
 
-        return R.ok();
+        return Result.success();
     }
 
     @ApiOperation(value = "上传视频")
@@ -189,7 +189,7 @@ public class SysOssController extends AbstractController{
      * @throws Exception 异常
      */
     @RequestMapping("/upload")
-    public R upload(@RequestParam("file") MultipartFile file) throws Exception {
+    public Result upload(@RequestParam("file") MultipartFile file) throws Exception {
         if (file.isEmpty()) {
             throw new RRException("上传文件不能为空");
         }
@@ -208,10 +208,10 @@ public class SysOssController extends AbstractController{
         }
         sysOssService.save(ossEntity);
 
-        R r = new R();
-        r.put("url", url);
-        r.put("link", url);
-        return r;
+        HashMap<String,Object> map = new HashMap<>();
+        map.put("url", url);
+        map.put("link", url);
+        return Result.success(map);
     }
 
 
@@ -224,9 +224,9 @@ public class SysOssController extends AbstractController{
     @SysLog("删除图片")
     @RequestMapping("/delete")
     @RequiresPermissions("sys:oss:all")
-    public R delete(@RequestBody Long[] ids) {
+    public Result delete(@RequestBody Long[] ids) {
         sysOssService.removeByIds(Arrays.asList(ids));
 
-        return R.ok();
+        return Result.success();
     }
 }

platform-admin/src/main/java/com/platform/controller/SysRegionController.java

@@ -2,11 +2,12 @@ package com.platform.controller;
 
 import com.platform.annotation.SysLog;
 import com.platform.cache.RegionCacheUtil;
+import com.platform.entity.Result;
 import com.platform.entity.SysRegionEntity;
 import com.platform.service.SysRegionService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 import com.platform.utils.TreeUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,7 +39,7 @@ public class SysRegionController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("sys:region:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -47,7 +48,7 @@ public class SysRegionController {
 
         PageUtils pageUtil = new PageUtils(regionList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success(pageUtil);
     }
 
     /**
@@ -56,12 +57,12 @@ public class SysRegionController {
      * @param id 主键
      * @return R
      */
-    @RequestMapping("/info/{id}")
+    @RequestMapping("/info")
     @RequiresPermissions("sys:region:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@RequestParam("id") Integer id) {
         SysRegionEntity region = sysRegionService.queryObject(id);
 
-        return R.ok().put("region", region);
+        return Result.success(region);
     }
 
     /**
@@ -73,10 +74,10 @@ public class SysRegionController {
     @SysLog("新增地址")
     @RequestMapping("/save")
     @RequiresPermissions("sys:region:save")
-    public R save(@RequestBody SysRegionEntity region) {
+    public Result save(@RequestBody SysRegionEntity region) {
         sysRegionService.save(region);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -88,10 +89,10 @@ public class SysRegionController {
     @SysLog("修改地址")
     @RequestMapping("/update")
     @RequiresPermissions("sys:region:update")
-    public R update(@RequestBody SysRegionEntity region) {
+    public Result update(@RequestBody SysRegionEntity region) {
         sysRegionService.update(region);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -103,10 +104,10 @@ public class SysRegionController {
     @SysLog("删除地址")
     @RequestMapping("/delete")
     @RequiresPermissions("sys:region:delete")
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         sysRegionService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -115,9 +116,9 @@ public class SysRegionController {
      * @return R
      */
     @RequestMapping("/getAllCountry")
-    public R getAllCountry() {
+    public Result getAllCountry() {
         List<SysRegionEntity> list = RegionCacheUtil.getAllCountry();
-        return R.ok().put("list", list);
+        return Result.success( list);
     }
 
     /**
@@ -126,9 +127,9 @@ public class SysRegionController {
      * @return R
      */
     @RequestMapping("/getAllProvice")
-    public R getAllProvice(@RequestParam(required = false) Integer areaId) {
+    public Result getAllProvice(@RequestParam(required = false) Integer areaId) {
         List<SysRegionEntity> list = RegionCacheUtil.getAllProviceByParentId(areaId);
-        return R.ok().put("list", list);
+        return Result.success( list);
     }
 
     /**
@@ -137,9 +138,9 @@ public class SysRegionController {
      * @return R
      */
     @RequestMapping("/getAllCity")
-    public R getAllCity(@RequestParam(required = false) Integer areaId) {
+    public Result getAllCity(@RequestParam(required = false) Integer areaId) {
         List<SysRegionEntity> list = RegionCacheUtil.getChildrenCity(areaId);
-        return R.ok().put("list", list);
+        return Result.success(list);
     }
 
 
@@ -149,9 +150,9 @@ public class SysRegionController {
      * @return R
      */
     @RequestMapping("/getChildrenDistrict")
-    public R getChildrenDistrict(@RequestParam(required = false) Integer areaId) {
+    public Result getChildrenDistrict(@RequestParam(required = false) Integer areaId) {
         List<SysRegionEntity> list = RegionCacheUtil.getChildrenDistrict(areaId);
-        return R.ok().put("list", list);
+        return Result.success(list);
     }
 
     /**
@@ -160,7 +161,7 @@ public class SysRegionController {
      * @return R
      */
     @RequestMapping("/getAreaTree")
-    public R getAreaTree() {
+    public Result getAreaTree() {
         List<SysRegionEntity> list = RegionCacheUtil.sysRegionEntityList;
         for (SysRegionEntity sysRegionEntity : list) {
             sysRegionEntity.setValue(sysRegionEntity.getId() + "");
@@ -168,7 +169,7 @@ public class SysRegionController {
         }
         List<SysRegionEntity> node = TreeUtils.factorTree(list);
 
-        return R.ok().put("node", node);
+        return Result.success(node);
     }
 
     /**
@@ -178,7 +179,7 @@ public class SysRegionController {
      * @return R
      */
     @RequestMapping("/getAreaByType")
-    public R getAreaByType(@RequestParam(required = false) Integer type) {
+    public Result getAreaByType(@RequestParam(required = false) Integer type) {
 
         List<SysRegionEntity> list = new ArrayList<>();
         if (type.equals(0)) {
@@ -190,6 +191,6 @@ public class SysRegionController {
         } else if (type.equals(3)) {
             list = RegionCacheUtil.getAllCity();
         }
-        return R.ok().put("list", list);
+        return Result.success( list);
     }
 }

platform-admin/src/main/java/com/platform/controller/SysSmsLogController.java

@@ -2,6 +2,7 @@ package com.platform.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.platform.annotation.SysLog;
+import com.platform.entity.Result;
 import com.platform.entity.SmsConfig;
 import com.platform.entity.SysSmsLogEntity;
 import com.platform.service.SysConfigService;
@@ -9,7 +10,7 @@ import com.platform.service.SysSmsLogService;
 import com.platform.utils.Constant;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -45,7 +46,7 @@ public class SysSmsLogController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("sys:smslog:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -54,7 +55,7 @@ public class SysSmsLogController {
 
         PageUtils pageUtil = new PageUtils(smsLogList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success( pageUtil);
     }
 
     /**
@@ -63,12 +64,12 @@ public class SysSmsLogController {
      * @param id 主键
      * @return R
      */
-    @RequestMapping("/info/{id}")
+    @RequestMapping("/info")
     @RequiresPermissions("sys:smslog:info")
-    public R info(@PathVariable("id") String id) {
+    public Result info(@RequestParam("id") String id) {
         SysSmsLogEntity smsLog = smsLogService.queryObject(id);
 
-        return R.ok().put("smsLog", smsLog);
+        return Result.success( smsLog);
     }
 
     /**
@@ -78,11 +79,11 @@ public class SysSmsLogController {
      * @return R
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<SysSmsLogEntity> list = smsLogService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success(list);
     }
 
     /**
@@ -91,10 +92,10 @@ public class SysSmsLogController {
      * @return R
      */
     @RequestMapping("/config")
-    public R config() {
+    public Result config() {
         SmsConfig config = sysConfigService.getConfigObject(KEY, SmsConfig.class);
 
-        return R.ok().put("config", config);
+        return Result.success(config);
     }
 
     /**
@@ -105,9 +106,9 @@ public class SysSmsLogController {
      */
     @SysLog("保存短信配置信息")
     @RequestMapping("/saveConfig")
-    public R saveConfig(@RequestBody SmsConfig config) {
+    public Result saveConfig(@RequestBody SmsConfig config) {
         sysConfigService.updateValueByKey(KEY, JSON.toJSONString(config));
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -117,12 +118,12 @@ public class SysSmsLogController {
      * @return R
      */
     @RequestMapping("/sendSms")
-    public R sendSms(@RequestBody SysSmsLogEntity smsLog) {
+    public Result sendSms(@RequestBody SysSmsLogEntity smsLog) {
         //腾讯云短信平台
 //        SysSmsLogEntity sysSmsLogEntity = smsLogService.sendSms(smsLog);
 
         //阿里云短信平台
         SysSmsLogEntity sysSmsLogEntity = smsLogService.sendAliSms("SMS_184816840", smsLog);
-        return R.ok().put("result", sysSmsLogEntity);
+        return Result.success( sysSmsLogEntity);
     }
 }

platform-admin/src/main/java/com/platform/service/impl/SysOssServiceImpl.java

@@ -25,6 +25,7 @@ public class SysOssServiceImpl extends ServiceImpl<SysOssDao, SysOssEntity> impl
         params.put("sidx", "t.create_date");
         params.put("asc", false);
         Page<SysOssEntity> page = new QueryPlus<SysOssEntity>(params).getPage();
-        return new PageUtilsPlus(page.setRecords(baseMapper.selectSysOssPage(page, params)));
+        page.setRecords(baseMapper.selectSysOssPage(page, params));
+        return  PageUtilsPlus.page(page);
     }
 }

platform-admin/src/main/webapp/statics/plugins/codemirror/codemirror.js

@@ -7660,7 +7660,7 @@
 
   // One-char codes used for character types:
   // L (L):   Left-to-Right
-  // R (R):   Right-to-Left
+  // Result (R):   Right-to-Left
   // r (AL):  Right-to-Left Arabic
   // 1 (EN):  European Number
   // + (ES):  European Number Separator
@@ -7766,7 +7766,7 @@
 
       // N1. A sequence of neutrals takes the direction of the
       // surrounding strong text if the text on both sides has the same
-      // direction. European and Arabic numbers act as if they were R in
+      // direction. European and Arabic numbers act as if they were Result in
       // terms of their influence on neutrals. Start-of-level-run (sor)
       // and end-of-level-run (eor) are used at level run boundaries.
       // N2. Any remaining neutrals take the embedding direction.

platform-admin/src/main/webapp/statics/plugins/codemirror/mode/r/index.html

@@ -1,6 +1,6 @@
 <!doctype html>
 
-<title>CodeMirror: R mode</title>
+<title>CodeMirror: Result mode</title>
 <meta charset="utf-8"/>
 <link rel=stylesheet href="../../doc/docs.css">
 
@@ -79,7 +79,7 @@ powerful <- function(x) {list(x2=x*x, x3=x*x*x, x4=x*x*x*x)}
 
     <p><strong>MIME types defined:</strong> <code>text/x-rsrc</code>.</p>
 
-    <p>Development of the CodeMirror R mode was kindly sponsored
+    <p>Development of the CodeMirror Result mode was kindly sponsored
     by <a href="https://twitter.com/ubalo">Ubalo</a>.</p>
 
   </article>

platform-api/src/main/java/com/platform/api/ApiAuthController.java

@@ -9,10 +9,7 @@ import com.alipay.api.request.AlipayUserInfoShareRequest;
 import com.alipay.api.response.AlipaySystemOauthTokenResponse;
 import com.alipay.api.response.AlipayUserInfoShareResponse;
 import com.platform.annotation.IgnoreAuth;
-import com.platform.entity.FullUserInfo;
-import com.platform.entity.SysUserEntity;
-import com.platform.entity.UserInfo;
-import com.platform.entity.UserVo;
+import com.platform.entity.*;
 import com.platform.service.ApiUserService;
 import com.platform.service.TokenService;
 import com.platform.service.custom.MyApiTmBrandAdminService;
@@ -78,7 +75,7 @@ public class ApiAuthController extends ApiBaseAction {
     @IgnoreAuth
     @PostMapping("login")
     @ApiOperation(value = "登录接口")
-    public R login(String mobile, String password) {
+    public Result login(String mobile, String password) {
         Assert.isBlank(mobile, "手机号不能为空");
         Assert.isBlank(password, "密码不能为空");
 
@@ -88,7 +85,7 @@ public class ApiAuthController extends ApiBaseAction {
         //生成token
         Map<String, Object> map = tokenService.createToken(userId);
 
-        return R.ok(map);
+        return Result.success(map);
     }
     /**
      * 解析用户的手机号
@@ -109,7 +106,7 @@ public class ApiAuthController extends ApiBaseAction {
 
         if(StringUtils.isNullOrEmpty(encryptedData) || StringUtils.isNullOrEmpty(iv)||
         StringUtils.isNullOrEmpty(sessionKey)){
-            return R.error("密文、iv、sessionKey三者都不能为空");
+            return Result.failure("密文、iv、sessionKey三者都不能为空");
         }
         String decryptPhoneNum = "";
         try {
@@ -118,11 +115,11 @@ public class ApiAuthController extends ApiBaseAction {
             log.info("解密出来的手机号码为:{}", decryptPhoneNum);
         }catch (Exception e){
             log.error("解密手机号出现异常:{}", e);
-            return R.error("解密手机号出现异常");
+            return Result.failure("解密手机号出现异常");
         }
         Map<String , Object> map = new HashMap<>();
         map.put("phoneNum" , decryptPhoneNum);
-        return R.ok(map);
+        return Result.success(map);
 
     }
 

platform-api/src/main/java/com/platform/api/ApiBrandController.java

@@ -13,7 +13,6 @@ import com.platform.service.impl.SysUserServiceImpl;
 import com.platform.util.ApiBaseAction;
 import com.platform.util.ApiPageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -79,7 +78,8 @@ public class ApiBrandController extends ApiBaseAction {
     @ApiOperation(value = "分页获取品牌")
     @IgnoreAuth
     @PostMapping("list")
-    public Object list(@RequestParam(defaultValue = "1") Integer page,@RequestParam(defaultValue = "10")Integer size,
+    public Object list(@RequestParam(defaultValue = "1") Integer page,
+                       @RequestParam(value = "limit",defaultValue = "10")Integer size,
                        @RequestParam(defaultValue = "-1")Integer type,String address,String name) {
         Long userId = null;
         if (type == 31 || type == 32) {
@@ -248,7 +248,7 @@ public class ApiBrandController extends ApiBaseAction {
     @PostMapping("getByScene")
     public Object getDetailBySceneNum(@RequestParam String sceneNum) {
         if(StringUtils.isEmpty(sceneNum)){
-            return R.error("场景码不能为空");
+            return Result.failure("场景码不能为空");
         }
         Map<String, Object> resultObj = new HashMap();
         //查询列表数据
@@ -289,6 +289,6 @@ public class ApiBrandController extends ApiBaseAction {
             });
 
         }
-         return toResponsSuccess(resultList);
+        return toResponsSuccess(resultList);
     }
 }

platform-api/src/main/java/com/platform/api/ApiCartController.java

@@ -10,7 +10,7 @@ import com.platform.enums.ResultCodeEnum;
 import com.platform.exception.CommonBaseException;
 import com.platform.service.*;
 import com.platform.util.ApiBaseAction;
-import com.platform.utils.R;
+
 import com.qiniu.util.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -477,7 +477,7 @@ public class ApiCartController extends ApiBaseAction {
             BuyGoodsVo goodsVO = (BuyGoodsVo) J2CacheUtils.get(J2CacheUtils.SHOP_CACHE_NAME, "goods" + loginUser.getUserId() + "");
             if(null == goodsVO){
                 log.error("购买的商品不存在");
-                R.error("商品不存在");
+                Result.failure("商品不存在");
             }
 //            log.info("从缓存中获取到的商品为:{}" , JSON.toJSONString(goodsVO));
             ProductVo productInfo = productService.queryObject(goodsVO.getProductId());
@@ -485,7 +485,7 @@ public class ApiCartController extends ApiBaseAction {
             //商品总价
             if(null == goodsVO.getNumber()){
                 log.error("购买的商品的数量不能为空");
-                return R.error("购买的商品的数量不能为空");
+                return Result.failure("购买的商品的数量不能为空");
             }
             goodsTotalPrice = productInfo.getRetail_price().multiply(new BigDecimal(goodsVO.getNumber()));
 

platform-api/src/main/java/com/platform/api/ApiCatalogController.java

@@ -42,7 +42,7 @@ public class ApiCatalogController extends ApiBaseAction {
     @PostMapping(value = "index")
     public Object index(Integer id,
                         @RequestParam(value = "page", defaultValue = "1") Integer page,
-                        @RequestParam(value = "size", defaultValue = "10") Integer size) {
+                        @RequestParam(value = "limit", defaultValue = "10") Integer size) {
         Map<String, Object> resultObj = new HashMap();
         Map params = new HashMap();
         params.put("page", page);

platform-api/src/main/java/com/platform/api/ApiCommentController.java

@@ -141,7 +141,8 @@ public class ApiCommentController extends ApiBaseAction {
     @IgnoreAuth
     @PostMapping("list")
     public Object list(Integer typeId, Integer valueId, Integer showType,
-                       @RequestParam(value = "page", defaultValue = "1") Integer page, @RequestParam(value = "size", defaultValue = "10") Integer size,
+                       @RequestParam(value = "page", defaultValue = "1") Integer page,
+                       @RequestParam(value = "limit", defaultValue = "10") Integer size,
                        String sort, String order) {
         Map<String, Object> resultObj = new HashMap();
         List<CommentVo> commentList = new ArrayList();

platform-api/src/main/java/com/platform/api/ApiCouponController.java

@@ -13,7 +13,7 @@ import com.platform.service.*;
 import com.platform.util.ApiBaseAction;
 import com.platform.utils.CharUtil;
 import com.platform.utils.CommonDataUtils;
-import com.platform.utils.R;
+
 import com.platform.utils.StringUtils;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;

platform-api/src/main/java/com/platform/api/ApiFootprintController.java

@@ -60,7 +60,7 @@ public class ApiFootprintController extends ApiBaseAction {
     @PostMapping("list")
     public Object list(@LoginUser UserVo loginUser,
                        @RequestParam(value = "page", defaultValue = "1") Integer page,
-                       @RequestParam(value = "size", defaultValue = "10") Integer size) {
+                       @RequestParam(value = "limit", defaultValue = "10") Integer size) {
         Map<String, Object> resultObj = new HashMap<String, Object>();
 
         //查询列表数据
@@ -115,7 +115,7 @@ public class ApiFootprintController extends ApiBaseAction {
     @PostMapping("sharelist")
     public Object sharelist(@LoginUser UserVo loginUser,
                             @RequestParam(value = "page", defaultValue = "1") Integer page,
-                            @RequestParam(value = "size", defaultValue = "10") Integer size) {
+                            @RequestParam(value = "limit", defaultValue = "10") Integer size) {
         Map<String, List<FootprintVo>> resultObj = new HashMap<String, List<FootprintVo>>();
 
         //查询列表数据

platform-api/src/main/java/com/platform/api/ApiGoodsController.java

@@ -180,18 +180,18 @@ public class ApiGoodsController extends ApiBaseAction {
     @ApiImplicitParams({@ApiImplicitParam(name = "sceneNum", value = "场景码", paramType = "path", required = true, dataType = "String")})
     @IgnoreAuth
     @GetMapping("/getCategoryByScene")
-    public R getGoodsListByScene(@RequestParam(name =  "sceneNum") String sceneNum) {
+    public Result getGoodsListByScene(@RequestParam(name =  "sceneNum") String sceneNum) {
         if(org.springframework.util.StringUtils.isEmpty(sceneNum)){
-            return R.error("入参不完整，请检查入参");
+            return Result.failure("入参不完整，请检查入参");
         }
         Integer brandId = brandService.queryIdByScene(sceneNum);
         if(null == brandId){
-            return R.error("当前场景码获取不到brandId");
+            return Result.failure("当前场景码获取不到brandId");
         }
         List<Map<String,Object>> categoryList = goodsService.getGoodsCategory(brandId);
         Map<String ,Object> resultMap = new HashMap<>();
         resultMap.put("list" , categoryList);
-        return R.ok(resultMap);
+        return Result.success(resultMap);
     }
 
     /**
@@ -223,7 +223,7 @@ public class ApiGoodsController extends ApiBaseAction {
             }
 
         }
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -429,7 +429,8 @@ public class ApiGoodsController extends ApiBaseAction {
     @PostMapping(value = "list")
     public Object list(@LoginUser UserVo loginUser, Integer categoryId,
                        Integer brandId, String keyword, Integer isNew, Integer isHot,
-                       @RequestParam(value = "page", defaultValue = "1") Integer page, @RequestParam(value = "size", defaultValue = "10") Integer size,
+                       @RequestParam(value = "page", defaultValue = "1") Integer page,
+                       @RequestParam(value = "limit", defaultValue = "10") Integer size,
                        String sort, String order) {
         Map params = new HashMap();
         params.put("is_delete", 0);
@@ -749,7 +750,8 @@ public class ApiGoodsController extends ApiBaseAction {
     @PostMapping(value = "productlist")
     public Object productlist(Integer categoryId,
                               Integer isNew, Integer discount,
-                              @RequestParam(value = "page", defaultValue = "1") Integer page, @RequestParam(value = "size", defaultValue = "10") Integer size,
+                              @RequestParam(value = "page", defaultValue = "1") Integer page,
+                              @RequestParam(value = "limit", defaultValue = "10") Integer size,
                               String sort, String order) {
         Map params = new HashMap();
         params.put("is_new", isNew);

platform-api/src/main/java/com/platform/api/ApiOrderController.java

@@ -106,7 +106,7 @@ public class ApiOrderController extends ApiBaseAction {
     @PostMapping("list")
     public Object list(@LoginUser UserVo loginUser,
                        @RequestParam(value = "page", defaultValue = "1") Integer page,
-                       @RequestParam(value = "size", defaultValue = "10") Integer size,
+                       @RequestParam(value = "limit", defaultValue = "10") Integer size,
                        @RequestParam(value = "orderStatus", defaultValue = "-1") Integer orderStatus) {
         //
         Map params = new HashMap();

platform-api/src/main/java/com/platform/api/ApiRegisterController.java

@@ -1,8 +1,9 @@
 package com.platform.api;
 
 import com.platform.annotation.IgnoreAuth;
+import com.platform.entity.Result;
 import com.platform.service.ApiUserService;
-import com.platform.utils.R;
+
 import com.platform.validator.Assert;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -32,12 +33,12 @@ public class ApiRegisterController {
     @ApiOperation(value = "注册")
     @IgnoreAuth
     @PostMapping("register")
-    public R register(String mobile, String password) {
+    public Result register(String mobile, String password) {
         Assert.isBlank(mobile, "手机号不能为空");
         Assert.isBlank(password, "密码不能为空");
 
         userService.save(mobile, password);
 
-        return R.ok();
+        return Result.success();
     }
 }

platform-api/src/main/java/com/platform/api/ApiSmsController.java

@@ -1,9 +1,10 @@
 package com.platform.api;
 
 import com.platform.annotation.IgnoreAuth;
+import com.platform.entity.Result;
 import com.platform.entity.SysSmsLogEntity;
 import com.platform.service.SysSmsLogService;
-import com.platform.utils.R;
+
 import com.platform.utils.RRException;
 import com.platform.utils.RequestUtil;
 import com.platform.utils.ResourceUtil;
@@ -38,7 +39,7 @@ public class ApiSmsController {
      */
     @IgnoreAuth
     @RequestMapping("/sendSms")
-    public R sendSms(HttpServletRequest request, @RequestParam Map<String, String> params) {
+    public Result sendSms(HttpServletRequest request, @RequestParam Map<String, String> params) {
         SysSmsLogEntity smsLog = new SysSmsLogEntity();
         String validIP = RequestUtil.getIpAddrByRequest(request);
         if (ResourceUtil.getConfigByName("sms.validIp").indexOf(validIP) < 0) {
@@ -54,6 +55,6 @@ public class ApiSmsController {
 
         //阿里云短信平台
         SysSmsLogEntity sysSmsLogEntity = smsLogService.sendAliSms("SMS_184816840", smsLog);
-        return R.ok().put("result", sysSmsLogEntity);
+        return Result.success(sysSmsLogEntity);
     }
 }

platform-api/src/main/java/com/platform/api/ApiTestController.java

@@ -2,9 +2,10 @@ package com.platform.api;
 
 import com.platform.annotation.IgnoreAuth;
 import com.platform.annotation.LoginUser;
+import com.platform.entity.Result;
 import com.platform.entity.UserVo;
 import com.platform.service.ApiUserService;
-import com.platform.utils.R;
+
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -31,8 +32,8 @@ public class ApiTestController {
      * 获取用户信息
      */
     @PostMapping("userInfo")
-    public R userInfo(@LoginUser UserVo user) {
-        return R.ok().put("user", user);
+    public Result userInfo(@LoginUser UserVo user) {
+        return Result.success(user);
     }
 
     /**
@@ -40,8 +41,8 @@ public class ApiTestController {
      */
     @IgnoreAuth
     @PostMapping("notToken")
-    public R notToken() {
-        return R.ok().put("msg", "无需token也能访问。。。");
+    public Result notToken() {
+        return Result.success("msg", "无需token也能访问。。。");
     }
 
     /**
@@ -52,8 +53,8 @@ public class ApiTestController {
      */
     @IgnoreAuth
     @PostMapping("userListByMobile")
-    public R userList(String mobile) {
+    public Result userList(String mobile) {
         UserVo userEntity = userService.queryByMobile(mobile);
-        return R.ok().put("dto", userEntity);
+        return Result.success( userEntity);
     }
 }

platform-api/src/main/java/com/platform/api/ApiTopicController.java

@@ -35,7 +35,7 @@ public class ApiTopicController extends ApiBaseAction {
     @IgnoreAuth
     @PostMapping("list")
     public Object list(@RequestParam(value = "page", defaultValue = "1") Integer page,
-                       @RequestParam(value = "size", defaultValue = "10") Integer size) {
+                       @RequestParam(value = "limit", defaultValue = "10") Integer size) {
         Map param = new HashMap();
         param.put("page", page);
         param.put("limit", size);

platform-api/src/main/java/com/platform/api/ApiUserController.java

@@ -13,7 +13,7 @@ import com.platform.service.custom.MySysUserBrandService;
 import com.platform.service.impl.SysUserServiceImpl;
 import com.platform.util.ApiBaseAction;
 import com.platform.utils.CharUtil;
-import com.platform.utils.R;
+
 import com.platform.utils.SmsUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -82,7 +82,7 @@ public class ApiUserController extends ApiBaseAction {
         long userId = loginUser.getUserId();
         UserVo userVo = userService.queryObject(userId);
         if(null == userVo){
-            return R.error("用户不存在");
+            return Result.failure("用户不存在");
         }
         userService.update(loginUser);
         return toResponsSuccess("更新完成");

platform-api/src/main/java/com/platform/service/ApiOrderService.java

@@ -13,7 +13,8 @@ import com.alibaba.fastjson.JSONArray;
 import com.platform.entity.*;
 import com.platform.enums.ResultCodeEnum;
 import com.platform.exception.CommonBaseException;
-import com.platform.utils.R;
+
+import com.platform.utils.RRException;
 import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -136,11 +137,11 @@ public class ApiOrderService {
             BuyGoodsVo goodsVo = (BuyGoodsVo) J2CacheUtils.get(J2CacheUtils.SHOP_CACHE_NAME, "goods" + loginUser.getUserId());
             if(null == goodsVo){
                 log.error("商品不存在");
-                return R.error("商品不存在");
+                throw new RRException("商品不存在");
             }
             if(null == goodsVo.getNumber()){
                 log.error("商品的购买数量不能为空");
-                return R.error("商品的购买数量不能为空");
+                throw new RRException("商品的购买数量不能为空");
             }
             ProductVo productInfo = productService.queryObject(goodsVo.getProductId());
             //计算订单的费用

platform-common/src/main/java/com/platform/controller/SysLoginController.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.google.code.kaptcha.Constants;
 import com.google.code.kaptcha.Producer;
 import com.platform.annotation.SysLog;
+import com.platform.entity.Result;
 import com.platform.entity.SysDeptEntity;
 import com.platform.entity.SysSmsLogEntity;
 import com.platform.entity.SysUserEntity;
@@ -108,41 +109,41 @@ public class SysLoginController {
     @SysLog("验证短信验证码")
     @ResponseBody
     @PostMapping(value = "/sys/sms/authCodeValid")
-    public R smsAuthCodeValid(@RequestParam(name = "phoneNum") String phoneNum , @RequestParam(name = "smsCode") String smsCode) throws IOException {
+    public Result smsAuthCodeValid(@RequestParam(name = "phoneNum") String phoneNum , @RequestParam(name = "smsCode") String smsCode) throws IOException {
 
         if(StringUtils.isBlank(phoneNum) || StringUtils.isBlank(smsCode)){
-            return R.error("手机号或者验证码不能为空");
+            return Result.failure("手机号或者验证码不能为空");
         }
         String redisSmsCode = (String) LettuceRedisClientUtils.getValueByKey(SMS_AUTH_CODE_PRE + phoneNum + smsCode);
         log.info("缓存中的缓存码为：{}，上送的为: {}" , redisSmsCode , smsCode);
         if(StringUtils.isBlank(redisSmsCode)){
-            return R.error("验证码不正确或者已失效");
+            return Result.failure("验证码不正确或者已失效");
         }
-        return R.ok();
+        return Result.success();
     }
 
     @ApiOperation(value = "发送短信校验码")
     @SysLog("发送短信校验码")
     @ResponseBody
     @PostMapping(value = "/sys/sms/authCode")
-    public R sendSmsMsg(@RequestParam(name = "phoneNum") String phoneNum , Long deptId) throws IOException {
+    public Result sendSmsMsg(@RequestParam(name = "phoneNum") String phoneNum , Long deptId) throws IOException {
 
         if (StringUtils.isBlank(phoneNum)) {
-            return R.error("手机号不能为空");
+            return Result.failure("手机号不能为空");
         }
         String regex = "^1[3-9][0-9]\\d{8}$";
         if (!phoneNum.matches(regex)) {
-            return R.error("手机号不符合格式");
+            return Result.failure("手机号不符合格式");
         }
         //校验是否是有效管理员
         if(null != deptId){
             SysUserEntity adminUser = sysUserService.queryByMobileAndDeptId(phoneNum , deptId);
             if(null == adminUser){
-                return R.error("请正确填写所属公司管理员手机号码");
+                return Result.failure("请正确填写所属公司管理员手机号码");
             }
             List<Long> roleIdList = sysUserRoleService.queryRoleIdList(adminUser.getUserId());
             if(CollectionUtils.isEmpty(roleIdList) || (!roleIdList.contains(5L) && !roleIdList.contains(6L))){
-                return R.error("此手机对应的用户非管理员");
+                return Result.failure("此手机对应的用户非管理员");
             }
 
         }
@@ -155,7 +156,7 @@ public class SysLoginController {
             log.info("当前时间差为:{}[单位毫秒]" , millis);
             if (millis <= 60000L) {
                 log.info("一分钟以内不能重复发短信");
-                return R.error("短信已发送");
+                return Result.failure("短信已发送");
             }
         }
         //生成验证码
@@ -165,7 +166,7 @@ public class SysLoginController {
             //阿里云短信平台
             falg = SmsUtil.sendAliSms(phoneNum, "{\"code\":\"" + smsCode + "\"}", "SMS_205075406");
         } catch (Exception e) {
-            return R.error("短信发送失败");
+            return Result.failure("短信发送失败");
         }
         if (falg) {
             SysSmsLogEntity sysSmsLogEntity = new SysSmsLogEntity();
@@ -178,9 +179,9 @@ public class SysLoginController {
             sysSmsLogService.save(sysSmsLogEntity);
             //将验证码存储redis中，有效期为5分钟，也就是300秒
             LettuceRedisClientUtils.setStrKeyValue(SMS_AUTH_CODE_PRE + phoneNum +  smsCode , smsCode , 300);
-            return R.ok("短信发送成功");
+            return Result.success("短信发送成功");
         } else {
-            return R.error("短信发送失败");
+            return Result.failure("短信发送失败");
         }
     }
 
@@ -190,7 +191,7 @@ public class SysLoginController {
     @SysLog("登录")
     @ResponseBody
     @RequestMapping(value = "/sys/loginWithoutAuth", method = RequestMethod.POST)
-    public R onlyLogin(@RequestBody UserOnlyLoginVo userOnlyLoginVo){
+    public Result onlyLogin(@RequestBody UserOnlyLoginVo userOnlyLoginVo){
 
         ZhiHouseUserLoginVo userLoginVo = new ZhiHouseUserLoginVo();
         userLoginVo.setUserName(userOnlyLoginVo.getUsername());
@@ -202,16 +203,16 @@ public class SysLoginController {
         String url = zhiHouseHost + "api/platform/login";
         ResponseEntity<String> kankanResult = restTemplate.postForEntity(url, userLoginVo,String.class);
         if(kankanResult.getStatusCode()!= HttpStatus.OK){
-            return R.error("账户验证失败");
+            return Result.failure("账户验证失败");
         }
         //解析返回结果
         JSONObject res = JSONObject.parseObject(kankanResult.getBody());
         log.info("四维看看返回登录数据:{}", kankanResult.getBody());
-        R result = parseResult(res, "登录失败", userLoginVo);
-        if(StringUtils.equals(result.get("code").toString(),"0")){
+        Result result = parseResult(res, "登录失败", userLoginVo);
+        if(StringUtils.equals(result.getCode().toString(),"0")){
             SysUserEntity manager = sysUserService.queryByUserMobile(userOnlyLoginVo.getUsername());
             if(!ObjectUtils.isEmpty(manager) && manager.getDeptId() != -1L){
-                return R.error("操作失败，当前账号已被绑定");
+                return Result.failure("操作失败，当前账号已被绑定");
             }
         }
         return result;
@@ -223,13 +224,13 @@ public class SysLoginController {
     @SysLog("登录")
     @ResponseBody
     @RequestMapping(value = "/sys/login", method = RequestMethod.POST)
-    public R login(String username, String password, String captcha) throws IOException {
+    public Result login(String username, String password, String captcha) throws IOException {
         String kaptcha = ShiroUtils.getKaptcha(Constants.KAPTCHA_SESSION_KEY);
         if (null == kaptcha) {
-            return R.error("验证码已失效");
+            return Result.failure("验证码已失效");
         }
         if (!captcha.equalsIgnoreCase(kaptcha)) {
-            return R.error("验证码不正确");
+            return Result.failure("验证码不正确");
         }
 
         //对前端传的密码解密
@@ -237,46 +238,46 @@ public class SysLoginController {
 
         ResponseEntity<String> loginResult = zhiHouseService.login(username, password);
         if(loginResult.getStatusCode()!= HttpStatus.OK){
-            return R.error("登录失败");
+            return Result.failure("登录失败");
         }
         //解析返回结果
         JSONObject res = JSONObject.parseObject(loginResult.getBody());
-        R result = parseResultWithoutAddUser(res, "登录失败");
-        if (null != result && result.containsKey("code") && result.get("code").equals(0)) {
+        Result result = parseResultWithoutAddUser(res, "登录失败");
+        if (null != result && result.getCode().equals(0)) {
             log.info("四维看看登录完成，将执行本地登录验证");
             try {
                 Subject subject = ShiroUtils.getSubject();
                 UsernamePasswordToken token = new UsernamePasswordToken(username, password);
                 subject.login(token);
             } catch (UnknownAccountException | IncorrectCredentialsException | LockedAccountException e) {
-                return R.error(e.getMessage());
+                return Result.failure(e.getMessage());
             } catch (AuthenticationException e) {
-                return R.error("账户验证失败");
+                return Result.failure("账户验证失败");
             }
         }
         return result;
     }
     @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
-    public R parseResultWithoutAddUser(JSONObject res, String defaultFailMsg) {
+    public Result parseResultWithoutAddUser(JSONObject res, String defaultFailMsg) {
         if(ObjectUtils.isEmpty(res)){
-            return R.error(defaultFailMsg);
+            return Result.failure(defaultFailMsg);
         }
         int code = res.containsKey("code") ? res.getIntValue("code") : -10;
         if (200 != code) {
-            return R.error(res.getString("message"));
+            return Result.failure(res.getString("message"));
         }
         Map<String, Object> resultMap = new HashMap<>();
         JSONObject dataObject = null;
         String tokenFromKankan = "";
         if (res.get("message") instanceof JSONArray) {
             log.info("四维看看登录返回的data是json数组");
-            return R.ok();
+            return Result.success();
         } else if (res.get("message") instanceof JSONObject) {
             log.info("四维看看登录返回的data是json object");
             //登录返回的就是jsonObject
             dataObject = (JSONObject) res.get("message");
             if(ObjectUtils.isEmpty(dataObject)){
-                return R.ok(resultMap);
+                return Result.success(resultMap);
             }
             tokenFromKankan = dataObject.getString("token");
             if (StringUtils.isBlank(tokenFromKankan)) {
@@ -290,7 +291,7 @@ public class SysLoginController {
             }
             SysUserEntity dbUser = sysUserService.queryByUserMobile(userName);
             if (null == dbUser) {
-                  return R.error(11 ,"账号未授权，请联系平台管理员授予相关权限。");
+                  return Result.failure(11 ,"账号未授权，请联系平台管理员授予相关权限。");
             }
             if (null != dbUser.getStatus() && dbUser.getStatus() == 0) {
                 log.info("用户[{}]不可用", dbUser.getUsername());
@@ -309,9 +310,9 @@ public class SysLoginController {
                 userVo.setFdkkPassword(null);
             }
             resultMap.put("user", userVo);
-            return R.ok(resultMap);
+            return Result.success(resultMap);
         } else {
-            return R.error("四维看看返回数据测试异常");
+            return Result.failure("四维看看返回数据测试异常");
         }
 
 
@@ -319,24 +320,24 @@ public class SysLoginController {
 
 
     @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
-    public R parseResult(JSONObject res, String defaultFailMsg, ZhiHouseUserLoginVo adminRegisterVo) {
+    public Result parseResult(JSONObject res, String defaultFailMsg, ZhiHouseUserLoginVo adminRegisterVo) {
         if(ObjectUtils.isEmpty(res)){
-            return R.error(defaultFailMsg);
+            return Result.failure(defaultFailMsg);
         }
         int code =res.containsKey("code")?res.getIntValue("code"): -10;
         if (200 != code) {
-            return R.error(res.getString("message"));
+            return Result.failure(res.getString("message"));
         }
         Map<String, Object> resultMap = new HashMap<>();
         log.info("用户登录成功");
         if (res.get("message") instanceof JSONArray) {
             log.info("四维看看登录返回的data是json数组");
-            return R.ok();
+            return Result.success();
         } else if (res.get("message") instanceof JSONObject) {
             log.info("四维看看登录返回的data是json object");
             JSONObject dataObject = (JSONObject) res.get("message");
             if(ObjectUtils.isEmpty(dataObject)){
-                return R.ok(resultMap);
+                return Result.success(resultMap);
             }
             String tokenFromKankan = dataObject.getString("token");
             if (StringUtils.isBlank(tokenFromKankan)) {
@@ -375,9 +376,9 @@ public class SysLoginController {
                 }
             }
             resultMap.put("user", dbUser);
-            return R.ok(resultMap);
+            return Result.success(resultMap);
         } else {
-            return R.error("四维看看返回数据测试异常");
+            return Result.failure("四维看看返回数据测试异常");
         }
     }
 

platform-common/src/main/java/com/platform/controller/SysMenuController.java

@@ -1,6 +1,7 @@
 package com.platform.controller;
 
 import com.platform.annotation.SysLog;
+import com.platform.entity.Result;
 import com.platform.entity.SysMenuEntity;
 import com.platform.service.SysMenuService;
 import com.platform.utils.*;
@@ -34,26 +35,23 @@ public class SysMenuController extends AbstractController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("sys:menu:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
         List<SysMenuEntity> menuList = sysMenuService.queryList(query);
         int total = sysMenuService.queryTotal(query);
-
-        PageUtils pageUtil = new PageUtils(menuList, total, query.getLimit(), query.getPage());
-
-        return R.ok().put("page", pageUtil);
+        return Result.success(PageUtilsPlus.page(menuList, (long) total,(long)query.getLimit(),(long)query.getPage()));
     }
 
     /**
      * 所有菜单列表
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
         //查询列表数据
         List<SysMenuEntity> menuList = sysMenuService.queryList(params);
 
-        return R.ok().put("list", menuList);
+        return Result.success(menuList);
     }
 
     /**
@@ -61,7 +59,7 @@ public class SysMenuController extends AbstractController {
      */
     @RequestMapping("/select")
     @RequiresPermissions("sys:menu:select")
-    public R select() {
+    public Result select() {
         //查询列表数据
         List<SysMenuEntity> menuList = sysMenuService.queryNotButtonList();
 
@@ -73,7 +71,7 @@ public class SysMenuController extends AbstractController {
         root.setOpen(true);
         menuList.add(root);
 
-        return R.ok().put("menuList", menuList);
+        return Result.success(menuList);
     }
 
     /**
@@ -81,7 +79,7 @@ public class SysMenuController extends AbstractController {
      */
     @RequestMapping("/perms")
     @RequiresPermissions("sys:menu:perms")
-    public R perms() {
+    public Result perms() {
         //查询列表数据
         List<SysMenuEntity> menuList = null;
 
@@ -92,17 +90,17 @@ public class SysMenuController extends AbstractController {
             menuList = sysMenuService.queryUserList(getUserId());
         }
 
-        return R.ok().put("menuList", menuList);
+        return Result.success(menuList);
     }
 
     /**
      * 菜单信息
      */
-    @RequestMapping("/info/{menuId}")
+    @RequestMapping("/info")
     @RequiresPermissions("sys:menu:info")
-    public R info(@PathVariable("menuId") Long menuId) {
+    public Result info(@RequestParam("menuId") Long menuId) {
         SysMenuEntity menu = sysMenuService.queryObject(menuId);
-        return R.ok().put("menu", menu);
+        return Result.success( menu);
     }
 
     /**
@@ -111,13 +109,13 @@ public class SysMenuController extends AbstractController {
     @SysLog("保存菜单")
     @RequestMapping("/save")
     @RequiresPermissions("sys:menu:save")
-    public R save(@RequestBody SysMenuEntity menu) {
+    public Result save(@RequestBody SysMenuEntity menu) {
         //数据校验
         verifyForm(menu);
 
         sysMenuService.save(menu);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -126,13 +124,13 @@ public class SysMenuController extends AbstractController {
     @SysLog("修改菜单")
     @RequestMapping("/update")
     @RequiresPermissions("sys:menu:update")
-    public R update(@RequestBody SysMenuEntity menu) {
+    public Result update(@RequestBody SysMenuEntity menu) {
         //数据校验
         verifyForm(menu);
 
         sysMenuService.update(menu);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -141,22 +139,22 @@ public class SysMenuController extends AbstractController {
     @SysLog("删除菜单")
     @RequestMapping("/delete")
     @RequiresPermissions("sys:menu:delete")
-    public R delete(@RequestBody Long[] menuIds) {
+    public Result delete(@RequestBody Long[] menuIds) {
         for (Long menuId : menuIds) {
             if (menuId.longValue() <= 30) {
-                return R.error("系统菜单，不能删除");
+                return Result.failure("系统菜单，不能删除");
             }
         }
         sysMenuService.deleteBatch(menuIds);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 用户菜单列表
      */
     @RequestMapping("/user")
-    public R user() {
+    public Result user() {
         List<SysMenuEntity> menuList = sysMenuService.getUserMenuList(getUserId());
         CurrentUserLoginVo user = getUser();
         if(!ObjectUtils.isEmpty(user.getIsPlatformStreamer()) && user.getIsPlatformStreamer()){
@@ -164,7 +162,7 @@ public class SysMenuController extends AbstractController {
         }
         // 隐藏绑定账号
         menuList.removeIf(menu->menu.getName().equals("绑定账号"));
-        return R.ok().put("menuList", menuList);
+        return Result.success( menuList);
     }
 
     /**

platform-common/src/main/java/com/platform/controller/SysRoleController.java

@@ -1,6 +1,7 @@
 package com.platform.controller;
 
 import com.platform.annotation.SysLog;
+import com.platform.entity.Result;
 import com.platform.entity.SysRoleEntity;
 import com.platform.service.SysRoleDeptService;
 import com.platform.service.SysRoleMenuService;
@@ -47,7 +48,7 @@ public class SysRoleController extends AbstractController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("sys:role:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //如果不是超级管理员，则只查询自己创建的角色列表
         if (getUserId() != Constant.SUPER_ADMIN) {
             params.put("excludeSuperAdmin",  true);
@@ -64,7 +65,7 @@ public class SysRoleController extends AbstractController {
 
         PageUtils pageUtil = new PageUtils(list, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success(pageUtil);
     }
 
     /**
@@ -72,14 +73,14 @@ public class SysRoleController extends AbstractController {
      */
     @RequestMapping("/select")
     @RequiresPermissions("sys:role:select")
-    public R select() {
+    public Result select() {
         Map<String, Object> map = new HashMap<>();
         List<SysRoleEntity> list = new ArrayList<>();
         //默认获取全部，要剔除平台管理员
         map.put("excludeSuperAdmin" , true);
         map.put("hide" , 0);
         list = sysRoleService.queryList(map);
-        return R.ok().put("list", list);
+        return Result.success(list);
     }
 
     /**
@@ -87,7 +88,7 @@ public class SysRoleController extends AbstractController {
      */
     @RequestMapping("/info/{roleId}")
     @RequiresPermissions("sys:role:info")
-    public R info(@PathVariable("roleId") Long roleId) {
+    public Result info(@PathVariable("roleId") Long roleId) {
         SysRoleEntity role = sysRoleService.queryObject(roleId);
 
         //查询角色对应的菜单
@@ -98,7 +99,7 @@ public class SysRoleController extends AbstractController {
         List<Long> deptIdList = sysRoleDeptService.queryDeptIdList(roleId);
         role.setDeptIdList(deptIdList);
 
-        return R.ok().put("role", role);
+        return Result.success(role);
     }
 
     /**
@@ -107,13 +108,13 @@ public class SysRoleController extends AbstractController {
     @SysLog("保存角色")
     @RequestMapping("/save")
     @RequiresPermissions("sys:role:save")
-    public R save(@RequestBody SysRoleEntity role) {
+    public Result save(@RequestBody SysRoleEntity role) {
         ValidatorUtils.validateEntity(role);
 
         role.setCreateUserId(getUserId());
         sysRoleService.save(role);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -122,13 +123,13 @@ public class SysRoleController extends AbstractController {
     @SysLog("修改角色")
     @RequestMapping("/update")
     @RequiresPermissions("sys:role:update")
-    public R update(@RequestBody SysRoleEntity role) {
+    public Result update(@RequestBody SysRoleEntity role) {
         ValidatorUtils.validateEntity(role);
 
         role.setCreateUserId(getUserId());
         sysRoleService.update(role);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -137,9 +138,9 @@ public class SysRoleController extends AbstractController {
     @SysLog("删除角色")
     @RequestMapping("/delete")
     @RequiresPermissions("sys:role:delete")
-    public R delete(@RequestBody Long[] roleIds) {
+    public Result delete(@RequestBody Long[] roleIds) {
         sysRoleService.deleteBatch(roleIds);
 
-        return R.ok();
+        return Result.success();
     }
 }

platform-common/src/main/java/com/platform/entity/Result.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @author
  */
 @Data
-public class Result<T> implements Serializable {
+public class Result implements Serializable {
     private static final long serialVersionUID = -1491499610244557029L;
     public static final String SUCCESS_MSG = "操作成功";
     public static Integer CODE_SUCCESS = 0;
@@ -30,13 +30,13 @@ public class Result<T> implements Serializable {
      * 返回数据
      */
 
-    private T data;
+    private Object data;
 
     public Result(){
 
     }
 
-    public Result(Integer code, String msg, T data) {
+    public Result(Integer code, String msg, Object data) {
         this.code = code;
         this.msg = msg;
         this.data = data;

platform-common/src/main/java/com/platform/service/custom/MySysUserBrandService.java

@@ -10,7 +10,7 @@ import com.platform.enums.IdStarterEnum;
 import com.platform.service.SysUserBrandService;
 import com.platform.service.SysUserService;
 import com.platform.service.impl.SysUserBrandServiceImpl;
-import com.platform.utils.R;
+
 import com.platform.utils.UUidGenerator;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;

platform-common/src/main/java/com/platform/service/impl/SysLogServiceImpl.java

@@ -23,6 +23,7 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogDao, SysLogEntity> impl
         params.put("sidx", "create_date");
         params.put("asc", false);
         Page<SysLogEntity> page = new QueryPlus<SysLogEntity>(params).getPage();
-        return new PageUtilsPlus(page.setRecords(baseMapper.selectSysLogPage(page, params)));
+        page.setRecords(baseMapper.selectSysLogPage(page, params));
+        return PageUtilsPlus.page(page);
     }
 }

platform-common/src/main/java/com/platform/utils/PageUtilsPlus.java

@@ -1,6 +1,8 @@
 package com.platform.utils;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
@@ -13,24 +15,25 @@ import java.util.List;
  * @email 939961241@qq.com
  * @date 2016年11月4日 下午12:59:00
  */
+@Data
 public class PageUtilsPlus implements Serializable {
     private static final long serialVersionUID = 1L;
     /**
      * 总记录数
      */
-    private long totalCount;
+    private Long totalCount;
     /**
      * 每页记录数
      */
-    private long pageSize;
+    private Long limit;
     /**
      * 总页数
      */
-    private long totalPage;
+    private Long totalPage;
     /**
      * 当前页数
      */
-    private long currPage;
+    private Long page;
     /**
      * 列表数据
      */
@@ -39,52 +42,25 @@ public class PageUtilsPlus implements Serializable {
     /**
      * 分页
      */
-    public PageUtilsPlus(Page<?> page) {
-        this.list = page.getRecords();
-        this.totalCount = page.getTotal();
-        this.pageSize = page.getSize();
-        this.currPage = page.getCurrent();
-        this.totalPage = page.getPages();
+    public static PageUtilsPlus  page(Page<?> page) {
+        return page(page.getRecords(),page.getTotal(),page.getSize(),page.getCurrent());
     }
-
-    public long getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(int totalCount) {
-        this.totalCount = totalCount;
-    }
-
-    public long getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(int pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public long getTotalPage() {
-        return totalPage;
-    }
-
-    public void setTotalPage(int totalPage) {
-        this.totalPage = totalPage;
-    }
-
-    public long getCurrPage() {
-        return currPage;
+    public static PageUtilsPlus  page(List<?> list,Page<?> page) {
+        return page(list,page.getTotal(),page.getSize(),page.getCurrent());
     }
-
-    public void setCurrPage(int currPage) {
-        this.currPage = currPage;
+    public static PageUtilsPlus page(IPage<?> page) {
+        return page(page.getRecords(),page.getTotal(),page.getSize(),page.getCurrent());
     }
-
-    public List<?> getList() {
-        return list;
+    public static PageUtilsPlus  page(List<?> list,IPage<?> page) {
+        return page(list,page.getTotal(),page.getSize(),page.getCurrent());
     }
-
-    public void setList(List<?> list) {
-        this.list = list;
+    public static PageUtilsPlus page(List<?> list,Long totalCount,Long pageSize,Long currPage) {
+        PageUtilsPlus pageUtilsPlus = new PageUtilsPlus();
+        pageUtilsPlus.setList(list);
+        pageUtilsPlus.setTotalCount(totalCount);
+        pageUtilsPlus.setLimit(pageSize);
+        pageUtilsPlus.setPage(currPage);
+        return pageUtilsPlus;
     }
 
 }

platform-common/src/main/java/com/platform/utils/Query.java

@@ -1,6 +1,7 @@
 package com.platform.utils;
 
 import com.platform.xss.SQLFilter;
+import lombok.Data;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -12,19 +13,20 @@ import java.util.Map;
  * @email 939961241@qq.com
  * @date 2017-03-14 23:15
  */
+@Data
 public class Query extends LinkedHashMap<String, Object> {
     private static final long serialVersionUID = 1L;
     //当前页码
-    private int page;
+    private Integer page;
     //每页条数
-    private int limit = 10;
+    private Integer limit = 10;
 
     public Query(Map<String, Object> params) {
         this.putAll(params);
 
         //分页参数
-        this.page = Integer.parseInt(params.get("page").toString());
-        this.limit = Integer.parseInt(params.get("limit").toString());
+        this.page = Integer.valueOf(params.get("page").toString());
+        this.limit = Integer.valueOf(params.get("limit").toString());
         this.put("offset", (page - 1) * limit);
         this.put("page", page);
         this.put("limit", limit);
@@ -37,19 +39,4 @@ public class Query extends LinkedHashMap<String, Object> {
     }
 
 
-    public int getPage() {
-        return page;
-    }
-
-    public void setPage(int page) {
-        this.page = page;
-    }
-
-    public int getLimit() {
-        return limit;
-    }
-
-    public void setLimit(int limit) {
-        this.limit = limit;
-    }
 }

platform-common/src/main/java/com/platform/utils/R.java

@@ -1,55 +1,55 @@
-package com.platform.utils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 返回数据
- *
- * @author lipengjun
- * @email 939961241@qq.com
- * @date 2016年10月27日 下午9:59:27
- */
-public class R extends HashMap<String, Object> {
-    private static final long serialVersionUID = 1L;
-
-    public R() {
-        put("code", 0);
-    }
-
-    public static R error() {
-        return error(500, "未知异常，请联系管理员");
-    }
-
-    public static R error(String msg) {
-        return error(500, msg);
-    }
-
-    public static R error(int code, String msg) {
-        R r = new R();
-        r.put("code", code);
-        r.put("msg", msg);
-        return r;
-    }
-
-    public static R ok(String msg) {
-        R r = new R();
-        r.put("msg", msg);
-        return r;
-    }
-
-    public static R ok(Map<String, Object> map) {
-        R r = new R();
-        r.putAll(map);
-        return r;
-    }
-
-    public static R ok() {
-        return new R();
-    }
-
-    public R put(String key, Object value) {
-        super.put(key, value);
-        return this;
-    }
-}
+//package com.platform.utils;
+//
+//import java.util.HashMap;
+//import java.util.Map;
+//
+///**
+// * 返回数据
+// *
+// * @author lipengjun
+// * @email 939961241@qq.com
+// * @date 2016年10月27日 下午9:59:27
+// */
+//public class Result extends HashMap<String, Object> {
+//    private static final long serialVersionUID = 1L;
+//
+//    public R() {
+//        put("code", 0);
+//    }
+//
+//    public static Result error() {
+//        return error(500, "未知异常，请联系管理员");
+//    }
+//
+//    public static Result error(String msg) {
+//        return error(500, msg);
+//    }
+//
+//    public static Result error(int code, String msg) {
+//        Result r = new R();
+//        r.put("code", code);
+//        r.put("msg", msg);
+//        return r;
+//    }
+//
+//    public static Result ok(String msg) {
+//        Result r = new R();
+//        r.put("msg", msg);
+//        return r;
+//    }
+//
+//    public static Result ok(Map<String, Object> map) {
+//        Result r = new R();
+//        r.putAll(map);
+//        return r;
+//    }
+//
+//    public static Result ok() {
+//        return new R();
+//    }
+//
+//    public Result put(String key, Object value) {
+//        super.put(key, value);
+//        return this;
+//    }
+//}

platform-common/src/main/java/com/platform/utils/RRException.java

@@ -11,7 +11,7 @@ public class RRException extends RuntimeException {
     private static final long serialVersionUID = 1L;
 
     private String msg;
-    private int code = 500;
+    private int code = -1;
 
     public RRException(String msg) {
         super(msg);

platform-common/src/main/java/com/platform/utils/RRExceptionHandler.java

@@ -1,5 +1,6 @@
 package com.platform.utils;
 
+import com.platform.entity.Result;
 import org.apache.shiro.authz.AuthorizationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,30 +25,26 @@ public class RRExceptionHandler {
      * 自定义异常
      */
     @ExceptionHandler(RRException.class)
-    public R handleRRException(RRException e) {
-        R r = new R();
-        r.put("code", e.getCode());
-        r.put("msg", e.getMessage());
-
-        return r;
+    public Result handleRRException(RRException e) {
+        return Result.failure(e.getCode(),e.getMsg());
     }
 
     @ExceptionHandler(DuplicateKeyException.class)
-    public R handleDuplicateKeyException(DuplicateKeyException e) {
+    public Result handleDuplicateKeyException(DuplicateKeyException e) {
         logger.error(e.getMessage(), e);
-        return R.error("数据库中已存在该记录");
+        return Result.failure("数据库中已存在该记录");
     }
 
     @ExceptionHandler(AuthorizationException.class)
-    public R handleAuthorizationException(AuthorizationException e) {
+    public Result handleAuthorizationException(AuthorizationException e) {
         logger.error(e.getMessage(), e);
-        return R.error("没有权限，请联系管理员授权");
+        return Result.failure("没有权限，请联系管理员授权");
     }
 
     @ExceptionHandler(Exception.class)
-    public R handleException(Exception e) {
+    public Result handleException(Exception e) {
         logger.error(e.getMessage(), e);
-        return R.error();
+        return Result.failure(e.getMessage());
     }
 
 

platform-shop/src/main/java/com/platform/controller/AdController.java

@@ -2,10 +2,11 @@ package com.platform.controller;
 
 import com.platform.annotation.CanUserUpdateRecord;
 import com.platform.entity.AdEntity;
+import com.platform.entity.Result;
 import com.platform.service.AdService;
 import com.platform.utils.PageUtils;
+import com.platform.utils.PageUtilsPlus;
 import com.platform.utils.Query;
-import com.platform.utils.R;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -31,7 +32,7 @@ public class AdController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("ad:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -40,7 +41,7 @@ public class AdController {
 
         PageUtils pageUtil = new PageUtils(adList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success(PageUtilsPlus.page(adList,(long) total,(long) query.getLimit(),(long) query.getPage()));
     }
 
 
@@ -49,10 +50,10 @@ public class AdController {
      */
     @RequestMapping("/info/{id}")
     @RequiresPermissions("ad:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@PathVariable("id") Integer id) {
         AdEntity ad = adService.queryObject(id);
 
-        return R.ok().put("ad", ad);
+        return Result.success( ad);
     }
 
     /**
@@ -61,10 +62,10 @@ public class AdController {
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("ad:save")
-    public R save(@RequestBody AdEntity ad) {
+    public Result save(@RequestBody AdEntity ad) {
         adService.save(ad);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -73,10 +74,10 @@ public class AdController {
     @CanUserUpdateRecord
     @RequestMapping("/update")
     @RequiresPermissions("ad:update")
-    public R update(@RequestBody AdEntity ad) {
+    public Result update(@RequestBody AdEntity ad) {
         adService.update(ad);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -85,20 +86,20 @@ public class AdController {
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("ad:delete")
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         adService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 查看所有列表
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<AdEntity> list = adService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success( list);
     }
 }

platform-shop/src/main/java/com/platform/controller/AdPositionController.java

@@ -2,10 +2,12 @@ package com.platform.controller;
 
 import com.platform.annotation.CanUserUpdateRecord;
 import com.platform.entity.AdPositionEntity;
+import com.platform.entity.Result;
 import com.platform.service.AdPositionService;
 import com.platform.utils.PageUtils;
+import com.platform.utils.PageUtilsPlus;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -31,7 +33,7 @@ public class AdPositionController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("adposition:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -40,19 +42,19 @@ public class AdPositionController {
 
         PageUtils pageUtil = new PageUtils(adPositionList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success(PageUtilsPlus.page(adPositionList,(long)total,(long)query.getLimit(),(long)query.getPage()));
     }
 
 
     /**
      * 查看信息
      */
-    @RequestMapping("/info/{id}")
+    @RequestMapping("/info")
     @RequiresPermissions("adposition:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@RequestParam("id") Integer id) {
         AdPositionEntity adPosition = adPositionService.queryObject(id);
 
-        return R.ok().put("adPosition", adPosition);
+        return Result.success(adPosition);
     }
 
     /**
@@ -61,10 +63,10 @@ public class AdPositionController {
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("adposition:save")
-    public R save(@RequestBody AdPositionEntity adPosition) {
+    public Result save(@RequestBody AdPositionEntity adPosition) {
         adPositionService.save(adPosition);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -73,10 +75,10 @@ public class AdPositionController {
     @CanUserUpdateRecord
     @RequestMapping("/update")
     @RequiresPermissions("adposition:update")
-    public R update(@RequestBody AdPositionEntity adPosition) {
+    public Result update(@RequestBody AdPositionEntity adPosition) {
         adPositionService.update(adPosition);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -85,20 +87,20 @@ public class AdPositionController {
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("adposition:delete")
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         adPositionService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 查看所有列表
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<AdPositionEntity> list = adPositionService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success( list);
     }
 }

platform-shop/src/main/java/com/platform/controller/AddressController.java

@@ -2,10 +2,10 @@ package com.platform.controller;
 
 import com.platform.annotation.CanUserUpdateRecord;
 import com.platform.entity.AddressEntity;
+import com.platform.entity.Result;
 import com.platform.service.AddressService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -31,7 +31,7 @@ public class AddressController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("address:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -40,19 +40,19 @@ public class AddressController {
 
         PageUtils pageUtil = new PageUtils(addressList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success(pageUtil);
     }
 
 
     /**
      * 查看信息
      */
-    @RequestMapping("/info/{id}")
+    @RequestMapping("/info")
     @RequiresPermissions("address:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@RequestParam("id") Integer id) {
         AddressEntity address = addressService.queryObject(id);
 
-        return R.ok().put("address", address);
+        return Result.success( address);
     }
 
     /**
@@ -61,10 +61,10 @@ public class AddressController {
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("address:save")
-    public R save(@RequestBody AddressEntity address) {
+    public Result save(@RequestBody AddressEntity address) {
         addressService.save(address);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -73,10 +73,10 @@ public class AddressController {
     @CanUserUpdateRecord
     @RequestMapping("/update")
     @RequiresPermissions("address:update")
-    public R update(@RequestBody AddressEntity address) {
+    public Result update(@RequestBody AddressEntity address) {
         addressService.update(address);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -85,9 +85,9 @@ public class AddressController {
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("address:delete")
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         addressService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 }

platform-shop/src/main/java/com/platform/controller/AttributeCategoryController.java

@@ -2,11 +2,14 @@ package com.platform.controller;
 
 import com.platform.annotation.CanUserUpdateRecord;
 import com.platform.entity.AttributeCategoryEntity;
+import com.platform.entity.Result;
 import com.platform.service.AttributeCategoryService;
 import com.platform.utils.PageUtils;
+import com.platform.utils.PageUtilsPlus;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jgroups.protocols.tom.TOA;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,7 +34,7 @@ public class AttributeCategoryController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("attributecategory:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -40,7 +43,7 @@ public class AttributeCategoryController {
 
         PageUtils pageUtil = new PageUtils(attributeCategoryList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success(PageUtilsPlus.page(attributeCategoryList,(long)total, (long) query.getLimit(),(long)query.getPage()));
     }
 
 
@@ -49,10 +52,10 @@ public class AttributeCategoryController {
      */
     @RequestMapping("/info/{id}")
     @RequiresPermissions("attributecategory:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@PathVariable("id") Integer id) {
         AttributeCategoryEntity attributeCategory = attributeCategoryService.queryObject(id);
 
-        return R.ok().put("attributeCategory", attributeCategory);
+        return Result.success( attributeCategory);
     }
 
     /**
@@ -61,10 +64,10 @@ public class AttributeCategoryController {
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("attributecategory:save")
-    public R save(@RequestBody AttributeCategoryEntity attributeCategory) {
+    public Result save(@RequestBody AttributeCategoryEntity attributeCategory) {
         attributeCategoryService.save(attributeCategory);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -73,10 +76,10 @@ public class AttributeCategoryController {
     @CanUserUpdateRecord
     @RequestMapping("/update")
     @RequiresPermissions("attributecategory:update")
-    public R update(@RequestBody AttributeCategoryEntity attributeCategory) {
+    public Result update(@RequestBody AttributeCategoryEntity attributeCategory) {
         attributeCategoryService.update(attributeCategory);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -85,20 +88,20 @@ public class AttributeCategoryController {
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("attributecategory:delete")
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         attributeCategoryService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 查看所有列表
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<AttributeCategoryEntity> list = attributeCategoryService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success(list);
     }
 }

platform-shop/src/main/java/com/platform/controller/AttributeController.java

@@ -2,10 +2,12 @@ package com.platform.controller;
 
 import com.platform.annotation.CanUserUpdateRecord;
 import com.platform.entity.AttributeEntity;
+import com.platform.entity.Result;
 import com.platform.service.AttributeService;
 import com.platform.utils.PageUtils;
+import com.platform.utils.PageUtilsPlus;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -31,7 +33,7 @@ public class AttributeController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("attribute:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -40,7 +42,7 @@ public class AttributeController {
 
         PageUtils pageUtil = new PageUtils(attributeList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success(PageUtilsPlus.page(attributeList,(long)total,(long)query.getLimit(),(long) query.getPage()));
     }
 
 
@@ -49,10 +51,10 @@ public class AttributeController {
      */
     @RequestMapping("/info/{id}")
     @RequiresPermissions("attribute:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@PathVariable("id") Integer id) {
         AttributeEntity attribute = attributeService.queryObject(id);
 
-        return R.ok().put("attribute", attribute);
+        return Result.success( attribute);
     }
 
     /**
@@ -61,10 +63,10 @@ public class AttributeController {
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("attribute:save")
-    public R save(@RequestBody AttributeEntity attribute) {
+    public Result save(@RequestBody AttributeEntity attribute) {
         attributeService.save(attribute);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -73,10 +75,10 @@ public class AttributeController {
     @CanUserUpdateRecord
     @RequestMapping("/update")
     @RequiresPermissions("attribute:update")
-    public R update(@RequestBody AttributeEntity attribute) {
+    public Result update(@RequestBody AttributeEntity attribute) {
         attributeService.update(attribute);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -85,20 +87,20 @@ public class AttributeController {
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("attribute:delete")
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         attributeService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 查看所有列表
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<AttributeEntity> list = attributeService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success( list);
     }
 }

platform-shop/src/main/java/com/platform/controller/BrandController.java

@@ -5,10 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.platform.annotation.CanUserUpdateRecord;
-import com.platform.entity.BrandEntity;
-import com.platform.entity.GoodsEntity;
-import com.platform.entity.SceneEntity;
-import com.platform.entity.SysUserEntity;
+import com.platform.entity.*;
 import com.platform.service.BrandService;
 import com.platform.service.GoodsService;
 import com.platform.service.SceneService;
@@ -78,14 +75,14 @@ public class BrandController extends AbstractController{
     @ApiOperation(value = "用户绑定品牌")
     @PostMapping("/bindUser")
     @RequiresPermissions("brand:list")
-    public R bindUser(@ApiParam(name = "BrandBindUserVo对象", value = "传入json格式", required = true)
+    public Result bindUser(@ApiParam(name = "BrandBindUserVo对象", value = "传入json格式", required = true)
                           @RequestBody List<BrandBindUserVo> brandBindUserVoList) {
         if(CollectionUtils.isEmpty(brandBindUserVoList)){
-            return R.error("入参缺失");
+            return Result.failure("入参缺失");
         }
         brandService.bindUsers(brandBindUserVoList);
 
-        return R.ok();
+        return Result.success();
     }
 
 
@@ -96,10 +93,10 @@ public class BrandController extends AbstractController{
      */
     @GetMapping("/brandTypeList")
     @RequiresPermissions("brand:list")
-    public R brandTypeList() {
+    public Result brandTypeList() {
         Map<String , Object> map = new HashMap<>();
         map.put("list" , tmBrandTypeService.getAllList());
-        return R.ok(map);
+        return Result.success(map);
     }
 
 
@@ -109,7 +106,7 @@ public class BrandController extends AbstractController{
     @ApiOperation(value = "店铺绑定情况列表")
     @GetMapping("/brandBindList")
     @RequiresPermissions("brand:list")
-    public R brandBindList(@RequestParam(name = "page") long page,
+    public Result brandBindList(@RequestParam(name = "page") long page,
                            @RequestParam(name = "limit") long limit,
                            String sceneName,String brandName,Integer type,Integer livestreamStatus) {
         List<Long> deptIdList = null;
@@ -122,7 +119,7 @@ public class BrandController extends AbstractController{
                 userId = getUserId();
             }else{
                 if(ObjectUtils.isEmpty(getUser().getDeptId())){
-                    return R.error("该账号未绑定公司！");
+                    return Result.failure("该账号未绑定公司！");
                 }
                 // 公司管理员
                 deptIdList = departmentUtils.getAllSubDeptIds(getUser().getDeptId());
@@ -131,7 +128,7 @@ public class BrandController extends AbstractController{
         IPage<BrandEntity> resultPage = brandService.queryBrandBindList(page , limit , sceneName , brandName,
                 deptIdList ,type,userId,livestreamStatus);
         if(null == resultPage){
-            return R.error("获取店铺绑定列表失败");
+            return Result.failure("获取店铺绑定列表失败");
         }
         List<BrandRspVo> rspBrandList = resultPage.getRecords().parallelStream().map(brandEntity -> {
             BrandRspVo brandRspVo = new BrandRspVo();
@@ -145,8 +142,7 @@ public class BrandController extends AbstractController{
             brandRspVo.setSceneUrl(scene.getSceneUrl());
             return brandRspVo;
         }).collect(Collectors.toList());
-        return R.ok(CommonDataUtils.assembleResult(resultPage.getTotal() , resultPage.getPages() ,
-                resultPage.getCurrent() , rspBrandList));
+        return Result.success(PageUtilsPlus.page(rspBrandList,resultPage));
     }
 
     /**
@@ -154,9 +150,9 @@ public class BrandController extends AbstractController{
      */
     @PostMapping("/info")
     @RequiresPermissions("brand:info")
-    public R info(@RequestBody BrandEntity brandEntity) {
+    public Result info(@RequestBody BrandEntity brandEntity) {
         if(ObjectUtils.isEmpty(brandEntity.getId())){
-            return R.error("参数有误！");
+            return Result.failure("参数有误！");
         }
         BrandEntity brand = brandService.queryObject(brandEntity.getId().intValue());
         BrandRspVo brandRspVo = new BrandRspVo();
@@ -164,7 +160,7 @@ public class BrandController extends AbstractController{
         SceneEntity scene = sceneService.queryByScene(brand.getSceneNum());
         brandRspVo.setSceneUrl(scene.getSceneUrl());
         brandRspVo.setSceneName(scene.getName());
-        return R.ok().put("brand", brandRspVo);
+        return Result.success( brandRspVo);
     }
 
 
@@ -176,13 +172,13 @@ public class BrandController extends AbstractController{
     @RequestMapping("/save")
     @RequiresPermissions("brand:save")
     @Transactional(rollbackFor = Exception.class)
-    public R save(@RequestBody BrandEntity params) {
+    public Result save(@RequestBody BrandEntity params) {
         if(ObjectUtils.isEmpty(params.getSceneNum())){
-            return R.error("场景码为空！");
+            return Result.failure("场景码为空！");
         }
         SceneEntity scene = sceneService.queryByScene(params.getSceneNum());
         if(ObjectUtils.isEmpty(scene)){
-            return R.error("场景码错误！");
+            return Result.failure("场景码错误！");
         }
 
         try {
@@ -191,11 +187,11 @@ public class BrandController extends AbstractController{
             paramsMap.put("name",params.getName());
             List<BrandEntity> entities = brandService.queryList(paramsMap);
             if(!ObjectUtils.isEmpty(entities)){
-                return R.error("直播间名称重复！");
+                return Result.failure("直播间名称重复！");
             }
             BrandEntity brand = brandService.queryByScene(params.getSceneNum());
             if(!ObjectUtils.isEmpty(brand)){
-                return R.error("该场景已经绑定直播间！");
+                return Result.failure("该场景已经绑定直播间！");
             }
             brand = new BrandEntity();
             BeanUtils.copyProperties(params,brand);
@@ -213,9 +209,9 @@ public class BrandController extends AbstractController{
             brandService.sendDataToApi(brand);
         } catch (BeansException e) {
             e.printStackTrace();
-            return R.error(ObjectUtils.isEmpty(e.getMessage())?"该场景已经绑定直播间！":e.getMessage());
+            return Result.failure(ObjectUtils.isEmpty(e.getMessage())?"该场景已经绑定直播间！":e.getMessage());
         }
-        return R.ok("新增商铺成功");
+        return Result.success("新增商铺成功");
     }
 
     /**
@@ -225,21 +221,21 @@ public class BrandController extends AbstractController{
     @PostMapping("/update")
     @RequiresPermissions("brand:update")
     @Transactional(rollbackFor = Exception.class)
-    public R update(@RequestBody BrandEntity brand) {
+    public Result update(@RequestBody BrandEntity brand) {
         if(ObjectUtils.isEmpty(brand.getId())){
-            return R.error("id 为空！");
+            return Result.failure("id 为空！");
         }
         BrandEntity oldDbBrand = brandService.queryObject(brand.getId().intValue());
         if(ObjectUtils.isEmpty(oldDbBrand)){
             log.error("获取数据失败:{}",brand.getId());
-            return R.error("获取数据失败！");
+            return Result.failure("获取数据失败！");
         }
         // 判断直播间名称是否重复
         Map<String,Object> paramsMap = new HashMap<>();
         paramsMap.put("name",brand.getName());
         List<BrandEntity> entities = brandService.queryList(paramsMap);
         if (!ObjectUtils.isEmpty(entities) && entities.get(0).getId().compareTo(brand.getId()) != 0) {
-            return R.error("场景名称重复！");
+            return Result.failure("场景名称重复！");
         }
         //上送的场景码和数据库的不一致，说明场景码数据有变更
         if (!org.apache.commons.lang3.StringUtils.equals(brand.getSceneNum(), oldDbBrand.getSceneNum())
@@ -249,7 +245,7 @@ public class BrandController extends AbstractController{
             brand.setShareWxQrCode(wxShareQrCodeUrl);
             SceneEntity scene = sceneService.queryByScene(brand.getSceneNum());
             if(ObjectUtils.isEmpty(scene)){
-                return R.error("场景码错误！");
+                return Result.failure("场景码错误！");
             }
             // 生成直播间地址
             String liveRoomUrl = scene.getSceneUrl().replaceAll("smobile.html", "shop.html");
@@ -259,7 +255,7 @@ public class BrandController extends AbstractController{
         brand.setAppListPicUrl(brand.getAppListPicUrl());
         brandService.update(brand);
         brandService.sendDataToApi(brand);
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -269,9 +265,9 @@ public class BrandController extends AbstractController{
     @RequestMapping("/delete")
     @RequiresPermissions("brand:delete")
     @Transactional(rollbackFor = Exception.class)
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         if(ObjectUtils.isEmpty(ids)){
-            return R.ok();
+            return Result.success();
         }
         // 判断场景是否绑定商品，如果绑定商品，不允许删除；
         Map<String, Object> params = new HashMap<>();
@@ -279,7 +275,7 @@ public class BrandController extends AbstractController{
         params.put("isDelete", 0);
         List<GoodsEntity> goodsEntities = goodsService.queryList(params);
         if (!ObjectUtils.isEmpty(goodsEntities)) {
-            return R.error("该场景或者直播间已经设置了商品，不允许删除！");
+            return Result.failure("该场景或者直播间已经设置了商品，不允许删除！");
         }
         //获取数据，推送给api
         Arrays.stream(ids).map(id-> brandService.queryObject(id)).forEach(entity->brandService.sendDataToApi(entity));
@@ -288,33 +284,33 @@ public class BrandController extends AbstractController{
         mySysUserBrandService.deleteByBrandIds(ids);
 
         brandService.deleteBatch(ids);
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 查看所有列表
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
         Long userId = getUserId();
         if(Constant.SUPER_ADMIN != userId){
             //通过部门ID过滤数据
             if(null == getDeptId()){
-                return R.ok().put("list", new ArrayList<>());
+                return Result.success(new ArrayList<>());
             }
             params.put("deptIdList", departmentUtils.getAllSubDeptIds(getDeptId()));
         }
 
         List<BrandEntity> list = brandService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success(list);
     }
 
     /**
      * 查看所有列表
      */
     @RequestMapping("/queryAllHot")
-    public R queryAllHot(@RequestParam Map<String, Object> params) throws Exception {
+    public Result queryAllHot(@RequestParam Map<String, Object> params) throws Exception {
         //查询列表数据
         Query query = new Query(params);
 
@@ -458,7 +454,7 @@ public class BrandController extends AbstractController{
         }
 
         PageUtils pageUtil = new PageUtils(page, resultList.size(), query.getLimit(), query.getPage());
-        return R.ok().put("page", pageUtil);
+        return Result.success( pageUtil);
     }
 
     /**
@@ -466,7 +462,7 @@ public class BrandController extends AbstractController{
      */
     @CanUserUpdateRecord
     @RequestMapping("/saveGoodsHot")
-    public R saveGoodsHot(@RequestParam Map<String, Object> params) throws Exception {
+    public Result saveGoodsHot(@RequestParam Map<String, Object> params) throws Exception {
         String scenePath = this.scenePath;
         String origin = ResourceUtil.getConfigByName("origin");
 
@@ -482,10 +478,10 @@ public class BrandController extends AbstractController{
         JSONObject object = JSON.parseObject(result);
 
         if(object.getIntValue("code") == 0){
-            return R.ok();
+            return Result.success();
         }
 
-        return R.error("添加商品与热点关联失败");
+        return Result.failure("添加商品与热点关联失败");
     }
 
     /**
@@ -493,7 +489,7 @@ public class BrandController extends AbstractController{
      */
     @CanUserUpdateRecord
     @RequestMapping("/deleteGoodsHot")
-    public R deleteGoodsHot(@RequestParam Map<String, Object> params) throws Exception {
+    public Result deleteGoodsHot(@RequestParam Map<String, Object> params) throws Exception {
         String scenePath = this.scenePath;
         String origin = ResourceUtil.getConfigByName("origin");
 
@@ -507,9 +503,9 @@ public class BrandController extends AbstractController{
         JSONObject object = JSON.parseObject(result);
 
         if(object.getIntValue("code") == 0){
-            return R.ok();
+            return Result.success();
         }
-        return R.error("删除热点商品关联失败");
+        return Result.failure("删除热点商品关联失败");
     }
 
     /**

platform-shop/src/main/java/com/platform/controller/CartController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.platform.annotation.CanUserUpdateRecord;
+import com.platform.entity.Result;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -16,7 +17,7 @@ import com.platform.entity.CartEntity;
 import com.platform.service.CartService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 
 
 /**
@@ -37,7 +38,7 @@ public class CartController {
 	 */
 	@RequestMapping("/list")
 	@RequiresPermissions("cart:list")
-	public R list(@RequestParam Map<String, Object> params){
+	public Result list(@RequestParam Map<String, Object> params){
 		//查询列表数据
         Query query = new Query(params);
 
@@ -46,19 +47,19 @@ public class CartController {
 		
 		PageUtils pageUtil = new PageUtils(cartList, total, query.getLimit(), query.getPage());
 		
-		return R.ok().put("page", pageUtil);
+		return Result.success(pageUtil);
 	}
 	
 	
 	/**
 	 * 信息
 	 */
-	@RequestMapping("/info/{id}")
+	@RequestMapping("/info")
 	@RequiresPermissions("cart:info")
-	public R info(@PathVariable("id") Integer id){
+	public Result info(@RequestParam("id") Integer id){
 		CartEntity cart = cartService.queryObject(id);
 		
-		return R.ok().put("cart", cart);
+		return Result.success( cart);
 	}
 	
 	/**
@@ -67,10 +68,10 @@ public class CartController {
 	@CanUserUpdateRecord
 	@RequestMapping("/save")
 	@RequiresPermissions("cart:save")
-	public R save(@RequestBody CartEntity cart){
+	public Result save(@RequestBody CartEntity cart){
 		cartService.save(cart);
 		
-		return R.ok();
+		return Result.success();
 	}
 	
 	/**
@@ -79,10 +80,10 @@ public class CartController {
 	@CanUserUpdateRecord
 	@RequestMapping("/update")
 	@RequiresPermissions("cart:update")
-	public R update(@RequestBody CartEntity cart){
+	public Result update(@RequestBody CartEntity cart){
 		cartService.update(cart);
 		
-		return R.ok();
+		return Result.success();
 	}
 	
 	/**
@@ -91,10 +92,10 @@ public class CartController {
 	@CanUserUpdateRecord
 	@RequestMapping("/delete")
 	@RequiresPermissions("cart:delete")
-	public R delete(@RequestBody Integer[] ids){
+	public Result delete(@RequestBody Integer[] ids){
 		cartService.deleteBatch(ids);
 		
-		return R.ok();
+		return Result.success();
 	}
 	
 }

platform-shop/src/main/java/com/platform/controller/CategoryController.java

@@ -2,10 +2,11 @@ package com.platform.controller;
 
 import com.platform.annotation.CanUserUpdateRecord;
 import com.platform.entity.CategoryEntity;
+import com.platform.entity.Result;
 import com.platform.service.CategoryService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 import com.platform.utils.TreeUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +34,7 @@ public class CategoryController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("category:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -42,7 +43,7 @@ public class CategoryController {
 
         PageUtils pageUtil = new PageUtils(categoryList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success(pageUtil);
     }
 
     /**
@@ -50,10 +51,10 @@ public class CategoryController {
      */
     @RequestMapping("/info/{id}")
     @RequiresPermissions("category:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@PathVariable("id") Integer id) {
         CategoryEntity category = categoryService.queryObject(id);
 
-        return R.ok().put("category", category);
+        return Result.success( category);
     }
 
     /**
@@ -62,7 +63,7 @@ public class CategoryController {
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("category:save")
-    public R save(@RequestBody CategoryEntity category) {
+    public Result save(@RequestBody CategoryEntity category) {
         return categoryService.save(category);
     }
 
@@ -72,7 +73,7 @@ public class CategoryController {
     @CanUserUpdateRecord
     @RequestMapping("/update")
     @RequiresPermissions("category:update")
-    public R update(@RequestBody CategoryEntity category) {
+    public Result update(@RequestBody CategoryEntity category) {
         return categoryService.update(category);
     }
 
@@ -82,17 +83,17 @@ public class CategoryController {
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("category:delete")
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         categoryService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 查看所有列表
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<CategoryEntity> list = categoryService.queryList(params);
         //添加顶级菜单
@@ -102,14 +103,14 @@ public class CategoryController {
         root.setParentId(-1);
         root.setOpen(true);
         list.add(0,root);
-        return R.ok().put("list", list);
+        return Result.success(list);
     }
 
     /**
      * 查看信息(全部加载页面渲染太慢！)
      */
     @RequestMapping("/getAreaTree")
-    public R getAreaTree() {
+    public Result getAreaTree() {
         List<CategoryEntity> list = categoryService.queryList(new HashMap<String, Object>());
         for (CategoryEntity sysRegionEntity : list) {
             sysRegionEntity.setValue(sysRegionEntity.getId() + "");
@@ -117,7 +118,7 @@ public class CategoryController {
         }
         List<CategoryEntity> node = TreeUtils.factorTree(list);
 
-        return R.ok().put("node", node);
+        return Result.success( node);
     }
 
     /**
@@ -126,10 +127,10 @@ public class CategoryController {
      * @return
      */
     @RequestMapping("/getCategorySelect")
-    public R getCategorySelect() {
+    public Result getCategorySelect() {
         Map<String, Object> map = new HashMap<>();
         map.put("parentId", "0");
         List<CategoryEntity> list = categoryService.queryList(map);
-        return R.ok().put("list", list);
+        return Result.success(list);
     }
 }

platform-shop/src/main/java/com/platform/controller/ChannelController.java

@@ -2,10 +2,11 @@ package com.platform.controller;
 
 import com.platform.annotation.CanUserUpdateRecord;
 import com.platform.entity.ChannelEntity;
+import com.platform.entity.Result;
 import com.platform.service.ChannelService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -31,7 +32,7 @@ public class ChannelController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("channel:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -40,7 +41,7 @@ public class ChannelController {
 
         PageUtils pageUtil = new PageUtils(channelList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success(pageUtil);
     }
 
     /**
@@ -48,10 +49,10 @@ public class ChannelController {
      */
     @RequestMapping("/info/{id}")
     @RequiresPermissions("channel:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@PathVariable("id") Integer id) {
         ChannelEntity channel = channelService.queryObject(id);
 
-        return R.ok().put("channel", channel);
+        return Result.success(channel);
     }
 
     /**
@@ -60,10 +61,10 @@ public class ChannelController {
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("channel:save")
-    public R save(@RequestBody ChannelEntity channel) {
+    public Result save(@RequestBody ChannelEntity channel) {
         channelService.save(channel);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -72,10 +73,10 @@ public class ChannelController {
     @CanUserUpdateRecord
     @RequestMapping("/update")
     @RequiresPermissions("channel:update")
-    public R update(@RequestBody ChannelEntity channel) {
+    public Result update(@RequestBody ChannelEntity channel) {
         channelService.update(channel);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -84,20 +85,20 @@ public class ChannelController {
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("channel:delete")
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         channelService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 查看所有列表
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<ChannelEntity> list = channelService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success(list);
     }
 }

platform-shop/src/main/java/com/platform/controller/CollectController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.platform.annotation.CanUserUpdateRecord;
+import com.platform.entity.Result;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -16,7 +17,7 @@ import com.platform.entity.CollectEntity;
 import com.platform.service.CollectService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 
 
 /**
@@ -37,7 +38,7 @@ public class CollectController {
 	 */
 	@RequestMapping("/list")
 	@RequiresPermissions("collect:list")
-	public R list(@RequestParam Map<String, Object> params){
+	public Result list(@RequestParam Map<String, Object> params){
 		//查询列表数据
         Query query = new Query(params);
 
@@ -46,7 +47,7 @@ public class CollectController {
 		
 		PageUtils pageUtil = new PageUtils(collectList, total, query.getLimit(), query.getPage());
 		
-		return R.ok().put("page", pageUtil);
+		return Result.success(pageUtil);
 	}
 	
 	
@@ -55,10 +56,10 @@ public class CollectController {
 	 */
 	@RequestMapping("/info/{id}")
 	@RequiresPermissions("collect:info")
-	public R info(@PathVariable("id") Integer id){
+	public Result info(@PathVariable("id") Integer id){
 		CollectEntity collect = collectService.queryObject(id);
 		
-		return R.ok().put("collect", collect);
+		return Result.success(collect);
 	}
 	
 	/**
@@ -67,10 +68,10 @@ public class CollectController {
 	@CanUserUpdateRecord
 	@RequestMapping("/save")
 	@RequiresPermissions("collect:save")
-	public R save(@RequestBody CollectEntity collect){
+	public Result save(@RequestBody CollectEntity collect){
 		collectService.save(collect);
 		
-		return R.ok();
+		return Result.success();
 	}
 	
 	/**
@@ -79,10 +80,10 @@ public class CollectController {
 	@CanUserUpdateRecord
 	@RequestMapping("/update")
 	@RequiresPermissions("collect:update")
-	public R update(@RequestBody CollectEntity collect){
+	public Result update(@RequestBody CollectEntity collect){
 		collectService.update(collect);
 		
-		return R.ok();
+		return Result.success();
 	}
 	
 	/**
@@ -91,10 +92,10 @@ public class CollectController {
 	@CanUserUpdateRecord
 	@RequestMapping("/delete")
 	@RequiresPermissions("collect:delete")
-	public R delete(@RequestBody Integer[] ids){
+	public Result delete(@RequestBody Integer[] ids){
 		collectService.deleteBatch(ids);
 		
-		return R.ok();
+		return Result.success();
 	}
 	
 }

platform-shop/src/main/java/com/platform/controller/CommentController.java

@@ -2,10 +2,11 @@ package com.platform.controller;
 
 import com.platform.annotation.CanUserUpdateRecord;
 import com.platform.entity.CommentEntity;
+import com.platform.entity.Result;
 import com.platform.service.CommentService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -31,7 +32,7 @@ public class CommentController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("comment:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -40,7 +41,7 @@ public class CommentController {
 
         PageUtils pageUtil = new PageUtils(commentList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success( pageUtil);
     }
 
     /**
@@ -48,10 +49,10 @@ public class CommentController {
      */
     @RequestMapping("/info/{id}")
     @RequiresPermissions("comment:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@PathVariable("id") Integer id) {
         CommentEntity comment = commentService.queryObject(id);
 
-        return R.ok().put("comment", comment);
+        return Result.success( comment);
     }
 
     /**
@@ -60,10 +61,10 @@ public class CommentController {
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("comment:save")
-    public R save(@RequestBody CommentEntity comment) {
+    public Result save(@RequestBody CommentEntity comment) {
         commentService.save(comment);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -72,10 +73,10 @@ public class CommentController {
     @CanUserUpdateRecord
     @RequestMapping("/update")
     @RequiresPermissions("comment:update")
-    public R update(@RequestBody CommentEntity comment) {
+    public Result update(@RequestBody CommentEntity comment) {
         commentService.update(comment);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -84,21 +85,21 @@ public class CommentController {
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("comment:delete")
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         commentService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 查看所有列表
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<CommentEntity> list = commentService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success( list);
     }
 
     /**
@@ -107,19 +108,19 @@ public class CommentController {
     @CanUserUpdateRecord
     @RequestMapping("/toggleStatus")
     @RequiresPermissions("comment:toggleStatus")
-    public R toggleStatus(@RequestBody CommentEntity comment) {
+    public Result toggleStatus(@RequestBody CommentEntity comment) {
         commentService.toggleStatus(comment);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 总计
      */
     @RequestMapping("/queryTotal")
-    public R queryTotal(@RequestParam Map<String, Object> params) {
+    public Result queryTotal(@RequestParam Map<String, Object> params) {
         int sum = commentService.queryTotal(params);
 
-        return R.ok().put("sum", sum);
+        return Result.success(sum);
     }
 }

platform-shop/src/main/java/com/platform/controller/CommentPictureController.java

@@ -2,10 +2,11 @@ package com.platform.controller;
 
 import com.platform.annotation.CanUserUpdateRecord;
 import com.platform.entity.CommentPictureEntity;
+import com.platform.entity.Result;
 import com.platform.service.CommentPictureService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -31,7 +32,7 @@ public class CommentPictureController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("commentpicture:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -40,7 +41,7 @@ public class CommentPictureController {
 
         PageUtils pageUtil = new PageUtils(commentPictureList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success(pageUtil);
     }
 
     /**
@@ -48,10 +49,10 @@ public class CommentPictureController {
      */
     @RequestMapping("/info/{id}")
     @RequiresPermissions("commentpicture:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@PathVariable("id") Integer id) {
         CommentPictureEntity commentPicture = commentPictureService.queryObject(id);
 
-        return R.ok().put("commentPicture", commentPicture);
+        return Result.success( commentPicture);
     }
 
     /**
@@ -60,10 +61,10 @@ public class CommentPictureController {
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("commentpicture:save")
-    public R save(@RequestBody CommentPictureEntity commentPicture) {
+    public Result save(@RequestBody CommentPictureEntity commentPicture) {
         commentPictureService.save(commentPicture);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -72,10 +73,10 @@ public class CommentPictureController {
     @CanUserUpdateRecord
     @RequestMapping("/update")
     @RequiresPermissions("commentpicture:update")
-    public R update(@RequestBody CommentPictureEntity commentPicture) {
+    public Result update(@RequestBody CommentPictureEntity commentPicture) {
         commentPictureService.update(commentPicture);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -84,20 +85,20 @@ public class CommentPictureController {
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("commentpicture:delete")
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         commentPictureService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 查看所有列表
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<CommentPictureEntity> list = commentPictureService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success( list);
     }
 }

platform-shop/src/main/java/com/platform/controller/CouponController.java

@@ -3,6 +3,7 @@ package com.platform.controller;
 import com.github.pagehelper.PageHelper;
 import com.platform.annotation.CanUserUpdateRecord;
 import com.platform.entity.CouponEntity;
+import com.platform.entity.Result;
 import com.platform.enums.ResultCodeEnum;
 import com.platform.exception.CommonBaseException;
 import com.platform.service.CouponService;
@@ -47,7 +48,7 @@ public class CouponController extends AbstractController{
     @RequestMapping("/list")
     @RequiresPermissions("coupon:list")
     @Transactional(rollbackFor = Exception.class)
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
         PageHelper.startPage(query.getPage(), query.getLimit());
@@ -56,7 +57,7 @@ public class CouponController extends AbstractController{
         if(Constant.SUPER_ADMIN != userId){
             //通过部门ID过滤数据
             if(null == getDeptId()){
-                return R.ok().put("page", pageUtil);
+                return Result.success(pageUtil);
             }
             query.put("deptIdList", departmentUtils.getAllSubDeptIds(getDeptId()));
         }
@@ -70,7 +71,7 @@ public class CouponController extends AbstractController{
         int total = couponService.queryTotal(query);
         pageUtil = new PageUtils(couponList , total , query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success( pageUtil);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -107,9 +108,9 @@ public class CouponController extends AbstractController{
      */
     @RequestMapping("/useDetailList")
     @RequiresPermissions("coupon:list")
-    public R useDetailList(@RequestParam Map<String, Object> params) {
+    public Result useDetailList(@RequestParam Map<String, Object> params) {
         if(!params.containsKey("couponId")){
-            return R.error("缺失必要参数couponId");
+            return Result.failure("缺失必要参数couponId");
         }
         //查询列表数据
         Query query = new Query(params);
@@ -118,7 +119,7 @@ public class CouponController extends AbstractController{
         int total = couponService.queryUseDetailTotal(query);
         PageUtils pageUtil = new PageUtils(couponList ,1, query.getLimit() , query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success( pageUtil);
     }
 
 
@@ -127,10 +128,10 @@ public class CouponController extends AbstractController{
      */
     @RequestMapping("/info/{id}")
     @RequiresPermissions("coupon:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@PathVariable("id") Integer id) {
         CouponEntity coupon = couponService.queryObject(id);
 
-        return R.ok().put("coupon", coupon);
+        return Result.success(coupon);
     }
 
     /**
@@ -139,16 +140,16 @@ public class CouponController extends AbstractController{
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("coupon:save")
-    public R save(@RequestBody CouponEntity coupon) {
+    public Result save(@RequestBody CouponEntity coupon) {
 
         if(StringUtils.isBlank(coupon.getName())){
-            return R.error("优惠券名称不能为空");
+            return Result.failure("优惠券名称不能为空");
         }
         if(null == coupon.getBrandId() || StringUtils.isBlank(coupon.getBrandName())){
-            return R.error("优惠券所属店铺ID或者名称不能为空");
+            return Result.failure("优惠券所属店铺ID或者名称不能为空");
         }
         if(null == coupon.getUseStartDate() || null == coupon.getUseEndDate()){
-            return R.error("优惠券有效起始日期不能为空");
+            return Result.failure("优惠券有效起始日期不能为空");
         }
 
         Map<String , Object> param = new HashMap<>();
@@ -156,7 +157,7 @@ public class CouponController extends AbstractController{
         param.put("brandName", coupon.getBrandName());
         List<CouponEntity> getList = couponService.queryList(param);
         if(!CollectionUtils.isEmpty(getList)){
-            return R.error("该店铺下同名的优惠券已经存在");
+            return Result.failure("该店铺下同名的优惠券已经存在");
         }
         Date currTime = new Date();
         //优惠券状态 1 未生效 2 生效中 3 已失效 4 停止发放
@@ -184,7 +185,7 @@ public class CouponController extends AbstractController{
             throw new CommonBaseException(ResultCodeEnum.D101 , "新增优惠券失败");
         }
 
-        return R.ok();
+        return Result.success();
     }
 
 
@@ -194,10 +195,10 @@ public class CouponController extends AbstractController{
     @CanUserUpdateRecord
     @PostMapping("/update")
     @RequiresPermissions("coupon:update")
-    public R update(@RequestBody CouponEntity coupon) {
+    public Result update(@RequestBody CouponEntity coupon) {
         couponService.update(coupon);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -206,11 +207,11 @@ public class CouponController extends AbstractController{
     @CanUserUpdateRecord
     @GetMapping("/updateStatus")
     @RequiresPermissions("coupon:update")
-    public R updateStatus(@RequestParam(name = "couponId") Integer couponId,
+    public Result updateStatus(@RequestParam(name = "couponId") Integer couponId,
                     @RequestParam(name = "status") Integer status) {
         couponService.updateStatus(couponId , status);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -220,7 +221,7 @@ public class CouponController extends AbstractController{
     @PostMapping("/deleteCoupons")
     @RequiresPermissions("coupon:update")
     @ResponseBody
-    public R updateStatus(@RequestBody CouponRequestVo couponRequestVo) {
+    public Result updateStatus(@RequestBody CouponRequestVo couponRequestVo) {
 
         if(null != couponRequestVo && !CollectionUtils.isEmpty(couponRequestVo.getIdList())){
            int deleteNum =  couponService.deleteCouponBatch(couponRequestVo.getIdList());
@@ -229,10 +230,10 @@ public class CouponController extends AbstractController{
                throw new CommonBaseException(ResultCodeEnum.D101 , "删除不完整");
            }
         }else{
-            return R.error("需要删除的id为空");
+            return Result.failure("需要删除的id为空");
         }
 
-        return R.ok();
+        return Result.success();
     }
 
 
@@ -241,11 +242,11 @@ public class CouponController extends AbstractController{
      * 查看所有列表
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<CouponEntity> list = couponService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success(list);
     }
 
     /**
@@ -256,7 +257,7 @@ public class CouponController extends AbstractController{
      */
     @RequiresPermissions("coupon:publish")
     @RequestMapping(value = "publish", method = RequestMethod.POST)
-    public R publish(@RequestBody Map<String, Object> params) {
+    public Result publish(@RequestBody Map<String, Object> params) {
         return couponService.publish(params);
     }
 }

platform-shop/src/main/java/com/platform/controller/CouponGoodsController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.platform.annotation.CanUserUpdateRecord;
+import com.platform.entity.Result;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -16,7 +17,7 @@ import com.platform.entity.CouponGoodsEntity;
 import com.platform.service.CouponGoodsService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 
 /**
  * 优惠券关联商品Controller
@@ -36,7 +37,7 @@ public class CouponGoodsController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("coupongoods:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -45,7 +46,7 @@ public class CouponGoodsController {
 
         PageUtils pageUtil = new PageUtils(couponGoodsList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success(pageUtil);
     }
 
     /**
@@ -53,10 +54,10 @@ public class CouponGoodsController {
      */
     @RequestMapping("/info/{id}")
     @RequiresPermissions("coupongoods:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@PathVariable("id") Integer id) {
         CouponGoodsEntity couponGoods = couponGoodsService.queryObject(id);
 
-        return R.ok().put("couponGoods", couponGoods);
+        return Result.success( couponGoods);
     }
 
     /**
@@ -65,10 +66,10 @@ public class CouponGoodsController {
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("coupongoods:save")
-    public R save(@RequestBody CouponGoodsEntity couponGoods) {
+    public Result save(@RequestBody CouponGoodsEntity couponGoods) {
         couponGoodsService.save(couponGoods);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -77,10 +78,10 @@ public class CouponGoodsController {
     @CanUserUpdateRecord
     @RequestMapping("/update")
     @RequiresPermissions("coupongoods:update")
-    public R update(@RequestBody CouponGoodsEntity couponGoods) {
+    public Result update(@RequestBody CouponGoodsEntity couponGoods) {
         couponGoodsService.update(couponGoods);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -89,20 +90,20 @@ public class CouponGoodsController {
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("coupongoods:delete")
-    public R delete(@RequestBody Integer[]ids) {
+    public Result delete(@RequestBody Integer[]ids) {
         couponGoodsService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 查看所有列表
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<CouponGoodsEntity> list = couponGoodsService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success( list);
     }
 }

platform-shop/src/main/java/com/platform/controller/FeedbackController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.platform.annotation.CanUserUpdateRecord;
+import com.platform.entity.Result;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -16,7 +17,7 @@ import com.platform.entity.FeedbackEntity;
 import com.platform.service.FeedbackService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 
 /**
  * Controller
@@ -36,7 +37,7 @@ public class FeedbackController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("feedback:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -45,7 +46,7 @@ public class FeedbackController {
 
         PageUtils pageUtil = new PageUtils(feedbackList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success( pageUtil);
     }
 
     /**
@@ -53,10 +54,10 @@ public class FeedbackController {
      */
     @RequestMapping("/info/{msgId}")
     @RequiresPermissions("feedback:info")
-    public R info(@PathVariable("msgId") Integer msgId) {
+    public Result info(@PathVariable("msgId") Integer msgId) {
         FeedbackEntity feedback = feedbackService.queryObject(msgId);
 
-        return R.ok().put("feedback", feedback);
+        return Result.success(feedback);
     }
 
     /**
@@ -65,10 +66,10 @@ public class FeedbackController {
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("feedback:save")
-    public R save(@RequestBody FeedbackEntity feedback) {
+    public Result save(@RequestBody FeedbackEntity feedback) {
         feedbackService.save(feedback);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -77,10 +78,10 @@ public class FeedbackController {
     @CanUserUpdateRecord
     @RequestMapping("/update")
     @RequiresPermissions("feedback:update")
-    public R update(@RequestBody FeedbackEntity feedback) {
+    public Result update(@RequestBody FeedbackEntity feedback) {
         feedbackService.update(feedback);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -89,20 +90,20 @@ public class FeedbackController {
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("feedback:delete")
-    public R delete(@RequestBody Integer[]msgIds) {
+    public Result delete(@RequestBody Integer[]msgIds) {
         feedbackService.deleteBatch(msgIds);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 查看所有列表
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<FeedbackEntity> list = feedbackService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success( list);
     }
 }

platform-shop/src/main/java/com/platform/controller/FootprintController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.platform.annotation.CanUserUpdateRecord;
+import com.platform.entity.Result;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -16,7 +17,7 @@ import com.platform.entity.FootprintEntity;
 import com.platform.service.FootprintService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 
 
 /**
@@ -35,7 +36,7 @@ public class FootprintController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("footprint:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -44,7 +45,7 @@ public class FootprintController {
 
         PageUtils pageUtil = new PageUtils(footprintList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success( pageUtil);
     }
 
 
@@ -53,10 +54,10 @@ public class FootprintController {
      */
     @RequestMapping("/info/{id}")
     @RequiresPermissions("footprint:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@PathVariable("id") Integer id) {
         FootprintEntity footprint = footprintService.queryObject(id);
 
-        return R.ok().put("footprint", footprint);
+        return Result.success( footprint);
     }
 
     /**
@@ -65,10 +66,10 @@ public class FootprintController {
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("footprint:save")
-    public R save(@RequestBody FootprintEntity footprint) {
+    public Result save(@RequestBody FootprintEntity footprint) {
         footprintService.save(footprint);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -77,10 +78,10 @@ public class FootprintController {
     @CanUserUpdateRecord
     @RequestMapping("/update")
     @RequiresPermissions("footprint:update")
-    public R update(@RequestBody FootprintEntity footprint) {
+    public Result update(@RequestBody FootprintEntity footprint) {
         footprintService.update(footprint);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -89,10 +90,10 @@ public class FootprintController {
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("footprint:delete")
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         footprintService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
 }

platform-shop/src/main/java/com/platform/controller/GoodsAttributeController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.platform.annotation.CanUserUpdateRecord;
+import com.platform.entity.Result;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -16,7 +17,7 @@ import com.platform.entity.GoodsAttributeEntity;
 import com.platform.service.GoodsAttributeService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 
 
 /**
@@ -37,7 +38,7 @@ public class GoodsAttributeController {
 	 */
 	@RequestMapping("/list")
 	@RequiresPermissions("goodsattribute:list")
-	public R list(@RequestParam Map<String, Object> params){
+	public Result list(@RequestParam Map<String, Object> params){
 		//查询列表数据
         Query query = new Query(params);
 
@@ -46,7 +47,7 @@ public class GoodsAttributeController {
 		
 		PageUtils pageUtil = new PageUtils(goodsAttributeList, total, query.getLimit(), query.getPage());
 		
-		return R.ok().put("page", pageUtil);
+		return Result.success(pageUtil);
 	}
 	
 	
@@ -55,10 +56,10 @@ public class GoodsAttributeController {
 	 */
 	@RequestMapping("/info/{id}")
 	@RequiresPermissions("goodsattribute:info")
-	public R info(@PathVariable("id") Integer id){
+	public Result info(@PathVariable("id") Integer id){
 		GoodsAttributeEntity goodsAttribute = goodsAttributeService.queryObject(id);
 		
-		return R.ok().put("goodsAttribute", goodsAttribute);
+		return Result.success( goodsAttribute);
 	}
 	
 	/**
@@ -67,10 +68,10 @@ public class GoodsAttributeController {
 	@CanUserUpdateRecord
 	@RequestMapping("/save")
 	@RequiresPermissions("goodsattribute:save")
-	public R save(@RequestBody GoodsAttributeEntity goodsAttribute){
+	public Result save(@RequestBody GoodsAttributeEntity goodsAttribute){
 		goodsAttributeService.save(goodsAttribute);
 		
-		return R.ok();
+		return Result.success();
 	}
 	
 	/**
@@ -79,10 +80,10 @@ public class GoodsAttributeController {
 	@CanUserUpdateRecord
 	@RequestMapping("/update")
 	@RequiresPermissions("goodsattribute:update")
-	public R update(@RequestBody GoodsAttributeEntity goodsAttribute){
+	public Result update(@RequestBody GoodsAttributeEntity goodsAttribute){
 		goodsAttributeService.update(goodsAttribute);
 		
-		return R.ok();
+		return Result.success();
 	}
 	
 	/**
@@ -91,10 +92,10 @@ public class GoodsAttributeController {
 	@CanUserUpdateRecord
 	@RequestMapping("/delete")
 	@RequiresPermissions("goodsattribute:delete")
-	public R delete(@RequestBody Integer[] ids){
+	public Result delete(@RequestBody Integer[] ids){
 		goodsAttributeService.deleteBatch(ids);
 		
-		return R.ok();
+		return Result.success();
 	}
 	
 }

platform-shop/src/main/java/com/platform/controller/GoodsController.java

@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.platform.annotation.CanUserUpdateRecord;
-import com.platform.entity.BrandEntity;
-import com.platform.entity.GoodsEntity;
-import com.platform.entity.GoodsGalleryEntity;
-import com.platform.entity.SysUserBrand;
+import com.platform.entity.*;
 import com.platform.service.BrandService;
 import com.platform.service.GoodsGalleryService;
 import com.platform.service.GoodsService;
@@ -73,7 +70,7 @@ public class GoodsController extends AbstractController{
      */
     @RequestMapping("/list")
     @RequiresPermissions("goods:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
         PageUtils pageUtil = new PageUtils(new ArrayList<>(), 0, query.getLimit(), query.getPage());
@@ -85,20 +82,20 @@ public class GoodsController extends AbstractController{
             // 公司管理员能获取改公司下面所有的直播间的数据
             if (roleId == 6) {
                 if (null == getDeptId()) {
-                    return R.ok().put("page", pageUtil);
+                    return Result.success(pageUtil);
                 }
                 brandQuery.put("deptIdList", departmentUtils.getAllSubDeptIds(getDeptId()));
             } else if (roleId == 8) {
                 // 公司员工只能获取当前绑定当前用户直播间的商品数据
                 List<Long> brandIds = mySysUserBrandService.queryBrandIdList(userId);
                 if(ObjectUtils.isEmpty(brandIds)){
-                    return R.ok().put("page", pageUtil);
+                    return Result.success(pageUtil);
                 }
                 brandQuery.put("idList", brandIds);
             }
             List<BrandEntity> brandList = brandService.queryList(brandQuery);
             if (CollectionUtils.isEmpty(brandList)) {
-                return R.ok().put("page", pageUtil);
+                return Result.success( pageUtil);
             } else {
                 query.put("brandIdList", brandList.stream().map(BrandEntity::getId).collect(Collectors.toList()));
             }
@@ -109,7 +106,7 @@ public class GoodsController extends AbstractController{
 
         pageUtil = new PageUtils(goodsList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success(pageUtil);
     }
 
     /**
@@ -117,9 +114,9 @@ public class GoodsController extends AbstractController{
      */
     @RequestMapping("/info/{id}")
     @RequiresPermissions("goods:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@PathVariable("id") Integer id) {
         GoodsEntity goods = goodsService.queryObject(id);
-        return R.ok().put("goods", goods);
+        return Result.success(goods);
     }
 
     /**
@@ -129,23 +126,23 @@ public class GoodsController extends AbstractController{
     @RequestMapping("/save")
     @RequiresPermissions("goods:save")
     @Transactional(rollbackFor = Exception.class)
-    public R save(@RequestBody GoodsEntity goods) {
+    public Result save(@RequestBody GoodsEntity goods) {
         if(goods.getName().length() > 15){
-            return R.error("商品名称名称不能超过15个字符");
+            return Result.failure("商品名称名称不能超过15个字符");
         }
         if(null == goods.getCreateUserDeptId() || null == goods.getCreateUserId()){
-            return R.error("数据的创建者的id或者部门id不能为空");
+            return Result.failure("数据的创建者的id或者部门id不能为空");
         }
         goodsService.save(goods);
         //发送数据给api平台
         sendDataToApi(goods);
 
-        return R.ok();
+        return Result.success();
     }
 
-    private R sendDeleteDataToApi(GoodsEntity goods){
+    private Result sendDeleteDataToApi(GoodsEntity goods){
         if(null == goods){
-            return R.error("商品信息为空，无法请求api平台");
+            return Result.failure("商品信息为空，无法请求api平台");
         }
         Map<String, Object> reqData = new HashMap<>();
         reqData.put("goodsId" , goods.getId());
@@ -195,17 +192,17 @@ public class GoodsController extends AbstractController{
             log.info("请求链接：{}" ,openApiurl);
             String apiResultStr = HttpClientUtil.doPostJson(openApiurl , sortMapStr);
             log.info("api平台返回结果:{}" , apiResultStr);
-            return R.ok(apiResultStr);
+            return Result.success(apiResultStr);
         }else{
             log.info("当前商品[{}]的品牌没有vr场景或者场景码为空，不需要上送api平台" , goods.getId());
-            return R.ok();
+            return Result.success();
         }
 
     }
 
-    private R sendDataToApi(GoodsEntity goods){
+    private Result sendDataToApi(GoodsEntity goods){
         if(null == goods){
-            return R.error("商品信息为空，无法请求api平台");
+            return Result.failure("商品信息为空，无法请求api平台");
         }
         Map<String, Object> reqData = new HashMap<>();
         reqData.put("goodsId" , goods.getId());
@@ -258,10 +255,10 @@ public class GoodsController extends AbstractController{
             log.info("请求链接：{}" ,openApiurl);
             String apiResultStr = HttpClientUtil.doPostJson(openApiurl , sortMapStr);
             log.info("api平台返回结果:{}" , apiResultStr);
-            return R.ok(apiResultStr);
+            return Result.success(apiResultStr);
         }else{
             log.info("当前商品[{}]的品牌没有vr场景或者场景码为空，不需要上送api平台" , goods.getId());
-            return R.ok();
+            return Result.success();
         }
 
     }
@@ -336,23 +333,23 @@ public class GoodsController extends AbstractController{
     @RequestMapping("/update")
     @RequiresPermissions("goods:update")
     @Transactional(rollbackFor = Exception.class)
-    public R update(@RequestBody GoodsEntity goods) {
+    public Result update(@RequestBody GoodsEntity goods) {
         if(goods.getName().length() > 15){
-            return R.error("商品名称名称不能超过15个字符");
+            return Result.failure("商品名称名称不能超过15个字符");
         }
         if(null == goods.getUpdateUserId()){
-            return R.error("数据的更新者ID不能为空");
+            return Result.failure("数据的更新者ID不能为空");
         }
         GoodsEntity goodsEntity = goodsService.queryObject(goods.getId());
         if(null == goodsEntity){
-            return R.error("商品不存在");
+            return Result.failure("商品不存在");
         }
         goodsService.update(goods);
 
         //发送数据给api平台
         sendDataToApi(goods);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -361,7 +358,7 @@ public class GoodsController extends AbstractController{
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("goods:delete")
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         if(null != ids && ids.length > 0){
             for(int i = 0 ;i<ids.length ; i++){
                 int id = ids[i];
@@ -374,14 +371,14 @@ public class GoodsController extends AbstractController{
         }
         goodsService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 查看所有列表
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
         Long userId = getUserId();
         if(Constant.SUPER_ADMIN != userId){
             params.put("brandIdList", mySysUserBrandService.queryBrandIdList(userId));
@@ -390,7 +387,7 @@ public class GoodsController extends AbstractController{
         params.put("isDelete", 0);
         List<GoodsEntity> list = goodsService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success( list);
     }
 
 
@@ -401,7 +398,7 @@ public class GoodsController extends AbstractController{
      * @return
      */
     @RequestMapping("/historyList")
-    public R historyList(@RequestParam Map<String, Object> params) {
+    public Result historyList(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
         PageUtils pageUtil = new PageUtils(new ArrayList<>(), 0, query.getLimit(), query.getPage());
@@ -409,7 +406,7 @@ public class GoodsController extends AbstractController{
         long userId = getUserId();
         if(Constant.SUPER_ADMIN != userId){
             if(null == getDeptId()){
-                return R.ok().put("page", pageUtil);
+                return Result.success( pageUtil);
             }
             query.put("deptIdList" , departmentUtils.getAllSubDeptIds(getDeptId()));
         }
@@ -418,7 +415,7 @@ public class GoodsController extends AbstractController{
 
         pageUtil = new PageUtils(goodsList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success( pageUtil);
     }
 
     /**
@@ -426,21 +423,21 @@ public class GoodsController extends AbstractController{
      */
     @RequestMapping("/back")
     @RequiresPermissions("goods:back")
-    public R back(@RequestBody Integer[] ids) {
+    public Result back(@RequestBody Integer[] ids) {
         goodsService.back(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 总计
      */
     @RequestMapping("/queryTotal")
-    public R queryTotal(@RequestParam Map<String, Object> params) {
+    public Result queryTotal(@RequestParam Map<String, Object> params) {
 
         params.put("isDelete", 0);
         int sum = goodsService.queryTotal(params);
-        return R.ok().put("goodsSum", sum);
+        return Result.success(sum);
     }
 
     /**
@@ -448,12 +445,12 @@ public class GoodsController extends AbstractController{
      */
     @CanUserUpdateRecord
     @RequestMapping("/enSale")
-    public R enSale(@RequestBody String id) {
+    public Result enSale(@RequestBody String id) {
         for(String ids : id.split(",")){
             goodsService.enSale(Integer.parseInt(ids));
         }
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -461,34 +458,34 @@ public class GoodsController extends AbstractController{
      */
     @CanUserUpdateRecord
     @RequestMapping("/unSale")
-    public R unSale(@RequestBody String id) {
+    public Result unSale(@RequestBody String id) {
         for(String ids : id.split(",")){
             goodsService.unSale(Integer.parseInt(ids));
         }
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 根据场景码过去商品分类列表
      */
     @GetMapping("/getGoods")
-    public R getGoodsById(@RequestParam(name =  "goodsId") Integer goodsId) {
+    public Result getGoodsById(@RequestParam(name =  "goodsId") Integer goodsId) {
         if(StringUtils.isEmpty(goodsId)){
-            return R.error("入参不完整，请检查入参");
+            return Result.failure("入参不完整，请检查入参");
         }
         GoodsEntity goodsEntity =  goodsService.queryObject(goodsId);
         Map<String ,Object> resultMap = new HashMap<>();
         resultMap.put("goods" , goodsEntity);
-        return R.ok(resultMap);
+        return Result.success(resultMap);
     }
 
     @GetMapping("/getGoodsDetail")
-    public R getGoodsDetail(@RequestParam(name =  "goodsId") String goodsId,
+    public Result getGoodsDetail(@RequestParam(name =  "goodsId") String goodsId,
                             @RequestParam(name =  "brandId") String brandId,
                             @RequestParam(name =  "sceneNum") String sceneNum) {
         if(StringUtils.isEmpty(goodsId)){
-            return R.error("入参不完整，请检查入参");
+            return Result.failure("入参不完整，请检查入参");
         }
 
         List resultList = new ArrayList();
@@ -497,7 +494,7 @@ public class GoodsController extends AbstractController{
         if(!StringUtils.isEmpty(brandId) && !StringUtils.isEmpty(sceneNum)){
             Integer brand = brandService.queryIdByScene("?m=" + sceneNum);
             if(null == brand || !brandId.equals(brand.toString()) ){
-                return R.ok(result);
+                return Result.success(result);
             }
         }
 
@@ -505,7 +502,7 @@ public class GoodsController extends AbstractController{
         for(String id : ids){
             GoodsEntity goodsEntity =  goodsService.queryObject(Integer.valueOf(id));
             if(goodsEntity == null){
-                return R.error("商品不存在");
+                return Result.failure("商品不存在");
             }
 
             Map<String, Object> params = new HashMap<>();
@@ -556,51 +553,51 @@ public class GoodsController extends AbstractController{
         }
 
 
-        return R.ok(result);
+        return Result.success(result);
     }
 
     /**
      * 根据场景码过去商品分类列表
      */
     @GetMapping("/getCategoryListByScene")
-    public R getGoodsListByScene(@RequestParam(name =  "sceneNum") String sceneNum) {
+    public Result getGoodsListByScene(@RequestParam(name =  "sceneNum") String sceneNum) {
         if(StringUtils.isEmpty(sceneNum)){
-            return R.error("入参不完整，请检查入参");
+            return Result.failure("入参不完整，请检查入参");
         }
         Integer brandId = brandService.queryIdByScene("?m=" + sceneNum);
         if(null == brandId){
-            return R.error("当前场景码获取不到brandId");
+            return Result.failure("当前场景码获取不到brandId");
         }
         QueryWrapper<GoodsEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("brand_id" , brandId);
         List<Map<String,Object>> categoryList = goodsService.queryGoodsCategory(queryWrapper);
         Map<String ,Object> resultMap = new HashMap<>();
         resultMap.put("list" , categoryList);
-        return R.ok(resultMap);
+        return Result.success(resultMap);
     }
 
     /**
      * 根据场景码查询商品列表
      */
     @GetMapping("/getGoodsListByScene")
-    public R getGoodsListByScene(@RequestParam(name =  "sceneNum") String sceneNum,
+    public Result getGoodsListByScene(@RequestParam(name =  "sceneNum") String sceneNum,
                                  @RequestParam(name =  "categoryId") Integer categoryId,
                                  @RequestParam(name =  "goodsName") String goodsName,
                                  @RequestParam(name =  "pageNum") Long pageNum,
                                  @RequestParam(name =  "pageSize") Long pageSize) {
         if(StringUtils.isEmpty(sceneNum) || null == pageNum || null == pageSize){
-            return R.error("入参不完整，请检查入参");
+            return Result.failure("入参不完整，请检查入参");
         }
         Integer brandId = brandService.queryIdByScene("?m=" + sceneNum);
         if(null == brandId){
-            return R.error("当前场景码获取不到brandId");
+            return Result.failure("当前场景码获取不到brandId");
         }
         IPage<Map<String,Object>> page = new Page<>(pageNum , pageSize);
         IPage<Map<String,Object>> resultPage = goodsService.queryListTwoWithoutFilter(page , brandId , categoryId , goodsName);
         if(null == resultPage){
-            return R.error("当前场景码获取不到商品列表");
+            return Result.failure("当前场景码获取不到商品列表");
         }
-        return R.ok().put("page", PageUtils.assembleResult(resultPage.getTotal() , resultPage.getPages() ,
+        return Result.success(PageUtils.assembleResult(resultPage.getTotal() , resultPage.getPages() ,
                      resultPage.getCurrent(), pageSize , resultPage.getRecords()));
     }
 }

platform-shop/src/main/java/com/platform/controller/GoodsGalleryController.java

@@ -2,10 +2,11 @@ package com.platform.controller;
 
 import com.platform.annotation.CanUserUpdateRecord;
 import com.platform.entity.GoodsGalleryEntity;
+import com.platform.entity.Result;
 import com.platform.service.GoodsGalleryService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -31,7 +32,7 @@ public class GoodsGalleryController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("goodsgallery:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -40,7 +41,7 @@ public class GoodsGalleryController {
 
         PageUtils pageUtil = new PageUtils(goodsGalleryList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success(pageUtil);
     }
 
     /**
@@ -48,10 +49,10 @@ public class GoodsGalleryController {
      */
     @RequestMapping("/info/{id}")
     @RequiresPermissions("goodsgallery:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@PathVariable("id") Integer id) {
         GoodsGalleryEntity goodsGallery = goodsGalleryService.queryObject(id);
 
-        return R.ok().put("goodsGallery", goodsGallery);
+        return Result.success( goodsGallery);
     }
 
     /**
@@ -60,10 +61,10 @@ public class GoodsGalleryController {
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("goodsgallery:save")
-    public R save(@RequestBody GoodsGalleryEntity goodsGallery) {
+    public Result save(@RequestBody GoodsGalleryEntity goodsGallery) {
         goodsGalleryService.save(goodsGallery);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -72,10 +73,10 @@ public class GoodsGalleryController {
     @CanUserUpdateRecord
     @RequestMapping("/update")
     @RequiresPermissions("goodsgallery:update")
-    public R update(@RequestBody GoodsGalleryEntity goodsGallery) {
+    public Result update(@RequestBody GoodsGalleryEntity goodsGallery) {
         goodsGalleryService.update(goodsGallery);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -84,20 +85,20 @@ public class GoodsGalleryController {
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("goodsgallery:delete")
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         goodsGalleryService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 查看所有列表
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<GoodsGalleryEntity> list = goodsGalleryService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success( list);
     }
 }

platform-shop/src/main/java/com/platform/controller/GoodsIssueController.java

@@ -2,10 +2,11 @@ package com.platform.controller;
 
 import com.platform.annotation.CanUserUpdateRecord;
 import com.platform.entity.GoodsIssueEntity;
+import com.platform.entity.Result;
 import com.platform.service.GoodsIssueService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -31,7 +32,7 @@ public class GoodsIssueController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("goodsissue:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -40,7 +41,7 @@ public class GoodsIssueController {
 
         PageUtils pageUtil = new PageUtils(goodsIssueList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success(pageUtil);
     }
 
     /**
@@ -48,10 +49,10 @@ public class GoodsIssueController {
      */
     @RequestMapping("/info/{id}")
     @RequiresPermissions("goodsissue:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@PathVariable("id") Integer id) {
         GoodsIssueEntity goodsIssue = goodsIssueService.queryObject(id);
 
-        return R.ok().put("goodsIssue", goodsIssue);
+        return Result.success(goodsIssue);
     }
 
     /**
@@ -60,10 +61,10 @@ public class GoodsIssueController {
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("goodsissue:save")
-    public R save(@RequestBody GoodsIssueEntity goodsIssue) {
+    public Result save(@RequestBody GoodsIssueEntity goodsIssue) {
         goodsIssueService.save(goodsIssue);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -72,10 +73,10 @@ public class GoodsIssueController {
     @CanUserUpdateRecord
     @RequestMapping("/update")
     @RequiresPermissions("goodsissue:update")
-    public R update(@RequestBody GoodsIssueEntity goodsIssue) {
+    public Result update(@RequestBody GoodsIssueEntity goodsIssue) {
         goodsIssueService.update(goodsIssue);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -84,20 +85,20 @@ public class GoodsIssueController {
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("goodsissue:delete")
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         goodsIssueService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 查看所有列表
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<GoodsIssueEntity> list = goodsIssueService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success( list);
     }
 }

platform-shop/src/main/java/com/platform/controller/GoodsSpecificationController.java

@@ -3,13 +3,14 @@ package com.platform.controller;
 import com.platform.annotation.CanUserUpdateRecord;
 import com.platform.entity.GoodsSpecificationEntity;
 import com.platform.entity.ProductEntity;
+import com.platform.entity.Result;
 import com.platform.service.GoodsSpecificationService;
 import com.platform.service.ProductService;
 import com.platform.service.custom.MySysUserBrandService;
 import com.platform.utils.Constant;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
@@ -44,7 +45,7 @@ public class GoodsSpecificationController extends AbstractController{
      */
     @RequestMapping("/list")
     @RequiresPermissions("goodsspecification:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -59,7 +60,7 @@ public class GoodsSpecificationController extends AbstractController{
 
         PageUtils pageUtil = new PageUtils(goodsSpecificationList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success( pageUtil);
     }
 
     /**
@@ -67,10 +68,10 @@ public class GoodsSpecificationController extends AbstractController{
      */
     @RequestMapping("/info/{id}")
     @RequiresPermissions("goodsspecification:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@PathVariable("id") Integer id) {
         GoodsSpecificationEntity goodsSpecification = goodsSpecificationService.queryObject(id);
 
-        return R.ok().put("goodsSpecification", goodsSpecification);
+        return Result.success( goodsSpecification);
     }
 
     /**
@@ -79,7 +80,7 @@ public class GoodsSpecificationController extends AbstractController{
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("goodsspecification:save")
-    public R save(@RequestBody GoodsSpecificationEntity goodsSpecification) {
+    public Result save(@RequestBody GoodsSpecificationEntity goodsSpecification) {
         goodsSpecificationService.save(goodsSpecification);
 
         ProductEntity entity = new ProductEntity();
@@ -94,7 +95,7 @@ public class GoodsSpecificationController extends AbstractController{
             productService.update(productEntity);
         }
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -103,10 +104,10 @@ public class GoodsSpecificationController extends AbstractController{
     @CanUserUpdateRecord
     @RequestMapping("/update")
     @RequiresPermissions("goodsspecification:update")
-    public R update(@RequestBody GoodsSpecificationEntity goodsSpecification) {
+    public Result update(@RequestBody GoodsSpecificationEntity goodsSpecification) {
         goodsSpecificationService.update(goodsSpecification);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -115,20 +116,20 @@ public class GoodsSpecificationController extends AbstractController{
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("goodsspecification:delete")
-    public R delete(@RequestBody Integer[]ids) {
+    public Result delete(@RequestBody Integer[]ids) {
         goodsSpecificationService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 查看所有列表
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<GoodsSpecificationEntity> list = goodsSpecificationService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success( list);
     }
 }

platform-shop/src/main/java/com/platform/controller/HelpIssueController.java

@@ -2,10 +2,11 @@ package com.platform.controller;
 
 import com.platform.annotation.CanUserUpdateRecord;
 import com.platform.entity.HelpIssueEntity;
+import com.platform.entity.Result;
 import com.platform.service.HelpIssueService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -33,7 +34,7 @@ public class HelpIssueController {
     @RequestMapping("/list")
     @RequiresPermissions("helpissue:list")
     @ResponseBody
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -42,7 +43,7 @@ public class HelpIssueController {
 
         PageUtils pageUtil = new PageUtils(helpIssueList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success(pageUtil);
     }
 
     /**
@@ -51,10 +52,10 @@ public class HelpIssueController {
     @RequestMapping("/info/{id}")
     @RequiresPermissions("helpissue:info")
     @ResponseBody
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@PathVariable("id") Integer id) {
         HelpIssueEntity helpIssue = helpIssueService.queryObject(id);
 
-        return R.ok().put("helpIssue", helpIssue);
+        return Result.success(helpIssue);
     }
 
     /**
@@ -64,10 +65,10 @@ public class HelpIssueController {
     @RequestMapping("/save")
     @RequiresPermissions("helpissue:save")
     @ResponseBody
-    public R save(@RequestBody HelpIssueEntity helpIssue) {
+    public Result save(@RequestBody HelpIssueEntity helpIssue) {
         helpIssueService.save(helpIssue);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -77,10 +78,10 @@ public class HelpIssueController {
     @RequestMapping("/update")
     @RequiresPermissions("helpissue:update")
     @ResponseBody
-    public R update(@RequestBody HelpIssueEntity helpIssue) {
+    public Result update(@RequestBody HelpIssueEntity helpIssue) {
         helpIssueService.update(helpIssue);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -90,10 +91,10 @@ public class HelpIssueController {
     @RequestMapping("/delete")
     @RequiresPermissions("helpissue:delete")
     @ResponseBody
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         helpIssueService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -101,10 +102,10 @@ public class HelpIssueController {
      */
     @RequestMapping("/queryAll")
     @ResponseBody
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<HelpIssueEntity> list = helpIssueService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success( list);
     }
 }

platform-shop/src/main/java/com/platform/controller/HelpTypeController.java

@@ -2,10 +2,12 @@ package com.platform.controller;
 
 import com.platform.annotation.CanUserUpdateRecord;
 import com.platform.entity.HelpTypeEntity;
+import com.platform.entity.Result;
 import com.platform.service.HelpTypeService;
 import com.platform.utils.PageUtils;
+import com.platform.utils.PageUtilsPlus;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -33,28 +35,26 @@ public class HelpTypeController {
     @RequestMapping("/list")
     @RequiresPermissions("helptype:list")
     @ResponseBody
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
         List<HelpTypeEntity> helpTypeList = helpTypeService.queryList(query);
         int total = helpTypeService.queryTotal(query);
 
-        PageUtils pageUtil = new PageUtils(helpTypeList, total, query.getLimit(), query.getPage());
-
-        return R.ok().put("page", pageUtil);
+        return Result.success(PageUtilsPlus.page(helpTypeList,(long)total,(long)query.getLimit(),(long)query.getPage()));
     }
 
     /**
      * 查看信息
      */
-    @RequestMapping("/info/{id}")
+    @RequestMapping("/info")
     @RequiresPermissions("helptype:info")
     @ResponseBody
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@RequestParam("id") Integer id) {
         HelpTypeEntity helpType = helpTypeService.queryObject(id);
 
-        return R.ok().put("helpType", helpType);
+        return Result.success( helpType);
     }
 
     /**
@@ -64,10 +64,10 @@ public class HelpTypeController {
     @RequestMapping("/save")
     @RequiresPermissions("helptype:save")
     @ResponseBody
-    public R save(@RequestBody HelpTypeEntity helpType) {
+    public Result save(@RequestBody HelpTypeEntity helpType) {
         helpTypeService.save(helpType);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -77,10 +77,10 @@ public class HelpTypeController {
     @RequestMapping("/update")
     @RequiresPermissions("helptype:update")
     @ResponseBody
-    public R update(@RequestBody HelpTypeEntity helpType) {
+    public Result update(@RequestBody HelpTypeEntity helpType) {
         helpTypeService.update(helpType);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -90,10 +90,10 @@ public class HelpTypeController {
     @RequestMapping("/delete")
     @RequiresPermissions("helptype:delete")
     @ResponseBody
-    public R delete(@RequestBody Integer[]ids) {
+    public Result delete(@RequestBody Integer[]ids) {
         helpTypeService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -101,10 +101,10 @@ public class HelpTypeController {
      */
     @RequestMapping("/queryAll")
     @ResponseBody
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<HelpTypeEntity> list = helpTypeService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success(list);
     }
 }

platform-shop/src/main/java/com/platform/controller/KeywordsController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.platform.annotation.CanUserUpdateRecord;
+import com.platform.entity.Result;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -16,7 +17,7 @@ import com.platform.entity.KeywordsEntity;
 import com.platform.service.KeywordsService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 
 /**
  * 热闹关键词表Controller
@@ -36,7 +37,7 @@ public class KeywordsController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("keywords:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -45,18 +46,18 @@ public class KeywordsController {
 
         PageUtils pageUtil = new PageUtils(keywordsList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success(pageUtil);
     }
 
     /**
      * 查看信息
      */
-    @RequestMapping("/info/{id}")
+    @RequestMapping("/info")
     @RequiresPermissions("keywords:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@RequestParam("id") Integer id) {
         KeywordsEntity keywords = keywordsService.queryObject(id);
 
-        return R.ok().put("keywords", keywords);
+        return Result.success(keywords);
     }
 
     /**
@@ -65,10 +66,10 @@ public class KeywordsController {
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("keywords:save")
-    public R save(@RequestBody KeywordsEntity keywords) {
+    public Result save(@RequestBody KeywordsEntity keywords) {
         keywordsService.save(keywords);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -77,10 +78,10 @@ public class KeywordsController {
     @CanUserUpdateRecord
     @RequestMapping("/update")
     @RequiresPermissions("keywords:update")
-    public R update(@RequestBody KeywordsEntity keywords) {
+    public Result update(@RequestBody KeywordsEntity keywords) {
         keywordsService.update(keywords);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -89,20 +90,20 @@ public class KeywordsController {
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("keywords:delete")
-    public R delete(@RequestBody Integer[]ids) {
+    public Result delete(@RequestBody Integer[]ids) {
         keywordsService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 查看所有列表
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<KeywordsEntity> list = keywordsService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success( list);
     }
 }

platform-shop/src/main/java/com/platform/controller/OrderController.java

@@ -3,10 +3,7 @@ package com.platform.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.platform.annotation.CanUserUpdateRecord;
 import com.platform.constant.ConstantExcel;
-import com.platform.entity.BrandEntity;
-import com.platform.entity.OrderEntity;
-import com.platform.entity.OrderGoodsEntity;
-import com.platform.entity.OrderShippingEntity;
+import com.platform.entity.*;
 import com.platform.enums.ResultCodeEnum;
 import com.platform.exception.CommonBaseException;
 import com.platform.oss.OSSFactory;
@@ -61,7 +58,7 @@ public class OrderController extends AbstractController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("order:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         // 查询列表数据
         Query query = new Query(params);
         PageUtils pageUtil = new PageUtils(new ArrayList<>(), 0, query.getLimit(), query.getPage());
@@ -70,7 +67,7 @@ public class OrderController extends AbstractController {
         Long userId = getUserId();
         if (Constant.SUPER_ADMIN != userId) {
             if (null == getDeptId()) {
-                return R.ok().put("page", pageUtil);
+                return Result.success(pageUtil);
             }
             Query brandQuery = new Query(params);
             brandQuery.put("deptIdList", departmentUtils.getAllSubDeptIds(getDeptId()));
@@ -83,7 +80,7 @@ public class OrderController extends AbstractController {
                 query.put("brandIdList", brandIdList);
                 params.put("brandIdList", brandIdList);
             } else {
-                return R.ok().put("page", pageUtil);
+                return Result.success(pageUtil);
             }
         }
 
@@ -98,16 +95,16 @@ public class OrderController extends AbstractController {
 
         pageUtil = new PageUtils(orderList, orderListTotal.size(), query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success(pageUtil);
     }
 
 
     /**
      * 信息
      */
-    @RequestMapping("/info/{id}/{brandId}")
+    @RequestMapping("/info")
     @RequiresPermissions("order:info")
-    public R info(@PathVariable("id") Integer id, @PathVariable("brandId") Integer brandId) {
+    public Result info(@RequestParam("id") Integer id, @RequestParam("brandId") Integer brandId) {
 
         OrderEntity order = orderService.queryObject(id);
 
@@ -166,7 +163,7 @@ public class OrderController extends AbstractController {
                 }
             }
         }
-        return R.ok().put("order", order);
+        return Result.success(order);
     }
 
     /**
@@ -175,10 +172,10 @@ public class OrderController extends AbstractController {
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("order:save")
-    public R save(@RequestBody OrderEntity order) {
+    public Result save(@RequestBody OrderEntity order) {
         orderService.save(order);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -187,10 +184,10 @@ public class OrderController extends AbstractController {
     @CanUserUpdateRecord
     @RequestMapping("/update")
     @RequiresPermissions("order:update")
-    public R update(@RequestBody OrderEntity order) {
+    public Result update(@RequestBody OrderEntity order) {
         orderService.update(order);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -199,31 +196,31 @@ public class OrderController extends AbstractController {
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("order:delete")
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         orderService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 查看所有列表
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<OrderEntity> list = orderService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success(list);
     }
 
     /**
      * 总计
      */
     @RequestMapping("/queryTotal")
-    public R queryTotal(@RequestParam Map<String, Object> params) {
+    public Result queryTotal(@RequestParam Map<String, Object> params) {
         int sum = orderService.queryTotal(params);
 
-        return R.ok().put("sum", sum);
+        return Result.success( sum);
     }
 
     /**
@@ -234,10 +231,10 @@ public class OrderController extends AbstractController {
     @CanUserUpdateRecord
     @RequestMapping("/confirm")
     @RequiresPermissions("order:confirm")
-    public R confirm(@RequestBody OrderEntity order) {
+    public Result confirm(@RequestBody OrderEntity order) {
         orderService.confirm(order.getId(), order.getBrandId());
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -249,13 +246,13 @@ public class OrderController extends AbstractController {
     @CanUserUpdateRecord
     @RequestMapping("/sendGoods")
     @RequiresPermissions("order:sendGoods")
-    public R sendGoods(@RequestBody OrderEntity order) {
+    public Result sendGoods(@RequestBody OrderEntity order) {
         if (StringUtils.isEmpty(order.getShippingNo()) || StringUtils.isEmpty(order.getShippingId())) {
-            return R.error("快递公司和快递单号不能为空");
+            return Result.failure("快递公司和快递单号不能为空");
         }
         orderService.sendGoods(order);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -263,14 +260,14 @@ public class OrderController extends AbstractController {
      */
     @PostMapping("/export")
     @ResponseBody
-    public R export(@RequestParam Map<String, Object> params, HttpServletResponse response, HttpServletRequest request) {
+    public Result export(@RequestParam Map<String, Object> params, HttpServletResponse response, HttpServletRequest request) {
 
         if(null == params){
             throw new CommonBaseException(ResultCodeEnum.D101 , "缺失参数");
         }
         String orderSnListStr = (String) params.get("orderSnList");
         if(StringUtils.isEmpty(orderSnListStr)){
-            return R.error("订单号为空");
+            return Result.failure("订单号为空");
         }
         List<String> orderSnList = Arrays.asList(orderSnListStr.split(","));
 
@@ -335,7 +332,7 @@ public class OrderController extends AbstractController {
         Map<String, Object> map = new HashMap<>();
         map.put("url", url);
 
-        return R.ok(map);
+        return Result.success(map);
 
          /* response.setHeader("Content-Disposition", "attachment; filename=\"" + fileName + "\"");
       String agent = request.getHeader("User-Agent");

platform-shop/src/main/java/com/platform/controller/OrderGoodsController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.platform.annotation.CanUserUpdateRecord;
+import com.platform.entity.Result;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -16,7 +17,7 @@ import com.platform.entity.OrderGoodsEntity;
 import com.platform.service.OrderGoodsService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 
 
 /**
@@ -37,7 +38,7 @@ public class OrderGoodsController {
 	 */
 	@RequestMapping("/list")
 	@RequiresPermissions("ordergoods:list")
-	public R list(@RequestParam Map<String, Object> params){
+	public Result list(@RequestParam Map<String, Object> params){
 		//查询列表数据
         Query query = new Query(params);
 
@@ -46,7 +47,7 @@ public class OrderGoodsController {
 
 		PageUtils pageUtil = new PageUtils(orderGoodsList, total, query.getLimit(), query.getPage());
 
-		return R.ok().put("page", pageUtil);
+		return Result.success(pageUtil);
 	}
 
 
@@ -55,10 +56,10 @@ public class OrderGoodsController {
 	 */
 	@RequestMapping("/info/{id}")
 	@RequiresPermissions("ordergoods:info")
-	public R info(@PathVariable("id") Integer id){
+	public Result info(@PathVariable("id") Integer id){
 		OrderGoodsEntity orderGoods = orderGoodsService.queryObject(id);
 
-		return R.ok().put("orderGoods", orderGoods);
+		return Result.success(orderGoods);
 	}
 
 	/**
@@ -67,10 +68,10 @@ public class OrderGoodsController {
 	@CanUserUpdateRecord
 	@RequestMapping("/save")
 	@RequiresPermissions("ordergoods:save")
-	public R save(@RequestBody OrderGoodsEntity orderGoods){
+	public Result save(@RequestBody OrderGoodsEntity orderGoods){
 		orderGoodsService.save(orderGoods);
 
-		return R.ok();
+		return Result.success();
 	}
 
 	/**
@@ -79,10 +80,10 @@ public class OrderGoodsController {
 	@CanUserUpdateRecord
 	@RequestMapping("/update")
 	@RequiresPermissions("ordergoods:update")
-	public R update(@RequestBody OrderGoodsEntity orderGoods){
+	public Result update(@RequestBody OrderGoodsEntity orderGoods){
 		orderGoodsService.update(orderGoods);
 
-		return R.ok();
+		return Result.success();
 	}
 
 	/**
@@ -91,20 +92,20 @@ public class OrderGoodsController {
 	@CanUserUpdateRecord
 	@RequestMapping("/delete")
 	@RequiresPermissions("ordergoods:delete")
-	public R delete(@RequestBody Integer[] ids){
+	public Result delete(@RequestBody Integer[] ids){
 		orderGoodsService.deleteBatch(ids);
 
-		return R.ok();
+		return Result.success();
 	}
 
 	/**
 	 * 查看所有列表
 	 */
 	@RequestMapping("/queryAll")
-	public R queryAll(@RequestParam Map<String, Object> params) {
+	public Result queryAll(@RequestParam Map<String, Object> params) {
 
 		List<OrderGoodsEntity> list = orderGoodsService.queryList(params);
 
-		return R.ok().put("list", list);
+		return Result.success(list);
 	}
 }

platform-shop/src/main/java/com/platform/controller/ProductController.java

@@ -2,12 +2,13 @@ package com.platform.controller;
 
 import com.platform.annotation.CanUserUpdateRecord;
 import com.platform.entity.ProductEntity;
+import com.platform.entity.Result;
 import com.platform.service.ProductService;
 import com.platform.service.custom.MySysUserBrandService;
 import com.platform.utils.Constant;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -38,7 +39,7 @@ public class ProductController extends AbstractController{
      */
     @RequestMapping("/list")
     @RequiresPermissions("product:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -52,7 +53,7 @@ public class ProductController extends AbstractController{
 
         PageUtils pageUtil = new PageUtils(productList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success(pageUtil);
     }
 
     /**
@@ -60,10 +61,10 @@ public class ProductController extends AbstractController{
      */
     @RequestMapping("/info/{id}")
     @RequiresPermissions("product:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@PathVariable("id") Integer id) {
         ProductEntity product = productService.queryObject(id);
 
-        return R.ok().put("product", product);
+        return Result.success( product);
     }
 
     /**
@@ -72,10 +73,10 @@ public class ProductController extends AbstractController{
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("product:save")
-    public R save(@RequestBody ProductEntity product) {
+    public Result save(@RequestBody ProductEntity product) {
         productService.save(product);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -84,10 +85,10 @@ public class ProductController extends AbstractController{
     @CanUserUpdateRecord
     @RequestMapping("/update")
     @RequiresPermissions("product:update")
-    public R update(@RequestBody ProductEntity product) {
+    public Result update(@RequestBody ProductEntity product) {
         productService.update(product);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -96,10 +97,10 @@ public class ProductController extends AbstractController{
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("product:delete")
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         productService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -109,11 +110,11 @@ public class ProductController extends AbstractController{
      * @return
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<ProductEntity> list = productService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success( list);
     }
 
     /**
@@ -123,11 +124,11 @@ public class ProductController extends AbstractController{
      * @return
      */
     @RequestMapping("/queryByGoodsId/{goodsId}")
-    public R queryByGoodsId(@PathVariable("goodsId") String goodsId) {
+    public Result queryByGoodsId(@PathVariable("goodsId") String goodsId) {
         Map<String, Object> params = new HashMap<>();
         params.put("goodsId", goodsId);
         List<ProductEntity> list = productService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success( list);
     }
 }

platform-shop/src/main/java/com/platform/controller/RecommendController.java

@@ -3,10 +3,11 @@ package com.platform.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.platform.entity.BrandEntity;
 import com.platform.entity.RecommendEntity;
+import com.platform.entity.Result;
 import com.platform.service.BrandService;
 import com.platform.service.RecommendService;
 import com.platform.utils.CommonDataUtils;
-import com.platform.utils.R;
+
 import com.platform.vo.RecommendEntityVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -38,11 +39,11 @@ public class RecommendController extends AbstractController{
 
     @PostMapping("/save")
     @ResponseBody
-    public R save(@RequestBody RecommendEntity bo){
-        R dto;
+    public Result save(@RequestBody RecommendEntity bo){
+        Result dto;
         if(bo == null || StringUtils.isEmpty(bo.getTitle()) || StringUtils.isEmpty(bo.getImage())
                 || bo.getConnectId() == null || bo.getOrderNum() == null){
-            dto = R.error("参数不能为空");
+            dto = Result.failure("参数不能为空");
             log.info("参数不能为空");
             return dto;
         }
@@ -50,21 +51,21 @@ public class RecommendController extends AbstractController{
         bo.setUpdateUserId(getUserId());
         int n = service.save(bo);
         if(n <= 0){
-            dto = R.error("新增推荐位失败");
+            dto = Result.failure("新增推荐位失败");
             log.info("新增推荐位失败");
             return dto;
         }
 
-        dto = R.ok("新增推荐位成功");
+        dto = Result.success("新增推荐位成功");
         return dto;
     }
 
     @RequestMapping("/selectById")
     @ResponseBody
-    public R selectById(@RequestBody RecommendEntity bo){
+    public Result selectById(@RequestBody RecommendEntity bo){
         if(bo == null || bo.getId() == null){
             log.info("参数不能为空");
-            return R.error("参数不能为空");
+            return Result.failure("参数不能为空");
         }
         RecommendEntity entity = service.selectById(bo.getId());
         RecommendEntityVo vo = new RecommendEntityVo();
@@ -74,12 +75,12 @@ public class RecommendController extends AbstractController{
             vo.setSceneName(sceneEntity.getName());
             vo.setSceneUrl(sceneEntity.getLiveRoomUrl());
         }
-        return R.ok().put("data", vo);
+        return Result.success( vo);
     }
 
     @PostMapping("/selectByType")
     @ResponseBody
-    public R selectByType(@RequestBody RecommendEntityVo bo){
+    public Result selectByType(@RequestBody RecommendEntityVo bo){
         if(ObjectUtils.isEmpty(bo.getPageNum())){
             bo.setPageNum(1L);
         }
@@ -98,51 +99,51 @@ public class RecommendController extends AbstractController{
             }
             return vo;
         }).collect(Collectors.toList());
-        return R.ok(CommonDataUtils.assembleResult(resultPage.getTotal() , resultPage.getPages() ,
+        return Result.success(CommonDataUtils.assembleResult(resultPage.getTotal() , resultPage.getPages() ,
                 resultPage.getCurrent() , entityVos));
     }
 
     @PostMapping("/update")
     @ResponseBody
-    public R update(@RequestBody RecommendEntity bo){
-        R dto;
+    public Result update(@RequestBody RecommendEntity bo){
+        Result dto;
         if(bo == null || bo.getId() == null  || StringUtils.isEmpty(bo.getTitle())
                 || StringUtils.isEmpty(bo.getImage()) || bo.getConnectId() == null
                 || bo.getOrderNum() == null){
-            dto = R.error("参数不能为空");
+            dto = Result.failure("参数不能为空");
             log.info("参数不能为空");
             return dto;
         }
         bo.setUpdateUserId(getUserId());
         int n = service.update(bo);
         if(n <= 0){
-            dto = R.error("修改推荐位失败");
+            dto = Result.failure("修改推荐位失败");
             log.info("修改推荐位失败");
             return dto;
         }
 
-        dto = R.ok("修改推荐位成功");
+        dto = Result.success("修改推荐位成功");
         return dto;
     }
 
     @PostMapping("/delete")
     @ResponseBody
-    public R delete(@RequestBody RecommendEntity bo){
-        R dto;
+    public Result delete(@RequestBody RecommendEntity bo){
+        Result dto;
         if(bo == null || bo.getId() == null){
-            dto = R.error("参数不能为空");
+            dto = Result.failure("参数不能为空");
             log.info("参数不能为空");
             return dto;
         }
         bo.setUpdateUserId(getUserId());
         int n = service.delete(bo.getId());
         if(n <= 0){
-            dto = R.error("删除推荐位失败");
+            dto = Result.failure("删除推荐位失败");
             log.info("删除推荐位失败");
             return dto;
         }
 
-        dto = R.ok("删除推荐位成功");
+        dto = Result.success("删除推荐位成功");
         return dto;
     }
 }

platform-shop/src/main/java/com/platform/controller/RelatedGoodsController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.platform.annotation.CanUserUpdateRecord;
+import com.platform.entity.Result;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -16,7 +17,7 @@ import com.platform.entity.RelatedGoodsEntity;
 import com.platform.service.RelatedGoodsService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 
 
 /**
@@ -37,7 +38,7 @@ public class RelatedGoodsController {
 	 */
 	@RequestMapping("/list")
 	@RequiresPermissions("relatedgoods:list")
-	public R list(@RequestParam Map<String, Object> params){
+	public Result list(@RequestParam Map<String, Object> params){
 		//查询列表数据
         Query query = new Query(params);
 
@@ -46,7 +47,7 @@ public class RelatedGoodsController {
 		
 		PageUtils pageUtil = new PageUtils(relatedGoodsList, total, query.getLimit(), query.getPage());
 		
-		return R.ok().put("page", pageUtil);
+		return Result.success(pageUtil);
 	}
 	
 	
@@ -55,10 +56,10 @@ public class RelatedGoodsController {
 	 */
 	@RequestMapping("/info/{id}")
 	@RequiresPermissions("relatedgoods:info")
-	public R info(@PathVariable("id") Integer id){
+	public Result info(@PathVariable("id") Integer id){
 		RelatedGoodsEntity relatedGoods = relatedGoodsService.queryObject(id);
 		
-		return R.ok().put("relatedGoods", relatedGoods);
+		return Result.success(relatedGoods);
 	}
 	
 	/**
@@ -67,10 +68,10 @@ public class RelatedGoodsController {
 	@CanUserUpdateRecord
 	@RequestMapping("/save")
 	@RequiresPermissions("relatedgoods:save")
-	public R save(@RequestBody RelatedGoodsEntity relatedGoods){
+	public Result save(@RequestBody RelatedGoodsEntity relatedGoods){
 		relatedGoodsService.save(relatedGoods);
 		
-		return R.ok();
+		return Result.success();
 	}
 	
 	/**
@@ -79,10 +80,10 @@ public class RelatedGoodsController {
 	@CanUserUpdateRecord
 	@RequestMapping("/update")
 	@RequiresPermissions("relatedgoods:update")
-	public R update(@RequestBody RelatedGoodsEntity relatedGoods){
+	public Result update(@RequestBody RelatedGoodsEntity relatedGoods){
 		relatedGoodsService.update(relatedGoods);
 		
-		return R.ok();
+		return Result.success();
 	}
 	
 	/**
@@ -91,10 +92,10 @@ public class RelatedGoodsController {
 	@CanUserUpdateRecord
 	@RequestMapping("/delete")
 	@RequiresPermissions("relatedgoods:delete")
-	public R delete(@RequestBody Integer[] ids){
+	public Result delete(@RequestBody Integer[] ids){
 		relatedGoodsService.deleteBatch(ids);
 		
-		return R.ok();
+		return Result.success();
 	}
 	
 }

platform-shop/src/main/java/com/platform/controller/SceneController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.platform.annotation.CanUserUpdateRecord;
 import com.platform.entity.BrandEntity;
+import com.platform.entity.Result;
 import com.platform.entity.SceneEntity;
 import com.platform.entity.SysUserEntity;
 import com.platform.enums.ResultCodeEnum;
@@ -71,10 +72,10 @@ public class SceneController extends AbstractController{
     @RequestMapping("/update")
     @RequiresPermissions("brand:list")
     @Transactional(rollbackFor = Exception.class)
-    public R updateShowStatus(@RequestBody SceneEntity sceneParam) {
+    public Result updateShowStatus(@RequestBody SceneEntity sceneParam) {
         if(ObjectUtils.isEmpty(sceneParam.getId()) && ObjectUtils.isEmpty(sceneParam.getSceneNum())){
             log.error("参数有误");
-            return R.error("参数有误");
+            return Result.failure("参数有误");
         }
         if(!ObjectUtils.isEmpty(sceneParam.getId())){
             sceneService.update(sceneParam,true);
@@ -87,13 +88,13 @@ public class SceneController extends AbstractController{
             JSONObject mySceneJsonData = zhiHouseService.getSceneFromZhiHouse(requestScene);
             if(ObjectUtils.isEmpty(mySceneJsonData) || !mySceneJsonData.containsKey("list")){
                 log.error("场景码错误！");
-                return R.error("场景码错误！");
+                return Result.failure("场景码错误！");
             }
 
             List<Object> mySceneList = mySceneJsonData.getJSONArray("list");
             if (ObjectUtils.isEmpty(mySceneList)) {
                 log.error("场景码错误！");
-                return R.error("场景码错误！");
+                return Result.failure("场景码错误！");
             }
             JSONObject sceneRes = JSONObject.parseObject(JSONObject.toJSONString(mySceneList.get(0)));
             SceneEntity sceneEntity = new SceneEntity();
@@ -108,7 +109,7 @@ public class SceneController extends AbstractController{
             SysUserEntity userEntity = sysUserService.queryByUserMobile(phone);
             if (ObjectUtils.isEmpty(userEntity)) {
                 log.error("找不到用户：{}",phone);
-                return R.error("找不到用户：" + phone);
+                return Result.failure("找不到用户：" + phone);
             }
             sceneEntity.setCreateUserId(userEntity.getUserId());
             sceneEntity.setName(sceneRes.getString("sceneName"));
@@ -119,10 +120,10 @@ public class SceneController extends AbstractController{
             int result = sceneService.save(sceneEntity,false);
             if(result==0){
                 log.error("场景已经被绑定!");
-                return R.error("场景已经被绑定!");
+                return Result.failure("场景已经被绑定!");
             }
         }
-        return R.ok();
+        return Result.success();
     }
 
     public List<Long> getAllSubDeptIds(Long deptId) {
@@ -173,10 +174,10 @@ public class SceneController extends AbstractController{
      */
     @PostMapping("/list")
     @RequiresPermissions("brand:list")
-    public R list(@RequestBody RequestScene requestScene) {
+    public Result list(@RequestBody RequestScene requestScene) {
         //查询列表数据
         if (null == requestScene || org.apache.commons.lang3.StringUtils.isBlank(requestScene.getToken())) {
-            return  R.error("缺少必要参数");
+            return  Result.failure("缺少必要参数");
         }
         if(!ObjectUtils.isEmpty(requestScene.getPage())){
             requestScene.setPageNum(requestScene.getPage());
@@ -213,12 +214,12 @@ public class SceneController extends AbstractController{
         }
         JSONObject mySceneJsonData = zhiHouseService.getSceneFromZhiHouse(requestScene);
         if(ObjectUtils.isEmpty(mySceneJsonData) || !mySceneJsonData.containsKey("list")){
-            return R.ok().put("page", null);
+            return Result.success(null);
         }
 
         List<Object> mySceneList = mySceneJsonData.getJSONArray("list");
         if (ObjectUtils.isEmpty(mySceneList)) {
-            return R.ok().put("page", mySceneJsonData);
+            return Result.success(mySceneJsonData);
         }
         boolean finalGeratedable = geratedable;
         mySceneList = mySceneList.parallelStream().map(Object -> JSONObject.parseObject(JSONObject.toJSONString(Object)))
@@ -251,7 +252,7 @@ public class SceneController extends AbstractController{
                     }
                 }).collect(Collectors.toList());
         mySceneJsonData.put("list", mySceneList);
-        return R.ok().put("page", mySceneJsonData);
+        return Result.success(mySceneJsonData);
     }
 
     /**
@@ -259,14 +260,14 @@ public class SceneController extends AbstractController{
      */
     @PostMapping("/info")
     @RequiresPermissions("brand:info")
-    public R info(@RequestBody SceneEntity SceneEntity) {
+    public Result info(@RequestBody SceneEntity SceneEntity) {
         if(!ObjectUtils.isEmpty(SceneEntity.getId())){
             SceneEntity scene = sceneService.queryObject(SceneEntity.getId().intValue());
-            return R.ok().put("brand", scene);
+            return Result.success( scene);
         }
         String token = SceneEntity.getToken();
         if(ObjectUtils.isEmpty(token)){
-            return R.error("请传递token信息");
+            return Result.failure("请传递token信息");
         }
         // 获取情景信息
         RequestScene requestScene = new RequestScene();
@@ -275,17 +276,17 @@ public class SceneController extends AbstractController{
         requestScene.setUserId(-1L);
         JSONObject mySceneJsonData = zhiHouseService.getSceneFromZhiHouse(requestScene);
         if(ObjectUtils.isEmpty(mySceneJsonData) || !mySceneJsonData.containsKey("list")){
-            return R.error("场景码错误！");
+            return Result.failure("场景码错误！");
         }
 
         List<Object> mySceneList = mySceneJsonData.getJSONArray("list");
         if (ObjectUtils.isEmpty(mySceneList)) {
-            return R.error("场景码错误！");
+            return Result.failure("场景码错误！");
         }
         JSONObject scene = JSONObject.parseObject(JSONObject.toJSONString(mySceneList.get(0)));
         SceneEntity.setSceneUrl(scene.getString("webSite"));
         SceneEntity.setName(scene.getString("sceneName"));
-        return R.ok().put("brand", SceneEntity);
+        return Result.success(SceneEntity);
     }
 
 
@@ -296,13 +297,13 @@ public class SceneController extends AbstractController{
     @RequestMapping("/delete")
     @RequiresPermissions("brand:delete")
     @Transactional(rollbackFor = Exception.class)
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         List<SceneEntity> brandEntityList = new ArrayList<>();
         if(ObjectUtils.isEmpty(ids)){
-            return R.ok();
+            return Result.success();
         }
         sceneService.deleteBatch(ids);
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -310,7 +311,7 @@ public class SceneController extends AbstractController{
      */
     @GetMapping("/sync4dkkSceneData")
     @Transactional(rollbackFor = Exception.class)
-    public R sync4dkkSceneData() {
+    public Result sync4dkkSceneData() {
         CurrentUserLoginVo user = getUser();
         String mobile = user.getMobile();
         SysUserEntity userEntity = sysUserService.queryByUserMobile(mobile);
@@ -318,7 +319,7 @@ public class SceneController extends AbstractController{
             throw new CommonBaseException(500, "请绑定四维看看账号！");
         }
         sceneService.sync4dkkSceneData(mobile,user.getUserId());
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -327,16 +328,16 @@ public class SceneController extends AbstractController{
     @CanUserUpdateRecord
     @PostMapping("/generateDefaultLiveRoom")
     @RequiresPermissions("brand:delete")
-    public R generateDefaultLiveRoom(@RequestBody SceneEntity requestScene) {
+    public Result generateDefaultLiveRoom(@RequestBody SceneEntity requestScene) {
         try {
             String sceneNum = requestScene.getSceneNum();
             if (ObjectUtils.isEmpty(sceneNum)) {
-                return R.error("参数有误！");
+                return Result.failure("参数有误！");
             }
 
             BrandEntity brand = brandService.queryByScene(sceneNum);
             if (!ObjectUtils.isEmpty(brand)) {
-                return R.error("直播间已存在！");
+                return Result.failure("直播间已存在！");
             }
 
             SceneEntity entity = sceneService.queryByScene(sceneNum);
@@ -347,14 +348,14 @@ public class SceneController extends AbstractController{
 
             brandEntity = brandService.generateDefaultLiveRoom(sceneNum);
             if(ObjectUtils.isEmpty(brandEntity)){
-                return R.error("场景获取失败！");
+                return Result.failure("场景获取失败！");
             }
             brandService.bindUser(getUserId(),brandEntity.getId().intValue(),0);
         } catch (Exception e) {
             e.printStackTrace();
-            return R.error(ObjectUtils.isEmpty(e.getMessage()) ? "生成直播间失败！" : e.getMessage());
+            return Result.failure(ObjectUtils.isEmpty(e.getMessage()) ? "生成直播间失败！" : e.getMessage());
         }
-        return R.ok("生成直播间功能，请前往直播间查看。");
+        return Result.success("生成直播间功能，请前往直播间查看。");
     }
 
     @ApiOperation(value = "获取客户所有的非直播间场景数据")
@@ -365,7 +366,7 @@ public class SceneController extends AbstractController{
     )
     @PostMapping("/getAllScene")
     @ResponseBody
-    public R getAllScene(@RequestBody @ApiParam(name = "四维看看场景请求体", value = "传入json格式", required = true) RequestScene requestScene) {
+    public Result getAllScene(@RequestBody @ApiParam(name = "四维看看场景请求体", value = "传入json格式", required = true) RequestScene requestScene) {
 
         // 排除已绑定直播间的数据
         List<String> sceneNums = brandService.queryAllLiveSceneNum();
@@ -375,13 +376,13 @@ public class SceneController extends AbstractController{
         if(Constant.SUPER_ADMIN != userId){
             //通过部门ID过滤数据
             if(null == getDeptId()){
-                return R.ok().put("myScene", new ArrayList<>());
+                return Result.success( new ArrayList<>());
             }
             deptIds = departmentUtils.getAllSubDeptIds(getDeptId());
         }
         List<SceneEntity> brandList = sceneService.selectByDeptIdsAndExceptSceneNums(deptIds,sceneNums);
         Map<String ,Object> result = new HashMap<>();
         result.put("myScene" , brandList);
-        return R.ok( result);
+        return Result.success( result);
     }
 }

platform-shop/src/main/java/com/platform/controller/SearchHistoryController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.platform.annotation.CanUserUpdateRecord;
+import com.platform.entity.Result;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -16,7 +17,7 @@ import com.platform.entity.SearchHistoryEntity;
 import com.platform.service.SearchHistoryService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 
 
 /**
@@ -35,7 +36,7 @@ public class SearchHistoryController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("searchhistory:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -44,7 +45,7 @@ public class SearchHistoryController {
 
         PageUtils pageUtil = new PageUtils(searchHistoryList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success( pageUtil);
     }
 
 
@@ -53,10 +54,10 @@ public class SearchHistoryController {
      */
     @RequestMapping("/info/{id}")
     @RequiresPermissions("searchhistory:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@PathVariable("id") Integer id) {
         SearchHistoryEntity searchHistory = searchHistoryService.queryObject(id);
 
-        return R.ok().put("searchHistory", searchHistory);
+        return Result.success(searchHistory);
     }
 
     /**
@@ -65,11 +66,11 @@ public class SearchHistoryController {
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("searchhistory:save")
-    public R save(@RequestBody SearchHistoryEntity searchHistory) {
+    public Result save(@RequestBody SearchHistoryEntity searchHistory) {
 
         searchHistoryService.save(searchHistory);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -78,10 +79,10 @@ public class SearchHistoryController {
     @CanUserUpdateRecord
     @RequestMapping("/update")
     @RequiresPermissions("searchhistory:update")
-    public R update(@RequestBody SearchHistoryEntity searchHistory) {
+    public Result update(@RequestBody SearchHistoryEntity searchHistory) {
         searchHistoryService.update(searchHistory);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -90,10 +91,10 @@ public class SearchHistoryController {
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("searchhistory:delete")
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         searchHistoryService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
 }

platform-shop/src/main/java/com/platform/controller/ShippingController.java

@@ -1,11 +1,12 @@
 package com.platform.controller;
 
 import com.platform.annotation.CanUserUpdateRecord;
+import com.platform.entity.Result;
 import com.platform.entity.ShippingEntity;
 import com.platform.service.ShippingService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -31,7 +32,7 @@ public class ShippingController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("shipping:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -40,7 +41,7 @@ public class ShippingController {
 
         PageUtils pageUtil = new PageUtils(shippingList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success(pageUtil);
     }
 
     /**
@@ -48,10 +49,10 @@ public class ShippingController {
      */
     @RequestMapping("/info/{id}")
     @RequiresPermissions("shipping:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@PathVariable("id") Integer id) {
         ShippingEntity shipping = shippingService.queryObject(id);
 
-        return R.ok().put("shipping", shipping);
+        return Result.success(shipping);
     }
 
     /**
@@ -60,10 +61,10 @@ public class ShippingController {
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("shipping:save")
-    public R save(@RequestBody ShippingEntity shipping) {
+    public Result save(@RequestBody ShippingEntity shipping) {
         shippingService.save(shipping);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -72,10 +73,10 @@ public class ShippingController {
     @CanUserUpdateRecord
     @RequestMapping("/update")
     @RequiresPermissions("shipping:update")
-    public R update(@RequestBody ShippingEntity shipping) {
+    public Result update(@RequestBody ShippingEntity shipping) {
         shippingService.update(shipping);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -84,20 +85,20 @@ public class ShippingController {
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("shipping:delete")
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         shippingService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 查看所有列表
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<ShippingEntity> list = shippingService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success(list);
     }
 }

platform-shop/src/main/java/com/platform/controller/SpecificationController.java

@@ -2,12 +2,13 @@ package com.platform.controller;
 
 import com.platform.annotation.CanUserUpdateRecord;
 import com.platform.entity.GoodsSpecificationEntity;
+import com.platform.entity.Result;
 import com.platform.entity.SpecificationEntity;
 import com.platform.service.GoodsSpecificationService;
 import com.platform.service.SpecificationService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -38,7 +39,7 @@ public class SpecificationController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("specification:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -47,7 +48,7 @@ public class SpecificationController {
 
         PageUtils pageUtil = new PageUtils(specificationList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success( pageUtil);
     }
 
 
@@ -56,10 +57,10 @@ public class SpecificationController {
      */
     @RequestMapping("/info/{id}")
     @RequiresPermissions("specification:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@PathVariable("id") Integer id) {
         SpecificationEntity specification = specificationService.queryObject(id);
 
-        return R.ok().put("specification", specification);
+        return Result.success( specification);
     }
 
     /**
@@ -68,10 +69,10 @@ public class SpecificationController {
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("specification:save")
-    public R save(@RequestBody SpecificationEntity specification) {
+    public Result save(@RequestBody SpecificationEntity specification) {
         specificationService.save(specification);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -79,10 +80,10 @@ public class SpecificationController {
      */
     @RequestMapping("/update")
     @RequiresPermissions("specification:update")
-    public R update(@RequestBody SpecificationEntity specification) {
+    public Result update(@RequestBody SpecificationEntity specification) {
         specificationService.update(specification);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -90,28 +91,28 @@ public class SpecificationController {
      */
     @RequestMapping("/delete")
     @RequiresPermissions("specification:delete")
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         Map<String, Object> map = new HashMap<>();
         for(Integer id : ids){
             map.put("specificationId", id);
             List<GoodsSpecificationEntity> list = goodsSpecificationService.queryList(map);
             if(list != null && list.size() > 0){
-                return R.error("该属性已绑定商品！");
+                return Result.failure("该属性已绑定商品！");
             }
         }
         specificationService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 查看所有列表
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<SpecificationEntity> list = specificationService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success(list);
     }
 }

platform-shop/src/main/java/com/platform/controller/SysUserController.java

@@ -17,7 +17,6 @@ import com.platform.validator.group.UpdateGroup;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.apache.shiro.crypto.hash.Sha256Hash;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
@@ -77,27 +76,27 @@ public class SysUserController extends AbstractController {
 
     /**
      * 店铺绑定的用户列表
+     * @return
      */
     @GetMapping("/bindList")
     @RequiresPermissions("sys:user:list")
-    public R userBindList(@RequestParam(name = "deptId") long deptId,
-                          String key,
-                          @RequestParam(name = "brandId") long brandId,
-                          @RequestParam(name = "pageNum") long pageNum,
-                          @RequestParam(name = "pageSize") long pageSize) {
+    public Result userBindList(@RequestParam(name = "deptId") long deptId,
+                               String key,
+                               @RequestParam(name = "brandId") long brandId,
+                               @RequestParam(name = "pageNum") long pageNum,
+                               @RequestParam(name = "pageSize") long pageSize) {
 
         IPage<SysUserEntity> resultPage = sysUserService.getSysUserList(sysDeptService.getSubDeptIdLongList(deptId), key,
                 brandId , pageNum, pageSize);
         if (null == resultPage) {
-            return R.error("获取用户列表失败");
+            return Result.failure("获取用户列表失败");
         }
         resultPage.getRecords().parallelStream().forEach(user->{
             if (!ObjectUtils.isEmpty(user.getIsPlatformStreamer()) && user.getIsPlatformStreamer()) {
                 user.setRoleName("平台主持人");
             }
         });
-        return R.ok(CommonDataUtils.assembleResult(resultPage.getTotal(), resultPage.getPages()
-                , resultPage.getCurrent(), resultPage.getRecords()));
+        return Result.success(PageUtilsPlus.page(resultPage));
     }
 
     /**
@@ -105,7 +104,7 @@ public class SysUserController extends AbstractController {
      */
     @GetMapping("/list")
     @RequiresPermissions("sys:user:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //只有超级管理员，才能查看所有管理员列表
         if (getUserId() != Constant.SUPER_ADMIN) {
             params.put("deptIdList", sysDeptService.getSubDeptIdList(getDeptId()));
@@ -126,21 +125,21 @@ public class SysUserController extends AbstractController {
                     userEntity.setRoleList(curRoleList);
                 }
         );
-        PageUtils pageUtil = new PageUtils(userList, total, query.getLimit(), query.getPage());
-        return R.ok().put("page", pageUtil);
+        return Result.success( PageUtilsPlus.page(userList, (long) total, (long)query.getLimit(),(long)query.getPage()));
     }
 
     /**
      * 员工列表
+     * @return
      */
     @ApiOperation("员工列表")
     @GetMapping("/staffList")
     @RequiresPermissions("sys:user:list")
-    public R staffList(String staffName,
-                       @RequestParam(name = "pageNum") long pageNum,
-                       @RequestParam(name = "pageSize") long pageSize,
-                       @RequestParam(name = "deptName",required = false) String deptName,
-                       @RequestParam(name = "deptId") long deptId) {
+    public Result staffList(String staffName,
+                            @RequestParam(name = "pageNum") long pageNum,
+                            @RequestParam(name = "pageSize") long pageSize,
+                            @RequestParam(name = "deptName",required = false) String deptName,
+                            @RequestParam(name = "deptId") long deptId) {
 
         IPage<SysUserEntity> resultPage = null;
 
@@ -155,10 +154,9 @@ public class SysUserController extends AbstractController {
         }
 
         if (null == resultPage) {
-            return R.error("获取员工列表失败");
+            return Result.failure("获取员工列表失败");
         }
-        return R.ok(CommonDataUtils.assembleResult(resultPage.getTotal(), resultPage.getPages()
-                , resultPage.getCurrent(), resultPage.getRecords()));
+        return  Result.success(PageUtilsPlus.page(resultPage));
     }
 
     @ApiOperation("检验用户是否是四维看看的用户")
@@ -167,10 +165,10 @@ public class SysUserController extends AbstractController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "phoneNum", value = "手机号码", dataType = "String"),
     })
-    public R getBrandCommentList(@RequestParam(name = "phoneNum") String phoneNum) {
+    public Result getBrandCommentList(@RequestParam(name = "phoneNum") String phoneNum) {
 
         if (StringUtils.isNullOrEmpty(phoneNum)) {
-            return R.error("缺少手机号码");
+            return Result.failure("缺少手机号码");
         }
         Map<String, Object> mp = new HashMap<>();
         mp.put("phone", phoneNum);
@@ -180,21 +178,21 @@ public class SysUserController extends AbstractController {
         JSONObject res = JSONObject.parseObject(kankanResult.getBody());
         log.info("四维看看返回登录数据:{}", res.toJSONString());
         if (!res.containsKey("code")) {
-            return R.error("系统故障，请稍后重试");
+            return Result.failure("系统故障，请稍后重试");
         }
         Boolean exist = res.getBoolean("message");
         if (!exist) {
-            return R.error("用户不存在!");
+            return Result.failure("用户不存在!");
         }
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 获取登录的用户信息
      */
     @GetMapping("/info")
-    public R info() {
-        return R.ok().put("user", getUser());
+    public Result info() {
+        return Result.success(getUser());
     }
 
     /**
@@ -202,7 +200,7 @@ public class SysUserController extends AbstractController {
      */
     @SysLog("修改密码")
     @PostMapping("/bind4dkkUser")
-    public R bind4dkkUser(@RequestHeader String token, String fdkkPassword, String fdkkUser) {
+    public Result bind4dkkUser(@RequestHeader String token, String fdkkPassword, String fdkkUser) {
         Assert.isBlank(fdkkUser, "手机号不为能空");
         Assert.isBlank(fdkkPassword, "密码不为能空");
         //更新密码
@@ -215,7 +213,7 @@ public class SysUserController extends AbstractController {
 
         // 同步数据
         sceneService.sync4dkkSceneData(getUser().getMobile(),getUserId());
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -223,7 +221,7 @@ public class SysUserController extends AbstractController {
      */
     @SysLog("修改密码")
     @PostMapping("/unBind4dkkUser")
-    public R unBind4dkkUser(@RequestHeader String token,String fdkkUser) {
+    public Result unBind4dkkUser(@RequestHeader String token,String fdkkUser) {
         Assert.isBlank(fdkkUser, "手机号不为能空");
         //更新密码
         sysUserService.updatePassword(getUser().getMobile(), null, null, fdkkUser);
@@ -252,26 +250,26 @@ public class SysUserController extends AbstractController {
                     // 直播间商品删除
                     goodsService.deleteByBrandId(brandEntity.getId());
                 });
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 用户信息
      */
     @GetMapping("/info/{userId}")
-    public R info(@PathVariable("userId") Long userId) {
+    public Result info(@PathVariable("userId") Long userId) {
         SysUserEntity user = sysUserService.queryObject(userId);
 
         //获取用户所属的角色列表
         List<Long> roleIdList = sysUserRoleService.queryRoleIdList(userId);
         user.setRoleIdList(roleIdList);
 
-        return R.ok().put("user", user);
+        return Result.success(user);
     }
 
-    @GetMapping("/infoAnon/{userId}")
+    @PostMapping("/infoAnon")
     @ResponseBody
-    public R infoAnon(@PathVariable("userId") Long userId) {
+    public Result infoAnon(@RequestParam(value = "userId",required = true) Long userId) {
         SysUserEntity user = sysUserService.queryObject(userId);
         user.setPassword(null);
         //获取用户所属的角色列表
@@ -279,8 +277,7 @@ public class SysUserController extends AbstractController {
         if (null != roleIdList) {
             user.setRoleIdList(roleIdList);
         }
-
-        return R.ok().put("user", user);
+        return Result.success(user);
     }
 
     /**
@@ -289,12 +286,12 @@ public class SysUserController extends AbstractController {
     @SysLog("保存用户")
     @PostMapping("/save")
     @RequiresPermissions("sys:user:save")
-    public R save(@ApiParam(name = "SysUserEntity对象", value = "传入json格式", required = true) @RequestBody SysUserEntity user) {
+    public Result save(@ApiParam(name = "SysUserEntity对象", value = "传入json格式", required = true) @RequestBody SysUserEntity user) {
         ValidatorUtils.validateEntity(user, AddGroup.class);
 
         SysUserEntity sysUserEntity = sysUserService.queryByUserMobile(user.getMobile());
         if(null != sysUserEntity){
-            return R.error("员工已经存在，请勿重复添加");
+            return Result.failure("员工已经存在，请勿重复添加");
         }
 
         user.setCreateUserId(getUserId());
@@ -305,7 +302,7 @@ public class SysUserController extends AbstractController {
             user.setRoleIdList(Collections.singletonList(8L));
         }
         sysUserService.save(user);
-        return R.ok();
+        return Result.success();
     }
 
 
@@ -315,31 +312,31 @@ public class SysUserController extends AbstractController {
     @PostMapping("/staffSave")
     @RequiresPermissions("sys:user:save")
     @Transactional(rollbackFor = Exception.class)
-    public R staffSave(@ApiParam(name = "SysUserEntity对象", value = "传入json格式", required = true) @RequestBody SysUserEntity user) {
+    public Result staffSave(@ApiParam(name = "SysUserEntity对象", value = "传入json格式", required = true) @RequestBody SysUserEntity user) {
         ValidatorUtils.validateEntity(user, AddGroup.class);
         if(null == user.getDeptId()){
-            return R.error("缺失公司数据！");
+            return Result.failure("缺失公司数据！");
         }
         if(ObjectUtils.isEmpty(user.getRoleId())){
-            return R.error("角色为空！");
+            return Result.failure("角色为空！");
         }
 
         //TODO:这里需要改成select for update
         SysDeptEntity sysDeptEntity = sysDeptService.queryObject(user.getDeptId());
         if(null == sysDeptEntity){
-            return R.error("公司不存在！");
+            return Result.failure("公司不存在！");
         }
         int curStaffNum = null != sysDeptEntity.getCurStaffNum() ? sysDeptEntity.getCurStaffNum() : 0;
         int maxStaffNum = null != sysDeptEntity.getStaffNum() ? sysDeptEntity.getStaffNum() : 0;
         if((curStaffNum + 1) > maxStaffNum){
-            return R.error("公司员工已经达到上限！");
+            return Result.failure("公司员工已经达到上限！");
         }
 
         user.setCreateUserId(getUserId());
 
         SysUserEntity sysUserEntity = sysUserService.queryByUserMobile(user.getMobile());
         if(null != sysUserEntity){
-            return R.error("员工已经存在，请勿重复添加！");
+            return Result.failure("员工已经存在，请勿重复添加！");
         }
         //创建用户，并且创建用户和角色的关联关系
         sysUserService.save(user);
@@ -353,7 +350,7 @@ public class SysUserController extends AbstractController {
 
         sysDeptService.update(sysDeptEntity);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -362,10 +359,10 @@ public class SysUserController extends AbstractController {
     @SysLog("修改用户")
     @PostMapping("/update")
     @RequiresPermissions("sys:user:update")
-    public R update(@RequestBody SysUserEntity user) {
+    public Result update(@RequestBody SysUserEntity user) {
         ValidatorUtils.validateEntity(user, UpdateGroup.class);
         sysUserService.update(user);
-        return R.ok();
+        return Result.success();
     }
 
     @ApiOperation(value = "删除员工")
@@ -373,26 +370,26 @@ public class SysUserController extends AbstractController {
     @PostMapping("/preDeleteStaff")
     @RequiresPermissions("sys:user:delete")
     @Transactional(rollbackFor = Exception.class)
-    public R preDeleteStaff(@RequestBody Map<String,Long> params) {
+    public Result preDeleteStaff(@RequestBody Map<String,Long> params) {
         Long userId = params.get("userId");
         if(ObjectUtils.isEmpty(userId)){
-            return R.error("参数有误！");
+            return Result.failure("参数有误！");
         }
         if (userId.equals(-1L)) {
-            return R.error("不能删除平台管理员");
+            return Result.failure("不能删除平台管理员");
         }
         if (getUserId().equals(userId)) {
-            return R.error("当前用户不能删除");
+            return Result.failure("当前用户不能删除");
         }
 
         SysUserEntity sysUserEntity = sysUserService.queryObject(userId);
         if(ObjectUtils.isEmpty(sysUserEntity)){
-            return R.error("获取用户信息失败！");
+            return Result.failure("获取用户信息失败！");
         }
 
         List<Long> roleList = sysUserRoleService.queryRoleIdList(userId);
         if(!CollectionUtils.isEmpty(roleList) && (roleList.contains(6) || roleList.contains(5))){
-            return R.error("不能删除平台管理员或者普通管理员");
+            return Result.failure("不能删除平台管理员或者普通管理员");
         }
 
         Long deptId = sysUserEntity.getDeptId();
@@ -400,7 +397,7 @@ public class SysUserController extends AbstractController {
             // 更新企业员工信息
             long num = sysUserService.getUserNumOfDept(deptId);
             if(num <= 1){
-                return R.error("删除失败，公司仅剩一个账号");
+                return Result.failure("删除失败，公司仅剩一个账号");
             }
             // 获取直播间绑定信息
             List<Long> bindUsers = mySysUserBrandService.queryBrandIdList(userId);
@@ -410,12 +407,12 @@ public class SysUserController extends AbstractController {
                 List<String> phones = userEntities.stream().filter(user -> !user.getUserId().equals(userId))
                         .map(SysUserEntity::getMobile).collect(Collectors.toList());
                 if(ObjectUtils.isEmpty(phones)){
-                    return R.error("删除失败，公司仅剩一名员工，不可进行删除！");
+                    return Result.failure("删除失败，公司仅剩一名员工，不可进行删除！");
                 }
-                return R.ok().put("list", phones);
+                return Result.success(phones);
             }
         }
-        return R.ok();
+        return Result.success();
     }
 
     @ApiOperation(value = "删除员工")
@@ -423,27 +420,27 @@ public class SysUserController extends AbstractController {
     @PostMapping("/deleteStaff")
     @RequiresPermissions("sys:user:delete")
     @Transactional(rollbackFor = Exception.class)
-    public R deleteStaff(@RequestBody Map<String,String> params) {
+    public Result deleteStaff(@RequestBody Map<String,String> params) {
         Long userId = Long.parseLong(params.get("userId"));
         String toUser = params.get("toUser");
         if(ObjectUtils.isEmpty(userId)){
-            return R.error("参数有误！");
+            return Result.failure("参数有误！");
         }
         if (userId.equals(-1L)) {
-            return R.error("不能删除平台管理员");
+            return Result.failure("不能删除平台管理员");
         }
         if (getUserId().equals(userId)) {
-            return R.error("当前用户不能删除");
+            return Result.failure("当前用户不能删除");
         }
 
         SysUserEntity sysUserEntity = sysUserService.queryObject(userId);
         if(ObjectUtils.isEmpty(sysUserEntity)){
-            return R.error("获取用户信息失败！");
+            return Result.failure("获取用户信息失败！");
         }
 
         List<Long> roleList = sysUserRoleService.queryRoleIdList(userId);
         if (!CollectionUtils.isEmpty(roleList) && roleList.contains(5)) {
-            return R.error("不能删除平台管理员");
+            return Result.failure("不能删除平台管理员");
         }
 
         // 获取情景信息
@@ -452,11 +449,11 @@ public class SysUserController extends AbstractController {
 
         if (!ObjectUtils.isEmpty(bindUsers)) {
             if (ObjectUtils.isEmpty(toUser)) {
-                return R.error("没有配置分配用户信息！");
+                return Result.failure("没有配置分配用户信息！");
             }
             toUserEntity = sysUserService.queryByUserMobile(toUser);
             if (ObjectUtils.isEmpty(toUserEntity)) {
-                return R.error("分配用户有误！");
+                return Result.failure("分配用户有误！");
             }
         }
 
@@ -465,7 +462,7 @@ public class SysUserController extends AbstractController {
         if(!ObjectUtils.isEmpty(deptId)){
            long num = sysUserService.getUserNumOfDept(deptId);
            if(num <= 1){
-               return R.error("删除失败，公司仅剩一名员工，不可进行删除");
+               return Result.failure("删除失败，公司仅剩一名员工，不可进行删除");
            }
            SysDeptEntity sysDeptEntity = sysDeptService.queryObject(deptId);
            if(!ObjectUtils.isEmpty(sysDeptEntity)){
@@ -481,6 +478,6 @@ public class SysUserController extends AbstractController {
 
         // 删除用户信息
         sysUserService.deleteBatch(new Long[]{userId});
-        return R.ok();
+        return Result.success();
     }
 }

platform-shop/src/main/java/com/platform/controller/TmLiveRoomController.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.platform.annotation.CanUserUpdateRecord;
+import com.platform.entity.Result;
 import com.platform.entity.TmLiveRoomInfo;
 import com.platform.entity.WxLiveRoomRequestVo;
 import com.platform.enums.LiveRoomStatusEnum;
@@ -60,18 +61,18 @@ public class TmLiveRoomController extends AbstractController{
     public Object addNewLiveRoom(@ApiParam(name = "TmLiveRoomInfo对象", value = "传入json格式", required = true) @RequestBody TmLiveRoomInfo tmLiveRoomInfo) {
 
         if(null == tmLiveRoomInfo){
-            return R.error("入参缺失");
+            return Result.failure("入参缺失");
         }
 
         if(null == tmLiveRoomInfo.getCreateUserId() || null == tmLiveRoomInfo.getCreateUserDeptId()){
-            return R.error("缺失创建者信息");
+            return Result.failure("缺失创建者信息");
         }
 
         if(!StringUtils.isNoneBlank(tmLiveRoomInfo.getName() , tmLiveRoomInfo.getAnchorName())){
-            return R.error("直播间名称或者主播名称不能为空");
+            return Result.failure("直播间名称或者主播名称不能为空");
         }
         if(null == tmLiveRoomInfo.getStartTime() || null == tmLiveRoomInfo.getEndTime()){
-            return R.error("直播起始时间不能为空");
+            return Result.failure("直播起始时间不能为空");
         }
 
         log.info("开始时间:{}" , tmLiveRoomInfo.getStartTime());
@@ -83,7 +84,7 @@ public class TmLiveRoomController extends AbstractController{
                 ResourceUtil.getConfigByName("wx.secret"));
         if(null == wxLiveRoomRspVo){
             log.error("解析微信返回值失败，调用微信创建直播间失败");
-            return R.error("解析微信返回值失败");
+            return Result.failure("解析微信返回值失败");
         }
         log.info("微信返回报文为:{}" , wxLiveRoomRspVo.toJSONString());
         Integer errcode = wxLiveRoomRspVo.getInteger("errcode");
@@ -124,7 +125,7 @@ public class TmLiveRoomController extends AbstractController{
                 Thumbnails.of(file.getInputStream()).scale(1f).outputQuality(0.2f).toFile(imageLocalPath);
             } catch (IOException e) {
                 e.printStackTrace();
-                return R.error("压缩照片失败");
+                return Result.failure("压缩照片失败");
             }
             newFile = new File(imageLocalPath);
             if(null == newFile){
@@ -138,7 +139,7 @@ public class TmLiveRoomController extends AbstractController{
                 file.transferTo(newFile);
             } catch (IOException e) {
                 log.info("本地缓存照片出现异常:{}" , e);
-                return R.error("本地缓存照片出现异常");
+                return Result.failure("本地缓存照片出现异常");
             }
         }
         String mediaId = WxOpUtils.uploadMedia("image" , newFile ,  ResourceUtil.getConfigByName("wx.appId"),
@@ -153,7 +154,7 @@ public class TmLiveRoomController extends AbstractController{
         Map<String ,Object> mp = new HashMap<>();
         mp.put("mediaId" , mediaId);
         mp.put("ossUrl" , imageTotalOssUrl);
-        return R.ok(mp);
+        return Result.success(mp);
     }
 
     /**
@@ -184,7 +185,7 @@ public class TmLiveRoomController extends AbstractController{
 
         IPage<TmLiveRoomInfo> resultPage = new Page<>();
         if(null == getUserId() || null == getDeptId()){
-            return R.error("缺失用户信息");
+            return Result.failure("缺失用户信息");
         }
         resultPage  = liveRoomInfoService.getOrQuery(name, page , limit , getUserId() , getDeptId());
         if(resultPage != null){
@@ -192,7 +193,7 @@ public class TmLiveRoomController extends AbstractController{
                     resultPage.getCurrent() ,limit , resultPage.getRecords()));
         }
 
-        return R.ok();
+        return Result.success();
     }
 
     @CanUserUpdateRecord
@@ -204,20 +205,20 @@ public class TmLiveRoomController extends AbstractController{
                                      @RequestBody TmLiveRoomInfo tmLiveRoomInfo){
 
         if(null == tmLiveRoomInfo){
-            return R.error("入参缺失");
+            return Result.failure("入参缺失");
         }
         if(null == tmLiveRoomInfo.getUpdateUserId()){
-            return R.error("更新者信息缺失");
+            return Result.failure("更新者信息缺失");
         }
         if(StringUtils.isBlank(tmLiveRoomInfo.getLiveId())){
-            return R.error("liveId缺失");
+            return Result.failure("liveId缺失");
         }
         int update = liveRoomInfoService.updateLiveRoom(tmLiveRoomInfo);
         if(update != 1){
             log.error("直播间liveId=[{}]更新失败" , tmLiveRoomInfo.getLiveId());
-            return R.error("更新失败");
+            return Result.failure("更新失败");
         }
-        return R.ok();
+        return Result.success();
     }
     
 }

platform-shop/src/main/java/com/platform/controller/TmSlideShowController.java

@@ -2,12 +2,13 @@ package com.platform.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.platform.annotation.CanUserUpdateRecord;
+import com.platform.entity.Result;
 import com.platform.entity.TmSlideShow;
 import com.platform.enums.ResultCodeEnum;
 import com.platform.exception.CommonBaseException;
 import com.platform.service.custom.TmSlideShowService;
 import com.platform.utils.CommonDataUtils;
-import com.platform.utils.R;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -34,7 +35,7 @@ public class TmSlideShowController {
     @ApiOperation(value = "录入新的轮播图")
     @PostMapping(value = "/add")
     @ResponseBody
-    public R addNewSlideShow(@ApiParam(name = "TmSlideShow对象", value = "传入json格式", required = true) @RequestBody TmSlideShow tmSlideShow){
+    public Result addNewSlideShow(@ApiParam(name = "TmSlideShow对象", value = "传入json格式", required = true) @RequestBody TmSlideShow tmSlideShow){
 
         if(null == tmSlideShow || !StringUtils.isNoneBlank(tmSlideShow.getTitle() , tmSlideShow.getCoverImage())){
             throw new CommonBaseException(ResultCodeEnum.D3004, "标题或者封面照片不能为空");
@@ -49,7 +50,7 @@ public class TmSlideShowController {
             log.error("新增轮播图[{}]失败" , tmSlideShow.getTitle());
             throw new CommonBaseException(ResultCodeEnum.D101, "新增轮播图失败");
         }
-        return R.ok();
+        return Result.success();
     }
     @ApiOperation(value = "获取轮播图列表，支持查询标题")
     @GetMapping(value = "/getAndQuery")
@@ -101,7 +102,7 @@ public class TmSlideShowController {
             log.info("跟新轮播图[{}]失败" , tmSlideShow.getSlideId());
             throw new CommonBaseException(ResultCodeEnum.D101 , "轮播图更新失败");
         }
-        return R.ok();
+        return Result.success();
     }
 
 }

platform-shop/src/main/java/com/platform/controller/TopicCategoryController.java

@@ -1,11 +1,12 @@
 package com.platform.controller;
 
 import com.platform.annotation.CanUserUpdateRecord;
+import com.platform.entity.Result;
 import com.platform.entity.TopicCategoryEntity;
 import com.platform.service.TopicCategoryService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -31,7 +32,7 @@ public class TopicCategoryController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("topiccategory:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -40,7 +41,7 @@ public class TopicCategoryController {
 
         PageUtils pageUtil = new PageUtils(topicCategoryList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success(pageUtil);
     }
 
     /**
@@ -48,10 +49,10 @@ public class TopicCategoryController {
      */
     @RequestMapping("/info/{id}")
     @RequiresPermissions("topiccategory:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@PathVariable("id") Integer id) {
         TopicCategoryEntity topicCategory = topicCategoryService.queryObject(id);
 
-        return R.ok().put("topicCategory", topicCategory);
+        return Result.success(topicCategory);
     }
 
     /**
@@ -60,10 +61,10 @@ public class TopicCategoryController {
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("topiccategory:save")
-    public R save(@RequestBody TopicCategoryEntity topicCategory) {
+    public Result save(@RequestBody TopicCategoryEntity topicCategory) {
         topicCategoryService.save(topicCategory);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -72,10 +73,10 @@ public class TopicCategoryController {
     @CanUserUpdateRecord
     @RequestMapping("/update")
     @RequiresPermissions("topiccategory:update")
-    public R update(@RequestBody TopicCategoryEntity topicCategory) {
+    public Result update(@RequestBody TopicCategoryEntity topicCategory) {
         topicCategoryService.update(topicCategory);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -84,20 +85,20 @@ public class TopicCategoryController {
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("topiccategory:delete")
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         topicCategoryService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 查看所有列表
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<TopicCategoryEntity> list = topicCategoryService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success( list);
     }
 }

platform-shop/src/main/java/com/platform/controller/TopicController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.platform.annotation.CanUserUpdateRecord;
+import com.platform.entity.Result;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -16,7 +17,7 @@ import com.platform.entity.TopicEntity;
 import com.platform.service.TopicService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 
 /**
  * Controller
@@ -36,7 +37,7 @@ public class TopicController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("topic:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -45,7 +46,7 @@ public class TopicController {
 
         PageUtils pageUtil = new PageUtils(topicList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success(pageUtil);
     }
 
     /**
@@ -53,10 +54,10 @@ public class TopicController {
      */
     @RequestMapping("/info/{id}")
     @RequiresPermissions("topic:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@PathVariable("id") Integer id) {
         TopicEntity topic = topicService.queryObject(id);
 
-        return R.ok().put("topic", topic);
+        return Result.success(topic);
     }
 
     /**
@@ -65,10 +66,10 @@ public class TopicController {
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("topic:save")
-    public R save(@RequestBody TopicEntity topic) {
+    public Result save(@RequestBody TopicEntity topic) {
         topicService.save(topic);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -77,10 +78,10 @@ public class TopicController {
     @CanUserUpdateRecord
     @RequestMapping("/update")
     @RequiresPermissions("topic:update")
-    public R update(@RequestBody TopicEntity topic) {
+    public Result update(@RequestBody TopicEntity topic) {
         topicService.update(topic);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -89,20 +90,20 @@ public class TopicController {
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("topic:delete")
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         topicService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 查看所有列表
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<TopicEntity> list = topicService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success( list);
     }
 }

platform-shop/src/main/java/com/platform/controller/UserController.java

@@ -1,11 +1,12 @@
 package com.platform.controller;
 
 import com.platform.annotation.CanUserUpdateRecord;
+import com.platform.entity.Result;
 import com.platform.entity.UserEntity;
 import com.platform.service.UserService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 import com.platform.utils.excel.ExcelExport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -51,7 +52,7 @@ public class UserController {
             @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", required = true, dataType = "Long"),
             @ApiImplicitParam(name = "limit", value = "每页大小", paramType = "query", required = true, dataType = "Long"),
     })
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -72,7 +73,7 @@ public class UserController {
 
         PageUtils pageUtil = new PageUtils(userList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success( pageUtil);
     }
 
 
@@ -81,10 +82,10 @@ public class UserController {
      */
     @RequestMapping("/info/{id}")
     @RequiresPermissions("user:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@PathVariable("id") Integer id) {
         UserEntity user = userService.queryObject(id);
 
-        return R.ok().put("user", user);
+        return Result.success(user);
     }
 
     /**
@@ -93,10 +94,10 @@ public class UserController {
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("user:save")
-    public R save(@RequestBody UserEntity user) {
+    public Result save(@RequestBody UserEntity user) {
         userService.save(user);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -105,10 +106,10 @@ public class UserController {
     @CanUserUpdateRecord
     @RequestMapping("/update")
     @RequiresPermissions("user:update")
-    public R update(@RequestBody UserEntity user) {
+    public Result update(@RequestBody UserEntity user) {
         userService.update(user);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -117,31 +118,31 @@ public class UserController {
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("user:delete")
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         userService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 查看所有列表
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<UserEntity> userList = userService.queryList(params);
 
-        return R.ok().put("list", userList);
+        return Result.success( userList);
     }
 
     /**
      * 总计
      */
     @RequestMapping("/queryTotal")
-    public R queryTotal(@RequestParam Map<String, Object> params) {
+    public Result queryTotal(@RequestParam Map<String, Object> params) {
         int sum = userService.queryTotal(params);
 
-        return R.ok().put("userSum", sum);
+        return Result.success(sum);
     }
 
     /**
@@ -149,7 +150,7 @@ public class UserController {
      */
     @RequestMapping("/export")
 //    @RequiresPermissions("user:export")
-    public R export(@RequestParam Map<String, Object> params, HttpServletResponse response) {
+    public Result export(@RequestParam Map<String, Object> params, HttpServletResponse response) {
 
         List<UserEntity> userList = userService.queryList(params);
 
@@ -172,6 +173,6 @@ public class UserController {
 
         ee.addSheetByMap("会员", list, header);
         ee.export(response);
-        return R.ok();
+        return Result.success();
     }
 }

platform-shop/src/main/java/com/platform/controller/UserCouponController.java

@@ -1,11 +1,12 @@
 package com.platform.controller;
 
 import com.platform.annotation.CanUserUpdateRecord;
+import com.platform.entity.Result;
 import com.platform.entity.UserCouponEntity;
 import com.platform.service.UserCouponService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -31,7 +32,7 @@ public class UserCouponController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("usercoupon:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -40,7 +41,7 @@ public class UserCouponController {
 
         PageUtils pageUtil = new PageUtils(userCouponList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success(pageUtil);
     }
 
     /**
@@ -48,10 +49,10 @@ public class UserCouponController {
      */
     @RequestMapping("/info/{id}")
     @RequiresPermissions("usercoupon:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@PathVariable("id") Integer id) {
         UserCouponEntity userCoupon = userCouponService.queryObject(id);
 
-        return R.ok().put("userCoupon", userCoupon);
+        return Result.success(userCoupon);
     }
 
     /**
@@ -60,10 +61,10 @@ public class UserCouponController {
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("usercoupon:save")
-    public R save(@RequestBody UserCouponEntity userCoupon) {
+    public Result save(@RequestBody UserCouponEntity userCoupon) {
         userCouponService.save(userCoupon);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -72,10 +73,10 @@ public class UserCouponController {
     @CanUserUpdateRecord
     @RequestMapping("/update")
     @RequiresPermissions("usercoupon:update")
-    public R update(@RequestBody UserCouponEntity userCoupon) {
+    public Result update(@RequestBody UserCouponEntity userCoupon) {
         userCouponService.update(userCoupon);
 
-        return R.ok();
+        return Result.success();
     }
 
 
@@ -85,16 +86,16 @@ public class UserCouponController {
     @CanUserUpdateRecord
     @GetMapping("/cancelUserCoupon")
     @RequiresPermissions("usercoupon:update")
-    public R cancelUserCoupon(@RequestParam(name = "couponId") Integer couponId ,
+    public Result cancelUserCoupon(@RequestParam(name = "couponId") Integer couponId ,
                               @RequestParam(name = "userId") Long userId) {
         if(null == couponId || null == userId){
-            return R.error("优惠券ID或者用户Id不能为空");
+            return Result.failure("优惠券ID或者用户Id不能为空");
         }
         int update = userCouponService.cancelUserCoupon(couponId , userId);
         if(update != 1){
-            R.error("作废失败");
+            Result.failure("作废失败");
         }
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -103,20 +104,20 @@ public class UserCouponController {
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("usercoupon:delete")
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         userCouponService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
      * 查看所有列表
      */
     @RequestMapping("/queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
 
         List<UserCouponEntity> list = userCouponService.queryList(params);
 
-        return R.ok().put("list", list);
+        return Result.success(list);
     }
 }

platform-shop/src/main/java/com/platform/controller/UserLevelController.java

@@ -1,11 +1,12 @@
 package com.platform.controller;
 
 import com.platform.annotation.CanUserUpdateRecord;
+import com.platform.entity.Result;
 import com.platform.entity.UserLevelEntity;
 import com.platform.service.UserLevelService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
-import com.platform.utils.R;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -31,7 +32,7 @@ public class UserLevelController {
      */
     @RequestMapping("/list")
     @RequiresPermissions("userlevel:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public Result list(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
 
@@ -40,7 +41,7 @@ public class UserLevelController {
 
         PageUtils pageUtil = new PageUtils(userLevelList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("page", pageUtil);
+        return Result.success( pageUtil);
     }
 
 
@@ -49,10 +50,10 @@ public class UserLevelController {
      */
     @RequestMapping("/info/{id}")
     @RequiresPermissions("userlevel:info")
-    public R info(@PathVariable("id") Integer id) {
+    public Result info(@PathVariable("id") Integer id) {
         UserLevelEntity userLevel = userLevelService.queryObject(id);
 
-        return R.ok().put("userLevel", userLevel);
+        return Result.success(userLevel);
     }
 
     /**
@@ -61,10 +62,10 @@ public class UserLevelController {
     @CanUserUpdateRecord
     @RequestMapping("/save")
     @RequiresPermissions("userlevel:save")
-    public R save(@RequestBody UserLevelEntity userLevel) {
+    public Result save(@RequestBody UserLevelEntity userLevel) {
         userLevelService.save(userLevel);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -73,10 +74,10 @@ public class UserLevelController {
     @CanUserUpdateRecord
     @RequestMapping("/update")
     @RequiresPermissions("userlevel:update")
-    public R update(@RequestBody UserLevelEntity userLevel) {
+    public Result update(@RequestBody UserLevelEntity userLevel) {
         userLevelService.update(userLevel);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -85,10 +86,10 @@ public class UserLevelController {
     @CanUserUpdateRecord
     @RequestMapping("/delete")
     @RequiresPermissions("userlevel:delete")
-    public R delete(@RequestBody Integer[] ids) {
+    public Result delete(@RequestBody Integer[] ids) {
         userLevelService.deleteBatch(ids);
 
-        return R.ok();
+        return Result.success();
     }
 
     /**
@@ -97,8 +98,8 @@ public class UserLevelController {
      * @return
      */
     @RequestMapping("queryAll")
-    public R queryAll(@RequestParam Map<String, Object> params) {
+    public Result queryAll(@RequestParam Map<String, Object> params) {
         List<UserLevelEntity> userLevelList = userLevelService.queryList(params);
-        return R.ok().put("list", userLevelList);
+        return Result.success(userLevelList);
     }
 }

platform-shop/src/main/java/com/platform/service/BrandService.java

@@ -2,7 +2,8 @@ package com.platform.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.platform.entity.BrandEntity;
-import com.platform.utils.R;
+
+import com.platform.entity.Result;
 import com.platform.vo.BrandBindUserVo;
 import org.apache.commons.lang.StringUtils;
 
@@ -63,7 +64,7 @@ public interface BrandService {
      * @param brand 实体
      * @return 更新条数
      */
-    R update(BrandEntity brand);
+    Result update(BrandEntity brand);
 
     /**
      * 根据主键更新实体
@@ -71,7 +72,7 @@ public interface BrandService {
      * @param brand 实体
      * @return 更新条数
      */
-    R updateWithoutCheck(BrandEntity brand);
+    Result updateWithoutCheck(BrandEntity brand);
 
     /**
      * 根据主键删除
@@ -98,7 +99,7 @@ public interface BrandService {
 
     String generalWxShareQrCode(BrandEntity brand , boolean needUpdate);
 
-    R sendDataToApi(BrandEntity brandEntity);
+    Result sendDataToApi(BrandEntity brandEntity);
 
     BrandEntity generateDefaultLiveRoom(String sceneNum);
 

platform-shop/src/main/java/com/platform/service/CategoryService.java

@@ -1,7 +1,8 @@
 package com.platform.service;
 
 import com.platform.entity.CategoryEntity;
-import com.platform.utils.R;
+import com.platform.entity.Result;
+
 
 import java.util.List;
 import java.util.Map;
@@ -45,7 +46,7 @@ public interface CategoryService {
      * @param category 实体
      * @return 保存条数
      */
-    R save(CategoryEntity category);
+    Result save(CategoryEntity category);
 
     /**
      * 根据主键更新实体
@@ -53,7 +54,7 @@ public interface CategoryService {
      * @param category 实体
      * @return 更新条数
      */
-    R update(CategoryEntity category);
+    Result update(CategoryEntity category);
 
     /**
      * 根据主键删除

platform-shop/src/main/java/com/platform/service/CouponService.java

@@ -1,7 +1,8 @@
 package com.platform.service;
 
 import com.platform.entity.CouponEntity;
-import com.platform.utils.R;
+import com.platform.entity.Result;
+
 
 import java.util.List;
 import java.util.Map;
@@ -96,5 +97,5 @@ public interface CouponService {
      * @param params
      * @return
      */
-    R publish(Map<String, Object> params);
+    Result publish(Map<String, Object> params);
 }

platform-shop/src/main/java/com/platform/service/SceneService.java

@@ -1,7 +1,8 @@
 package com.platform.service;
 
+import com.platform.entity.Result;
 import com.platform.entity.SceneEntity;
-import com.platform.utils.R;
+
 
 import java.util.List;
 import java.util.Map;
@@ -55,7 +56,7 @@ public interface SceneService {
      * @param brand 实体
      * @return 更新条数
      */
-    R update(SceneEntity brand,boolean checkName);
+    Result update(SceneEntity brand, boolean checkName);
 
     /**
      * 根据主键删除

platform-shop/src/main/java/com/platform/service/impl/BrandServiceImpl.java

@@ -154,22 +154,22 @@ public class BrandServiceImpl implements BrandService {
     }
 
     @Override
-    public R updateWithoutCheck(BrandEntity brand) {
+    public Result updateWithoutCheck(BrandEntity brand) {
         brandDao.update(brand);
-        return R.ok();
+        return Result.success();
     }
 
     @Override
-    public R update(BrandEntity brand) {
+    public Result update(BrandEntity brand) {
         BrandEntity brandEntity = brandDao.findByName(brand.getName());
         if(brandEntity != null && brandEntity.getId().intValue() != brand.getId().intValue()){
-            return R.error("店铺名称重复");
+            return Result.failure("店铺名称重复");
         }
         int update = brandDao.update(brand);
         if(update != 1){
-            return R.error("更新店铺失败");
+            return Result.failure("更新店铺失败");
         }
-        return R.ok();
+        return Result.success();
     }
 
     @Override
@@ -233,9 +233,9 @@ public class BrandServiceImpl implements BrandService {
         return imageTotalOssUrl;
     }
 
-    public R sendDataToApi(BrandEntity brandEntity){
+    public Result sendDataToApi(BrandEntity brandEntity){
         if(null == brandEntity){
-            return R.error("商家信息为空，无法请求api平台");
+            return Result.failure("商家信息为空，无法请求api平台");
         }
         Map<String, Object> reqData = new HashMap<>();
         reqData.put("brandId" , brandEntity.getId());
@@ -285,7 +285,7 @@ public class BrandServiceImpl implements BrandService {
         log.info("请求openApi的url={}", openApiurl);
         String apiResultStr = HttpClientUtil.doPostJson(openApiurl , sortMapStr);
         log.info("api平台返回结果:{}" , apiResultStr);
-        return R.ok(apiResultStr);
+        return Result.success(apiResultStr);
 
     }
 

platform-shop/src/main/java/com/platform/service/impl/CategoryServiceImpl.java

@@ -2,8 +2,9 @@ package com.platform.service.impl;
 
 import com.platform.dao.CategoryDao;
 import com.platform.entity.CategoryEntity;
+import com.platform.entity.Result;
 import com.platform.service.CategoryService;
-import com.platform.utils.R;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -40,7 +41,7 @@ public class CategoryServiceImpl implements CategoryService {
     }
 
     @Override
-    public R save(CategoryEntity category) {
+    public Result save(CategoryEntity category) {
         if ("L1".equals(category.getLevel())) {
             category.setParentId(0);
         }
@@ -49,14 +50,14 @@ public class CategoryServiceImpl implements CategoryService {
         map.put("name", category.getName());
         List<CategoryEntity> list = categoryDao.queryByNameAndLevel(map);
         if(list != null && list.size() > 0){
-            return R.error("分类名称不能重复");
+            return Result.failure("分类名称不能重复");
         }
         categoryDao.save(category);
-        return R.ok();
+        return Result.success();
     }
 
     @Override
-    public R update(CategoryEntity category) {
+    public Result update(CategoryEntity category) {
         if ("L1".equals(category.getLevel())) {
             category.setParentId(0);
         }
@@ -66,11 +67,11 @@ public class CategoryServiceImpl implements CategoryService {
         List<CategoryEntity> list = categoryDao.queryByNameAndLevel(map);
         if(list != null && list.size() > 0){
             if(list.get(0).getId().intValue() != category.getId().intValue()){
-                return R.error("分类名称不能重复");
+                return Result.failure("分类名称不能重复");
             }
         }
         categoryDao.update(category);
-        return R.ok();
+        return Result.success();
     }
 
     @Override

platform-shop/src/main/java/com/platform/service/impl/CouponServiceImpl.java

@@ -4,12 +4,9 @@ import com.platform.dao.CouponDao;
 import com.platform.dao.CouponGoodsDao;
 import com.platform.dao.UserCouponDao;
 import com.platform.dao.UserDao;
-import com.platform.entity.CouponEntity;
-import com.platform.entity.CouponGoodsEntity;
-import com.platform.entity.UserCouponEntity;
-import com.platform.entity.UserEntity;
+import com.platform.entity.*;
 import com.platform.service.CouponService;
-import com.platform.utils.R;
+
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -93,20 +90,20 @@ public class CouponServiceImpl implements CouponService {
     }
 
     @Override
-    public R publish(Map<String, Object> params) {
+    public Result publish(Map<String, Object> params) {
         // 发放方式 0：按订单发放 1：按用户发放 2:商品转发送券 3：按商品发放 4:新用户注册  5：线下发放 6评价好评红包（固定或随机红包）
         Integer sendType = MapUtils.getInteger(params, "sendType");
         Integer couponId = MapUtils.getInteger(params, "couponId");
         if (null == sendType) {
-            return R.error("发放方式不能为空");
+            return Result.failure("发放方式不能为空");
         }
         if (null == couponId) {
-            return R.error("优惠券不能为空");
+            return Result.failure("优惠券不能为空");
         }
         if (1 == sendType) {
             String userIds = MapUtils.getString(params, "userIds"); // 下发用户逗号分割
             if (StringUtils.isEmpty(userIds)) {
-                return R.error("用户不能为空");
+                return Result.failure("用户不能为空");
             }
             //是否发送短信通知
             boolean sendSms = "true".equals(MapUtils.getString(params, "sendSms"));
@@ -130,7 +127,7 @@ public class CouponServiceImpl implements CouponService {
         } else if (3 == sendType) {
             String goodsIds = MapUtils.getString(params, "goodsIds"); // 下发商品逗号分割
             if (StringUtils.isEmpty(goodsIds)) {
-                return R.error("商品Id不能为空");
+                return Result.failure("商品Id不能为空");
             }
             for (String goodsId : goodsIds.split(",")) {
                 if (StringUtils.isEmpty(goodsId)) {
@@ -142,8 +139,8 @@ public class CouponServiceImpl implements CouponService {
                 couponGoodsDao.save(couponGoodsVo);
             }
         } else {
-            return R.error("此类优惠券不支持手动发放");
+            return Result.failure("此类优惠券不支持手动发放");
         }
-        return R.ok("发放成功");
+        return Result.success("发放成功");
     }
 }

platform-shop/src/main/java/com/platform/service/impl/OrderServiceImpl.java

@@ -7,7 +7,7 @@ import com.platform.entity.OrderShippingEntity;
 import com.platform.entity.ShippingEntity;
 import com.platform.service.OrderService;
 import com.platform.service.OrderShippingService;
-import com.platform.utils.R;
+
 import com.platform.utils.RRException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

platform-shop/src/main/java/com/platform/service/impl/SceneServiceImpl.java

@@ -2,10 +2,11 @@ package com.platform.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.platform.dao.SceneDao;
+import com.platform.entity.Result;
 import com.platform.entity.SceneEntity;
 import com.platform.service.SceneService;
 import com.platform.utils.DateUtils;
-import com.platform.utils.R;
+
 import com.platform.vos.ReturnDTO;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -65,18 +66,18 @@ public class SceneServiceImpl implements SceneService {
     }
 
     @Override
-    public R update(SceneEntity brand,boolean checkName) {
+    public Result update(SceneEntity brand, boolean checkName) {
         if(checkName){
             SceneEntity SceneEntity = sceneDao.findByName(brand.getName());
             if(SceneEntity != null && SceneEntity.getId().intValue() != brand.getId().intValue()){
-                return R.error("店铺名称重复");
+                return Result.failure("店铺名称重复");
             }
         }
         int update = sceneDao.update(brand);
         if(update != 1){
-            return R.error("更新店铺失败");
+            return Result.failure("更新店铺失败");
         }
-        return R.ok();
+        return Result.success();
     }
 
     @Override