智能分析平台备份

src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleReportController.java

@@ -165,12 +165,11 @@ public class QualityRuleReportController {
             @RequestParam(value = "reportSumStartTime") String reportSumStartTime,
             @RequestParam(value = "reportSumEndTime") String reportSumEndTime,
             HttpServletResponse response) throws ParseException{
-        SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-        SimpleDateFormat sdf= new SimpleDateFormat("MMM d, yyyy K:m:s a", Locale.ENGLISH);
         Long province = Long.parseLong(provinceId);
         Long kpi = Long.parseLong(kpiId);
-        Timestamp startTime = Timestamp.valueOf(sd.format(sdf.parse(reportSumStartTime)));
-        Timestamp endTime =Timestamp.valueOf(sd.format(sdf.parse(reportSumEndTime)));
+        Timestamp startTime = Timestamp.valueOf(reportSumStartTime);
+        System.out.println(startTime);
+        Timestamp endTime =Timestamp.valueOf(reportSumEndTime);
         List<QualityRuleInfo> qualityRuleInfo = (List<QualityRuleInfo>) qualityRuleInfoService.findBy(province,kpi,startTime,endTime);
         cmszOperationLogService.createLog("查询","数据质量规则运营","查询数据质量规则运营明细");
         Gson gson = new Gson();

src/main/webapp/WEB-INF/views/AnalysisSupport/RuleOperationTable.jsp

@@ -21,7 +21,7 @@
         <th width="6.4%">告警类型</th>
         <th width="6.4%">指标监控时间</th>
         <th width="6.4%">指标业务时间</th>
-        <th width="6.4%">是否过滤</th>
+        <%--<th width="6.4%">是否过滤</th>--%>
     </tr>
     </thead>
     <tbody>
@@ -38,10 +38,10 @@
             <td>${qualityRuleInfo.warningType}</td>
             <td>${qualityRuleInfo.kpiMonitorRunTime}</td>
             <td>${qualityRuleInfo.businessTime}</td>
-            <td>
-                <c:if test="${qualityRuleInfo.ifFilter == '0'}">未过滤</c:if>
-                <c:if test="${qualityRuleInfo.ifFilter == '1'}">已过滤</c:if>
-            </td>
+            <%--<td>--%>
+                <%--<c:if test="${qualityRuleInfo.ifFilter == '0'}">未过滤</c:if>--%>
+                <%--<c:if test="${qualityRuleInfo.ifFilter == '1'}">已过滤</c:if>--%>
+            <%--</td>--%>
         </tr>
     </c:forEach>
     </tbody>

src/main/webapp/static/js/ruleReportDetailTable.js

@@ -331,6 +331,7 @@ table_pagging.prototype = {
                                 }
 
                                 if(k==1){
+                                    console.log(this.objectlist[i])
                                     tdContext = "<a href='javascript:;' onclick='selectOperation(\""+this.getData(this.objectlist[i],"provinceId")+"\",\""+this.getData(this.objectlist[i],"kpiId")+"\",\""+this.getData(this.objectlist[i],"reportSumStartTime")+"\",\""+this.getData(this.objectlist[i],"reportSumEndTime")+"\")'>"+this.getData(this.objectlist[i],this.header[k][1])+"</a>";
                                 }
 
@@ -529,7 +530,7 @@ table_pagging.prototype = {
         alert(this.tablename);
     }
 
-}
+};
 //查看数据质量运营
 function selectOperation(provinceId,kpiId,reportSumStartTime,reportSumEndTime){
     $.dialog({
@@ -543,7 +544,7 @@ function selectOperation(provinceId,kpiId,reportSumStartTime,reportSumEndTime){
             $.ajax({
                 type : 'GET',
                 contentType : 'application/json',
-                url: "/AnalysisSupport/QualityRuleReport/findOperation?provinceId="+provinceId+"&kpiId="+kpiId+"&reportSumStartTime="+reportSumStartTime+"&reportSumEndTime="+reportSumEndTime,
+                url: "/AnalysisSupport/QualityRuleReport/findOperation?provinceId="+provinceId+"&kpiId="+kpiId+"&reportSumStartTime="+df.format(new Date(reportSumStartTime))+"&reportSumEndTime="+df.format(new Date(reportSumStartTime)),
                 dataType : 'text',
                 beforeSend: function(data) {
                 },