思迅初始化与更新区分

client/src/main/java/com/small/client/dao/BaseDao.java

@@ -385,6 +385,62 @@ public class BaseDao {
         return   resultDto;
     }
 
+    /**
+     * 全量查询
+     * @param ip
+     * @param username
+     * @param password
+     * @param portNumber
+     * @param dataBaseName
+     * @param pageNo
+     * @param pageSize
+     * @param where
+     * @param stockOperateWhere
+     * @return
+     */
+    public ResultDto baseFindAllGoodsListJoinPage(String ip, String username, String password,Integer portNumber, String dataBaseName, int pageNo, int pageSize,
+                                               String where,String stockOperateWhere){
+        Connection connection=getConnection(ip,username,password,portNumber,dataBaseName);
+        int start=(pageNo-1)*pageSize+1;
+        int end=pageNo*pageSize;
+        String sql="SELECT * " +
+                "FROM (" +
+                "    SELECT  " +
+                "        ROW_NUMBER() OVER(ORDER BY shop.item_clsno, shop.item_no) AS rowIdA," +
+                "        shop.*," +
+                "        (\n" +
+                "            SELECT TOP 1 stock_qty " +
+                "            FROM t_im_branch_stock " +
+                "            WHERE item_no = shop.item_no " +
+                "            ORDER BY oper_date DESC " +
+                "        ) as stock_qty,\n" +
+                "        (\n" +
+                "            SELECT TOP 1 oper_date " +
+                "            FROM t_im_branch_stock  " +
+                "            WHERE item_no = shop.item_no " +
+                "            ORDER BY oper_date DESC " +
+                "        ) as oper_date " +
+                "    FROM t_bd_item_info shop " +
+                "    %s " +
+                ") t " +
+                "WHERE rowIdA BETWEEN %s AND %s " +
+                "ORDER BY rowIdA;";
+        sql=String.format(sql,where,start,end);
+        log.info(sql);
+        ResultDto resultDto=new ResultDto();
+        ResultSet rs=null;
+        try {
+            PreparedStatement ps= connection.prepareStatement(sql);
+            rs = ps.executeQuery();
+        } catch (SQLException e) {
+            log.info("数据库查询异常方法{},异常信息{}","com.suisung.mall.shop.sixun.dao.BaseDao.baseFindListJoinPage",e.getMessage());
+            throw new RuntimeException(e);
+        }
+        resultDto.setResultSet(rs);
+        resultDto.setConnection(connection);
+        return   resultDto;
+    }
+
     /**
      *
      * @param ip

client/src/main/java/com/small/client/dao/SxDataDao.java

@@ -127,9 +127,15 @@ public class SxDataDao extends BaseDao{
         try {
             while (rs.next()) {
                 sxSyncCategory=new SxSyncCategory();
-                sxSyncCategory.setItem_clsname(rs.getString("item_clsname"));//分类名称
+                if(StringUtils.isNotEmpty(rs.getString("item_clsname"))){
-                sxSyncCategory.setCls_parent(rs.getString("cls_parent"));//父级编码
+                    sxSyncCategory.setItem_clsname(rs.getString("item_clsname").trim());//分类名称
-                sxSyncCategory.setItem_clsno(rs.getString("item_clsno"));//分类编码
+                }
+                if(StringUtils.isNotEmpty(rs.getString("cls_parent"))){
+                    sxSyncCategory.setCls_parent(rs.getString("cls_parent").trim());//父级编码
+                }
+                if(StringUtils.isNotEmpty(rs.getString("item_clsno"))){
+                    sxSyncCategory.setItem_clsno(rs.getString("item_clsno").trim());//分类编码
+                }
 //                System.out.printf(rs.getString("item_clsno"));//分类编码
                // log.info(rs.getString("item_clsname")+"\t");//分类名称
                 //log.info(rs.getString("cls_parent")+"\t");//父级编码
@@ -203,13 +209,22 @@ public class SxDataDao extends BaseDao{
      * @param pageNo
      * @param pageSize
      */
-    public  List<SxSyncGoods> findBditemInfoListPage(DataBaseInfo dataBaseInfo,int pageNo,int pageSize){
+    public  List<SxSyncGoods> findBditemInfoListPage(DataBaseInfo dataBaseInfo,int pageNo,int pageSize,boolean isAll){
         String stockOperateWhere="";
         if(StringUtils.isNotEmpty(dataBaseInfo.getStockOperateWhere())){
             stockOperateWhere=" where "+dataBaseInfo.getStockOperateWhere();
         }
-        ResultDto resultDto=baseFindGoodsListJoinPage(dataBaseInfo.getIp(),dataBaseInfo.getUserName(),dataBaseInfo.getPassword(),dataBaseInfo.getDbPort(),dataBaseInfo.getDataBaseName()
+
+        ResultDto resultDto=null;
+        if(!isAll){
+             resultDto=baseFindGoodsListJoinPage(dataBaseInfo.getIp(),dataBaseInfo.getUserName(),dataBaseInfo.getPassword(),dataBaseInfo.getDbPort(),dataBaseInfo.getDataBaseName()
                     ,pageNo,pageSize,dataBaseInfo.getWhere()==null?DEFALTWHERE:dataBaseInfo.getWhere(),stockOperateWhere);
+        }else {
+            resultDto=baseFindAllGoodsListJoinPage(dataBaseInfo.getIp(),dataBaseInfo.getUserName(),dataBaseInfo.getPassword(),dataBaseInfo.getDbPort(),dataBaseInfo.getDataBaseName()
+                    ,pageNo,pageSize,dataBaseInfo.getWhere()==null?DEFALTWHERE:dataBaseInfo.getWhere(),stockOperateWhere);
+        }
+
+
         ResultSet rs= resultDto.getResultSet();
         List<SxSyncGoods> sxSyncGoodses=new ArrayList<>();
         SxSyncGoods sxSyncGoods=null;

client/src/main/java/com/small/client/dto/ProductQuantityConsumptionDto.java

@@ -45,4 +45,7 @@ public class ProductQuantityConsumptionDto {
     @ApiModelProperty(value = "更新时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
+
+    @ApiModelProperty(value = "下单时间")
+    private Long saleTime;
 }

client/src/main/java/com/small/client/service/SxDataAbst/SxDataAbstService.java

@@ -69,6 +69,7 @@ public abstract class SxDataAbstService {
         SxCategoryModel sxCategoryModel=null;
         while (iterator.hasNext()){
             SxSyncCategory sxSyncCategory= iterator.next();
+            try {
                 sxCategoryModel=new SxCategoryModel();
                 sxCategoryModel.setCategory_image(SxDataDao.DEFAULT_IMG);
                 sxCategoryModel.setCategory_name(sxSyncCategory.getItem_clsname());
@@ -100,6 +101,9 @@ public abstract class SxDataAbstService {
                 }
                 sxCategoryModel.setProduct_type(sxCategoryModel.getCategory_name());
                 sxCategoryModels.add(sxCategoryModel);
+            }catch (Exception e){
+                log.info("sxSyncCategory:{}",sxSyncCategory);
+            }
         }
         sxCategoryModels=filterCategories(sxCategoryModels);
         return sxCategoryModels;
@@ -132,7 +136,7 @@ public abstract class SxDataAbstService {
         List<SxSyncCategory> list= sxSyncCategories.stream().filter(cc->
                         cc.getItem_clsno().trim().equals(parentId.trim()))
                 .collect(Collectors.toList());
-        return CollectionUtil.isNotEmpty(list)?list.get(0):new SxSyncCategory();
+        return CollectionUtil.isNotEmpty(list)?list.get(0):null;
     }
 
     /**

client/src/main/java/com/small/client/service/imp/SxDataServiceImp.java

@@ -334,6 +334,7 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService
         //String where="where 1=1";
         String where="where shop.status='1'";
         Integer total =0;
+        boolean isAll=false;
         String parentId=getAndCacheTree(dataBaseInfo,dataBaseInfo.getCategoryName());//加载缓存用的
         String fileEndFix="";
         if(DicEnum.SYNCTYPE_02.getCode().equals(dataBaseInfo.getSyncType())){
@@ -374,6 +375,7 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService
             total = sxDataDao.getTBditemInfoJoninTotal(dataBaseInfo);
         }else {
              where="where b.status='1'";
+             isAll=true;
             dataBaseInfo.setWhere(where);
             total = sxDataDao.getTBditemInfoTotal(dataBaseInfo);
              where="where shop.status='1'";
@@ -396,7 +398,7 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService
         Date refreshDate= DateUtil.date(tenMinutesAgo);
         List<String> folders=new ArrayList<>();
         for (int i = 1; i <=pages; i++) {
-            List<SxSyncGoods> sxSyncGoods= sxDataDao.findBditemInfoListPage(dataBaseInfo,i,SxDataDao.PAGESIZE);
+            List<SxSyncGoods> sxSyncGoods= sxDataDao.findBditemInfoListPage(dataBaseInfo,i,SxDataDao.PAGESIZE,isAll);
             List<SxGoosModel> sxGoosModelList= CvtToGoosModel(sxSyncGoods,specPriceDtoList);
             String jsonString="";
             ObjectMapper objectMapper = new ObjectMapper();