From 907277aecc4441508ddfb9d7564aaaaf2a8178b0 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Mon, 21 Dec 2020 17:44:21 +0800
Subject: [PATCH] =?UTF-8?q?20201221=E5=AF=BC=E5=85=A5Rey?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ccsens/ht/api/ImportController.java   | 25 +++++++++++++++++++
 .../java/com/ccsens/ht/uitl/Constant.java     |  1 +
 ht/src/main/resources/application.yml         |  4 +--
 ht/web/WEB-INF/web.xml                        |  6 +++++
 pom.xml                                       |  6 ++---
 5 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 ht/web/WEB-INF/web.xml

diff --git a/ht/src/main/java/com/ccsens/ht/api/ImportController.java b/ht/src/main/java/com/ccsens/ht/api/ImportController.java
index 4ea407a8..f098e7d4 100644
--- a/ht/src/main/java/com/ccsens/ht/api/ImportController.java
+++ b/ht/src/main/java/com/ccsens/ht/api/ImportController.java
@@ -123,5 +123,30 @@ public class ImportController {
         return JsonResponse.newInstance().ok();
     }
 
+    /**
+     *@Description:
+     *@Param:
+     *@return: com.ccsens.ptpro.util.JsonResponse
+     *@Author: wuhuijuan
+     *@date: 2020/5/14 11:21
+     */
+    @ApiOperation(value = "导入importRey",notes = "文件大小不能超过20M，支持后缀:.xls|.xlsx")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "医疗项目表", required = true, paramType = "form",dataType = "__file")
+    })
+    @RequestMapping(value = "/importRey", method = RequestMethod.POST)
+    public JsonResponse importRey(@RequestParam(required = true) Part file) throws Exception{
+
+        long time1 = System.currentTimeMillis();
+        //1.上传文件
+        String allowedExts = "xls,xlsx";
+        String dir = WebConstant.UPLOAD_PROJECT_WBS + File.separator;
+        String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExts, dir);
+        File execlFile = new File(dir+path);
+        long time2 = System.currentTimeMillis();
+        importService.importQuestion(execlFile, Constant.Ht.Report.REY);
+        log.info("导入Rey");
+        return JsonResponse.newInstance().ok();
+    }
 
 }
diff --git a/ht/src/main/java/com/ccsens/ht/uitl/Constant.java b/ht/src/main/java/com/ccsens/ht/uitl/Constant.java
index 664229b8..ca367d23 100644
--- a/ht/src/main/java/com/ccsens/ht/uitl/Constant.java
+++ b/ht/src/main/java/com/ccsens/ht/uitl/Constant.java
@@ -117,6 +117,7 @@ public class Constant {
             public final static String MOCA = "MoCA";
             public final static String MMSE = "MMSE";
             public final static String NPI = "NPI";
+            public final static String REY = "Rey";
             /**报告单未完成*/
             public final static Byte COMPLETE_NO = 0;
             /**报告单已完成*/
diff --git a/ht/src/main/resources/application.yml b/ht/src/main/resources/application.yml
index d082c0ea..5c2cd5c4 100644
--- a/ht/src/main/resources/application.yml
+++ b/ht/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: prod
-    include: common, util-prod
\ No newline at end of file
+    active: dev
+    include: common, util-dev
\ No newline at end of file
diff --git a/ht/web/WEB-INF/web.xml b/ht/web/WEB-INF/web.xml
new file mode 100644
index 00000000..d80081d1
--- /dev/null
+++ b/ht/web/WEB-INF/web.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+         version="4.0">
+</web-app>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e1cc5e6e..beca0a44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,10 +10,10 @@
         <module>ht</module>
         <module>tall</module>
         <module>util</module>
-        <module>game</module>
-        <module>mt</module>
+<!--        <module>game</module>-->
+<!--        <module>mt</module>-->
         <module>health</module>
-        <module>ct</module>
+<!--        <module>ct</module>-->
     </modules>
 
     <groupId>com.ccsens</groupId>