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 b02bcbf7..509d0ef9 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 @@ -57,6 +57,20 @@ public class WechatLoginController extends BaseController { return getDataTable(list); } + @PostMapping("/getActiveStatus") + @ResponseBody + public ZDResponse getActiveStatus(@RequestBody WechatUser wechatUser) { + WechatUser user = wechatService.selectUserById(wechatUser.getGuid()); + return ZDResponse.success("成功",user); + } + + @PostMapping("/editActiveStatus") + @ResponseBody + public ZDResponse editActiveStatus(WechatUser wechatUser) { + return wechatService.update(wechatUser) > 0 + ? ZDResponse.success() : ZDResponse.error("编辑失败"); + } + /** * 修改 */ @@ -91,7 +105,7 @@ public class WechatLoginController extends BaseController { SceneMedal sceneMedal = new SceneMedal(); sceneMedal.setSceneId(medalId); List sceneMedals = sceneMedalService.selectSceneMedalList(sceneMedal); - medalId = sceneMedals.stream().map(c -> c.getGuid()).collect(Collectors.joining(",")); + medalId = sceneMedals.stream().map(SceneMedal::getGuid).collect(Collectors.joining(",")); // 判断用户是否已拥有该勋章 WechatUser user = wechatService.selectUserById(wechatUser.getGuid()); diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/WechatUser.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/WechatUser.java index 91acd48d..3bce93f5 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/WechatUser.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/WechatUser.java @@ -30,6 +30,8 @@ public class WechatUser implements Serializable { private String medal; + private Integer active; + private String creator; private Date createTime; @@ -145,4 +147,12 @@ public class WechatUser implements Serializable { public void setMedal(String medal) { this.medal = medal; } + + public Integer getActive() { + return active; + } + + public void setActive(Integer active) { + this.active = active; + } } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/WechatLoginMapper.xml b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/WechatLoginMapper.xml index e48aeae7..5bd353ce 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/WechatLoginMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/WechatLoginMapper.xml @@ -16,6 +16,7 @@ + @@ -34,7 +35,8 @@ create_time, open_id, union_id, - medal + medal, + active from wechat_user @@ -105,6 +107,7 @@ open_id = #{openId}, union_id = #{unionId}, medal = #{medal}, + active = #{active}, where guid = #{guid}