解析更改

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

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.crypto.Data;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -94,7 +95,6 @@ public class LogApi {
      @RequestMapping("selectAnalysisData")
      public List<Map<String,Object>> selectAnalysisData(@RequestParam("uploadDate")String uploadDate){
          List<Map<String,Object>> resultList = logService.selectAnalysisData(replaceDate(uploadDate));
-
          return resultList;
      }
 
@@ -110,6 +110,21 @@ public class LogApi {
          logService.changeCardType(printDate,fileId);
          SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
          logService.insertAnalysisDate(df.format(new Date()),fileId);
+         //查询XML文件信息
+         List<Map<String,Object>> resultList = logService.selectFileIdByUploadDate(printDate);
+         //查询Excel文件信息
+         Map<String, Object> resultMap = logService.selectFileNameDic(fileId);
+         List<Map<String,Object>> result = new ArrayList<>();
+         for (int i=0; i<resultList.size();i++){
+           String fileName= (String) resultList.get(i).get("FILE_NAME");
+             //查询证件类型计数
+           Map<String,Object>countMap=  logService.selectCountByCardType((String) resultList.get(i).get("ID"));
+           resultMap.put("fileName",fileName);
+           resultMap.put("commonCount",countMap.get("pusum"));
+           resultMap.put("postCount",countMap.get("yousum"));
+           result.set(i,resultMap);
+             logService.insertIntoAnalysis(fileId,fileName,String.valueOf(countMap.get("common")),String.valueOf(countMap.get("post")));
+         }
          return true;
      }
 

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

@@ -342,11 +342,7 @@ public class TaskListApi {
                     specialCardEntity.setTaskId(taskEntity.getTaskId());
                     specialCardService.saveSpecialCard(specialCardEntity);
                 }
-
-
             }
-
-
         }
         Map<String,Object> map = new LinkedHashMap<>();
         map.put("msg","成功添加快证任务单");

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

@@ -12,7 +12,6 @@ import java.util.Map;
 public interface LogMapper {
 
 
-
     @Select("select file_name_dic.upload_date,file_name_dic.FILE_NAME,file_name_dic.FILE_ID,count(*) as count,\n" +
             "file_name_dic.FORM_START_TIME,file_name_dic.FORM_DEADLINE\n" +
             "from file_name_dic \n" +
@@ -22,6 +21,7 @@ public interface LogMapper {
     public List<Map<String,Object>> selectAnalysisData(@Param("uploadDate") String uploadDate);
 
 
+
     //TODO XML的时间+post的file_id
     @Update("UPDATE PREPRO_PERSON SET CARD_TYPE_ID =9 \n" +
             "WHERE JMSFZSLH in (\n" +
@@ -37,6 +37,9 @@ public interface LogMapper {
     @Update(" update FILE_NAME_DIC set  FILE_NAME_DIC.ANALYSIS_DATE = to_date(#{printDate},'yyyy-mm-dd hh24:mi:ss') where  file_id=#{fileId} ")
     public boolean insertAnalysisDate(@Param("printDate")String printDate,@Param("fileId")String fileId);
 
+    @Insert("INSERT INTO ANALYSIS (FILE_DIC_ID,FILE_ID,COMMON_CARD_COUNT,POST_CARD_COUNT) VALUES (#{fileDic},#{fileId},#{commonCardCount},#{postCardCount})")
+    public boolean insertIntoAnalysis(@Param("fileDic")String fileDic,@Param("fileId")String fileId,@Param("commonCardCount")String commonCardCount,@Param("postCardCount")String postCardCount);
+
 
     @Select("<script> " +
             "SELECT * FROM " +
@@ -143,6 +146,19 @@ public interface LogMapper {
     @Delete("delete from files where id=#{id}")
     public boolean deleteFile(@Param("id")String id);
 
+    @Select("select SOURCE_FILE_NAME,id,RECORD_NUMBER from files where to_char(UPLOAD_DATE,'yyyy-mm-dd hh24:mi:ss')=#{uploadDate}")
+    public List<Map<String,Object>> selectFileIdByUploadDate(@Param("uploadDate")String uploadDate);
+
+    @Select("select FORM_START_TIME,FORM_DEADLINE,FILE_NAME,ANALYSIS_DATE")
+    public Map<String,Object> selectFileNameDic(@Param("fileId")String fileId);
+
+    @Select("select  sum(pu) pusum,sum(you) yousum from (select decode(CARD_TYPE_ID,0,l,0) pu,decode(CARD_TYPE_ID,9,l,0) you from (select count(CARD_TYPE_ID) as l,CARD_TYPE_ID from PREPRO_PERSON where file_id =#{fileId} group by CARD_TYPE_ID))\n ")
+    public Map<String,Object> selectCountByCardType(@Param("fileId")String fileId);
+
+
+
+
+
 
 
 

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

@@ -30,4 +30,12 @@ public interface LogService {
     public boolean deleteFile(@Param("id")String id);
 
     public List<String> selectId(@Param("uploadTime")String uploadTime);
+
+    public boolean insertIntoAnalysis(@Param("fileDic")String fileDic,@Param("fileId")String fileId,@Param("commonCardCount")String commonCardCount,@Param("postCardCount")String postCardCount);
+
+    public List<Map<String,Object>> selectFileIdByUploadDate(@Param("uploadDate")String uploadDate);
+
+    public Map<String,Object> selectFileNameDic(@Param("fileId")String fileId);
+
+    public Map<String,Object> selectCountByCardType(@Param("fileId")String fileName);
 }

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

@@ -43,7 +43,6 @@ public class ImportXmlServiceImpl implements ImportXmlService {
     @Override
     public List<CountDataEntity> queryPersonXml(String importDate, long maxNum, long minNum) {
         return filesMapper.selectFiles(importDate,maxNum,minNum);
-//        return null;
     }
 
     @Override

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

@@ -3,6 +3,7 @@ package com.yxproject.start.service.impl;
 import com.yxproject.start.entity.CountyDicEntity;
 import com.yxproject.start.mapper.LogMapper;
 import com.yxproject.start.service.LogService;
+import com.yxproject.start.service.SelectSerialNumberService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -79,4 +80,28 @@ public class LogServiceImpl implements LogService {
        List<String> id= logMapper.selectId(uploadTime);
         return id;
     }
+
+    @Override
+    public boolean insertIntoAnalysis(String fileDic, String fileId, String commonCardCount, String postCardCount) {
+        logMapper.insertIntoAnalysis(fileDic,fileId,commonCardCount,postCardCount);
+        return true;
+    }
+
+    @Override
+    public List<Map<String,Object>> selectFileIdByUploadDate(String uploadDate) {
+        List<Map<String,Object>> result= logMapper.selectFileIdByUploadDate(uploadDate);
+        return result;
+    }
+
+    @Override
+    public Map<String, Object> selectFileNameDic(String fileId) {
+        Map<String, Object> resultMap = logMapper.selectFileNameDic(fileId);
+        return resultMap;
+    }
+
+    @Override
+    public Map<String, Object> selectCountByCardType(String fileName) {
+       Map<String,Object> result= logMapper.selectCountByCardType(fileName);
+        return result;
+    }
 }