From 3154533fb81cb884cb632f3d9216144b45c0b55b Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sun, 25 Jul 2021 16:51:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E5=90=8E=E9=87=8D=E6=96=B0=E7=BC=96=E8=BE=91=E6=95=B0=E6=8D=AE?= =?UTF-8?q?,=E6=94=B6=E8=97=8F=E7=9A=84=E6=95=B0=E6=8D=AE=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E9=80=BB=E8=BE=91,=E5=8F=96=E6=B6=88=E6=94=B6?= =?UTF-8?q?=E8=97=8F=E6=97=B6(=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4),?= =?UTF-8?q?=E5=86=8D=E6=AC=A1=E6=94=B6=E8=97=8F=E6=AD=A4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?,=E7=94=B1=E4=B9=8B=E5=89=8D=E7=9A=84=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=B8=80=E6=9D=A1=E6=96=B0=E6=94=B6=E8=97=8F=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9B=B4=E6=94=B9=E4=B8=BA=E6=9B=B4=E6=96=B0=E5=8E=9F?= =?UTF-8?q?=E6=9D=A5=E6=95=B0=E6=8D=AE=E7=9A=84=E9=80=BB=E8=BE=91=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=AD=97=E6=AE=B5=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandardsInfoController.java | 1 - .../controller/PersonCollectEOController.java | 22 ++++++++++++++----- .../adc/da/person/dao/PersonCollectEODao.java | 2 ++ .../service/IPersonCollectEOService.java | 2 ++ .../impl/PersonCollectEOServiceImpl.java | 5 +++++ .../mapper/person/PersonCollectEOMapper.xml | 8 +++++++ 6 files changed, 34 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index c35efe84..bc066c06 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -151,7 +151,6 @@ public class SarStandardsInfoController extends BaseController page.setAdvanceSearchStr(null); } } - page.setUserId(LoginUserUtil.getUserId()); List rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page); return Result.success(getPageInfo(page.getPager(), rows)); } diff --git a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java index 600d4d9b..448d57a9 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java @@ -8,6 +8,7 @@ import com.adc.da.person.page.PersonCollectEOPage; import com.adc.da.person.service.IPersonCollectEOService; import com.adc.da.util.LoginUserUtil; import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -78,12 +79,20 @@ public class PersonCollectEOController extends BaseController { @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) // @RequiresPermissions("person:personCollect:create") public ResponseMessage create(@RequestBody TsPersonCollect tsPersonCollect) throws Exception { - // String userId = LoginUserUtil.getUserId(); - tsPersonCollect.setId(UUIDUtils.randomUUID20()); - tsPersonCollect.setValidFlag(0); - tsPersonCollect.setCreationTime(new Date()); + tsPersonCollect.setModifyTime(new Date()); + tsPersonCollect.setValidFlag(0); + + //如果这个用户已经收藏过这个标准,则更新个人收藏表 + int line=personCollectEOService.updateByUserIdAndCollectResId(tsPersonCollect); + if (personCollectEOService.updateByUserIdAndCollectResId(tsPersonCollect)>0) { + return Result.success("0","收藏成功,请到'我的收藏'中查看相关信息。", tsPersonCollect); + } + + //用户没有收藏过时,在表中添加 + tsPersonCollect.setId(UUIDUtils.randomUUID20()); + tsPersonCollect.setCreationTime(new Date()); personCollectEOService.save(tsPersonCollect); @@ -93,10 +102,13 @@ public class PersonCollectEOController extends BaseController { @ApiOperation(value = "|PersonCollectEO|修改") - @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE,value = "/updatePersonCollect") // @RequiresPermissions("person:personCollect:update") public ResponseMessage update(@RequestBody TsPersonCollect tsPersonCollect) throws Exception { tsPersonCollect.setModifyTime(new Date()); + +// tsPersonCollect.setValidFlag(0); + personCollectEOService.updateById(tsPersonCollect); return Result.success(tsPersonCollect); } diff --git a/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java index 59ddd12e..3ad4b283 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java @@ -18,6 +18,8 @@ import java.util.List; */ public interface PersonCollectEODao extends BaseMapper { + public int updateByUserIdAndCollectResId(TsPersonCollect tsPersonCollect); + public List queryByList(BasePage page); public int queryByCount(BasePage var1); diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java index b21e938f..2faae02d 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java @@ -10,6 +10,8 @@ import java.util.List; public interface IPersonCollectEOService extends IService { + public int updateByUserIdAndCollectResId(TsPersonCollect tsPersonCollect); + public List queryByPage(PersonCollectEOPage page); public List queryByList(PersonCollectEOPage page); diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java index fc781203..8515f61a 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java @@ -36,12 +36,17 @@ public class PersonCollectEOServiceImpl extends ServiceImpl queryByPage(PersonCollectEOPage page) { diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml index 230c587c..95090684 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml @@ -397,4 +397,12 @@ from ts_pserson_collect where collect_type=#{c} + + + + UPDATE ts_person_collect + SET modify_time=#{modifyTime},Valid_flag=#{validFlag} + WHERE user_id = #{userId} + AND collect_res_id = #{collectResId} +