调整获取商城物料的返回值

src/main/java/com/uas/platform/b2c/external/erp/prod/service/impl/ProdServiceImpl.java

@@ -20,28 +20,14 @@ import com.uas.platform.b2c.prod.commodity.service.ReleaseProductByBatchService;
 import com.uas.platform.b2c.prod.store.dao.StoreInDao;
 import com.uas.platform.b2c.prod.store.model.StoreIn;
 import com.uas.platform.core.logging.BufferedLoggerManager;
-import com.uas.platform.core.model.PageInfo;
-import com.uas.platform.core.model.PageParams;
-import com.uas.platform.core.persistence.criteria.CriterionExpression;
-import com.uas.platform.core.persistence.criteria.LogicalExpression;
-import com.uas.platform.core.persistence.criteria.PredicateUtils;
-import com.uas.platform.core.persistence.criteria.SimpleExpression;
 import org.apache.log4j.Logger;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -214,42 +200,43 @@ public class ProdServiceImpl implements ProdService {
     }
 
     @Override
-    public Page<Prod> findNewProdUploadMallERP(int i) {
-        PageParams pageParams = new PageParams();
-        pageParams.setPage(i);
-        pageParams.setCount(IntegerConstant.PAGE_COUNT);
-        final PageInfo info = new PageInfo(pageParams);
-        info.sorting("id", Sort.Direction.ASC);
-        SimpleExpression b2cEnabled = new SimpleExpression("b2cEnabled", 1, CriterionExpression.Operator.EQ);
-        SimpleExpression pbranden = PredicateUtils.isNotNull("pbranden");
-        SimpleExpression pcmpcode = PredicateUtils.isNotNull("pcmpcode");
-        SimpleExpression erpDown = PredicateUtils.isNull("erpDown");
-        LogicalExpression expression = new LogicalExpression(new SimpleExpression[]{b2cEnabled, pbranden, pcmpcode, erpDown}, CriterionExpression.Operator.AND);
-        info.expression(expression);
-        Page<V_ProductPrivate> productPrivates = vProductPrivateDao.findAll(new Specification<V_ProductPrivate>() {
-            @Override
-            public Predicate toPredicate(Root<V_ProductPrivate> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
-                query.where(info.getPredicates(root, query, cb));
-                return null;
-            }
-        }, info);
-        List<V_ProductPrivate> content = productPrivates.getContent();
+    public List<Prod> findNewProdUploadMallERP(int i) {
+//        PageParams pageParams = new PageParams();
+//        pageParams.setPage(i);
+//        pageParams.setCount(IntegerConstant.PAGE_COUNT);
+//        final PageInfo info = new PageInfo(pageParams);
+//        info.sorting("id", Sort.Direction.ASC);
+//        SimpleExpression b2cEnabled = new SimpleExpression("b2cEnabled", 1, CriterionExpression.Operator.EQ);
+//        SimpleExpression pbranden = PredicateUtils.isNotNull("pbranden");
+//        SimpleExpression pcmpcode = PredicateUtils.isNotNull("pcmpcode");
+//        SimpleExpression erpDown = PredicateUtils.isNull("erpDown");
+//        LogicalExpression expression = new LogicalExpression(new SimpleExpression[]{b2cEnabled, pbranden, pcmpcode, erpDown}, CriterionExpression.Operator.AND);
+//        info.expression(expression);
+        String sql = "select * from v$product$private where pr_erpdown is null and pr_b2cenabled = 1 and pr_pcmpcode is not null and pr_pbrand is not null limit i, 500";
+        List<V_ProductPrivate> v_productPrivates = jdbcTemplate.queryForList(sql, V_ProductPrivate.class);
+//        Page<V_ProductPrivate> productPrivates = vProductPrivateDao.findAll(new Specification<V_ProductPrivate>() {
+//            @Override
+//            public Predicate toPredicate(Root<V_ProductPrivate> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+//                query.where(info.getPredicates(root, query, cb));
+//                return null;
+//            }
+//        }, info);
+//        List<V_ProductPrivate> content = productPrivates.getContent();
         List<Prod> content1 =  new ArrayList<>();
-        for (V_ProductPrivate v_productPrivate : content) {
+        for (V_ProductPrivate v_productPrivate : v_productPrivates) {
                 Prod prod = ModelConvertUtil.vProductPrivateConvertProd(v_productPrivate);
             if (prod != null) {
                 content1.add(prod);
             }
         }
-        PageImpl<Prod> page = new PageImpl<>(content1, info, productPrivates.getTotalElements());
-        return page;
+        return content1;
     }
 
     @Override
     public void updateNewProdDowned(final List<String> list) {
         if (!CollectionUtils.isEmpty(list)) {
             final String sql = "update products set pr_erpdown = '已上传' where pr_pcmpcode = ? and pr_pbranden = ?";
-            int[] batchUpdate = jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
+            jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
                 @Override
                 public void setValues(PreparedStatement ps, int i) throws SQLException {
                     String str = list.get(i);
@@ -263,7 +250,7 @@ public class ProdServiceImpl implements ProdService {
                     return list.size();
                 }
             });
-            System.out.println(batchUpdate.length);
+            System.out.println("success");
         }
     }
 }