From 1b710e434b79fc0f6ee3157a1e8aefe783821ddf Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Sun, 29 Aug 2021 09:50:38 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=9A=E5=91=98=E4=BA=AE=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E6=A0=87=E8=AF=86=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-cloud-client-yushan | 2 +- epdc-cloud-commons-yushan | 2 +- epdc-cloud-parent-yushan | 2 +- .../esua/epdc/service/impl/UserServiceImpl.java | 1 + .../src/main/resources/mapper/UserDao.xml | 15 +++++++++++---- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index cc0e5d4..8894fa8 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit cc0e5d4a31687b9224edc53d7b8d6414e7005d6a +Subproject commit 8894fa89091fef625786273e51561bc1bb4e8fce diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan index f491284..31d32c8 160000 --- a/epdc-cloud-commons-yushan +++ b/epdc-cloud-commons-yushan @@ -1 +1 @@ -Subproject commit f49128405cd591b9aab7f129df01518c5aea143e +Subproject commit 31d32c81a8018a5c93745bcca1a538cc0bf59e13 diff --git a/epdc-cloud-parent-yushan b/epdc-cloud-parent-yushan index 7d5b870..6c53fd9 160000 --- a/epdc-cloud-parent-yushan +++ b/epdc-cloud-parent-yushan @@ -1 +1 @@ -Subproject commit 7d5b8709e3fa8224b3463e120f7b79af1feea28c +Subproject commit 6c53fd985cbaae46046a44a2d84f1eb9bff86a9d diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 95c800c..ed09a6b 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -459,6 +459,7 @@ public class UserServiceImpl extends BaseServiceImpl implem @Override @DataSource(value = DataSourceNames.FIRST) public Result getInfoById(String id) { + EpdcUserInfoResultDTO user = baseDao.selectOneInfoById(id); return new Result().ok(baseDao.selectOneInfoById(id)); } diff --git a/epdc-cloud-user/src/main/resources/mapper/UserDao.xml b/epdc-cloud-user/src/main/resources/mapper/UserDao.xml index b9f9a3d..eff21ce 100644 --- a/epdc-cloud-user/src/main/resources/mapper/UserDao.xml +++ b/epdc-cloud-user/src/main/resources/mapper/UserDao.xml @@ -8,7 +8,7 @@ + SELECT + ui.HEAD_URL, + ui.MOTTO, + ui.PROMISE, + ui.SERVICE_ARE + FROM epdc_user_info ui + WHERE ui.USER_ID = #{userId} + AND ui.DEL_FLAG = '0' + + + + From 4a0a5c0d60103c97e333667bb57bce4c1f5f9bb2 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Mon, 30 Aug 2021 18:35:03 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E5=85=9A=E5=91=98=E4=BA=AE=E8=BA=AB=E4=BB=BD=E6=8E=A8=E8=8D=90?= =?UTF-8?q?-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EpdcAppPartyMemberController.java | 23 +++++++++++++++++++ .../com/elink/esua/epdc/dao/UserInfoDao.java | 18 +++++++++++++++ .../esua/epdc/service/UserInfoService.java | 19 +++++++++++++++ .../service/impl/UserInfoServiceImpl.java | 16 +++++++++++++ .../src/main/resources/mapper/UserInfoDao.xml | 7 +++++- 5 files changed, 82 insertions(+), 1 deletion(-) diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/EpdcAppPartyMemberController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/EpdcAppPartyMemberController.java index f4a3278..e7d239b 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/EpdcAppPartyMemberController.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/EpdcAppPartyMemberController.java @@ -34,6 +34,29 @@ public class EpdcAppPartyMemberController { public Result getDentityDetail(@PathVariable("userId") Long userId){ EpdcAppIdentityDetailResultDTO data = userInfoService.getDentityDetail(userId); return new Result().ok(data); + } + + /** + * 党建引领-党员亮身份推荐 + * @params [id] + * @return void + * @author zhangfenghe + * @since 2021/8/30 9:26 + */ + @PostMapping("partyBuilding/brightIdentity/recommended") + public Result recommended(@PathVariable("id") String id){ + return userInfoService.recommended(id); + } + /** + * 党建引领-党员亮身份取消推荐 + * @params [id] + * @return void + * @author zhangfenghe + * @since 2021/8/30 9:26 + */ + @PostMapping("partyBuilding/brightIdentity/recommendedCancel") + public Result recommendedCancel(@PathVariable("id") String id){ + return userInfoService.recommendedCancel(id); } } diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserInfoDao.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserInfoDao.java index a96a016..2e79b18 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserInfoDao.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserInfoDao.java @@ -22,4 +22,22 @@ public interface UserInfoDao extends BaseDao { */ EpdcAppIdentityDetailResultDTO selectDentityDetail(Long userId); + /** + * 党建引领-党员亮身份推荐 + * @params [id] + * @return void + * @author zhangfenghe + * @since 2021/8/30 9:26 + */ + void recommended(String id); + + /** + * 党建引领-党员亮身份取消推荐 + * @params [id] + * @return void + * @author zhangfenghe + * @since 2021/8/30 9:26 + */ + void recommendedCancel(String id); + } diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserInfoService.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserInfoService.java index d958ac2..5d1ffcc 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserInfoService.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserInfoService.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.epdc.form.EpdcAppShowIdentityFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppIdentityDetailResultDTO; import com.elink.esua.epdc.entity.UserInfoEntity; @@ -18,4 +19,22 @@ public interface UserInfoService extends BaseService { void save(EpdcAppShowIdentityFormDTO dto); EpdcAppIdentityDetailResultDTO getDentityDetail(Long userId); + + /** + * 党建引领-党员亮身份推荐 + * @params [id] + * @return void + * @author zhangfenghe + * @since 2021/8/30 9:26 + */ + Result recommended(String id); + + /** + * 党建引领-党员亮身份取消推荐 + * @params [id] + * @return void + * @author zhangfenghe + * @since 2021/8/30 9:26 + */ + Result recommendedCancel(String id); } diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserInfoServiceImpl.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserInfoServiceImpl.java index c166a44..531f230 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserInfoServiceImpl.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserInfoServiceImpl.java @@ -2,6 +2,8 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.AssertUtils; import com.elink.esua.epdc.dao.UserInfoDao; import com.elink.esua.epdc.dto.epdc.form.EpdcAppShowIdentityFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppIdentityDetailResultDTO; @@ -31,4 +33,18 @@ public class UserInfoServiceImpl extends BaseServiceImpl - + + UPDATE esua_epdc_user.epdc_user_info SET RECOMMEND_FLAG = '1' WHERE ID = #{id} AND DEL_FALG = '0' + + + UPDATE esua_epdc_user.epdc_user_info SET RECOMMEND_FLAG = '0' WHERE ID = #{id} AND DEL_FALG = '0' + From 9c40de7b1034083c8160df6a81061d15427662ce Mon Sep 17 00:00:00 2001 From: zhangfh Date: Tue, 31 Aug 2021 00:09:41 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E5=85=9A=E5=91=98=E4=BA=AE=E8=BA=AB=E4=BB=BDbug-=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/EpdcAppPartyMemberController.java | 11 +++++------ .../java/com/elink/esua/epdc/dao/UserInfoDao.java | 2 +- .../com/elink/esua/epdc/service/UserInfoService.java | 2 +- .../esua/epdc/service/impl/UserInfoServiceImpl.java | 2 +- .../src/main/resources/mapper/UserInfoDao.xml | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/EpdcAppPartyMemberController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/EpdcAppPartyMemberController.java index e7d239b..36bda32 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/EpdcAppPartyMemberController.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/EpdcAppPartyMemberController.java @@ -1,6 +1,5 @@ package com.elink.esua.epdc.controller; -import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; @@ -17,21 +16,21 @@ import org.springframework.web.bind.annotation.*; * create time: 2021/8/29$ 10:32$ */ @RestController -@RequestMapping(Constant.APP_USER_FLAG+"partyMember") +@RequestMapping("partyMember") public class EpdcAppPartyMemberController { @Autowired private UserInfoService userInfoService; @PostMapping("showIdentity") - public Result save(@RequestBody EpdcAppShowIdentityFormDTO formDto){ + public Result saveShowIdentity(@RequestBody EpdcAppShowIdentityFormDTO formDto){ ValidatorUtils.validateEntity(formDto, AddGroup.class, DefaultGroup.class); userInfoService.save(formDto); return new Result(); } @GetMapping("dentityDetail/{userId}") - public Result getDentityDetail(@PathVariable("userId") Long userId){ + public Result getDentityDetail(@PathVariable("userId") String userId){ EpdcAppIdentityDetailResultDTO data = userInfoService.getDentityDetail(userId); return new Result().ok(data); } @@ -43,7 +42,7 @@ public class EpdcAppPartyMemberController { * @author zhangfenghe * @since 2021/8/30 9:26 */ - @PostMapping("partyBuilding/brightIdentity/recommended") + @PostMapping("brightIdentity/recommended/{id}") public Result recommended(@PathVariable("id") String id){ return userInfoService.recommended(id); } @@ -55,7 +54,7 @@ public class EpdcAppPartyMemberController { * @author zhangfenghe * @since 2021/8/30 9:26 */ - @PostMapping("partyBuilding/brightIdentity/recommendedCancel") + @PostMapping("brightIdentity/recommendedCancel/{id}") public Result recommendedCancel(@PathVariable("id") String id){ return userInfoService.recommendedCancel(id); } diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserInfoDao.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserInfoDao.java index 2e79b18..320b708 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserInfoDao.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserInfoDao.java @@ -20,7 +20,7 @@ public interface UserInfoDao extends BaseDao { * @author jyyzz * @since 2021/8/29 11:44 */ - EpdcAppIdentityDetailResultDTO selectDentityDetail(Long userId); + EpdcAppIdentityDetailResultDTO selectDentityDetail(String userId); /** * 党建引领-党员亮身份推荐 diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserInfoService.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserInfoService.java index 5d1ffcc..4122d4a 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserInfoService.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserInfoService.java @@ -18,7 +18,7 @@ public interface UserInfoService extends BaseService { */ void save(EpdcAppShowIdentityFormDTO dto); - EpdcAppIdentityDetailResultDTO getDentityDetail(Long userId); + EpdcAppIdentityDetailResultDTO getDentityDetail(String userId); /** * 党建引领-党员亮身份推荐 diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserInfoServiceImpl.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserInfoServiceImpl.java index 531f230..3485ae7 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserInfoServiceImpl.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserInfoServiceImpl.java @@ -29,7 +29,7 @@ public class UserInfoServiceImpl extends BaseServiceImpl - SELECT ui.HEAD_URL, ui.MOTTO, ui.PROMISE, - ui.SERVICE_ARE + ui.SERVICE_AREA FROM epdc_user_info ui WHERE ui.USER_ID = #{userId} AND ui.DEL_FLAG = '0' From f599000bfeea974b202677b5b5310a88dcd66a67 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Tue, 31 Aug 2021 14:19:08 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E5=85=9A=E5=91=98=E4=BA=AE=E8=BA=AB=E4=BB=BD-bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/elink/esua/epdc/dao/UserInfoDao.java | 2 ++ .../java/com/elink/esua/epdc/entity/UserInfoEntity.java | 4 ++++ .../elink/esua/epdc/service/impl/UserInfoServiceImpl.java | 8 +++++++- epdc-cloud-user/src/main/resources/mapper/UserInfoDao.xml | 7 +++++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserInfoDao.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserInfoDao.java index 320b708..2cb465d 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserInfoDao.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserInfoDao.java @@ -13,6 +13,8 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface UserInfoDao extends BaseDao { + String selectDentityIdByUserId(String userId); + /** *获取党员亮身份详情接口 * @params [userId] diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/entity/UserInfoEntity.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/entity/UserInfoEntity.java index ce84d7e..75cea72 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/entity/UserInfoEntity.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/entity/UserInfoEntity.java @@ -16,6 +16,10 @@ import lombok.EqualsAndHashCode; public class UserInfoEntity extends BaseEpdcEntity { private static final long serialVersionUID = 1L; + /** + * 主键id + */ + private String id; /** * 用户id */ diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserInfoServiceImpl.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserInfoServiceImpl.java index 3485ae7..7dd5abb 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserInfoServiceImpl.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserInfoServiceImpl.java @@ -25,7 +25,13 @@ public class UserInfoServiceImpl extends BaseServiceImpl + UPDATE esua_epdc_user.epdc_user_info SET RECOMMEND_FLAG = '1' WHERE ID = #{id} AND DEL_FALG = '0' From 2942005b646b5dca0c084a88afcfb56979a1f5cc Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Tue, 31 Aug 2021 16:19:31 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=9A=E5=91=98=E4=BA=AE=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E6=A0=87=E8=AF=86=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-cloud-client-yushan | 2 +- epdc-cloud-commons-yushan | 2 +- .../main/java/com/elink/esua/epdc/entity/UserInfoEntity.java | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 8894fa8..037ee65 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 8894fa89091fef625786273e51561bc1bb4e8fce +Subproject commit 037ee6574bf347ae34d5251735a99c5511d81794 diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan index 31d32c8..9d7cf7e 160000 --- a/epdc-cloud-commons-yushan +++ b/epdc-cloud-commons-yushan @@ -1 +1 @@ -Subproject commit 31d32c81a8018a5c93745bcca1a538cc0bf59e13 +Subproject commit 9d7cf7e81ccc634751f032f72e5333a90eb40ee2 diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/entity/UserInfoEntity.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/entity/UserInfoEntity.java index 75cea72..ce84d7e 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/entity/UserInfoEntity.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/entity/UserInfoEntity.java @@ -16,10 +16,6 @@ import lombok.EqualsAndHashCode; public class UserInfoEntity extends BaseEpdcEntity { private static final long serialVersionUID = 1L; - /** - * 主键id - */ - private String id; /** * 用户id */