Skip to content

张云鹏 / uc-engine

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 6a22a82a 6a22a82af245b4ea1f13192518eeb4547e09201a by xianghan
Options

1.优化

1 parent f126970f
Inline Side-by-side
Showing 6 changed files with 54 additions and 42 deletions
......@@ -5,6 +5,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import java.util.List;
import java.util.Optional;
/**
......@@ -16,5 +17,6 @@ public interface UserCollectionDetailRepository extends JpaRepository<UserCollec
@Modifying
void deleteAllByUserCollectionId(Long userCollectionId);
Optional<UserCollectionDetail> findByDetailIdAndDetailTypeAndUserCollectionId(Long detailId, String detailType, Long userCollectionId);
// Optional<UserCollectionDetail> findByDetailIdAndDetailTypeAndUserCollectionId(Long detailId, String detailType, Long userCollectionId);
List<UserCollectionDetail> findByDetailIdAndDetailTypeAndUserCollectionId(Long detailId, String detailType, Long userCollectionId);
}
......
......@@ -505,9 +505,11 @@ public class UserOperationController {
@AnonymousAccess
public ResultInfo addCollection(@RequestBody String content) {
log.info("UserOperationController ==> addCollection ==>> param ==> [{}]",content);
boolean result = this.userOperationService.addCollection(content);
return ResultInfo.success(result);
if (StringUtils.isNotBlank(content)) {
boolean result = this.userOperationService.addCollection(content);
return ResultInfo.success(result);
}
return ResultInfo.success();
}
}
......
......@@ -771,6 +771,10 @@ public class UserOperationServiceImpl implements UserOperationService {
this.userCollectionService.findFirstByUserIdAndTypeAndName(id, userCollectionMq.getType(),
userCollectionMq.getName());
if (Objects.isNull(userCollection.getId())) {
return true;
}
int count = 0;
for (UserCollectionMq collectionMq : value) {
......@@ -850,23 +854,52 @@ public class UserOperationServiceImpl implements UserOperationService {
for (UserCollectionMq collectionMq : value) {
UserCollectionDetail userCollectionDetail = collectionMq2DetailMapper.toEntity(collectionMq);
Optional<UserCollectionDetail> userCollectionDetailOptional = userCollectionDetailRepository
List<UserCollectionDetail> userCollectionDetailOptional = userCollectionDetailRepository
.findByDetailIdAndDetailTypeAndUserCollectionId(userCollectionDetail.getDetailId(),
userCollectionDetail.getDetailType(), userCollection.getId());
//观影记录同一天只存一条记录
if (userCollectionDetailOptional.isPresent() &&
DateUtil.isSameDay(new Date(userCollectionDetailOptional.get().getCreateTime().getTime()), new Date())) {
userCollectionDetail.setId(userCollectionDetailOptional.get().getId());
} else {
if (CollectionUtils.isEmpty(userCollectionDetailOptional)) {
userCollectionDetail.setId(null)
.setUserCollectionId(userCollection.getId());
userCollectionDetailRepository.save(userCollectionDetail);
} else {
for (UserCollectionDetail collectionDetail : userCollectionDetailOptional) {
//观影记录同一天只存一条记录
boolean sameDay = DateUtil.isSameDay(new Date(collectionDetail.getCreateTime().getTime()), new Date());
if (sameDay) {
continue;
} else {
userCollectionDetail.setId(null)
.setUserCollectionId(userCollection.getId());
userCollectionDetailRepository.save(userCollectionDetail);
continue;
}
}
}
/*if (userCollectionDetailOptional.isPresent()) {
//观影记录同一天只存一条记录
boolean sameDay = DateUtil.isSameDay(new Date(userCollectionDetailOptional.get().getCreateTime().getTime()), new Date());
if (sameDay) {
userCollectionDetail.setId(userCollectionDetailOptional.get().getId());
userCollectionDetailRepository.save(userCollectionDetail);
} else {
continue;
}
} else {
userCollectionDetail.setId(null)
.setUserCollectionId(userCollection.getId());
userCollectionDetailRepository.save(userCollectionDetail);
}*/
userCollectionDetailRepository.save(userCollectionDetail);
}
}
......
......@@ -45,6 +45,7 @@ spring:
hibernate:
# 生产环境设置成 none，避免程序运行时自动更新数据库结构
ddl-auto: none
show-sql: false
servlet:
multipart:
file-size-threshold: 2KB
......
......@@ -64,12 +64,12 @@
<!--监控sql日志输出 -->
<logger name="jdbc.sqlonly" level="INFO" additivity="false">
<logger name="jdbc.sqlonly" level="OFF" additivity="false">
<appender-ref ref="console" />
<appender-ref ref="info" />
</logger>
<logger name="jdbc.resultset" level="ERROR" additivity="false">
<logger name="jdbc.resultset" level="OFF" additivity="false">
<appender-ref ref="console" />
<appender-ref ref="info" />
</logger>
......
......@@ -22,10 +22,7 @@ public class UserOperationControllerTest extends BaseTest {
@Test
public void deleteCollection() {
try {
String a = "{\n" +
"\t\"platformAccount\": \"topdraw\",\n" +
"\t\"data\": \"[{\\\"appId\\\":\\\"57\\\",\\\"userId\\\":\\\"5\\\",\\\"type\\\":\\\"1\\\",\\\"name\\\":\\\"PersonalCollectionRecords\\\",\\\"count\\\":\\\"1\\\",\\\"images\\\":\\\"\\\",\\\"userCollectionId\\\":\\\"\\\",\\\"detailFolderCode\\\":\\\"\\\",\\\"detailType\\\":\\\"\\\"},\\\"detailId\\\":\\\"\\\",\\\"detailEpisodeId\\\":\\\"\\\",\\\"detailEpisodeCode\\\":\\\"\\\",\\\"detailName\\\":\\\"\\\",\\\"detailMark\\\":\\\"\\\",\\\"detailImg\\\":\\\"\\\",\\\"detailImg\\\":\\\"\\\",\\\"detailIndex\\\":\\\"\\\",\\\"detailTotalIndex\\\":\\\"\\\",\\\"detailPlayTime\\\":\\\"\\\",\\\"detailTotalTime\\\":\\\"\\\",\\\"detailSequence\\\":\\\"\\\",\\\"detailScore\\\":\\\"\\\",\\\"detailLike\\\":\\\"\\\",\\\"detailExtData\\\":\\\"\\\"}]\"\n" +
"}";
String a = "eyJkYXRhIjpbeyJ1c2VyQ29sbGVjdGlvbklkIjo0LCJkZXRhaWxOYW1lIjoi6amv6b6Z5a6d5YW4IiwiY291bnQiOjIsImRldGFpbElkIjo0MDAsImRldGFpbFRvdGFsSW5kZXgiOjEsInVwZGF0ZVRpbWUiOjE2NTM1ODM2OTQwMDAsInR5cGUiOjEsImRldGFpbENvZGUiOiJtZWRpYV9lMmQ3NTIyMC1jNDExLTRkMWItOTM0ZS1jMWVhMjQ4Yzg4YTYiLCJ1c2VySWQiOjEsImRldGFpbFR5cGUiOiJNRURJQSIsImNyZWF0ZVRpbWUiOjE2NTM1ODM2OTQwMDAsImRldGFpbFNlcXVlbmNlIjoxLCJhcHBJZCI6NTcsIm5hbWUiOiJQZXJzb25hbENvbGxlY3Rpb25SZWNvcmRzIiwiZGV0YWlsRm9sZGVyQ29kZSI6IkRlZmF1bHQiLCJpZCI6OH1dLCJwbGF0Zm9ybUFjY291bnQiOiJ0b3BkcmF3In0=";
ResultInfo weixinUserAndMember = this.userOperationController.deleteCollection(a);
System.out.println(weixinUserAndMember);
} catch (Exception e) {
......@@ -50,30 +47,7 @@ public class UserOperationControllerTest extends BaseTest {
@Test
public void addCollection() {
try {
String a = "{\n" +
"\t\"data\": [\n" +
"\t{\n" +
"\t\"app_id\": 57,\n" +
"\t\"user_id\": 1,\n" +
"\t\"type\": 1,\n" +
"\t\"name\": \"PersonalCollectionRecords\",\n" +
"\t\"count\": 22,\n" +
"\t\"images\": \"{\\\"map\\\":{\\\"poster\\\":[0]},\\\"list\\\":[{\\\"id\\\":47422,\\\"type\\\":2,\\\"width\\\":222,\\\"height\\\":294,\\\"fileUrl\\\":\\\"upload/image/media/2020-07-30/9a8a02db-9444-4bff-ba54-ea784ae4f88c.jpg\\\",\\\"size\\\":104643}]}\",\n" +
"\t\"id\": 756756,\n" +
"\t\"user_collection_id\": 1,\n" +
"\t\"detail_folder_code\": \"Default\",\n" +
"\t\"detail_type\": \"MEDIA\",\n" +
"\t\"detail_id\": 46532,\n" +
"\t\"detail_code\": \"media_558bc45a-5480-46ec-be9a-c749ffdbdf49\",\n" +
"\t\"detail_name\": \"熊出没之探险日记2\",\n" +
"\t\"detail_total_index\": 40,\n" +
"\t\"detail_sequence\": 1,\n" +
"\t\"create_time\": 1644503167000,\n" +
"\t\"update_time\": 1644503167000\n" +
"\t}\n" +
"\t],\n" +
"\t\"platformAccount\": \"topdraw\"\n" +
"}";
String a = "eyJkYXRhIjpbeyJ1c2VyQ29sbGVjdGlvbklkIjo0LCJpbWFnZXMiOiJ7XCJsaXN0XCI6W3tcInNpemVcIjowLFwiZW5hYmxlXCI6ZmFsc2UsXCJ3aWR0aFwiOjI5MSxcImZpbGVVcmxcIjpcInVwbG9hZC9pbWFnZS9tZWRpYS8yY2YzNjIxMS03ZjZjLTQ3N2YtYjFjZi0wYjViNDVkMDljNDYucG5nXCIsXCJpZFwiOjY5NDEsXCJoZWlnaHRcIjozNTV9LHtcInNpemVcIjowLFwiZW5hYmxlXCI6ZmFsc2UsXCJ3aWR0aFwiOjI3NCxcImZpbGVVcmxcIjpcInVwbG9hZC9pbWFnZS9tZWRpYS9jYTZkMzEyYS05ZjA1LTQ4YjAtYTJlMi1kOGExMTdhZjhlN2QucG5nXCIsXCJpZFwiOjY5NDIsXCJoZWlnaHRcIjoxNjh9LHtcInNpemVcIjowLFwiZW5hYmxlXCI6ZmFsc2UsXCJ3aWR0aFwiOjI2MCxcImZpbGVVcmxcIjpcInVwbG9hZC9pbWFnZS9tZWRpYS80NzE3YzYzYy03NjQ1LTRiMmYtYTA2MS03NTBhZDYyYTI3ZGYuanBnXCIsXCJpZFwiOjY5NDMsXCJoZWlnaHRcIjozNjB9XSxcIm1hcFwiOntcImNoYW5uZWxfbG9nb1wiOlsyXSxcInN0aWxsc1wiOlswXSxcInBvc3RlclwiOlsxXX19IiwiZGV0YWlsTmFtZSI6Iumpr+m+meWuneWFuCIsImNvdW50IjoyLCJkZXRhaWxJZCI6NDAwLCJkZXRhaWxUb3RhbEluZGV4IjoxLCJ1cGRhdGVUaW1lIjoxNjUzNTgzNjk0MDAwLCJ0eXBlIjoxLCJkZXRhaWxDb2RlIjoibWVkaWFfZTJkNzUyMjAtYzQxMS00ZDFiLTkzNGUtYzFlYTI0OGM4OGE2IiwidXNlcklkIjoxLCJkZXRhaWxUeXBlIjoiTUVESUEiLCJjcmVhdGVUaW1lIjoxNjUzNTgzNjk0MDAwLCJkZXRhaWxTZXF1ZW5jZSI6MSwiYXBwSWQiOjU3LCJuYW1lIjoiUGVyc29uYWxDb2xsZWN0aW9uUmVjb3JkcyIsImRldGFpbEZvbGRlckNvZGUiOiJEZWZhdWx0IiwiaWQiOjh9LHsidXNlckNvbGxlY3Rpb25JZCI6NCwiaW1hZ2VzIjoie1wibWFwXCI6e1wicG9zdGVyXCI6WzBdfSxcImxpc3RcIjpbe1wiaWRcIjo0NzQyMixcInR5cGVcIjoyLFwid2lkdGhcIjoyMjIsXCJoZWlnaHRcIjoyOTQsXCJmaWxlVXJsXCI6XCJ1cGxvYWQvaW1hZ2UvbWVkaWEvMjAyMC0wNy0zMC85YThhMDJkYi05NDQ0LTRiZmYtYmE1NC1lYTc4NGFlNGY4OGMuanBnXCIsXCJzaXplXCI6MTA0NjQzfV19IiwiZGV0YWlsTmFtZSI6IueGiuWHuuayoeS5i+aOoumZqeaXpeiusDIiLCJjb3VudCI6MiwiZGV0YWlsSWQiOjQ2NTMyLCJkZXRhaWxUb3RhbEluZGV4Ijo0MCwidXBkYXRlVGltZSI6MTY1Mzk4MDE5NDAwMCwidHlwZSI6MSwiZGV0YWlsQ29kZSI6Im1lZGlhXzU1OGJjNDVhLTU0ODAtNDZlYy1iZTlhLWM3NDlmZmRiZGY0OSIsInVzZXJJZCI6MSwiZGV0YWlsVHlwZSI6Ik1FRElBIiwiY3JlYXRlVGltZSI6MTY1Mzk4MDE5NDAwMCwiZGV0YWlsU2VxdWVuY2UiOjEsImFwcElkIjo1NywibmFtZSI6IlBlcnNvbmFsQ29sbGVjdGlvblJlY29yZHMiLCJkZXRhaWxGb2xkZXJDb2RlIjoiRGVmYXVsdCIsImlkIjoxMX1dLCJwbGF0Zm9ybUFjY291bnQiOiJ0b3BkcmF3In0=";
ResultInfo weixinUserAndMember = this.userOperationController.addCollection(a);
System.out.println(weixinUserAndMember);
} catch (Exception e) {
......