系统消息列表接口

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/admin/service/impl/AdminUpushServiceImpl.java

@@ -87,8 +87,12 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
             adminUpushMapper.insert(adminUpush);
 
             // 处理缓存数据
+            AdminUpush adminUpushInfo = adminUpushMapper.selectOne(Wrappers.lambdaQuery(AdminUpush.class).eq(AdminUpush::getUpushId, upushId));
+            if (null == adminUpushInfo.getPushTime()) {
+                adminUpushInfo.setPushTime("");
+            }
             AdminUpushVo adminUpushVo = new AdminUpushVo();
-            BeanUtils.copyProperties(adminUpush, adminUpushVo);
+            BeanUtils.copyProperties(adminUpushInfo, adminUpushVo);
             mongoTemplate.insert(adminUpushVo, AdminUpushVo.class.getSimpleName());
 
             if (adminUpush.getIsPush() == 1) {

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/basicServices/AdminUpushController.java

+package com.liquidnet.service.platform.controller.basicServices;
+
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.adam.dto.vo.admin.AdminUpushVo;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.platform.service.basicServices.AdminUpushServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 友盟推送 系统消息
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-07-15
+ */
+@Api(tags = "basicServices")
+@RestController
+@RequestMapping("basicServices/upush")
+public class AdminUpushController {
+
+    @Autowired
+    private AdminUpushServiceImpl adminUpushServiceImpl;
+
+    @GetMapping("system")
+    @ApiOperation("系统消息列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "query", dataType = "Integer", name = "page", value = "页码"),
+            @ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "每页数量"),
+    })
+    public ResponseDto<PageInfo<AdminUpushVo>> lists(
+            @RequestParam(defaultValue = "1") Integer page,
+            @RequestParam(defaultValue = "10") Integer size
+    ) {
+        PageInfo<AdminUpushVo> result = adminUpushServiceImpl.lists(page, size);
+
+        return ResponseDto.success(result);
+    }
+
+}

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/basicServices/AlOssController.java

@@ -31,7 +31,6 @@ import java.util.UUID;
  * @author jiangxiulong
  * @since 2021-07-09
  */
-
 @Api(tags = "basicServices")
 @RestController
 @RequestMapping("basicServices/alOss")

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/basicServices/WechatShareController.java

@@ -34,7 +34,6 @@ import java.util.UUID;
  * @author jiangxiulong
  * @since 2021-07-09
  */
-
 @Api(tags = "basicServices")
 @RestController
 @RequestMapping("basicServices/wechatShareSign")

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/basicServices/ZhengzaiAppVersionsController.java

@@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @author jiangxiulong
  * @since 2021-07-09
  */
-
 @Api(tags = "basicServices")
 @RestController
 @RequestMapping("basicServices/ZhengzaiAppVersions")

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/basicServices/AdminUpushServiceImpl.java

+package com.liquidnet.service.platform.service.basicServices;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.adam.dto.vo.admin.AdminUpushVo;
+import com.liquidnet.service.kylin.entity.AdminUpush;
+import com.liquidnet.service.kylin.mapper.AdminUpushMapper;
+import com.liquidnet.service.kylin.service.admin.IAdminUpushService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 轮播图 服务实现类
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-05-02
+ */
+@Service
+public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUpush> implements IAdminUpushService {
+
+    @Value("${liquidnet.al-oss.imgUrl}")
+    private String imgUrl;
+
+    @Autowired
+    MongoTemplate mongoTemplate;
+
+    @Autowired
+    RedisUtil redisUtil;
+
+    public PageInfo<AdminUpushVo> lists(Integer page, Integer size) {
+        Query query = Query.query(
+                Criteria.where("specifyType").is(2).and("messageType").is(2)
+                .and("pushTime").lt(DateUtil.getNowTime())
+        );
+
+        long count = mongoTemplate.count(query, AdminUpushVo.class.getSimpleName());
+
+        PageInfo<AdminUpushVo> voPageInfo = null;
+        if (count > 0) {
+            Pageable pageable = PageRequest.of(page - 1, size, Sort.by(Sort.Direction.DESC, "createdAt"));
+
+            query.with(pageable);
+
+            List<AdminUpushVo> msgList = mongoTemplate.find(
+                    query,
+                    AdminUpushVo.class,
+                    AdminUpushVo.class.getSimpleName()
+            );
+
+            if (!CollectionUtils.isEmpty(msgList)) {
+                for (AdminUpushVo info : msgList) {
+                    String img = imgUrl + info.getImg();
+                    info.setImg(img);
+                }
+            }
+
+            voPageInfo = PageInfo.of(msgList);
+            voPageInfo.setTotal(count);
+        } else {
+            voPageInfo = new PageInfo<>();
+        }
+        return voPageInfo;
+    }
+
+}