add

src/main/java/com/zfire/jiasm/syncdata/common/DataUploadLogic.java

@@ -273,7 +273,7 @@ public class DataUploadLogic {
                                     + (System.currentTimeMillis() - startTime) + "毫秒]");
                         }
                     } catch (Exception ex) {
-                        log.info("执行上传任务[" + taskId + "]发生错误", ex);
+                        log.info("执行上传任务[ " + (String) row.get("src_tab_name") + " " + taskId + "]发生错误", ex);
                     } finally {
                         synchronized (map) {
                             map.put(taskId, Boolean.FALSE);
@@ -321,7 +321,7 @@ public class DataUploadLogic {
                 throw new Exception(errorMessage);
             }
         } catch (Exception ex) {
-            log.error("执行上传任务[taskId=" + taskId + ",syn_req_id=" + synReqId + ",seqFlag=" + segFlag + "]发生错误:"
+            log.error("执行上传任务[ "+srcTabName+" taskId=" + taskId + ",syn_req_id=" + synReqId + ",seqFlag=" + segFlag + "]发生错误:"
                     + ex.getMessage());
             try {
                 String errMessage = ex.getMessage();
@@ -393,7 +393,7 @@ public class DataUploadLogic {
                 throw new Exception("检查是否新增失败[" + synReqId + "],[" + jsonResult.getMsg() + "]");
             }
         } catch (Exception ex) {
-            log.error("执行上传任务[taskId=" + taskId + ",syn_req_id=" + synReqId + ",seqFlag=" + segFlag + "]发生错误:"
+            log.error("执行上传任务[ "+srcTabName+" taskId=" + taskId + ",syn_req_id=" + synReqId + ",seqFlag=" + segFlag + "]发生错误:"
                     + ex.getMessage());
             try {
                 String errMessage = ex.getMessage();

src/main/java/com/zfire/jiasm/syncdata/plus/entity/IntegralGradeConfigure.java

@@ -73,6 +73,9 @@ public class IntegralGradeConfigure extends Model<IntegralGradeConfigure> {
     @ApiModelProperty(value = "技能等级图标")
     private String url;
 
+    @ApiModelProperty(value = "等级数值")
+    private Integer gradeLevel;
+
 
     @Override
     protected Serializable pkVal() {

src/main/java/com/zfire/jiasm/syncdata/upload/jdmall/AppointSite.java

@@ -22,7 +22,7 @@ public class AppointSite {
     @Scheduled(fixedDelay = 2 * 1000)
     private void appointSiteProcess() {
         addJdueUtil.process("addJdueAppointSite", "api/jdueFeedback/addJdueAppointSite",
-                "itf_addJdueAppointSite_req", cols);
+                "itf_addjdueappointsite_req", cols);
     }
 
 }

src/main/java/com/zfire/jiasm/syncdata/upload/jdmall/AppointmentModification.java

@@ -19,10 +19,10 @@ public class AppointmentModification {
     private String[] cols = new String[] { "orderNo", "createBy", "createDate", "bookDate",
             "bookDate2", "remark" };
 
-    @Scheduled(fixedRateString = "${AddJdueBookOnDoor_Rate}")
+    @Scheduled(fixedDelay = 2 * 1000)
     private void process() {
         addJdueUtil.process("addJdueBookOnDoor", "api/jdueFeedback/addJdueBookOnDoor",
-                "itf_addJdueBookOnDoor_req", cols);
+                "itf_addjduebookondoor_req", cols);
     }
 
 }

src/main/java/com/zfire/jiasm/syncdata/upload/jdmall/CancelOrder.java

@@ -17,9 +17,9 @@ public class CancelOrder {
     private AddJdueUtil addJdueUtil;
     private String[] cols = new String[] { "orderNo", "createBy", "createDate", "cancelType","cancelReason"};
 
-    @Scheduled(fixedRateString = "${AddJdueCancel_Rate}")
+    @Scheduled(fixedDelay = 2 * 1000)
     private void process() {
         addJdueUtil.process("addJdueCancel", "api/jdueFeedback/addJdueCancel",
-                "itf_addJdueCancel_req", cols);
+                "itf_addjduecancel_req", cols);
     }
 }

src/main/java/com/zfire/jiasm/syncdata/upload/jdmall/Finish.java

@@ -19,10 +19,10 @@ public class Finish {
     private String[] cols = new String[] { "orderNo", "createBy", "createDate", "barcode1",
             "barcode2", "dealRemark" };
 
-    @Scheduled(fixedRateString = "${AddJdueFinish_Rate}")
+    @Scheduled(fixedDelay = 2 * 1000)
     private void process() {
         addJdueUtil.process("addJdueFinish", "api/jdueFeedback/addJdueFinish",
-                "itf_addJdueFinish_req", cols);
+                "itf_addjduefinish_req", cols);
     }
 
 }

src/main/java/com/zfire/jiasm/syncdata/upload/jdmall/ServicePersonnel.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Component;
 
 /**
  * 京东工单数据同步到格力总部
- * 回传指派改派服务商数据 itf_addJdueAppointSite_req
+ * 回传指派改派服务人员数据 itf_addJdueAppointSite_req
  */
 @Slf4j
 @Component
@@ -16,13 +16,13 @@ public class ServicePersonnel {
     @Autowired
     private AddJdueUtil addJdueUtil;
 
-    private String[] cols = new String[] { "orderNo", "siteNode", "siteName", "createBy", "createDate", "contactMan",
-            "siteMobile", "province", "city", "county", "town", "address" };
+    private String[] cols = new String[] { "orderNo", "siteNode", "siteName", "createBy", "createDate",
+            "engineerCode", "engineerName", "engineerMobile" };
 
-    @Scheduled(fixedRateString = "${AddJdueAppointSite_Rate}")
+    @Scheduled(fixedDelay = 2 * 1000)
     private void process() {
-        addJdueUtil.process("addJdueAppointSite", "api/jdueFeedback/addJdueAppointSite",
-                "itf_addJdueAppointSite_req",cols);
+        addJdueUtil.process("addJdueAppointEngineer", "api/jdueFeedback/addJdueAppointEngineer",
+                "itf_addjdueappointengineer_req", cols);
     }
 
 }

src/main/java/com/zfire/jiasm/syncdata/upload/order/DataUpload.java

@@ -148,7 +148,7 @@ public class DataUpload {
                 throw new Exception(errorMessage);
             }
         } catch (Exception ex) {
-            log.error("执行上传任务[taskId=" + taskId + ",syn_req_id=" + synReqId + ",seqFlag=" + segFlag + "]发生错误:"
+            log.error("执行上传任务[ "+srcTabName+"  taskId=" + taskId + ",syn_req_id=" + synReqId + ",seqFlag=" + segFlag + "]发生错误:"
                     + ex.getMessage());
             try {
                 String errMessage = ex.getMessage();
@@ -220,7 +220,7 @@ public class DataUpload {
                 throw new Exception("检查是否新增失败[" + synReqId + "],[" + jsonResult.getMsg() + "]");
             }
         } catch (Exception ex) {
-            log.error("执行上传任务[taskId=" + taskId + ",syn_req_id=" + synReqId + ",seqFlag=" + segFlag + "]发生错误:"
+            log.error("执行上传任务[ "+srcTabName+"  taskId=" + taskId + ",syn_req_id=" + synReqId + ",seqFlag=" + segFlag + "]发生错误:"
                     + ex.getMessage());
             try {
                 String errMessage = ex.getMessage();