IM需求提交

house365-hgs-web/src/main/java/com/house365/web/controller/CloudActivityController.java

@@ -101,6 +101,7 @@ public class CloudActivityController extends BaseController {
 
     /**
      * 云迹主动拉取数据列表
+     *
      * @param number
      * @param model
      * @param request
@@ -601,6 +602,7 @@ public class CloudActivityController extends BaseController {
                 completePercent = "100";
                 protect = redisUtil.hasKey("cloud:protect:" + activeId) ? redisUtil.getIntegerByKey("cloud:protect:" + activeId) : 0;
                 done = redisUtil.hasKey("cloud:done:" + activeId) ? redisUtil.getIntegerByKey("cloud:done:" + activeId) : 0;
+                System.out.println("activeId===" + activeId + "---protect---" + protect + "----done-----" + done);
             } else {
                 int totalNum = Integer.parseInt(total);
                 int percent = new BigDecimal(completed).divide(new BigDecimal(totalNum), 2,

house365-hgs-web/src/main/webapp/WEB-INF/views/cloudactivity/pages/addcloud.jsp

@@ -148,7 +148,7 @@
                                     清空
                                 </a>
                             </div>
-                            <div style="margin-left: 180px;">报名时间与访问时间至少选一个。由于CRM限制，访问时间暂时仅限近10天</div>
+                            <div style="margin-left: 180px;">由于CRM限制，访问时间暂时仅限近30天</div>
                         </div>
                     </div>
 
@@ -214,6 +214,11 @@
     }
 
     function doImport() {
+        var total = $("#total").val();
+        if(total == 0){
+            alert("没有数据，请重新查询");
+            return false;
+        }
         $("#loadingDialog").dialog({
             dialogClass: "no-close",
             autoOpen: false,
@@ -344,7 +349,7 @@
                 alert("请填写浏览项目");
                 return;
             }
-            var date = new Date(new Date().getTime() - (3000 * 60 * 60 * 24 * 30));
+            var date = new Date(new Date().getTime() - (1000 * 60 * 60 * 24 * 30));
             var seperator = "-";
             var year = date.getFullYear();
             var month = date.getMonth() + 1;
@@ -362,6 +367,7 @@
                 return;
             }
         }
+
         if ($("#totalPriceMin").val() && !$("#totalPriceMax").val()) {
             alert("请填写完整总价范围");
             return;

house365-hgs-ws/src/main/java/com/house365/ws/interfaces/impl/CloudActivityImpl.java

@@ -448,7 +448,7 @@ public class CloudActivityImpl implements ICloudActivityInterface {
                             decreaseKey(activeId);
                             redisUtil.addKeyVal("cloud:process:" + activeId, "1");
                         }
-                        System.out.println("cloudPull : " + activeId + "--------count1---------" + count1 + " ---------count2--------" + count2);
+                        System.out.println("cloudPull数目 : " + activeId + "--------count1---------" + count1 + " ---------count2--------" + count2);
                     }
 
                     //更新云迹活动字段