Merge remote-tracking branch 'origin/master'

fuliqi

2023-11-30 e5bf0d08d05f5c58224fe28cdf743a1bae88e3f0

 ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java

@@ -2,10 +2,12 @@


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.bo.AdminUserDetails;
import com.ycl.dto.message.MessageParam;
import com.ycl.entity.caseHandler.BaseCase;
import com.ycl.entity.message.Message;
import com.ycl.mapper.user.UmsAdminMapper;
import com.ycl.service.message.IMessageService;
@@ -17,6 +19,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;

@@ -35,7 +38,7 @@

    @Autowired
    private IMessageService iMessageService;
    @Autowired
    @Resource
    private UmsAdminMapper umsAdminMapper;

    @ApiOperation(value = "发送消息")
@@ -72,6 +75,7 @@
        message.setCreateUser(user.getUserId());
        message.setCreateTime(new Date());
        message.setTargetFrom(umsAdminMapper.selectById(user.getUserId()).getUsername());
        message.setIsView(0);
        return CommonResult.success(iMessageService.save(message));
    }

@@ -108,6 +112,14 @@
        return CommonResult.failed();
    }

    @ApiOperation(value = "查询我的消息")
    @GetMapping("/queryMyMessage")
    public CommonResult<Page<Message>> queryMyMessage(@RequestParam Integer pageSize,
                                                  @RequestParam Integer current){
                               AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        return CommonResult.success(iMessageService.queryMyMessage(new Page<Message>().setCurrent(current).setSize(pageSize), user.getUserId()));
    }


    @ApiOperation("消息已查看")
    @PostMapping("/modification_batch")