提交修改

.gitignore

@@ -31,3 +31,4 @@ build/
 
 ### VS Code ###
 .vscode/
+/src/main/resources/static/

src/main/java/ieven/server/webapp/api/DataController.java

@@ -18,21 +18,9 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/data")
 public class DataController {
-
-    @Autowired
-    private DataRepository dataRepository;
     @Autowired
     private DataService dataService;
 
-    @PostMapping("save")
-    public DataMap saveOne() {
-        DataMap dataMap = new DataMap();
-        dataMap.put("test", 1);
-        dataMap = dataRepository.save(dataMap);
-        dataMap.formId();
-        return dataMap;
-    }
-
     @PostMapping("/viewDataByFileId")
     public Mapped viewByFileId(@RequestBody ViewInput viewInput) {
         return dataService.viewDataByFileId(viewInput);

src/main/java/ieven/server/webapp/domain/alipay/AlipayService.java

@@ -59,6 +59,9 @@ public class AlipayService {
 
     public Mapped extractPersonInfo(ModelIdInput modelIdInput) {
         String modelId = modelIdInput.getModelId();
+        if (modelId == null) {
+            return Mapped.ERROR("没有选择模型!");
+        }
         //插入文件
         LogicalFile logicalFile = createNewLogicalFile(modelId, FNAME_PERSONINFO);
         String fileId = logicalFile.getId();
@@ -142,6 +145,10 @@ public class AlipayService {
         }
     }
 
+    private void readFieldBankCard() {
+
+    }
+
     /**
      * 创建新的逻辑表,只包含表头
      */
@@ -158,7 +165,7 @@ public class AlipayService {
 
     @Async
     public void saveLines(List<DataMap> documentList) {
-        mongoTemplate.insert(documentList,DataMap.class);
+        mongoTemplate.insert(documentList, DataMap.class);
     }
 
 }

src/main/java/ieven/server/webapp/domain/common/HeaderModifier.java

@@ -0,0 +1,4 @@
+package ieven.server.webapp.domain.common;
+
+public class HeaderModifier {
+}

src/main/java/ieven/server/webapp/domain/common/TableHeaders.java

@@ -0,0 +1,11 @@
+package ieven.server.webapp.domain.common;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 固定的表头
+ */
+public class TableHeaders {
+    public final static List<String> FIELD_LIST_REGISTER = Arrays.asList("用户ID", "登录邮箱", "登录手机", "账户名称", "证件类型", "证件号", "可用余额", "绑定手机", "绑定银行卡", "对应的协查数据");
+}

src/main/java/ieven/server/webapp/domain/common/TableType.java

@@ -0,0 +1,7 @@
+package ieven.server.webapp.domain.common;
+
+//表类型
+public class TableType {
+    //支付宝注册信息原表
+    public final static int ALIPAY_ORIGIN_REGISTER = 1;
+}

src/main/java/ieven/server/webapp/domain/file/FileListInput.java

@@ -7,4 +7,5 @@ public class FileListInput {
     private String modelId;
     private int page;
     private int pageSize;
+    private String modelName;
 }

src/main/java/ieven/server/webapp/domain/file/FileService.java

@@ -4,6 +4,7 @@ import com.mongodb.client.gridfs.model.GridFSFile;
 import com.mongodb.client.result.DeleteResult;
 import ieven.server.webapp.domain.IdInput;
 import ieven.server.webapp.domain.data.DataMap;
+import ieven.server.webapp.domain.model.Model;
 import ieven.server.webapp.infrastructure.wrapper.Mapped;
 import ieven.server.webapp.service.impl.MongoExcelServiceImpl;
 import ieven.server.webapp.util.excel.ExcelXlsReader;
@@ -53,9 +54,6 @@ public class FileService {
     @Autowired
     private MongoTemplate mongoTemplate;
     @Autowired
-    @Qualifier("readFileExecutor")
-    private ThreadPoolExecutor threadPoolExecutor;
-    @Autowired
     private GridFsOperations fsOperations;
     @Autowired
     @Lazy
@@ -144,20 +142,29 @@ public class FileService {
 
     public Mapped listUploaded(FileListInput fileListInput) {
         String modelId = fileListInput.getModelId();
+        if(modelId==null){
+            return Mapped.ERROR("没有选择任何分组");
+        }
         Future<Long> longFuture = fileService.countTotalByModelId(modelId);
+        Future<String> modelNameFuture = fileService.retrieveModelname(modelId);
         int page = fileListInput.getPage();
         int pageSize = fileListInput.getPageSize();
         int skip = (page - 1) * pageSize;
-        Query query = new Query();
+        Query query = new Query(Criteria.where("modelId").is(modelId));
         List<LogicalFile> resultList = mongoTemplate.find(
                 query.skip(skip).limit(pageSize),
                 LogicalFile.class);
         Long total = null;
+        String modelName = "";
         try {
             total = longFuture.get();
+            modelName = modelNameFuture.get();
         } catch (InterruptedException | ExecutionException e) {
             return Mapped.ERROR("查询出错");
         }
+        for (LogicalFile file : resultList) {
+            file.setModelName(modelName);
+        }
         Mapped res = Mapped.OK();
         res.put("code", 200);
         res.put("result", resultList);
@@ -202,4 +209,14 @@ public class FileService {
         mongoTemplate.remove(new Query(Criteria.where("fileId").is(fileId)), DataMap.class);
     }
 
+    @Async
+    Future<String> retrieveModelname(String modelId) {
+        Model model = mongoTemplate.findOne(new Query(Criteria.where("id").is(modelId)), Model.class);
+        String modelName = "";
+        if (model != null) {
+            modelName = model.getModelName();
+        }
+        return new AsyncResult<>(modelName);
+    }
+
 }

src/main/java/ieven/server/webapp/domain/file/LogicalFile.java

@@ -1,5 +1,6 @@
 package ieven.server.webapp.domain.file;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import org.bson.types.ObjectId;
 import org.springframework.data.annotation.Id;
@@ -13,9 +14,11 @@ public class LogicalFile {
     private String id;
     @Indexed
     private String modelId;
+    @JsonIgnore
     private ObjectId gridId;
     private String status;
     private String filename;
     private Boolean generated;
     private String uploadDate;
+    private String modelName;
 }

src/main/java/ieven/server/webapp/infrastructure/InitialBeans.java

@@ -9,10 +9,4 @@ import java.util.concurrent.TimeUnit;
 
 @Configuration
 public class InitialBeans {
-    @Bean("readFileExecutor")
-    ThreadPoolExecutor threadPoolExecutor() {
-        int core = 10;
-        int max = 12;
-        return new ThreadPoolExecutor(core, max, 5L, TimeUnit.SECONDS, new LinkedBlockingQueue<>());
-    }
 }

src/main/java/ieven/server/webapp/infrastructure/MyNotFoundUrlHandler.java

@@ -0,0 +1,29 @@
+package ieven.server.webapp.infrastructure;
+
+import org.springframework.boot.web.server.ConfigurableWebServerFactory;
+import org.springframework.boot.web.server.ErrorPage;
+import org.springframework.boot.web.server.WebServerFactoryCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpStatus;
+
+/**
+ * 用于处理找不到页面时候，全部返回html的处理
+ * @author xiaomage
+ */
+@Configuration
+public class MyNotFoundUrlHandler {
+    @Bean
+    public WebServerFactoryCustomizer<ConfigurableWebServerFactory> webServerFactoryCustomizer(){
+        return new WebServerFactoryCustomizer<ConfigurableWebServerFactory>() {
+            @Override
+            public void customize(ConfigurableWebServerFactory factory) {
+                ErrorPage error200Page = new ErrorPage(HttpStatus.OK, "/index.html");
+                ErrorPage error401Page = new ErrorPage(HttpStatus.UNAUTHORIZED, "/index.html");
+                ErrorPage error404Page = new ErrorPage(HttpStatus.NOT_FOUND, "/index.html");
+                ErrorPage error500Page = new ErrorPage(HttpStatus.INTERNAL_SERVER_ERROR, "/index.html");
+                factory.addErrorPages(error200Page,error401Page, error404Page, error500Page);
+            }
+        };
+    }
+}

src/main/java/ieven/server/webapp/infrastructure/SpringContextUtil.java

@@ -0,0 +1,38 @@
+package ieven.server.webapp.infrastructure;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SpringContextUtil implements ApplicationContextAware {
+
+    private static ApplicationContext applicationContext;
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        SpringContextUtil.applicationContext = applicationContext;
+    }
+
+    //获取applicationContext
+    public static ApplicationContext getApplicationContext() {
+        return applicationContext;
+    }
+
+    //通过name获取 Bean.
+    public static Object getBean(String name) {
+        return getApplicationContext().getBean(name);
+    }
+
+    //通过class获取Bean.
+    public static <T> T getBean(Class<T> clazz) {
+        return getApplicationContext().getBean(clazz);
+    }
+
+    //通过name,以及Clazz返回指定的Bean
+    public static <T> T getBean(String name, Class<T> clazz) {
+        return getApplicationContext().getBean(name, clazz);
+    }
+}
+

src/main/java/ieven/server/webapp/service/FileService.java

@@ -1,13 +0,0 @@
-package ieven.server.webapp.service;
-
-import org.bson.types.ObjectId;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.gridfs.GridFsOperations;
-import org.springframework.data.mongodb.gridfs.GridFsTemplate;
-
-public interface FileService {
-    /**
-     * 读取文件并且存储到mongo,异步操作
-     */
-    void readFileWhileStoreDataAsync(ObjectId fileId);
-}

src/main/java/ieven/server/webapp/service/TestService.java

@@ -1,6 +0,0 @@
-package ieven.server.webapp.service;
-
-public interface TestService {
-    void testInsert();
-    void testSave();
-}

src/main/java/ieven/server/webapp/service/impl/FileServiceImpl.java

@@ -1,26 +0,0 @@
-package ieven.server.webapp.service.impl;
-
-import ieven.server.webapp.service.FileService;
-import org.bson.types.ObjectId;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.gridfs.GridFsOperations;
-import org.springframework.stereotype.Service;
-
-import java.util.concurrent.ThreadPoolExecutor;
-
-@Service
-public class FileServiceImpl implements FileService {
-    @Autowired
-    @Qualifier("readFileExecutor")
-    private ThreadPoolExecutor threadPoolExecutor;
-    @Autowired
-    private MongoTemplate mongoTemplate;
-    @Autowired
-    private GridFsOperations fsOperations;
-
-    @Override
-    public void readFileWhileStoreDataAsync(ObjectId objectId) {
-    }
-}

src/main/java/ieven/server/webapp/service/impl/TestServiceImpl.java

@@ -1,33 +0,0 @@
-package ieven.server.webapp.service.impl;
-
-import ieven.server.webapp.service.TestService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.stereotype.Service;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-@Service
-public class TestServiceImpl implements TestService {
-    @Autowired
-    private MongoTemplate mongoTemplate;
-
-    @Override
-    public void testInsert() {
-
-    }
-
-    @Override
-    public void testSave() {
-        Map<String, Object> map1 = new LinkedHashMap<>();
-        map1.put("_id","11111111");
-        map1.put("字段1", "值1");
-        map1.put("字段2", 2);
-        Map<String, Object> map2 = new LinkedHashMap<>();
-        map2.put("字段1", "值1");
-        map2.put("字段3", null);
-        mongoTemplate.save(map1, "test");
-        mongoTemplate.save(map2, "test");
-    }
-}

src/test/java/ieven/server/webapp/service/impl/TestServiceImplTest.java

@@ -1,12 +1,9 @@
 package ieven.server.webapp.service.impl;
 
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
 import com.mongodb.MongoException;
 import com.mongodb.client.FindIterable;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.model.Filters;
-import ieven.server.webapp.service.TestService;
 import ieven.server.webapp.util.Properties;
 import org.bson.Document;
 import org.bson.conversions.Bson;
@@ -17,32 +14,14 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.mongodb.core.CollectionCallback;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.query.BasicQuery;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.mongodb.gridfs.GridFsTemplate;
 
-import java.util.List;
 import java.util.logging.Logger;
 
 @SpringBootTest
 class TestServiceImplTest {
     private final Logger logger = Logger.getLogger("TestServiceImplTest");
     @Autowired
-    private TestService testService;
-    @Autowired
     private MongoTemplate mongoTemplate;
-    @Autowired
-    private GridFsTemplate fsTemplate;
-
-    @Test
-    void testInsert() {
-    }
-
-    @Test
-    void testSave() {
-        testService.testSave();
-    }
 
     @Test
     void testFind() {