二维码类型配置

src/main/java/com/ydtech/modules/admin/controller/SysQRCodeRelationController.java

@@ -2,10 +2,12 @@ package com.ydtech.modules.admin.controller;
 
 
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.core.page.HttpStatus;
 import com.ydtech.modules.admin.model.SysQRCodeRelation;
 import com.ydtech.modules.admin.model.vo.SysQRCodeRelationVo;
 import com.ydtech.modules.admin.service.SysQRCodeRelationService;
 import com.ydtech.modules.base.controller.BaseController;
+import com.ydtech.modules.protocol.utils.AssertionUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -25,18 +27,24 @@ public class SysQRCodeRelationController extends BaseController {
     public HttpResult save(@RequestBody SysQRCodeRelation sysQRCodeRelation) {
         sysQRCodeRelation.setCreateBy(getUserName());
         sysQRCodeRelation.setLastUpdateBy(getUserName());
-        return HttpResult.ok("添加成功",sysQRCodeRelationService.save(sysQRCodeRelation));
+        boolean result = sysQRCodeRelationService.save(sysQRCodeRelation);
+        AssertionUtils.isSucceed(result, "添加失败");
+        return HttpResult.ok("添加成功",result);
     }
     @PostMapping(value = "/edit")
     @ApiOperation("修改二维码类型")
     public HttpResult edit(@RequestBody SysQRCodeRelation sysQRCodeRelation) {
         sysQRCodeRelation.setLastUpdateBy(getUserName());
-        return HttpResult.ok("修改成功",sysQRCodeRelationService.updateById(sysQRCodeRelation));
+        boolean result = sysQRCodeRelationService.updateById(sysQRCodeRelation);
+        AssertionUtils.isSucceed(result, "修改失败");
+        return HttpResult.ok("修改成功",result);
     }
     @DeleteMapping(value = "/delete")
     @ApiOperation("删除二维码类型")
     public HttpResult delete(@RequestParam("id") Integer id) {
-        return HttpResult.ok("删除成功",sysQRCodeRelationService.removeById(id));
+        boolean result = sysQRCodeRelationService.removeById(id);
+        AssertionUtils.isSucceed(result, "删除失败");
+        return HttpResult.ok("删除成功",result);
     }
 
     @PostMapping(value = "/getList")

src/main/java/com/ydtech/modules/admin/service/SysQRCodeRelationService.java

@@ -2,13 +2,14 @@ package com.ydtech.modules.admin.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.core.page.PageResult;
 import com.ydtech.modules.admin.model.SysQRCodeRelation;
 import com.ydtech.modules.admin.model.vo.SysQRCodeRelationVo;
 
 public interface SysQRCodeRelationService extends IService<SysQRCodeRelation> {
 
 
-    public HttpResult getAllForPage(SysQRCodeRelationVo sysQRCodeRelationVo );
+    public PageResult getAllForPage(SysQRCodeRelationVo sysQRCodeRelationVo );
 
     public Integer getQRCodeType(Integer apiType, String insCompanyId, String insCompanyName);
 

src/main/java/com/ydtech/modules/admin/service/impl/SysQRCodeRelationServiceImpl.java

@@ -22,7 +22,7 @@ public class SysQRCodeRelationServiceImpl extends ServiceImpl<SysQRCodeRelationM
                                 implements SysQRCodeRelationService {
     private final static Logger LOGGER = LoggerFactory.getLogger(SysQRCodeRelationService.class);
     @Override
-    public HttpResult getAllForPage(SysQRCodeRelationVo sysQRCodeRelationVo) {
+    public PageResult getAllForPage(SysQRCodeRelationVo sysQRCodeRelationVo) {
         LOGGER.info("开始获取二维码关联配置分页列表----");
         PageHelper.startPage(sysQRCodeRelationVo.getPageNum(), sysQRCodeRelationVo.getPageSize());
         Map map = new HashMap();
@@ -40,7 +40,7 @@ public class SysQRCodeRelationServiceImpl extends ServiceImpl<SysQRCodeRelationM
         }
         List<SysQRCodeRelation> list =  baseMapper.selectByMap(map);
         PageResult<SysQRCodeRelation> pageResult = new PageResult<>(list);
-        return HttpResult.ok("查询成功", pageResult);
+        return pageResult;
     }
 
     @Override