蓝小帮接口的完善

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/bulehelp/BmfwEventController.java

@@ -1,21 +1,45 @@
 package com.bizmatics.mhfire.controller.web.bulehelp;
 
 
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.mhfire.model.bulehelp.BmfwEvent;
+import com.bizmatics.mhfire.service.bulehelp.BmfwEventService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- *  前端控制器
+ *  项目申报记录
  * </p>
  *
- * @author liangcy
+ * @author yq
  * @since 2021-06-15
  */
-@Controller
+@RestController
 @RequestMapping("/bule/bmfwEvent")
 public class BmfwEventController {
 
+    @Autowired
+    private BmfwEventService bmfwEventService;
+
+    /**
+     * 分页
+     * @param current 页数
+     * @param size 条数
+     * @param unit 单位信息
+     * @return
+     */
+    @GetMapping("/page")
+    public ApiResult<CommonPage<BmfwEvent>> page(@RequestParam Integer current,
+                                                 @RequestParam Integer size,
+                                                 @RequestParam(required = false) String unit){
+        return ApiResult.success(bmfwEventService.page(current, size, unit));
+    }
 }
 

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/bulehelp/BmfwFeedbackController.java

@@ -1,21 +1,44 @@
 package com.bizmatics.mhfire.controller.web.bulehelp;
 
 
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.mhfire.model.bulehelp.BmfwEvent;
+import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
+import com.bizmatics.mhfire.service.bulehelp.BmfwFeedbackService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * <p>
- *  前端控制器
+ *  用户反馈记录
  * </p>
  *
- * @author liangcy
+ * @author yq
  * @since 2021-06-15
  */
 @Controller
 @RequestMapping("/bule/bmfwFeedback")
 public class BmfwFeedbackController {
 
+    @Autowired
+    private BmfwFeedbackService bmfwFeedbackService;
+
+
+    /**
+     * 分页
+     * @param current 页数
+     * @param size 条数
+     * @return
+     */
+    @GetMapping("/page")
+    public ApiResult<CommonPage<BmfwFeedback>> page(@RequestParam Integer current,
+                                                    @RequestParam Integer size){
+        return ApiResult.success(bmfwFeedbackService.page(current, size));
+    }
 }
 

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/bulehelp/BmfwLawsCatalogController.java

@@ -1,13 +1,21 @@
 package com.bizmatics.mhfire.controller.web.bulehelp;
 
 
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
+import com.bizmatics.mhfire.model.bulehelp.BmfwLawsCatalog;
+import com.bizmatics.mhfire.service.bulehelp.BmfwLawsCatalogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * <p>
- *  前端控制器
+ *  法规目录表
  * </p>
  *
  * @author liangcy
@@ -17,5 +25,25 @@ import org.springframework.stereotype.Controller;
 @RequestMapping("/bule/bmfwLawsCatalog")
 public class BmfwLawsCatalogController {
 
+    @Autowired
+    private BmfwLawsCatalogService bmfwLawsCatalogService;
+
+
+    /**
+     * 分页
+     * @param current 页数
+     * @param size 条数
+     * @param name 名称
+     * @param lawsId 法律名称
+     * @return
+     */
+    @GetMapping("/page")
+    public ApiResult<CommonPage<BmfwLawsCatalog>> page(@RequestParam Integer current,
+                                                       @RequestParam Integer size,
+                                                       @RequestParam(required = false) String name,
+                                                       @RequestParam(required = false) String lawsId){
+        return ApiResult.success(bmfwLawsCatalogService.page(current, size, name,lawsId));
+    }
+
 }
 

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/bulehelp/BmfwLawsCatalogInfoController.java

@@ -1,13 +1,21 @@
 package com.bizmatics.mhfire.controller.web.bulehelp;
 
 
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.mhfire.model.bulehelp.BmfwLawsCatalog;
+import com.bizmatics.mhfire.model.bulehelp.BmfwLawsCatalogInfo;
+import com.bizmatics.mhfire.service.bulehelp.BmfwLawsCatalogInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * <p>
- *  前端控制器
+ *  法规详情表
  * </p>
  *
  * @author liangcy
@@ -17,5 +25,25 @@ import org.springframework.stereotype.Controller;
 @RequestMapping("/bule/bmfwLawsCatalogInfo")
 public class BmfwLawsCatalogInfoController {
 
+    @Autowired
+    private BmfwLawsCatalogInfoService bmfwLawsCatalogInfoService;
+
+
+    /**
+     * 分页
+     * @param current 页数
+     * @param size 条数
+     * @param param value
+     * @param catalogId 法规目录id
+     * @return
+     */
+    @GetMapping("/page")
+    public ApiResult<CommonPage<BmfwLawsCatalogInfo>> page(@RequestParam Integer current,
+                                                           @RequestParam Integer size,
+                                                           @RequestParam(required = false) String param,
+                                                           @RequestParam(required = false) Integer catalogId){
+        return ApiResult.success(bmfwLawsCatalogInfoService.page(current, size, param,catalogId));
+    }
+
 }
 

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/bulehelp/BmfwLawsController.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Controller;
 
 /**
  * <p>
- *  前端控制器
+ *  法规记录表
  * </p>
  *
  * @author liangcy

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/bulehelp/BmfwLawsNewController.java

@@ -1,21 +1,46 @@
 package com.bizmatics.mhfire.controller.web.bulehelp;
 
 
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.mhfire.model.bulehelp.BmfwLawsCatalogInfo;
+import com.bizmatics.mhfire.model.bulehelp.BmfwLawsNew;
+import com.bizmatics.mhfire.service.bulehelp.BmfwLawsNewService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * <p>
- *  前端控制器
+ *  普法宣传记录
  * </p>
  *
- * @author liangcy
+ * @author yq
  * @since 2021-06-15
  */
 @Controller
 @RequestMapping("/bule/bmfwLawsNew")
 public class BmfwLawsNewController {
 
+    @Autowired
+    private BmfwLawsNewService bmfwLawsNewService;
+
+
+    /**
+     * 分页
+     * @param current 页数
+     * @param size 条数
+     * @param name
+     * @return
+     */
+    @GetMapping("/page")
+    public ApiResult<CommonPage<BmfwLawsNew>> page(@RequestParam Integer current,
+                                                   @RequestParam Integer size,
+                                                   @RequestParam(required = false) String name){
+        return ApiResult.success(bmfwLawsNewService.page(current, size, name));
+    }
 }
 

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/bulehelp/BmfwUserController.java

@@ -1,13 +1,21 @@
 package com.bizmatics.mhfire.controller.web.bulehelp;
 
 
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.mhfire.model.bulehelp.BmfwLawsNew;
+import com.bizmatics.mhfire.model.bulehelp.BmfwUser;
+import com.bizmatics.mhfire.service.bulehelp.BmfwUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * <p>
- *  前端控制器
+ *  用户信息
  * </p>
  *
  * @author liangcy
@@ -17,5 +25,20 @@ import org.springframework.stereotype.Controller;
 @RequestMapping("/bule/bmfwUser")
 public class BmfwUserController {
 
+    @Autowired
+    private BmfwUserService bmfwUserService;
+
+
+    /**
+     * 分页
+     * @param current 页数
+     * @param size 条数
+     * @return
+     */
+    @GetMapping("/page")
+    public ApiResult<CommonPage<BmfwUser>> page(@RequestParam Integer current,
+                                                @RequestParam Integer size){
+        return ApiResult.success(bmfwUserService.page(current, size));
+    }
 }
 

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/bulehelp/RobotQuestionController.java

@@ -1,21 +1,45 @@
 package com.bizmatics.mhfire.controller.web.bulehelp;
 
 
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.mhfire.model.bulehelp.BmfwUser;
+import com.bizmatics.mhfire.model.bulehelp.RobotQuestion;
+import com.bizmatics.mhfire.service.bulehelp.RobotQuestionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * <p>
- *  前端控制器
+ *  题目表
  * </p>
  *
- * @author liangcy
+ * @author yq
  * @since 2021-06-15
  */
 @Controller
 @RequestMapping("/bule/robotQuestion")
 public class RobotQuestionController {
 
+
+    @Autowired
+    private RobotQuestionService robotQuestionService;
+
+
+    /**
+     * 分页
+     * @param current 页数
+     * @param size 条数
+     * @return
+     */
+    @GetMapping("/page")
+    public ApiResult<CommonPage<RobotQuestion>> page(@RequestParam Integer current,
+                                                @RequestParam Integer size){
+        return ApiResult.success(robotQuestionService.page(current, size));
+    }
 }
 

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/bulehelp/RobotQuestionKeyController.java

@@ -1,21 +1,47 @@
 package com.bizmatics.mhfire.controller.web.bulehelp;
 
 
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.mhfire.model.bulehelp.RobotQuestion;
+import com.bizmatics.mhfire.model.bulehelp.RobotQuestionKey;
+import com.bizmatics.mhfire.service.bulehelp.RobotQuestionKeyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * <p>
- *  前端控制器
+ *  关键字信息
  * </p>
  *
- * @author liangcy
+ * @author yq
  * @since 2021-06-15
  */
 @Controller
 @RequestMapping("/bule/robotQuestionKey")
 public class RobotQuestionKeyController {
 
+    @Autowired
+    private RobotQuestionKeyService robotQuestionKeyService;
+
+
+    /**
+     * 分页
+     * @param current 页数
+     * @param size 条数
+     * @param name 名称
+     * @return
+     */
+    @GetMapping("/page")
+    public ApiResult<CommonPage<RobotQuestionKey>> page(@RequestParam Integer current,
+                                                     @RequestParam Integer size,
+                                                     @RequestParam(required = false) String name){
+        return ApiResult.success(robotQuestionKeyService.page(current, size, name));
+    }
+
 }
 

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/bulehelp/RobotQuestionMessageController.java

@@ -1,21 +1,46 @@
 package com.bizmatics.mhfire.controller.web.bulehelp;
 
 
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.mhfire.model.bulehelp.RobotQuestionKey;
+import com.bizmatics.mhfire.model.bulehelp.RobotQuestionMessage;
+import com.bizmatics.mhfire.service.bulehelp.RobotQuestionMessageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * <p>
- *  前端控制器
+ *  搜索问题记录表
  * </p>
  *
- * @author liangcy
+ * @author yq
  * @since 2021-06-15
  */
 @Controller
 @RequestMapping("/bule/robotQuestionMessage")
 public class RobotQuestionMessageController {
 
+    @Autowired
+    private RobotQuestionMessageService robotQuestionMessageService;
+
+
+    /**
+     * 分页
+     * @param current 页数
+     * @param size 条数
+     * @param classIf  分类
+     * @return
+     */
+    @GetMapping("/page")
+    public ApiResult<CommonPage<RobotQuestionMessage>> page(@RequestParam Integer current,
+                                                        @RequestParam Integer size,
+                                                        @RequestParam(required = false) String classIf){
+        return ApiResult.success(robotQuestionMessageService.page(current, size, classIf));
+    }
 }
 

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/bulehelp/RobotQuestionMessageRecordController.java

@@ -1,21 +1,43 @@
 package com.bizmatics.mhfire.controller.web.bulehelp;
 
 
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.mhfire.model.bulehelp.RobotQuestionMessage;
+import com.bizmatics.mhfire.model.bulehelp.RobotQuestionMessageRecord;
+import com.bizmatics.mhfire.service.bulehelp.RobotQuestionMessageRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * <p>
- *  前端控制器
+ *  留言记录信息
  * </p>
  *
- * @author liangcy
+ * @author yq
  * @since 2021-06-15
  */
 @Controller
 @RequestMapping("/bule/robotQuestionMessageRecord")
 public class RobotQuestionMessageRecordController {
 
+    @Autowired
+    private RobotQuestionMessageRecordService robotQuestionMessageRecordService;
+
+    /**
+     * 分页
+     * @param current 页数
+     * @param size 条数
+     * @return
+     */
+    @GetMapping("/page")
+    public ApiResult<CommonPage<RobotQuestionMessageRecord>> page(@RequestParam Integer current,
+                                                            @RequestParam Integer size){
+        return ApiResult.success(robotQuestionMessageRecordService.page(current, size));
+    }
 }
 

mhfire-controller/src/main/resources/application-dev.properties

@@ -19,6 +19,10 @@ spring.datasource.dynamic.primary=mhfire
 spring.datasource.dynamic.datasource.mhfire.url=jdbc:mysql://120.55.70.156:3306/mhfire?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&characterEncoding=utf8
 spring.datasource.dynamic.datasource.mhfire.username=root
 spring.datasource.dynamic.datasource.mhfire.password=123456
+#À¶Ð¡°ï
+spring.datasource.dynamic.datasource.bulehelp.url=jdbc:mysql://120.55.70.156:3306/bulehelp?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&characterEncoding=utf8
+spring.datasource.dynamic.datasource.bulehelp.username=root
+spring.datasource.dynamic.datasource.bulehelp.password=123456
 spring.datasource.dynamic.druid.initial-size=5                                                                       
 spring.datasource.dynamic.druid.min-idle=5
 spring.datasource.dynamic.druid.max-active=30

mhfire-model/src/main/java/com/bizmatics/mhfire/model/bulehelp/BmfwEvent.java

@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
  * 
  * </p>
  *
- * @author liangcy
+ * @author yq
  * @since 2021-06-15
  */
 @Data
@@ -57,11 +57,12 @@ public class BmfwEvent implements Serializable {
      */
     private String certificateImage;
 
+
+    private String phoneNo;
+
     /**
      * 办理人的手机号
      */
-    private String phoneNo;
-
     private String maskedPhoneNo;
 
     /**
@@ -69,8 +70,14 @@ public class BmfwEvent implements Serializable {
      */
     private String s;
 
+    /**
+     * 创建时间
+     */
     private LocalDateTime createTime;
 
+    /**
+     * 最后修改时间
+     */
     private LocalDateTime lastUpdTime;
 
     /**
@@ -103,6 +110,9 @@ public class BmfwEvent implements Serializable {
      */
     private String sendClassify;
 
+    /**
+     * 合格,不合格
+     */
     private String certificateS;
 
     private Integer isDel;

mhfire-model/src/main/java/com/bizmatics/mhfire/model/bulehelp/BmfwFeedback.java

@@ -26,12 +26,20 @@ public class BmfwFeedback implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+
     private String openid;
 
+    /**
+     * 反馈内容
+     */
     private String content;
-
+    /**
+     * 图片
+     */
     private String images;
-
+    /**
+     * 创建时间
+     */
     private LocalDateTime createTime;
 
 

mhfire-model/src/main/java/com/bizmatics/mhfire/model/bulehelp/BmfwLawsCatalog.java

@@ -36,8 +36,15 @@ public class BmfwLawsCatalog implements Serializable {
      */
     private String name;
 
+    /**
+     * 创建时间
+     */
     private LocalDateTime createTime;
 
+
+    /**
+     * 法规名称
+     */
     private String lawsId;
 
 

mhfire-model/src/main/java/com/bizmatics/mhfire/model/bulehelp/BmfwUser.java

@@ -34,7 +34,9 @@ public class BmfwUser implements Serializable {
     private String openid;
 
     private String phoneNo;
-
+    /**
+     * 手机号
+     */
     private String maskedPhoneNo;
 
     private LocalDateTime createTime;

mhfire-model/src/main/java/com/bizmatics/mhfire/model/bulehelp/RobotQuestionMessageRecord.java

@@ -55,5 +55,7 @@ public class RobotQuestionMessageRecord implements Serializable {
      */
     private String reason;
 
+    private RobotQuestionMessage robotQuestionMessage;
+
 
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/BmfwEventService.java

@@ -1,6 +1,7 @@
 package com.bizmatics.mhfire.service.bulehelp;
 
 
+import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.common.mvc.base.CrudService;
 import com.bizmatics.mhfire.model.bulehelp.BmfwEvent;
@@ -16,4 +17,6 @@ import com.bizmatics.mhfire.persistence.mapper.bulehelp.BmfwEventMapper;
  */
 public interface BmfwEventService extends CrudService<BmfwEvent> {
 
+    CommonPage<BmfwEvent> page(Integer current,Integer size,String unit);
+
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/BmfwFeedbackService.java

@@ -1,5 +1,6 @@
 package com.bizmatics.mhfire.service.bulehelp;
 
+import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.mvc.base.CrudService;
 import com.bizmatics.mhfire.model.bulehelp.BmfwEvent;
 import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
@@ -15,4 +16,5 @@ import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
  */
 public interface BmfwFeedbackService extends CrudService<BmfwFeedback> {
 
+    CommonPage<BmfwFeedback> page(Integer current,Integer size);
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/BmfwLawsCatalogInfoService.java

@@ -1,6 +1,8 @@
 package com.bizmatics.mhfire.service.bulehelp;
 
+import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.mhfire.model.bulehelp.BmfwEvent;
 import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
 import com.bizmatics.mhfire.model.bulehelp.BmfwLawsCatalogInfo;
 
@@ -15,4 +17,5 @@ import com.bizmatics.mhfire.model.bulehelp.BmfwLawsCatalogInfo;
  */
 public interface BmfwLawsCatalogInfoService extends CrudService<BmfwLawsCatalogInfo> {
 
+    CommonPage<BmfwLawsCatalogInfo> page(Integer current,Integer size,String param,Integer catalogId);
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/BmfwLawsCatalogService.java

@@ -1,6 +1,8 @@
 package com.bizmatics.mhfire.service.bulehelp;
 
+import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.mhfire.model.bulehelp.BmfwEvent;
 import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
 import com.bizmatics.mhfire.model.bulehelp.BmfwLawsCatalog;
 
@@ -15,4 +17,5 @@ import com.bizmatics.mhfire.model.bulehelp.BmfwLawsCatalog;
  */
 public interface BmfwLawsCatalogService extends CrudService<BmfwLawsCatalog> {
 
+    CommonPage<BmfwLawsCatalog> page(Integer current,Integer size,String name,String lawsId);
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/BmfwLawsNewService.java

@@ -1,6 +1,8 @@
 package com.bizmatics.mhfire.service.bulehelp;
 
+import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.mhfire.model.bulehelp.BmfwEvent;
 import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
 import com.bizmatics.mhfire.model.bulehelp.BmfwLawsNew;
 
@@ -15,4 +17,5 @@ import com.bizmatics.mhfire.model.bulehelp.BmfwLawsNew;
  */
 public interface BmfwLawsNewService extends CrudService<BmfwLawsNew> {
 
+    CommonPage<BmfwLawsNew> page(Integer current,Integer size,String name);
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/BmfwLawsService.java

@@ -1,6 +1,8 @@
 package com.bizmatics.mhfire.service.bulehelp;
 
+import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.mhfire.model.bulehelp.BmfwEvent;
 import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
 import com.bizmatics.mhfire.model.bulehelp.BmfwLaws;
 
@@ -15,4 +17,5 @@ import com.bizmatics.mhfire.model.bulehelp.BmfwLaws;
  */
 public interface BmfwLawsService extends CrudService<BmfwLaws> {
 
+    CommonPage<BmfwLaws> page(Integer current,Integer size,String param);
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/BmfwUserService.java

@@ -1,6 +1,8 @@
 package com.bizmatics.mhfire.service.bulehelp;
 
+import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.mhfire.model.bulehelp.BmfwEvent;
 import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
 import com.bizmatics.mhfire.model.bulehelp.BmfwUser;
 
@@ -15,4 +17,5 @@ import com.bizmatics.mhfire.model.bulehelp.BmfwUser;
  */
 public interface BmfwUserService extends CrudService<BmfwUser> {
 
+    CommonPage<BmfwUser> page(Integer current,Integer size);
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/RobotQuestionKeyService.java

@@ -1,6 +1,8 @@
 package com.bizmatics.mhfire.service.bulehelp;
 
+import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.mhfire.model.bulehelp.BmfwEvent;
 import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
 import com.bizmatics.mhfire.model.bulehelp.RobotQuestionKey;
 
@@ -15,4 +17,6 @@ import com.bizmatics.mhfire.model.bulehelp.RobotQuestionKey;
  */
 public interface RobotQuestionKeyService extends CrudService<RobotQuestionKey> {
 
+    CommonPage<RobotQuestionKey> page(Integer current,Integer size,String name);
+
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/RobotQuestionMessageRecordService.java

@@ -1,6 +1,8 @@
 package com.bizmatics.mhfire.service.bulehelp;
 
+import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.mhfire.model.bulehelp.BmfwEvent;
 import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
 import com.bizmatics.mhfire.model.bulehelp.RobotQuestionMessageRecord;
 
@@ -14,5 +16,6 @@ import com.bizmatics.mhfire.model.bulehelp.RobotQuestionMessageRecord;
  * @since 2021-06-15
  */
 public interface RobotQuestionMessageRecordService extends CrudService<RobotQuestionMessageRecord> {
+    CommonPage<RobotQuestionMessageRecord> page(Integer current,Integer size);
 
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/RobotQuestionMessageService.java

@@ -1,6 +1,8 @@
 package com.bizmatics.mhfire.service.bulehelp;
 
+import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.mhfire.model.bulehelp.BmfwEvent;
 import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
 import com.bizmatics.mhfire.model.bulehelp.RobotQuestionMessage;
 
@@ -15,4 +17,5 @@ import com.bizmatics.mhfire.model.bulehelp.RobotQuestionMessage;
  */
 public interface RobotQuestionMessageService extends CrudService<RobotQuestionMessage> {
 
+    CommonPage<RobotQuestionMessage> page(Integer current,Integer size,String param);
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/RobotQuestionService.java

@@ -1,7 +1,9 @@
 package com.bizmatics.mhfire.service.bulehelp;
 
 
+import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.mhfire.model.bulehelp.BmfwEvent;
 import com.bizmatics.mhfire.model.bulehelp.RobotQuestion;
 
 
@@ -15,4 +17,5 @@ import com.bizmatics.mhfire.model.bulehelp.RobotQuestion;
  */
 public interface RobotQuestionService extends CrudService<RobotQuestion> {
 
+    CommonPage<RobotQuestion> page(Integer current,Integer size);
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/impl/BmfwEventServiceImpl.java

@@ -1,22 +1,41 @@
 package com.bizmatics.mhfire.service.bulehelp.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.common.core.util.StringUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.mhfire.model.bulehelp.BmfwEvent;
 import com.bizmatics.mhfire.persistence.mapper.bulehelp.BmfwEventMapper;
 import com.bizmatics.mhfire.service.bulehelp.BmfwEventService;
+
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+
 /**
  * <p>
- *  服务实现类
+ *  项目申报记录表
  * </p>
  *
- * @author liangcy
+ * @author yq
  * @since 2021-06-15
  */
+@DS("bulehelp")
 @Service
 public class BmfwEventServiceImpl extends AbstractCrudService<BmfwEventMapper, BmfwEvent> implements BmfwEventService {
 
+    @Override
+    public CommonPage<BmfwEvent> page(Integer current,Integer size,String unit) {
+        LambdaQueryWrapper<BmfwEvent> productLambdaQueryWrapper = Wrappers.lambdaQuery(BmfwEvent.class)
+                .like(StringUtils.isNotBlank(unit), BmfwEvent::getUnit, unit);
+        IPage<BmfwEvent> page = new Page<>(current, size);
+        page = baseMapper.selectPage(page, productLambdaQueryWrapper);
+        return this.ToCommonPage(page);
+    }
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/impl/BmfwFeedbackServiceImpl.java

@@ -1,12 +1,22 @@
 package com.bizmatics.mhfire.service.bulehelp.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.common.core.util.StringUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.mhfire.model.bulehelp.BmfwEvent;
 import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
 import com.bizmatics.mhfire.persistence.mapper.bulehelp.BmfwFeedbackMapper;
 import com.bizmatics.mhfire.service.bulehelp.BmfwFeedbackService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+
 /**
  * <p>
  *  服务实现类
@@ -15,7 +25,15 @@ import org.springframework.stereotype.Service;
  * @author liangcy
  * @since 2021-06-15
  */
+@DS("bulehelp")
 @Service
 public class BmfwFeedbackServiceImpl extends AbstractCrudService<BmfwFeedbackMapper, BmfwFeedback> implements BmfwFeedbackService {
 
+    @Override
+    public CommonPage<BmfwFeedback> page(Integer current,Integer size) {
+        LambdaQueryWrapper<BmfwFeedback> productLambdaQueryWrapper = Wrappers.lambdaQuery(BmfwFeedback.class);
+        IPage<BmfwFeedback> page = new Page<>(current, size);
+        page = baseMapper.selectPage(page, productLambdaQueryWrapper);
+        return this.ToCommonPage(page);
+    }
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/impl/BmfwLawsCatalogInfoServiceImpl.java

@@ -1,13 +1,23 @@
 package com.bizmatics.mhfire.service.bulehelp.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.common.core.util.StringUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
 import com.bizmatics.mhfire.model.bulehelp.BmfwLawsCatalogInfo;
 import com.bizmatics.mhfire.persistence.mapper.bulehelp.BmfwLawsCatalogInfoMapper;
 import com.bizmatics.mhfire.service.bulehelp.BmfwLawsCatalogInfoService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+
 /**
  * <p>
  *  服务实现类
@@ -16,7 +26,17 @@ import org.springframework.stereotype.Service;
  * @author liangcy
  * @since 2021-06-15
  */
+@DS("bulehelp")
 @Service
 public class BmfwLawsCatalogInfoServiceImpl extends AbstractCrudService<BmfwLawsCatalogInfoMapper, BmfwLawsCatalogInfo> implements BmfwLawsCatalogInfoService {
 
+    @Override
+    public CommonPage<BmfwLawsCatalogInfo> page(Integer current,Integer size,String param,Integer catalogId) {
+        LambdaQueryWrapper<BmfwLawsCatalogInfo> productLambdaQueryWrapper = Wrappers.lambdaQuery(BmfwLawsCatalogInfo.class)
+                .like(StringUtils.isNotBlank(param), BmfwLawsCatalogInfo::getValue, param)
+                .eq(null != catalogId,BmfwLawsCatalogInfo::getCatalogId,catalogId);
+        IPage<BmfwLawsCatalogInfo> page = new Page<>(current, size);
+        page = baseMapper.selectPage(page, productLambdaQueryWrapper);
+        return this.ToCommonPage(page);
+    }
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/impl/BmfwLawsCatalogServiceImpl.java

@@ -1,13 +1,23 @@
 package com.bizmatics.mhfire.service.bulehelp.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.common.core.util.StringUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
 import com.bizmatics.mhfire.model.bulehelp.BmfwLawsCatalog;
 import com.bizmatics.mhfire.persistence.mapper.bulehelp.BmfwLawsCatalogMapper;
 import com.bizmatics.mhfire.service.bulehelp.BmfwLawsCatalogService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+
 /**
  * <p>
  *  服务实现类
@@ -16,7 +26,17 @@ import org.springframework.stereotype.Service;
  * @author liangcy
  * @since 2021-06-15
  */
+@DS("bulehelp")
 @Service
 public class BmfwLawsCatalogServiceImpl extends AbstractCrudService<BmfwLawsCatalogMapper, BmfwLawsCatalog> implements BmfwLawsCatalogService {
 
+    @Override
+    public CommonPage<BmfwLawsCatalog> page(Integer current,Integer size,String name,String lawsId) {
+        LambdaQueryWrapper<BmfwLawsCatalog> productLambdaQueryWrapper = Wrappers.lambdaQuery(BmfwLawsCatalog.class)
+                .like(StringUtils.isNotBlank(name), BmfwLawsCatalog::getName, name)
+                .eq(StringUtils.isNotBlank(lawsId), BmfwLawsCatalog::getLawsId, lawsId);
+        IPage<BmfwLawsCatalog> page = new Page<>(current, size);
+        page = baseMapper.selectPage(page, productLambdaQueryWrapper);
+        return this.ToCommonPage(page);
+    }
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/impl/BmfwLawsNewServiceImpl.java

@@ -1,13 +1,23 @@
 package com.bizmatics.mhfire.service.bulehelp.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.common.core.util.StringUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
 import com.bizmatics.mhfire.model.bulehelp.BmfwLawsNew;
 import com.bizmatics.mhfire.persistence.mapper.bulehelp.BmfwLawsNewMapper;
 import com.bizmatics.mhfire.service.bulehelp.BmfwLawsNewService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+
 /**
  * <p>
  *  服务实现类
@@ -16,7 +26,16 @@ import org.springframework.stereotype.Service;
  * @author liangcy
  * @since 2021-06-15
  */
+@DS("bulehelp")
 @Service
 public class BmfwLawsNewServiceImpl extends AbstractCrudService<BmfwLawsNewMapper, BmfwLawsNew> implements BmfwLawsNewService {
 
+    @Override
+    public CommonPage<BmfwLawsNew> page(Integer current,Integer size,String name) {
+        LambdaQueryWrapper<BmfwLawsNew> productLambdaQueryWrapper = Wrappers.lambdaQuery(BmfwLawsNew.class)
+                .like(StringUtils.isNotBlank(name), BmfwLawsNew::getClassify, name);
+        IPage<BmfwLawsNew> page = new Page<>(current, size);
+        page = baseMapper.selectPage(page, productLambdaQueryWrapper);
+        return this.ToCommonPage(page);
+    }
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/impl/BmfwLawsServiceImpl.java

@@ -1,12 +1,22 @@
 package com.bizmatics.mhfire.service.bulehelp.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.common.core.util.StringUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
 import com.bizmatics.mhfire.model.bulehelp.BmfwLaws;
 import com.bizmatics.mhfire.persistence.mapper.bulehelp.BmfwLawsMapper;
 import com.bizmatics.mhfire.service.bulehelp.BmfwLawsService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+
 /**
  * <p>
  *  服务实现类
@@ -15,7 +25,16 @@ import org.springframework.stereotype.Service;
  * @author liangcy
  * @since 2021-06-15
  */
+@DS("bulehelp")
 @Service
 public class BmfwLawsServiceImpl extends AbstractCrudService<BmfwLawsMapper, BmfwLaws> implements BmfwLawsService {
 
+    @Override
+    public CommonPage<BmfwLaws> page(Integer current,Integer size,String param) {
+        LambdaQueryWrapper<BmfwLaws> productLambdaQueryWrapper = Wrappers.lambdaQuery(BmfwLaws.class)
+                .like(StringUtils.isNotBlank(param), BmfwLaws::getId, param);
+        IPage<BmfwLaws> page = new Page<>(current, size);
+        page = baseMapper.selectPage(page, productLambdaQueryWrapper);
+        return this.ToCommonPage(page);
+    }
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/impl/BmfwUserServiceImpl.java

@@ -1,13 +1,23 @@
 package com.bizmatics.mhfire.service.bulehelp.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.common.core.util.StringUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
 import com.bizmatics.mhfire.model.bulehelp.BmfwUser;
 import com.bizmatics.mhfire.persistence.mapper.bulehelp.BmfwUserMapper;
 import com.bizmatics.mhfire.service.bulehelp.BmfwUserService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+
 /**
  * <p>
  *  服务实现类
@@ -16,7 +26,15 @@ import org.springframework.stereotype.Service;
  * @author liangcy
  * @since 2021-06-15
  */
+@DS("bulehelp")
 @Service
 public class BmfwUserServiceImpl extends AbstractCrudService<BmfwUserMapper, BmfwUser> implements BmfwUserService {
 
+    @Override
+    public CommonPage<BmfwUser> page(Integer current,Integer size) {
+        LambdaQueryWrapper<BmfwUser> productLambdaQueryWrapper = Wrappers.lambdaQuery(BmfwUser.class);
+        IPage<BmfwUser> page = new Page<>(current, size);
+        page = baseMapper.selectPage(page, productLambdaQueryWrapper);
+        return this.ToCommonPage(page);
+    }
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/impl/RobotQuestionKeyServiceImpl.java

@@ -1,13 +1,23 @@
 package com.bizmatics.mhfire.service.bulehelp.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.common.core.util.StringUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
 import com.bizmatics.mhfire.model.bulehelp.RobotQuestionKey;
 import com.bizmatics.mhfire.persistence.mapper.bulehelp.RobotQuestionKeyMapper;
 import com.bizmatics.mhfire.service.bulehelp.RobotQuestionKeyService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+
 /**
  * <p>
  *  服务实现类
@@ -16,7 +26,16 @@ import org.springframework.stereotype.Service;
  * @author liangcy
  * @since 2021-06-15
  */
+@DS("bulehelp")
 @Service
 public class RobotQuestionKeyServiceImpl extends AbstractCrudService<RobotQuestionKeyMapper, RobotQuestionKey> implements RobotQuestionKeyService {
 
+    @Override
+    public CommonPage<RobotQuestionKey> page(Integer current,Integer size,String name) {
+        LambdaQueryWrapper<RobotQuestionKey> productLambdaQueryWrapper = Wrappers.lambdaQuery(RobotQuestionKey.class)
+                .like(StringUtils.isNotBlank(name), RobotQuestionKey::getId, name);
+        IPage<RobotQuestionKey> page = new Page<>(current, size);
+        page = baseMapper.selectPage(page, productLambdaQueryWrapper);
+        return this.ToCommonPage(page);
+    }
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/impl/RobotQuestionMessageRecordServiceImpl.java

@@ -1,13 +1,26 @@
 package com.bizmatics.mhfire.service.bulehelp.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.common.core.util.StringUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
 import com.bizmatics.mhfire.model.bulehelp.RobotQuestionMessageRecord;
 import com.bizmatics.mhfire.persistence.mapper.bulehelp.RobotQuestionMessageRecordMapper;
 import com.bizmatics.mhfire.service.bulehelp.RobotQuestionMessageRecordService;
+import com.bizmatics.mhfire.service.bulehelp.RobotQuestionMessageService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Optional;
+
 /**
  * <p>
  *  服务实现类
@@ -16,7 +29,20 @@ import org.springframework.stereotype.Service;
  * @author liangcy
  * @since 2021-06-15
  */
+@DS("bulehelp")
 @Service
 public class RobotQuestionMessageRecordServiceImpl extends AbstractCrudService<RobotQuestionMessageRecordMapper, RobotQuestionMessageRecord> implements RobotQuestionMessageRecordService {
-
+    @Autowired
+    private RobotQuestionMessageService robotQuestionMessageService;
+    @Override
+    public CommonPage<RobotQuestionMessageRecord> page(Integer current,Integer size) {
+        LambdaQueryWrapper<RobotQuestionMessageRecord> productLambdaQueryWrapper = Wrappers.lambdaQuery(RobotQuestionMessageRecord.class);
+        IPage<RobotQuestionMessageRecord> page = new Page<>(current, size);
+        page = baseMapper.selectPage(page, productLambdaQueryWrapper);
+        page.getRecords().forEach(robotQuestionMessageRecord ->
+            Optional.ofNullable(robotQuestionMessageRecord.getMessageId())
+                    .ifPresent(messageId -> robotQuestionMessageRecord.setRobotQuestionMessage(robotQuestionMessageService.getById(messageId)))
+        );
+        return this.ToCommonPage(page);
+    }
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/impl/RobotQuestionMessageServiceImpl.java

@@ -1,13 +1,23 @@
 package com.bizmatics.mhfire.service.bulehelp.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.common.core.util.StringUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
 import com.bizmatics.mhfire.model.bulehelp.RobotQuestionMessage;
 import com.bizmatics.mhfire.persistence.mapper.bulehelp.RobotQuestionMessageMapper;
 import com.bizmatics.mhfire.service.bulehelp.RobotQuestionMessageService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+
 /**
  * <p>
  *  服务实现类
@@ -16,7 +26,16 @@ import org.springframework.stereotype.Service;
  * @author liangcy
  * @since 2021-06-15
  */
+@DS("bulehelp")
 @Service
 public class RobotQuestionMessageServiceImpl extends AbstractCrudService<RobotQuestionMessageMapper, RobotQuestionMessage> implements RobotQuestionMessageService {
 
+    @Override
+    public CommonPage<RobotQuestionMessage> page(Integer current,Integer size,String param) {
+        LambdaQueryWrapper<RobotQuestionMessage> productLambdaQueryWrapper = Wrappers.lambdaQuery(RobotQuestionMessage.class)
+                .like(StringUtils.isNotBlank(param), RobotQuestionMessage::getClassify, param);
+        IPage<RobotQuestionMessage> page = new Page<>(current, size);
+        page = baseMapper.selectPage(page, productLambdaQueryWrapper);
+        return this.ToCommonPage(page);
+    }
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/bulehelp/impl/RobotQuestionServiceImpl.java

@@ -1,13 +1,23 @@
 package com.bizmatics.mhfire.service.bulehelp.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.common.core.util.StringUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.mhfire.model.bulehelp.BmfwFeedback;
 import com.bizmatics.mhfire.model.bulehelp.RobotQuestion;
 import com.bizmatics.mhfire.persistence.mapper.bulehelp.RobotQuestionMapper;
 import com.bizmatics.mhfire.service.bulehelp.RobotQuestionService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+
 /**
  * <p>
  *  服务实现类
@@ -16,7 +26,15 @@ import org.springframework.stereotype.Service;
  * @author liangcy
  * @since 2021-06-15
  */
+@DS("bulehelp")
 @Service
 public class RobotQuestionServiceImpl extends AbstractCrudService<RobotQuestionMapper, RobotQuestion> implements RobotQuestionService {
 
+    @Override
+    public CommonPage<RobotQuestion> page(Integer current,Integer size) {
+        LambdaQueryWrapper<RobotQuestion> productLambdaQueryWrapper = Wrappers.lambdaQuery(RobotQuestion.class);
+        IPage<RobotQuestion> page = new Page<>(current, size);
+        page = baseMapper.selectPage(page, productLambdaQueryWrapper);
+        return this.ToCommonPage(page);
+    }
 }