Merge branch 'dev' of ssh://10.10.101.21/source/platform-b2b

src/main/java/com/uas/platform/b2b/publicapi/controller/ApCheckApiController.java

@@ -1,15 +1,21 @@
 package com.uas.platform.b2b.publicapi.controller;
 
+import com.uas.platform.b2b.dao.CommonDao;
+import com.uas.platform.b2b.erp.model.VendorInfo;
 import com.uas.platform.b2b.publicapi.service.ApCheckApiService;
+import com.uas.platform.b2b.service.PurchaseApCheckService;
 import com.uas.platform.b2b.task.ApCheckTask;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 对账单 API
  *
@@ -26,6 +32,12 @@ public class ApCheckApiController {
     @Autowired
     ApCheckTask apCheckTask;
 
+    @Autowired
+    private CommonDao commonDao;
+
+    @Autowired
+    private PurchaseApCheckService apCheckService;
+
     /**
      * 日志
      */
@@ -79,9 +91,14 @@ public class ApCheckApiController {
      * @return 执行时间
      */
     @RequestMapping(value = "/updateApCheck", method = RequestMethod.GET)
-    public String updateApCheck() {
+    public String updateApCheck(String enUU) {
         Long start = System.currentTimeMillis();
-        apCheckTask.updateCount();
+        if (StringUtils.isEmpty(enUU)) {
+            apCheckTask.updateCount();
+        } else {
+            List<VendorInfo> vendorList = commonDao.query("select ve_id id,ve_myenuu custuu,ve_vendenuu venduu from `purc$vendors` where ve_vendenuu in (?) or ve_myenuu in (?)", VendorInfo.class, enUU, enUU);
+            apCheckService.updateCheckByVendorInfo(vendorList);
+        }
         return "cost: " + (System.currentTimeMillis() - start);
     }
 }

src/main/java/com/uas/platform/b2b/service/PurchaseApCheckService.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.service;
 
+import com.uas.platform.b2b.erp.model.VendorInfo;
 import com.uas.platform.b2b.model.PurchaseApCheck;
 import com.uas.platform.b2b.model.PurchaseApCheckDone;
 import com.uas.platform.b2b.model.PurchaseApCheckItem;
@@ -298,4 +299,11 @@ public interface PurchaseApCheckService {
      * @return 数据统计
      */
     List<ApCheckAmount> getSendAmountTrade(Long vendorUU, Long customerUU, String checkDate, Long fromDate, Long endDate);
+
+    /**
+     * 通过供应商信息更新对账数据
+     *
+     * @param vendorList 供应商信息
+     */
+    void updateCheckByVendorInfo(List<VendorInfo> vendorList);
 }

src/main/java/com/uas/platform/b2b/service/impl/PurchaseApCheckServiceImpl.java

@@ -13,6 +13,7 @@ import com.uas.platform.b2b.dao.PurchaseApCheckDoneDao;
 import com.uas.platform.b2b.dao.PurchaseApCheckItemDao;
 import com.uas.platform.b2b.dao.PurchaseApCheckTodoDao;
 import com.uas.platform.b2b.dao.VendorDao;
+import com.uas.platform.b2b.erp.model.VendorInfo;
 import com.uas.platform.b2b.model.ApCheckTable;
 import com.uas.platform.b2b.model.CommunalLog;
 import com.uas.platform.b2b.model.DateFilter;
@@ -1187,4 +1188,36 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
             .map(PurchaseApCheckItem::getSourceId)
             .collect(Collectors.toSet());
     }
+
+    /**
+     * 通过供应商信息更新对账数据
+     *
+     * @param vendorList 供应商信息
+     */
+    @Override
+    public void updateCheckByVendorInfo(List<VendorInfo> vendorList) {
+        if (!CollectionUtil.isEmpty(vendorList)) {
+            List<String> sqlList = new ArrayList<>();
+            final int[] size = {0};
+            vendorList.forEach(vendorInfo -> {
+                String sql = this.updateApCheckCountSql(vendorInfo.getVenduu(), vendorInfo.getCustuu(), vendorInfo.getId());
+                if (!StringUtils.isEmpty(sql)) {
+                    sqlList.add(sql);
+                    size[0]++;
+                }
+            });
+            if (!CollectionUtils.isEmpty(sqlList)) {
+                try {
+                    commonDao.getJdbcTemplate().batchUpdate(sqlList.toArray(new String[sqlList.size()]));
+                } catch (RuntimeException e) {
+                    throw new IllegalOperatorException("更新失败-> " + e.getMessage());
+                }
+            }
+            CommunalLog log = new CommunalLog();
+            log.setTitle("更新客户关系表对账数据");
+            log.setMessage("最小id： " + vendorList.get(0).getId() + "；数量： " + size[0]);
+            log.setTime(System.currentTimeMillis());
+            communalLogDao.save(log);
+        }
+    }
 }

src/main/java/com/uas/platform/b2b/task/ApCheckTask.java

@@ -51,29 +51,7 @@ public class ApCheckTask {
     @Scheduled(cron = "0 0/5 0,1,2 * * ? ")
     public void updateCount() {
         List<VendorInfo> vendorList = commonDao.query(TODO_CUSTOMER_SQL, VendorInfo.class);
-        if (!CollectionUtil.isEmpty(vendorList)) {
-            List<String> sqlList = new ArrayList<>();
-            final int[] size = {0};
-            vendorList.forEach(vendorInfo -> {
-                String sql = apCheckService.updateApCheckCountSql(vendorInfo.getVenduu(), vendorInfo.getCustuu(), vendorInfo.getId());
-                if (!StringUtils.isEmpty(sql)) {
-                    sqlList.add(sql);
-                    size[0]++;
-                }
-            });
-            if (!CollectionUtils.isEmpty(sqlList)) {
-                try {
-                    commonDao.getJdbcTemplate().batchUpdate(sqlList.toArray(new String[sqlList.size()]));
-                } catch (RuntimeException e) {
-                    throw new IllegalOperatorException("更新失败-> " + e.getMessage());
-                }
-            }
-            CommunalLog log = new CommunalLog();
-            log.setTitle("更新客户关系表对账数据");
-            log.setMessage("最小id： " + vendorList.get(0).getId() + "；数量： " + size[0]);
-            log.setTime(System.currentTimeMillis());
-            communalLogDao.save(log);
-        }
+        apCheckService.updateCheckByVendorInfo(vendorList);
     }
 
 }