1 před 4 týdny
rodič
revize
fb1b615e8e
25 změnil soubory, kde provedl 52 přidání a 34 odebrání
  1. 1 1
      imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/cms/books/CategoriesServiceController.java
  2. 1 1
      imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/cms/books/ContentsServiceController.java
  3. 1 1
      imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/cms/books/InfoServiceController.java
  4. 1 1
      imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/cms/books/view/BookViewController.java
  5. 15 0
      imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/cms/news/NewsController.java
  6. 1 1
      imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/upms/SysRoleServiceController.java
  7. 1 1
      imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/upms/SysUserRoleServiceController.java
  8. 1 1
      imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/upms/SysUserServiceController.java
  9. 1 1
      imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/upms/view/OrganizationViewController.java
  10. 1 1
      imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/upms/view/PermissionViewController.java
  11. 1 1
      imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/upms/view/RoleViewController.java
  12. 1 1
      imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/upms/view/UserViewController.java
  13. 1 1
      imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/book/ICategoriesService.java
  14. 1 1
      imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/book/IContentsService.java
  15. 1 1
      imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/book/IInfoService.java
  16. 2 2
      imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/book/impl/CategoriesServiceImpl.java
  17. 2 2
      imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/book/impl/ContentsServiceImpl.java
  18. 2 2
      imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/book/impl/InfoServiceImpl.java
  19. 1 1
      imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/upms/ISysRoleService.java
  20. 1 1
      imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/upms/ISysUserRoleService.java
  21. 1 1
      imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/upms/ISysUserService.java
  22. 2 3
      imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/upms/impl/SysRoleServiceImpl.java
  23. 2 2
      imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/upms/impl/SysUserRoleServiceImpl.java
  24. 2 2
      imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/upms/impl/SysUserServiceImpl.java
  25. 8 4
      imwork-windows/imwork-silos/src/main/resources/static/business/cms/book/contents/list.js

+ 1 - 1
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/cms/books/CategoriesServiceController.java

@@ -12,7 +12,7 @@ import top.imwork.window.silos.pojo.bo.CategoriesBO;
 import top.imwork.window.silos.pojo.bo.CategoriesResultBO;
 import top.imwork.window.silos.pojo.po.CategoriesListParamVO;
 import top.imwork.window.silos.pojo.po.CategoriesParamVO;
-import top.imwork.window.silos.service.ICategoriesService;
+import top.imwork.window.silos.service.book.ICategoriesService;
 
 /**
  * 图书分类

+ 1 - 1
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/cms/books/ContentsServiceController.java

@@ -12,7 +12,7 @@ import top.imwork.window.silos.pojo.bo.ContentsBO;
 import top.imwork.window.silos.pojo.bo.ContentsResultBO;
 import top.imwork.window.silos.pojo.po.ContentsListParamVO;
 import top.imwork.window.silos.pojo.po.ContentsParamVO;
-import top.imwork.window.silos.service.IContentsService;
+import top.imwork.window.silos.service.book.IContentsService;
 
 /**
  * 图书内容表

+ 1 - 1
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/cms/books/InfoServiceController.java

@@ -12,7 +12,7 @@ import top.imwork.window.silos.pojo.bo.InfoBO;
 import top.imwork.window.silos.pojo.bo.InfoResultBO;
 import top.imwork.window.silos.pojo.po.InfoListParamVO;
 import top.imwork.window.silos.pojo.po.InfoParamVO;
-import top.imwork.window.silos.service.IInfoService;
+import top.imwork.window.silos.service.book.IInfoService;
 import top.imwork.window.silos.utils.StringUtils;
 
 /**

+ 1 - 1
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/cms/books/BookViewController.java → imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/cms/books/view/BookViewController.java

@@ -1,4 +1,4 @@
-package top.imwork.window.silos.controller.cms.books;
+package top.imwork.window.silos.controller.cms.books.view;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

+ 15 - 0
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/cms/news/NewsController.java

@@ -0,0 +1,15 @@
+package top.imwork.window.silos.controller.cms.news;
+
+/**
+ * Copyright (C), 2015-2026
+ * FileName: NewsController
+ * Author<作者姓名>:   stars
+ * CreateTime<创建时间>:   2026/1/7 17:23
+ * UpdateTime<修改时间>:   2026/1/7 17:23
+ * Description〈功能简述〉: 新闻板块
+ * History<历史描述>:
+ * Since<版本号>: 1.0.0
+ */
+public class NewsController {
+
+}

+ 1 - 1
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/upms/SysRoleServiceController.java

@@ -12,7 +12,7 @@ import top.imwork.window.silos.pojo.bo.SysRoleBO;
 import top.imwork.window.silos.pojo.bo.SysRoleResultBO;
 import top.imwork.window.silos.pojo.po.SysRoleListParamVO;
 import top.imwork.window.silos.pojo.po.SysRoleParamVO;
-import top.imwork.window.silos.service.ISysRoleService;
+import top.imwork.window.silos.service.upms.ISysRoleService;
 
 /**
  * 角色信息

+ 1 - 1
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/upms/SysUserRoleServiceController.java

@@ -12,7 +12,7 @@ import top.imwork.window.silos.pojo.bo.SysUserRoleBO;
 import top.imwork.window.silos.pojo.bo.SysUserRoleResultBO;
 import top.imwork.window.silos.pojo.po.SysUserRoleListParamVO;
 import top.imwork.window.silos.pojo.po.SysUserRoleParamVO;
-import top.imwork.window.silos.service.ISysUserRoleService;
+import top.imwork.window.silos.service.upms.ISysUserRoleService;
 
 /**
  * 用户与角色关联信息

+ 1 - 1
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/upms/SysUserServiceController.java

@@ -12,7 +12,7 @@ import top.imwork.window.silos.pojo.bo.SysUserBO;
 import top.imwork.window.silos.pojo.bo.SysUserResultBO;
 import top.imwork.window.silos.pojo.po.SysUserListParamVO;
 import top.imwork.window.silos.pojo.po.SysUserParamVO;
-import top.imwork.window.silos.service.ISysUserService;
+import top.imwork.window.silos.service.upms.ISysUserService;
 
 /**
  * 用户信息

+ 1 - 1
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/upms/OrganizationViewController.java → imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/upms/view/OrganizationViewController.java

@@ -1,4 +1,4 @@
-package top.imwork.window.silos.controller.upms;
+package top.imwork.window.silos.controller.upms.view;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;

+ 1 - 1
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/upms/PermissionViewController.java → imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/upms/view/PermissionViewController.java

@@ -1,4 +1,4 @@
-package top.imwork.window.silos.controller.upms;
+package top.imwork.window.silos.controller.upms.view;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;

+ 1 - 1
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/upms/RoleViewController.java → imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/upms/view/RoleViewController.java

@@ -1,4 +1,4 @@
-package top.imwork.window.silos.controller.upms;
+package top.imwork.window.silos.controller.upms.view;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;

+ 1 - 1
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/upms/UserViewController.java → imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/upms/view/UserViewController.java

@@ -1,4 +1,4 @@
-package top.imwork.window.silos.controller.upms;
+package top.imwork.window.silos.controller.upms.view;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;

+ 1 - 1
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/ICategoriesService.java → imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/book/ICategoriesService.java

@@ -1,4 +1,4 @@
-package top.imwork.window.silos.service;
+package top.imwork.window.silos.service.book;
 
 import top.imwork.window.silos.pojo.bo.CategoriesBO;
 import top.imwork.window.silos.pojo.bo.CategoriesResultBO;

+ 1 - 1
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/IContentsService.java → imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/book/IContentsService.java

@@ -1,4 +1,4 @@
-package top.imwork.window.silos.service;
+package top.imwork.window.silos.service.book;
 
 import top.imwork.window.silos.pojo.bo.ContentsBO;
 import top.imwork.window.silos.pojo.bo.ContentsResultBO;

+ 1 - 1
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/IInfoService.java → imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/book/IInfoService.java

@@ -1,4 +1,4 @@
-package top.imwork.window.silos.service;
+package top.imwork.window.silos.service.book;
 
 import top.imwork.window.silos.pojo.bo.InfoBO;
 import top.imwork.window.silos.pojo.bo.InfoResultBO;

+ 2 - 2
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/impl/CategoriesServiceImpl.java → imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/book/impl/CategoriesServiceImpl.java

@@ -1,4 +1,4 @@
-package top.imwork.window.silos.service.impl;
+package top.imwork.window.silos.service.book.impl;
 
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
@@ -17,7 +17,7 @@ import top.imwork.window.silos.pojo.bo.CategoriesBO;
 import top.imwork.window.silos.pojo.bo.CategoriesResultBO;
 import top.imwork.window.silos.pojo.dto.CategoriesDTO;
 import top.imwork.window.silos.pojo.dto.CategoriesListDTO;
-import top.imwork.window.silos.service.ICategoriesService;
+import top.imwork.window.silos.service.book.ICategoriesService;
 
 import java.util.Date;
 

+ 2 - 2
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/impl/ContentsServiceImpl.java → imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/book/impl/ContentsServiceImpl.java

@@ -1,4 +1,4 @@
-package top.imwork.window.silos.service.impl;
+package top.imwork.window.silos.service.book.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -17,7 +17,7 @@ import top.imwork.window.silos.pojo.bo.ContentsBO;
 import top.imwork.window.silos.pojo.bo.ContentsResultBO;
 import top.imwork.window.silos.pojo.dto.ContentsDTO;
 import top.imwork.window.silos.pojo.dto.ContentsListDTO;
-import top.imwork.window.silos.service.IContentsService;
+import top.imwork.window.silos.service.book.IContentsService;
 import top.imwork.window.silos.convert.ContentsConvert;
 
 import java.util.Date;

+ 2 - 2
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/impl/InfoServiceImpl.java → imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/book/impl/InfoServiceImpl.java

@@ -1,4 +1,4 @@
-package top.imwork.window.silos.service.impl;
+package top.imwork.window.silos.service.book.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -22,7 +22,7 @@ import top.imwork.window.silos.pojo.dto.InfoListDTO;
 import top.imwork.window.silos.processor.ChapterContent;
 import top.imwork.window.silos.processor.ChapterSplitter;
 import top.imwork.window.silos.processor.ChapterSplitterProcessor;
-import top.imwork.window.silos.service.IInfoService;
+import top.imwork.window.silos.service.book.IInfoService;
 import top.imwork.window.silos.convert.InfoConvert;
 
 import java.io.IOException;

+ 1 - 1
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/ISysRoleService.java → imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/upms/ISysRoleService.java

@@ -1,4 +1,4 @@
-package top.imwork.window.silos.service;
+package top.imwork.window.silos.service.upms;
 
 import top.imwork.window.silos.pojo.bo.SysRoleBO;
 import top.imwork.window.silos.pojo.bo.SysRoleResultBO;

+ 1 - 1
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/ISysUserRoleService.java → imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/upms/ISysUserRoleService.java

@@ -1,4 +1,4 @@
-package top.imwork.window.silos.service;
+package top.imwork.window.silos.service.upms;
 
 import top.imwork.window.silos.pojo.bo.SysUserRoleBO;
 import top.imwork.window.silos.pojo.bo.SysUserRoleResultBO;

+ 1 - 1
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/ISysUserService.java → imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/upms/ISysUserService.java

@@ -1,4 +1,4 @@
-package top.imwork.window.silos.service;
+package top.imwork.window.silos.service.upms;
 
 import top.imwork.window.silos.pojo.bo.SysUserBO;
 import top.imwork.window.silos.pojo.bo.SysUserResultBO;

+ 2 - 3
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/impl/SysRoleServiceImpl.java → imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/upms/impl/SysRoleServiceImpl.java

@@ -1,8 +1,7 @@
-package top.imwork.window.silos.service.impl;
+package top.imwork.window.silos.service.upms.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import jakarta.annotation.Resource;
@@ -17,7 +16,7 @@ import top.imwork.window.silos.pojo.bo.SysRoleBO;
 import top.imwork.window.silos.pojo.bo.SysRoleResultBO;
 import top.imwork.window.silos.pojo.dto.SysRoleDTO;
 import top.imwork.window.silos.pojo.dto.SysRoleListDTO;
-import top.imwork.window.silos.service.ISysRoleService;
+import top.imwork.window.silos.service.upms.ISysRoleService;
 import top.imwork.window.silos.convert.SysRoleConvert;
 
 import java.util.Date;

+ 2 - 2
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/impl/SysUserRoleServiceImpl.java → imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/upms/impl/SysUserRoleServiceImpl.java

@@ -1,4 +1,4 @@
-package top.imwork.window.silos.service.impl;
+package top.imwork.window.silos.service.upms.impl;
 
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
@@ -16,7 +16,7 @@ import top.imwork.window.silos.pojo.bo.SysUserRoleBO;
 import top.imwork.window.silos.pojo.bo.SysUserRoleResultBO;
 import top.imwork.window.silos.pojo.dto.SysUserRoleDTO;
 import top.imwork.window.silos.pojo.dto.SysUserRoleListDTO;
-import top.imwork.window.silos.service.ISysUserRoleService;
+import top.imwork.window.silos.service.upms.ISysUserRoleService;
 import top.imwork.window.silos.convert.SysUserRoleConvert;
 
 @Service("sysUserRoleService")

+ 2 - 2
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/impl/SysUserServiceImpl.java → imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/service/upms/impl/SysUserServiceImpl.java

@@ -1,4 +1,4 @@
-package top.imwork.window.silos.service.impl;
+package top.imwork.window.silos.service.upms.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -17,7 +17,7 @@ import top.imwork.window.silos.pojo.bo.SysUserBO;
 import top.imwork.window.silos.pojo.bo.SysUserResultBO;
 import top.imwork.window.silos.pojo.dto.SysUserDTO;
 import top.imwork.window.silos.pojo.dto.SysUserListDTO;
-import top.imwork.window.silos.service.ISysUserService;
+import top.imwork.window.silos.service.upms.ISysUserService;
 import top.imwork.window.silos.convert.SysUserConvert;
 
 import java.util.Date;

+ 8 - 4
imwork-windows/imwork-silos/src/main/resources/static/business/cms/book/contents/list.js

@@ -228,10 +228,14 @@ layui.config({
         try {
             var body = layui.layer.getChildFrame('body', index);
             body.find('#id').val(data.id);
-            body.find('#chapterNumber').val(data.userName);
-            body.find(`#chapterLevel input[value="${data.chapterLevel}"]`).prop('checked', true);
-            body.find('#chapterTitle').val(data.userName);
-            body.find(`#contentType input[value="${data.contentType}"]`).prop('checked', true);
+            body.find('#chapterNumber').val(data.chapterNumber);
+            body.find('#chapterLevel input[value="${data.chapterLevel}"]').prop('checked', true);
+            body.find('#chapterTitle').val(data.chapterTitle);
+            body.find('#contentType input[value="${data.contentType}"]').prop('checked', true);
+            body.find('#wordCount').val(data.wordCount);
+            body.find('#version').val(data.version);
+            body.find('#contentText').val(data.contentText);
+            body.find('#isPublic input[value="${data.isPublic}"]').prop('checked', true);
 
             var formFields = {
                 '#id': data.id ? BigInt(data.id).toString() : '',