bug

blade-service-api/blade-business-api/src/main/java/org/springblade/business/feign/MessageWarningClient.java

@@ -6,6 +6,8 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.List;
+
 @FeignClient(value = BusinessConstant.APPLICATION_WEATHER_NAME)
 public interface MessageWarningClient {
 
@@ -14,4 +16,7 @@ public interface MessageWarningClient {
     @PostMapping(API_PREFIX + "/savePushUserMessageWarning")
     void savePushUserMessageWarning(@RequestBody MessageWarningVO vo);
 
+    @PostMapping(API_PREFIX + "/savePushUserMessageWarningList")
+    void savePushUserMessageWarning(@RequestBody List<MessageWarningVO> vo);
+
 }

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/MessageWarningVO.java

@@ -63,6 +63,9 @@ public class MessageWarningVO extends MessageWarning {
 	@ApiModelProperty("系统消息未读数量")
 	private Long typeFiveNumber;
 
+	@ApiModelProperty("已读、未读")
+	private Integer smsType;
+
 	@ApiModelProperty("用以批量标记已读,所勾选的列表数据ID")
 	private List<String> ids;
 

blade-service/blade-business/src/main/java/org/springblade/business/controller/BusinessUserOpinionController.java

@@ -189,8 +189,8 @@ public class BusinessUserOpinionController {
             try{
                 if(StringUtils.isNotEmpty(content)){
                     this.messageWarningClient.savePushUserMessageWarning(new MessageWarningVO(
-                            null,
-                            null,
+                            userOpinion.getProjectId(),
+                            userOpinion.getContractId(),
                             4,
                             content,
                             userOpinion.getCreateUser(),

blade-service/blade-business/src/main/java/org/springblade/business/controller/MessageWarningController.java

@@ -87,7 +87,7 @@ public class MessageWarningController extends BladeController {
 	@GetMapping("/queryCurrentUserMessageCount")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "获取当前用户的消息数量")
-	public R<MessageWarningVO> queryCurrentUserMessageCount(){
+	public R<MessageWarningVO> queryCurrentUserMessageCount(@RequestParam String projectId, @RequestParam String contractId){
 		MessageWarningVO vo = new MessageWarningVO();
 
 		for(int i = 1, l = 6; i < l; i ++){
@@ -96,6 +96,8 @@ public class MessageWarningController extends BladeController {
 			wrapper.eq(MessageWarning::getPushUser, AuthUtil.getUserId());
 			wrapper.eq(MessageWarning::getType, i);
 			wrapper.eq(MessageWarning::getIsRead, 0);
+			wrapper.eq(MessageWarning::getProjectId, projectId);
+			wrapper.eq(MessageWarning::getContractId, contractId);
 
 			//获取数量
 			Long typeNumber = this.messageWarningService.count(wrapper);
@@ -146,9 +148,6 @@ public class MessageWarningController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "分页", notes = "传入operationWarning")
 	public R<IPage<MessageWarningVO>> list(MessageWarningVO vo, Query query) {
-		//置空项目及合同段ID
-		vo.setProjectId(null);
-		vo.setContractId(null);
 
 		QueryWrapper<MessageWarning> wrapper = Condition.getQueryWrapper(vo);
 		//获取当前人的数据
@@ -157,8 +156,14 @@ public class MessageWarningController extends BladeController {
 			wrapper.lambda().between(MessageWarning::getCreateTime, vo.getStartTime(), DateUtil.format(DateUtils.addDays(DateUtil.parse(vo.getEndTime(), "yyyy-MM-dd"), 1), "yyyy-MM-dd"));
 		}
 
+		if(vo.getSmsType() != null && vo.getSmsType() > -1){
+			wrapper.lambda().eq(MessageWarning::getIsRead, new Integer("2").equals(vo.getSmsType()) ? 0 : 1);
+		}
+		//设置合同段ID
+		wrapper.lambda().eq(MessageWarning::getProjectId, vo.getProjectId()).eq(MessageWarning::getContractId, vo.getContractId());
+
 		//时间倒序，状态正序(已读在后，未读在前)
-		wrapper.lambda().orderByDesc(MessageWarning::getCreateTime).orderByAsc(MessageWarning::getIsRead);
+		wrapper.lambda().orderByAsc(MessageWarning::getIsRead).orderByDesc(MessageWarning::getCreateTime);
 
 		IPage<MessageWarningVO> iPage = MessageWarningWrapper.build().pageVO(this.messageWarningService.page(Condition.getPage(query), wrapper));
 

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/MessageWarningClientImpl.java

@@ -6,12 +6,19 @@ import org.springblade.business.service.IMessageWarningService;
 import org.springblade.business.vo.MessageWarningVO;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 @AllArgsConstructor
 public class MessageWarningClientImpl implements MessageWarningClient {
 
     private final IMessageWarningService messageWarningService;
 
+    @Override
+    public void savePushUserMessageWarning(List<MessageWarningVO> vo) {
+        this.messageWarningService.savePushUserMessageWarning(vo);
+    }
+
     @Override
     public void savePushUserMessageWarning(MessageWarningVO vo) {
         this.messageWarningService.savePushUserMessageWarning(vo);

blade-service/blade-business/src/main/java/org/springblade/business/service/IMessageWarningService.java

@@ -19,7 +19,6 @@ package org.springblade.business.service;
 import org.springblade.business.entity.MessageWarning;
 import org.springblade.business.vo.MessageWarningVO;
 import org.springblade.core.mp.base.BaseService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.List;