OA ZL0010-来料检验不合格控制流程代码

op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java

@@ -0,0 +1,20 @@
+package com.op.system.api;
+
+import com.op.common.core.constant.ServiceNameConstants;
+import com.op.common.core.web.domain.AjaxResult;
+import com.op.system.api.factory.RemoteOpenFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+/**
+ * Open接口服务
+ *
+ * @author OP
+ */
+@FeignClient(contextId = "remoteOpenService", value = ServiceNameConstants.OPEN_SERVICE, fallbackFactory = RemoteOpenFallbackFactory.class)
+public interface RemoteOpenService {
+    /**提交ZL0010-来料检验不合格控制流程**/
+    @PostMapping("/openInterface/OAInspection")
+    public AjaxResult OAInspection();
+
+}

op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteOpenFallbackFactory.java

@@ -0,0 +1,24 @@
+package com.op.system.api.factory;
+
+
+import com.op.common.core.web.domain.AjaxResult;
+import com.op.system.api.RemoteOpenService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RemoteOpenFallbackFactory implements FallbackFactory<RemoteOpenService> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteOpenFallbackFactory.class);
+    @Override
+    public RemoteOpenService create(Throwable throwable) {
+        log.error("Open服务调用失败:{}", throwable.getMessage());
+        return new RemoteOpenService() {
+            @Override
+            public AjaxResult OAInspection() {
+                return AjaxResult.error("提交ZL0010-来料检验不合格控制流程失败"+throwable.getMessage());
+            }
+        };
+    }
+}

op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java

@@ -16,6 +16,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * mes上位机专属
  *
@@ -113,7 +116,16 @@ public class OpenController extends BaseController {
         return success(openService.insertQcCheckTaskProduce(qcCheckTaskProduce));
     }
 
-    public  static void main(String args[]){
-        System.out.println(DateUtils.getDate());
+
+    /**
+     * ZL0010-来料检验不合格控制流程提交
+     * @param paramMap
+     * @return
+     */
+    @PostMapping("/OAInspection")
+    public AjaxResult OAInspection(@RequestBody(required = false) Map<String, Object> paramMap) {
+        return openService.OAInspection(paramMap);
     }
+
+
 }

op-modules/op-open/src/main/java/com/op/open/service/OpenService.java

@@ -9,6 +9,7 @@ import com.op.system.api.domain.quality.QcCheckTaskDTO;
 import com.op.system.api.domain.quality.QcCheckTaskProduceDTO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 订单Service接口
@@ -27,4 +28,6 @@ public interface OpenService {
     AjaxResult machineRepair(EquRepairOrderDTO equRepairOrderDTO);
 
     int insertQcCheckTaskProduce(QcCheckTaskProduceDTO qcCheckTaskProduce);
+
+    AjaxResult OAInspection(Map<String, Object> paramMap);
 }

op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java

@@ -4,10 +4,14 @@ import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.op.common.core.constant.Constants;
 import com.op.common.core.context.SecurityContextHolder;
 import com.op.common.core.domain.R;
 import com.op.common.core.utils.DateUtils;
 import com.op.common.core.utils.bean.BeanUtils;
+import com.op.common.core.utils.http.HttpUtils;
 import com.op.common.core.utils.uuid.IdUtils;
 import com.op.common.core.web.domain.AjaxResult;
 import com.op.common.security.utils.SecurityUtils;
@@ -30,22 +34,22 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.op.common.core.web.domain.AjaxResult.error;
 import static com.op.common.core.web.domain.AjaxResult.success;
 
 /**
@@ -57,9 +61,12 @@ import static com.op.common.core.web.domain.AjaxResult.success;
 @Service
 public class OpenServiceImpl implements OpenService {
     protected Logger logger = LoggerFactory.getLogger(getClass());
+    @Value("${OA.url}")
+    private String oa_url;
 
     @Autowired
     private OpenMapper openMapper;
+
 //    @Autowired
 //    private RemoteSapService remoteSapService;
 
@@ -352,12 +359,57 @@ public class OpenServiceImpl implements OpenService {
         return openMapper.addBatch(items);
     }
 
+    @Override
+    public AjaxResult OAInspection(Map<String, Object> paramMap) {
 
-    public static void main(String args[]){
-        DateTimeFormatter ymdhms = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        LocalDate today = LocalDate.now();
-        LocalDate lastMonth3 = today.plus(-3, ChronoUnit.MONTHS);
+        try {
+
+            String result = HttpUtils.sendPostOA(oa_url, convertJsonToUrlParams(JSONObject.toJSONString(paramMap)));
+            System.out.println(result);
+            //返回示例{"result":"0","info":"成功","requestid":"2193799"}
+            Map resultMap=JSONObject.parseObject(result);
+            if (resultMap.get("result").equals(Constants.LOGIN_SUCCESS_STATUS)){
+                return success(resultMap.get("info").toString(),resultMap.get("requestid").toString());
+            }else {
+                return error(resultMap.get("info").toString());
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return error(e.getMessage());
+        }
+    }
+
+        public static String convertJsonToUrlParams(String json) throws IOException {
+            ObjectMapper objectMapper = new ObjectMapper();
+            JsonNode jsonNode = objectMapper.readTree(json);
 
-        System.out.println("7天之前的日期为:"+lastMonth3.getYear());
+            StringBuilder urlParams = new StringBuilder();
+
+            Iterator<String> fieldNames = jsonNode.fieldNames();
+            while (fieldNames.hasNext()) {
+                String fieldName = fieldNames.next();
+                JsonNode fieldValue = jsonNode.get(fieldName);
+
+                if (urlParams.length() > 0) {
+                    urlParams.append("&");
+                }
+
+                urlParams.append(fieldName).append("=").append(fieldValue);
+            }
+
+            return urlParams.toString();
+        }
+    public static void main(String args[]){
+        Map<String, Object> paramMap =new HashMap<>();
+        paramMap.put("A","B");
+        paramMap.put("C","D");
+        paramMap.put("E","F");
+        System.out.println(JSONObject.toJSONString(paramMap));
+//        DateTimeFormatter ymdhms = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+//        LocalDate today = LocalDate.now();
+//        LocalDate lastMonth3 = today.plus(-3, ChronoUnit.MONTHS);
+//
+//        System.out.println("7天之前的日期为:"+lastMonth3.getYear());
     }
 }