diff --git a/admin-pc/.env.development b/admin-pc/.env.development index 3d427a3..bd6ee43 100644 --- a/admin-pc/.env.development +++ b/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 diff --git a/admin-pc/.env.production b/admin-pc/.env.production index 99f8dac..cba03f8 100644 --- a/admin-pc/.env.production +++ b/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 \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/api/controller/AppletBookController.java b/module-common/src/main/java/org/jeecg/api/controller/AppletBookController.java index b2f9682..de8ffc6 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/AppletBookController.java +++ b/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") diff --git a/module-common/src/main/java/org/jeecg/api/controller/AppletTaskController.java b/module-common/src/main/java/org/jeecg/api/controller/AppletTaskController.java index 1150837..caec1f7 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/AppletTaskController.java +++ b/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); + } + + } diff --git a/module-common/src/main/java/org/jeecg/api/service/AppletBookService.java b/module-common/src/main/java/org/jeecg/api/service/AppletBookService.java index df73421..dbf930a 100644 --- a/module-common/src/main/java/org/jeecg/api/service/AppletBookService.java +++ b/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); diff --git a/module-common/src/main/java/org/jeecg/api/service/AppletTaskService.java b/module-common/src/main/java/org/jeecg/api/service/AppletTaskService.java index 0220a84..577f026 100644 --- a/module-common/src/main/java/org/jeecg/api/service/AppletTaskService.java +++ b/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); + } diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletAchievementServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletAchievementServiceImpl.java index 19cf67e..b7bbeae 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletAchievementServiceImpl.java +++ b/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 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); } diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletBookServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletBookServiceImpl.java index 3139f6c..2641422 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletBookServiceImpl.java +++ b/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) { diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletCommentServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletCommentServiceImpl.java index 5589ef7..be4b04f 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletCommentServiceImpl.java +++ b/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 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); } diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletTaskServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletTaskServiceImpl.java index e210a75..cc9aa3c 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletTaskServiceImpl.java +++ b/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); + } + } } diff --git a/module-common/src/main/java/org/jeecg/modules/commonBook/controller/CommonBookController.java b/module-common/src/main/java/org/jeecg/modules/commonBook/controller/CommonBookController.java index e060e2c..84e9513 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBook/controller/CommonBookController.java +++ b/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="书架信息") diff --git a/module-common/src/main/java/org/jeecg/modules/commonBook/entity/CommonBook.java b/module-common/src/main/java/org/jeecg/modules/commonBook/entity/CommonBook.java index d622d0a..1811d9e 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBook/entity/CommonBook.java +++ b/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; } diff --git a/module-common/src/main/java/org/jeecg/modules/commonBook/mapper/CommonBookMapper.java b/module-common/src/main/java/org/jeecg/modules/commonBook/mapper/CommonBookMapper.java index 5360040..628ab87 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBook/mapper/CommonBookMapper.java +++ b/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 { diff --git a/module-common/src/main/java/org/jeecg/modules/commonBook/service/ICommonBookService.java b/module-common/src/main/java/org/jeecg/modules/commonBook/service/ICommonBookService.java index 983c694..09d2098 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBook/service/ICommonBookService.java +++ b/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 { diff --git a/module-common/src/main/java/org/jeecg/modules/commonBook/service/impl/CommonBookServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonBook/service/impl/CommonBookServiceImpl.java index fcc31dd..436b86d 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBook/service/impl/CommonBookServiceImpl.java +++ b/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 diff --git a/module-common/src/main/java/org/jeecg/modules/commonBook/vue/CommonBookList.vue b/module-common/src/main/java/org/jeecg/modules/commonBook/vue/CommonBookList.vue index 5f04ef3..e86a61a 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBook/vue/CommonBookList.vue +++ b/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 } } diff --git a/module-common/src/main/java/org/jeecg/modules/commonBook/vue/modules/CommonBookForm.vue b/module-common/src/main/java/org/jeecg/modules/commonBook/vue/modules/CommonBookForm.vue index 9b83673..0e845d6 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBook/vue/modules/CommonBookForm.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonBook/vue/modules/CommonBookForm.vue @@ -28,6 +28,16 @@ + + + + + + + + + + diff --git a/module-common/src/main/java/org/jeecg/modules/commonBook/vue3/CommonBook.data.ts b/module-common/src/main/java/org/jeecg/modules/commonBook/vue3/CommonBook.data.ts index b5b5126..86092fc 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBook/vue3/CommonBook.data.ts +++ b/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', + }, ]; diff --git a/module-common/src/main/java/org/jeecg/modules/commonBookAchievement/entity/CommonBookAchievement.java b/module-common/src/main/java/org/jeecg/modules/commonBookAchievement/entity/CommonBookAchievement.java index 4cd407a..4ec489d 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBookAchievement/entity/CommonBookAchievement.java +++ b/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; } diff --git a/module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java b/module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java index 27b7444..b08762e 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java +++ b/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; }