add

src/main/java/com/zfire/jiasm/syncdata/download/basedata/说明文档.txt

@@ -0,0 +1,2 @@
+ // 可配置一次 同步
+ select * from itf_gree_to_fa_download_task where src_tab_name like '%tbl_az_assign_xslx%';

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

@@ -0,0 +1,40 @@
+package com.zfire.jiasm.syncdata.sendmessage;
+
+import com.zfire.jiasm.syncdata.service.impl.SMSSelfGetArrivedServiceImpl;
+import com.zfire.jiasm.syncdata.utils.SMSSelfManager;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * 查看评价短信回复信息
+ */
+@Slf4j
+@Component
+public class SMSGetArrived {
+
+    @Autowired
+    private SMSSelfManager smsSelfManager;
+
+    @Autowired
+    private SMSSelfGetArrivedServiceImpl smsSelfGetArrivedServiceImpl;
+
+
+    @Scheduled(fixedDelay = 1 * 5 * 1000)
+    private void process() {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        try {
+            log.info("开始查询短信状态报告: \uF0B7{}",sdf.format(new Date()));
+            smsSelfGetArrivedServiceImpl.insertData(smsSelfManager.getArrived());
+            log.info("查询短信状态报告结束: \uF0B7{}",sdf.format(new Date()));
+        } catch (Exception ex) {
+            log.error("查询短信状态报告失败", ex);
+        }
+    }
+
+}

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

@@ -0,0 +1,68 @@
+package com.zfire.jiasm.syncdata.sendmessage;
+
+/**
+ * 联通 - 客户完工评价短信回复查询
+ */
+
+import com.zfire.jiasm.syncdata.service.SMSRepairFinishService;
+import com.zfire.jiasm.syncdata.utils.SMSSelfManager;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Slf4j
+public class SMSMessageQuery {
+    @Value("${SMSSelf_templateId}")
+    private String templateId;
+
+    @Autowired
+    private SMSRepairFinishService smsRepairFinishService;
+    @Autowired
+    private SMSSelfManager smsSelfManager;
+
+    @Scheduled(fixedDelay = 1 * 5 * 1000)
+    private void process() {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        if(!smsSelfManager.checkCanSend()) {
+            log.info("自建工单评价短信不到发送时间段");
+            return;
+        }
+
+        try {
+            log.info("开始评价短信发送: \uF0B7{}", sdf.format(new Date()));
+            List<Map<String, Object>> result = smsRepairFinishService.getTaskData4Self();
+
+            for (Map<String, Object> row : result) {
+
+                String synTaskNo = (String) row.get("syn_task_no");
+
+                String[] datas = new String[1];
+                datas[0] = (String) row.get("fsnr");
+
+                String resultData = smsSelfManager.templateSMS((String) row.get("sjid"), templateId, (String) row.get("syn_task_no"),
+                        (String) row.get("fsma"), datas);
+
+                if (resultData.length()>0){
+                    smsRepairFinishService.failureUpdate(synTaskNo,resultData);
+                } else {
+                    smsRepairFinishService.successUpdate(synTaskNo);
+                }
+            }
+
+            log.info("开始评价短信发送结束: \uF0B7{}", sdf.format(new Date()));
+
+        } catch (Exception ex) {
+            log.error("评价短信发送失败", ex);
+        }
+
+    }
+}

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

@@ -0,0 +1,138 @@
+package com.zfire.jiasm.syncdata.sendmessage;
+
+import com.alibaba.fastjson.JSON;
+import com.zfire.jiasm.syncdata.data.Token;
+import com.zfire.jiasm.syncdata.plus.entity.ItfMessagehuifangentity;
+import com.zfire.jiasm.syncdata.service.SMSRepairFinishService;
+import com.zfire.jiasm.syncdata.utils.OLDSystemUtil;
+import com.zfire.jiasm.syncdata.utils.TokenCenter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 发送短信 - 完工评价短信发送，发给格力总部，由格力总部发送
+ */
+@Slf4j
+@Component
+public class SendGreeMessage {
+    @Value("${installTopicName}")
+    private String installTopicName;
+    @Value("${repaireMessageFinishTopicName}")
+    private String repaireMessageFinishTopicName;
+
+
+    @Autowired
+    private TokenCenter tokenCenter;
+    @Autowired
+    private OLDSystemUtil oldSystemTask;
+    @Autowired
+    private SMSRepairFinishService smsRepairFinishService;
+
+    @Scheduled(fixedDelay = 1 * 5 * 1000)
+    public void process() throws Exception {
+        /*if (1 == 1) {
+            return;
+        }*/
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        // 提取数据
+        List<Map<String, Object>> result = smsRepairFinishService.getTaskData();
+        log.info("开始评价短信发送到总部: \uF0B7{}", sdf.format(new Date()));
+
+        Token token = tokenCenter.getCurrentToken();
+        for (Map<String, Object> row : result) {
+            String synTaskNo = (String) row.get("syn_task_no");
+            Map<String, Object> messageTableData = row;
+            String name;
+            String topic;
+            String format;
+            StringBuffer messageJson = new StringBuffer();
+            Integer azorwx=(Integer)row.get("azorwx");
+            if(azorwx==1) {
+                name="安装";
+                topic=this.installTopicName;
+                format="yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
+                if(row.get("dxguid")!=null) {
+                    row.remove("dxguid");
+                }
+                messageJson.append("{\"messageHuifangEntity\":"+JSON.toJSONStringWithDateFormat(oldSystemTask.filterDataMap(messageTableData,true),
+                        format)+"}");
+            }else {
+                name="维修";
+                topic=this.repaireMessageFinishTopicName;
+                format="yyyy-MM-dd HH:mm:ss";
+                messageTableData.put("fsdt", row.get("crdt"));
+                messageJson.append(JSON.toJSONStringWithDateFormat(oldSystemTask.filterDataMap(messageTableData,false),
+                        format));
+            }
+
+            String key = (String)row.get("fjid");
+            String json = messageJson.toString();
+            log.info(name+"评价短信" + json);
+            oldSystemTask.sendMessage2Server(topic, json, token, key);
+            smsRepairFinishService.successUpdate(synTaskNo);
+        }
+
+        log.info("评价短信发送到总部结束: \uF0B7{}", sdf.format(new Date()));
+
+    }
+
+    private void getMessageJson(ItfMessagehuifangentity item, Map<String, Object> messageTableData) {
+        messageTableData.put("synTaskNo", item.getSynTaskNo());
+        messageTableData.put("orderBaseId", item.getOrderBaseId());
+        messageTableData.put("sendtype", item.getSendtype());
+        messageTableData.put("plansendtime", item.getPlansendtime());
+        messageTableData.put("sendtime", item.getSendtime());
+        messageTableData.put("azorwx", item.getAzorwx());
+        messageTableData.put("crdt", item.getCrdt());
+        messageTableData.put("fjid", item.getFjid());
+        messageTableData.put("fjwd", item.getFjwd());
+        messageTableData.put("fscs", item.getFscs());
+        messageTableData.put("fsma", item.getFsma());
+        messageTableData.put("fsnr", item.getFsnr());
+        messageTableData.put("sjid", item.getSjid());
+        messageTableData.put("sjly", item.getSjly());
+        messageTableData.put("stat", item.getStat());
+        messageTableData.put("stat2", item.getStat2());
+        messageTableData.put("yhlb", item.getYhlb());
+        messageTableData.put("fsStatus", item.getFsStatus());
+        if (item.getDxguid() != null) {
+            messageTableData.put("dxguid", item.getDxguid());
+        }
+        messageTableData.put("exeCount", item.getExeCount());
+        messageTableData.put("errorMsg", item.getErrorMsg());
+    }
+
+    private void getOneMessageJson(ItfMessagehuifangentity item, Map<String, Object> messageTableData) {
+        messageTableData.put("synTaskNo", item.getSynTaskNo());
+        messageTableData.put("orderBaseId", item.getOrderBaseId());
+        messageTableData.put("sendtype", item.getSendtype());
+        messageTableData.put("plansendtime", item.getPlansendtime());
+        messageTableData.put("sendtime", item.getSendtime());
+        messageTableData.put("azorwx", item.getAzorwx());
+        messageTableData.put("crdt", item.getCrdt());
+        messageTableData.put("fjid", item.getFjid());
+        messageTableData.put("fjwd", item.getFjwd());
+        messageTableData.put("fscs", item.getFscs());
+        messageTableData.put("fsma", item.getFsma());
+        messageTableData.put("fsnr", item.getFsnr());
+        messageTableData.put("sjid", item.getSjid());
+        messageTableData.put("sjly", item.getSjly());
+        messageTableData.put("stat", item.getStat());
+        messageTableData.put("stat2", item.getStat2());
+        messageTableData.put("yhlb", item.getYhlb());
+        messageTableData.put("fsStatus", item.getFsStatus());
+        messageTableData.put("dxguid", item.getDxguid());
+        messageTableData.put("exeCount", item.getExeCount());
+        messageTableData.put("errorMsg", item.getErrorMsg());
+        messageTableData.put("fsdt", item.getCrdt());
+    }
+}

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

@@ -1,12 +1,8 @@
 package com.zfire.jiasm.syncdata.sendmessage;
 
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.zfire.jiasm.syncdata.dao.mapper.SendGreeSmsMapper;
 import com.zfire.jiasm.syncdata.plus.entity.FaOrderSms;
-import com.zfire.jiasm.syncdata.plus.entity.OutJiasmToGreeSynRule;
-import com.zfire.jiasm.syncdata.plus.service.FaOrderSmsService;
 import com.zfire.jiasm.syncdata.utils.SMSSelfManager;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,12 +12,11 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
 /**
- * 发送短信
+ * 发送短信 - 自建短信
  */
 @Slf4j
 @Component
@@ -40,7 +35,6 @@ public class SendMessage {
             return;
         }
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        List<OutJiasmToGreeSynRule> synRules = new ArrayList<>();
         // 提取数据
         List<FaOrderSms> records = sendGreeSmsMapper.getData();
         log.info("开始自建工单短信发送: \uF0B7{}",sdf.format(new Date()));

src/main/java/com/zfire/jiasm/syncdata/service/OLDSystemService.java

@@ -0,0 +1,16 @@
+package com.zfire.jiasm.syncdata.service;
+
+import java.util.List;
+import java.util.Map;
+
+public interface OLDSystemService {
+
+	public List<Map<String, Object>> getRequests(String tableName,int type);
+	
+	public List<Map<String, Object>> getTableDatas(String tableName,String synTaskNo);
+	
+	public List<Map<String, Object>> getTableDatasJoinParent(String tableName,String synTaskNo,String parentTableName,String parentId,String childeIdName);
+	
+	public void successUpdate(String tableName,String synTaskNo);
+
+}

src/main/java/com/zfire/jiasm/syncdata/service/SMSRepairFinishService.java

@@ -0,0 +1,16 @@
+package com.zfire.jiasm.syncdata.service;
+
+import java.util.List;
+import java.util.Map;
+
+public interface SMSRepairFinishService {
+	
+	public List<Map<String, Object>> getTaskData();
+	
+	public List<Map<String, Object>> getTaskData4Self();
+
+	public void successUpdate(String synTaskNo);
+
+	public void failureUpdate(String synTaskNo,String error_msg);
+
+}

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

@@ -0,0 +1,89 @@
+package com.zfire.jiasm.syncdata.service.impl;
+
+
+import com.zfire.jiasm.syncdata.service.OLDSystemService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@Slf4j
+public class OLDSystemServiceImpl implements OLDSystemService {
+
+	@Autowired
+	private JdbcTemplate jdbcTemplate;
+
+	@Override
+	public List<Map<String, Object>> getTableDatas(String tableName, String synTaskNo) {
+		List<Map<String, Object>> result = jdbcTemplate
+				.queryForList("SELECT * FROM " + tableName + " where syn_task_no=?", new Object[] { synTaskNo });
+		return result;
+	}
+
+	@Override
+	public void successUpdate(String tableName, String synTaskNo) {
+		jdbcTemplate.update("update " + tableName + " set syn_status=1,syn_time=? where syn_task_no=?",
+				new Object[] { new Date(), synTaskNo });
+
+	}
+
+	@Override
+	public List<Map<String, Object>> getRequests(String tableName, int type) {
+		List<Map<String, Object>> result;
+		
+		if(type==1) {
+			//家用空调、热水器
+			result = jdbcTemplate.queryForList(
+					"SELECT * FROM " + tableName + " where syn_status=0 and spid in (101,103) order by syn_req_time,stat ",
+					new Object[] { });
+		}else if (type==2) {
+			//商用空调
+			result = jdbcTemplate.queryForList(
+					"SELECT * FROM " + tableName + " where syn_status=0 and spid in (102) order by syn_req_time,stat ",
+					new Object[] {});
+		}else if(type==3) {
+			//生活电器
+			result = jdbcTemplate.queryForList(
+					"SELECT * FROM " + tableName + " where syn_status=0 and spid not in (101,102,103) order by syn_req_time,stat ",
+					new Object[] {});
+		}else {
+			//维修
+			result = jdbcTemplate.queryForList(
+					"SELECT * FROM " + tableName + " where syn_status=0 order by syn_req_time,stat ", new Object[] {});
+
+		}
+
+		return result;
+	}
+
+	@Override
+	public List<Map<String, Object>> getTableDatasJoinParent(String tableName, String synTaskNo, String parentTableName,
+			String parentId, String childeIdName) {
+		if (childeIdName == null || childeIdName.trim().length() == 0) {
+			childeIdName = "id";
+		}
+		
+		
+		List<Map<String, Object>> result = jdbcTemplate.queryForList(
+				"SELECT a.* FROM " + tableName + " a," + parentTableName
+						+ " b where a.syn_task_no=b.syn_task_no and a.syn_task_no=? and a." + childeIdName + "=? ",
+				new Object[] { synTaskNo, parentId });
+		
+		if(tableName.trim().equalsIgnoreCase("itf_tblAzWgmxSyktTmmxLs")
+				|| tableName.trim().equalsIgnoreCase("itf_tblazwgmxsyktfj")
+				|| tableName.trim().equalsIgnoreCase("itf_tblazwgmxjyktFj")
+				|| tableName.trim().equalsIgnoreCase("itf_tblAzWgmxQitaFj")
+				) {
+			log.info("SELECT a.* FROM " + tableName + " a," + parentTableName
+					+ " b where a.syn_task_no=b.syn_task_no and a.syn_task_no="+synTaskNo+" and a." + childeIdName + "="+parentId);
+		}
+		
+		return result;
+	}
+
+}

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

@@ -0,0 +1,50 @@
+package com.zfire.jiasm.syncdata.service.impl;
+
+import com.zfire.jiasm.syncdata.service.SMSRepairFinishService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import java.sql.Timestamp;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class SMSRepairFinishServiceImpl implements SMSRepairFinishService {
+
+	@Value("${FAILURE_EXE_COUNT}")
+	private String exeCount;
+
+
+	@Autowired
+	private JdbcTemplate jdbcTemplate;
+
+	@Override
+	public List<Map<String, Object>> getTaskData() {
+		List<Map<String, Object>> result = jdbcTemplate.queryForList(
+				"SELECT * FROM itf_messagehuifangentity where fs_status=0 and sendtype = 1 order by syn_task_no");
+		return result;
+	}
+
+	@Override
+	public List<Map<String, Object>> getTaskData4Self() {
+		List<Map<String, Object>> result = jdbcTemplate
+				.queryForList("SELECT * FROM itf_messagehuifangentity where fs_status=0 and sendtype = 2 "
+						+ " and exe_count<"+ exeCount +" and now()>plansendtime " + " order by syn_task_no");
+		return result;
+	}
+
+	@Override
+	public void successUpdate(String synTaskNo) {
+		jdbcTemplate.update("update itf_messagehuifangentity set fs_status=1,sendtime=? where syn_task_no=?",
+				new Object[] { new Timestamp(System.currentTimeMillis()),synTaskNo });
+	}
+
+	@Override
+	public  void failureUpdate(String synTaskNo,String error_msg){
+		jdbcTemplate.update("update itf_messagehuifangentity set exe_count=exe_count + 1,sendtime=?,error_msg=? where syn_task_no=?",
+				new Object[] { new Timestamp(System.currentTimeMillis()),error_msg,synTaskNo});
+	}
+
+}

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

@@ -0,0 +1,55 @@
+package com.zfire.jiasm.syncdata.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.SimpleDateFormat;
+
+@Service
+public class SMSSelfGetArrivedServiceImpl {
+
+	@Autowired
+	private JdbcTemplate jdbcTemplate;
+
+	@Transactional(rollbackFor = Exception.class)
+	public void insertData(JSONObject datas) throws Exception {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+		JSONArray reports = datas.getJSONArray("reports");
+		for (int i = 0; i < reports.size(); i++) {
+			JSONObject data = reports.getJSONObject(i);
+
+			String sql = "insert into itf_receive_sms (smsType,fromNum,content,recvTime,"
+					+ "dateSent,status,appendCode,action,deliverCode,reqId,smsCount,spCode,subappend) "
+					+ "values (?,?,?,?,?,?,?,?,?,?,?,?,?) ";
+
+			Object[] insertValue = new Object[13];
+			insertValue[0] = data.getString("smsType");
+			insertValue[1] = data.getString("fromNum");
+			insertValue[2] = data.getString("content");
+
+			insertValue[3] = sdf.parse(data.getString("recvTime"));
+
+			if (data.containsKey("dateSent")) {
+				insertValue[4] = sdf.parse(data.getString("dateSent"));
+			} else {
+				insertValue[4] = null;
+			}
+
+			insertValue[5] = data.getOrDefault("status", "0");
+			insertValue[6] = data.getOrDefault("appendCode", "");
+			insertValue[7] = data.getString("action");
+			insertValue[8] = data.getOrDefault("deliverCode", "");
+			insertValue[9] = data.getOrDefault("reqId", "");
+			insertValue[10] = data.getOrDefault("smsCount", "0");
+			insertValue[11] = data.getOrDefault("spCode", "");
+			insertValue[12] = data.getOrDefault("subAppend", "");
+
+			jdbcTemplate.update(sql, insertValue);
+		}
+	}
+
+}

src/main/java/com/zfire/jiasm/syncdata/upload/worker/UploadWorkerTOGree.java

@@ -118,100 +118,111 @@ public class UploadWorkerTOGree {
         recs = getWorkerUploads();
 
         for (OutWorkerUpload item:recs){
-            WorkUploadInfo req = new WorkUploadInfo();
-            WorkerCertificateInfo workerCertificateInfo = new WorkerCertificateInfo();
+            try{
+                WorkUploadInfo req = new WorkUploadInfo();
+                WorkerCertificateInfo workerCertificateInfo = new WorkerCertificateInfo();
 
-            // 获取师傅信息
-            if (!workersMap.containsKey(item.getWorkerId())){
-                continue;
-            }
-            worker = workersMap.get(item.getWorkerId()).get(0);
-
-            //  查看师傅是否已选中品牌商 先同步状态为无效状态
-            workerBrandAccount = getWorkerBrandAccount(brand, item, worker);
-            if (workerBrandAccount == null || workerBrandAccount.size()<1) {
-                continue;
-            }
-
-            // 格力一个师傅最多三个有效网点超3个网点不能同步
-            if (checkWebsitSum(workerBrandAccount,item)){
-                continue;
-            }
-
-            // 查看师傅服务区域
-            workerStreet = getWorkerStreet(item, worker);
-            if (workerStreet == null) {
-                continue;
-            }
+                // 获取师傅信息
+                if (!workersMap.containsKey(item.getWorkerId())){
+                    continue;
+                }
+                worker = workersMap.get(item.getWorkerId()).get(0);
 
-            // 提取师傅证件信息，未同步时不处理
-            if (getCertificateInfo(workerCertificateInfo, worker.getWorkerId())){
-                continue;
-            }
+                //  查看师傅是否已选中品牌商 先同步状态为无效状态
+                workerBrandAccount = getWorkerBrandAccount(brand, item, worker);
+                if (workerBrandAccount == null || workerBrandAccount.size()<1) {
+                    continue;
+                }
 
-            // 必要条件必须满足，否则不进行数据上传动作
-            if (checkNecessary(worker, item, workerCertificateInfo)){
-                continue;
-            }
+                // 格力一个师傅最多三个有效网点超3个网点不能同步
+                if (checkWebsitSum(workerBrandAccount,item)){
+                    continue;
+                }
 
-            // 获取签约品类
-            if (getCategory(brand, jySignSplbList, sySignSplbList, worker, item)){
-                continue;
-            }
+                // 查看师傅服务区域
+                workerStreet = getWorkerStreet(item, worker);
+                if (workerStreet == null) {
+                    continue;
+                }
 
-            // 生成数据对象 证件
-            getreq(workerCertificateInfo, req, worker);
-
-            // 按网点同步
-            for (WorkerBrandAccount dot: workerBrandAccount){
-                //网点未签约品类时该网点师傅信息不同步
-                GreeResponseHelper response = getwdqylbxx(wdqyapi,dot.getBrandWebsitNumber());
-                if (response.getStatus() == 200){
-                    // 获取网点签约的品类信息
-                    websitqypl = JSONObject.parseObject(response.getData().toString(), WebsitQXLB.class);
-                 } else {
-                    // 写入表备注信息
-                    updateWorkerUploadLag(item,"获取网点签约的品类信息失败");
-                    break;
+                // 提取师傅证件信息，未同步时不处理
+                if (getCertificateInfo(workerCertificateInfo, worker.getWorkerId())){
+                    continue;
                 }
 
-                // 从网点签约的品类信息中过滤师傅的品类信息
-                extracted(jySignSplbList, sySignSplbList, jyList, syList, websitqypl);
+                // 必要条件必须满足，否则不进行数据上传动作
+                if (checkNecessary(worker, item, workerCertificateInfo)){
+                    continue;
+                }
 
-                // 过滤后无品类，不能上传
-                if (jyList.size()<1 && syList.size()<1){
-                    // 写入表备注信息
-                    updateWorkerUploadLag(item,"师傅签约品类过滤后不能同时为空");
+                // 获取签约品类
+                if (getCategory(brand, jySignSplbList, sySignSplbList, worker, item)){
                     continue;
                 }
 
-                // 按网点过滤师傅的类别信息
-                req.setJySignSplbList(jyList);
-                req.setSySignSplbList(syList);
+                // 生成数据对象 证件
+                getreq(workerCertificateInfo, req, worker);
 
-                // 服务人员编号(不填值为新增，填值为修改)
-                if (StringUtils.isNotEmpty(dot.getBrandWorkerNumber())){
-                    req.setWxgno(dot.getBrandWorkerNumber());
-                    // 重值部分数据 以格力门店数据为准
-                    resetParameter(wdwxgMap, req);
-                } else {
-                    // 省份-城市-区县-乡镇
-                    if (extractedPCAS(req, workerStreet,brand.getBrandId(),item)){
+                // 按网点同步
+                for (WorkerBrandAccount dot: workerBrandAccount){
+                    //网点未签约品类时该网点师傅信息不同步
+                    GreeResponseHelper response = getwdqylbxx(wdqyapi,dot.getBrandWebsitNumber());
+                    if (response.getStatus() == 200){
+                        // 获取网点签约的品类信息
+                        websitqypl = JSONObject.parseObject(response.getData().toString(), WebsitQXLB.class);
+                    } else {
+                        // 写入表备注信息
+                        updateWorkerUploadLag(item,"获取网点签约的品类信息失败");
+                        break;
+                    }
+
+                    // 从网点签约的品类信息中过滤师傅的品类信息
+                    extracted(jySignSplbList, sySignSplbList, jyList, syList, websitqypl);
+
+                    // 过滤后无品类，不能上传
+                    if (jyList.size()<1 && syList.size()<1){
+                        // 写入表备注信息
+                        updateWorkerUploadLag(item,"师傅签约品类过滤后不能同时为空");
                         continue;
                     }
-                }
-                // 所属网点
-                req.setWdno(dot.getBrandWebsitNumber());
 
-                // 日志
-                log.info("报文：{}",JSONObject.toJSONString(req));
+                    // 按网点过滤师傅的类别信息
+                    req.setJySignSplbList(jyList);
+                    req.setSySignSplbList(syList);
 
-                // 同步
-                syncData(dot.getId(), wxgaddapi, item, req);
+                    // 服务人员编号(不填值为新增，填值为修改)
+                    if (StringUtils.isNotEmpty(dot.getBrandWorkerNumber())){
+                        req.setWxgno(dot.getBrandWorkerNumber());
+                        // 重值部分数据 以格力门店数据为准
+                        resetParameter(wdwxgMap, req);
+                    } else {
+                        // 省份-城市-区县-乡镇
+                        if (extractedPCAS(req, workerStreet,brand.getBrandId(),item)){
+                            continue;
+                        }
+                    }
+                    // 所属网点
+                    req.setWdno(dot.getBrandWebsitNumber());
 
-                jyList.clear();
-                syList.clear();
-            }
+                    // 日志
+                    log.info("报文：{}",JSONObject.toJSONString(req));
+
+                    // 同步
+                    syncData(dot.getId(), wxgaddapi, item, req);
+
+                    jyList.clear();
+                    syList.clear();
+                }
+            } catch (Exception ex) {
+                String msg ="同步失败";
+                if (ex.getMessage() != null){
+                    msg = ex.getMessage();
+                }
+                if (ex.getMessage() != null && ex.getMessage().trim().length() > 255) {
+                    msg = ex.getMessage().substring(0, 255);
+                }
+               updateWorkerUploadLag(item,msg);
+           }
         }
 
         log.info("同步师傅信息到格力总部完成: \uF0B7{}",sdf.format(new Date()));
@@ -247,7 +258,7 @@ public class UploadWorkerTOGree {
         List<String> jyfwlbList = new ArrayList<>();
 
         // 过滤商用品类
-        if (websitqypl.getSySignSplbList().size()>0){
+        if (websitqypl.getSySignSplbList().size()>0 && sySignSplbList.size()>0){
             // 大类名称 取交集
             websitqypl.getSySignSplbList().get(0).getFwlbList().retainAll(sySignSplbList.get(0).getFwlbList());
             syfwlbList.addAll(websitqypl.getSySignSplbList().get(0).getFwlbList());
@@ -268,14 +279,14 @@ public class UploadWorkerTOGree {
         }
 
         // 过滤家用品类
-        if (websitqypl.getJySignSplbList().size()>0){
+        if (websitqypl.getJySignSplbList().size()>0 && jySignSplbList.size()>0){
             // 大类名称 取交集
             websitqypl.getJySignSplbList().get(0).getFwlbList().retainAll(jySignSplbList.get(0).getFwlbList());
             jyfwlbList.addAll(websitqypl.getJySignSplbList().get(0).getFwlbList());
             // 品类
             for (SignSplb sy : jySignSplbList){
                 for (SignSplb wdjy: websitqypl.getJySignSplbList()){
-                    if (wdjy.getSpdl().equals(sy.getSpdl()) && wdjy.getSpxl().equals(sy.getSpxl())){
+                    /*if (wdjy.getSpdl().equals(sy.getSpdl()) && wdjy.getSpxl().equals(sy.getSpxl())){
                         SignSplb one = new SignSplb();
                         one.setFwlbList(syfwlbList);
                         one.setSpdl(wdjy.getSpdl());
@@ -283,6 +294,25 @@ public class UploadWorkerTOGree {
                         one.setSpxl(wdjy.getSpxl());
                         one.setSpxlName(wdjy.getSpxlName());
                         jyList.add(one);
+                    }*/
+                    if (wdjy.getSpdl().equals(sy.getSpdl())){
+                        if (wdjy.getSpxl() !=null){
+                            if (wdjy.getSpxl().equals(sy.getSpxl())){
+                                SignSplb one = new SignSplb();
+                                one.setFwlbList(syfwlbList);
+                                one.setSpdl(wdjy.getSpdl());
+                                one.setSpdlName(wdjy.getSpdlName());
+                                one.setSpxl(wdjy.getSpxl());
+                                one.setSpxlName(wdjy.getSpxlName());
+                                jyList.add(one);
+                            }
+                        } else {
+                            SignSplb one = new SignSplb();
+                            one.setFwlbList(syfwlbList);
+                            one.setSpdl(wdjy.getSpdl());
+                            one.setSpdlName(wdjy.getSpdlName());
+                            jyList.add(one);
+                        }
                     }
                 }
             }
@@ -658,6 +688,7 @@ public class UploadWorkerTOGree {
                 .eq(BrandLbsRelate::getLbsCityId,workerStreet.getCityId())
                 .eq(BrandLbsRelate::getLbsDistrictId,workerStreet.getAreaId())
                 .eq(BrandLbsRelate::getBrandId,brandId).list();
+        log.info("workerStreet: {}",workerStreet);
         if (braa != null && braa.size()>0){
             Area c = areaService.lambdaQuery()
                     .eq(Area::getAreaId,braa.get(0).getAreaId()).one();

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

@@ -0,0 +1,255 @@
+package com.zfire.jiasm.syncdata.utils;
+
+import com.alibaba.fastjson.JSON;
+import com.zfire.jiasm.syncdata.data.Token;
+import com.zfire.jiasm.syncdata.service.OLDSystemService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+
+@Component
+@Slf4j
+public class OLDSystemUtil {
+	@Value("${baseurl}")
+	private String baseurl;
+
+	@Value("${installTopicName}")
+	private String installTopicName;
+
+	@Value("${repaireTopicName}")
+	private String repaireTopicName;
+
+	@Autowired
+	private TokenCenter tokenCenter;
+
+	@Autowired
+	private OLDSystemService oldSystemService;
+
+
+
+	public void process(String name, String requestTable, String requestJsonName, Object[] collectParam,
+			Object[] finishParam, boolean isInstall, int type, String idColName) {
+
+		List<Map<String, Object>> result = oldSystemService.getRequests(requestTable, type);
+
+		try {
+
+			Token token = tokenCenter.getCurrentToken();
+
+			for (Map<String, Object> row : result) {
+
+				int status = (Integer) row.get("status");
+
+				String aTableDataName;
+				String aTableDataJsonName;
+				String[] tableDatasAry;
+				String[] tableDatasJsonName;
+				String otherJsons;
+				String messageTableName;
+				String messageJsonName;
+
+				String proccessName;
+
+				if (status == 1) {
+
+					aTableDataName = (String) collectParam[0];
+					aTableDataJsonName = (String) collectParam[1];
+					tableDatasAry = (String[]) collectParam[2];
+					tableDatasJsonName = (String[]) collectParam[3];
+					otherJsons = (String) collectParam[4];
+					messageTableName = (String) collectParam[5];
+					messageJsonName = (String) collectParam[6];
+
+					proccessName = name + "采集";
+
+				} else {
+
+					aTableDataName = (String) finishParam[0];
+					aTableDataJsonName = (String) finishParam[1];
+					tableDatasAry = (String[]) finishParam[2];
+					tableDatasJsonName = (String[]) finishParam[3];
+					otherJsons = (String) finishParam[4];
+					messageTableName = (String) finishParam[5];
+					messageJsonName = (String) finishParam[6];
+
+					proccessName = name + "完工";
+
+				}
+
+				processATask(row, token, requestTable, requestJsonName, proccessName, aTableDataName,
+						aTableDataJsonName, tableDatasAry, tableDatasJsonName, otherJsons, isInstall, type, idColName,
+						messageTableName, messageJsonName);
+
+			}
+
+		} catch (Exception ex) {
+			log.error("[" + name + "]上传就系统失败", ex);
+		}
+
+	}
+
+	private void processATask(Map<String, Object> row, Token token, String requestTable, String requestJsonName,
+			String name, String aTableDataName, String aTableDataJsonName, String[] tableDatasAry,
+			String[] tableDatasJsonName, String otherJsons, boolean isInstall, int type, String idColName,
+			String messageTableName, String messageJsonName) throws Exception {
+
+		String synTaskNo = (String) row.get("syn_task_no");
+
+		String key = "12345678";
+		Object pgid = row.get("pgid");
+		if (pgid != null) {
+			key = pgid.toString();
+		}
+
+		String requestJson = "\"" + requestJsonName + "\":"
+				+ JSON.toJSONStringWithDateFormat(filterDataMap(row, true), "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+
+		StringBuffer messageJson = new StringBuffer();
+
+		if (messageTableName != null && messageTableName.trim().length() > 0) {
+
+			log.info("开始取数据[synTaskNo=" + synTaskNo + ",tableName=" + messageTableName + "]");
+			List<Map<String, Object>> messageTableDatas = oldSystemService.getTableDatas(messageTableName, synTaskNo);
+			if (messageTableDatas.size() > 0) {
+				Map<String, Object> messageTableData = messageTableDatas.get(0);
+				messageJson.append(",\"" + messageJsonName + "\":");
+				messageJson.append(JSON.toJSONStringWithDateFormat(filterDataMap(messageTableData, true),
+						"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"));
+			}
+
+		}
+
+		log.info("开始取数据[synTaskNo=" + synTaskNo + ",tableName=" + aTableDataName + "]");
+		List<Map<String, Object>> aTableDataList = oldSystemService.getTableDatas(aTableDataName, synTaskNo);
+		StringBuffer sb = new StringBuffer();
+		for (Map<String, Object> aTableData : aTableDataList) {
+			String tableData = JSON.toJSONStringWithDateFormat(filterDataMap(aTableData, true),
+					"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+			String id = (String) aTableData.get(idColName);
+			if (sb.length() > 0) {
+				sb.append(",");
+			}
+			sb.append("{\"id\":\"" + id + "\"");
+
+			StringBuffer sb3 = new StringBuffer();
+			for (int i = 0; i < tableDatasAry.length; i++) {
+
+				String tableName = tableDatasAry[i];
+				String jsonName = tableDatasJsonName[i];
+				log.info("开始取数据[synTaskNo=" + synTaskNo + ",tableName=" + tableName + "]");
+				String childIdName="id";
+				
+				if(aTableDataName.trim().equalsIgnoreCase("itf_tblWxjsJykt")) {
+					childIdName="wxjsguid";
+				}
+				
+				if(tableName.trim().equalsIgnoreCase("itf_tblAzWgmxSyktTmmxLs")
+						|| tableName.trim().equalsIgnoreCase("itf_tblazwgmxsyktfj")) {
+					childIdName="relationid";
+				}
+				
+				if(tableName.trim().equalsIgnoreCase("itf_tblazwgmxjyktFj")
+						|| tableName.trim().equalsIgnoreCase("itf_tblAzWgmxQitaFj")
+						) {
+					childIdName="pgwcmxid";
+				}
+				
+				List<Map<String, Object>> tableDatas = oldSystemService.getTableDatasJoinParent(tableName, synTaskNo,
+						aTableDataName,aTableData.get("id").toString(),childIdName);
+				StringBuffer sb2 = new StringBuffer();
+				for (Map<String, Object> theTableData : tableDatas) {
+					if (sb2.length() > 0) {
+						sb2.append(",");
+					}
+					sb2.append(JSON.toJSONStringWithDateFormat(filterDataMap(theTableData, true),
+							"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"));
+				}
+				String rowData = "\"" + jsonName + "\":" + "[" + sb2.toString() + "]";
+
+				if (sb3.length() > 0) {
+					sb3.append(",");
+				}
+				sb3.append(rowData);
+			}
+
+			if (sb3.length() > 0) {
+				sb.append("," + sb3.toString());
+			}
+
+			if (otherJsons.length() > 0) {
+				sb.append("," + otherJsons);
+			}
+
+			sb.append(
+					",\"" + aTableDataJsonName + "\":" + tableData + (!isInstall ? messageJson.toString() : "") + "}");
+		}
+
+		String json;
+		if (isInstall) {
+			json = "{\"dataAcquiredList\": [" + sb.toString() + "]," + requestJson + messageJson.toString() + "}";
+		} else {
+			json = sb.toString();
+		}
+
+		log.info(name + json);
+
+		sendMessage2Server((isInstall ? this.installTopicName : this.repaireTopicName), json, token, key);
+
+		oldSystemService.successUpdate(requestTable, synTaskNo);
+
+	}
+
+	public void sendMessage2Server(String topic, String json, Token token, String key) throws Exception {
+
+		String url = this.baseurl + "kafka/sendMessage";
+		Map<String, String> paramMap = new HashMap<String, String>();
+		paramMap.put("topic", topic);
+		paramMap.put("key", key);
+		paramMap.put("message", json);
+		JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", JSON.toJSONString(paramMap), token);
+		if (!jsonResult.isOK()) {
+			throw new Exception("发送消息失败[" + jsonResult.getMsg() + "]");
+		}
+	}
+
+	@SuppressWarnings("serial")
+	private Set<String> excludeCols = new HashSet<String>() {
+		{
+			add("syn_task_no");
+			add("syn_req_time");
+			add("syn_status");
+			add("syn_time");
+			add("syn_times");
+			add("syn_err_msg");
+			add("worker_order_no");
+			add("status");
+			add("fs_status");
+		}
+	};
+
+	public Map<String, Object> filterDataMap(Map<String, Object> row, boolean isSub8Hour) {
+		Map<String, Object> paramMap = new HashMap<String, Object>();
+		Set<String> keys = row.keySet();
+		for (String key : keys) {
+			if (!excludeCols.contains(key)) {
+				if (isSub8Hour) {
+					Object value = row.get(key.trim());
+					if (value != null && (value instanceof Date)) {
+						Date date = (Date) value;
+						Calendar calendar = Calendar.getInstance();
+						calendar.setTime(date);
+						calendar.add(Calendar.HOUR, -8);
+						row.put(key.trim(), calendar.getTime());
+					}
+				}
+				paramMap.put(DataUtil.fromDbName2ServiceName(key.trim()), row.get(key.trim()));
+			}
+		}
+
+		return paramMap;
+	}
+
+}

src/main/resources/bootstrap-dev.properties

@@ -128,4 +128,10 @@ SMSSelf_appId=8a216da880d67afb0181472847271316
 SMSSelf_smsType=0
 SMSSelf_templateId=1196771
 SMSSelf_startTime=07:00
-SMSSelf_endTime=24:00
+SMSSelf_endTime=24:00
+FAILURE_EXE_COUNT=10
+
+######################## 完工评价短信发送到格力总部 ###########################
+repaireMessageFinishTopicName=messageHuifangTopic
+installTopicName=azdatacollection
+repaireTopicName=WxDtoTopic

src/main/resources/bootstrap-prd.properties

@@ -99,4 +99,10 @@ SMSSelf_appId=8a216da880d67afb0181472847271316
 SMSSelf_smsType=0
 SMSSelf_templateId=1196771
 SMSSelf_startTime=06:00
-SMSSelf_endTime=24:00
+SMSSelf_endTime=24:00
+FAILURE_EXE_COUNT=10
+
+######################## 完工评价短信发送到格力总部 ###########################
+installTopicName=azdatacollection
+repaireTopicName=WxDtoTopic
+repaireMessageFinishTopicName=messageHuifangTopic

src/main/resources/bootstrap-test.properties

@@ -123,4 +123,9 @@ SMSSelf_appId=8a216da880d67afb0181472847271316
 SMSSelf_smsType=0
 SMSSelf_templateId=1196771
 SMSSelf_startTime=07:00
-SMSSelf_endTime=24:00
+SMSSelf_endTime=24:00
+FAILURE_EXE_COUNT=10
+######################## 完工评价短信发送到格力总部 ###########################
+installTopicName=azdatacollection
+repaireTopicName=WxDtoTopic
+repaireMessageFinishTopicName=messageHuifangTopic