修复

admin-pc/.env.development

@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=http://localhost:8001/novel-admin/
+VUE_APP_API_BASE_URL=http://localhost:8002/novel-admin/
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 

admin-pc/.env.production

@@ -1,4 +1,4 @@
 NODE_ENV=production
-VUE_APP_API_BASE_URL=http://localhost:8001/novel-admin/
+VUE_APP_API_BASE_URL=http://localhost:8002/novel-admin/
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

module-common/src/main/java/org/jeecg/api/controller/AppletBookController.java

@@ -32,6 +32,21 @@ public class AppletBookController {
         return appletBookService.getReadBookPage(token,pageBean);
     }
 
+
+    //修改我的书籍信息
+    @ApiOperation(value="修改我的书籍信息", notes="修改我的书籍信息")
+    @PostMapping(value = "/saveOrUpdateReadBook")
+    public Result<?> saveOrUpdateReadBook(@RequestHeader("X-Access-Token") String token, CommonBook commonBook){
+        return appletBookService.saveOrUpdateReadBook(token, commonBook);
+    }
+
+
+
+
+
+
+
+
     //增加我的书架阅读记录
     @ApiOperation(value="增加我的书架阅读记录", notes="增加我的书架阅读记录")
     @PostMapping(value = "/addReadBook")

module-common/src/main/java/org/jeecg/api/controller/AppletTaskController.java

@@ -64,6 +64,14 @@ public class AppletTaskController {
     }
 
 
+    //获取我当天是否以及签到
+    @ApiOperation(value="获取我当天是否以及签到", notes="获取我当天是否以及签到")
+    @GetMapping(value = "/getSignTaskToday")
+    public Result<?> getSignTaskToday(@RequestHeader("X-Access-Token") String token){
+        return appletTaskService.getSignTaskToday(token);
+    }
+
+
 
 
 }

module-common/src/main/java/org/jeecg/api/service/AppletBookService.java

@@ -11,6 +11,10 @@ public interface AppletBookService {
     //获取我阅读过的书籍列表带分页
     Result<?> getReadBookPage(String token,PageBean pageBean);
 
+    //修改我的书籍信息
+    Result<?> saveOrUpdateReadBook(String token, CommonBook commonBook);
+
+
     //增加我的书架阅读记录
     Result<?> addReadBook(String token, CommonBook commonBook);
 

module-common/src/main/java/org/jeecg/api/service/AppletTaskService.java

@@ -32,4 +32,7 @@ public interface AppletTaskService {
     Result<?> clickMoreTask(String token, String taskId);
 
 
+    //获取我当天是否已经签到
+    Result<?> getSignTaskToday(String token);
+
 }

module-common/src/main/java/org/jeecg/api/service/impl/AppletAchievementServiceImpl.java

@@ -41,17 +41,7 @@ public class AppletAchievementServiceImpl implements AppletAchievementService {
     @Override
     public Result<?> setAchievementName(String token, CommonBookAchievementLog bookAchievementLog){
         HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-//        //书籍标识不能为空
-//        if(StringUtils.isEmpty(bookAchievementLog.getBookId())){
-//            return Result.error("书籍标识不能为空");
-//        }
-//        //根据书籍标识查询书籍信息
-//        CommonShop commonShop = commonShopService.getById(bookAchievementLog.getBookId());
-//        if(commonShop==null){
-//            return Result.error("书籍不存在");
-//        }
         CommonBookAchievementLog one = commonBookAchievementLogService.lambdaQuery()
-//                .eq(CommonBookAchievementLog::getBookId, bookAchievementLog.getBookId())
                 .eq(CommonBookAchievementLog::getUserId, member.getId())
                 .one();
         if(one!=null){
@@ -59,7 +49,6 @@ public class AppletAchievementServiceImpl implements AppletAchievementService {
             commonBookAchievementLogService.save(bookAchievementLog);
             return Result.OK("修改成功");
         }else{
-//            bookAchievementLog.setBookId(commonShop.getId());
             bookAchievementLog.setUserId(member.getId());
             commonBookAchievementLogService.save(bookAchievementLog);
             return Result.OK("设置成功");
@@ -71,10 +60,30 @@ public class AppletAchievementServiceImpl implements AppletAchievementService {
     @Override
     public Result<?> getAchievement(String token, String bookId){
         HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //根据书籍标识获取当前作者
+        CommonShop commonShop = commonShopService.lambdaQuery()
+                .eq(CommonShop::getId, bookId)
+                .one();
+
         CommonBookAchievementLog one = commonBookAchievementLogService.lambdaQuery()
-//                .eq(CommonBookAchievementLog::getBookId, bookId)
-                .eq(CommonBookAchievementLog::getUserId, member.getId())
+                .eq(CommonBookAchievementLog::getUserId, commonShop.getUserId())
                 .one();
+        //如果对象不为空
+//        List<CommonBookAchievement> list =commonBookAchievementService.list();
+//        if(one!=null){
+//            list.get(0).setName(one.getOneName());
+//            list.get(0).setOldName(one.getOneOldName());
+//            list.get(0).setNum(one.getOneNum());
+//
+//            list.get(1).setName(one.getTwoName());
+//            list.get(1).setOldName(one.getTwoOldName());
+//            list.get(1).setNum(one.getTwoNum());
+//
+//
+//            list.get(2).setName(one.getThreeName());
+//            list.get(2).setOldName(one.getThreeOldName());
+//            list.get(2).setNum(one.getThreeNum());
+//        }
         return Result.OK("查询成功",one);
     }
 

module-common/src/main/java/org/jeecg/api/service/impl/AppletBookServiceImpl.java

@@ -90,6 +90,25 @@ public class AppletBookServiceImpl implements AppletBookService {
         return Result.OK("我阅读过的书籍列表",pageList);
     }
 
+
+
+    //修改我的书籍信息
+    @Override
+    public Result<?> saveOrUpdateReadBook(String token, CommonBook commonBook){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        CommonBook one = commonBookService.lambdaQuery()
+                .eq(CommonBook::getShopId, commonBook.getShopId())
+                .eq(CommonBook::getUserId, hanHaiMember.getId())
+                .one();
+        if(one!=null){
+            commonBook.setId(one.getId());
+            commonBookService.updateById(commonBook);
+        }else{
+            commonBookService.save(commonBook);
+        }
+        return Result.OK("保存成功");
+    }
+
     //增加我的书架阅读记录
     @Override
     public Result<?> addReadBook(String token, CommonBook commonBook) {

module-common/src/main/java/org/jeecg/api/service/impl/AppletCommentServiceImpl.java

@@ -191,7 +191,12 @@ public class AppletCommentServiceImpl implements AppletCommentService {
         HanHaiMember hanHaiMember = hanHaiMemberService.getById(commonBookComment.getUserId());
         commonBookComment.setHanHaiMember(hanHaiMember);
         commonBookComment.setCommonShop(commonShopService.getById(commonBookComment.getBookId()));
-        commonBookComment.setChildren(commonBookCommentService.lambdaQuery().eq(CommonBookComment::getPid,commentId).list());
+        List<CommonBookComment> list = commonBookCommentService.lambdaQuery().eq(CommonBookComment::getPid, commentId).list();
+        //循环写入用户信息
+        for (CommonBookComment bookComment : list) {
+            bookComment.setHanHaiMember(hanHaiMemberService.getById(bookComment.getUserId()));
+        }
+        commonBookComment.setChildren(list);
         return Result.OK(commonBookComment);
     }
 

module-common/src/main/java/org/jeecg/api/service/impl/AppletTaskServiceImpl.java

@@ -6,6 +6,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.jeecg.api.bean.PageBean;
 import org.jeecg.api.service.AppletTaskService;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.util.DateUtils;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.commonSign.entity.CommonSign;
 import org.jeecg.modules.commonSign.service.ICommonSignService;
@@ -195,4 +196,22 @@ public class AppletTaskServiceImpl implements AppletTaskService {
         }
         return Result.OK("领取成功");
     }
+
+
+
+    //获取我当天是否已经签到
+    @Override
+    public Result<?> getSignTaskToday(String token){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //查询当天我是否有签到记录
+        CommonSignLog c = commonSignLogService.lambdaQuery()
+                .eq(CommonSignLog::getUserId,hanHaiMember.getId())
+                .eq(CommonSignLog::getCreateTime, DateUtils.getDate())
+                .one();
+        if(c!=null){
+            return Result.OK("今天已签到",true);
+        }else{
+            return Result.OK("今天未签到",false);
+        }
+    }
 }

module-common/src/main/java/org/jeecg/modules/commonBook/controller/CommonBookController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 书架信息
  * @Author: jeecg-boot
- * @Date:   2025-05-14
+ * @Date:   2025-06-07
  * @Version: V1.0
  */
 @Api(tags="书架信息")

module-common/src/main/java/org/jeecg/modules/commonBook/entity/CommonBook.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 书架信息
  * @Author: jeecg-boot
- * @Date:   2025-05-14
+ * @Date:   2025-06-07
  * @Version: V1.0
  */
 @Data
@@ -68,4 +68,13 @@ public class CommonBook implements Serializable {
 	@Dict(dictTable = "common_shop", dicText = "name", dicCode = "id")
     @ApiModelProperty(value = "关联小说")
     private java.lang.String shopId;
+	/**关联章节*/
+	@Excel(name = "关联章节", width = 15, dictTable = "common_book_novel", dicText = "title", dicCode = "id")
+	@Dict(dictTable = "common_book_novel", dicText = "title", dicCode = "id")
+    @ApiModelProperty(value = "关联章节")
+    private java.lang.String novelId;
+	/**章节字数*/
+	@Excel(name = "章节字数", width = 15)
+    @ApiModelProperty(value = "章节字数")
+    private java.lang.Integer novelNum;
 }

module-common/src/main/java/org/jeecg/modules/commonBook/mapper/CommonBookMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 书架信息
  * @Author: jeecg-boot
- * @Date:   2025-05-14
+ * @Date:   2025-06-07
  * @Version: V1.0
  */
 public interface CommonBookMapper extends BaseMapper<CommonBook> {

module-common/src/main/java/org/jeecg/modules/commonBook/service/ICommonBookService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 书架信息
  * @Author: jeecg-boot
- * @Date:   2025-05-14
+ * @Date:   2025-06-07
  * @Version: V1.0
  */
 public interface ICommonBookService extends IService<CommonBook> {

module-common/src/main/java/org/jeecg/modules/commonBook/service/impl/CommonBookServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 书架信息
  * @Author: jeecg-boot
- * @Date:   2025-05-14
+ * @Date:   2025-06-07
  * @Version: V1.0
  */
 @Service

module-common/src/main/java/org/jeecg/modules/commonBook/vue/CommonBookList.vue

@@ -148,6 +148,16 @@
             align:"center",
             dataIndex: 'shopId_dictText'
           },
+          {
+            title:'关联章节',
+            align:"center",
+            dataIndex: 'novelId_dictText'
+          },
+          {
+            title:'章节字数',
+            align:"center",
+            dataIndex: 'novelNum'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -187,6 +197,8 @@
         fieldList.push({type:'string',value:'name',text:'书名',dictCode:''})
         fieldList.push({type:'Text',value:'image',text:'主图',dictCode:''})
         fieldList.push({type:'sel_search',value:'shopId',text:'关联小说',dictTable:"common_shop", dictText:'name', dictCode:'id'})
+        fieldList.push({type:'sel_search',value:'novelId',text:'关联章节',dictTable:"common_book_novel", dictText:'title', dictCode:'id'})
+        fieldList.push({type:'int',value:'novelNum',text:'章节字数',dictCode:''})
         this.superFieldList = fieldList
       }
     }

module-common/src/main/java/org/jeecg/modules/commonBook/vue/modules/CommonBookForm.vue

@@ -28,6 +28,16 @@
               <j-search-select-tag v-model="model.shopId" dict="common_shop,name,id"  />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联章节" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="novelId">
+              <j-search-select-tag v-model="model.novelId" dict="common_book_novel,title,id"  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="章节字数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="novelNum">
+              <a-input-number v-model="model.novelNum" placeholder="请输入章节字数" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

module-common/src/main/java/org/jeecg/modules/commonBook/vue3/CommonBook.data.ts

@@ -30,6 +30,16 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'shopId_dictText'
    },
+   {
+    title: '关联章节',
+    align:"center",
+    dataIndex: 'novelId_dictText'
+   },
+   {
+    title: '章节字数',
+    align:"center",
+    dataIndex: 'novelNum'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -66,4 +76,17 @@ export const formSchema: FormSchema[] = [
        dict:"common_shop,name,id"
     },
   },
+  {
+    label: '关联章节',
+    field: 'novelId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"common_book_novel,title,id"
+    },
+  },
+  {
+    label: '章节字数',
+    field: 'novelNum',
+    component: 'InputNumber',
+  },
 ];

module-common/src/main/java/org/jeecg/modules/commonBookAchievement/entity/CommonBookAchievement.java

@@ -5,6 +5,7 @@ import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -55,4 +56,15 @@ public class CommonBookAchievement implements Serializable {
 	@Excel(name = "成就标题", width = 15)
     @ApiModelProperty(value = "成就标题")
     private java.lang.String title;
+
+
+
+    @TableField (exist = false)
+    private java.lang.String name;
+
+    @TableField (exist = false)
+    private java.lang.String oldName;
+
+    @TableField (exist = false)
+    private java.lang.Integer num;
 }

module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java

@@ -105,4 +105,6 @@ public class CommonShop implements Serializable {
     @Dict(dicCode = "book_my_status")
     @ApiModelProperty(value = "作品状态")
     private java.lang.Integer bookStatus;
+
+    private java.lang.Integer bookSum;
 }