add

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

@@ -693,8 +693,8 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         Worker v = new Worker();
         //  S + 手机号
         // v.setWorkerId(IdWorker.getIdStr());
-        // v.setWorkerId("S" + m.getYddh());
-        v.setWorkerId("W" + workerId);
+        v.setWorkerId("S" + m.getYddh());
+        // v.setWorkerId("W" + workerId);
 
 
         v.setWorkerName(m.getWxgmc().trim());
@@ -1015,11 +1015,11 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
                 }
             } else {
                 // S + 手机号 作为ID主键，手机号是不能重的 不再新增，会报错主键冲突
-                /*if (mobiles.contains(m.getYddh().trim())){
+                if (mobiles.contains(m.getYddh().trim())){
                     continue;
-                }*/
-                workdidsUp.add(workdids.get(0));
-                workdids.remove(0);
+                }
+                // workdidsUp.add(workdids.get(0));
+                // workdids.remove(0);
                 sfzens.add(m.getSfzen().trim());
                 mobiles.add(m.getYddh().trim());
                 addWorkerRec.add(v);
@@ -1056,11 +1056,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         }
         
         // 修改被使用状态
-        if (uupWorkerRec.size()>=500){
-            workerService.updateBatchById(uupWorkerRec);
-            log.info("本地网点维修工人员信息表修改了{}条数据", uupWorkerRec.size());
-            uupWorkerRec.clear();
-        }
+
 
         sfzens.clear();
         mobiles.clear();

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

@@ -57,8 +57,8 @@ public class InstallProduceUploadListServiceImpl implements InstallProduceUpload
         List<OutJiasmToGreeUploadTaskList> ojtgutls = new ArrayList<>();
         log.info("开始预处理需要上传的工单数据: \uF0B7{}",sdf.format(new Date()));
 
-        //测试使用
-        List<String> orderNos = new ArrayList<>();
+        //测试用 20231013
+        /*List<String> orderNos = new ArrayList<>();
         List<Test> orderno = testService.lambdaQuery()
                 .eq(Test::getFlag,1).list();
         if (CollectionUtils.isEmpty(orderno)){
@@ -67,7 +67,7 @@ public class InstallProduceUploadListServiceImpl implements InstallProduceUpload
         orderno.stream().forEach(event->{
             orderNos.add(event.getId());
         });
-        orderno.clear();
+        orderno.clear();*/
 
 
 
@@ -76,7 +76,7 @@ public class InstallProduceUploadListServiceImpl implements InstallProduceUpload
         taskResults = outJiasmToGreeUploadnotifylistService.lambdaQuery()
                 .eq(OutJiasmToGreeUploadnotifylist::getSynStatus, SynStatusEnum.UN_SYN.getCode())
                 // .eq(OutJiasmToGreeUploadnotifylist::getSynReqId, 20916)// 测试用
-                .in(OutJiasmToGreeUploadnotifylist::getOrderNo, orderNos)// 测试用
+                // .in(OutJiasmToGreeUploadnotifylist::getOrderNo, orderNos)// 测试用  20231013
                 .orderByAsc(OutJiasmToGreeUploadnotifylist::getSynReqId)
                 .list();
         try {

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

@@ -70,8 +70,8 @@ public class RepairProduceUploadListServiceImpl implements RepairProduceUploadLi
 
         log.info("开始预处理需要上传的维修工单数据: \uF0B7{}",sdf.format(new Date()));
 
-        //测试使用
-        List<String> orderNos = new ArrayList<>();
+        //测试用  processUploadList()
+        /*List<String> orderNos = new ArrayList<>();
         List<Test> orderno = testService.lambdaQuery()
                 .eq(Test::getFlag,1).list();
         if (CollectionUtils.isEmpty(orderno)){
@@ -80,14 +80,14 @@ public class RepairProduceUploadListServiceImpl implements RepairProduceUploadLi
         orderno.stream().forEach(event->{
             orderNos.add(event.getId());
         });
-        orderno.clear();
+        orderno.clear();*/
 
 
         // 从需要上传的订单数据表中提取数据
         List<OutJiasmToGreeUploadnotifylist> taskResults = outJiasmToGreeUploadnotifylistService.lambdaQuery()
                 .eq(OutJiasmToGreeUploadnotifylist::getSynStatus,0)
                 // .eq(OutJiasmToGreeUploadnotifylist::getSynReqId,416094L)// 测试用
-                .in(OutJiasmToGreeUploadnotifylist::getOrderNo, orderNos)// 测试用
+                // .in(OutJiasmToGreeUploadnotifylist::getOrderNo, orderNos)// 测试用  20231013
                 .orderByAsc(OutJiasmToGreeUploadnotifylist::getSynReqId).list();
         try{
             Token token = tokenCenter.getCurrentToken();

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

@@ -279,6 +279,7 @@ public class SMSSelfGetArrivedServiceImpl {
 
 
 	private void syncSmsRecord(JSONObject data) {
+		// 单号 + 评价内容
 		Map<String,String> orderPjnr = new HashMap<>();
 		// 同步工单回复信息 这里使用手机号+发送码来确认 存在无对应的情况不处理
 		// 最近两个月的一定只有一条，为防止出现问题，用list
@@ -298,10 +299,11 @@ public class SMSSelfGetArrivedServiceImpl {
 			smsRecordService.updateBatchById(u);
 			u.clear();
 
+			// 生成工单评价数据
+
 			// 差评时向申诉表插入数据(自建工单插入差评申诉(非商用空调且为差评信息))
 			// 总部发送的短信回复在从总部同步时已做了处理
-			getOrderAppeal(orderPjnr);
-
+			// getOrderAppeal(orderPjnr);
 		}
 	}
 
@@ -352,7 +354,6 @@ public class SMSSelfGetArrivedServiceImpl {
 						!orderBase.getMainId().equals("102") && !orderBase.getMainId().equals("109")){
 					// 补追评信息 可能存在追评 判断不是差评记录
 					oldcpss.setLastEvaluate((String) entry.getValue());
-
 				}
 			}
 		}