add

src/main/java/com/zfire/jiasm/syncdata/service/impl/InstallDownloadServiceImpl.java

@@ -167,7 +167,11 @@ public class InstallDownloadServiceImpl implements InstallDownloadService {
         itfInstallBatchDownloadRecService.updateById(update);
     }
 
-    public void downloadAdd(List<ItfInstallBatchDownloadRec> rec, List<ItfTblAzAssignLcLsDownload> lcls, List<ItfTblAzAssignMxDownload> mx, List<ItfTblAzAssignFkmxDownload> fk, List<ItfTblAzAssignFeeDownload> fe, List<ItfTblAzAssignAppointmentDownload> app, List<ItfTblAzAssignLcFzryDownload> fz, List<ItfTblAzAssignSatisfactionDownload> sa, List<ItfTblAzAssignPlatformDownload> pla) {
+    public void downloadAdd(List<ItfInstallBatchDownloadRec> rec, List<ItfTblAzAssignLcLsDownload> lcls,
+                            List<ItfTblAzAssignMxDownload> mx, List<ItfTblAzAssignFkmxDownload> fk,
+                            List<ItfTblAzAssignFeeDownload> fe, List<ItfTblAzAssignAppointmentDownload> app,
+                            List<ItfTblAzAssignLcFzryDownload> fz, List<ItfTblAzAssignSatisfactionDownload> sa,
+                            List<ItfTblAzAssignPlatformDownload> pla) {
         if (rec.size()>0){
             itfInstallBatchDownloadRecService.saveBatch(rec);
             rec.clear();

src/main/java/com/zfire/jiasm/syncdata/service/impl/RepairProduceDataUploadServiceImpl.java

@@ -180,6 +180,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
                 List<OutJiasmToGreeUploadTaskList> result = outJiasmToGreeUploadTaskListService.lambdaQuery()
                         .eq(OutJiasmToGreeUploadTaskList::getSynStatus,0)
                         .eq(OutJiasmToGreeUploadTaskList::getUploadTaskType,uploadTaskType)
+                        // .eq(OutJiasmToGreeUploadTaskList::getSynReqId,99L)// 测试用
                         .orderByAsc(OutJiasmToGreeUploadTaskList::getSynReqId).list();
                 // 相同任务类型的数据逐个处理
                 for (OutJiasmToGreeUploadTaskList row: result){
@@ -918,6 +919,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
     public Long generateJyktData(Brand brand, OrderBase orderBase, OrderRepairDetail item) {
         ItfTblWxjsJyktUpload jykt = generateJykt(brand, orderBase, item);
         jykt.setSynStatus(44);
+        log.info("生成维修结算数据 {}",JSONObject.toJSONString(jykt));
         itfTblWxjsJyktUploadService.save(jykt);
         return jykt.getSynReqId();
     }
@@ -1437,7 +1439,13 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         List<OrderRepairDetailReason> reasons =  orderRepairDetailReasonService.lambdaQuery()
                 .eq(OrderRepairDetailReason::getOrderRepairDetailId, detail.getId()).list();
         for (OrderRepairDetailReason r : reasons){
-            if (StringUtils.isEmpty(r.getRepairBugParentId()) || StringUtils.isEmpty(r.getNumber())){
+            // 只传最低级别(父级不等于子级)
+            if (StringUtils.isNotEmpty(r.getRepairBugParentId()) && StringUtils.isNotEmpty(r.getRepairBugId()) &&
+                    r.getRepairBugParentId().equals(r.getRepairBugId())){
+                continue;
+            }
+            // 现象原因号不传
+            if (StringUtils.isEmpty(r.getNumber())){
                 continue;
             }
             // 修改 维修现象主键、维修明细主键

src/main/java/com/zfire/jiasm/syncdata/service/impl/RepairProduceUploadListServiceImpl.java

@@ -371,9 +371,6 @@ public class RepairProduceUploadListServiceImpl implements RepairProduceUploadLi
     private OrderBase generateTaskList(String itemTableName, String itemOrderNo, String itemTableNameId,
                                        OrderBase orderBase, List<OutJiasmToGreeUploadTaskList> ojtgutls) {
         // 工单状态(8, 9, 10, 11, 12, 13, 14) 派工状态:(13, 14, 15) 未下载总部采集数据
-        log.info("生成661 getOrderStatus{} getDispatchStatus{} getOutCjDownloadFlag{}",
-                orderBase.getOrderStatus(),orderBase.getDispatchStatus(),orderBase.getOutCjDownloadFlag());
-
         if ((orderBase.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G8.getCode()) ||
                 orderBase.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G9.getCode()) ||
                 orderBase.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G10.getCode()) ||
@@ -388,9 +385,6 @@ public class RepairProduceUploadListServiceImpl implements RepairProduceUploadLi
             OutJiasmToGreeUploadTaskList add = publicService.getUploadTaskList(itemOrderNo, itemTableNameId, itemTableName,
                     orderBase.getOrderType(),661);
             ojtgutls.add(add);
-
-            log.info("生成661 ");
-
             OrderBase up = new OrderBase();
             up.setId(orderBase.getId());
             up.setOutCjDownloadFlag(1);

src/main/resources/bootstrap-dev.properties

@@ -11,9 +11,13 @@ spring.devtools.add-properties=true
 spring.datasource.druid.db-type=mysql
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://121.43.111.127:3306/jiasm?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8&serverTimezone=Asia/Shanghai
-spring.datasource.username=root
-spring.datasource.password=xch!eCdvc124@
+#spring.datasource.url=jdbc:mysql://121.43.111.127:3306/jiasm?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8&serverTimezone=Asia/Shanghai
+#spring.datasource.username=root
+#spring.datasource.password=xch!eCdvc124@
+spring.datasource.url=jdbc:mysql://jiasm-zfire-rds-aliyun-com.rwlb.rds.aliyuncs.com:3306/jiasm_prd?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8
+spring.datasource.username=jiasm_sync
+spring.datasource.password=dvuol*v()d5@12SdG
+
 spring.datasource.druid.connection-init-sqls=set names utf8mb4
 spring.datasource.druid.initial-size=5
 spring.datasource.druid.minIdle=5
@@ -387,7 +391,7 @@ tmscc=FALSE
 azuploadyscc=FALSE
 azuploadscc=FALSE
 #维修工单上传  生成需要上传的数据、生成上传任务清单列表
-wxuploadyscc=FALSE
+wxuploadyscc=TRUE
 wxuploadscc=FALSE
 #以旧换新 鉴定单、生成条码、条码上传
 yjhxjddc=FALSE
@@ -399,8 +403,8 @@ hsgdcjtmc=FALSE
 #工单数据向上同步
 datauploadc=FALSE
 #安装、维修工单入本地表
-installinc=TRUE
-repairinc=TRUE
+installinc=FALSE
+repairinc=FALSE
 #完工评价短信格力总部发送，自建工单联通发送，查看评价短信回复信息，自建完工评价短信联通发送，派服务人员格力发送
 wgmsgsendc=FALSE
 zjgdmsgsendc=FALSE
@@ -409,8 +413,8 @@ zwgmsgsendc=FALSE
 pgmsgsendc=FALSE
 #######################安装与维修工单控制参数(从总部与从工单获取互斥)###############################
 #安装、维修工单总部下载
-installdownc=TRUE
-repairdownc=TRUE
+installdownc=FALSE
+repairdownc=FALSE
 #安装与维修工单从工单系统下载
 installflag=FALSE
 repairflag=FALSE

src/main/resources/generator-dev.properties

@@ -1,7 +1,11 @@
 java.package=com.zfire.jiasm.syncdata
-jdbc.url=jdbc:mysql://121.43.111.127:3306/jiasm?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8
-jdbc.username=root
-jdbc.pwd=xch!eCdvc124@
+#jdbc.url=jdbc:mysql://121.43.111.127:3306/jiasm?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8
+#jdbc.username=root
+#jdbc.pwd=xch!eCdvc124@
+
+jdbc.url=jdbc:mysql://pc-wz9ualr91v12g50w0.rwlb.rds.aliyuncs.com:3306/jiasm_prd?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8
+jdbc.username=jiasm_sync
+jdbc.pwd=dvuol*v()d5@12SdG
 
 tables=
 tablePrefixs=