fix 证书

zhongzheng-api/src/main/java/com/zhongzheng/controller/alioss/OssController.java

@@ -2,9 +2,12 @@ package com.zhongzheng.controller.alioss;
 
 
 import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.WxTokenService;
 import com.zhongzheng.modules.alioss.bo.OssRequest;
 import com.zhongzheng.modules.alioss.service.OssService;
 import com.zhongzheng.modules.alioss.vo.ResultBean;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -35,12 +38,16 @@ public class OssController {
 
     private final OssService ossService;
 
+    private final WxTokenService wxTokenService;
+
     /**
      * policy获得
      */
     @ApiOperation("policy获得")
     @GetMapping("/policy")
     public AjaxResult<ResultBean> policy(@Validated OssRequest ossRequest) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        ossRequest.setUserId(loginUser.getUser().getUserId());
         ResultBean result = ossService.getPolicy(ossRequest);
         log.info("服务端生成签名:{}",result);
         return AjaxResult.success(result);

zhongzheng-system/src/main/java/com/zhongzheng/modules/alioss/bo/OssRequest.java

@@ -26,4 +26,7 @@ public class OssRequest{
     /** 上传图片 */
     @ApiModelProperty("MultipartFile上传文件")
     private MultipartFile file;
+
+    @ApiModelProperty("用户ID")
+    private Long userId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/alioss/service/impl/OssServiceImpl.java

@@ -103,6 +103,9 @@ public class OssServiceImpl implements OssService {
 
 
     public String generateRandomFilename(OssRequest ossRequest) {
+        if(Validator.isEmpty(ossRequest.getUserId())){
+            ossRequest.setUserId(0L);
+        }
         String RandomFilename = "";
         //生成随机数
         Random rand = new Random();
@@ -117,28 +120,28 @@ public class OssServiceImpl implements OssService {
         RandomFilename = now + String.valueOf(random > 0 ? random : (-1) * random);
         switch(ossRequest.getImageStatus()){
             case 0 :
-                RandomFilename = "avatar"+"/"+sdf.format(new Date())+"/"+now;
+                RandomFilename = "avatar"+"/"+ossRequest.getUserId()+"/"+sdf.format(new Date())+"/"+now;
                 break;
             case 1 :
-                RandomFilename = "IDNumber"+"/"+sdf.format(new Date())+"/"+now;
+                RandomFilename = "IDNumber"+"/"+ossRequest.getUserId()+"/"+sdf.format(new Date())+"/"+now;
                 break;
             case 2 :
-                RandomFilename = "QuestionBank"+"/"+sdf.format(new Date())+"/"+now;
+                RandomFilename = "QuestionBank"+ossRequest.getUserId()+"/"+"/"+sdf.format(new Date())+"/"+now;
                 break;
             case 3 :
-                RandomFilename = "guide"+"/"+sdf.format(new Date())+"/"+now;
+                RandomFilename = "guide"+"/"+ossRequest.getUserId()+"/"+sdf.format(new Date())+"/"+now;
                 break;
             case 4 :
-                RandomFilename = "advertising"+"/"+sdf.format(new Date())+"/"+now;
+                RandomFilename = "advertising"+ossRequest.getUserId()+"/"+"/"+sdf.format(new Date())+"/"+now;
                 break;
             case 5 :
-                RandomFilename = "IDCard"+"/"+sdf.format(new Date())+"/"+now;
+                RandomFilename = "IDCard"+"/"+ossRequest.getUserId()+"/"+sdf.format(new Date())+"/"+now;
                 break;
             case 6 :
-                RandomFilename = "file"+"/"+sdf.format(new Date())+"/"+now;
+                RandomFilename = "file"+"/"+ossRequest.getUserId()+"/"+sdf.format(new Date())+"/"+now;
                 break;
             case 7 :
-                RandomFilename = "certificate"+"/"+sdf.format(new Date())+"/"+now;
+                RandomFilename = "certificate"+"/"+ossRequest.getUserId()+"/"+sdf.format(new Date())+"/"+now;
                 break;
         }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserSubscribeMapper.java

@@ -32,6 +32,8 @@ public interface UserSubscribeMapper extends BaseMapper<UserSubscribe> {
 
     Long selectSubscribeId(@Param("applyId") Long applyId,@Param("goodsId") Long goodsId,@Param("userId")  Long userId);
 
+    Long selectSubscribeUpdateId(@Param("applyId") Long applyId,@Param("goodsId") Long goodsId,@Param("userId")  Long userId,@Param("applySiteExamTime")  Long applySiteExamTime,@Param("applySiteStartTime")  String applySiteStartTime,@Param("applySiteEndTime")  String applySiteEndTime,@Param("applySiteAddress")  String applySiteAddress);
+
     Long selectAddSubscribeId(@Param("applyId") Long applyId,@Param("goodsId") Long goodsId,@Param("userId")  Long userId);
 
     Long queryBusinessId(@Param("subscribeId")Long subscribeId,@Param("businessId")Long businessId);

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

@@ -1130,6 +1130,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 }
             }
 
+
             if (!StringUtils.isEmpty(userSubscribeImport.getResult())) {
                 if (userSubscribeImport.getResult().equals("不通过")) {
                     userSbusciEditBo.setResult(0);
@@ -1154,13 +1155,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 continue;
             }
             userSbusciEditBo.setApplyId(applyId);
-            Long subscribeId = baseMapper.selectSubscribeId(applyId, goodsId, userId);
-            if (subscribeId == null) {
-                userSubscribeImport.setCause("该学员在考试计划中无预约数据，请确认该学员已预约考试");
-                userSubscribeImports.add(userSubscribeImport);
-                continue;
-            }
-            userSbusciEditBo.setSubscribeId(subscribeId);
+
 
 /*            if (!StringUtils.isEmpty(userSubscribeImport.getStudentTypeName())) {
                 if (userSubscribeImport.getStudentTypeName().equals("非补考学员")) {
@@ -1206,7 +1201,8 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
-
+            String startTime = "";
+            String endTime = "";
             if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteTime())) {
                 String[] split = userSubscribeImport.getApplySiteTime().split(":");
                 if (split.length < 2) {
@@ -1214,8 +1210,8 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                     userSubscribeImports.add(userSubscribeImport);
                     continue;
                 }
-                String startTime = split[0];
-                String endTime = split[1];
+                 startTime = split[0];
+                 endTime = split[1];
                /* startTime = startTime.replace(":", "-");
                 endTime = endTime.replace(":", "-");*/
 
@@ -1226,6 +1222,27 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
+
+            Long subscribeId = baseMapper.selectSubscribeUpdateId(applyId, goodsId, userId,userSbusciEditBo.getApplySiteExamTime(),userSbusciEditBo.getApplySiteStartTime(),userSbusciEditBo.getApplySiteEndTime(),userSbusciEditBo.getApplySiteAddress());
+            if (Validator.isEmpty(subscribeId)) {
+                userSubscribeImport.setCause("该学员在考试计划中无预约数据，请确认该学员已预约考试");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
+            System.out.println(subscribeId);
+            userSbusciEditBo.setSubscribeId(subscribeId);
+
+          /*  ExamApplyQueryBo queryTimeBo = new ExamApplyQueryBo();
+            queryTimeBo.setApplySiteId(applyId);
+            queryTimeBo.setStartTime(startTime);
+            queryTimeBo.setEndTime(endTime);
+            queryTimeBo.setExamTime(userSbusciEditBo.getApplySiteExamTime());
+            Long siteTime = examApplyMapper.checkSiteTimeHave(queryTimeBo);
+            if (Validator.isEmpty(siteTime)) {
+                userSubscribeImport.setCause("该考试时间段不存在");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }*/
            /* if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteAddressTrain())) {
                 userSbusciEditBo.setApplySiteAddressTrain(userSubscribeImport.getApplySiteAddressTrain());
             }

zhongzheng-system/src/main/resources/mapper/modules/user/UserSubscribeMapper.xml

@@ -199,6 +199,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LIMIT 1
     </select>
 
+    <select id="selectSubscribeUpdateId" parameterType="map"  resultType="Long">
+        SELECT
+            us.subscribe_id
+        FROM
+            user_subscribe us
+        WHERE 1=1
+          and us.subscribe_status =1
+          and us.apply_id = #{applyId}
+          and us.goods_id=#{goodsId}
+          and us.user_id = #{userId}
+          and us.apply_site_exam_time = #{applySiteExamTime}
+          and us.apply_site_start_time = #{applySiteStartTime}
+          and us.apply_site_end_time = #{applySiteEndTime}
+          and us.apply_site_address = #{applySiteAddress}
+            LIMIT 1
+    </select>
+
     <select id="selectAddSubscribeId" parameterType="map"  resultType="Long">
         SELECT
             us.subscribe_id