实体类信息的完善

mhfire-controller/src/main/resources/smart-doc.json

@@ -4,7 +4,7 @@
   "isStrict": false,
   "coverOld": true,
   "allInOne": true,
-  "packageFilters": "com.bizmatics.mhfire.controller.web",
+  "packageFilters": "com.bizmatics.mhfire.controller.web.bulehelp",
   "requestExample":"false",
   "responseExample":"true",
   "projectName": "mhfire"

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

@@ -23,6 +23,9 @@ public class BmfwLawsCatalog implements Serializable {
 
     private static final long serialVersionUID=1L;
 
+    /**
+     * id
+     */
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 

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

@@ -1,6 +1,7 @@
 package com.bizmatics.mhfire.model.bulehelp;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -23,9 +24,14 @@ public class BmfwLawsCatalogInfo implements Serializable {
 
     private static final long serialVersionUID=1L;
 
+
+    /**
+     * id
+     */
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+
     private Integer catalogId;
 
     /**
@@ -42,5 +48,11 @@ public class BmfwLawsCatalogInfo implements Serializable {
 
     private LocalDateTime lastUpdTime;
 
+    /**
+     * 法规目录名称
+     */
+    @TableField(exist = false)
+    private String catalogName;
+
 
 }

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

@@ -55,6 +55,9 @@ public class BmfwLawsNew implements Serializable {
 
     private LocalDateTime lastUpdTime;
 
+    /**
+     * 状态
+     */
     private String s;
 
 

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

@@ -23,13 +23,23 @@ public class RobotQuestion implements Serializable {
 
     private static final long serialVersionUID=1L;
 
+    /**
+     * id
+     */
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
-
+    /**
+     * 题目
+     */
     private String title;
-
+    /**
+     * 答案
+     */
     private String answer;
 
+    /**
+     * 关键字
+     */
     private String questionKey;
 
     /**
@@ -41,6 +51,9 @@ public class RobotQuestion implements Serializable {
 
     private LocalDateTime lastUpdTime;
 
+    /**
+     * 状态
+     */
     private String s;
 
 

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

@@ -21,6 +21,9 @@ public class RobotQuestionKey implements Serializable {
 
     private static final long serialVersionUID=1L;
 
+    /**
+     * 关键字名称
+     */
     private String id;
 
     /**

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

@@ -23,17 +23,32 @@ public class RobotQuestionMessage implements Serializable {
 
     private static final long serialVersionUID=1L;
 
+    /**
+     * id
+     */
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     private String openid;
 
+    /**
+     * 问题描述
+     */
     private String message;
 
+    /**
+     * 回复
+     */
     private String reply;
 
+    /**
+     * 未知已解决
+     */
     private String s;
 
+    /**
+     * 分类
+     */
     private String classify;
 
     private LocalDateTime createTime;

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

@@ -1,6 +1,7 @@
 package com.bizmatics.mhfire.model.bulehelp;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -23,6 +24,9 @@ public class RobotQuestionMessageRecord implements Serializable {
 
     private static final long serialVersionUID=1L;
 
+    /**
+     * id
+     */
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
@@ -35,10 +39,16 @@ public class RobotQuestionMessageRecord implements Serializable {
      */
     private String content;
 
+    /**
+     * 用户名称
+     */
     private String username;
 
     private String phoneNo;
 
+    /**
+     * 手机号
+     */
     private String maskedPhoneNo;
 
     private LocalDateTime createTime;
@@ -55,6 +65,11 @@ public class RobotQuestionMessageRecord implements Serializable {
      */
     private String reason;
 
+
+    /**
+     * 搜索问题记录
+     */
+    @TableField(exist = false)
     private RobotQuestionMessage robotQuestionMessage;
 
 

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

@@ -14,6 +14,8 @@ 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 com.bizmatics.mhfire.service.bulehelp.BmfwLawsCatalogService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -29,6 +31,8 @@ import java.util.ArrayList;
 @DS("bulehelp")
 @Service
 public class BmfwLawsCatalogInfoServiceImpl extends AbstractCrudService<BmfwLawsCatalogInfoMapper, BmfwLawsCatalogInfo> implements BmfwLawsCatalogInfoService {
+    @Autowired
+    private BmfwLawsCatalogService bmfwLawsCatalogService;
 
     @Override
     public CommonPage<BmfwLawsCatalogInfo> page(Integer current,Integer size,String param,Integer catalogId) {
@@ -37,6 +41,7 @@ public class BmfwLawsCatalogInfoServiceImpl extends AbstractCrudService<BmfwLaws
                 .eq(null != catalogId,BmfwLawsCatalogInfo::getCatalogId,catalogId);
         IPage<BmfwLawsCatalogInfo> page = new Page<>(current, size);
         page = baseMapper.selectPage(page, productLambdaQueryWrapper);
+        page.getRecords().forEach(bmfwLawsCatalogInfo -> bmfwLawsCatalogInfo.setCatalogName(bmfwLawsCatalogService.getById(bmfwLawsCatalogInfo.getCatalogId()).getName()));
         return this.ToCommonPage(page);
     }
 }