diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/add.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/add.html new file mode 100644 index 00000000..32b48397 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/add.html @@ -0,0 +1,227 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+
+ +
+
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/edit.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/edit.html new file mode 100755 index 00000000..75293e0d --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/edit.html @@ -0,0 +1,216 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+ + + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/view.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/view.html new file mode 100644 index 00000000..03d1ec3a --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/view.html @@ -0,0 +1,117 @@ + + + + + + +
+
+
+
+
+ +
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file 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 f4869423..9c549048 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 @@ -2,10 +2,11 @@ +
-
+
@@ -18,20 +19,15 @@
-
- -
- - - - + + + + + + - -
-
+ +
@@ -53,19 +49,150 @@
+
+ +
+
+ +
+
+
- + + diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/detail.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/detail.html index 0e5129ff..9680be54 100755 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/detail.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/scene/detail.html @@ -2,6 +2,7 @@ +
@@ -13,12 +14,12 @@
-
- -
- -
-
+ + + + + +
@@ -67,26 +68,45 @@
+
+ +
+
+ +
+
+ +
+ \ No newline at end of file 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 ed81915b..608dbc7b 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 @@ -2,6 +2,7 @@ +
@@ -13,15 +14,15 @@
-
- -
- -
-
+ + + + + + + + +
@@ -76,20 +77,200 @@
+
+ +
+
+ +
+
+ +
- \ No newline at end of file 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 00e98843..2da40b9b 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 @@ -2,6 +2,7 @@ +
@@ -63,7 +64,7 @@ var exportFlag = [[${@permission.hasPermi('project:manage:export')}]]; var importboolen = (importFlag == "" ? true : false) var exportboolen = (exportFlag == "" ? true : false) - var prefix = ctx + "scene/manage"; + var prefix = ctx + "small/scene/manage"; $(function () { var options = { url: prefix + "/list", @@ -99,17 +100,17 @@ field: 'name', title: '场景名称' }, - { - field: 'type', - title: '题目类型', - formatter: function (value, index) { - for (var i = 0; i <= sceneType.length; i++) { - if (value + "" === sceneType[i].dictValue) { - return sceneType[i].dictLabel; - } - } - } - }, + // { + // field: 'type', + // title: '题目类型', + // formatter: function (value, index) { + // for (var i = 0; i <= sceneType.length; i++) { + // if (value + "" === sceneType[i].dictValue) { + // return sceneType[i].dictLabel; + // } + // } + // } + // }, { field: 'url', title: '二维码' @@ -194,7 +195,7 @@ // } function sort(id) { - $.get(ctx + "scene/manage/sort/" + id, null, function (res) { + $.get(ctx + "small/scene/manage/sort/" + id, null, function (res) { if (res.success) { // $.table.refresh(); diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/CustomImageController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/CustomImageController.java index a6d46943..d4226d5c 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/CustomImageController.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/CustomImageController.java @@ -60,7 +60,7 @@ public class CustomImageController extends BaseController { */ @PostMapping("/listAll") @ResponseBody - public ZDResponse listAll(CustomImage customImage) { + public ZDResponse listAll(@RequestBody CustomImage customImage) { List list = customImageService.selectCustomImageListAll(customImage); return ZDResponse.success("成功", list); } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneHomeController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneHomeController.java new file mode 100644 index 00000000..c064d0c0 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneHomeController.java @@ -0,0 +1,171 @@ +package com.zdxt.knowledge.controller; + +import com.zdxt.common.ZDResponse; +import com.zdxt.common.controller.BaseController; +import com.zdxt.common.util.TableDataInfo; +import com.zdxt.knowledge.domain.SceneHome; +import com.zdxt.knowledge.service.ISceneHomeService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.HashMap; +import java.util.List; + +/** + * Controller + * + * @author ruoyi + * @date 2023-12-26 + */ +@Controller +@RequestMapping("/small/project/home") +public class SceneHomeController extends BaseController { + private String prefix = "project/home"; + + @Autowired + private ISceneHomeService sceneHomeService; + + @RequiresPermissions("project:home:view") + @GetMapping("/view") + public String view() { + return prefix + "/view"; + } + + /** + * 查询列表 + */ + @RequiresPermissions("project:home:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(SceneHome sceneHome) { + startPage(); + List list = sceneHomeService.selectSceneHomeList(sceneHome); + return getDataTable(list); + } + + /** + * 查询列表 + */ + @PostMapping("/listAll") + @ResponseBody + public ZDResponse listAll(@RequestBody SceneHome sceneHome) { + List list = sceneHomeService.selectSceneHomeListAll(sceneHome); + return ZDResponse.success("成功", list); + } + + @RequiresPermissions("project:home:detail") + @GetMapping("/detail/{guid}") + public String detail(@PathVariable("guid") String guid, ModelMap mmap) { + SceneHome sceneHome = sceneHomeService.selectSceneHomeById(guid); + mmap.put("sceneHome", sceneHome); + return prefix + "/detail"; + } + + /** + * 新增跳转 + */ + @GetMapping("/add") + public String add() { + return prefix + "/add"; + } + + /** + * 新增保存 + */ + @RequiresPermissions("project:home:add") + @PostMapping("/add") + @ResponseBody + public ZDResponse addSave(@RequestParam("file") MultipartFile[] files, SceneHome sceneHome) { + return sceneHomeService.insertSceneHome(files, sceneHome) > 0 + ? ZDResponse.success() : ZDResponse.error("新增失败"); + } + + /** + * 修改 + */ + @GetMapping("/edit/{guid}") + public String edit(@PathVariable("guid") String guid, ModelMap mmap) { + SceneHome sceneHome = sceneHomeService.selectSceneHomeById(guid); + mmap.put("sceneHome", sceneHome); + return prefix + "/edit"; + } + + /** + * 修改保存 + */ + @RequiresPermissions("project:home:edit") + @PostMapping("/edit") + @ResponseBody + public ZDResponse editSave(@RequestParam("file") MultipartFile[] files, SceneHome sceneHome) { + return sceneHomeService.updateSceneHome(files, sceneHome) > 0 + ? ZDResponse.success() : ZDResponse.error("修改失败"); + } + + /** + * 删除 + */ + @RequiresPermissions("project:home:remove") + @PostMapping("/remove") + @ResponseBody + public ZDResponse remove(String ids) { + return sceneHomeService.deleteSceneHomeByIds(ids) > 0 + ? ZDResponse.success() : ZDResponse.error("删除失败"); + } + + /** + * 排序上移 + */ + @GetMapping("/sort/{guid}") + @ResponseBody + public ZDResponse sort(@PathVariable("guid") String guid) { + return sceneHomeService.sort(guid); + } + + /** + * 查询附件信息 + * + * @param key + * @return + */ + @GetMapping("/queryFiles/{key}") + @ResponseBody + public ZDResponse queryFiles(@PathVariable String key) { + HashMap map = new HashMap<>(); + map.put("filePreview", sceneHomeService.queryFiles(key)); + return ZDResponse.success("获取成功", map); + } + + /** + * 查询附件信息 + * + * @param key + * @return + */ + @PostMapping("/queryFilesPost") + @ResponseBody + public ZDResponse queryFilesPost(String key) { + HashMap map = new HashMap<>(); + map.put("filePreview", sceneHomeService.queryFiles(key)); + return ZDResponse.success("获取成功", map); + } + + /** + * 删除案例要素附件 + * + * @param key + * @return + */ + @PostMapping("/removeFile") + @ResponseBody + public ZDResponse removeFile(String key) { + if (sceneHomeService.removeFile(key) > 0) { + return ZDResponse.success("操作成功"); + } else { + return ZDResponse.error("操作失败"); + } + } +} 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 cb7d58d8..bcc337c3 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 @@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.util.Collections; +import java.util.HashMap; import java.util.List; @@ -28,7 +29,7 @@ import java.util.List; * @date 2023-12-25 */ @Controller -@RequestMapping("/scene/manage") +@RequestMapping("/small/scene/manage") public class SceneManageController extends BaseController { private String prefix = "project/scene"; @@ -54,6 +55,16 @@ public class SceneManageController extends BaseController { return getDataTable(list); } + /** + * 查询 + */ + @PostMapping("/listAll") + @ResponseBody + public ZDResponse listAll(@RequestBody SceneManage sceneManage) { + List list = sceneManageService.selectSceneManageListAll(sceneManage); + return ZDResponse.success("成功", list); + } + /** * 查看详情 */ @@ -79,8 +90,8 @@ public class SceneManageController extends BaseController { @RequiresPermissions("project:manage:add") @PostMapping("/add") @ResponseBody - public ZDResponse addSave(SceneManage sceneManage) { - return sceneManageService.insertSceneManage(sceneManage) > 0 + public ZDResponse addSave(@RequestParam("file") MultipartFile[] files, SceneManage sceneManage) { + return sceneManageService.insertSceneManage(files, sceneManage) > 0 ? ZDResponse.success() : ZDResponse.error("新增失败"); } @@ -100,8 +111,8 @@ public class SceneManageController extends BaseController { @RequiresPermissions("project:manage:edit") @PostMapping("/edit") @ResponseBody - public ZDResponse editSave(SceneManage sceneManage) { - return sceneManageService.updateSceneManage(sceneManage) > 0 + public ZDResponse editSave(@RequestParam("file") MultipartFile[] files, SceneManage sceneManage) { + return sceneManageService.updateSceneManage(files, sceneManage) > 0 ? ZDResponse.success() : ZDResponse.error("编辑失败"); } @@ -164,4 +175,49 @@ public class SceneManageController extends BaseController { SceneImportDataModel.class ); } + + /** + * 查询附件信息 + * + * @param key + * @return + */ + @GetMapping("/queryFiles/{key}") + @ResponseBody + public ZDResponse queryFiles(@PathVariable String key) { + HashMap map = new HashMap<>(); + map.put("filePreview", sceneManageService.queryFiles(key)); + return ZDResponse.success("获取成功", map); + } + + /** + * 查询附件信息 + * + * @param key + * @return + */ + @PostMapping("/queryFilesPost") + @ResponseBody + public ZDResponse queryFilesPost(String key) { + HashMap map = new HashMap<>(); + map.put("filePreview", sceneManageService.queryFiles(key)); + return ZDResponse.success("获取成功", map); + } + + /** + * 删除案例要素附件 + * + * @param key + * @return + */ + @PostMapping("/removeFile") + @ResponseBody + public ZDResponse removeFile(String key) { + if (sceneManageService.removeFile(key) > 0) { + return ZDResponse.success("操作成功"); + } else { + return ZDResponse.error("操作失败"); + } + } + } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneHome.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneHome.java new file mode 100644 index 00000000..8fc1fda5 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneHome.java @@ -0,0 +1,131 @@ +package com.zdxt.knowledge.domain; + +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; +import java.util.Map; + +/** + * 场景题目对象 scene_question + * + * @author ruoyi + * @date 2023-12-26 + */ +public class SceneHome implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String guid; + + /** + * 名称 + */ + private String name; + + /** + * 隐藏0是1否 + */ + private Integer hide; + + /** + * 图标 + */ + private String picIcon; + + /** + * 名称 + */ + private Integer sort; + + /** + * 创建人 + */ + private String creator; + + /** + * 创建时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + private String uploadPath; + /** + * 请求参数 + */ + private Map params; + + public String getGuid() { + return guid; + } + + public void setGuid(String guid) { + this.guid = guid; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getHide() { + return hide; + } + + public void setHide(Integer hide) { + this.hide = hide; + } + + public String getPicIcon() { + return picIcon; + } + + public void setPicIcon(String picIcon) { + this.picIcon = picIcon; + } + + public Integer getSort() { + return sort; + } + + public void setSort(Integer sort) { + this.sort = sort; + } + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Map getParams() { + return params; + } + + public void setParams(Map params) { + this.params = params; + } + + public String getUploadPath() { + return uploadPath; + } + + public void setUploadPath(String uploadPath) { + this.uploadPath = uploadPath; + } +} 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 11f5e004..4a1865fb 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 @@ -109,6 +109,8 @@ public class SceneManage implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; + private String uploadPath; + /** * 请求参数 */ @@ -265,4 +267,12 @@ public class SceneManage implements Serializable { public void setUseTotal(Long useTotal) { this.useTotal = useTotal; } + + public String getUploadPath() { + return uploadPath; + } + + public void setUploadPath(String uploadPath) { + this.uploadPath = uploadPath; + } } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/SceneHomeMapper.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/SceneHomeMapper.java new file mode 100644 index 00000000..1e0cf63e --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/SceneHomeMapper.java @@ -0,0 +1,63 @@ +package com.zdxt.knowledge.mapper; + +import com.zdxt.knowledge.domain.SceneHome; + +import java.util.List; + +/** + * Mapper接口 + * + * @author ruoyi + * @date 2023-12-26 + */ +public interface SceneHomeMapper { + /** + * 查询 + * + * @param guid ID + * @return + */ + public SceneHome selectSceneHomeById(String guid); + + /** + * 查询列表 + * + * @param sceneHome + * @return 集合 + */ + public List selectSceneHomeList(SceneHome sceneHome); + + public List selectSceneHomeListAll(SceneHome sceneHome); + + /** + * 新增 + * + * @param sceneHome + * @return 结果 + */ + public int insertSceneHome(SceneHome sceneHome); + + /** + * 修改 + * + * @param sceneHome + * @return 结果 + */ + public int updateSceneHome(SceneHome sceneHome); + + /** + * 批量删除 + * + * @param guids 需要删除的数据ID + * @return 结果 + */ + public int deleteSceneHomeByIds(String[] guids); + + /** + * 获取排序【请填写功能名称】 + * + * @return 结果 + */ + public SceneHome selectLastSort(Integer sort); + +} 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 8d8528ea..e6ca108c 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 @@ -7,31 +7,32 @@ import java.util.List; /** * 【请填写功能名称】Mapper接口 - * + * * @author ruoyi * @date 2023-12-25 */ -public interface SceneManageMapper -{ +public interface SceneManageMapper { /** * 查询【请填写功能名称】 - * + * * @param guid 【请填写功能名称】ID * @return 【请填写功能名称】 */ - public SceneManage selectSceneManageById(String guid); + public SceneManage selectSceneManageById(String guid); /** * 查询【请填写功能名称】列表 - * + * * @param sceneManage 【请填写功能名称】 * @return 【请填写功能名称】集合 */ public List selectSceneManageList(SceneManage sceneManage); + public List selectSceneManageListAll(SceneManage sceneManage); + /** * 新增【请填写功能名称】 - * + * * @param sceneManage 【请填写功能名称】 * @return 结果 */ @@ -47,7 +48,7 @@ public interface SceneManageMapper /** * 修改【请填写功能名称】 - * + * * @param sceneManage 【请填写功能名称】 * @return 结果 */ @@ -55,7 +56,7 @@ public interface SceneManageMapper /** * 删除【请填写功能名称】 - * + * * @param guid 【请填写功能名称】ID * @return 结果 */ @@ -63,7 +64,7 @@ public interface SceneManageMapper /** * 批量删除【请填写功能名称】 - * + * * @param guids 需要删除的数据ID * @return 结果 */ @@ -84,7 +85,7 @@ public interface SceneManageMapper * * @return 结果 */ - public int selectMinSort(); + public Integer selectMinSort(); /** * 获取排序【请填写功能名称】 diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneHomeService.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneHomeService.java new file mode 100644 index 00000000..9b849fb8 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneHomeService.java @@ -0,0 +1,83 @@ +package com.zdxt.knowledge.service; + +import com.zdxt.common.ZDResponse; +import com.zdxt.common.zdxtFile.AttFileRespDTO; +import com.zdxt.knowledge.domain.SceneHome; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; + +/** + * Service接口 + * + * @author ruoyi + * @date 2023-12-26 + */ +public interface ISceneHomeService { + /** + * 查询 + * + * @param guid ID + * @return + */ + public SceneHome selectSceneHomeById(String guid); + + /** + * 查询列表 + * + * @param sceneHome + * @return 集合 + */ + public List selectSceneHomeList(SceneHome sceneHome); + + public List selectSceneHomeListAll(SceneHome sceneHome); + + /** + * 新增 + * + * @param sceneHome + * @return 结果 + */ + public int insertSceneHome(MultipartFile[] files, SceneHome sceneHome); + + + /** + * 修改 + * + * @param sceneHome + * @return 结果 + */ + public int updateSceneHome(MultipartFile[] files, SceneHome sceneHome); + + /** + * 批量删除 + * + * @param guids 需要删除的数据ID + * @return 结果 + */ + public int deleteSceneHomeByIds(String guids); + + /** + * 排序上移【请填写功能名称】 + * + * @param guid + * @return 结果 + */ + public ZDResponse sort(String guid); + + /** + * 查询附件 + * + * @param key + * @return + */ + AttFileRespDTO queryFiles(String key); + + /** + * 删除案例要素图片 + * + * @param key 图片id + * @return + */ + public int removeFile(String key); +} 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 35b603e3..1998efbe 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 @@ -1,6 +1,7 @@ package com.zdxt.knowledge.service; import com.zdxt.common.ZDResponse; +import com.zdxt.common.zdxtFile.AttFileRespDTO; import com.zdxt.knowledge.domain.SceneManage; import org.springframework.core.io.Resource; import org.springframework.http.ResponseEntity; @@ -10,15 +11,14 @@ import java.util.List; /** * 【请填写功能名称】Service接口 - * + * * @author ruoyi * @date 2023-12-25 */ -public interface ISceneManageService -{ +public interface ISceneManageService { /** * 查询【请填写功能名称】 - * + * * @param guid 【请填写功能名称】ID * @return 【请填写功能名称】 */ @@ -26,31 +26,39 @@ public interface ISceneManageService /** * 查询【请填写功能名称】列表 - * + * * @param sceneManage 【请填写功能名称】 * @return 【请填写功能名称】集合 */ public List selectSceneManageList(SceneManage sceneManage); + /** + * 查询列表 + * + * @param sceneManage 【请填写功能名称】 + * @return 请填写功能名称】集合 + */ + public List selectSceneManageListAll(SceneManage sceneManage); + /** * 新增【请填写功能名称】 - * + * * @param sceneManage 【请填写功能名称】 * @return 结果 */ - public int insertSceneManage(SceneManage sceneManage); + public int insertSceneManage(MultipartFile[] files, SceneManage sceneManage); /** * 修改【请填写功能名称】 - * + * * @param sceneManage 【请填写功能名称】 * @return 结果 */ - public int updateSceneManage(SceneManage sceneManage); + public int updateSceneManage(MultipartFile[] files, SceneManage sceneManage); /** * 批量删除【请填写功能名称】 - * + * * @param guids 需要删除的数据ID * @return 结果 */ @@ -58,7 +66,7 @@ public interface ISceneManageService /** * 删除【请填写功能名称】信息 - * + * * @param guid 【请填写功能名称】ID * @return 结果 */ @@ -86,4 +94,20 @@ public interface ISceneManageService * @return 结果 */ ResponseEntity exportData(); + + /** + * 查询附件 + * + * @param key + * @return + */ + AttFileRespDTO queryFiles(String key); + + /** + * 删除案例要素图片 + * + * @param key 图片id + * @return + */ + public int removeFile(String key); } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneHomeServiceImpl.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneHomeServiceImpl.java new file mode 100644 index 00000000..596d2969 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneHomeServiceImpl.java @@ -0,0 +1,168 @@ +package com.zdxt.knowledge.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; +import com.zdxt.auth.dto.UserBean; +import com.zdxt.auth.dto.ZdxtFileBean; +import com.zdxt.auth.feign.FileUploadApi; +import com.zdxt.auth.feign.UserApi; +import com.zdxt.auth.feign.ZdxtFileCommonApi; +import com.zdxt.common.ZDResponse; +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; +import com.zdxt.common.zdxtFile.ZdxtFileCommon; +import com.zdxt.knowledge.domain.SceneHome; +import com.zdxt.knowledge.domain.SceneManage; +import com.zdxt.knowledge.mapper.SceneHomeMapper; +import com.zdxt.knowledge.service.ISceneHomeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +/** + * Service业务层处理 + * + * @author ruoyi + * @date 2023-12-26 + */ +@Service +public class SceneHomeServiceImpl implements ISceneHomeService { + @Autowired + private SceneHomeMapper sceneHomeMapper; + @Autowired + private UserApi userApi; + @Autowired + private FileUploadApi fileUploadApi; + @Autowired + private ZdxtFileCommonApi zdxtFileCommonApi; + + /** + * 查询 + * + * @param guid ID + * @return + */ + @Override + public SceneHome selectSceneHomeById(String guid) { + return sceneHomeMapper.selectSceneHomeById(guid); + } + + /** + * 查询列表 + * + * @param sceneHome + * @return + */ + @Override + public List selectSceneHomeList(SceneHome sceneHome) { + return sceneHomeMapper.selectSceneHomeList(sceneHome); + } + + @Override + public List selectSceneHomeListAll(SceneHome sceneHome) { + return sceneHomeMapper.selectSceneHomeListAll(sceneHome); + } + + /** + * 新增 + * + * @param sceneHome + * @return 结果 + */ + @Override + public int insertSceneHome(MultipartFile[] files, SceneHome sceneHome) { + UserBean userBean = userApi.getCurrentUser(); + if (Objects.nonNull(userBean)) { + sceneHome.setCreator(userBean.getUserName()); + sceneHome.setCreateTime(DateUtils.getNowDate()); + } + sceneHome.setGuid(StringUtils.getUUID()); + int result = sceneHomeMapper.insertSceneHome(sceneHome); + // 上传文件，并在附件表中添加记录 + if (result > 0 && ObjectUtil.isNotEmpty(files)) { + for (MultipartFile file : files) { + zdxtFileCommonApi.insertZdxtFile(file, sceneHome.getGuid() + "", fileUploadApi.upload(file)); + } + } + return result; + } + + /** + * 修改 + * + * @param sceneHome + * @return 结果 + */ + @Override + public int updateSceneHome(MultipartFile[] files, SceneHome sceneHome) { + int result = sceneHomeMapper.updateSceneHome(sceneHome); + // 上传文件，并在附件表中添加记录 + if (result > 0 && ObjectUtil.isNotEmpty(files)) { + zdxtFileCommonApi.deleteZdxtFileByIds(sceneHome.getGuid()); + for (MultipartFile file : files) { + zdxtFileCommonApi.insertZdxtFile(file, sceneHome.getGuid() + "", fileUploadApi.upload(file)); + } + } + return result; + } + + /** + * 删除对象 + * + * @param guids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteSceneHomeByIds(String guids) { + return sceneHomeMapper.deleteSceneHomeByIds(Convert.toStrArray(guids)); + } + + @Override + public ZDResponse sort(String guid) { + SceneHome sceneHome = sceneHomeMapper.selectSceneHomeById(guid); + if (Objects.isNull(sceneHome)) { + return ZDResponse.error("未找到相关数据"); + } + SceneHome lastSceneHome = sceneHomeMapper.selectLastSort(sceneHome.getSort()); + if (Objects.isNull(lastSceneHome)) { + return ZDResponse.error("上移达到最大限制"); + } + + Integer lastSceneManageSort = lastSceneHome.getSort(); + lastSceneHome.setSort(sceneHome.getSort()); + sceneHomeMapper.updateSceneHome(lastSceneHome); + sceneHome.setSort(lastSceneManageSort); + sceneHomeMapper.updateSceneHome(sceneHome); + return ZDResponse.success("上移成功"); + } + + @Override + public AttFileRespDTO queryFiles(String key) { + ZdxtFileBean zdxtFileBeanCondition = new ZdxtFileBean(); + zdxtFileBeanCondition.setBusinessId(key); + List fileBeanList = zdxtFileCommonApi.selectZdxtFileList(zdxtFileBeanCondition); + + ArrayList fileList = new ArrayList<>(); + for (ZdxtFileBean fileBean : fileBeanList) { + ZdxtFileCommon zdxtFileCommon = new ZdxtFileCommon(); + BeanUtil.copyProperties(fileBean, zdxtFileCommon); + fileList.add(zdxtFileCommon); + } + + FilePreviewUtilBean filePreviewUtilBean = new FilePreviewUtilBean(); + return filePreviewUtilBean.attachementToAttFileRespDTO(fileList); + } + + @Override + public int removeFile(String key) { + return zdxtFileCommonApi.deleteZdxtFileById(key); + } + +} 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 fbca5c1a..89f060e9 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 @@ -1,14 +1,22 @@ package com.zdxt.knowledge.service.impl; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; import com.zdxt.auth.dto.DictDataBean; import com.zdxt.auth.dto.UserBean; +import com.zdxt.auth.dto.ZdxtFileBean; import com.zdxt.auth.feign.DictDataApi; +import com.zdxt.auth.feign.FileUploadApi; import com.zdxt.auth.feign.UserApi; +import com.zdxt.auth.feign.ZdxtFileCommonApi; import com.zdxt.common.ZDResponse; 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; +import com.zdxt.common.zdxtFile.ZdxtFileCommon; import com.zdxt.knowledge.domain.SceneImportDataModel; import com.zdxt.knowledge.domain.SceneManage; import com.zdxt.knowledge.mapper.SceneManageMapper; @@ -46,6 +54,12 @@ public class SceneManageServiceImpl implements ISceneManageService { @Autowired private DictDataApi dictDataApi; + @Autowired + private FileUploadApi fileUploadApi; + + @Autowired + private ZdxtFileCommonApi zdxtFileCommonApi; + /** * 查询【请填写功能名称】 * @@ -71,6 +85,17 @@ public class SceneManageServiceImpl implements ISceneManageService { return sceneManageMapper.selectSceneManageList(sceneManage); } + /** + * 查询列表 + * + * @param sceneManage 【请填写功能名称】 + * @return 【请填写功能名称】 + */ + @Override + public List selectSceneManageListAll(SceneManage sceneManage) { + return sceneManageMapper.selectSceneManageListAll(sceneManage); + } + /** * 新增【请填写功能名称】 * @@ -78,16 +103,23 @@ public class SceneManageServiceImpl implements ISceneManageService { * @return 结果 */ @Override - public int insertSceneManage(SceneManage sceneManage) { + public int insertSceneManage(MultipartFile[] files, SceneManage sceneManage) { UserBean userBean = userApi.getCurrentUser(); if (Objects.nonNull(userBean)) { sceneManage.setCreator(userBean.getUserName()); sceneManage.setCreateTime(DateUtils.getNowDate()); } - int i = sceneManageMapper.selectMinSort(); - sceneManage.setSort(i + 1); + Integer i = sceneManageMapper.selectMinSort(); + sceneManage.setSort(Objects.isNull(i) ? 1 : i + 1); sceneManage.setGuid(StringUtils.getUUID()); - return sceneManageMapper.insertSceneManage(sceneManage); + int result = sceneManageMapper.insertSceneManage(sceneManage); + // 上传文件，并在附件表中添加记录 + if (result > 0 && ObjectUtil.isNotEmpty(files)) { + for (MultipartFile file : files) { + zdxtFileCommonApi.insertZdxtFile(file, sceneManage.getGuid() + "", fileUploadApi.upload(file)); + } + } + return result; } /** @@ -97,9 +129,17 @@ public class SceneManageServiceImpl implements ISceneManageService { * @return 结果 */ @Override - public int updateSceneManage(SceneManage sceneManage) { + public int updateSceneManage(MultipartFile[] files, SceneManage sceneManage) { sceneManage.setUpdateTime(DateUtils.getNowDate()); - return sceneManageMapper.updateSceneManage(sceneManage); + int result = sceneManageMapper.updateSceneManage(sceneManage); + // 上传文件，并在附件表中添加记录 + if (result > 0 && ObjectUtil.isNotEmpty(files)) { + zdxtFileCommonApi.deleteZdxtFileByIds(sceneManage.getGuid()); + for (MultipartFile file : files) { + zdxtFileCommonApi.insertZdxtFile(file, sceneManage.getGuid() + "", fileUploadApi.upload(file)); + } + } + return result; } /** @@ -140,7 +180,7 @@ public class SceneManageServiceImpl implements ISceneManageService { } SceneManage lastSceneManage = sceneManageMapper.selectLastSort(sceneManage.getSort()); if (Objects.isNull(lastSceneManage)) { - return ZDResponse.error("上移达到最大限制"); + return ZDResponse.error("上移达到最大限制"); } Integer lastSceneManageSort = lastSceneManage.getSort(); @@ -207,4 +247,27 @@ public class SceneManageServiceImpl implements ISceneManageService { return ExcelUtil.getExcelSimpleResponseEntity(new ArrayList<>(), dataModelList, SceneImportDataModel.class); } + @Override + public AttFileRespDTO queryFiles(String key) { + ZdxtFileBean zdxtFileBeanCondition = new ZdxtFileBean(); + zdxtFileBeanCondition.setBusinessId(key); + List fileBeanList = zdxtFileCommonApi.selectZdxtFileList(zdxtFileBeanCondition); + + ArrayList fileList = new ArrayList<>(); + for (ZdxtFileBean fileBean : fileBeanList) { + ZdxtFileCommon zdxtFileCommon = new ZdxtFileCommon(); + BeanUtil.copyProperties(fileBean, zdxtFileCommon); + fileList.add(zdxtFileCommon); + } + + FilePreviewUtilBean filePreviewUtilBean = new FilePreviewUtilBean(); + return filePreviewUtilBean.attachementToAttFileRespDTO(fileList); + } + + @Override + public int removeFile(String key) { + return zdxtFileCommonApi.deleteZdxtFileById(key); + } + + } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/CustomImageMapper.xml b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/CustomImageMapper.xml index 455cbe30..b75c5e70 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/CustomImageMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/CustomImageMapper.xml @@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and cu.page = #{page} and cu.position = #{position} + order by cu.srot ASC + + + and name like concat('%', #{name}, '%') + and creator = #{creator} + + order by sort ASC + + + + + + insert into scene_home + + guid, + `name`, + pic_icon, + sort, + `hide`, + creator, + create_time, + + + #{guid}, + #{name}, + #{picIcon}, + #{sort}, + #{hide}, + #{creator}, + #{createTime}, + + + + + update scene_home + + name = #{name}, + pic_icon = #{picIcon}, + sort = #{sort}, + hide = #{hide}, + creator = #{creator}, + + where guid = #{guid} + + + + delete from scene_home where guid = #{guid} + + + + delete from scene_home where guid in + + #{guid} + + + + + + + + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneManageMapper.xml b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneManageMapper.xml index d5e81d0f..7c09aab7 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneManageMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneManageMapper.xml @@ -141,5 +141,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + \ No newline at end of file