记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit d57984d9 authored by Administrator's avatar Administrator
Browse files
Options

Merge branch 'pre' into 'master' 

Pre

See merge request !34
parents f41e969c 2126ecd9
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 120 deletions
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetAppletController.java
View file @ d57984d9
...@@ -91,89 +91,92 @@ public class SweetAppletController { ...@@ -91,89 +91,92 @@ public class SweetAppletController {
@RequestParam(required = false) Integer page, @RequestParam(required = false) Integer page,
@RequestParam(required = false) Integer size, @RequestParam(required = false) Integer size,
@RequestParam String uid) { @RequestParam String uid) {
try {
List<SweetManualArtistListDto> allReturnArtist = ObjectUtil.getSweetManualArtistListDtoList();
List<SweetManualArtistListDto> returnArtist = ObjectUtil.getSweetManualArtistListDtoList();
List<SweetManualArtistListDto> allReturnArtist = ObjectUtil.getSweetManualArtistListDtoList(); SweetManualArtistList2Dto data = redisDataUtils.getTimeList(manualId);
List<SweetManualArtistListDto> returnArtist = ObjectUtil.getSweetManualArtistListDtoList(); SweetArtistsRelationVo relationData = redisDataUtils.getArtistsRelationRedisVo(uid, manualId);
SweetManualArtistList2Dto data = redisDataUtils.getTimeList(manualId); List<SweetManualArtistListDto> artistData = data.getData();
SweetArtistsRelationVo relationData = redisDataUtils.getArtistsRelationRedisVo(uid, manualId);
List<SweetManualArtistListDto> artistData = data.getData(); int startPosition = 0;
int endPosition = 0;
int startPosition = 0; if (page != null) {
int endPosition = 0; startPosition = (page - 1) * size;
if (page != null) { endPosition = (page) * size;
startPosition = (page - 1) * size; }
endPosition = (page) * size;
}
if (page == null && dateTime == null) { if (page == null && dateTime == null) {
try { try {
dateTime = data.getDate().get(0); dateTime = data.getDate().get(0);
} catch (Exception e) { } catch (Exception e) {
}
} }
}
for (SweetManualArtistListDto item : artistData) { for (SweetManualArtistListDto item : artistData) {
boolean isSave = true; boolean isSave = true;
if (isSign == 1) { if (isSign == 1) {
if (item.getSignatureStart() == null) { if (item.getSignatureStart() == null) {
//不保留 //不保留
isSave = false; isSave = false;
}
} }
}
if (dateTime != null) { if (dateTime != null) {
if (!item.getPerformanceStart().contains(dateTime)) { if (!item.getPerformanceStart().contains(dateTime)) {
//不保留 //不保留
isSave = false; isSave = false;
}
} }
}
if (stage != null) { if (stage != null) {
if (!item.getTitle().equalsIgnoreCase(stage)) { if (!item.getTitle().equalsIgnoreCase(stage)) {
//保留 //保留
isSave = false; isSave = false;
}
} }
}
if (isSave) { if (isSave) {
allReturnArtist.add(item); allReturnArtist.add(item);
}
} }
}
for (int i = 0; i < allReturnArtist.size(); i++) { for (int i = 0; i < allReturnArtist.size(); i++) {
SweetManualArtistListDto item = allReturnArtist.get(i); SweetManualArtistListDto item = allReturnArtist.get(i);
if (page != null && i >= startPosition && i < endPosition) { if (page != null && i >= startPosition && i < endPosition) {
item.setIsWatch(0); item.setIsWatch(0);
item.setIsSign(0); item.setIsSign(0);
if (relationData.getWatchList() != null) { if (relationData.getWatchList() != null) {
for (String artistsId : relationData.getWatchList()) { for (String artistsId : relationData.getWatchList()) {
if (artistsId.equalsIgnoreCase(item.getArtistId())) { if (artistsId.equalsIgnoreCase(item.getArtistId())) {
item.setIsWatch(1); item.setIsWatch(1);
break; break;
}
} }
} }
} if (relationData.getSignList() != null) {
if (relationData.getSignList() != null) { for (String artistsId : relationData.getSignList()) {
for (String artistsId : relationData.getSignList()) { if (artistsId.equalsIgnoreCase(item.getArtistId())) {
if (artistsId.equalsIgnoreCase(item.getArtistId())) { item.setIsSign(1);
item.setIsSign(1); break;
break; }
} }
} }
}
returnArtist.add(item); returnArtist.add(item);
}
} }
}
data.setData(returnArtist); data.setData(returnArtist);
data.setTotal(allReturnArtist.size()); data.setTotal(allReturnArtist.size());
return ResponseDto.success(data); return ResponseDto.success(data);
} catch (Exception e) {
return ResponseDto.failure();
}
} }
@GetMapping("richText") @GetMapping("richText")
...@@ -353,7 +356,7 @@ public class SweetAppletController { ...@@ -353,7 +356,7 @@ public class SweetAppletController {
if (mobile == null || mobile.isEmpty()) { if (mobile == null || mobile.isEmpty()) {
return ResponseDto.failure(); return ResponseDto.failure();
} }
SweetPrizeVo vo = redisDataUtils.changeLuckDrawStatus(mobile,unionId, luckDrawNum); SweetPrizeVo vo = redisDataUtils.changeLuckDrawStatus(mobile, unionId, luckDrawNum);
return ResponseDto.success(vo); return ResponseDto.success(vo);
} }
} }
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetAppletMdskController.java
View file @ d57984d9
...@@ -91,89 +91,92 @@ public class SweetAppletMdskController { ...@@ -91,89 +91,92 @@ public class SweetAppletMdskController {
@RequestParam(required = false) Integer page, @RequestParam(required = false) Integer page,
@RequestParam(required = false) Integer size, @RequestParam(required = false) Integer size,
@RequestParam String uid) { @RequestParam String uid) {
try {
List<SweetManualArtistListMDSKDto> allReturnArtist = ObjectUtil.getSweetManualArtistListMDSKDtoList();
List<SweetManualArtistListMDSKDto> returnArtist = ObjectUtil.getSweetManualArtistListMDSKDtoList();
List<SweetManualArtistListMDSKDto> allReturnArtist = ObjectUtil.getSweetManualArtistListMDSKDtoList(); SweetManualArtistList2MDSKDto data = redisDataUtils.getTimeList(manualId);
List<SweetManualArtistListMDSKDto> returnArtist = ObjectUtil.getSweetManualArtistListMDSKDtoList(); SweetArtistsRelationVo relationData = redisDataUtils.getArtistsRelationRedisVo(uid, manualId);
SweetManualArtistList2MDSKDto data = redisDataUtils.getTimeList(manualId); List<SweetManualArtistListMDSKDto> artistData = data.getData();
SweetArtistsRelationVo relationData = redisDataUtils.getArtistsRelationRedisVo(uid, manualId);
List<SweetManualArtistListMDSKDto> artistData = data.getData(); int startPosition = 0;
int endPosition = 0;
int startPosition = 0; if (page != null) {
int endPosition = 0; startPosition = (page - 1) * size;
if (page != null) { endPosition = (page) * size;
startPosition = (page - 1) * size; }
endPosition = (page) * size;
}
if (page == null && dateTime == null) { if (page == null && dateTime == null) {
try { try {
dateTime = data.getDate().get(0); dateTime = data.getDate().get(0);
} catch (Exception e) { } catch (Exception e) {
}
} }
}
for (SweetManualArtistListMDSKDto item : artistData) { for (SweetManualArtistListMDSKDto item : artistData) {
boolean isSave = true; boolean isSave = true;
if (isSign == 1) { if (isSign == 1) {
if (item.getSignatureStart() == null) { if (item.getSignatureStart() == null) {
//不保留 //不保留
isSave = false; isSave = false;
}
} }
}
if (dateTime != null) { if (dateTime != null) {
if (!item.getPerformanceStart().contains(dateTime)) { if (!item.getPerformanceStart().contains(dateTime)) {
//不保留 //不保留
isSave = false; isSave = false;
}
} }
}
if (stage != null) { if (stage != null) {
if (!item.getTitle().equalsIgnoreCase(stage)) { if (!item.getTitle().equalsIgnoreCase(stage)) {
//保留 //保留
isSave = false; isSave = false;
}
} }
}
if (isSave) { if (isSave) {
allReturnArtist.add(item); allReturnArtist.add(item);
}
} }
}
for (int i = 0; i < allReturnArtist.size(); i++) { for (int i = 0; i < allReturnArtist.size(); i++) {
SweetManualArtistListMDSKDto item = allReturnArtist.get(i); SweetManualArtistListMDSKDto item = allReturnArtist.get(i);
if (page != null && i >= startPosition && i < endPosition) { if (page != null && i >= startPosition && i < endPosition) {
item.setIsWatch(0); item.setIsWatch(0);
item.setIsSign(0); item.setIsSign(0);
if (relationData.getWatchList() != null) { if (relationData.getWatchList() != null) {
for (String artistsId : relationData.getWatchList()) { for (String artistsId : relationData.getWatchList()) {
if (artistsId.equalsIgnoreCase(item.getArtistId())) { if (artistsId.equalsIgnoreCase(item.getArtistId())) {
item.setIsWatch(1); item.setIsWatch(1);
break; break;
}
} }
} }
} if (relationData.getSignList() != null) {
if (relationData.getSignList() != null) { for (String artistsId : relationData.getSignList()) {
for (String artistsId : relationData.getSignList()) { if (artistsId.equalsIgnoreCase(item.getArtistId())) {
if (artistsId.equalsIgnoreCase(item.getArtistId())) { item.setIsSign(1);
item.setIsSign(1); break;
break; }
} }
} }
}
returnArtist.add(item); returnArtist.add(item);
}
} }
}
data.setData(returnArtist); data.setData(returnArtist);
data.setTotal(allReturnArtist.size()); data.setTotal(allReturnArtist.size());
return ResponseDto.success(data); return ResponseDto.success(data);
} catch (Exception e) {
return ResponseDto.failure();
}
} }
@GetMapping("richText") @GetMapping("richText")
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/com/liquidnet/service/sweet/mapper/SweetManualArtistsMapper.xml
View file @ d57984d9
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
<where> <where>
sma.status = 1 and manual_id = #{manualId} sma.status = 1 and manual_id = #{manualId}
</where> </where>
ORDER BY sma.updated_at DESC
</select> </select>
<select id="getManualDetails" parameterType="java.util.Map" resultMap="getManualListResult"> <select id="getManualDetails" parameterType="java.util.Map" resultMap="getManualListResult">
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/com/liquidnet/service/sweet/mapper/SweetManualArtistsMdskMapper.xml
View file @ d57984d9
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
<where> <where>
sma.status = 1 and manual_id = #{manualId} sma.status = 1 and manual_id = #{manualId}
</where> </where>
ORDER BY sma.updated_at DESC
</select> </select>
<select id="getManualDetails" parameterType="java.util.Map" resultMap="getManualListResult"> <select id="getManualDetails" parameterType="java.util.Map" resultMap="getManualListResult">
......
liquidnet-bus-support/liquidnet-support-config/src/main/resources/application-dev.yml
View file @ d57984d9
...@@ -19,7 +19,7 @@ liquidnet: ...@@ -19,7 +19,7 @@ liquidnet:
password: admin password: admin
config: config:
# location: /Users/color/company_project/java/liquidnet-bus-v1-1/liquidnet-bus-config/liquidnet-config # location: /Users/color/company_project/java/liquidnet-bus-v1-1/liquidnet-bus-config/liquidnet-config
# location: /Users/hujiachen/JavaProject/liquidnet-bus-v1/liquidnet-bus-config/liquidnet-config # location: /Users/hujiachen/IdeaProjects/liquidnet-bus-v1/liquidnet-bus-config/liquidnet-config
location: /app/support-config location: /app/support-config
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment