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 448d57a9..600d4d9b 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,7 +8,6 @@ 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; @@ -79,20 +78,12 @@ 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.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.setValidFlag(0); tsPersonCollect.setCreationTime(new Date()); + tsPersonCollect.setModifyTime(new Date()); personCollectEOService.save(tsPersonCollect); @@ -102,13 +93,10 @@ public class PersonCollectEOController extends BaseController { @ApiOperation(value = "|PersonCollectEO|修改") - @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE,value = "/updatePersonCollect") + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) // @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 3ad4b283..59ddd12e 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,8 +18,6 @@ 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 2faae02d..b21e938f 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,8 +10,6 @@ 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 8515f61a..fc781203 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,17 +36,12 @@ 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 95090684..230c587c 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,12 +397,4 @@ 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} -