feats

deploy/bootstrap

@@ -2,6 +2,6 @@
 #
 #
 
-appVer="0.0.3"
+appVer="0.0.6"
 
 java -jar ./medical-plat-${appVer}.jar

deploy/template.yml

@@ -11,7 +11,7 @@ Resources:
       Properties:
         Handler: com.yunzhi.demo.SpringApplication::main
         Runtime: custom
-        CodeUri: 'oss://yz-serverless/medical-plat/medical-plat-0.0.4.zip'
+        CodeUri: 'oss://yz-serverless/medical-plat/medical-plat-0.0.6.zip'
         MemorySize: 1024
         Timeout: 30
         InitializationTimeout: 30

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.yunzhi</groupId>
 	<artifactId>medical-plat</artifactId>
-	<version>0.0.5</version>
+	<version>0.0.6</version>
 	<name>medical-plat</name>
 	<description>Demo project for Spring Boot</description>
 
@@ -116,7 +116,15 @@
 			<artifactId>weixin-java-miniapp</artifactId>
 			<version>3.8.0</version>
 		</dependency>
-		<!--weixin-miniapp start-->
+		<!--weixin-miniapp end-->
+
+		<!--commons-compress start-->
+<!--		<dependency>-->
+<!--			<groupId>org.apache.commons</groupId>-->
+<!--			<artifactId>commons-compress</artifactId>-->
+<!--			<version>1.21</version>-->
+<!--		</dependency>-->
+		<!--commons-compress end-->
 
 		<!--lombok start-->
 		<dependency>
@@ -150,6 +158,9 @@
 					<plugin>
 						<groupId>org.springframework.boot</groupId>
 						<artifactId>spring-boot-maven-plugin</artifactId>
+						<configuration>
+							<includeSystemScope>true</includeSystemScope>
+						</configuration>
 					</plugin>
 				</plugins>
 				<resources>
@@ -175,6 +186,9 @@
 					<plugin>
 						<groupId>org.springframework.boot</groupId>
 						<artifactId>spring-boot-maven-plugin</artifactId>
+						<configuration>
+							<includeSystemScope>true</includeSystemScope>
+						</configuration>
 					</plugin>
 
 					<!-- 跳过测试 -->

src/main/java/com/yunzhi/demo/common/StringUtils.java

@@ -2,6 +2,7 @@ package com.yunzhi.demo.common;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.nio.charset.Charset;
 import java.util.Random;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -9,6 +10,18 @@ import java.util.regex.Pattern;
 public class StringUtils {
     private static Pattern humpPattern = Pattern.compile("[A-Z]");
 
+    private static String[] charsets = new String[] {
+        "GBK",
+        "BIG5",
+        "GB18030",
+        "EUC-TW",
+        "ISO-8859-1",
+        "UTF-8",
+        "UTF-16",
+        "WINDOWS-1251",
+        "WINDOWS-1252"
+    };
+
     public static boolean isEmpty(String str) {
         return null == str || "".equals(str.trim()) || "null".equals(str) || "undefined".equals(str);
     }
@@ -117,4 +130,21 @@ public class StringUtils {
         prefix = prefix.substring(0, padLen);
         return prefix + src;
     }
+
+    public static String convert(String value, String fromEncoding, String toEncoding) throws UnsupportedEncodingException {
+        return new String(value.getBytes(fromEncoding), toEncoding);
+    }
+
+    public static String detectCharset(String value) throws UnsupportedEncodingException {
+        String probe = "UTF-8";
+        for(String c : charsets) {
+            Charset charset = Charset.forName(c);
+            if(charset != null) {
+                if(value.equals(convert(convert(value, charset.name(), probe), probe, charset.name()))) {
+                    return c;
+                }
+            }
+        }
+        return probe;
+    }
 }

src/main/java/com/yunzhi/demo/controller/TaTestLogController.java

@@ -2,14 +2,13 @@ package com.yunzhi.demo.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yunzhi.demo.common.BaseController;
-import com.yunzhi.demo.common.Constants;
-import com.yunzhi.demo.common.DateUtils;
-import com.yunzhi.demo.common.ResponseBean;
-import com.yunzhi.demo.entity.TaPerson;
-import com.yunzhi.demo.entity.TaStudent;
+import com.yunzhi.demo.common.*;
+import com.yunzhi.demo.entity.*;
 import com.yunzhi.demo.service.ITaStudentService;
+import com.yunzhi.demo.service.ITmTestPdfService;
+import com.yunzhi.demo.service.ITmTestStudentService;
 import com.yunzhi.demo.vo.StudentTestLog;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -19,12 +18,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.yunzhi.demo.service.ITaTestLogService;
-import com.yunzhi.demo.entity.TaTestLog;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
-import java.time.LocalDateTime;
-import java.util.zip.ZipFile;
+import java.util.List;
+
 
 /**
  * <p>
@@ -48,6 +44,11 @@ public class TaTestLogController extends BaseController {
     @Autowired
     public ITaStudentService iTaStudentService;
 
+    @Autowired
+    public ITmTestPdfService iTmTestPdfService;
+
+    @Autowired
+    public ITmTestStudentService iTmTestStudentService;
 
     /**
      * 分页查询列表
@@ -109,16 +110,38 @@ public class TaTestLogController extends BaseController {
         }
     }
 
+    /**
+     *
+     * @param testPdfList
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/admin/taTestLog/upload/pdf",method= RequestMethod.POST)
+    @ApiOperation(value="上传体检文件", notes = "上传体检文件", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean uploadPDF(@RequestBody List<TmTestPdf> testPdfList) throws Exception {
+        if (null == testPdfList || testPdfList.size() < 1) {
+            return ResponseBean.error("请设置上传内容", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        iTmTestPdfService.saveBatch(testPdfList);
+
+        return ResponseBean.success(null);
+    }
 
-    public ResponseBean uploadZip(@RequestPart("schoolId") String schoolId,
-                                  @RequestPart("file") MultipartFile multipartFile) throws Exception {
-        LocalDateTime now = LocalDateTime.now();
-        String prefix = String.format("test-%s-%s", schoolId, DateUtils.toString(now, "yyyy-MM-dd"));
-        File file = File.createTempFile(prefix, "zip");
-        file.deleteOnExit();
+    /**
+     *
+     * @param testStudentList
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/admin/taTestLog/upload/excel",method= RequestMethod.POST)
+    @ApiOperation(value="上传体检映射文件", notes = "上传体检映射文件", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean uploadExcel(@RequestBody List<TmTestStudent> testStudentList) throws Exception {
+        if (null == testStudentList || testStudentList.size() < 1) {
+            return ResponseBean.error("请设置上传内容", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
 
-        multipartFile.transferTo(file);
-        ZipFile zf = new ZipFile(file);
+        iTmTestStudentService.saveBatch(testStudentList);
 
         return ResponseBean.success(null);
     }

src/main/java/com/yunzhi/demo/entity/TmTestPdf.java

@@ -0,0 +1,40 @@
+package com.yunzhi.demo.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TmTestPdf对象", description="体检PDF导入日志")
+public class TmTestPdf implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "序号")
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    @ApiModelProperty(value = "学校ID")
+    private String schoolId;
+
+    @ApiModelProperty(value = "姓名")
+    private String studentName;
+
+    @ApiModelProperty(value = "体检编号")
+    private String testNo;
+
+    @ApiModelProperty(value = "文件地址")
+    private String url;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+}

src/main/java/com/yunzhi/demo/entity/TmTestStudent.java

@@ -0,0 +1,37 @@
+package com.yunzhi.demo.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TmTestStudent对象", description="体检学生日志")
+public class TmTestStudent implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "序号")
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    @ApiModelProperty(value = "学校ID")
+    private String schoolId;
+
+    @ApiModelProperty(value = "序号")
+    private String studentNo;
+
+    @ApiModelProperty(value = "体检编号")
+    private String testNo;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+}

src/main/java/com/yunzhi/demo/mapper/TmTestPdfMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.demo.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.demo.entity.TmTestPdf;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 体检PDF导入日志 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-04-15
+ */
+@Mapper
+public interface TmTestPdfMapper extends BaseMapper<TmTestPdf> {
+
+}

src/main/java/com/yunzhi/demo/mapper/TmTestStudentMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.demo.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.demo.entity.TmTestStudent;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 体检学生日志 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-04-15
+ */
+@Mapper
+public interface TmTestStudentMapper extends BaseMapper<TmTestStudent> {
+
+}

src/main/java/com/yunzhi/demo/service/ITmTestPdfService.java

@@ -0,0 +1,16 @@
+package com.yunzhi.demo.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.demo.entity.TmTestPdf;
+
+/**
+ * <p>
+ * 体检PDF导入日志 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-04-15
+ */
+public interface ITmTestPdfService extends IService<TmTestPdf> {
+
+}

src/main/java/com/yunzhi/demo/service/ITmTestStudentService.java

@@ -0,0 +1,16 @@
+package com.yunzhi.demo.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.demo.entity.TmTestStudent;
+
+/**
+ * <p>
+ * 体检学生日志 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-04-15
+ */
+public interface ITmTestStudentService extends IService<TmTestStudent> {
+
+}

src/main/java/com/yunzhi/demo/service/impl/TmTestPdfServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yunzhi.demo.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.demo.entity.TmTestPdf;
+import com.yunzhi.demo.mapper.TmTestPdfMapper;
+import com.yunzhi.demo.service.ITmTestPdfService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 体检PDF导入日志 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-04-15
+ */
+@Service
+public class TmTestPdfServiceImpl extends ServiceImpl<TmTestPdfMapper, TmTestPdf> implements ITmTestPdfService {
+
+}

src/main/java/com/yunzhi/demo/service/impl/TmTestStudentServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yunzhi.demo.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.demo.entity.TmTestStudent;
+import com.yunzhi.demo.mapper.TmTestStudentMapper;
+import com.yunzhi.demo.service.ITmTestStudentService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 体检学生日志 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-04-15
+ */
+@Service
+public class TmTestStudentServiceImpl extends ServiceImpl<TmTestStudentMapper, TmTestStudent> implements ITmTestStudentService {
+
+}

src/main/resources/mapper/TmTestPdfMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yunzhi.demo.mapper.TmTestPdfMapper">
+
+</mapper>

src/main/resources/mapper/TmTestStudentMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yunzhi.demo.mapper.TmTestStudentMapper">
+
+</mapper>