大王卡证件稽核证件、学生不限量证件、学生证资料上

c5e1f067 · 彭祥礼 · b036076b · c5e1f067 · c5e1f067 · c5e1f067
Commit c5e1f067 authored May 26, 2020 by 彭祥礼
7 changed files
--- a/common/src/main/java/com/winsun/bean/Order.java
+++ b/common/src/main/java/com/winsun/bean/Order.java
 package com.winsun.bean;
 import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import lombok.Data;
@@ -19,6 +20,7 @@ public class Order implements Serializable{
 	/**
 	 * 主键
 	 */
+	@TableId(value="id")
 	private String id;
 	/**

--- a/common/src/main/java/com/winsun/bean/StudentCertUpload.java
+++ b/common/src/main/java/com/winsun/bean/StudentCertUpload.java
 package com.winsun.bean;
 import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
 import lombok.Data;
 import java.io.Serializable;
@@ -19,7 +21,7 @@ public class StudentCertUpload implements Serializable {
 	private static final long serialVersionUID =  4964608982013796074L;
-   	@TableField("id" )
+   	@TableId(value = "id", type = IdType.AUTO)
 	private Integer id;
 	/**

--- a/common/src/main/java/com/winsun/utils/FileUtil.java
+++ b/common/src/main/java/com/winsun/utils/FileUtil.java
 package com.winsun.utils;
-import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.auth.core.util.IOUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.multipart.MultipartFile;
-import java.io.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
 /**
 * @Author xuede

--- a/common/src/main/java/com/winsun/utils/PicturesUtil.java
+++ b/common/src/main/java/com/winsun/utils/PicturesUtil.java
@@ -2,6 +2,7 @@ package com.winsun.utils;
 import com.winsun.constant.FilePath;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -22,7 +23,6 @@ public class PicturesUtil {
     * 上传图片
     * <p>
     * 前端传来图片必须为jpeg格式
-     *
     * @param file 图片base64字符串
     * @param path 图片上一级文件夹名
     * @param pathType 图片上一级文件夹名
@@ -30,6 +30,9 @@ public class PicturesUtil {
     * @return
     */
    public static String uploadPictures(String file, String path,String pathType){
+        if(StringUtils.isBlank(path)){
+            path = "temp";
+        }
        Date date = new Date();
        SimpleDateFormat yyMMdd = new SimpleDateFormat("yyMMdd");
        String h = yyMMdd.format(date.getTime());
@@ -44,6 +47,7 @@ public class PicturesUtil {
                if (!dir.exists()) {
                    dir.mkdirs();
                }
+                //enclosure/images/idCard/200525/temp/1590395528186.jpeg
                filePath = FilePath.PATH.getValue()+ pathType+ "/"+ h + "/" + path + "/" + date.getTime() + "." + houzhui;
                //byte[] bytes = Base64.getUrlDecoder().decode(base64Data);

--- a/service-manager/src/main/java/com/winsun/controller/PersonalCenterController.java
+++ b/service-manager/src/main/java/com/winsun/controller/PersonalCenterController.java
@@ -7,23 +7,18 @@ import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.auth.core.shiro.ShiroUser;
 import com.winsun.bean.HhrUser;
+import com.winsun.bean.Order;
 import com.winsun.bean.SysUser;
-import com.winsun.mapper.AppMapper;
+import com.winsun.mapper.*;
-import com.winsun.mapper.HhrUserMapper;
-import com.winsun.mapper.SchoolMapper;
-import com.winsun.mapper.SysUserMapper;
 import com.winsun.smsUtils.SendSmsAndMail;
 import com.winsun.utils.IDCardUtil;
 import com.winsun.utils.MyBatisPlusUpdateUtils;
 import com.winsun.utils.PicturesUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
 import java.util.Date;
 import java.util.HashMap;
@@ -40,7 +35,7 @@ import java.util.concurrent.TimeUnit;
 public class PersonalCenterController extends BaseController {
    private static HhrUserMapper hhrUserMapper;
+    private static OrderMapper orderMapper;
    private static SysUserMapper sysUserMapper;
    private static AppMapper appMapper;
@@ -55,16 +50,17 @@ public class PersonalCenterController extends BaseController {
    private String EDITPWD = "EditPwd";
-    private static String PATHTYPE="idCard";
+    private static String PATHTYPE ="idCard";
    @Autowired
    public PersonalCenterController(SysUserMapper sysUserMapper, HhrUserMapper hhrUserMapper, AppMapper appMapper,
-                                    StringRedisTemplate stringRedisTemplate, SchoolMapper schoolMapper) {
+                                    StringRedisTemplate stringRedisTemplate, SchoolMapper schoolMapper,OrderMapper orderMapper) {
        PersonalCenterController.sysUserMapper = sysUserMapper;
        PersonalCenterController.hhrUserMapper = hhrUserMapper;
        PersonalCenterController.appMapper = appMapper;
        PersonalCenterController.stringRedisTemplate = stringRedisTemplate;
        PersonalCenterController.schoolMapper = schoolMapper;
+        PersonalCenterController.orderMapper = orderMapper;
    }
    @Permission(menuname = "登录后微信解绑", value = "WXUnbundling", method = RequestMethod.POST)
@@ -115,6 +111,30 @@ public class PersonalCenterController extends BaseController {
        return ResponseData.error("上传失败！");
    }
+    /**
+     * 上传学生证证件照
+     * @param idCard
+     * @param stuCard
+     * @return
+     */
+    @RequestMapping(value = "uploadStuCard", method = RequestMethod.POST)
+    @ResponseBody
+    public ResponseData<String> uploadStuCard(String idCard, String stuCard) {
+        Wrapper<Order> wrapper = new EntityWrapper<>();
+        wrapper.eq("id", idCard);
+        Order order = new Order();
+        if(StringUtils.isBlank(stuCard)){
+            return ResponseData.error("没有添加上传图片！！！");
+        }
+        order.setStudenCard(PicturesUtil.uploadPictures(stuCard, "",PATHTYPE));
+        Integer integer1 = orderMapper.update(order,wrapper);
+        if(integer1==1){
+            return ResponseData.success("上传成功！");
+        }
+        return ResponseData.error("上传失败！");
+    }
    @Permission(menuname = "查询当前登录用户证件照", value = "selectPicture", method = RequestMethod.POST)
    public ResponseData<Map<String, Object>> selectPicture(String partner) {
        ShiroUser user = getShiroUser();

--- a/service-manager/src/main/java/com/winsun/controller/StudentCardVerifyController.java
+++ b/service-manager/src/main/java/com/winsun/controller/StudentCardVerifyController.java
@@ -16,16 +16,14 @@ import com.winsun.bean.SysUser;
 import com.winsun.mapper.StudentCardMapper;
 import com.winsun.mapper.SysUserMapper;
 import com.winsun.utils.ExcelDealUtils;
+import com.winsun.utils.PicturesUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
@@ -50,6 +48,11 @@ public class StudentCardVerifyController extends BaseController {
    @Autowired
    @Qualifier("redisStringTemplate")
    private RedisTemplate redisTemplate;
+    private static String PATH1 = "StudentCard1";
+    private static String PATH2 = "StudentCard2";
+    private static String PATH3 = "StudentCard3";
+    private static String PATH4 = "StudentCard4";
    /**
     * 学生不限量证件信息添加
     *
@@ -108,6 +111,52 @@ public class StudentCardVerifyController extends BaseController {
    }
    /**
+     * 学生证证件照上传
+     * @param idCard
+     * @param userName
+     * @param orderPhone
+     * @param linkPhone
+     * @param file1
+     * @param file2
+     * @param file3
+     * @param file4
+     * @return
+     */
+    @RequestMapping(value = "uploadCard", method = RequestMethod.POST)
+    @ResponseBody
+    public ResponseData<String> uploadStuCard(String idCard,String userName, String orderPhone, String linkPhone,
+                                              String file1,String file2,String file3,String file4) {
+        Wrapper<StudentCard> wrapper = new EntityWrapper<>();
+        wrapper.eq("id", idCard);
+        StudentCard student = new StudentCard();
+        student.setUserName(userName);
+        student.setOrderPhone(orderPhone);
+        student.setLinkPhone(linkPhone);
+        if(StringUtils.isNotBlank(file1)){
+            String file01 = PicturesUtil.uploadPictures(file1, "",PATH1);
+            student.setStudentCardUrl(file01);
+        }
+        if(StringUtils.isNotBlank(file2)){
+            String file02 = PicturesUtil.uploadPictures(file2,"",PATH2);
+            student.setOtherImgUrl1(file02);
+        }
+        if(StringUtils.isNotBlank(file3)){
+            String file03 = PicturesUtil.uploadPictures(file3, "",PATH3);
+            student.setOtherImgUrl2(file03);
+        }
+        if(StringUtils.isNotBlank(file4)){
+            String file04 = PicturesUtil.uploadPictures(file4, "",PATH4);
+            student.setOtherImgUrl3(file04);
+        }
+        Integer integer1 = studentCardMapper.update(student,wrapper);
+        if(integer1==1){
+            return ResponseData.success("上传成功！");
+        }
+        return ResponseData.error("上传失败！");
+    }
+    /**
     * 修改学生不限量证件状态
     * @param ids
     * @param state

--- a/service-manager/src/main/java/com/winsun/controller/StudentDwkVerifyController.java
+++ b/service-manager/src/main/java/com/winsun/controller/StudentDwkVerifyController.java
@@ -16,16 +16,14 @@ import com.winsun.bean.SysUser;
 import com.winsun.mapper.StudentCertUploadMapper;
 import com.winsun.mapper.SysUserMapper;
 import com.winsun.utils.ExcelDealUtils;
+import com.winsun.utils.PicturesUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
@@ -50,6 +48,11 @@ public class StudentDwkVerifyController extends BaseController {
    @Autowired
    @Qualifier("redisStringTemplate")
    private RedisTemplate redisTemplate;
+    private static String PATH1 = "StudentCertUpload1";
+    private static String PATH2 = "StudentCertUpload2";
+    private static String PATH3 = "StudentCertUpload3";
+    private static String PATH4 = "StudentCertUpload4";
    /**
     * 大王卡证件稽核信息添加
     *
@@ -185,6 +188,52 @@ public class StudentDwkVerifyController extends BaseController {
    }
    /**
+     * 学生证证件照上传
+     * @param idCard
+     * @param userName
+     * @param orderPhone
+     * @param linkPhone
+     * @param file1
+     * @param file2
+     * @param file3
+     * @param file4
+     * @return
+     */
+    @RequestMapping(value = "uploadCard", method = RequestMethod.POST)
+    @ResponseBody
+    public ResponseData<String> uploadStuCard(String idCard,String userName, String orderPhone, String linkPhone,
+                                              String file1,String file2,String file3,String file4) {
+        Wrapper<StudentCertUpload> wrapper = new EntityWrapper<>();
+        wrapper.eq("id", idCard);
+        StudentCertUpload student = new StudentCertUpload();
+        student.setUserName(userName);
+        student.setOrderPhone(orderPhone);
+        student.setLinkPhone(linkPhone);
+        if(StringUtils.isNotBlank(file1)){
+            String file01 = PicturesUtil.uploadPictures(file1, "",PATH1);
+            student.setStudentCardUrl(file01);
+        }
+        if(StringUtils.isNotBlank(file2)){
+            String file02 = PicturesUtil.uploadPictures(file2, "",PATH2);
+            student.setSchoolCardUrl(file02);
+        }
+        if(StringUtils.isNotBlank(file3)){
+            String file03 = PicturesUtil.uploadPictures(file3, "",PATH3);
+            student.setNoticeUrl(file03);
+        }
+        if(StringUtils.isNotBlank(file4)){
+            String file04 = PicturesUtil.uploadPictures(file4, "",PATH4);
+            student.setOtherUrl(file04);
+        }
+        Integer integer1 = studentCertUploadMapper.update(student,wrapper);
+        if(integer1==1){
+            return ResponseData.success("上传成功！");
+        }
+        return ResponseData.error("上传失败！");
+    }
+    /**
     *
     * @param ids
     * @return