Merge remote-tracking branch 'origin/liuna'

src/main/java/com/hp/cmsz/entity/QualityRuleOperationDetail.java

@@ -18,7 +18,7 @@ public class QualityRuleOperationDetail {
     private Long channelId;
     private Long dataSourceId;
     private Long provinceId;
-    private Long qualityVerificationResultId;
+    //private Long qualityVerificationResultId;
     private Timestamp kpiMonitorRunTime;
     private Timestamp businessTime;
     private String kpiName;
@@ -82,13 +82,13 @@ public class QualityRuleOperationDetail {
     }
     @Id
     @GeneratedValue(strategy= GenerationType.IDENTITY)
-    public Long getQualityVerificationResultId() {
-        return qualityVerificationResultId;
-    }
-
-    public void setQualityVerificationResultId(Long qualityVerificationResultId) {
-        this.qualityVerificationResultId = qualityVerificationResultId;
-    }
+//    public Long getQualityVerificationResultId() {
+//        return qualityVerificationResultId;
+//    }
+//
+//    public void setQualityVerificationResultId(Long qualityVerificationResultId) {
+//        this.qualityVerificationResultId = qualityVerificationResultId;
+//    }
 
     public Timestamp getKpiMonitorRunTime() {
         return kpiMonitorRunTime;

src/main/java/com/hp/cmsz/repository/QualityRuleReportInfoDao.java

+package com.hp.cmsz.repository;
+
+import com.hp.cmsz.entity.QualityRuleOperationDetail;
+import com.hp.cmsz.entity.QualityRuleReport;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import java.sql.Timestamp;
+import java.util.List;
+
+public interface QualityRuleReportInfoDao extends JpaSpecificationExecutor<QualityRuleOperationDetail>,
+        PagingAndSortingRepository<QualityRuleOperationDetail, Long> {
+    List<QualityRuleOperationDetail> findByProvinceIdAndKpiIdAndBusinessTimeBetweenOrderByBusinessTimeDescProvinceIdDescWarningNumAsc(Long provinceId, Long kpiId, Timestamp startTime, Timestamp endTime);
+}

src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleReportInfoService.java

+package com.hp.cmsz.service.analysissupport;
+
+import com.hp.cmsz.entity.QualityRuleOperationDetail;
+import com.hp.cmsz.entity.QualityRuleReport;
+import com.hp.cmsz.repository.QualityRuleReportInfoDao;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.sql.Timestamp;
+import java.util.List;
+
+@Service
+@Transactional
+public class QualityRuleReportInfoService {
+    @Autowired
+    private QualityRuleReportInfoDao qualityRuleReportInfoDao;
+
+    public List<QualityRuleOperationDetail> findBy(Long provinceId, Long kpiId, Timestamp startTime, Timestamp endTime){
+        return qualityRuleReportInfoDao.findByProvinceIdAndKpiIdAndBusinessTimeBetweenOrderByBusinessTimeDescProvinceIdDescWarningNumAsc(provinceId,kpiId,startTime,endTime);
+    }
+}

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

@@ -5,10 +5,12 @@ import com.hp.cmsz.entity.*;
 import com.hp.cmsz.repository.DataSourceDao;
 import com.hp.cmsz.repository.KpiDao;
 import com.hp.cmsz.repository.ProvinceDao;
+import com.hp.cmsz.repository.QualityRuleReportInfoDao;
 import com.hp.cmsz.service.BusinessService;
 import com.hp.cmsz.service.ChannelService;
 import com.hp.cmsz.service.CmszOperationLogService;
 import com.hp.cmsz.service.analysissupport.QualityRuleInfoService;
+import com.hp.cmsz.service.analysissupport.QualityRuleReportInfoService;
 import com.hp.cmsz.service.analysissupport.QualityRuleReportService;
 import com.hp.cmsz.web.PageURLController;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,6 +62,9 @@ public class QualityRuleReportController {
     private QualityRuleInfoService qualityRuleInfoService;
 
     @Autowired
+    private QualityRuleReportInfoService qualityRuleReportInfoService;
+
+    @Autowired
     private CmszOperationLogService cmszOperationLogService;
 
     @RequestMapping(value = "")
@@ -169,7 +174,7 @@ public class QualityRuleReportController {
         Long kpi = Long.parseLong(kpiId);
         Timestamp startTime = Timestamp.valueOf(reportSumStartTime);
         Timestamp endTime =Timestamp.valueOf(reportSumEndTime);
-        List<QualityRuleReport> qualityRuleReportList = qualityRuleInfoService.findBy(province,kpi,startTime,endTime);
+        List<QualityRuleOperationDetail> qualityRuleReportList = qualityRuleReportInfoService.findBy(province,kpi,startTime,endTime);
         cmszOperationLogService.createLog("查询","数据质量规则运营","查询数据质量运营明细");
         Gson gson = new Gson();
         response.setContentType("text/Xml;charset=gbk");