Merge branch 'feature/1221-suggest' into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/SysSuggestionTypeController.java

@@ -42,7 +42,6 @@ public class SysSuggestionTypeController {
     private SysUserService sysUserService;
 
     @ApiOperation(value = "详情", notes = "平台建议类型表-根据详情ID查询单条, 传入id")
-    @PreAuthorize("@pcs.hasPermissions('sysSuggestionType/detail')")
     @GetMapping("/detail/{id}")
     public R<SysSuggestionType> detail(@PathVariable("id") Long id) {
 
@@ -52,7 +51,6 @@ public class SysSuggestionTypeController {
     }
 
     @ApiOperation(value = "查询分页", notes = "平台建议类型表- 传入 SysSuggestionTypeWrapper.SysSuggestionTypeQuery")
-    @PreAuthorize("@pcs.hasPermissions('sysSuggestionType/page')")
     @PostMapping("/page")
     public R<PageInfo<SysSuggestionTypeWrapper.SysSuggestionType>> page(@RequestBody SysSuggestionTypeWrapper.SysSuggestionTypeQuery query) {
 

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/SysSuggestionV2Controller.java

@@ -80,7 +80,6 @@ public class SysSuggestionV2Controller extends BaseController {
      * @return R<PageInfo < SysSuggestionWrapper.SysSuggestion>>
      */
     @ApiOperation(value = "查询分页", notes = "传入sysSuggestionSearch")
-    @PreAuthorize("@pcs.hasPermissions('sysSuggestionV2/page')")
     @PostMapping("/page")
     public R<PageInfo<SysSuggestionWrapper.SysSuggestion>> page(@RequestBody SysSuggestionWrapper.SysSuggestionQuery query) {
         com.yonge.cooleshow.auth.api.entity.SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -124,7 +123,6 @@ public class SysSuggestionV2Controller extends BaseController {
      * @return R<Boolean>
      */
     @ApiOperation(value = "新增", notes = "传入sysSuggestion")
-    @PreAuthorize("@pcs.hasPermissions('sysSuggestionV2/save')")
     @PostMapping("/save")
     public R<Boolean> add(@Validated @RequestBody SysSuggestionVo.SysSuggestion suggestion,
                           @RequestHeader(name = "user-agent") String userAgent) {
@@ -143,7 +141,6 @@ public class SysSuggestionV2Controller extends BaseController {
     }
 
     @ApiOperation(value = "未读消息统计", notes = "统计当前用户推送未读消息数")
-    @PreAuthorize("@pcs.hasPermissions('sysSuggestionV2/suggestMessageUnread')")
     @GetMapping("/suggestMessageUnread")
     public R<List<SysMessageWrapper.MessageUnreadStat>> suggestMessageUnread() {
         com.yonge.cooleshow.auth.api.entity.SysUser userInfo = sysUserFeignService.queryUserInfo();

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/SysSuggestionTypeController.java

@@ -42,7 +42,6 @@ public class SysSuggestionTypeController {
     private SysUserService sysUserService;
 
     @ApiOperation(value = "详情", notes = "平台建议类型表-根据详情ID查询单条, 传入id")
-    @PreAuthorize("@pcs.hasPermissions('sysSuggestionType/detail')")
     @GetMapping("/detail/{id}")
     public R<SysSuggestionType> detail(@PathVariable("id") Long id) {
 
@@ -52,7 +51,6 @@ public class SysSuggestionTypeController {
     }
 
     @ApiOperation(value = "查询分页", notes = "平台建议类型表- 传入 SysSuggestionTypeWrapper.SysSuggestionTypeQuery")
-    @PreAuthorize("@pcs.hasPermissions('sysSuggestionType/page')")
     @PostMapping("/page")
     public R<PageInfo<SysSuggestionTypeWrapper.SysSuggestionType>> page(@RequestBody SysSuggestionTypeWrapper.SysSuggestionTypeQuery query) {
 

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/SysSuggestionV2Controller.java

@@ -71,7 +71,6 @@ public class SysSuggestionV2Controller extends BaseController {
      * @return R<PageInfo < SysSuggestionWrapper.SysSuggestion>>
      */
     @ApiOperation(value = "查询分页", notes = "传入sysSuggestionSearch")
-    @PreAuthorize("@pcs.hasPermissions('sysSuggestionV2/page')")
     @PostMapping("/page")
     public R<PageInfo<SysSuggestionWrapper.SysSuggestion>> page(@RequestBody SysSuggestionWrapper.SysSuggestionQuery query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -110,7 +109,6 @@ public class SysSuggestionV2Controller extends BaseController {
      * @return R<Boolean>
      */
     @ApiOperation(value = "新增", notes = "传入sysSuggestion")
-    @PreAuthorize("@pcs.hasPermissions('sysSuggestionV2/save')")
     @PostMapping("/save")
     public R<Boolean> add(@Validated @RequestBody SysSuggestionVo.SysSuggestion suggestion,
                           @RequestHeader(name = "user-agent") String userAgent) {
@@ -127,7 +125,6 @@ public class SysSuggestionV2Controller extends BaseController {
     }
 
     @ApiOperation(value = "未读消息统计", notes = "统计当前用户推送未读消息数")
-    @PreAuthorize("@pcs.hasPermissions('sysSuggestionV2/suggestMessageUnread')")
     @GetMapping("/suggestMessageUnread")
     public R<List<SysMessageWrapper.MessageUnreadStat>> suggestMessageUnread() {
         SysUser userInfo = sysUserFeignService.queryUserInfo();

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysSuggestionV2ServiceImpl.java

@@ -129,10 +129,8 @@ public class SysSuggestionV2ServiceImpl extends ServiceImpl<SysSuggestionV2Mappe
                 if (ClientEnum.TEACHER.equals(suggestion.getClientType())) {
                     messageType = MessageTypeEnum.SYS_SUGGEST_FEEDBACK_TEACHER;
                 }
-                SysSuggestionType type = Optional.ofNullable(sysSuggestionTypeMapper.selectById(suggestion.getSuggestionTypeId())).orElse(new SysSuggestionType());
-                String title = "【" + Optional.ofNullable(type.getName()).orElse("") + "】" + DateFormatUtils.format(handTime, "yyyy-MM-dd");
                 sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, messageType,
-                        receivers, null, 0, null, null, title, handleSuggestion.getFeedbackContent());
+                        receivers, null, 0, null, null, handleSuggestion.getFeedbackContent());
             } catch (Exception e) {
                 log.warn("意见反馈推送发送失败，{}", e.getMessage());
             }