liyg 2 gadi atpakaļ
vecāks
revīzija
a7581d23ed

+ 34 - 34
src/main/java/com/steerinfo/dil/controller/AmsSaleOrderController.java

@@ -1679,40 +1679,40 @@ public class AmsSaleOrderController<RedisTemplate> extends BaseRESTfulController
     /**
      * 重试上传车牌号到金蝶,5min一次
      */
-    @Scheduled(fixedRate=1000*60*5)
-    public void retryPushCarNumberToEas(){
-        List<List<Map<String,Object>>> newRetry=new ArrayList<>();
-        if(retryQueen.size()<=0){
-            //没有需要重传的,直接退出
-            return;
-        }
-        System.out.println("开始重传,目前失败数量:"+retryQueen.size());
-        for(List<Map<String,Object>> mapList:retryQueen){
-            // 调用EAS接口将车牌号传给金蝶
-            Map<String,Object> input = joinFeign.findCarNumberByOrderList(mapList);
-            Map<String, Object> totalMap = easCapacityTestUtil.getTotalMap();
-            totalMap.put("input",input);
-            System.out.println(totalMap);
-            String json = JSONUtils.toJSONString(totalMap);
-            System.out.println(json);
-            Map<String,Object> s = joinFeign.pushCarNumberToEas(totalMap);
-            try {
-                newFileTool.newFile("pushCarNumberToEas:"+totalMap,"金蝶通讯报文");
-            }catch (Exception e){
-                e.printStackTrace();
-            }
-            if (s == null || s.size() == 0) {
-                //失败,存入新的重试队列,准备下一次重试
-                newRetry.add(mapList);
-                System.out.println("重试:登录金蝶失败");
-            }else{
-                System.out.println("重试:上传车牌成功");
-            }
-        }
-        //结束,替换掉旧的队列
-        retryQueen=newRetry;
-        System.out.println("重传结束,剩余失败数量:"+retryQueen.size());
-    }
+//    @Scheduled(fixedRate=1000*60*5)
+//    public void retryPushCarNumberToEas(){
+//        List<List<Map<String,Object>>> newRetry=new ArrayList<>();
+//        if(retryQueen.size()<=0){
+//            //没有需要重传的,直接退出
+//            return;
+//        }
+//        System.out.println("开始重传,目前失败数量:"+retryQueen.size());
+//        for(List<Map<String,Object>> mapList:retryQueen){
+//            // 调用EAS接口将车牌号传给金蝶
+//            Map<String,Object> input = joinFeign.findCarNumberByOrderList(mapList);
+//            Map<String, Object> totalMap = easCapacityTestUtil.getTotalMap();
+//            totalMap.put("input",input);
+//            System.out.println(totalMap);
+//            String json = JSONUtils.toJSONString(totalMap);
+//            System.out.println(json);
+//            Map<String,Object> s = joinFeign.pushCarNumberToEas(totalMap);
+//            try {
+//                newFileTool.newFile("pushCarNumberToEas:"+totalMap,"金蝶通讯报文");
+//            }catch (Exception e){
+//                e.printStackTrace();
+//            }
+//            if (s == null || s.size() == 0) {
+//                //失败,存入新的重试队列,准备下一次重试
+//                newRetry.add(mapList);
+//                System.out.println("重试:登录金蝶失败");
+//            }else{
+//                System.out.println("重试:上传车牌成功");
+//            }
+//        }
+//        //结束,替换掉旧的队列
+//        retryQueen=newRetry;
+//        System.out.println("重传结束,剩余失败数量:"+retryQueen.size());
+//    }
 
     @ApiOperation("查询制单日期")
     @PostMapping("getMakeOrderDate")

+ 10 - 0
src/main/java/com/steerinfo/dil/controller/DilNoticeController.java

@@ -365,4 +365,14 @@ public class DilNoticeController extends BaseRESTfulController {
         PageListAdd data = columnDataUtil.tableColumnData(apiId, null, list);
         return success(data);
     }
+
+    /**
+     * TEST ADD LOG
+     * @param mapValue
+     * @return
+     */
+    @PostMapping(value = "/addSaleLog")
+    public void test(@RequestBody(required = false) Map<String, Object> mapValue) {
+        saleLogUtil.logOrder(new BigDecimal(1),"测试",mapValue,SaleLogUtil.INSERT);
+    }
 }

+ 2 - 2
src/main/java/com/steerinfo/dil/util/SaleLogUtil.java

@@ -37,7 +37,7 @@ public class SaleLogUtil {
             saleLog.setResultId(saleLogMapper.selectMaxId());
             saleLog.setOrderId(orderId);
             saleLog.setDescription(descriptoin);
-            saleLog.setJsonData(""+map);
+            //saleLog.setJsonData(""+map);
             saleLog.setInsertTime(new Date());
             saleLog.setInsertUsername(getUserName(map));
             switch (oprationType){
@@ -60,8 +60,8 @@ public class SaleLogUtil {
                     saleLog.setOprationType("未知操作");
             }
             return saleLogMapper.insertSelective(saleLog);
-
         }catch (Exception e){
+            e.printStackTrace();
             return -1;
         }
     }