add

src/main/java/com/zfire/jiasm/syncdata/download/order/InstallBusiness.java

@@ -936,12 +936,6 @@ public class InstallBusiness {
             sas.add(add);
         }
         itfTblAzAssignMxDownloadService.updateBatchById(sas);
-        // 测试用
-        /*if (synReqIds.get(0).equals(190L)){
-            itfTblAzAssignMxDownloadService.updateBatchById(sas);
-        } else {
-            itfTblAzAssignMxDownloadService.saveBatch(sas);
-        }*/
     }
 
     private void upItfTblAzAssignFkmxDownload(List<Long> synReqFkMxIds) {

src/main/java/com/zfire/jiasm/syncdata/download/other/accessories/AccessoriesQuery.java

@@ -28,9 +28,9 @@ public class AccessoriesQuery {
 
     @Scheduled(fixedDelay = 1 * 5 * 1000)
     public void getInfo(){
-        /*if (1==1){
+        if (1==1){
             return;
-        }*/
+        }
 
         // 提取数据
         List<TableDataQueryTime> tdqts = tableDataQueryTimeService.lambdaQuery()

src/main/java/com/zfire/jiasm/syncdata/download/other/DataAdd.java → src/main/java/com/zfire/jiasm/syncdata/download/other/install/DataAdd.java

@@ -1,4 +1,4 @@
-package com.zfire.jiasm.syncdata.download.other;
+package com.zfire.jiasm.syncdata.download.other.install;
 
 import com.zfire.jiasm.syncdata.plus.entity.TblAddUploadList;
 import com.zfire.jiasm.syncdata.plus.service.TblAddUploadListService;

src/main/java/com/zfire/jiasm/syncdata/download/other/DataAddFeedback.java → src/main/java/com/zfire/jiasm/syncdata/download/other/install/DataAddFeedback.java

@@ -1,4 +1,4 @@
-package com.zfire.jiasm.syncdata.download.other;
+package com.zfire.jiasm.syncdata.download.other.install;
 
 import com.zfire.jiasm.syncdata.plus.entity.TblAddUploadList;
 import com.zfire.jiasm.syncdata.plus.service.TblAddUploadListService;

src/main/java/com/zfire/jiasm/syncdata/download/other/QueryDataDown.java → src/main/java/com/zfire/jiasm/syncdata/download/other/install/QueryDataDown.java

@@ -1,4 +1,4 @@
-package com.zfire.jiasm.syncdata.download.other;
+package com.zfire.jiasm.syncdata.download.other.install;
 
 import com.zfire.jiasm.syncdata.plus.entity.TableDataQueryTime;
 import com.zfire.jiasm.syncdata.plus.service.TableDataQueryTimeService;

src/main/java/com/zfire/jiasm/syncdata/download/other/QueryDataUpload.java → src/main/java/com/zfire/jiasm/syncdata/download/other/install/QueryDataUpload.java

@@ -1,4 +1,4 @@
-package com.zfire.jiasm.syncdata.download.other;
+package com.zfire.jiasm.syncdata.download.other.install;
 
 import com.zfire.jiasm.syncdata.plus.entity.TblAzwgmxUpload;
 import com.zfire.jiasm.syncdata.plus.service.TblAzwgmxUploadService;

src/main/java/com/zfire/jiasm/syncdata/download/other/refunds/Message.java

@@ -28,10 +28,9 @@ public class Message {
 
     @Scheduled(fixedDelay = 1 * 5 * 1000)
     public void getMessage(){
-        /*if (1==1){
+        if (1==1){
             return;
         }
-*/
         // 提取数据
         List<TableDataQueryTime> tdqts = tableDataQueryTimeService.lambdaQuery()
                 .eq(TableDataQueryTime::getType,6)

src/main/java/com/zfire/jiasm/syncdata/download/other/RepairSettlement.java → src/main/java/com/zfire/jiasm/syncdata/download/other/repair/RepairSettlement.java

@@ -1,4 +1,4 @@
-package com.zfire.jiasm.syncdata.download.other;
+package com.zfire.jiasm.syncdata.download.other.repair;
 
 import com.zfire.jiasm.syncdata.plus.entity.TblAddUploadList;
 import com.zfire.jiasm.syncdata.plus.service.TblAddUploadListService;

src/main/java/com/zfire/jiasm/syncdata/download/other/RepairSettlementStatus.java → src/main/java/com/zfire/jiasm/syncdata/download/other/repair/RepairSettlementStatus.java

@@ -1,4 +1,4 @@
-package com.zfire.jiasm.syncdata.download.other;
+package com.zfire.jiasm.syncdata.download.other.repair;
 
 import com.zfire.jiasm.syncdata.plus.entity.SyncQuerySettlementStatus;
 import com.zfire.jiasm.syncdata.plus.service.SyncQuerySettlementStatusService;

src/main/java/com/zfire/jiasm/syncdata/plus/entity/AdminUser.java

@@ -142,6 +142,12 @@ public class AdminUser extends Model<AdminUser> {
     @ApiModelProperty(value = "是否绑定供应链帐号 YES=是 NO=否")
     private String bindSupply;
 
+    @ApiModelProperty(value = "联通云呼integratedid")
+    private String unicomIntegratedId;
+
+    @ApiModelProperty(value = "联通云呼ExtenType（支持三种方式Local（直线方式），sip（软电话），gateway（语音网关/IP话机））")
+    private String unicomIntegratedType;
+
 
     @Override
     protected Serializable pkVal() {

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

@@ -28,11 +28,6 @@ public class AccessoriesBO  implements Serializable {
     private String yjpjbm;
 
     /**
-     * 上一次查询时间
-     */
-    @ApiModelProperty(value = "上一次查询时间")
-    private String startTime;
-    /**
      * 页数
      */
     @ApiModelProperty(value = "页数")

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

@@ -97,7 +97,12 @@ public class OtherDownServiceImpl implements OtherDownService {
     TblAzWgmxJyktSpecialUploadService tblAzWgmxJyktSpecialUploadService;
     @Resource
     JdMessageDownloadService jdMessageDownloadService;
-
+    @Resource
+    GreeMessageDownloadService greeMessageDownloadService;
+    @Resource
+    GreeShortMessageReplyDownloadService greeShortMessageReplyDownloadService;
+    @Resource
+    AccessoriesQueryDownloadService accessoriesQueryDownloadService;
 
 
     private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -241,13 +246,18 @@ public class OtherDownServiceImpl implements OtherDownService {
 
     @Override
     public void detailMessage(TableDataQueryTime item) throws Exception {
-        List<TblRefundsDownload> ads = new ArrayList<>();
-        getMessageData(item, ads);
+        List<GreeMessageDownload> ads = new ArrayList<>();
+        List<GreeShortMessageReplyDownload> shorts = new ArrayList<>();
+        getMessageData(item, ads,shorts);
         // 获取到数据
         if (ads.size()>0) {
-            // tblRefundsDownloadService.saveOrUpdateBatch(ads);
+            greeMessageDownloadService.saveOrUpdateBatch(ads);
             ads.clear();
         }
+        if (shorts.size()>0) {
+            greeShortMessageReplyDownloadService.saveOrUpdateBatch(shorts);
+            shorts.clear();
+        }
         synSuccessTableDataQueryTimeT(item);
     }
 
@@ -297,7 +307,7 @@ public class OtherDownServiceImpl implements OtherDownService {
         int size=100;
         int total=0;
         int oldtotal=0;
-        List<TblRefundsDownload> ads = new ArrayList<>();
+        List<AccessoriesQueryDownload> ads = new ArrayList<>();
         Date synTime = new Date();
 
         do {
@@ -310,7 +320,7 @@ public class OtherDownServiceImpl implements OtherDownService {
             }
             // 获取到数据
             if (ads.size()>0){
-                // tblRefundsDownloadService.saveOrUpdateBatch(ads);
+                accessoriesQueryDownloadService.saveOrUpdateBatch(ads);
                 ads.clear();
                 // 所剩记录数
                 total = total - oldtotal;
@@ -1258,13 +1268,10 @@ public class OtherDownServiceImpl implements OtherDownService {
     }
 
     private int getAccessoriesData(int page, int size, TableDataQueryTime item,
-                               List<TblRefundsDownload> ads) throws Exception {
+                               List<AccessoriesQueryDownload> ads) throws Exception {
         int total=0;
         AccessoriesBO req = new AccessoriesBO();
         req.setClientId(clientid);
-        if (item.getSynReqTime() !=null){
-            req.setStartTime(sdf.format(item.getSynReqTime()));
-        }
         req.setPageNum(page);
         req.setSize(size);
 
@@ -1273,11 +1280,11 @@ public class OtherDownServiceImpl implements OtherDownService {
         log.info("response: {}",JSONObject.toJSONString(response));
         if (response.getStatusCode() == 200){
             total =response.getTotal();
-            /*JSONArray datas = (JSONArray)JSONArray.parse(response.getData().toString());
+            JSONArray datas = (JSONArray)JSONArray.parse(response.getData().toString());
             for (int i = 0; i < datas.size(); i++) {
-                TblRefundsDownload add = JSONObject.parseObject(datas.getJSONObject(i).toString(), TblRefundsDownload.class);
+                AccessoriesQueryDownload add = JSONObject.parseObject(datas.getJSONObject(i).toString(), AccessoriesQueryDownload.class);
                 ads.add(add);
-            }*/
+            }
             return total;
         }
         // 同步失败
@@ -1312,22 +1319,31 @@ public class OtherDownServiceImpl implements OtherDownService {
     }
 
 
-    private void getMessageData(TableDataQueryTime item, List<TblRefundsDownload> ads) throws Exception {
+    private void getMessageData(TableDataQueryTime item, List<GreeMessageDownload> ads,
+                                List<GreeShortMessageReplyDownload> shorts) throws Exception {
         MessageBO req = new MessageBO();
-        req.setAzorwx(0);
-        req.setPgid("123");
-        req.setPhone("13711477891");
+        req.setAzorwx(1);
+        req.setPgid("20210521162706142");
+        req.setPhone("18970944263");
 
         log.info("request: {}",JSONObject.toJSONString(req));
         GreeResponseHelperOther response = HttpUtil.httpGetInfo(String.format(item.getUrl(), String.valueOf(req.getAzorwx()),req.getPgid(),req.getPhone()),greeLogic.greeGetT());
 
         log.info("response: {}",JSONObject.toJSONString(response));
         if (response.getStatusCode() == 200){
-             /*JSONArray datas = (JSONArray)JSONArray.parse(response.getData().toString());
+             JSONArray datas = (JSONArray)JSONArray.parse(response.getData().toString());
             for (int i = 0; i < datas.size(); i++) {
-                TblRefundsDownload add = JSONObject.parseObject(datas.getJSONObject(i).toString(), TblRefundsDownload.class);
+                GreeMessageDownload add = JSONObject.parseObject(datas.getJSONObject(i).toString(), GreeMessageDownload.class);
                 ads.add(add);
-            }*/
+                String ls = JSONObject.parseObject(datas.getJSONObject(i).toString()).get("rerunContentList").toString();
+                JSONArray ds = (JSONArray)JSONArray.parse(ls);
+                for (int j = 0; j < ds.size(); j++){
+                    GreeShortMessageReplyDownload ad = JSONObject.parseObject(ds.getJSONObject(j).toString(), GreeShortMessageReplyDownload.class);
+                    ad.setPgid(add.getPgid());
+                    shorts.add(ad);
+                }
+            }
+            return ;
         }
         // 同步失败
         synErrorTableDataQueryTime(item, response);