add

src/main/java/com/zfire/jiasm/syncdata/sendmessage/SMSMessageFinish.java

@@ -6,6 +6,8 @@ package com.zfire.jiasm.syncdata.sendmessage;
  */
 
 import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
+import com.zfire.jiasm.syncdata.plus.entity.ItfMessagehuifangentity;
+import com.zfire.jiasm.syncdata.plus.service.ItfMessagehuifangentityService;
 import com.zfire.jiasm.syncdata.service.PublicService;
 import com.zfire.jiasm.syncdata.service.SMSRepairFinishService;
 import com.zfire.jiasm.syncdata.utils.SMSSelfManager;
@@ -28,12 +30,16 @@ public class SMSMessageFinish {
     private String templateId;
     @Value("${zwgmsgsendc}")
     private String zwgmsgsendc = "";
+    @Value("${FAILURE_EXE_COUNT}")
+    private String exeCount;
     @Autowired
     private SMSRepairFinishService smsRepairFinishService;
     @Autowired
     private SMSSelfManager smsSelfManager;
     @Resource
     PublicService publicService;
+    @Resource
+    ItfMessagehuifangentityService itfMessagehuifangentityService;
 
 
 
@@ -53,6 +59,35 @@ public class SMSMessageFinish {
         try {
             log.info("开始自建工单评价短信发送: \uF0B7{}", sdf.format(new Date()));
             // 从完工短信发送记录表中提取数据
+            List<ItfMessagehuifangentity> huifs = itfMessagehuifangentityService.lambdaQuery()
+                    .eq(ItfMessagehuifangentity::getFsStatus,0)
+                    // .eq(ItfMessagehuifangentity::getOrderBaseId,"B473682316009797") // 测试用
+                    .eq(ItfMessagehuifangentity::getSendtype,2)
+                    .lt(ItfMessagehuifangentity::getExeCount,Integer.valueOf(exeCount))
+                    .orderByAsc(ItfMessagehuifangentity::getSynTaskNo)
+                    .list();
+
+            //SELECT * FROM itf_messagehuifangentity where fs_status=0 and sendtype = 2 "
+                    //+ " and exe_count<"+ exeCount +" and now()>plansendtime " + " order by syn_task_no");
+            for (ItfMessagehuifangentity item :huifs){
+                Date cur = new Date();
+                if (cur.compareTo(item.getPlansendtime())<=0){
+                    continue;
+                }
+                String synTaskNo = item.getSynTaskNo();
+                String[] datas = new String[1];
+                datas[0] = item.getFsnr();
+                String resultData = smsSelfManager.templateSMS(item.getSjid(), templateId,
+                        item.getSynTaskNo(),item.getFsma(), datas);
+
+                if (resultData.length()>0){
+                    smsRepairFinishService.failureUpdate(synTaskNo,resultData);
+                } else {
+                    smsRepairFinishService.successUpdate(synTaskNo);
+                    publicService.upSmsRecordSendTime(synTaskNo,item.getSjid(),new Date());
+                }
+            }
+/*
             List<Map<String, Object>> result = smsRepairFinishService.getTaskData4Self();
             for (Map<String, Object> row : result) {
                 String synTaskNo = (String) row.get("syn_task_no");
@@ -67,7 +102,7 @@ public class SMSMessageFinish {
                     smsRepairFinishService.successUpdate(synTaskNo);
                     publicService.upSmsRecordSendTime(synTaskNo,(String)row.get("sjid"),new Date());
                 }
-            }
+            }*/
 
             log.info("开始评价短信发送结束: \uF0B7{}", sdf.format(new Date()));
 

src/main/java/com/zfire/jiasm/syncdata/utils/SMSSelfManager.java

@@ -133,7 +133,7 @@ public class SMSSelfManager {
 			httpUrlConn.setRequestProperty("Content-Type", "application/json;charset=utf-8");
 			httpUrlConn.setRequestMethod("POST");
 
-			log.debug("url[" + url + "],send[" + jsonString + "]");
+			log.info("url[{}] ,send[{}]",url,jsonString);
 
 			if (null != jsonString) {
 				OutputStream outputStream = httpUrlConn.getOutputStream();
@@ -161,7 +161,7 @@ public class SMSSelfManager {
 			inputStream = null;
 			httpUrlConn.disconnect();
 			String result = buffer.toString();
-			log.debug("receive[" + result + "],url[" + url + "],send[" + jsonString + "]");
+			log.info("receive[{}],url[{}],send[{}]",result, url, jsonString);
 
 			jsonresult = JSONObject.parseObject(result);
 

src/main/resources/bootstrap-prdt.properties

@@ -414,14 +414,14 @@ hsgdcjtmc=FALSE
 #工单数据向上同步
 datauploadc=FALSE
 #安装、维修工单入本地表
-installinc=TRUE
+installinc=FALSE
 repairinc=FALSE
 smsinselfc=FALSE
 #完工评价短信格力总部发送，自建工单联通发送，查看评价短信回复信息，自建完工评价短信联通发送，派服务人员格力发送
 wgmsgsendc=FALSE
 zjgdmsgsendc=FALSE
 qmsgsendc=FALSE
-zwgmsgsendc=FALSE
+zwgmsgsendc=TRUE
 pgmsgsendc=FALSE
 greesmsc=FALSE
 SMSSelf_marketing_Ratec=FALSE