diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/add.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/add.html index ccbd050b..42f75f69 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/add.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/add.html @@ -3,7 +3,7 @@ - +
@@ -28,12 +28,13 @@
-
+
- -
- + +
@@ -41,23 +42,23 @@
-
- +
+
+
-
- +
@@ -66,9 +67,17 @@
- + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/selected.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/selected.html new file mode 100755 index 00000000..b98ff393 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/selected.html @@ -0,0 +1,201 @@ + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+
+
+ + + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/view.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/view.html index 884be383..26a45493 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/view.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/view.html @@ -14,6 +14,7 @@

名称：

+
  •  搜索 @@ -40,9 +41,12 @@ var editFlag = [[${@permission.hasPermi('project:medal:edit')}]]; var removeFlag = [[${@permission.hasPermi('project:medal:remove')}]]; var detailFlag = [[${@permission.hasPermi('project:medal:detail')}]]; + var types = [[${@dict.getType('medal_type')}]]; var prefix = ctx + "small/project/medal"; $(function () { + var type = [[${type}]]; + $("[name='type']").val(type); var options = { url: prefix + "/list", createUrl: prefix + "/add/{}", @@ -65,6 +69,13 @@ return value === 0 ? "否" : "是"; } }, + { + field: 'type', + title: '类型', + formatter: function (value, row, index) { + return $.table.selectDictLabel(types, value); + } + }, { field: 'creator', title: '创建人' @@ -78,6 +89,7 @@ align: 'center', formatter: function (value, row, index) { var actions = []; + actions.push('成就 '); actions.push('编辑 '); actions.push('查看 '); actions.push('删除'); @@ -94,7 +106,17 @@ } function add() { - $.modal.open("新增", ctx + "small/project/medal/add", 800, 450); + var type = [[${type}]]; + $.modal.open("新增", ctx + "small/project/medal/add/" + type, 800, 450); + } + + function selected(id) { + var selectedUrl = prefix + "/selected/{guid}"; + var url = "/404.html"; + if ($.common.isNotEmpty(id)) { + url = selectedUrl.replace("{guid}", id); + } + $.modal.open("编辑", url); } function sort(id) { diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneMedalController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneMedalController.java index 14b59215..c6b4773e 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneMedalController.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneMedalController.java @@ -5,10 +5,8 @@ import com.zdxt.common.controller.BaseController; import com.zdxt.common.util.TableDataInfo; import com.zdxt.knowledge.domain.SceneManage; import com.zdxt.knowledge.domain.SceneMedal; -import com.zdxt.knowledge.domain.WechatUser; import com.zdxt.knowledge.service.ISceneManageService; import com.zdxt.knowledge.service.ISceneMedalService; -import com.zdxt.knowledge.service.WechatService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -27,21 +25,47 @@ import java.util.List; * @date 2023-01-22 */ @Controller - @RequestMapping("/small/project/medal") +@RequestMapping("/small/project/medal") public class SceneMedalController extends BaseController { private String prefix = "project/medal"; @Autowired private ISceneMedalService sceneMedalService; - @Autowired private ISceneManageService sceneManageService; - @Autowired private WechatService wechatService; + @Autowired + private ISceneManageService sceneManageService; @RequiresPermissions("project:medal:view") @GetMapping("/view") public String manage() { + return prefix + "/manage"; + } + + @RequiresPermissions("project:medal:view") + @GetMapping("/view/{type}") + public String view(@PathVariable("type") String type, ModelMap mmap) { + mmap.put("type", type); return prefix + "/view"; } + /** + * 成就勋章图标 + */ + @GetMapping("/selected/{guid}") + public String selected(@PathVariable("guid") String guid, ModelMap mmap) { + SceneMedal sceneMedal = sceneMedalService.selectSceneMedalById(guid); + mmap.put("sceneMedal", sceneMedal); + return prefix + "/selected"; + } + + /** + * 修改保存 + */ + @RequiresPermissions("project:medal:edit") + @PostMapping("/selected") + @ResponseBody + public ZDResponse selectedSave(@RequestParam("file") MultipartFile[] files, SceneMedal sceneMedal) { + return sceneMedalService.selected(files, sceneMedal); + } /** * 查询 @@ -54,6 +78,7 @@ public class SceneMedalController extends BaseController { List list = sceneMedalService.selectSceneMedalList(sceneMedal); return getDataTable(list); } + /** * 查询 */ @@ -82,9 +107,10 @@ public class SceneMedalController extends BaseController { /** * 新增 */ - @GetMapping("/add") - public String add(ModelMap mmap) { + @GetMapping("/add/{type}") + public String add(@PathVariable("type") String type, ModelMap mmap) { List sceneList = sceneManageService.selectSceneManageListAll(new SceneManage()); + mmap.put("type", type); mmap.put("sceneList", sceneList); return prefix + "/add"; } @@ -119,8 +145,7 @@ public class SceneMedalController extends BaseController { @PostMapping("/edit") @ResponseBody public ZDResponse editSave(@RequestParam("file") MultipartFile[] files, SceneMedal sceneMedal) { - return sceneMedalService.updateSceneMedal(files, sceneMedal) > 0 - ? ZDResponse.success() : ZDResponse.error("编辑失败"); + return sceneMedalService.updateSceneMedal(files, sceneMedal); } /** diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneMedal.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneMedal.java index f7cec11c..2a31c9c9 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneMedal.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneMedal.java @@ -30,9 +30,19 @@ public class SceneMedal implements Serializable { */ private String iconPath; + /** + * 成就图标 + */ + private String achieveIconPath; + /** 绑定场景Id */ private String sceneId; + /** + * 分数 + */ + private Integer level; + /** 类型 */ private String type; @@ -147,4 +157,20 @@ public class SceneMedal implements Serializable { public void setHide(Integer hide) { this.hide = hide; } + + public Integer getLevel() { + return level; + } + + public void setLevel(Integer level) { + this.level = level; + } + + public String getAchieveIconPath() { + return achieveIconPath; + } + + public void setAchieveIconPath(String achieveIconPath) { + this.achieveIconPath = achieveIconPath; + } } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneMedalService.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneMedalService.java index 517f3a6a..9710d81b 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneMedalService.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneMedalService.java @@ -1,5 +1,6 @@ package com.zdxt.knowledge.service; +import com.zdxt.common.ZDResponse; import com.zdxt.common.zdxtFile.AttFileRespDTO; import com.zdxt.knowledge.domain.SceneMedal; import org.springframework.web.multipart.MultipartFile; @@ -44,7 +45,7 @@ public interface ISceneMedalService { * @param sceneMedal * @return 结果 */ - public int updateSceneMedal(MultipartFile[] files, SceneMedal sceneMedal); + public ZDResponse updateSceneMedal(MultipartFile[] files, SceneMedal sceneMedal); /** * 批量删除 @@ -77,4 +78,6 @@ public interface ISceneMedalService { * @return */ public int removeFile(String key); + + ZDResponse selected(MultipartFile[] files, SceneMedal sceneMedal); } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneMedalServiceImpl.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneMedalServiceImpl.java index 1d180d2f..1d548109 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneMedalServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneMedalServiceImpl.java @@ -7,6 +7,7 @@ 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; @@ -95,17 +96,21 @@ public class SceneMedalServiceImpl implements ISceneMedalService { * @return 结果 */ @Override - public int updateSceneMedal(MultipartFile[] files, SceneMedal sceneMedal) { - if (ObjectUtil.isEmpty(files) || files.length > 1) { - return -1; + public ZDResponse updateSceneMedal(MultipartFile[] files, SceneMedal sceneMedal) { + if (ObjectUtil.isNotEmpty(files) && files.length > 1) { + return ZDResponse.error("单次只允许上传一个文件"); + } + String uploadFilePath = ""; + if (ObjectUtil.isNotEmpty(files)) { + zdxtFileCommonApi.deleteZdxtFileByIds(sceneMedal.getGuid()); + // 上传文件，并在附件表中添加记录 + uploadFilePath = fileUploadApi.upload(files[0]); + zdxtFileCommonApi.insertZdxtFile(files[0], sceneMedal.getGuid() + "", uploadFilePath); } - zdxtFileCommonApi.deleteZdxtFileByIds(sceneMedal.getGuid()); - // 上传文件，并在附件表中添加记录 - String uploadFilePath = fileUploadApi.upload(files[0]); - zdxtFileCommonApi.insertZdxtFile(files[0], sceneMedal.getGuid() + "", uploadFilePath); //更新数据 sceneMedal.setIconPath(uploadFilePath); - return sceneMedalMapper.updateSceneMedal(sceneMedal); + return sceneMedalMapper.updateSceneMedal(sceneMedal) > 0 ? + ZDResponse.success("编辑成功") : ZDResponse.error("编辑失败"); } /** @@ -146,4 +151,21 @@ public class SceneMedalServiceImpl implements ISceneMedalService { return zdxtFileCommonApi.deleteZdxtFileById(key); } + @Override + public ZDResponse selected(MultipartFile[] files, SceneMedal sceneMedal) { + if (ObjectUtil.isEmpty(files) || files.length > 1) { + return ZDResponse.error("文件不能为空且只允许上传一张图片"); + } + String uploadPath = fileUploadApi.upload(files[0]); + sceneMedal.setAchieveIconPath(uploadPath); + int result = sceneMedalMapper.updateSceneMedal(sceneMedal); + // 上传文件，并在附件表中添加记录 + if (result > 0) { + zdxtFileCommonApi.deleteZdxtFileByIds(sceneMedal.getGuid() + "0000"); + zdxtFileCommonApi.insertZdxtFile(files[0], sceneMedal.getGuid() + "0000", uploadPath); + return ZDResponse.success(); + } + return ZDResponse.error("编辑成就勋章图片失败"); + } + } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneMedalMapper.xml b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneMedalMapper.xml index 308d4df7..1d58cd5a 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneMedalMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneMedalMapper.xml @@ -7,9 +7,11 @@ + + @@ -20,9 +22,11 @@ select guid, name, icon_path, + achieve_icon_path, scene_id, type, hide, + level, creator, create_time, update_by, @@ -35,6 +39,7 @@ and hide = 1 and name like concat('%', #{name}, '%') + and type = #{type} and creator = #{creator} and scene_id = #{sceneId} @@ -51,9 +56,11 @@ guid, `name`, icon_path, + achieve_icon_path, scene_id, type, - hide, + hide, + level, creator, create_time, update_by, @@ -63,9 +70,11 @@ #{guid}, #{name}, #{iconPath}, + #{achieveIconPath}, #{sceneId}, #{type}, - #{hide}, + #{hide}, + #{level}, #{creator}, #{createTime}, #{updateBy}, @@ -78,9 +87,11 @@ name = #{name}, icon_path = #{iconPath}, + achieve_icon_path = #{achieveIconPath}, scene_id = #{sceneId}, type = #{type}, - hide = #{hide}, + hide = #{hide}, + level = #{level}, update_by = #{updateBy}, update_time = #{updateTime},