【功能完善】【镭雕机接口不做校验】

src/main/java/com/uas/eis/controller/MESDataController.java

@@ -109,9 +109,7 @@ public class MESDataController {
      */
     @RequestMapping("/api/mes/getQRCode")
     public ApiResult<List<Map<String,Object>>> getQRCode(HttpServletRequest request, String data){
-        String accessKey = request.getHeader("AccessKey");
-        String requestId = request.getHeader("RequestId");
-        return mesDataService.getQRCode(accessKey,requestId,data);
+        return mesDataService.getQRCode(data);
 
     }
 
@@ -122,9 +120,7 @@ public class MESDataController {
      */
     @RequestMapping("/api/mes/checkQRCode")
     public ApiResult<String> checkQRCode(HttpServletRequest request, String data){
-        String accessKey = request.getHeader("AccessKey");
-        String requestId = request.getHeader("RequestId");
-        return mesDataService.checkQRCode(accessKey, requestId, data);
+        return mesDataService.checkQRCode(data);
     }
 
     /**

src/main/java/com/uas/eis/service/MESDataService.java

@@ -21,9 +21,9 @@ public interface MESDataService {
 
 	List<Map<Object,Object>> packageDetail(String accessKey, String requestId, String data);
 
-	ApiResult<List<Map<String,Object>>> getQRCode(String accessKey, String requestId, String data);
+	ApiResult<List<Map<String,Object>>> getQRCode(String data);
 
-	ApiResult<String> checkQRCode(String accessKey, String requestId, String data);
+	ApiResult<String> checkQRCode(String data);
 
 	ApiResult<String> checkDCRQRCode(String accessKey, String requestId, String data);
 

src/main/java/com/uas/eis/serviceImpl/MESDataServiceImpl.java

@@ -243,9 +243,7 @@ public class MESDataServiceImpl implements MESDataService {
 	}
 
 	@Override
-	public ApiResult<List<Map<String,Object>>> getQRCode(String accessKey, String requestId, String data) {
-		String AE_MASTER = checkAccessKey(accessKey, requestId);
-		SpObserver.putSp(AE_MASTER);
+	public ApiResult<List<Map<String,Object>>> getQRCode(String data) {
 		Map<Object, Object> map = BaseUtil.parseFormStoreToMap(data);
 		String veCode = StringUtil.nvl(map.get("veCode"), "");
 		if ("".equals(veCode)){
@@ -270,15 +268,13 @@ public class MESDataServiceImpl implements MESDataService {
 		if (baseDao.checkIf("ProdQRCode","qr_vecode='" + veCode + "' and qr_prodcode='" + prodCode + "' and qr_machinecode='" + machineCode + "' and qr_version='" + version + "' and to_char(qr_date,'yyyy-MM-dd')='"+indate+"' and nvl(qr_isobtained,0)=0")) {
 			List<Map<String, Object>> maps = baseDao.queryForList("select to_char(qr_date,'yyyy-MM-dd') qr_date, qr_prodcode, qr_vecode, qr_version, qr_machinecode, qr_qty, qr_serianum, qr_code from ProdQRCode where qr_vecode='" + veCode + "' and qr_prodcode='" + prodCode + "' and qr_machinecode='" + machineCode + "' and qr_version='" + version + "' and to_char(qr_date,'yyyy-MM-dd')='"+indate+"' and nvl(qr_isobtained,0)=0");
 			baseDao.execute("update ProdQRCode set qr_isobtained=-1 where qr_vecode='" + veCode + "' and qr_prodcode='" + prodCode + "' and qr_machinecode='" + machineCode + "' and qr_version='" + version + "' and to_char(qr_date,'yyyy-MM-dd')='"+indate+"' and nvl(qr_isobtained,0)=0");
-			return ApiResponse.successRsp("0", "Success", requestId, maps);
+			return ApiResponse.successRsp("0", "Success", "", maps);
 		}else
 			return ApiResponse.failRsp("10015","获取失败，请检查参数！");
 	}
 
 	@Override
-	public ApiResult<String> checkQRCode(String accessKey, String requestId, String data) {
-		String AE_MASTER = checkAccessKey(accessKey, requestId);
-		SpObserver.putSp(AE_MASTER);
+	public ApiResult<String> checkQRCode(String data) {
 		Map<Object, Object> map = BaseUtil.parseFormStoreToMap(data);
 		String veCode = StringUtil.nvl(map.get("veCode"), "");
 		if ("".equals(veCode)){
@@ -306,10 +302,10 @@ public class MESDataServiceImpl implements MESDataService {
 		}
 		if (baseDao.checkIf("ProdQRCode","qr_code='"+QRCode+"' and qr_vecode='" + veCode + "' and qr_prodcode='" + prodCode + "' and qr_machinecode='" + machineCode + "' and qr_version='" + version + "' and to_char(qr_date,'yyyy-MM-dd')='"+indate+"' and nvl(qr_isobtained,0)<>0")){
 			baseDao.execute("update ProdQRCode set qr_ldischeck=-1,qr_ldcheckres='OK',qr_ldcheckdate=sysdate where qr_code='"+QRCode+"' and qr_vecode='" + veCode + "' and qr_prodcode='" + prodCode + "' and qr_machinecode='" + machineCode + "' and qr_version='" + version + "' and to_char(qr_date,'yyyy-MM-dd')='"+indate+"' and nvl(qr_isobtained,0)<>0");
-			return ApiResponse.successRsp("0","Success",requestId,"OK");
+			return ApiResponse.successRsp("0","Success","","OK");
 		}else {
 			baseDao.execute("update ProdQRCode set qr_ldischeck=-1,qr_ldcheckres='NG',qr_ldcheckdate=sysdate where qr_code='"+QRCode+"' and qr_vecode='" + veCode + "' and qr_prodcode='" + prodCode + "' and qr_machinecode='" + machineCode + "' and qr_version='" + version + "' and to_char(qr_date,'yyyy-MM-dd')='"+indate+"' and nvl(qr_isobtained,0)<>0");
-			return ApiResponse.successRsp("0", "Success", requestId, "NG");
+			return ApiResponse.successRsp("0", "Success", "", "NG");
 		}
 
 	}