change - 发送个人详情到ERP接口优化

os-mes/src/main/java/com/os/mes/api/domain/ERPPersonalDetails.java

@@ -38,7 +38,7 @@ public class ERPPersonalDetails implements Serializable {
 
     /** 员工详细信息 */
     @JsonProperty(value = "userdatas")
-    private List<ERPPersonalDetail> userdatas;
+    private String userdatas;
 
     public String getAppCode() {
         return AppCode;
@@ -72,11 +72,11 @@ public class ERPPersonalDetails implements Serializable {
         this.plancode = plancode;
     }
 
-    public List<ERPPersonalDetail> getUserdatas() {
+    public String getUserdatas() {
         return userdatas;
     }
 
-    public void setUserdatas(List<ERPPersonalDetail> userdatas) {
+    public void setUserdatas(String userdatas) {
         this.userdatas = userdatas;
     }
 

os-mes/src/main/java/com/os/mes/api/service/impl/ERPPortServiceImpl.java

@@ -343,7 +343,14 @@ public class ERPPortServiceImpl implements IERPPortService {
             personalDetail.setWorkload(executeUser.getCompleteAmount());
             detailList.add(personalDetail);
         }
-        personalDetails.setUserdatas(detailList);
+        try {
+            ObjectMapper objectMapper = new ObjectMapper();
+            objectMapper.setPropertyNamingStrategy(PropertyNamingStrategy.UPPER_CAMEL_CASE);
+            String requestParam = objectMapper.writeValueAsString(detailList);
+            personalDetails.setUserdatas(requestParam);
+        } catch (JsonProcessingException e) {
+            logger.info("processPlanInfo异常{}", e.toString());
+        }
         sendPersonalDetailsToERP(personalDetails);
     }
 
@@ -355,25 +362,25 @@ public class ERPPortServiceImpl implements IERPPortService {
             ObjectMapper objectMapper = new ObjectMapper();
             objectMapper.setPropertyNamingStrategy(PropertyNamingStrategy.UPPER_CAMEL_CASE);
             String requestParam = objectMapper.writeValueAsString(personalDetails);
-//            String result = ApiUtils.sendERPHttpPost(ERPConstants.ERP_URL, requestParam);
-            String result = "{\n" +
-                    "\t\"Successful\": true,\n" +
-                    "\t\"ErrorMessage\": null,\n" +
-                    "\t\"Detail\": null,\n" +
-                    "\t\"Logined\": false,\n" +
-                    "\t\"ReturnData\": {\n" +
-                    "\t\t\"result\": \"success\",\n" +
-                    "\t\t\"message\": \"\"\n" +
-                    "\t},\n" +
-                    "\t\"DataType\": 0\n" +
-                    "}";
+            String result = ApiUtils.sendERPHttpPost(ERPConstants.ERP_URL, requestParam);
+//            String result = "{\n" +
+//                    "  \"Successful\" : true,\n" +
+//                    "  \"ErrorMessage\" : null,\n" +
+//                    "  \"Detail\" : null,\n" +
+//                    "  \"Logined\" : false,\n" +
+//                    "  \"ReturnData\" : {\n" +
+//                    "    \"result\" : \"success\",\n" +
+//                    "    \"message\" : \"\"\n" +
+//                    "  },\n" +
+//                    "  \"DataType\" : 0\n" +
+//                    "}";
             logger.info("发送到ERP的请求参数：{}|ERP返回结果：{}", requestParam, result);
             // 处理接口返回消息
             ObjectMapper resultMapper = new ObjectMapper();
             // 将 JSON 字符串转换为 Java 对象
             HashMap hashMap = resultMapper.readValue(result, HashMap.class);
             Boolean SuccessFlag = (Boolean) hashMap.get("Successful");
-            if (SuccessFlag){
+            if (SuccessFlag) {
                 String planCode = personalDetails.getPlancode();
                 prodPlanInfoService.updateProdPlanInfoUploadFlag(planCode);
                 logger.info("发送个人详情到ERP工单编号：{}已上传ERP!", planCode);