From e3fd5af91ee15428b1935e41f6bf467826a58639 Mon Sep 17 00:00:00 2001 From: yanyan Date: Wed, 3 Jan 2024 10:32:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=BA=E6=99=AF=E7=AE=A1=E7=90=86=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BA=BA=E5=8F=A3=E6=8E=92=E5=BA=8F=E5=8F=8A=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E4=BA=BA=E6=95=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/project/scene/add.html | 22 ++- .../templates/project/scene/edit.html | 24 +-- .../templates/project/scene/manage.html | 5 +- .../controller/SceneManageController.java | 6 +- .../domain/SceneImportDataModel.java | 20 +- .../zdxt/knowledge/domain/SceneManage.java | 175 +++++++++++------- .../knowledge/mapper/SceneManageMapper.java | 9 + .../service/ISceneManageService.java | 2 +- .../service/impl/SceneManageServiceImpl.java | 12 +- .../resources/mapper/SceneManageMapper.xml | 23 ++- 10 files changed, 200 insertions(+), 98 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/add.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/add.html index b11cc76d..30ee4f4e 100755 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/add.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/add.html @@ -7,40 +7,46 @@
- +
- +
- +
- +
- +
-
- +
-
+
+ +
+ +
+
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/edit.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/edit.html index d5e010e2..9cb6b701 100755 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/edit.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/edit.html @@ -34,18 +34,18 @@
-
- -
- -
-
-
- -
- -
-
+ + + + + + + + + + + +
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/manage.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/manage.html index 622e4457..c185a41e 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/manage.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/manage.html @@ -19,7 +19,10 @@ - +
  • +

    创建人：

    + +
  •  搜索  重置 diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneManageController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneManageController.java index bc6ab729..b7acd704 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneManageController.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneManageController.java @@ -2,7 +2,6 @@ package com.zdxt.knowledge.controller; import com.zdxt.common.ZDResponse; import com.zdxt.common.controller.BaseController; -import com.zdxt.common.util.DateUtils; import com.zdxt.common.util.TableDataInfo; import com.zdxt.knowledge.domain.SceneImportDataModel; import com.zdxt.knowledge.domain.SceneManage; @@ -20,7 +19,6 @@ import org.springframework.web.multipart.MultipartFile; import java.util.Collections; import java.util.List; -import java.util.Objects; /** @@ -114,8 +112,7 @@ public class SceneManageController extends BaseController { @PostMapping("/remove") @ResponseBody public ZDResponse remove(String ids) { - return sceneManageService.deleteSceneManageByIds(ids) > 0 - ? ZDResponse.success() : ZDResponse.error("删除失败"); + return sceneManageService.deleteSceneManageByIds(ids); } /** @@ -149,6 +146,7 @@ public class SceneManageController extends BaseController { dataModel.setType("文字"); dataModel.setSourceUnit("深圳消防"); dataModel.setIsOpen("是"); + dataModel.setSort(1); dataModel.setSceneBackground("开展全员消防培训及演练活动,增强员工防火意识、提升火灾处理能力"); dataModel.setDescribe("逐人过关熟悉掌握基本防火意识及注意事项;强化操练灭火器等消防装备器材的使用方法和操作"); return ExcelUtil.getExcelSimpleResponseEntity( diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneImportDataModel.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneImportDataModel.java index 832c979c..9bd6f273 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneImportDataModel.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneImportDataModel.java @@ -10,26 +10,38 @@ import lombok.Data; @Data public class SceneImportDataModel { - /** 场景名称 */ + /** + * 场景名称 + */ @ExcelProperty("场景名称") @ColumnWidth(20) private String name; - /** 题目类型0：文字 1：图片 2：视频*/ + /** + * 题目类型0：文字 1：图片 2：视频 + */ @ExcelProperty("题目类型(文字,图片,视频)") @ColumnWidth(20) private String type; - /** 来源单位 */ + /** + * 来源单位 + */ @ExcelProperty("来源单位") @ColumnWidth(20) private String sourceUnit; - /** 是否公开0是1否 */ + /** + * 是否公开0是1否 + */ @ExcelProperty("是否公开") @ColumnWidth(20) private String isOpen; + @ExcelProperty("入口排序") + @ColumnWidth(20) + private Integer sort; + @ExcelProperty("演练背景") @ColumnWidth(20) private String sceneBackground; diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneManage.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneManage.java index fa184f2e..47fda7c7 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneManage.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneManage.java @@ -12,156 +12,189 @@ import java.util.Map; /** * 【请填写功能名称】对象 scene_manage - * + * * @author ruoyi * @date 2023-12-25 */ -public class SceneManage implements Serializable -{ +public class SceneManage implements Serializable { private static final long serialVersionUID = 1L; - /** 主键 */ + /** + * 主键 + */ private Long id; - /** 场景名称 */ + /** + * 场景名称 + */ @Excel(name = "场景名称") private String name; - /** 题目类型0：文字 1：图片 2：视频*/ + /** + * 题目类型0：文字 1：图片 2：视频 + */ @Excel(name = "题目类型") private Integer type; - /** 二维码链接 */ + /** + * 二维码链接 + */ @Excel(name = "二维码链接") private String url; - /** 来源单位 */ + /** + * 来源单位 + */ @Excel(name = "来源单位") private String sourceUnit; - /** 是否公开0是1否 */ + /** + * 是否公开0是1否 + */ @Excel(name = "是否公开0是1否") private Integer isOpen; - /** 状态 1：上架中 2：上架 3：下架中 4：下架*/ + /** + * 状态 1：上架中 2：上架 3：下架中 4：下架 + */ @Excel(name = "状态") private Integer status; - /** 是否删除0是1否 */ + /** + * 是否删除0是1否 + */ @Excel(name = "是否删除0是1否") private Integer isDelete; - /** 创建人 */ + /** + * 创建人 + */ @Excel(name = "创建人") private String creator; + /** + * 演练背景 + */ @Excel(name = "演练背景") private String sceneBackground; + /** + * 描述 + */ @Excel(name = "描述") private String describe; - /** 创建时间 */ + /** + * 排序 + */ + @Excel(name = "排序") + private Integer sort; + + /** + * 使用人数 + */ + @Excel(name = "使用人数") + private Long useTotal; + + /** + * 创建时间 + */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; private Date createTimeEnd; - /** 更新时间 */ + /** + * 更新时间 + */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; - /** 请求参数 */ + /** + * 请求参数 + */ private Map params; - public void setId(Long id) - { + public void setId(Long id) { this.id = id; } - public Long getId() - { + public Long getId() { return id; } - public void setName(String name) - { + + public void setName(String name) { this.name = name; } - public String getName() - { + public String getName() { return name; } - public void setType(Integer type) - { + + public void setType(Integer type) { this.type = type; } - public Integer getType() - { + public Integer getType() { return type; } - public void setUrl(String url) - { + + public void setUrl(String url) { this.url = url; } - public String getUrl() - { + public String getUrl() { return url; } - public void setSourceUnit(String sourceUnit) - { + + public void setSourceUnit(String sourceUnit) { this.sourceUnit = sourceUnit; } - public String getSourceUnit() - { + public String getSourceUnit() { return sourceUnit; } - public void setIsOpen(Integer isOpen) - { + + public void setIsOpen(Integer isOpen) { this.isOpen = isOpen; } - public Integer getIsOpen() - { + public Integer getIsOpen() { return isOpen; } - public void setStatus(Integer status) - { + + public void setStatus(Integer status) { this.status = status; } - public Integer getStatus() - { + public Integer getStatus() { return status; } - public void setIsDelete(Integer isDelete) - { + + public void setIsDelete(Integer isDelete) { this.isDelete = isDelete; } - public Integer getIsDelete() - { + public Integer getIsDelete() { return isDelete; } - public void setCreator(String creator) - { + + public void setCreator(String creator) { this.creator = creator; } - public String getCreator() - { + public String getCreator() { return creator; } public Date getCreateTime() { return createTime; } + public void setCreateTime(Date createTime) { this.createTime = createTime; } + public Date getUpdateTime() { return updateTime; } @@ -180,18 +213,18 @@ public class SceneManage implements Serializable @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("name", getName()) - .append("type", getType()) - .append("url", getUrl()) - .append("sourceUnit", getSourceUnit()) - .append("isOpen", getIsOpen()) - .append("status", getStatus()) - .append("isDelete", getIsDelete()) - .append("creator", getCreator()) - .append("createTime", getCreateTime()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("name", getName()) + .append("type", getType()) + .append("url", getUrl()) + .append("sourceUnit", getSourceUnit()) + .append("isOpen", getIsOpen()) + .append("status", getStatus()) + .append("isDelete", getIsDelete()) + .append("creator", getCreator()) + .append("createTime", getCreateTime()) + .toString(); } public Date getCreateTimeEnd() { @@ -217,4 +250,20 @@ public class SceneManage implements Serializable public void setDescribe(String describe) { this.describe = describe; } + + public Integer getSort() { + return sort; + } + + public void setSort(Integer sort) { + this.sort = sort; + } + + public Long getUseTotal() { + return useTotal; + } + + public void setUseTotal(Long useTotal) { + this.useTotal = useTotal; + } } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/SceneManageMapper.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/SceneManageMapper.java index de1bf821..e1ed5bc1 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/SceneManageMapper.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/SceneManageMapper.java @@ -68,4 +68,13 @@ public interface SceneManageMapper * @return 结果 */ public int deleteSceneManageByIds(String[] ids); + + + /** + * 批量查找【请填写功能名称】 + * + * @param ids 需要查找的数据ID + * @return 结果 + */ + public List selectSceneManageByIds(String[] ids); } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneManageService.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneManageService.java index c2531939..fe9968a1 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneManageService.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneManageService.java @@ -54,7 +54,7 @@ public interface ISceneManageService * @param ids 需要删除的数据ID * @return 结果 */ - public int deleteSceneManageByIds(String ids); + public ZDResponse deleteSceneManageByIds(String ids); /** * 删除【请填写功能名称】信息 diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneManageServiceImpl.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneManageServiceImpl.java index 166248f7..10964bde 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneManageServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneManageServiceImpl.java @@ -104,8 +104,16 @@ public class SceneManageServiceImpl implements ISceneManageService { * @return 结果 */ @Override - public int deleteSceneManageByIds(String ids) { - return sceneManageMapper.deleteSceneManageByIds(Convert.toStrArray(ids)); + public ZDResponse deleteSceneManageByIds(String ids) { + List sceneManageList = sceneManageMapper.selectSceneManageByIds(Convert.toStrArray(ids)); + if (CollectionUtils.isNotEmpty(sceneManageList)) { + long count = sceneManageList.stream().filter(item -> !Objects.equals(item.getStatus(), 4)).count(); + if (count > 0) { + return ZDResponse.error("仅支持已下架的场景进行删除操作"); + } + } + return sceneManageMapper.deleteSceneManageByIds(Convert.toStrArray(ids))> 0 + ? ZDResponse.success() : ZDResponse.error("删除失败"); } /** diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneManageMapper.xml b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneManageMapper.xml index 68cd3a2d..6ec19339 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneManageMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneManageMapper.xml @@ -17,10 +17,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select id, name, type, url, source_unit, is_open, status, is_delete, creator, create_time, scene_background, `describe` from scene_manage + select id, name, type, url, source_unit, is_open, status, is_delete, creator, create_time, scene_background, `describe`, sort, use_total from scene_manage + + + and is_delete = 1 + and id in + + #{id} + + + + insert into scene_manage - (`name`, `type`, source_unit, is_open, creator, create_time,scene_background, `describe`) values + (`name`, `type`, source_unit, is_open, creator, create_time,scene_background, `describe`, `sort`) values - (#{sceneObj.name},#{sceneObj.type},#{sceneObj.sourceUnit},#{sceneObj.isOpen},#{sceneObj.creator},#{sceneObj.createTime},#{sceneObj.sceneBackground},#{sceneObj.describe}) + (#{sceneObj.name},#{sceneObj.type},#{sceneObj.sourceUnit},#{sceneObj.isOpen},#{sceneObj.creator},#{sceneObj.createTime},#{sceneObj.sceneBackground},#{sceneObj.describe},#{sceneObj.sort})