diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageProducerController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageProducerController.java index f66a177..0ce9670 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageProducerController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageProducerController.java @@ -44,8 +44,9 @@ public class BizMessageProducerController { @ApiOperation("删除信息.") @DeleteMapping @ResponseStatus(code = HttpStatus.OK) - public BaseResponse> deleteMessageByCode(@ApiParam(value = "消息内容", required = true)@RequestParam("code") String code) { + public BaseResponse deleteMessageByCode(@RequestParam(value = "code",required = true) String code, + @RequestParam(value = "userId",required = false)String userId) { - return BaseResponse.success(service.deleteMessageByCode(code)); + return BaseResponse.success(service.deleteMessageByCode(code,userId)); } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java index d7e5463..b2bbe04 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java @@ -25,5 +25,5 @@ public interface BizMessageMapper extends BaseMapper { Integer deleteMessageByServicecdoe(List magIds); - Integer deleteAuthorizeByServicecdoe(List magIds); + Integer deleteAuthorizeByServicecdoe(@Param("magId")String magId,@Param("userIds")List userIds); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml index a7f556b..ed87114 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml @@ -94,9 +94,12 @@ delete from biz_message_authorize - where message_id in - - #{id} - + where message_id = #{magId} + + and user_id in + + #{id} + + \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageProducerService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageProducerService.java index da43a30..e8a135b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageProducerService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageProducerService.java @@ -10,5 +10,5 @@ public interface BizMessageProducerService { Optional produce(BizMessageRawDTO messageRaw); - Map deleteMessageByCode(String questId); + Boolean deleteMessageByCode(String questId,String userId); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageProducerServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageProducerServiceImpl.java index d127831..fd3948e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageProducerServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageProducerServiceImpl.java @@ -26,10 +26,7 @@ import org.springframework.util.Assert; import java.io.IOException; import java.io.StringWriter; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; import java.util.stream.Collectors; /** @@ -168,20 +165,19 @@ public class BizMessageProducerServiceImpl implements BizMessageProducerService * @return */ @Override - public Map deleteMessageByCode(String questId) { + public Boolean deleteMessageByCode(String questId,String userId) { List messageList = messageMapper.findMessageByLikeCode(questId); log.info(" 删除查询结果 messageList: "+messageList); List magIds = messageList.stream().map(BizMessage::getId).distinct().collect(Collectors.toList()); Map map = new HashMap<>(); - Integer m = new Integer(0); - Integer a = new Integer(0); if(magIds!=null&&magIds.size()>0) { - m = messageMapper.deleteMessageByServicecdoe(magIds); - a = messageMapper.deleteAuthorizeByServicecdoe(magIds); + List userIds = new ArrayList<>(); + userIds.add(userId); + magIds.forEach(magid->{ + messageMapper.deleteAuthorizeByServicecdoe(magid,userIds); + }); } - map.put("deleteMessage", m); - map.put("deleteAuthorize", a); - return map; + return true; } }