Merge remote-tracking branch 'origin/dev' into dev

ace-common/src/main/java/com/github/wxiaoqi/security/common/biz/BaseBiz.java

@@ -211,6 +211,26 @@ public abstract class BaseBiz<M extends Mapper<T>, T> {
         return PageDataVO.pageInfo(query, ()-> mapper.selectByExample(example));
     }
 
+    public PageDataVO<T> selectByQueryLogicPage(Query query) {
+        Class<T> clazz = (Class<T>) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[1];
+        Example example = new Example(clazz);
+        if(query.entrySet().size()>0) {
+            Example.Criteria criteria = example.createCriteria();
+            for (Map.Entry<String, Object> entry : query.entrySet()) {
+                criteria.andLike(entry.getKey(), "%" + entry.getValue().toString() + "%");
+            }
+        }
+
+        Field field = ReflectUtil.getField(clazz, "updTime");
+        if(null != field) {
+            example.setOrderByClause("upd_time desc");
+        }
+        Field isDelField = ReflectUtil.getField(clazz, "isDel");
+        if(null != isDelField) {
+            example.createCriteria().andEqualTo("isDel", 0);
+        }
+        return PageDataVO.pageInfo(query, ()-> mapper.selectByExample(example));
+    }
 
 
 }

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/backstage/BgRscpImageDataTotalController.java

@@ -8,6 +8,7 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.util.Query;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.github.wxiaoqi.security.common.vo.PageParam;
 import com.upyuns.platform.rs.datacenter.biz.RscpAreaImageTotalBiz;
 import com.upyuns.platform.rs.datacenter.biz.RscpImageDataTotalBiz;
@@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 
@@ -31,5 +33,10 @@ import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TR
 @RequestMapping("/bg/imageData")
 public class BgRscpImageDataTotalController extends BaseController<RscpImageDataTotalBiz, RscpImageDataTotal> {
 
-
+    @Override
+    public ObjectRestResponse<PageDataVO<RscpImageDataTotal>> pages(Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+        return ObjectRestResponse.succ(baseBiz.selectByQueryLogicPage(query));
+    }
 }
\ No newline at end of file

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/backstage/BgRscpImagePriceController.java

@@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollUtil;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.util.Query;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.upyuns.platform.rs.datacenter.biz.RscpImagePriceBiz;
 import com.upyuns.platform.rs.datacenter.entity.RscpImagePrice;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
@@ -21,6 +24,10 @@ import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TR
 @RequestMapping("/bg/imagePrice")
 public class BgRscpImagePriceController extends BaseController<RscpImagePriceBiz, RscpImagePrice> {
 
-
-
+    @Override
+    public ObjectRestResponse<PageDataVO<RscpImagePrice>> pages(Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+        return ObjectRestResponse.succ(baseBiz.selectByQueryLogicPage(query));
+    }
 }
\ No newline at end of file

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/backstage/BgRscpResolutionController.java

@@ -3,13 +3,17 @@ package com.upyuns.platform.rs.datacenter.rest.backstage;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.util.Query;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.upyuns.platform.rs.datacenter.biz.RscpResolutionBiz;
+import com.upyuns.platform.rs.datacenter.entity.RscpImagePrice;
 import com.upyuns.platform.rs.datacenter.entity.RscpResolution;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
@@ -18,4 +22,10 @@ import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TR
 @RequestMapping("/bg/resolution")
 public class BgRscpResolutionController extends BaseController<RscpResolutionBiz, RscpResolution> {
 
+    @Override
+    public ObjectRestResponse<PageDataVO<RscpResolution>> pages(Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+        return ObjectRestResponse.succ(baseBiz.selectByQueryLogicPage(query));
+    }
 }
\ No newline at end of file