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

mes/hd/nladmin-system/src/main/java/org/nl/AppRun.java

@@ -4,7 +4,8 @@ import cn.dev33.satoken.annotation.SaIgnore;
 import com.alicp.jetcache.Cache;
 import com.alicp.jetcache.anno.config.EnableCreateCacheAnnotation;
 import com.alicp.jetcache.anno.config.EnableMethodCache;
- 
+
+import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.springframework.boot.CommandLineRunner;
@@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @EnableAsync
 @RestController
- 
+
 @SpringBootApplication(exclude = {
         org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class
 })
@@ -40,6 +41,7 @@ import org.springframework.web.bind.annotation.RestController;
 @EnableMethodCache(basePackages = "org.nl")
 @EnableCreateCacheAnnotation
 @MapperScan("org.nl.**.mapper")
+@Slf4j
 public class AppRun implements CommandLineRunner {
 
     private Cache<String, Object> userCache;
@@ -53,7 +55,7 @@ public class AppRun implements CommandLineRunner {
 
     @Override
     public void run(String... args) throws Exception {
-        System.out.println(111);
+       log.warn("项目启动完成");
     }
 
     @Bean

mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java

@@ -85,11 +85,11 @@ public class LogAspect {
         try {
             log.info("[--request--][请求接口:{}][请求参数:{}]",url,params);
             result = joinPoint.proceed();
-            //是否把日志存到日志表
+//            //是否把日志存到日志表
-            if (logInfo.isAddLogTable()) {
+//            if (logInfo.isAddLogTable()) {
-                Log log = new Log("INFO", System.currentTimeMillis() - comming);
+//                Log log = new Log("INFO", System.currentTimeMillis() - comming);
-                logService.save(getUsername(), StringUtils.getBrowser(request), requestIp, joinPoint, log);
+//                logService.save(getUsername(), StringUtils.getBrowser(request), requestIp, joinPoint, log);
-            }
+//            }
         }catch (Exception ex){
             StringBuffer errorStack = new StringBuffer();
             errorStack.append("<br/>【异常堆栈:");

mes/hd/nladmin-system/src/main/java/org/nl/modules/wql/util/WqlUtil.java

@@ -173,6 +173,7 @@ public class WqlUtil{
                str = str.substring(str.indexOf(beginStr) + 1, str.indexOf(endStr));
           }
           catch(Exception arg3) {
+               arg3.printStackTrace();
           }
           return str;
      }

mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java

@@ -358,31 +358,41 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
     @Override
     @Async
     public void feedOrderRealQty(JSONObject param) {
+        String today = DateUtil.today().replace("-", "");
         if (CollectionUtils.isEmpty(param)){
             return;
         }
-        Iterator<String> iterator = param.keySet().iterator();
+        Iterator<String> check = param.keySet().iterator();
-        Map<String, PdmProduceWorkorder> map = workorderService.list(new QueryWrapper<PdmProduceWorkorder>()
+        while (check.hasNext()){
-                .in("workorder_code", param.keySet()))
+            String key = check.next();
-                .stream().collect(HashMap::new, (k, v) -> k.put(v.getWorkorder_code(), v), HashMap::putAll);
+            if (!key.contains(today)){
-        Date now = new Date();
+                check.remove();
-        BigDecimal divide = new BigDecimal(0);
-        while (iterator.hasNext()){
-            String workorderCode = iterator.next();
-            BigDecimal dq_real_qty = param.getBigDecimal(workorderCode);
-            PdmProduceWorkorder workorder = map.get(workorderCode);
-            if(workorder == null){
-                continue;
             }
-            BigDecimal subtract = dq_real_qty.subtract(workorder.getDq_real_qty());
+        }
-            if (workorder.getUpdate_time() !=null){
+        if (!CollectionUtils.isEmpty(param)){
-                divide = subtract.divide(new BigDecimal(DateUtil.between(workorder.getUpdate_time(), now, DateUnit.SECOND)), 3, RoundingMode.HALF_UP);
+            Iterator<String> iterator = param.keySet().iterator();
+            Map<String, PdmProduceWorkorder> map = workorderService.list(new QueryWrapper<PdmProduceWorkorder>()
+                    .in("workorder_code", param.keySet()))
+                    .stream().collect(HashMap::new, (k, v) -> k.put(v.getWorkorder_code(), v), HashMap::putAll);
+            Date now = new Date();
+            BigDecimal divide = new BigDecimal(0);
+            while (iterator.hasNext()){
+                String workorderCode = iterator.next();
+                BigDecimal dq_real_qty = param.getBigDecimal(workorderCode);
+                PdmProduceWorkorder workorder = map.get(workorderCode);
+                if(workorder == null){
+                    continue;
+                }
+                BigDecimal subtract = dq_real_qty.subtract(workorder.getDq_real_qty());
+                if (workorder.getUpdate_time() !=null){
+                    divide = subtract.divide(new BigDecimal(DateUtil.between(workorder.getUpdate_time(), now, DateUnit.SECOND)), 3, RoundingMode.HALF_UP);
+                }
+                workorderService.update(new UpdateWrapper<PdmProduceWorkorder>()
+                        .set("dq_real_qty",dq_real_qty)
+                        .set("update_time",DateUtil.now())
+                        .set("slope",divide)
+                        .eq("workorder_code",workorderCode));
             }
-            workorderService.update(new UpdateWrapper<PdmProduceWorkorder>()
-                    .set("dq_real_qty",dq_real_qty)
-                    .set("update_time",DateUtil.now())
-                    .set("slope",divide)
-                    .eq("workorder_code",workorderCode));
         }
     }
 

mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml

@@ -1,5 +1,8 @@
 server:
   port: 8011
+  tomcat:
+    max-threads: 300
+    min-spare-threads: 30
 #配置数据源
 spring:
   datasource:

mes/hd/nladmin-system/src/main/resources/config/application-prod.yml

@@ -1,5 +1,8 @@
 server:
   port: 8011
+  tomcat:
+    max-threads: 300
+    min-spare-threads: 30
 #配置数据源
 spring:
   datasource:

mes/hd/nladmin-system/src/main/resources/config/application.yml

@@ -2,7 +2,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: dev3
+    active: prod
   jackson:
     time-zone: GMT+8
   data:

mes/hd/nladmin-system/src/main/resources/logback-spring.xml

@@ -79,9 +79,8 @@
 
 
     <springProfile name="dev3">
-        <root level="debug">
+        <root level="info">
-<!--            <appender-ref ref="asyncLuceneAppender"/>-->
+            <appender-ref ref="asyncLuceneAppender"/>
-            <appender-ref ref="CONSOLE"/>
         </root>
         <logger name="jdbc" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
@@ -89,6 +88,9 @@
         <logger name="org.springframework" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
+        <logger name="org.nl" level="WARN" additivity="true">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
         <logger name="org.hibernate" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
@@ -111,8 +113,10 @@
     <springProfile name="prod">
         <root level="info">
             <appender-ref ref="asyncLuceneAppender"/>
-            <appender-ref ref="CONSOLE"/>
         </root>
+        <logger name="org.nl" level="WARN" additivity="true">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
         <logger name="jdbc" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>