解析更改

src/main/java/com/yxproject/start/api/LogApi.java

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.crypto.Data;
+import java.io.FileOutputStream;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;

src/main/java/com/yxproject/start/mapper/LogMapper.java

@@ -45,16 +45,12 @@ public interface LogMapper {
             "SELECT * FROM " +
             "( " +
             "SELECT A.*, ROWNUM RN " +
-            "FROM (SELECT FILES.SOURCE_FILE_NAME,FILE_NAME_DIC.FORM_START_TIME," +
-            "FILE_NAME_DIC.FORM_DEADLINE,FILE_NAME_DIC.FILE_NAME," +
-            "FILE_NAME_DIC.ANALYSIS_DATE,FILES.RECORD_NUMBER ," +
-            "SUM(DECOdE(CARD_TYPE_ID,9,1,0)) youcount," +
-            "SUM(DECOdE(CARD_TYPE_ID,0,1,0)) PUcount " +
-            "FROM FILE_NAME_DIC " +
-            "LEFT JOIN PERSON_POST ON FILE_NAME_DIC.FILE_ID=PERSON_POST.FILE_ID " +
-            " LEFT JOIN ANALYSIS ON FILE_NAME_DIC.FILE_ID=ANALYSIS.FILE_DIC_ID "+
-            " LEFT JOIN FILES ON ANALYSIS.FILE_ID = FILES.ID " +
-            "left join PREPRO_PERSON on PREPRO_PERSON.FILE_ID = FILES.SOURCE_FILE_NAME " +
+            "FROM (SELECT FILES.SOURCE_FILE_NAME,ANALYSIS.COMMON_CARD_COUNT,ANALYSIS.POST_CARD_COUNT, "+
+            "FILE_NAME_DIC.FORM_START_TIME,FILE_NAME_DIC.FORM_DEADLINE,FILE_NAME_DIC.FILE_NAME,FILE_NAME_DIC.ANALYSIS_DATE, "+
+            "FILES.RECORD_NUMBER "+
+            "FROM ANALYSIS " +
+            "LEFT JOIN FILES ON FILES.ID=ANALYSIS.FILE_ID " +
+            " LEFT JOIN FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID = ANALYSIS.FILE_DIC_ID "+
             "WHERE  1=1" +
             "<if test='fileName !=\"\"' >" +
             " and FILE_NAME_DIC.FILE_NAME=#{fileName} " +
@@ -62,9 +58,6 @@ public interface LogMapper {
             "<if test='analysisDate !=\"\"' >" +
             "AND subStr(FILE_NAME_DIC.ANALYSIS_DATE,0,8) =subStr( #{analysisDate},0,8) " +
             "</if>" +
-            "group by FILES.SOURCE_FILE_NAME, FILE_NAME_DIC.FORM_START_TIME, " +
-            "FILE_NAME_DIC.FORM_DEADLINE, FILE_NAME_DIC.FILE_NAME, " +
-            "FILE_NAME_DIC.ANALYSIS_DATE, FILES.RECORD_NUMBER" +
             ")" +
             "A" +
             ")" +
@@ -72,6 +65,10 @@ public interface LogMapper {
             "</script>")
     public List<Map<String,Object>> selectAnalysisLog(@Param("fileName")String fileName,@Param("analysisDate")String analysisDate,@Param("begin")long begin,@Param("end")long end);
 
+
+    @Select("select files.id from files where files.SOURCE_FILE_NAME = #{fileName}")
+    public String selectByFileName(@Param("fileName")String fileName);
+
     @Select("<script> " +
             "SELECT * FROM " +
             "            ( " +

src/main/java/com/yxproject/start/service/LogService.java

@@ -38,4 +38,6 @@ public interface LogService {
     public Map<String,Object> selectFileNameDic(@Param("fileId")String fileId);
 
     public Map<String,Object> selectCountByCardType(@Param("fileId")String fileName);
+
+    public String selectByFileName(@Param("fileName")String fileName);
 }

src/main/java/com/yxproject/start/service/impl/LogServiceImpl.java

@@ -104,4 +104,10 @@ public class LogServiceImpl implements LogService {
        Map<String,Object> result= logMapper.selectCountByCardType(fileName);
         return result;
     }
+
+    @Override
+    public String selectByFileName(String fileName) {
+        String fileId= logMapper.selectByFileName(fileName);
+        return fileId;
+    }
 }