opt:优化日志打印

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

@@ -46,14 +46,16 @@ public class DruidFilter extends FilterEventAdapter {
         try {
             count=statement.getUpdateCount();
         }catch (Exception ex){ }
-        if (size>0 && count>0) {
+        if (count>0) {
+            if (size > 0) {
                 Collection<JdbcParameter> values = statement.getParameters().values();
                 List<Object> params = new ArrayList<>();
                 for (JdbcParameter value : values) {
                     params.add(value.getValue());
                 }
                 executeSql = SQLUtils.format(executeSql, JdbcUtils.MYSQL, params);
-            log.info("[----SQL----][update][执行结果:{}][ SQL: {} ]",count,executeSql);
+            }
+            log.info("[----SQL----][update][ SQL: {} ]", executeSql);
         }
         super.statementExecuteAfter(statement, sql, result);
     }

mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/rest/FlourworkController.java

@@ -93,6 +93,16 @@ public class FlourworkController {
         }, "autoCalledMater", 1);
         return new ResponseEntity<>(result.get(),HttpStatus.OK);
     }
+    @PostMapping("/autoCalledMater2")
+    @Log("自动叫料")
+    @ApiOperation("自动叫料")
+        public ResponseEntity<Object> autoCalledMater2(@RequestBody JSONObject whereJson){
+        AtomicReference<JSONObject> result = new AtomicReference<>(new JSONObject());
+        RedissonUtils.lock(a -> {
+            result.set(flourworkService.autoCalledMater2(whereJson));
+        }, "autoCalledMater", 1);
+        return new ResponseEntity<>(result.get(),HttpStatus.OK);
+    }
 
     @PostMapping("/startWork")
     @Log("开始作业")

mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/FlourworkService.java

@@ -55,6 +55,7 @@ public interface FlourworkService {
      * @param whereJson /
      */
     JSONObject autoCalledMater(JSONObject whereJson);
+    JSONObject autoCalledMater2(JSONObject whereJson);
 
     /**
      * 开始作业

mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java

@@ -401,6 +401,17 @@ public class FlourworkServiceImpl implements FlourworkService {
         flourworkService.asyncdown(movList,SecurityUtils.getCurrentUserId(),SecurityUtils.getNickName());
         return result;
     }
+
+    @Override
+    public JSONObject autoCalledMater2(JSONObject whereJson) {
+        ArrayList<String> striings = new ArrayList<String>();
+        JSONObject jsonObject = WQLObject.getWQLObject("sch_base_point").query("point_id ='" + "2021" + "'").uniqueResult(0);
+        striings.add("123123");
+        striings.add("22222");
+        flourworkService.asyncdown(striings, 12312L,"123213");
+        return null;
+    }
+
     @Override
     public void asyncdown(List<String> movinvs,Long userid,String username){
         try {

mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java

@@ -930,6 +930,11 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
 
     @Override
     public void handdown(JSONObject whereJson) {
+        HandMoveStorAcsTask handMoveStorAcsTask = new HandMoveStorAcsTask();
+
+        log.info("下发acs:{}","!23312");
+         handMoveStorAcsTask.notifyAcs("!23312");
+        log.info("下发acs反馈:{}","!23312");
         //移库单主表
         WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_MoveInv");
         //移库单明细表
@@ -937,7 +942,6 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
         //任务表
         WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task");
 
-        HandMoveStorAcsTask handMoveStorAcsTask = new HandMoveStorAcsTask();
 
         Long currentUserId = whereJson.getLong("currentUserId");
         String nickName = whereJson.getString("nickName");
@@ -960,7 +964,9 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
         for (int i = 0; i < ja.size(); i++) {
             JSONObject jo = ja.getJSONObject(i);
             String taskdtl_id = jo.getString("taskdtl_id");
+            log.info("下发acs:{}",taskdtl_id);
             JSONObject result = handMoveStorAcsTask.notifyAcs(taskdtl_id);
+            log.info("下发acs反馈:{}",taskdtl_id);
             JSONObject task = wo_Task.query("taskdtl_id='" + taskdtl_id + "'").uniqueResult(0);
             if (ObjectUtil.isNotEmpty(result)) {
                 String status = result.getString("status");

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

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

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

@@ -80,13 +80,13 @@ s    <!-- 按照每天生成日志文件 -->
 
     <appender name="asyncLuceneAppender" class="org.nl.config.lucene.AsyncLuceneAppender">
         <appender-ref ref="luceneAppender" />
-        <queueSize>512</queueSize>
+        <queueSize>2000</queueSize>
     </appender>
 
     <!--异步到文件-->
     <appender name="asyncFileAppender" class="ch.qos.logback.classic.AsyncAppender">
         <discardingThreshold>0</discardingThreshold>
-        <queueSize>500</queueSize>
+        <queueSize>2000</queueSize>
         <appender-ref ref="FILE"/>
     </appender>