add app宣教文章管理

nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/ArticleQuery.java

@@ -0,0 +1,32 @@
+package com.nb.web.api.feign;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.nb.web.api.entity.AppArticleEntity;
+import com.nb.web.api.entity.BusDeviceAlarmEntity;
+import com.nb.web.api.enums.AppArticleEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName AlarmQuery.java
+ * @Description
+ * @createTime 2022年05月16日 21:28:00
+ */
+@Data
+@ApiModel("宣教文章查询")
+public class ArticleQuery implements Serializable {
+
+    @ApiModelProperty(value = "文章类型",example = "0（术后镇痛） 1（癌痛知识） 2（评价标准） 3（健康资讯）",required = true)
+    @NotNull(message = "文章类型不能为空")
+    private AppArticleEnum type;
+
+    @ApiModelProperty(value = "分页参数",required = true)
+    @NotNull(message = "分页参数不能为空")
+    private Page<AppArticleEntity> page;
+}

nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/IAppArticleClient.java

@@ -0,0 +1,15 @@
+package com.nb.web.api.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.nb.web.api.entity.AppArticleEntity;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName IVersionClient.java
+ * @Description TODO
+ * @createTime 2022年10月10日 09:04:00
+ */
+public interface IAppArticleClient {
+    IPage<AppArticleEntity> page(ArticleQuery query);
+}

nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/query/AlarmQuery.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 
 /**
  * @author lifang
@@ -17,7 +18,7 @@ import javax.validation.constraints.NotNull;
  */
 @Data
 @ApiModel("报警信息查询参数")
-public class AlarmQuery {
+public class AlarmQuery implements Serializable {
     @ApiModelProperty("临床id")
     @NotNull(message = "临床id不能为空")
     private String clinicId;

nb-service/app-assistant/src/main/java/com/nb/app/assistant/controller/AppArticleController.java

@@ -0,0 +1,34 @@
+package com.nb.app.assistant.controller;
+
+import com.nb.core.result.R;
+import com.nb.web.api.feign.ArticleQuery;
+import com.nb.web.api.feign.IAppArticleClient;
+import com.nb.web.api.feign.IVersionClient;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName MsgController.java
+ * @Description TODO
+ * @createTime 2022年08月17日 20:38:00
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/app/article")
+@Api(tags = "宣教文章")
+@Slf4j
+public class AppArticleController {
+    private final IAppArticleClient articleClient;
+
+    @PostMapping("/page")
+    @ApiOperation("宣教文档分页查询")
+    public R page(@RequestBody@Validated ArticleQuery query){
+        return R.success(articleClient.page(query));
+    }
+}

nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/AppArticleController.java → nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/BusAppArticleController.java

@@ -21,7 +21,7 @@ import javax.annotation.Resource;
 @RestController
 @RequestMapping("/bus/app/article")
 @Api(tags = "app宣教文章管理",description="app宣教文章管理    权限： app:article: ",authorizations = {@Authorization("app:article:")})
-public class AppArticleController extends BaseCrudController<AppArticleEntity,String> {
+public class BusAppArticleController extends BaseCrudController<AppArticleEntity,String> {
     @Resource
     private LocalAppArticleService appArticleService;
 

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalAppArticleService.java

@@ -2,11 +2,15 @@ package com.nb.web.service.bus.service;
 
 import cn.dev33.satoken.exception.NotPermissionException;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.nb.auth.bean.LoginUser;
 import com.nb.auth.utils.SecurityUtil;
 import com.nb.common.crud.BaseService;
 import com.nb.core.exception.CustomException;
 import com.nb.web.api.entity.AppArticleEntity;
+import com.nb.web.api.feign.ArticleQuery;
+import com.nb.web.api.feign.IAppArticleClient;
 import com.nb.web.service.bus.entity.BusDocEntity;
 import com.nb.web.service.bus.mapper.AppArticleMapper;
 import com.nb.web.service.bus.mapper.BusDocMapper;
@@ -22,7 +26,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 @Slf4j
-public class LocalAppArticleService extends BaseService<AppArticleMapper, AppArticleEntity,String> {
+public class LocalAppArticleService extends BaseService<AppArticleMapper, AppArticleEntity,String> implements IAppArticleClient {
 
     @Override
     public void validateBeforeSave(AppArticleEntity entity) {
@@ -51,4 +55,11 @@ public class LocalAppArticleService extends BaseService<AppArticleMapper, AppArt
             }
         }
     }
+
+    @Override
+    public IPage<AppArticleEntity> page(ArticleQuery query) {
+        return this.page(query.getPage(),new QueryWrapper<AppArticleEntity>()
+                .lambda()
+                .eq(AppArticleEntity::getType,query.getType()));
+    }
 }