From dfce0d94a7ed3fa1fe324359a788f0ad2f781803 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 24 十一月 2022 15:37:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 103054e..d173e1a 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,12 +1,12 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.TestMast;
import com.zy.asrs.entity.param.*;
+import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
@@ -32,6 +32,8 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private ApiLogService apiLogService;
@PostMapping("/order/matSync/default/v1")
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
@@ -228,6 +230,7 @@
public synchronized R combPack(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) CombParam param,
HttpServletRequest request){
+ appkey="ea1f0459efc02a79f046f982767939ae";
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -236,6 +239,18 @@
openService.combPACK(param);
Map<String,Boolean> map=new HashMap<>();
+ apiLogService.save(
+ "mes鐢宠鍏ュ簱",
+ "172.28.15.251",
+ null,
+ "127.0.0.1",
+ JSON.toJSONString("PackNo:"+param.getPackNo()
+ +" PackName:"+param.getPackName()
+ +" RequestTime:"+param.getRequestTime()
+ +" SettingTimes:"+param.getSettingTimes()),
+ "172.28.15.251",
+ true
+ );
map.put("isComplete",true);
return R.ok(map);
}
@@ -287,9 +302,12 @@
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- if (param.getTestResult().equals("ok")){
+ if (param.getTestResult().equals("OK")){
map.put("isComplete",openService.testFinish(param));
- }else {
+ }else if(param.getTestResult().equals("NG")){
+ openService.testNG(param);
+ map.put("isComplete",false);
+ }else{
map.put("isComplete",false);
}
return R.ok(map);
--
Gitblit v1.9.1