Merge branch 'zhaoyue-dev4' into 'master'

Zhaoyue dev4



See merge request !7

 git add --all src/*
 git add --all src/*
 git add push.sh
 git add push.sh
 git add pom.xml
 git add pom.xml
-git commit -m "Fix names"
-git push origin zhaoyue-dev3
+git commit -m "Fix little points"
+git push origin zhaoyue-dev4
 git status
 git status

@@ -50,13 +50,8 @@ public interface Constants {
     public static final int LOWER = 1;
     public static final int LOWER = 1;
     public static final int HIGHER = 2;
     public static final int HIGHER = 2;
 
 
-    public static final int STATUS_BAD = 0;
-    public static final boolean STATUS_BAD2 = false;
-    public static final Byte STATUS_BAD3 = 0;
-
     public static final int STATUS_OK = 1;
     public static final int STATUS_OK = 1;
-    public static final boolean STATUS_OK2= true;
-    public static final Byte STATUS_OK3= 1;
+    public static final boolean STATUS_OK2 = true;
 
 
 
 
 }
 }

@@ -9,7 +9,7 @@ import  com.xkl.domain.XklAmpReportEntity;
  * @see XklAmpReportEntity
  * @see XklAmpReportEntity
  */
  */
 public interface ReportRepository extends CrudRepository<XklAmpReportEntity, Long> {
 public interface ReportRepository extends CrudRepository<XklAmpReportEntity, Long> {
-    public XklAmpReportEntity findByMd5AndStatus(String md5, Byte status);
+    public XklAmpReportEntity findByMd5AndStatus(String md5, int status);
 
 
     public XklAmpReportEntity findById(long id);
     public XklAmpReportEntity findById(long id);
 
 

@@ -61,7 +61,7 @@ public class ReportService implements IReportService {
         /*
         /*
          * 如果已经处理过的报告，不再进行处理。
          * 如果已经处理过的报告，不再进行处理。
          */
          */
-        XklAmpReportEntity report = reportRepository.findByMd5AndStatus(reportMd5, Constants.STATUS_OK3);
+        XklAmpReportEntity report = reportRepository.findByMd5AndStatus(reportMd5, Constants.STATUS_OK);
         if (report != null && report.getStatus() > 0) {
         if (report != null && report.getStatus() > 0) {
             // 返回，报告已存在。
             // 返回，报告已存在。
             return new ResponseEntity<>(ResultModel.ok(new ReportIdModel(report.getId())), HttpStatus.OK);
             return new ResponseEntity<>(ResultModel.ok(new ReportIdModel(report.getId())), HttpStatus.OK);