查看短信验证码

mec-application/src/main/java/com/ym/mec/teacher/controller/SysMessageController.java

@@ -90,24 +90,4 @@ public class SysMessageController extends BaseController {
 		sysMessageService.sendMessage(messageSender, sysUser.getId(), "", content, receiver, null, readStatus, url, group,"TEACHER");
 		return succeed();
 	}
-
-	@ApiOperation(value = "查询分页", notes = "传入sysMessageSearch")
-	@PreAuthorize("@auditsvc.hasPermissions('sysMessage/page', {'BACKEND'})")
-	@PostMapping("/page")
-	public HttpResponseResult<PageInfo<SysMessageVo.SysMessageList>> page(@RequestBody SysMessageVo.SysMessageQuery query) {
-		// 数据类型转换
-		PageInfo<SysMessageVo.SysMessageList> records = sysMessageService.queryMessageCode(query);
-
-		Pattern pattern = Pattern.compile("验证码\\d+");
-		records.getRows().forEach(next -> {
-			String content = next.getContent();
-			if (StringUtils.isNotEmpty(content)) {
-				Matcher matcher = pattern.matcher(content);
-				if (matcher.find()) {
-					next.setVerityCode(matcher.group().replace("验证码",""));
-				}
-			}
-		});
-		return succeed(records);
-	}
 }

mec-application/src/main/java/com/ym/mec/web/controller/SysMessageController.java

@@ -5,21 +5,24 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.AppVersionInfoDao;
 import com.ym.mec.biz.dal.dto.SysMessageDto;
+import com.ym.mec.biz.dal.dto.SysMessageVo;
 import com.ym.mec.biz.dal.entity.AppVersionInfo;
 import com.ym.mec.biz.dal.enums.MessageSendMode;
 import com.ym.mec.biz.dal.page.SysMessageQueryInfo;
 import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 @RestController
 @Api(tags = "消息服务")
@@ -95,4 +98,25 @@ public class SysMessageController extends BaseController {
 		}
 		return succeed(sysMessageService.queryCountOfUnread(MessageSendMode.SEO, sysUser.getId(),null, sysUser.getTenantId()));
 	}
+
+
+	@ApiOperation(value = "查询分页", notes = "传入sysMessageSearch")
+	@PreAuthorize("@pcs.hasPermissions('sysMessage/page')")
+	@PostMapping("/page")
+	public HttpResponseResult<PageInfo<SysMessageVo.SysMessageList>> page(@RequestBody SysMessageVo.SysMessageQuery query) {
+		// 数据类型转换
+		PageInfo<SysMessageVo.SysMessageList> records = sysMessageService.queryMessageCode(query);
+
+		Pattern pattern = Pattern.compile("验证码\\d+");
+		records.getRows().forEach(next -> {
+			String content = next.getContent();
+			if (StringUtils.isNotEmpty(content)) {
+				Matcher matcher = pattern.matcher(content);
+				if (matcher.find()) {
+					next.setVerityCode(matcher.group().replace("验证码",""));
+				}
+			}
+		});
+		return succeed(records);
+	}
 }