From ae503878e47aa7817b6422fc22ec2c7c63436d88 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Wed, 6 Mar 2024 17:18:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=8A=A0=E4=B8=A4=E4=B8=AA=E4=B8=8B=E6=8B=89=E6=94=B9=E5=8F=98?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/smallProgram/image/settings.html | 30 +++++++++++++++++-- .../controller/CustomImageController.java | 18 +++++++++++ .../controller/WechatLoginController.java | 9 +++--- .../knowledge/mapper/CustomImageMapper.java | 7 +++++ .../service/ICustomImageService.java | 8 +++++ .../service/impl/CustomImageServiceImpl.java | 13 ++++++++ .../resources/mapper/CustomImageMapper.xml | 10 +++++++ .../resources/mapper/SceneMedalMapper.xml | 1 + 8 files changed, 89 insertions(+), 7 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/image/settings.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/image/settings.html index 2ca9cee6..2bcb68ba 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/image/settings.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/image/settings.html @@ -98,7 +98,13 @@
- + +
+ +
@@ -117,7 +123,13 @@
- + +
+ +
@@ -401,6 +413,20 @@ }); } + /** 更新状态 */ + function updateStatue(key) { + var val = $("#status-"+key+" option:selected").val(); + $.ajax({ + url: prefix+'/editStatus/'+key+"/"+val, //后台url + type: "GET", + dataType: 'json', //数据返回类型，可以是xml、json等 + success: function (data) { //成功，回调函数 + }, + error: function (er) { //失败，回调函数 + } + }); + } + \ No newline at end of file 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 d4226d5c..b0a0ca33 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 @@ -130,6 +130,24 @@ public class CustomImageController extends BaseController { return resNum > 0 ? ZDResponse.success("操作成功", resNum) : ZDResponse.error("操作失败", resNum); } + /** + * 修改状态 + */ + @RequiresPermissions("custom:image:edit") + @GetMapping("/editStatus/{title}/{status}") + @ResponseBody + public ZDResponse editStatus(@PathVariable("title")String title, @PathVariable("status") String status) { + CustomImage customImage = new CustomImage(); + customImage.setTitle(title); + if (status == null) { + customImage.setStatus(0); + } else { + customImage.setStatus(Integer.parseInt(status)); + } + int resNum = customImageService.editStatus(customImage); + return resNum > 0 ? ZDResponse.success("操作成功", resNum) : ZDResponse.error("操作失败", resNum); + } + /** * 删除自定义图片管理 */ diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/WechatLoginController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/WechatLoginController.java index b9df8ab7..b02bcbf7 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/WechatLoginController.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/WechatLoginController.java @@ -83,10 +83,9 @@ public class WechatLoginController extends BaseController { /** * 修改保存 */ - @RequiresPermissions("project:user:edit") @PostMapping("/editUserMedal") @ResponseBody - public ZDResponse editUserMedal(WechatUser wechatUser) { + public ZDResponse editUserMedal(@RequestBody WechatUser wechatUser) { // 先通过场景id获取到相关联的勋章id String medalId = wechatUser.getMedal(); SceneMedal sceneMedal = new SceneMedal(); @@ -99,13 +98,13 @@ public class WechatLoginController extends BaseController { String medalStr = user.getMedal(); if(medalStr.indexOf(medalId) > -1) { // 已拥有直接返回 - return ZDResponse.success(); + return ZDResponse.success("0"); } // 否则更新 medalStr += ","+medalId; - user.setMedal(medalStr); + wechatUser.setMedal(medalStr); return wechatService.update(wechatUser) > 0 - ? ZDResponse.success() : ZDResponse.error("编辑失败"); + ? ZDResponse.success("1") : ZDResponse.error("编辑失败"); } /** diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/CustomImageMapper.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/CustomImageMapper.java index 40b4f7c0..0c8c25df 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/CustomImageMapper.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/CustomImageMapper.java @@ -53,6 +53,13 @@ public interface CustomImageMapper */ public int updateSrot(@Param("srot") Long srot, @Param("key") Long key); + /** + * 修改状态 + * @param customImage 自定义图片管理 + * @return + */ + public int editStatus(CustomImage customImage); + /** * 删除自定义图片管理 * diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ICustomImageService.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ICustomImageService.java index 8cfd33e0..7393e63e 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ICustomImageService.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ICustomImageService.java @@ -71,6 +71,14 @@ public interface ICustomImageService */ public int updateSrot(Long srot, Long key); + /** + * 修改状态 + * + * @param customImage 自定义图片管理 + * @return 结果 + */ + public int editStatus(CustomImage customImage); + /** * 批量删除自定义图片管理 * diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/CustomImageServiceImpl.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/CustomImageServiceImpl.java index 8613e465..32b50d15 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/CustomImageServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/CustomImageServiceImpl.java @@ -167,6 +167,19 @@ public class CustomImageServiceImpl implements ICustomImageService return customImageMapper.updateSrot(srot, key); } + /** + * 修改状态 + * + * @param customImage 自定义图片管理 + * @return 结果 + */ + @Override + public int editStatus(CustomImage customImage) + { + customImage.setUpdator(userApi.getCurrentUser().getUserName()); + return customImageMapper.editStatus(customImage); + } + /** * 删除自定义图片管理对象 * diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/CustomImageMapper.xml b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/CustomImageMapper.xml index b75c5e70..e9a2f509 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/CustomImageMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/CustomImageMapper.xml @@ -101,6 +101,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update custom_image set srot = #{srot} where srot = #{key} + + update custom_image + + status = #{status}, + updator = #{updator}, + update_time = #{updateTime}, + + where title = #{title} + + delete from custom_image where guid = #{guid} diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneMedalMapper.xml b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneMedalMapper.xml index 67e5f06b..e4f4eb6e 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneMedalMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneMedalMapper.xml @@ -34,6 +34,7 @@ and hide = 1 and name like concat('%', #{name}, '%') and creator = #{creator} + and scene_id = #{sceneId}