Commit e44506f866c46b0078240f0e0d19d26dda1e8968
1 parent
d85dd605
feat(*): 优化代码
- 优化代码
Showing
2 changed files
with
11 additions
and
10 deletions
fw-hestia-server/src/main/java/cn/fw/hestia/server/controller/api/MessageCenterServiceImpl.kt
... | ... | @@ -23,10 +23,11 @@ import javax.validation.constraints.NotNull |
23 | 23 | */ |
24 | 24 | @RestController |
25 | 25 | @RequestMapping("/api/hestia/mc") |
26 | -class MessageCenterServiceImpl(private val messageCenterBizService: MessageCenterBizService) : | |
26 | +class MessageCenterServiceImpl( | |
27 | + private val messageCenterBizService: MessageCenterBizService, | |
28 | + @Value("\${task.max-size}") private val maxSize: Int = 0 | |
29 | +) : | |
27 | 30 | IMessageCenterService { |
28 | - @Value("\${task.max-size}") | |
29 | - private val maxSize = 0 | |
30 | 31 | |
31 | 32 | @PostMapping("/send") |
32 | 33 | @ControllerMethod("发送模板消息") | ... | ... |
fw-hestia-service/src/main/java/cn/fw/hestia/service/buz/MessageCenterBizService.kt
... | ... | @@ -102,12 +102,12 @@ class MessageCenterBizService( |
102 | 102 | val key = sendDataPrefix |
103 | 103 | val setOps = redisTemplate.boundSetOps(key) |
104 | 104 | val seanceToken = history.id.toString() |
105 | - if (java.lang.Boolean.TRUE == setOps.isMember(seanceToken)) { | |
105 | + if (true == setOps.isMember(seanceToken)) { | |
106 | 106 | return |
107 | 107 | } |
108 | 108 | val result = saveLog(createTmParam(history), history.id) { r: SendLog -> |
109 | - r.manual = java.lang.Boolean.FALSE | |
110 | - if (java.lang.Boolean.TRUE == r.succeed) { | |
109 | + r.manual = false | |
110 | + if (true == r.succeed) { | |
111 | 111 | setOps.add(seanceToken) |
112 | 112 | } |
113 | 113 | } |
... | ... | @@ -239,8 +239,8 @@ class MessageCenterBizService( |
239 | 239 | |
240 | 240 | |
241 | 241 | fun readMessage(history: MessageHistory) { |
242 | - if (java.lang.Boolean.FALSE == history.readz) { | |
243 | - history.readz = java.lang.Boolean.TRUE | |
242 | + if (false == history.readz) { | |
243 | + history.readz = true | |
244 | 244 | history.state = MessageStateEnum.SUMI |
245 | 245 | messageHistoryService.updateById(history) |
246 | 246 | } |
... | ... | @@ -251,7 +251,7 @@ class MessageCenterBizService( |
251 | 251 | return messageHistory?.run { |
252 | 252 | val result = saveLog( |
253 | 253 | createTmParam(messageHistory), messageHistory.id |
254 | - ) { r: SendLog -> r.manual = java.lang.Boolean.TRUE } | |
254 | + ) { r: SendLog -> r.manual = true } | |
255 | 255 | val succeed = MessageConstant.SUCCEED_STR == result |
256 | 256 | if (succeed) { |
257 | 257 | messageHistory.state = MessageStateEnum.SUMI |
... | ... | @@ -267,7 +267,7 @@ class MessageCenterBizService( |
267 | 267 | |
268 | 268 | private fun saveLog(tmParam: TMParam, messageId: Long?, cons: Consumer<SendLog>): String { |
269 | 269 | val result = MessageConstant.SUCCEED_STR |
270 | - val sendLog = SendLog(messageId, Date(), true, java.lang.Boolean.FALSE, result) | |
270 | + val sendLog = SendLog(messageId, Date(), succeed = true, manual = false, result) | |
271 | 271 | sendLogService.save(sendLog) |
272 | 272 | return result |
273 | 273 | } | ... | ... |