修复class问题,新增圈子带前缀

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java

@@ -1,20 +1,5 @@
 package com.ruoyi.web.controller.common;
 
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.util.Random;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import javax.annotation.Resource;
-import javax.imageio.ImageIO;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ruoyi.generator.util.SendSms;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.FastByteArrayOutputStream;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.google.code.kaptcha.Producer;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.constant.CacheConstants;
@@ -23,7 +8,21 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.sign.Base64;
 import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.generator.util.SendSms;
 import com.ruoyi.system.service.ISysConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.FastByteArrayOutputStream;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.Random;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 验证码操作处理
@@ -95,9 +94,9 @@ public class CaptchaController {
         Random random = new Random();
         int code = 1000 + random.nextInt(9000);
         //2.发送验证码
-        SendSms.sendMsg("次元时代", "SMS_474845159", phoneNumber, String.valueOf(code));
+        SendSms.sendMsg("次元时代科技", "SMS_474845159", phoneNumber, String.valueOf(code));
         //3.存入redis
-        String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + code;
+        String verifyKey = CacheConstants.SMS_CODE_KEY + phoneNumber;
         redisCache.setCacheObject(verifyKey, code, Constants.SMS_EXPIRATION, TimeUnit.MINUTES);
         return AjaxResult.success("短信验证码发送成功!");
     }

ruoyi-generator/src/main/java/com/ruoyi/generator/controller/CommunityArticleController.java

@@ -47,9 +47,13 @@ public class CommunityArticleController extends BaseController {
 
     @Autowired
     private CommunityUserCircleMapper communityUserCircleMapper;
+
     @Autowired
     private CommunityCircleMapper communityCircleMapper;
 
+    @Autowired
+    private CommunityClassCircleMapper communityClassCircleMapper;
+
 
     /**
      * 获取文章列表信息
@@ -85,10 +89,14 @@ public class CommunityArticleController extends BaseController {
     }
 
     @GetMapping("/circleList")
-    @ApiOperation("获取文章分类列表")
+    @ApiOperation("获取文章圈子列表")
     //@Anonymous
     public AjaxResult getCircleList() {
         List<CommunityCircle> communityClasses = communityCircleMapper.selectList(new QueryWrapper<CommunityCircle>());
+        for (CommunityCircle communityCircle : communityClasses) {
+            String className = communityClassCircleMapper.getClassNameByCircleId(communityCircle.getId());
+            communityCircle.setCircleName(className + "·" + communityCircle.getCircleName());
+        }
         return AjaxResult.success(communityClasses);
     }
 

ruoyi-generator/src/main/java/com/ruoyi/generator/domain/Community/CommunityClass.java

@@ -1,18 +1,16 @@
 package com.ruoyi.generator.domain.Community;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import javax.validation.constraints.NotNull;
-
-import java.io.Serializable;
-
-import java.util.Date;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.Date;
+
 /**
 * 社区分类
 * @TableName community_class
@@ -33,7 +31,7 @@ public class CommunityClass implements Serializable {
     @Size(max= 10,message="编码长度不能超过10")
     @ApiModelProperty("分类名称")
     @Length(max= 10,message="编码长度不能超过10")
-    private String classname;
+    private String className;
     /**
     * 创建人
     */

ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/community/CommunityClassCircleMapper.java

@@ -6,4 +6,5 @@ import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface CommunityClassCircleMapper extends BaseMapper<CommunityClassCircle> {
+    String getClassNameByCircleId(long id);
 }

ruoyi-generator/src/main/resources/mapper/community/CommunityClassCircleMapper.xml

@@ -0,0 +1,12 @@
+<?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.ruoyi.generator.mapper.community.CommunityClassCircleMapper">
+    <select id="getClassNameByCircleId" resultType="java.lang.String">
+        select class_name
+        from community_class a
+                 left join community_class_circle b on a.id = b.class_id
+        where b.circle_id = #{id}
+    </select>
+</mapper>