Merge remote-tracking branch 'origin/developer' into developer

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabPushMessageMapper.java

@@ -68,4 +68,6 @@ public interface TabPushMessageMapper {
                                          @Param("endTime") Date endTime,
                                          @Param("pushClassifyId") Integer pushClassifyId,
                                          @Param("userId") Integer userId);
+
+    int readCount(@Param("messageId") Integer messageId);
 }
\ No newline at end of file

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/PushMessageService.java

@@ -16,4 +16,6 @@ public interface PushMessageService {
     Page<TabPushMessage> pagePushMesage(String search, Integer pushStatus, Date startTime, Date endTime, Integer pushClassifyId);
 
     Page<UserMessageDTO> pageUserMessage(String search, Integer status, Date startTime, Date endTime, Integer pushClassifyId, Integer userId);
+
+    int readCount(Integer messageId);
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/PushMessageServiceImpl.java

@@ -48,4 +48,9 @@ public class PushMessageServiceImpl implements PushMessageService {
                                                 Integer pushClassifyId, Integer userId) {
         return this.tabPushMessageMapper.pageUserMessage(search, status, startTime, endTime, pushClassifyId, userId);
     }
+
+    @Override
+    public int readCount(Integer messageId) {
+        return this.tabPushMessageMapper.readCount(messageId);
+    }
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/PushMessageApiServiceImpl.java

@@ -203,6 +203,9 @@ public class PushMessageApiServiceImpl implements PushMessageApiService {
     @Override
     public ServiceResponse<Integer> readMessage(Integer messageId, Integer userId) {
         int i = this.pushUserMessageService.readMessage(messageId, userId);
+        if(i > 0){
+            this.pushMessageService.readCount(messageId);
+        }
         return ServiceResponse.success(i);
     }
 

gic-platform-enterprise-service/src/main/resources/mapper/TabPushMessageMapper.xml

@@ -280,4 +280,9 @@
     </if>
     order by t1.status asc,t1.create_time desc
   </select>
+  <update id="readCount" parameterType="com.gic.enterprise.entity.TabPushMessage">
+    update tab_push_message
+    set read_count = read_count + 1
+    where message_id = #{messageId,jdbcType=INTEGER}
+  </update>
 </mapper>
\ No newline at end of file

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/PushMessageController.java

@@ -98,7 +98,7 @@ public class PushMessageController {
         if(StringUtils.isNotBlank(pushMessage.getPushTime())){
             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             try {
-                pushMessageDTO.setPushTime(dateFormat.parse(pushMessage.getPushTime()));
+                pushMessageDTO.setPushTime(dateFormat.parse(pushMessage.getPushTime().replace("T", " ").replace(".000+0000", "")));
             } catch (ParseException e) {
                 log.warn("异常", e);
                 return RestResponse.failure(ErrorCode.SYSTEM_ERROR.getCode(), "日期转换错误");