fengji 声部搜索改分页

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SubjectDao.java

@@ -165,10 +165,9 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
 
     /**
      * 按id或名称模糊搜索
-     *
-     * @param parentSubjectId 按父Id查询
-     * @param search 搜索条件
      * @return 查询结果
      */
-    List<Subject> search(@Param("parentSubjectId")Integer parentSubjectId, @Param("search") String search);
+    List<Subject> queryPageByIdOrName(Map<String, Object> params);
+
+    int queryPageByIdOrNameCount(Map<String, Object> params);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/SubjectQueryInfo.java

@@ -15,6 +15,12 @@ public class SubjectQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "对内1对外2",required = false)
     private Integer tenantId;
 
+    @ApiModelProperty(value = "查询父Id")
+    private Integer parentSubjectId;
+
+    @ApiModelProperty(value = "模糊查询id或者名称")
+    private String search;
+
     public Integer getTenantId() {
         return tenantId;
     }
@@ -38,4 +44,22 @@ public class SubjectQueryInfo extends QueryInfo {
     public void setParentId(Integer parentId) {
         this.parentId = parentId;
     }
+
+    public Integer getParentSubjectId() {
+        return parentSubjectId;
+    }
+
+    public void setParentSubjectId(Integer parentSubjectId) {
+        this.parentSubjectId = parentSubjectId;
+    }
+
+    @Override
+    public String getSearch() {
+        return search;
+    }
+
+    @Override
+    public void setSearch(String search) {
+        this.search = search;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/SubjectService.java

@@ -108,5 +108,5 @@ public interface SubjectService extends BaseService<Integer, Subject> {
      * @param search 搜索条件
      * @return 查询结果
      */
-    List<Subject> search(Integer parentSubjectId, String search);
+    PageInfo<Subject> queryPageByIdOrName(SubjectQueryInfo queryInfo);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SubjectServiceImpl.java

@@ -221,7 +221,23 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject> implem
     }
 
     @Override
-    public List<Subject> search(Integer parentSubjectId, String search) {
-        return  subjectDao.search(parentSubjectId, search);
+    public PageInfo<Subject> queryPageByIdOrName(SubjectQueryInfo queryInfo) {
+        PageInfo<Subject> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+        Map<String, Object> params = new HashMap<String, Object>();
+        MapUtil.populateMap(params, queryInfo);
+
+        List<Subject> dataList = null;
+        int count = subjectDao.queryPageByIdOrNameCount(params);
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = subjectDao.queryPageByIdOrName(params);
+        }
+        if (count == 0) {
+            dataList = new ArrayList<>();
+        }
+        pageInfo.setRows(dataList);
+        return pageInfo;
+
     }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantOrderRecordServiceImpl.java

@@ -233,14 +233,13 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
         tenantProductInfoService.updateById(productInfo);
     }
 
-    private int rechargeSuccess(TenantOrderRecord record) throws Exception {
+    private void rechargeSuccess(TenantOrderRecord record) throws Exception {
         // 更新 tenantAssetsInfo
         log.info("checkRechargeCheck  updateAmount>>>>>");
         int ret = assetsInfoService.updateAmount(record.getTenantId(), record.getExpectAmount());
         if (ret != 1) {
             throw new Exception("更新支付失败");
         }
-        return ret;
     }
 
     @Override
@@ -255,10 +254,7 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
             baseMapper.updateById(record);
             try {
                 log.info("checkRechargeCheck  rechargeSuccess>>>>>");
-                int ret = this.rechargeSuccess(record); // 充值成功
-                if (ret == 0) {
-                    throw new Exception("更新失败");
-                }
+                this.rechargeSuccess(record); // 充值成功
                 return true;
             } catch (Exception e) {
                 e.printStackTrace();

mec-biz/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -144,7 +144,19 @@
         </where>
     </select>
 
-    <select id="search" resultMap="Subject">
+    <select id="queryPageByIdOrNameCount" resultType="integer">
+        SELECT count(1) FROM `subject`
+        <where>
+            del_flag_ = 0
+            <if test="parentSubjectId != null and parentSubjectId != ''">
+                AND parent_subject_id_ = #{parentSubjectId}
+            </if>
+            <if test="search != null and search != ''">
+                AND (id_ = #{search} or name_ like concat('%', #{search}, '%'))
+            </if>
+        </where>
+    </select>
+    <select id="queryPageByIdOrName" resultMap="Subject">
         SELECT * FROM `subject`
         <where>
             del_flag_ = 0
@@ -155,6 +167,7 @@
                 AND (id_ = #{search} or name_ like concat('%', #{search}, '%'))
             </if>
         </where>
+        <include refid="global.limit"/>
     </select>
 
     <sql id="querySubPageSql">

mec-web/src/main/java/com/ym/mec/web/controller/AppRedemptionCodeController.java

@@ -20,7 +20,7 @@ import javax.annotation.Resource;
  * @since 2021-12-27 14:27:56
  */
 @RestController
-@RequestMapping("/appRedemptionCode")
+@RequestMapping("appRedemptionCode")
 public class AppRedemptionCodeController extends BaseController {
     /**
      * 服务对象

mec-web/src/main/java/com/ym/mec/web/controller/SubjectController.java

@@ -102,9 +102,10 @@ public class SubjectController extends BaseController {
     }
 
     @ApiOperation(value = "搜索按Id和名称")
-    @GetMapping("/search")
-    // @PreAuthorize("@pcs.hasPermissions('subject/search')")
-    public Object search(Integer parentSubjectId, String search){
-        return succeed(subjectService.search(parentSubjectId, search));
+    @PostMapping("/queryPageByIdOrName")
+    // @PreAuthorize("@pcs.hasPermissions('subject/queryPageByIdOrName')")
+    public Object queryPageByIdOrName(SubjectQueryInfo queryInfo){
+        return succeed(subjectService.queryPageByIdOrName(queryInfo));
     }
+
 }

mec-web/src/main/java/com/ym/mec/web/controller/TenantAssetsInfoController.java

@@ -18,7 +18,7 @@ import java.util.List;
  * @since 2021-12-22 14:27:02
  */
 @RestController
-@RequestMapping("/tenantAssetsInfo")
+@RequestMapping("tenantAssetsInfo")
 public class TenantAssetsInfoController extends BaseController {
 
     /**

mec-web/src/main/java/com/ym/mec/web/controller/TenantInfoController.java

@@ -26,7 +26,7 @@ import java.util.Map;
  * @author hgw
  * Created by 2021-12-07
  */
-@RequestMapping("/tenantInfo")
+@RequestMapping("tenantInfo")
 @Api(tags = "机构管理")
 @RestController
 public class TenantInfoController extends BaseController {
@@ -109,7 +109,7 @@ public class TenantInfoController extends BaseController {
 
     @ApiOperation(value = "机构充值")
     @GetMapping("/recharge/{amount}")
-    // @PreAuthorize("@pcs.hasPermissions('tenantInfo/recharge')")
+    @PreAuthorize("@pcs.hasPermissions('tenantInfo/recharge')")
     public HttpResponseResult<Map<String, Object>> recharge(
             @ApiParam(value = "充值金额", required = true) @PathVariable("amount") Double amount
     ) throws Exception {
@@ -119,7 +119,7 @@ public class TenantInfoController extends BaseController {
 
     @ApiOperation(value = "轮询查询订单状态")
     @GetMapping("/rechargeCheck/{orderNo}")
-    // @PreAuthorize("@pcs.hasPermissions('tenantInfo/payCheck')")
+    @PreAuthorize("@pcs.hasPermissions('tenantInfo/payCheck')")
     public HttpResponseResult<Boolean> rechargeCheck(
             @ApiParam(value = "订单号", required = true) @PathVariable("orderNo") String orderNo
     ) throws Exception {

mec-web/src/main/java/com/ym/mec/web/controller/TenantOrderRecordController.java

@@ -27,7 +27,7 @@ import java.util.Map;
  */
 @RestController
 @Api(tags = "机构付款记录")
-@RequestMapping("/tenantOrderRecord")
+@RequestMapping("tenantOrderRecord")
 public class TenantOrderRecordController extends BaseController {
     /**
      * 服务对象