oss文件上传

hzgzpt-admin/src/main/java/com/miaxis/app/controller/user/UserInfoController.java

@@ -1,7 +1,10 @@
 package com.miaxis.app.controller.user;
 
 import com.miaxis.app.user.domain.UserInfo;
+import com.miaxis.app.user.domain.dto.UserDto;
 import com.miaxis.app.user.service.IUserInfoService;
+import com.miaxis.common.aliyunOSS.AliyunConfig;
+import com.miaxis.common.aliyunOSS.AliyunUpload;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
@@ -14,8 +17,14 @@ import com.miaxis.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 【用户信息】Controller
@@ -102,6 +111,44 @@ public class UserInfoController extends BaseController{
         return toResponse(userInfoService.deleteUserInfoByIds(ids));
     }
 
+    /**
+     * 上传身份证正反面,及人像图片
+     * uploadIdCardAndHeadPicture
+     */
+    @Log(title = "用户信息", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping("/uploadIdCardAndHeadPicture")
+    @ApiOperation("上传身份证正反面,及人像图片")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type",value = "idCardFront:身份证正面、idCardReverse:身份证反面、faces:人像" ,dataType = "String",required = true),
+            @ApiImplicitParam(name = "multFile", value = "上传文件", required = true, dataType = "String")
+    })
+    public Response uploadIdCardAndHeadPicture(String type,MultipartFile multFile) throws IOException {
+        String savePath = AliyunConfig.gzpt_user + type + "/"
+                + new SimpleDateFormat("yyyyMM").format(new Date()) + "/";
+        String fileName = System.currentTimeMillis() + ".jpg";
+        String fileUrl = AliyunUpload.uploadForStream(multFile.getInputStream(), savePath, fileName);
+        Map<String, Object> map = new HashMap<>();
+        map.put("filePath",savePath+fileName);//文件路径名
+        map.put("fileUrl",fileUrl);//文件访问路径
+        return Response.success(map);
+    }
+
+    /**
+     * 删除文件
+     * uploadIdCardAndHeadPicture
+     */
+    @Log(title = "用户信息", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping("/deleteCardAndHeadPicture")
+    @ApiOperation("删除文件")
+    @ApiImplicitParam(name = "filePath",value = "文件路径(filePath)" ,dataType = "String",required = true)
+    public Response deleteCardAndHeadPicture(String filePath) {
+        boolean b = AliyunUpload.deleteObject(filePath);
+        if (!b)return Response.error();
+        return Response.success();
+    }
+
+
+
     /**
      * 修改用户手机号
      */

hzgzpt-common/pom.xml

@@ -173,7 +173,7 @@
             <version>1.9.4</version>
         </dependency>
 
-        <!--aliyun OSS-->
+        <!--aliyunOSS OSS-->
         <dependency>
             <groupId>com.aliyun.oss</groupId>
             <artifactId>aliyun-sdk-oss</artifactId>

hzgzpt-common/src/main/java/com/miaxis/common/aliyun/AliyunConfig.java

@@ -1,24 +0,0 @@
-package com.miaxis.common.aliyun;
-
-public class AliyunConfig {
-	public static String endpoint = "oss-cn-shanghai.aliyuncs.com";
-	public static String accessKeyId = "LTAIijc2Vl913Dha";
-	public static String accessKeySecret = "HbQBG0RQqdfKoYGJmoqdT1FFYO8OTs";
-	public static String bucketName = "xzzfile";
-	public static String visitPath = "http://image.jppt.com.cn";
-
-	public static String gzpt_path = "gzpt/";
-	/** 教练员图片文件*/
-	public static String gzpt_coach_rootpath = gzpt_path + "coach/";
-	/** 学员图片文件 */
-	public static String gzpt_student_rootpath = gzpt_path + "student/";
-	/** 学员图片文件 */
-	public static String gzpt_trainCar_rootpath = gzpt_path + "trainCar/";
-	/** 人脸识别图像文件 */
-	public static String gzpt_faces_rootpath = gzpt_path + "faces/";
-
-	public static String tms_news_rootpath = gzpt_path + "news/";
-
-	
-}
- 

hzgzpt-common/src/main/java/com/miaxis/common/aliyunOSS/AliyunConfig.java

@@ -0,0 +1,17 @@
+package com.miaxis.common.aliyunOSS;
+
+public class AliyunConfig {
+	public static String endpoint = "oss-cn-shanghai.aliyuncs.com";
+	public static String accessKeyId = "LTAIijc2Vl913Dha";
+	public static String accessKeySecret = "HbQBG0RQqdfKoYGJmoqdT1FFYO8OTs";
+	public static String bucketName = "xzzfile";
+	public static String visitPath = "http://image.jppt.com.cn";
+
+	public static String gzpt_path = "gzpt/";
+	/** 用户图片文件*/
+	public static String gzpt_user = gzpt_path + "user/";
+
+
+	
+}
+ 

hzgzpt-common/src/main/java/com/miaxis/common/aliyun/AliyunDown.java → hzgzpt-common/src/main/java/com/miaxis/common/aliyunOSS/AliyunDown.java

@@ -1,4 +1,4 @@
-package com.miaxis.common.aliyun;
+package com.miaxis.common.aliyunOSS;
 
 import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.model.DownloadFileRequest;

hzgzpt-common/src/main/java/com/miaxis/common/aliyun/AliyunUpload.java → hzgzpt-common/src/main/java/com/miaxis/common/aliyunOSS/AliyunUpload.java

@@ -1,6 +1,7 @@
-package com.miaxis.common.aliyun;
+package com.miaxis.common.aliyunOSS;
 
 import com.aliyun.oss.OSSClient;
+import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.utils.Base64;
 import sun.misc.BASE64Decoder;
 
@@ -220,4 +221,31 @@ public class AliyunUpload {
 		}
 		return url;
 	}
+
+    /**
+     * 删除文件
+     * @param filePath 文件
+     * @return
+     */
+    public static boolean deleteObject(String filePath) {
+        OSSClient ossClient = new OSSClient(AliyunConfig.endpoint, AliyunConfig.accessKeyId,AliyunConfig.accessKeySecret);
+
+        try {
+            boolean exist = ossClient.doesObjectExist(AliyunConfig.bucketName,filePath);
+            if (!exist) {
+                System.out.println("文件不存在");
+                return false;
+            }
+            ossClient.deleteObject(AliyunConfig.bucketName,filePath);
+
+        }catch (Exception e){
+            e.printStackTrace();
+            System.out.println("服务异常");
+           return false;
+        }finally {
+            ossClient.shutdown();
+        }
+        return true;
+    }
+
 }

hzgzpt-service-app/src/main/java/com/miaxis/app/user/domain/UserInfo.java

@@ -105,116 +105,16 @@ public class UserInfo extends BaseBusinessEntity {
     @ApiModelProperty(value = "培训车型")
     private String pxcx;
 
-    public void setId(Long id){
-        this.id = id;
-    }
-
-    public Long getId(){
-        return id;
-    }
-    public void setName(String name){
-        this.name = name;
-    }
-
-    public String getName(){
-        return name;
-    }
-    public void setSex(Long sex){
-        this.sex = sex;
-    }
-
-    public Long getSex(){
-        return sex;
-    }
-    public void setSfzmlx(Long sfzmlx){
-        this.sfzmlx = sfzmlx;
-    }
-
-    public Long getSfzmlx(){
-        return sfzmlx;
-    }
-    public void setSfzmhm(String sfzmhm){
-        this.sfzmhm = sfzmhm;
-    }
-
-    public String getSfzmhm(){
-        return sfzmhm;
-    }
-    public void setCrdate(Date crdate){
-        this.crdate = crdate;
-    }
-
-    public Date getCrdate(){
-        return crdate;
-    }
-    public void setBirthday(Date birthday){
-        this.birthday = birthday;
-    }
-
-    public Date getBirthday(){
-        return birthday;
-    }
-    public void setMobile(String mobile){
-        this.mobile = mobile;
-    }
-
-    public String getMobile(){
-        return mobile;
-    }
-    public void setPassword(String password){
-        this.password = password;
-    }
-
-    public String getPassword(){
-        return password;
-    }
-    public void setWechar(String wechar){
-        this.wechar = wechar;
-    }
-
-    public String getWechar(){
-        return wechar;
-    }
-    public void setOpenid(String openid){
-        this.openid = openid;
-    }
-
-    public String getOpenid(){
-        return openid;
-    }
-    public void setInscode(String inscode){
-        this.inscode = inscode;
-    }
-
-    public String getInscode(){
-        return inscode;
-    }
-    public void setPxcx(String pxcx){
-        this.pxcx = pxcx;
-    }
-
-    public String getPxcx(){
-        return pxcx;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("sex", getSex())
-            .append("sfzmlx", getSfzmlx())
-            .append("sfzmhm", getSfzmhm())
-            .append("crdate", getCrdate())
-            .append("birthday", getBirthday())
-            .append("mobile", getMobile())
-            .append("password", getPassword())
-            .append("wechar", getWechar())
-            .append("openid", getOpenid())
-            .append("inscode", getInscode())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .append("pxcx", getPxcx())
-            .toString();
-    }
+    /** 驾校班型Id */
+    @Excel(name = "驾校班型Id")
+    @TableField("schoolClassTypeId")
+    @ApiModelProperty(value = "驾校班型Id")
+    private String schoolClassTypeId;
+
+    /** 教练id(带教教练) */
+    @Excel(name = "教练id(带教教练)")
+    @TableField("coachId")
+    @ApiModelProperty(value = "教练id(带教教练)")
+    private String coachId;
+
 }

hzgzpt-service-app/src/main/java/com/miaxis/app/user/mapper/UserInfoMapper.java

@@ -3,6 +3,7 @@ package com.miaxis.app.user.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.app.user.domain.UserInfo;
+import com.miaxis.app.user.domain.dto.UserDto;
 
 /**
  * 用户信息Mapper接口

hzgzpt-service-app/src/main/java/com/miaxis/app/user/service/IUserInfoService.java

@@ -3,6 +3,7 @@ package com.miaxis.app.user.service;
 import java.util.List;
 import com.miaxis.app.user.domain.UserInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.app.user.domain.dto.UserDto;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.SysUser;
 

hzgzpt-service-app/src/main/java/com/miaxis/app/user/service/impl/UserInfoServiceImpl.java

@@ -2,6 +2,7 @@ package com.miaxis.app.user.service.impl;
 
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.app.user.domain.dto.UserDto;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.SysUser;

hzgzpt-service-app/src/main/resources/mapper/user/UserInfoMapper.xml

@@ -20,10 +20,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="pxcx"    column="pxcx"    />
+        <result property="schoolClassTypeId"    column="schoolClassTypeId"    />
+        <result property="coachId"    column="coachId"    />
     </resultMap>
 
     <sql id="selectUserInfoVo">
-        select id, name, sex, sfzmlx, sfzmhm, crdate, birthday, mobile, password, wechar, openid, inscode, create_time, update_time, pxcx from user_info
+        select id, name, sex, sfzmlx, sfzmhm, crdate, birthday, mobile, password, wechar, openid, inscode, create_time, update_time, pxcx,schoolClassTypeId,coachId from user_info
     </sql>
 
     <select id="selectUserInfoList" parameterType="UserInfo" resultMap="UserInfoResult">
@@ -41,6 +43,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="openid != null  and openid != ''"> and openid = #{openid}</if>
             <if test="inscode != null  and inscode != ''"> and inscode = #{inscode}</if>
             <if test="pxcx != null  and pxcx != ''"> and pxcx = #{pxcx}</if>
+            <if test="schoolClassTypeId != null">schoolClassTypeId,</if>
+            <if test="coachId != null">coachId,</if>
         </where>
     </select>
     
@@ -67,6 +71,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="pxcx != null">pxcx,</if>
+            <if test="schoolClassTypeId != null">schoolClassTypeId,</if>
+            <if test="coachId != null">coachId,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -84,6 +90,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="pxcx != null">#{pxcx},</if>
+            <if test="schoolClassTypeId != null">#{schoolClassTypeId},</if>
+            <if test="coachId != null">#{coachId},</if>
          </trim>
     </insert>
 
@@ -104,6 +112,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="pxcx != null">pxcx = #{pxcx},</if>
+            <if test="schoolClassTypeId != null">#{schoolClassTypeId},</if>
+            <if test="coachId != null">#{coachId},</if>
         </trim>
         where id = #{id}
     </update>

pom.xml

@@ -32,7 +32,7 @@
         <jwt.version>0.9.1</jwt.version>
         <mybatis-plus.version>3.4.1</mybatis-plus.version>
         <hutool.version>5.4.0</hutool.version>
-        <com.aliyun.oss.version>2.4.0</com.aliyun.oss.version>
+        <com.aliyun.oss.version>2.8.3</com.aliyun.oss.version>
     </properties>
 	
     <!-- 依赖声明 -->
@@ -218,7 +218,7 @@
                 <version>${ruoyi.version}</version>
             </dependency>
 
-            <!--aliyun OSS-->
+            <!--aliyunOSS OSS-->
             <dependency>
                 <groupId>com.aliyun.oss</groupId>
                 <artifactId>aliyun-sdk-oss</artifactId>