证书修改

src/main/java/com/peanut/modules/common/controller/ClassController.java

@@ -19,6 +19,7 @@ import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -401,7 +402,11 @@ public class ClassController {
 
     //生成证书
     @RequestMapping("/generateCertificateClass")
+    @Transactional
     public R generateCertificateClass(@RequestBody Map<String,Object> params) {
+        //抢锁
+        Boolean lock = redisTemplate.opsForValue().setIfAbsent("lock", "123");
+        if(lock) {
             try {
                 //证书类型A a证 B b证 ZK自考
                 String type = params.get("type").toString();
@@ -418,7 +423,6 @@ public class ClassController {
                         courseTitle = courseEntity.getTitle().substring(0,courseEntity.getTitle().indexOf("【"));
                     }
                     userCertificate.setTitle(courseTitle);
-                String certificateNo = getNextCertificateNo(type,courseEntity.getTitleAbbr());//证书编号
                     ClassExamUser classExamUser = classExamUserService.getOne(new LambdaQueryWrapper<ClassExamUser>()
                             .eq(ClassExamUser::getUserId,ShiroUtils.getUId())
                             .eq(ClassExamUser::getRelationId,params.get("relationId").toString()));
@@ -427,13 +431,12 @@ public class ClassController {
                     String endDay = DateUtil.dayOfMonth(classExamUser.getEndTime())+"";
                     String[] description= {endYear,endMonth,endDay,courseTitle};
                     String[] edes = {courseEntity.getEtitle()};
+                    String certificateNo = getNextCertificateNo(type,courseEntity.getTitleAbbr());//证书编号
                     String url = userCertificateService.generateCertificate(type,certificateNo,photoUrl,realName, description, edes, endYear,endMonth,endDay);
                     userCertificate.setCertificateNo(certificateNo);
                     userCertificate.setCertificateUrl(url);
                     userCertificate.setCourseId(courseEntity.getId());
                     userCertificateService.save(userCertificate);
-                //解锁
-                redisTemplate.delete("lock");
                 }else {
                     ClassEntity classEntity = classEntityService.getById(params.get("relationId").toString());
                     String startYear = DateUtil.year(classEntity.getStartTime())+"";
@@ -445,8 +448,6 @@ public class ClassController {
                     List<Map<String,Object>> list = classEntityService.classCourseInfoClassId(classEntity.getId());
                     for (Map<String,Object> map:list){
                         userCertificate.setCourseId((Integer) map.get("courseId"));
-                    String certificateNo = getNextCertificateNo(type,map.get("titleAbbr").toString());
-                    userCertificate.setCertificateNo(certificateNo);
                         double keshiTotal = (double)map.get("keshi");
                         String keshi = (keshiTotal+"").replace(".0","");
                         String courseTitle = map.get("courseTitle").toString();
@@ -456,30 +457,29 @@ public class ClassController {
                         String[] des = {startYear,startMonth,startDay,endYear,endMonth,endDay,
                                 classEntity.getTitle(),courseTitle,keshi};
                         String[] edes = {map.get("courseETitle").toString(),keshi};
+                        String certificateNo = getNextCertificateNo(type,map.get("titleAbbr").toString());
                         String url = userCertificateService.generateCertificate(type,certificateNo,photoUrl,realName,des, edes, endYear,endMonth,endDay);
-                    userCertificate.setTitle(classEntity.getTitle());
                         userCertificate.setCertificateUrl(url);
+                        userCertificate.setCertificateNo(certificateNo);
+                        userCertificate.setTitle(classEntity.getTitle());
                         userCertificate.setClassId(classEntity.getId());
                         userCertificateService.save(userCertificate);
-                    //解锁
-                    redisTemplate.delete("lock");
                     }
                 }
-            return R.ok();
             }finally {
                 //解锁
                 redisTemplate.delete("lock");
             }
-
+        }else {
+            generateCertificateClass(params);
+        }
+        return R.ok();
     }
 
     //获取下一个编号
     public String getNextCertificateNo(String type,String courseNamePinyin){
-        //抢锁
-        Boolean lock = redisTemplate.opsForValue().setIfAbsent("lock", "123");
-        if(lock) {
         List<UserCertificate> userCertificateList = userCertificateService.list(new LambdaQueryWrapper<UserCertificate>()
-                    .orderByDesc(UserCertificate::getCreateTime));
+                .orderByDesc(UserCertificate::getId));
         String res = "";
         if (userCertificateList.size() > 0){
             UserCertificate u0 = userCertificateList.get(0);
@@ -507,9 +507,6 @@ public class ClassController {
             }
         }
         return res+courseNamePinyin;
-        }else {
-            return getNextCertificateNo(type,courseNamePinyin);
-        }
     }