publish 0.9.11

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>0.9.9</version>
+    <version>0.9.11</version>
     <packaging>pom</packaging>
     <name>springboot-parent</name>
     <description>杭州铁晟科技有限公司基础依赖</description>
@@ -57,55 +57,55 @@
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-database</artifactId>
-                <version>0.9.9</version>
+                <version>0.9.11</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>0.9.9</version>
+                <version>0.9.11</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>0.9.9</version>
+                <version>0.9.11</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>0.9.9</version>
+                <version>0.9.11</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>0.9.9</version>
+                <version>0.9.11</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>0.9.9</version>
+                <version>0.9.11</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-encrypt</artifactId>
-                <version>0.9.9</version>
+                <version>0.9.11</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>0.9.9</version>
+                <version>0.9.11</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-poi</artifactId>
-                <version>0.9.9</version>
+                <version>0.9.11</version>
             </dependency>
 
             <dependency>

springboot-ademo/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.9.9</version>
+        <version>0.9.11</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
@@ -25,6 +25,12 @@
             <groupId>com.tiesheng.springboot-parent</groupId>
             <artifactId>springboot-web</artifactId>
         </dependency>
+
+          <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+        </dependency>
+
     </dependencies>
 
     <repositories>

springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java

@@ -1,10 +1,17 @@
 package com.tiesheng.demo.controller;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.TimeInterval;
 import cn.hutool.json.JSONUtil;
 import cn.hutool.log.LogFactory;
+import cn.hutool.poi.excel.ExcelUtil;
+import cn.hutool.poi.excel.sax.handler.RowHandler;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.read.listener.ReadListener;
 import com.tiesheng.annotation.token.TokenIgnore;
 import com.tiesheng.core.service.CoreMessageService;
+import com.tiesheng.demo.pojos.PoiBean;
 import com.tiesheng.demo.pojos.TestFile;
 import com.tiesheng.login.config.token.TsTokenConfig;
 import com.tiesheng.login.config.token.bean.TokenBean;
@@ -19,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.util.List;
 
 /**
@@ -121,4 +129,43 @@ public class TestController {
         return ApiResp.respOK("");
     }
 
+
+    @RequestMapping("poi")
+    @TokenIgnore
+    public ApiResp<String> poi() {
+        TimeInterval timeInterval = new TimeInterval();
+
+        FileUploadPath file = FileUploadPath.file("/upload/test.xlsx");
+
+        EasyExcel.read(new File(file.getAbsolutePath()), PoiBean.class, new ReadListener<PoiBean>() {
+
+            @Override
+            public void invoke(PoiBean poiBean, AnalysisContext analysisContext) {
+
+            }
+
+            @Override
+            public void doAfterAllAnalysed(AnalysisContext analysisContext) {
+
+            }
+        }).sheet().doRead();
+
+        System.out.println("timeInterval: " + timeInterval.interval());
+        return ApiResp.respOK("");
+    }
+
+    @RequestMapping("poiTool")
+    @TokenIgnore
+    public ApiResp<String> poiTool() {
+        TimeInterval timeInterval = new TimeInterval();
+
+        FileUploadPath file = FileUploadPath.file("/upload/test.xlsx");
+
+        ExcelUtil.getReader(new File(file.getAbsolutePath())).read();
+
+        System.out.println("timeInterval: " + timeInterval.interval());
+
+        return ApiResp.respOK("");
+    }
+
 }

springboot-ademo/src/main/java/com/tiesheng/demo/pojos/PoiBean.java

@@ -0,0 +1,75 @@
+package com.tiesheng.demo.pojos;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+public class PoiBean {
+
+    @ExcelProperty("学院")
+    private String college;
+    private String type;
+    private String name;
+    private String no;
+    private String sex;
+    private String fdy;
+    private String fdyNo;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter\getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public String getCollege() {
+        return college;
+    }
+
+    public void setCollege(String college) {
+        this.college = college;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getNo() {
+        return no;
+    }
+
+    public void setNo(String no) {
+        this.no = no;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public String getFdy() {
+        return fdy;
+    }
+
+    public void setFdy(String fdy) {
+        this.fdy = fdy;
+    }
+
+    public String getFdyNo() {
+        return fdyNo;
+    }
+
+    public void setFdyNo(String fdyNo) {
+        this.fdyNo = fdyNo;
+    }
+}

springboot-ademo/src/main/resources/static/mobile/0.0.13/index.html

@@ -7,31 +7,10 @@
             content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
             name="viewport"
     />
-    <title>钉钉授权</title>
 </head>
 <body>
-<script src="dingtalk.open.js"></script>
 <script type="text/javascript">
 
-  function getQueryString(name) {
-    var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
-    var r = window.location.search.substr(1).match(reg);
-    if (r != null) return decodeURI(r[2]);
-    return null;
-  }
-
-  dd.runtime.permission.requestAuthCode({
-    corpId: getQueryString("corpId"),
-    onSuccess: function (result) {
-      let search = window.location.search + "&code=" + result.code;
-      window.location.href = "/auth/ding/oauth2/" + getQueryString("service") + search;
-    },
-    onFail: function (err) {
-      window.location.href = "./error.html?message=" + JSON.stringify(err);
-    }
-  })
-
 </script>
-
 </body>
 </html>

springboot-ademo/src/main/resources/static/mobile/0.0.4/index.html

@@ -7,30 +7,10 @@
             content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
             name="viewport"
     />
-    <title>钉钉授权</title>
 </head>
 <body>
-<script src="dingtalk.open.js"></script>
 <script type="text/javascript">
 
-  function getQueryString(name) {
-    var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
-    var r = window.location.search.substr(1).match(reg);
-    if (r != null) return decodeURI(r[2]);
-    return null;
-  }
-
-  dd.runtime.permission.requestAuthCode({
-    corpId: getQueryString("corpId"),
-    onSuccess: function (result) {
-      let search = window.location.search + "&code=" + result.code;
-      window.location.href = "/auth/ding/oauth2/" + getQueryString("service") + search;
-    },
-    onFail: function (err) {
-      window.location.href = "./error.html?message=" + JSON.stringify(err);
-    }
-  })
-
 </script>
 
 </body>

springboot-annotation/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.9.9</version>
+        <version>0.9.11</version>
     </parent>
 
     <artifactId>springboot-annotation</artifactId>

springboot-database/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.9.9</version>
+        <version>0.9.11</version>
     </parent>
 
     <artifactId>springboot-database</artifactId>

springboot-encrypt/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.9.9</version>
+        <version>0.9.11</version>
     </parent>
 
     <artifactId>springboot-encrypt</artifactId>

springboot-login/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.9.9</version>
+        <version>0.9.11</version>
     </parent>
 
     <artifactId>springboot-login</artifactId>

springboot-message/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.9.9</version>
+        <version>0.9.11</version>
     </parent>
 
     <artifactId>springboot-message</artifactId>

springboot-platform/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.9.9</version>
+        <version>0.9.11</version>
     </parent>
 
     <artifactId>springboot-platform</artifactId>

springboot-poi/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.9.9</version>
+        <version>0.9.11</version>
     </parent>
 
     <artifactId>springboot-poi</artifactId>

springboot-util/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.9.9</version>
+        <version>0.9.11</version>
     </parent>
 
     <artifactId>springboot-util</artifactId>

springboot-web/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.9.9</version>
+        <version>0.9.11</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>

springboot-web/src/main/java/com/tiesheng/core/service/CoreLogService.java

@@ -69,7 +69,7 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
      * @param title 标题
      * @param list  要导入的数据
      */
-    public <T> CoreLogProcess addProcess(String title, List<T> list, ProcessImportConsumer consumer) {
+    public <T> CoreLogProcess addProcess(String title, List<T> list, ProcessImportConsumer<T> consumer) {
         if (CollUtil.isEmpty(list)) {
             throw new ApiException("文件中不存在数据");
         }
@@ -85,9 +85,9 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
             CollUtil.split(list, 100).forEach((it) -> {
                 int accept = consumer.accept(it);
                 coreLogProcess.setSuccessNum(coreLogProcess.getSuccessNum() + accept);
-                coreLogProcess.setFailNum(coreLogProcess.getFailNum() + 100 - accept);
+                coreLogProcess.setFailNum(coreLogProcess.getFailNum() + it.size() - accept);
 
-                if (coreLogProcess.getFailNum() + coreLogProcess.getSuccessNum() == list.size()) {
+                if (coreLogProcess.getFailNum() + coreLogProcess.getSuccessNum() >= list.size()) {
                     coreLogProcess.setFailFile(consumer.getFailFile());
                     coreLogProcess.setStatus(1);
                 }

springboot-web/src/main/java/com/tiesheng/core/util/ProcessImportConsumer.java

@@ -2,7 +2,7 @@ package com.tiesheng.core.util;
 
 import java.util.List;
 
-public interface ProcessImportConsumer {
+public interface ProcessImportConsumer<T> {
 
 
     /**
@@ -12,7 +12,7 @@ public interface ProcessImportConsumer {
      * @param <T>
      * @return 返回成功的数量
      */
-    <T> int accept(List<T> list);
+    int accept(List<T> list);
 
 
     /**