add

src/main/java/com/zfire/jiasm/syncdata/pojo/bo/DownRepairOrderGD.java

@@ -16,7 +16,7 @@ public class DownRepairOrderGD implements Serializable {
     private static final long serialVersionUID = 1L;
 
     // 序主键
-    private Integer id;
+    private String id;
     // 工单
     private JSONArray data;
 

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

@@ -82,7 +82,7 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
             // 销售公司编码
             String salesWebsitNumber = synRule.getSalesWebsitNumber();
             String downloadBatchNo = UUID.randomUUID().toString();
-            int id = 0;
+            String id = "";
             // 获取数据 这里的数据为数组，会有多个工单的情况
             data = downloadRepairDataGD();
             id = data.getId();
@@ -156,7 +156,7 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
             // 销售公司编码
             String salesWebsitNumber = synRule.getSalesWebsitNumber();
             String downloadBatchNo = UUID.randomUUID().toString();
-            int id = 0;
+            String id = "";
             // 获取数据 这里的数据为数组，会有多个工单的情况
             data = downloadInstallDataGD();
             id = data.getId();
@@ -167,7 +167,6 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
             for (int i = 0; i < datas.size(); i++) {
                 JSONObject sheet = datas.getJSONObject(i);
                 try{
-                    // 维修工单主表必须存在
                     JSONObject mainTableData = sheet.getJSONObject("TBL_AZ_ASSIGN_LC_LS");
                     if (mainTableData != null) {
                         String downloadTaskNo = UUID.randomUUID().toString();
@@ -235,7 +234,7 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
             // 销售公司编码
             String salesWebsitNumber = synRule.getSalesWebsitNumber();
             String downloadBatchNo = UUID.randomUUID().toString();
-            int id = 0;
+            String id = "";
             // 获取数据 这里的数据为数组，会有多个工单的情况
             data = downloadRepairDataGD();
             id = data.getId();
@@ -286,7 +285,7 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
             String url = baseurl + "sync/installorderup";
             for (Map<String, Object> row : result) {
                 Long synReqId = (Long) row.get("syn_req_id");
-                Integer gdid = (Integer) row.get("gdid");
+                String gdid = (String) row.get("gdid");
                 try {
                     Map<String, Object> paramMap = new HashMap<String, Object>();
                     paramMap.put("id", gdid);
@@ -294,13 +293,13 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
 
                     String code = jsonResult.getString("code");
                     if ("200".equals(code)) {
-                        updateSuccess(synReqId, "itf_install_batch_download_gd_rec");
+                        updateGDSuccess(gdid, "itf_install_batch_download_gd_rec");
                     } else {
-                        updateError(synReqId, "与工单系统同步失败", "itf_install_batch_download_gd_rec");
+                        updateGDError(gdid, "与工单系统同步失败", "itf_install_batch_download_gd_rec");
                     }
                 } catch (Exception ex) {
                     log.error("工单系统更新安装主表下载状态失败syn_req_id=" + synReqId, ex);
-                    updateError(synReqId, ex.getMessage(), "itf_install_batch_download_gd_rec");
+                    updateGDError(gdid, ex.getMessage(), "itf_install_batch_download_gd_rec");
                 }
             }
         } catch (Exception ex) {
@@ -314,7 +313,7 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
             String url = baseurl + "sync/repairorderup";
             for (Map<String, Object> row : result) {
                 Long synReqId = (Long) row.get("syn_req_id");
-                Integer gdid = (Integer) row.get("gdid");
+                String gdid = (String) row.get("gdid");
                 try {
                     Map<String, Object> paramMap = new HashMap<String, Object>();
                     paramMap.put("id", gdid);
@@ -322,13 +321,13 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
 
                     String code = jsonResult.getString("code");
                     if ("200".equals(code)) {
-                        updateSuccess(synReqId, "itf_repair_batch_download_gd_rec");
+                        updateGDSuccess(gdid, "itf_repair_batch_download_gd_rec");
                     } else {
                         updateError(synReqId, "与工单系统同步失败", "itf_repair_batch_download_gd_rec");
                     }
                 } catch (Exception ex) {
                     log.error("工单系统更新维修主表下载状态失败syn_req_id=" + synReqId, ex);
-                    updateError(synReqId, ex.getMessage(), "itf_repair_batch_download_gd_rec");
+                    updateGDError(gdid, ex.getMessage(), "itf_repair_batch_download_gd_rec");
                 }
             }
         } catch (Exception ex) {
@@ -342,21 +341,32 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
                 new Object[] { errorMessage, synReqId });
     }
 
+    public void updateGDError(String gdid, String errorMessage, String tabName) {
+        jdbcTemplate.update(
+                "update " + tabName + " set gree_stat_syn_status=99,gree_stat_syn_err_msg=? where gdid=?",
+                new Object[] { errorMessage, gdid });
+    }
+
     public void updateSuccess(Long synReqId, String tabName) {
         jdbcTemplate.update("update " + tabName + " set gree_stat_syn_status=1,gree_stat_syn_time=? where syn_req_id=?",
                 new Object[] { new Date(System.currentTimeMillis()), synReqId });
     }
 
+    public void updateGDSuccess(String gdid, String tabName) {
+        jdbcTemplate.update("update " + tabName + " set gree_stat_syn_status=1,gree_stat_syn_time=? where gdid=?",
+                new Object[] { new Date(System.currentTimeMillis()), gdid });
+    }
+
     public List<Map<String, Object>> getNeedUpdateTaskData(String tabName) {
         List<Map<String, Object>> result = jdbcTemplate
                 .queryForList("SELECT * from " + tabName
-                        + " where gree_stat_syn_status=0 and gdid>-1 order by syn_req_id ");
+                        + " where gree_stat_syn_status=0 order by syn_req_id ");
         return result;
     }
 
 
     private DownRepairOrderGD downloadInstallDataGD() throws Exception {
-        int id;
+        String id ="";
         DownRepairOrderGD datas = new DownRepairOrderGD();
         String url = baseurl + "sync/installorder";
         JSONObject jsonResult = HttpUtil.httpRequestGetPgidGD(url, "GET", null);
@@ -364,7 +374,7 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
         String code = jsonResult.getString("code");
         if ("200".equals(code)) {
             JSONArray data = jsonResult.getJSONArray("data");
-            id =Integer.valueOf((String)jsonResult.getString("id"));
+            id =(String)jsonResult.getString("id");
             datas.setId(id);
             datas.setData(data);
 
@@ -380,7 +390,7 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
     }
 
     private DownRepairOrderGD downloadRepairDataGD() throws Exception {
-        int id;
+        String id;
         DownRepairOrderGD datas = new DownRepairOrderGD();
         String url = baseurl + "sync/repairorder";
         JSONObject jsonResult = HttpUtil.httpRequestGetPgidGD(url, "GET", null);
@@ -388,7 +398,7 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
         String code = jsonResult.getString("code");
         if ("200".equals(code)) {
             JSONArray data = jsonResult.getJSONArray("data");
-            id =Integer.valueOf((String)jsonResult.getString("id"));
+            id =(String)jsonResult.getString("id");
             datas.setId(id);
             datas.setData(data);
 
@@ -406,9 +416,9 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
     @Transactional(rollbackFor = Exception.class)
     public void addInstallData(JSONObject mainTableData, String downloadBatchNo, String downloadTaskNo, JSONObject sheet,
                               String[] srcTabnameArray, String[] srcTabColListArray, String[] destTabNameArray,
-                              String[] destTabColListArray, String salesWebsitNumber, int id) throws Exception {
+                              String[] destTabColListArray, String salesWebsitNumber,String id) throws Exception {
         // 查看同一时间同一工单是否存在下载记录表 存在不再保存本次的同步数据
-        if (insertInstallRecData(mainTableData, downloadBatchNo, downloadTaskNo, salesWebsitNumber, id)) {
+        if (insertInstallRecData(mainTableData, downloadBatchNo, downloadTaskNo, salesWebsitNumber,id)) {
             parseInstallData(sheet, srcTabnameArray, srcTabColListArray, destTabNameArray, destTabColListArray, downloadTaskNo,
                     false, downloadBatchNo);
         }
@@ -417,7 +427,7 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
     @Transactional(rollbackFor = Exception.class)
     public void addRepairData(JSONObject mainTableData, String downloadBatchNo, String downloadTaskNo, JSONObject sheet,
                               String[] srcTabnameArray, String[] srcTabColListArray, String[] destTabNameArray,
-                              String[] destTabColListArray, String salesWebsitNumber, int id) throws Exception {
+                              String[] destTabColListArray, String salesWebsitNumber, String id) throws Exception {
         // 查看同一时间同一工单是否存在下载记录表 存在不再保存本次的同步数据
         if (insertRepairRecData(mainTableData, downloadBatchNo, downloadTaskNo, salesWebsitNumber, id)) {
             parseRepairData(sheet, srcTabnameArray, srcTabColListArray, destTabNameArray, destTabColListArray, downloadTaskNo,
@@ -426,7 +436,7 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
     }
 
     private boolean insertInstallRecData(JSONObject aData, String downloadBatchNo, String downloadTaskNo,
-                                        String salesWebsitNumber, Integer id) throws Exception {
+                                        String salesWebsitNumber, String id) throws Exception {
 
         // 查看 相同时间同一单数据
         List<Map<String, Object>> rec = isInstallDuplicate(aData);
@@ -434,17 +444,17 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
 
         boolean duplicate = (rec.size() > 0);
 
-        String sql = "insert into itf_install_batch_download_gd_rec (sales_websit_number,download_batch_no,download_task_no,"
+        String sql = "insert into itf_install_batch_download_gd_rec (gdid,sales_websit_number,download_batch_no,download_task_no,"
                 + "pgguid,created_by,created_date,last_modified_by,last_modified_date,pgid,"
                 + "extendfiled1,extendfiled2,extendfiled3,extendfiled4,extendfiled5"
-                + (duplicate ? ",gree_stat_syn_err_msg" : "") + ") values (" + "?,?,?,?,?,?,?,?,?,?,?,?,?,?"
+                + (duplicate ? ",gree_stat_syn_err_msg" : "") + ") values (" + "?,?,?,?,?,?,?,?,?,?,?,?,?,?,?"
                 + (duplicate ? ",?" : "") + ") ";
 
         // 存在 说明重复获取，不再保存数据
         if (duplicate) {
             if (!recHasNoUploadStatus(rec)) {
                 jdbcTemplate.update(sql,
-                        new Object[] { salesWebsitNumber, downloadBatchNo, downloadTaskNo, aData.getString("pgguid"),
+                        new Object[] { id,salesWebsitNumber, downloadBatchNo, downloadTaskNo, aData.getString("pgguid"),
                                 aData.getString("createdBy"), aData.getString("createdDate"),
                                 aData.getString("lastModifiedBy"), aData.getString("lastModifiedDate"),
                                 aData.getString("pgid"), aData.getString("extendfiled1"),
@@ -453,7 +463,7 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
             }
             return false;
         } else {
-            jdbcTemplate.update(sql, new Object[] { salesWebsitNumber, downloadBatchNo, downloadTaskNo,
+            jdbcTemplate.update(sql, new Object[] { id,salesWebsitNumber, downloadBatchNo, downloadTaskNo,
                     aData.getString("pgguid"), aData.getString("createdBy"), aData.getString("createdDate"),
                     aData.getString("lastModifiedBy"), aData.getString("lastModifiedDate"), aData.getString("pgid"),
                     aData.getString("extendfiled1"), aData.getString("extendfiled2"), aData.getString("extendfiled3"),
@@ -464,7 +474,7 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
     }
 
     private boolean insertRepairRecData(JSONObject aData, String downloadBatchNo, String downloadTaskNo,
-                                        String salesWebsitNumber, Integer id) throws Exception {
+                                        String salesWebsitNumber, String id) throws Exception {
 
         // 查看 相同时间同一单数据
         List<Map<String, Object>> rec = isRepairDuplicate(aData);

src/main/resources/bootstrap-dev.properties

@@ -396,5 +396,5 @@ hsgdcjtmc=FALSE
 datauploadc=FALSE
 
 #安装与维修工单从工单系统获取标识
-installflag=FALSE
-repairflag=FALSE
+installflag=TRUE
+repairflag=TRUE

src/main/resources/bootstrap-prd.properties

@@ -282,8 +282,8 @@ workercertificatec=TRUE
 workerceruploadc=TRUE
 detaildownc=TRUE
 #安装工单下载 、入本地表
-installdownc=TRUE
-installinc=TRUE
+installdownc=FALSE
+installinc=FALSE
 #维修工单下载、入本地表
 repairdownc=TRUE
 repairinc=TRUE
@@ -390,5 +390,5 @@ hsgdcjtmc=FALSE
 #工单数据向上同步
 datauploadc=TRUE
 #安装与维修工单从工单系统获取标识
-installflag=FALSE
-repairflag=FALSE
+installflag=TRUE
+repairflag=TRUE

src/main/resources/bootstrap-test.properties

@@ -288,8 +288,8 @@ workercertificatec=TRUE
 workerceruploadc=TRUE
 detaildownc=TRUE
 #安装工单下载 、入本地表
-installdownc=TRUE
-installinc=TRUE
+installdownc=FALSE
+installinc=FALSE
 #维修工单下载、入本地表
 repairdownc=TRUE
 repairinc=TRUE
@@ -396,5 +396,5 @@ hsgdcjtmc=FALSE
 #工单数据向上同步
 datauploadc=TRUE
 #安装与维修工单从工单系统获取标识
-installflag=FALSE
-repairflag=FALSE
+installflag=TRUE
+repairflag=TRUE