From fa6b6b3e2287a8860b3fb09691820400e62c4287 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Thu, 28 Dec 2023 19:18:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=20-=20?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=E7=AE=A1=E7=90=86(=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E6=B2=A1=E5=A5=BD),=20=E6=A8=AA=E5=B9=85=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=20=E8=BF=99=E4=B8=A4=E4=B8=AA=E5=BC=84=E5=A5=BD?= =?UTF-8?q?=E4=BA=86=20.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zdxtEmergencyBootStart/pom.xml | 6 + .../project/smallProgram/library/add.html | 14 ++ .../project/smallProgram/library/detail.html | 34 ++-- .../project/smallProgram/library/edit.html | 14 ++ .../project/smallProgram/library/view.html | 146 +++++++++++++++--- .../zdxtEmergencyKnowledgeService/pom.xml | 6 + .../KnowledgeLibraryController.java | 38 ++++- .../knowledge/domain/KnowledgeLibrary.java | 36 ++++- .../mapper/KnowledgeLibraryMapper.java | 8 + .../service/IKnowledgeLibraryService.java | 8 + .../impl/KnowledgeLibraryServiceImpl.java | 19 +++ .../mapper/KnowledgeLibraryMapper.xml | 34 +++- lib/EmergencyServiceApi/pom.xml | 85 +++++----- 13 files changed, 360 insertions(+), 88 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/pom.xml b/lib/EmergencyService/zdxtEmergencyBootStart/pom.xml index f46c5a2d..ceb990bd 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/pom.xml +++ b/lib/EmergencyService/zdxtEmergencyBootStart/pom.xml @@ -72,6 +72,12 @@ zdxtEmergencyJt808Service 1.0 + + EmergencyServiceApi + emergencyKnowledgeServiceApi + 1.0 + compile + diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/library/add.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/library/add.html index f734df64..7a268578 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/library/add.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/library/add.html @@ -29,6 +29,20 @@ +
+ +
+ +
+ +
+ +
+
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/library/detail.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/library/detail.html index 1a223b22..87d117d8 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/library/detail.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/library/detail.html @@ -1,10 +1,16 @@ - + + +
@@ -13,13 +19,13 @@
- +
- +
@@ -31,6 +37,20 @@
+
+ +
+ +
+ +
+ +
+
@@ -67,11 +87,7 @@ $(function() { $('#itemContentSummernote').summernote('code', $('#content').val()); - $('#post').select2({ - placeholder: "请选择职务", - allowClear: true - }); - $('#userType').val('3').trigger('change'); + $('#itemContentSummernote').summernote('disable'); // 渲染要素信息 renderVersionAtt(); }) @@ -251,7 +267,7 @@ } }, layoutTemplates: { - // actionDelete: ''//去掉删除按钮 + actionDelete: '',//去掉删除按钮 actionUpload: '' // 去掉上传按钮 }, initialPreview: filePreview.fileList == null ? [] : filePreview.fileList, diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/library/edit.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/library/edit.html index 605e68d3..f982b1c7 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/library/edit.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/library/edit.html @@ -31,6 +31,20 @@
+
+ +
+ +
+ +
+ +
+
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/library/view.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/library/view.html index 386eeced..edb902b3 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/library/view.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/library/view.html @@ -44,13 +44,18 @@ shiro:hasPermission="system:post:edit"> 修改 --> - + 全部删除 - + + 发布 + + + 下线 + + + 审核 +
@@ -59,18 +64,24 @@
+ + diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/pom.xml b/lib/EmergencyService/zdxtEmergencyKnowledgeService/pom.xml index 58528671..3c914fb3 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/pom.xml +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/pom.xml @@ -30,6 +30,12 @@ + + EmergencyServiceApi + emergencyKnowledgeServiceApi + 1.0 + compile + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/KnowledgeLibraryController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/KnowledgeLibraryController.java index e54ee90d..259209af 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/KnowledgeLibraryController.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/KnowledgeLibraryController.java @@ -1,5 +1,6 @@ package com.zdxt.knowledge.controller; +import java.util.Date; import java.util.HashMap; import java.util.List; @@ -8,7 +9,7 @@ import com.zdxt.auth.feign.DictDataApi; import com.zdxt.common.ZDResponse; import com.zdxt.common.controller.BaseController; import com.zdxt.common.util.TableDataInfo; -import com.zdxt.domain.auth.Post; +import com.zdxt.flow.util.DateUtil; import com.zdxt.knowledge.domain.KnowledgeLibrary; import com.zdxt.knowledge.service.IKnowledgeLibraryService; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -116,7 +117,6 @@ public class KnowledgeLibraryController extends BaseController /** * 知识库详情 */ - @RequiresPermissions("small:library:view") @GetMapping("/detail/{guid}") public String detail(@PathVariable("guid") String guid, ModelMap mmap) { @@ -149,6 +149,18 @@ public class KnowledgeLibraryController extends BaseController return resNum>0?ZDResponse.success("操作成功", resNum):ZDResponse.error("操作失败", resNum); } + /** + * 修改发布状态 + */ + @RequiresPermissions("small:library:edit") + @PostMapping("/toPublishState") + @ResponseBody + public ZDResponse toPublishState(String ids, String state) + { + int resNum = knowledgeLibraryService.updatePublishState(ids, state); + return resNum>0?ZDResponse.success("操作成功", resNum):ZDResponse.error("操作失败", resNum); + } + /** * 查询附件信息 * @param key @@ -189,4 +201,26 @@ public class KnowledgeLibraryController extends BaseController return ZDResponse.error("操作失败"); } } + + @GetMapping("/launch") + public String launch(ModelMap mmap) { + mmap.put("date", new Date()); + return prefix + "/launch"; + } + + /** + * 管理科审核 + */ + @GetMapping("/glksh") + public String glksh(ModelMap mmap) { + mmap.put("date", new Date()); + return prefix + "/glksh"; + } + + @GetMapping("/getFlowEP") + @ResponseBody + public ZDResponse getFlowEV(String id){ + KnowledgeLibrary library = knowledgeLibraryService.selectKnowledgeLibraryById(id); + return ZDResponse.success("",library); + } } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/KnowledgeLibrary.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/KnowledgeLibrary.java index 7abad98d..8cc70c61 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/KnowledgeLibrary.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/KnowledgeLibrary.java @@ -33,8 +33,14 @@ public class KnowledgeLibrary extends BaseDomain /** 排序 */ private Long srot; - /** 状态 */ - private String state; + /** 类型(1:消防,2:地震灾害,3:地质灾害) */ + private Integer type; + + /** 是否置顶(0:否,1:是) */ + private Integer pinned; + + /** 状态(0:正常,1:停用) */ + private Integer status; /** 发布时间 */ private String publishdate; @@ -42,7 +48,7 @@ public class KnowledgeLibrary extends BaseDomain /** 发布状态(0:待发布,1:已发布,2:已上线,3:已下线) */ private Integer publishstate; - /** 审核状态(0:未审核,1:已审核) */ + /** 审核状态(0:未审核,1:警员审核,2:管理科审核) */ private Integer examinestate; public String getGuid() { @@ -93,12 +99,28 @@ public class KnowledgeLibrary extends BaseDomain this.srot = srot; } - public String getState() { - return state; + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Integer getPinned() { + return pinned; + } + + public void setPinned(Integer pinned) { + this.pinned = pinned; + } + + public Integer getStatus() { + return status; } - public void setState(String state) { - this.state = state; + public void setStatus(Integer status) { + this.status = status; } public String getPublishdate() { diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/KnowledgeLibraryMapper.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/KnowledgeLibraryMapper.java index 7275b2d1..cdc5fd68 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/KnowledgeLibraryMapper.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/KnowledgeLibraryMapper.java @@ -1,6 +1,7 @@ package com.zdxt.knowledge.mapper; import com.zdxt.knowledge.domain.KnowledgeLibrary; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -59,4 +60,11 @@ public interface KnowledgeLibraryMapper * @return 结果 */ public int deleteKnowledgeLibraryByIds(String[] guids); + + /** + * 批量修改发布状态 + * @param guids + * @return + */ + public int updatePublishState(@Param("guids") String[] guids, @Param("state") String state, @Param("publishdate") String publishdate); } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/IKnowledgeLibraryService.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/IKnowledgeLibraryService.java index 75d75854..11cbf4fd 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/IKnowledgeLibraryService.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/IKnowledgeLibraryService.java @@ -44,6 +44,7 @@ public interface IKnowledgeLibraryService * @param knowledgeLibrary 知识库 * @return 结果 */ + public int updateKnowledgeLibrary(KnowledgeLibrary knowledgeLibrary); public int updateKnowledgeLibrary(KnowledgeLibrary knowledgeLibrary, MultipartFile[] files); /** @@ -62,6 +63,13 @@ public interface IKnowledgeLibraryService */ public int deleteKnowledgeLibraryById(String guid); + /** + * 批量修改发布状态 + * @param ids + * @return + */ + public int updatePublishState(String ids, String state); + /** * 查询附件 * @param key diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/KnowledgeLibraryServiceImpl.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/KnowledgeLibraryServiceImpl.java index c982916b..45e8e130 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/KnowledgeLibraryServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/KnowledgeLibraryServiceImpl.java @@ -9,6 +9,7 @@ import com.zdxt.auth.dto.ZdxtFileBean; import com.zdxt.auth.feign.FileUploadApi; import com.zdxt.auth.feign.ZdxtFileCommonApi; import com.zdxt.common.util.Convert; +import com.zdxt.common.util.DateUtils; import com.zdxt.common.util.StringUtils; import com.zdxt.common.zdxtFile.AttFileRespDTO; import com.zdxt.common.zdxtFile.FilePreviewUtilBean; @@ -80,6 +81,18 @@ public class KnowledgeLibraryServiceImpl implements IKnowledgeLibraryService return resNum; } + /** + * 修改知识库 + * + * @param knowledgeLibrary 知识库 + * @return 结果 + */ + @Override + public int updateKnowledgeLibrary(KnowledgeLibrary knowledgeLibrary) + { + return knowledgeLibraryMapper.updateKnowledgeLibrary(knowledgeLibrary); + } + /** * 修改知识库 * @@ -125,6 +138,12 @@ public class KnowledgeLibraryServiceImpl implements IKnowledgeLibraryService return knowledgeLibraryMapper.deleteKnowledgeLibraryById(guid); } + @Override + public int updatePublishState(String ids, String state) { + String publishdate = DateUtils.getTime(); + return knowledgeLibraryMapper.updatePublishState(Convert.toStrArray(ids), state, publishdate); + } + @Override public AttFileRespDTO queryFiles(String key) { ZdxtFileBean zdxtFileBeanCondition = new ZdxtFileBean(); diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/KnowledgeLibraryMapper.xml b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/KnowledgeLibraryMapper.xml index 6710a95d..a1b53732 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/KnowledgeLibraryMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/KnowledgeLibraryMapper.xml @@ -11,7 +11,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + @@ -22,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select guid, title, sub_title, content, flag, srot, state, publishDate, publishState, examineState, creator, create_time, updator, update_time from knowledge_library + select guid, title, sub_title, content, flag, srot, type, pinned, status, publishDate, publishState, examineState, creator, create_time, updator, update_time from knowledge_library