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

Skip to content

L
liquidnet-bus-v1
Commit c5f11782 authored by 张国柄's avatar 张国柄
Browse files
Options

Merge branch 'dev' into test

parents e35565b9 257c836c
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 105 deletions
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamThirdPartParam.java
View file @ c5f11782
......@@ -14,7 +14,7 @@ import java.io.Serializable;
@Data
public class AdamThirdPartParam implements Serializable {
private static final long serialVersionUID = 675588088506034208L;
@ApiModelProperty(position = 11, required = true, value = "第三方OPENID[64]")
@ApiModelProperty(position = 11, required = true, value = "第三方账号唯一标识[64]")
@NotBlank(message = "OPENID不能为空")
private String openId;
@ApiModelProperty(position = 12, required = true, value = "昵称[64]", example = "Swagger")
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java
View file @ c5f11782
......@@ -346,7 +346,7 @@ public class AdamLoginController {
} catch (Exception e) {
log.error("WX.API调用异常[jsCode:{},respJStr={}]", jsCode, respJStr, e);
}
log.debug("jsCode={},openid={}", jsCode, openId);
log.debug("jsCode={},respJStr={}", jsCode, respJStr);
return ResponseDto.success(openId);
}
......@@ -369,10 +369,12 @@ public class AdamLoginController {
} catch (Exception e) {
log.error("WX.API调用异常[jsCode:{},respJStr={}]", code, respJStr, e);
}
log.debug("code={},openid={}", code, openId);
log.debug("code={},respJStr={}", code, respJStr);
return ResponseDto.success(openId);
}
/* ---------------------------- Internal Method ---------------------------- */
/* ---------------------------- Internal Method ---------------------------- */
/* ---------------------------- Internal Method ---------------------------- */
private ResponseDto checkSmsCode(String mobile, String code) {
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetAppletController.java
View file @ c5f11782
......@@ -40,7 +40,7 @@ public class SweetAppletController {
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "电子手册id", required = true),
})
public ResponseDto<SweetManualAppletDto> details(@RequestParam(defaultValue = "1") String manualId) {
public ResponseDto<SweetManualAppletDto> details(@RequestParam() String manualId) {
return ResponseDto.success(redisDataUtils.getAppletPerformance(manualId));
}
......@@ -49,7 +49,7 @@ public class SweetAppletController {
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "电子手册id", required = true),
})
public ResponseDto<List<SweetManualNotify>> notify(@RequestParam(defaultValue = "1") String manualId) {
public ResponseDto<List<SweetManualNotify>> notify(@RequestParam() String manualId) {
return ResponseDto.success(redisDataUtils.getNotifyRedisData(manualId));
}
......@@ -58,7 +58,7 @@ public class SweetAppletController {
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "电子手册id", required = true),
})
public ResponseDto<List<String>> tag(@RequestParam(defaultValue = "1") String manualId) {
public ResponseDto<List<String>> tag(@RequestParam() String manualId) {
return ResponseDto.success(redisDataUtils.getTagRedisData(manualId));
}
......@@ -72,12 +72,12 @@ public class SweetAppletController {
@ApiImplicitParam(type = "query", dataType = "Integer", name = "page", value = "页数", required = true),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "数量", required = true),
})
public ResponseDto<SweetManualArtistList2Dto> timeList(@RequestParam(defaultValue = "1") String manualId,
@RequestParam(defaultValue = "2021-12-01") String dateTime,
@RequestParam(defaultValue = "测试舞台") String stage,
@RequestParam(defaultValue = "isSign") Integer isSign,
@RequestParam(defaultValue = "page") Integer page,
@RequestParam(defaultValue = "size") Integer size) {
public ResponseDto<SweetManualArtistList2Dto> timeList(@RequestParam( )String manualId,
@RequestParam() String dateTime,
@RequestParam() String stage,
@RequestParam() Integer isSign,
@RequestParam() Integer page,
@RequestParam() Integer size) {
String uid = CurrentUtil.getCurrentUid();
int startPosition = (page - 1) * size;
int endPosition = (page) * size;
......@@ -151,8 +151,8 @@ public class SweetAppletController {
@ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "电子手册id", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "type", value = "类型 (1签售时间 2现场地图 3官方大巴 4公共交通 5自驾导航坐标 6官方支持 7观众须知 8防疫指南 9观演攻略)", required = true),
})
public ResponseDto<SweetRichtext> richText(@RequestParam(defaultValue = "1") String manualId,
@RequestParam(defaultValue = "1") String type) {
public ResponseDto<SweetRichtext> richText(@RequestParam() String manualId,
@RequestParam() String type) {
return ResponseDto.success(redisDataUtils.getRichTextRedisData(manualId, type));
}
......@@ -162,8 +162,8 @@ public class SweetAppletController {
@ApiImplicitParam(type = "query", dataType = "String", name = "uid", value = "用户id", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "artistsId", value = "艺人id", required = true)
})
public ResponseDto<Boolean> watch(@RequestParam(defaultValue = "1") String uid,
@RequestParam(defaultValue = "1") String artistsId) {
public ResponseDto<Boolean> watch(@RequestParam() String uid,
@RequestParam() String artistsId) {
redisDataUtils.setArtistsRelationRedisVo(uid, artistsId, "sign");
return ResponseDto.success();
}
......@@ -174,8 +174,8 @@ public class SweetAppletController {
@ApiImplicitParam(type = "query", dataType = "String", name = "uid", value = "用户id", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "artistsId", value = "艺人id", required = true)
})
public ResponseDto<Boolean> sign(@RequestParam(defaultValue = "1") String uid,
@RequestParam(defaultValue = "1") String artistsId) {
public ResponseDto<Boolean> sign(@RequestParam() String uid,
@RequestParam() String artistsId) {
redisDataUtils.setArtistsRelationRedisVo(uid, artistsId, "watch");
return ResponseDto.success();
}
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetArtistsController.java
View file @ c5f11782
......@@ -37,9 +37,9 @@ public class SweetArtistsController {
@ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "数量", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "name", value = "艺人姓名 不查询从传递null", required = false),
})
public ResponseDto<PageInfo<SweetArtists>> getList(@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer size,
@RequestParam(defaultValue = "艺人姓名",required = false) String name) {
public ResponseDto<PageInfo<SweetArtists>> getList(@RequestParam() Integer page,
@RequestParam() Integer size,
@RequestParam(required = false) String name) {
return sweetArtistsService.getList(page, size, name);
}
......@@ -51,10 +51,10 @@ public class SweetArtistsController {
@ApiImplicitParam(type = "query", dataType = "String", name = "pinyin", value = "姓名拼音", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "describe", value = "艺人简介", required = true),
})
public ResponseDto<Boolean> add(@RequestParam(defaultValue = "") String picUrl,
@RequestParam(defaultValue = "艺人姓名") String name,
@RequestParam(defaultValue = "pinyin") String pinyin,
@RequestParam(defaultValue = "艺人简介") String describe) {
public ResponseDto<Boolean> add(@RequestParam() String picUrl,
@RequestParam() String name,
@RequestParam() String pinyin,
@RequestParam() String describe) {
return sweetArtistsService.add(picUrl, name, pinyin, describe);
}
......@@ -63,7 +63,7 @@ public class SweetArtistsController {
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "artistsId", value = "艺人Id", required = true),
})
public ResponseDto<SweetArtists> detail(@RequestParam(defaultValue = "1") String artistsId) {
public ResponseDto<SweetArtists> detail(@RequestParam() String artistsId) {
return sweetArtistsService.detail(artistsId);
}
......@@ -76,11 +76,11 @@ public class SweetArtistsController {
@ApiImplicitParam(type = "query", dataType = "String", name = "pinyin", value = "姓名拼音", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "describe", value = "艺人简介", required = true),
})
public ResponseDto<Boolean> change(@RequestParam(defaultValue = "1") String artistsId,
@RequestParam(defaultValue = "") String picUrl,
@RequestParam(defaultValue = "艺人姓名") String name,
@RequestParam(defaultValue = "pinyin") String pinyin,
@RequestParam(defaultValue = "艺人简介") String describe) {
public ResponseDto<Boolean> change(@RequestParam() String artistsId,
@RequestParam() String picUrl,
@RequestParam() String name,
@RequestParam() String pinyin,
@RequestParam() String describe) {
return sweetArtistsService.change(artistsId, picUrl, name, pinyin, describe);
}
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetManualArtistsController.java
View file @ c5f11782
......@@ -37,9 +37,9 @@ public class SweetManualArtistsController {
@ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "数量", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "manaulId", value = "手册id", required = true),
})
public ResponseDto<PageInfo<SweetManualArtistListDto>> getList(@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer size,
@RequestParam(defaultValue = "") String manualId) {
public ResponseDto<PageInfo<SweetManualArtistListDto>> getList(@RequestParam() Integer page,
@RequestParam() Integer size,
@RequestParam() String manualId) {
return sweetManualArtistsService.getList(page, size, manualId);
}
......@@ -48,7 +48,7 @@ public class SweetManualArtistsController {
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "manualRelationId", value = "手册艺人id", required = true),
})
public ResponseDto<SweetManualArtistListDto> details(@RequestParam(defaultValue = "") String manualRelationId) {
public ResponseDto<SweetManualArtistListDto> details(@RequestParam() String manualRelationId) {
return sweetManualArtistsService.details(manualRelationId);
}
......@@ -63,13 +63,13 @@ public class SweetManualArtistsController {
@ApiImplicitParam(type = "query", dataType = "String", name = "signatureStart", value = "签售开始时间", required = false),
@ApiImplicitParam(type = "query", dataType = "String", name = "signatureEnd", value = "签售结束时间", required = false),
})
public ResponseDto<Boolean> add(@RequestParam(defaultValue = "1") String manualId,
@RequestParam(defaultValue = "10") String artistId,
@RequestParam(defaultValue = "") String stageId,
@RequestParam(defaultValue = "", required = false) String performanceStart,
@RequestParam(defaultValue = "", required = false) String performanceEnd,
@RequestParam(defaultValue = "", required = false) String signatureStart,
@RequestParam(defaultValue = "", required = false) String signatureEnd) {
public ResponseDto<Boolean> add(@RequestParam() String manualId,
@RequestParam() String artistId,
@RequestParam() String stageId,
@RequestParam( required = false) String performanceStart,
@RequestParam( required = false) String performanceEnd,
@RequestParam( required = false) String signatureStart,
@RequestParam( required = false) String signatureEnd) {
return sweetManualArtistsService.add(manualId, artistId, stageId, performanceStart, performanceEnd, signatureStart, signatureEnd);
}
......@@ -85,14 +85,14 @@ public class SweetManualArtistsController {
@ApiImplicitParam(type = "query", dataType = "String", name = "signatureStart", value = "签售开始时间", required = false),
@ApiImplicitParam(type = "query", dataType = "String", name = "signatureEnd", value = "签售结束时间", required = false),
})
public ResponseDto<Boolean> change(@RequestParam(defaultValue = "1") String manualRelationId,
@RequestParam(defaultValue = "1") String manualId,
@RequestParam(defaultValue = "10") String artistId,
@RequestParam(defaultValue = "") String stageId,
@RequestParam(defaultValue = "", required = false) String performanceStart,
@RequestParam(defaultValue = "", required = false) String performanceEnd,
@RequestParam(defaultValue = "", required = false) String signatureStart,
@RequestParam(defaultValue = "", required = false) String signatureEnd) {
public ResponseDto<Boolean> change(@RequestParam() String manualRelationId,
@RequestParam() String manualId,
@RequestParam() String artistId,
@RequestParam() String stageId,
@RequestParam( required = false) String performanceStart,
@RequestParam( required = false) String performanceEnd,
@RequestParam( required = false) String signatureStart,
@RequestParam(required = false) String signatureEnd) {
return sweetManualArtistsService.change(manualRelationId, manualId, artistId, stageId, performanceStart, performanceEnd, signatureStart, signatureEnd);
}
......@@ -102,8 +102,8 @@ public class SweetManualArtistsController {
@ApiImplicitParam(type = "query", dataType = "String", name = "manualRelationId", value = "手册艺人id", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "手册id", required = true)
})
public ResponseDto<Boolean> delete(@RequestParam(defaultValue = "1") String manualRelationId,
@RequestParam(defaultValue = "1") String manualId) {
public ResponseDto<Boolean> delete(@RequestParam() String manualRelationId,
@RequestParam() String manualId) {
return sweetManualArtistsService.delete(manualRelationId, manualId);
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetManualController.java
View file @ c5f11782
......@@ -37,9 +37,9 @@ public class SweetManualController {
@ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "数量", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "name", value = "姓名", required = false),
})
public ResponseDto<PageInfo<SweetManualDto>> getList(@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer size,
@RequestParam(defaultValue = "",required = false) String name) {
public ResponseDto<PageInfo<SweetManualDto>> getList(@RequestParam() Integer page,
@RequestParam() Integer size,
@RequestParam(required = false) String name) {
return sweetManualService.getManualList(page, size, name);
}
......@@ -49,8 +49,8 @@ public class SweetManualController {
@ApiImplicitParam(type = "query", dataType = "Integer", name = "page", value = "页数", required = true),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "数量", required = true),
})
public ResponseDto<Boolean> changeRelease(@RequestParam(defaultValue = "1") String manualId,
@RequestParam(defaultValue = "1") Integer isRelease) {
public ResponseDto<Boolean> changeRelease(@RequestParam() String manualId,
@RequestParam() Integer isRelease) {
return sweetManualService.changeRelease(manualId, isRelease);
}
......@@ -61,9 +61,9 @@ public class SweetManualController {
@ApiImplicitParam(type = "query", dataType = "String", name = "performancesId", value = "演出id", required = true),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "status", value = "开启状态", required = true),
})
public ResponseDto<Boolean> changeStatus(@RequestParam(defaultValue = "1") String manualId,
@RequestParam(defaultValue = "1") String performancesId,
@RequestParam(defaultValue = "1") Integer status) {
public ResponseDto<Boolean> changeStatus(@RequestParam() String manualId,
@RequestParam() String performancesId,
@RequestParam() Integer status) {
return sweetManualService.changeStatus(manualId, performancesId, status);
}
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetManualNotifyController.java
View file @ c5f11782
......@@ -39,10 +39,10 @@ public class SweetManualNotifyController {
@ApiImplicitParam(type = "query", dataType = "String", name = "name", value = "通知标题 不查询从传递null", required = false),
@ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "手册id", required = true),
})
public ResponseDto<PageInfo<SweetManualNotify>> getList(@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer size,
@RequestParam(defaultValue = "标题", required = false) String name,
@RequestParam(defaultValue = "手册id") String manualId) {
public ResponseDto<PageInfo<SweetManualNotify>> getList(@RequestParam() Integer page,
@RequestParam() Integer size,
@RequestParam( required = false) String name,
@RequestParam() String manualId) {
return sweetManualNotifyService.getList(page, size, name, manualId);
}
......@@ -53,9 +53,9 @@ public class SweetManualNotifyController {
@ApiImplicitParam(type = "query", dataType = "String", name = "title", value = "标题", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "content", value = "内容", required = true),
})
public ResponseDto<Boolean> add(@RequestParam(defaultValue = "") String manualId,
@RequestParam(defaultValue = "标题") String title,
@RequestParam(defaultValue = "内容") String content) {
public ResponseDto<Boolean> add(@RequestParam() String manualId,
@RequestParam() String title,
@RequestParam() String content) {
return sweetManualNotifyService.add(manualId, title, content);
}
......@@ -64,7 +64,7 @@ public class SweetManualNotifyController {
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "手册id", required = true),
})
public ResponseDto<SweetManualNotify> detail(@RequestParam(defaultValue = "1") String manualId) {
public ResponseDto<SweetManualNotify> detail(@RequestParam() String manualId) {
return sweetManualNotifyService.details(manualId);
}
......@@ -76,10 +76,10 @@ public class SweetManualNotifyController {
@ApiImplicitParam(type = "query", dataType = "String", name = "title", value = "标题", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "content", value = "内容", required = true),
})
public ResponseDto<Boolean> change(@RequestParam(defaultValue = "") String manualId,
@RequestParam(defaultValue = "") String manualNotifyId,
@RequestParam(defaultValue = "标题") String title,
@RequestParam(defaultValue = "内容") String content) {
public ResponseDto<Boolean> change(@RequestParam() String manualId,
@RequestParam() String manualNotifyId,
@RequestParam() String title,
@RequestParam() String content) {
return sweetManualNotifyService.change(manualId, manualNotifyId, title, content);
}
......@@ -88,7 +88,7 @@ public class SweetManualNotifyController {
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "manualNotifyId", value = "手册通知id", required = true),
})
public ResponseDto<Boolean> delete(@RequestParam(defaultValue = "1") String manualNotifyId) {
public ResponseDto<Boolean> delete(@RequestParam() String manualNotifyId) {
return sweetManualNotifyService.delete(manualNotifyId);
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetManualSortController.java
View file @ c5f11782
......@@ -34,8 +34,8 @@ public class SweetManualSortController {
@ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "电子手册id", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "content", value = "内容 例子(POSITION_1,POSITION_2)", required = true)
})
public ResponseDto<Boolean> changeStatus(@RequestParam(defaultValue = "1") String manualId,
@RequestParam(defaultValue = "") String content) {
public ResponseDto<Boolean> changeStatus(@RequestParam() String manualId,
@RequestParam() String content) {
return sweetManualSortService.add(manualId, content);
}
......@@ -44,7 +44,7 @@ public class SweetManualSortController {
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "电子手册id", required = true)
})
public ResponseDto<SweetManualSort> changeStatus(@RequestParam(defaultValue = "1") String manualId) {
public ResponseDto<SweetManualSort> changeStatus(@RequestParam() String manualId) {
return sweetManualSortService.get(manualId);
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetRichtextController.java
View file @ c5f11782
......@@ -36,8 +36,8 @@ public class SweetRichtextController {
@ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "电子手册id", required = true),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "type", value = "类型 (1签售时间 2现场地图 3官方大巴 4公共交通 5自驾导航坐标 6官方支持 7观众须知 8防疫指南 9观演攻略)", required = true),
})
public ResponseDto<SweetRichtext> get(@RequestParam(defaultValue = "1") String manualId,
@RequestParam(defaultValue = "1") Integer type) {
public ResponseDto<SweetRichtext> get(@RequestParam() String manualId,
@RequestParam() Integer type) {
return sweetRichtextService.get(manualId, type);
}
......@@ -50,11 +50,11 @@ public class SweetRichtextController {
@ApiImplicitParam(type = "query", dataType = "Integer", name = "picUrl", value = "图片地址", required = false),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "type", value = "类型 (1签售时间 2现场地图 3官方大巴 4公共交通 5自驾导航坐标 6官方支持 7观众须知 8防疫指南 9观演攻略)", required = true),
})
public ResponseDto<Boolean> add(@RequestParam(defaultValue = "1") String manualId,
@RequestParam(defaultValue = "",required = false) String details,
@RequestParam(defaultValue = "100.100,200.200",required = false) String local,
@RequestParam(defaultValue = "",required = false) String picUrl,
@RequestParam(defaultValue = "1") Integer type) {
public ResponseDto<Boolean> add(@RequestParam() String manualId,
@RequestParam(required = false) String details,
@RequestParam(required = false) String local,
@RequestParam(required = false) String picUrl,
@RequestParam() Integer type) {
return sweetRichtextService.add(manualId, details, local, picUrl, type);
}
......@@ -67,11 +67,11 @@ public class SweetRichtextController {
@ApiImplicitParam(type = "query", dataType = "Integer", name = "picUrl", value = "图片地址", required = false),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "type", value = "类型 (1签售时间 2现场地图 3官方大巴 4公共交通 5自驾导航坐标 6官方支持 7观众须知 8防疫指南 9观演攻略)", required = true),
})
public ResponseDto<Boolean> change(@RequestParam(defaultValue = "1") String manualId,
@RequestParam(defaultValue = "",required = false) String details,
@RequestParam(defaultValue = "100.100,200.200",required = false) String local,
@RequestParam(defaultValue = "",required = false) String picUrl,
@RequestParam(defaultValue = "1") Integer type) {
public ResponseDto<Boolean> change(@RequestParam() String manualId,
@RequestParam(required = false) String details,
@RequestParam(required = false) String local,
@RequestParam(required = false) String picUrl,
@RequestParam() Integer type) {
return sweetRichtextService.change(manualId, details, local, picUrl, type);
}
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetStageController.java
View file @ c5f11782
......@@ -35,9 +35,9 @@ public class SweetStageController {
@ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "数量", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "title", value = "舞台名称", required = false),
})
public ResponseDto<PageInfo<SweetStage>> getList(@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer size,
@RequestParam(defaultValue = "名字",required = false) String title) {
public ResponseDto<PageInfo<SweetStage>> getList(@RequestParam() Integer page,
@RequestParam() Integer size,
@RequestParam(required = false) String title) {
return sweetStageService.getList(page, size, title);
}
......@@ -46,7 +46,7 @@ public class SweetStageController {
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "name", value = "舞台名", required = true),
})
public ResponseDto<Boolean> add(@RequestParam(defaultValue = "舞台名") String name) {
public ResponseDto<Boolean> add(@RequestParam() String name) {
return sweetStageService.add(name);
}
......@@ -55,7 +55,7 @@ public class SweetStageController {
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "stageId", value = "舞台Id", required = true),
})
public ResponseDto<SweetStage> detail(@RequestParam(defaultValue = "1") String stageId) {
public ResponseDto<SweetStage> detail(@RequestParam() String stageId) {
return sweetStageService.detail(stageId);
}
......@@ -65,8 +65,8 @@ public class SweetStageController {
@ApiImplicitParam(type = "query", dataType = "String", name = "stageId", value = "舞台Id", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "name", value = "舞台名", required = true),
})
public ResponseDto<Boolean> change(@RequestParam(defaultValue = "1") String stageId,
@RequestParam(defaultValue = "舞台名") String name) {
public ResponseDto<Boolean> change(@RequestParam() String stageId,
@RequestParam() String name) {
return sweetStageService.change(name, stageId);
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetArtistsServiceImpl.java
View file @ c5f11782
......@@ -45,8 +45,13 @@ public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, Swe
public ResponseDto<PageInfo<SweetArtists>> getList(int page, int size, String name) {
PageInfo<SweetArtists> pageInfo = null;
try {
List<SweetArtists> data;
PageHelper.startPage(page, size);
List<SweetArtists> data = sweetArtistsMapper.selectList(Wrappers.lambdaQuery(SweetArtists.class).like(SweetArtists::getName, name));
if(name!=null){
data = sweetArtistsMapper.selectList(Wrappers.lambdaQuery(SweetArtists.class).like(SweetArtists::getName, name));
}else{
data = sweetArtistsMapper.selectList(Wrappers.lambdaQuery(SweetArtists.class));
}
pageInfo = new PageInfo(data);
return ResponseDto.success(pageInfo);
} catch (Exception e) {
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetManualNotifyServiceImpl.java
View file @ c5f11782
......@@ -38,7 +38,12 @@ public class SweetManualNotifyServiceImpl extends ServiceImpl<SweetManualNotifyM
PageInfo<SweetManualNotify> pageInfo = null;
try {
PageHelper.startPage(page, size);
List<SweetManualNotify> data = sweetManualNotifyMapper.selectList(Wrappers.lambdaQuery(SweetManualNotify.class).like(SweetManualNotify::getTitle, title).eq(SweetManualNotify::getManualId, manualId).eq(SweetManualNotify::getStatus, 1));
List<SweetManualNotify> data;
if (title != null) {
data = sweetManualNotifyMapper.selectList(Wrappers.lambdaQuery(SweetManualNotify.class).like(SweetManualNotify::getTitle, title).eq(SweetManualNotify::getManualId, manualId).eq(SweetManualNotify::getStatus, 1));
} else {
data = sweetManualNotifyMapper.selectList(Wrappers.lambdaQuery(SweetManualNotify.class).eq(SweetManualNotify::getManualId, manualId).eq(SweetManualNotify::getStatus, 1));
}
pageInfo = new PageInfo(data);
return ResponseDto.success(pageInfo);
} catch (Exception e) {
......@@ -77,7 +82,7 @@ public class SweetManualNotifyServiceImpl extends ServiceImpl<SweetManualNotifyM
}
@Override
public ResponseDto<Boolean> change(String manualId,String manualNotifyId, String title, String content) {
public ResponseDto<Boolean> change(String manualId, String manualNotifyId, String title, String content) {
try {
SweetManualNotify sweetManualNotify = SweetManualNotify.getNew();
sweetManualNotify.setTitle(title);
......@@ -86,12 +91,12 @@ public class SweetManualNotifyServiceImpl extends ServiceImpl<SweetManualNotifyM
sweetManualNotifyMapper.update(sweetManualNotify, Wrappers.lambdaUpdate(SweetManualNotify.class).eq(SweetManualNotify::getManualNotifyId, manualNotifyId));
List<SweetManualNotify> oldData = redisDataUtils.getNotifyRedisData(manualId);
for (SweetManualNotify item:oldData){
if(item.getManualNotifyId().equalsIgnoreCase(manualNotifyId)){
item.setTitle(title);
item.setContent(content);
item.setUpdatedAt(LocalDateTime.now());
}
for (SweetManualNotify item : oldData) {
if (item.getManualNotifyId().equalsIgnoreCase(manualNotifyId)) {
item.setTitle(title);
item.setContent(content);
item.setUpdatedAt(LocalDateTime.now());
}
}
redisDataUtils.setNotifyRedisData(manualId, oldData);
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetStageServiceImpl.java
View file @ c5f11782
......@@ -43,7 +43,12 @@ public class SweetStageServiceImpl extends ServiceImpl<SweetStageMapper, SweetSt
PageInfo<SweetStage> pageInfo = null;
try {
PageHelper.startPage(page, size);
List<SweetStage> data = sweetStageMapper.selectList(Wrappers.lambdaQuery(SweetStage.class).like(SweetStage::getTitle, title));
List<SweetStage> data;
if(title!=null) {
data = sweetStageMapper.selectList(Wrappers.lambdaQuery(SweetStage.class).like(SweetStage::getTitle, title));
}else{
data = sweetStageMapper.selectList(Wrappers.lambdaQuery(SweetStage.class));
}
pageInfo = new PageInfo(data);
return ResponseDto.success(pageInfo);
} catch (Exception e) {
......
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