Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/collectdata/src/main/java/com/management/collectdata/controller/DataCollectController.java

@@ -185,8 +185,8 @@ public class DataCollectController {
 
     @RequestMapping("/getSqlServerProjectTypeDataList")
     public List<String> getSqlServerProjectTypeDataList(@RequestBody PageBO pageBO) {
-        String sqlQuery = " select distinct left(citemccode,5)  " +
-                " from fitemss97  where bclose = 0 ORDER BY citemccode OFFSET ? ROWS FETCH NEXT ? ROWS ONLY ";
+        String sqlQuery = " select distinct left(citemccode,5) as codecc  " +
+                " from fitemss97  where bclose = 0 ORDER BY left(citemccode,5) OFFSET ? ROWS FETCH NEXT ? ROWS ONLY ";
         List<String> resList = new ArrayList<>();
         try (Connection connection = sqlServerDataSource.getConnection()) {
             PreparedStatement queryStmt = connection.prepareStatement(sqlQuery);
@@ -196,7 +196,7 @@ public class DataCollectController {
             queryStmt.setInt(2, pageSize);
             try (ResultSet resultSet = queryStmt.executeQuery()) {
                 while (resultSet.next()) {
-                    resList.add(resultSet.getString("citemccode"));
+                    resList.add(resultSet.getString("codecc"));
                 }
             }
         } catch (SQLException e) {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/QRCodeController.java

@@ -61,7 +61,12 @@ public class QRCodeController {
             String footerLine2 = String.format("行号: %s",null == erpOrderInfo.getLine()?"":erpOrderInfo.getLine());
 
             String s = null != erpOrderInfo.getMoDId() ? erpOrderInfo.getMoDId() : "";
-            String fileName = erpOrderInfo.getProjectName()+erpOrderInfo.getOrderId()+erpOrderInfo.getLine()+".png";
+            String finalProjectName = erpOrderInfo.getProjectName();
+            if(finalProjectName.contains("/") || finalProjectName.contains("\\")){
+                finalProjectName = finalProjectName.replace("/","-");
+                finalProjectName = finalProjectName.replace("\\","-");
+            }
+            String fileName = finalProjectName+erpOrderInfo.getOrderId()+erpOrderInfo.getLine()+".png";
 
             try {
                 BufferedImage qrImage = QRCodeUtil.generateQRCodeImage(data, width, height);
@@ -132,7 +137,12 @@ public class QRCodeController {
 
         int width = 300; // 二维码宽度
         int height = 300; // 二维码高度
-        String fileName = erpOrderInfo.getProjectName()+erpOrderInfo.getOrderId()+erpOrderInfo.getLine()+".png";
+        String finalProjectName = erpOrderInfo.getProjectName();
+        if(finalProjectName.contains("/") || finalProjectName.contains("\\")){
+            finalProjectName = finalProjectName.replace("/","-");
+            finalProjectName = finalProjectName.replace("\\","-");
+        }
+        String fileName = finalProjectName+erpOrderInfo.getOrderId()+erpOrderInfo.getLine()+".png";
         try {
             BufferedImage qrImage = QRCodeUtil.generateQRCodeImage(data, width, height);
             // 创建带标题和两行底部文字的完整图片

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/DataCollectTask.java

@@ -198,7 +198,7 @@ public class DataCollectTask {
 //    @Scheduled(cron = "0 05 16 * * ?")
     @Async
     public void sqlServerTask() {
-//        if(isDev){return;}
+        if(isDev){return;}
         RestTemplate restTemplate = new RestTemplate();
         String sumUrl = PREFIX_URL+"/dataCollect/getSqlServerDataSum";
         String listUrl = PREFIX_URL+"/dataCollect/getSqlServerDataList";
@@ -447,7 +447,7 @@ public class DataCollectTask {
     }
 
     @Scheduled(cron = "0 30 2 * * ?")
-//@Scheduled(cron = "0 46 16 * * ?")
+//@Scheduled(cron = "0 46 15 * * ?")
     @Async
     public void sqlServerProjectTypeTask() {
         if(isDev){return;}
@@ -531,8 +531,8 @@ public class DataCollectTask {
 
     }
 
-    @Scheduled(cron = "0 0 3 * * ?")
-//@Scheduled(cron = "0 48 16 * * ?")
+    @Scheduled(cron = "0 30 3 * * ?")
+//@Scheduled(cron = "0 12 16 * * ?")
     @Async
     public void sqlServerProjectTask() {
         if(isDev){return;}
@@ -683,7 +683,7 @@ public class DataCollectTask {
         }
     }
 
-    @Scheduled(cron = "0 30 3 * * ?")
+    @Scheduled(cron = "0 0 3 * * ?")
 //@Scheduled(cron = "0 20 17 * * ?")
     @Async
     public void businessTripTask(){