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

Skip to content

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

Merge branch 'test'

parents 0faf8441 6733fcb0
Show whitespace changes
Inline Side-by-side
Showing with 130 additions and 17 deletions
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamEntersParam.java
View file @ ff46cac5
...@@ -14,7 +14,8 @@ public class AdamEntersParam implements java.io.Serializable { ...@@ -14,7 +14,8 @@ public class AdamEntersParam implements java.io.Serializable {
@ApiModelProperty(position = 10, required = false, value = "入场人ID，编辑时必传[50]") @ApiModelProperty(position = 10, required = false, value = "入场人ID，编辑时必传[50]")
private String entersId; private String entersId;
@ApiModelProperty(position = 11, required = true, value = "入场人姓名[50]", example = "测试") @ApiModelProperty(position = 11, required = true, value = "入场人姓名[50]", example = "测试")
@Pattern(regexp = LnsRegex.Valid.CHINESE_HANZI, message = "姓名必须为2～20位汉字") // @Pattern(regexp = LnsRegex.Valid.CHINESE_HANZI, message = "姓名必须为2～20位汉字")
@Size(min = 1, max = 30)
private String name; private String name;
@ApiModelProperty(position = 12, required = true, value = "入场人手机号[11]", example = "13100000000") @ApiModelProperty(position = 12, required = true, value = "入场人手机号[11]", example = "13100000000")
@Pattern(regexp = "\\d{11}", message = "手机号格式有误") @Pattern(regexp = "\\d{11}", message = "手机号格式有误")
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/create.html
View file @ ff46cac5
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<th:block th:include="include :: header('添加banner')"/> <th:block th:include="include :: header('添加banner')"/>
<th:block th:include="include :: select2-css"/> <th:block th:include="include :: select2-css"/>
<th:block th:include="include :: datetimepicker-css"/> <th:block th:include="include :: datetimepicker-css"/>
<th:block th:include="include :: bootstrap-fileinput-css" /> <th:block th:include="include :: bootstrap-fileinput-css"/>
</head> </head>
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
...@@ -39,10 +39,24 @@ ...@@ -39,10 +39,24 @@
</div> </div>
<div class="col-sm-5"> <div class="col-sm-5">
<input class="form-control" type="text" placeholder="请填写url" id="targetObjInput"> <input class="form-control" type="text" placeholder="请填写url" id="targetObjInput">
<div hidden="hidden" id="targetObjSelectShow"> <!--<div hidden="hidden" id="targetObjSelectShow">
<select class="form-control" id="targetObjSelect"> <select class="form-control" id="targetObjSelect">
<option value="">--请选择--</option> <option value="">&#45;&#45;请选择&#45;&#45;</option>
</select> </select>
</div>-->
<div hidden class="row" id="targetObjSelectShow">
<div class="col-lg-6">
<div class="input-group">
<input type="text" class="form-control" id="targetObjSelect">
<div class="input-group-btn">
<button type="button" class="btn btn-white dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
</ul>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -104,7 +118,8 @@ ...@@ -104,7 +118,8 @@
<div class="form-group"> <div class="form-group">
<label class="font-noraml">请上传封面图</label> <label class="font-noraml">请上传封面图</label>
<div class="file-loading"> <div class="file-loading">
<input id="fileinput-demo-1" type="file" name="coverImgFile" data-browse-on-zone-click="true" data-msg-placeholder="Select {files} for upload..."> <input id="fileinput-demo-1" type="file" name="coverImgFile" data-browse-on-zone-click="true"
data-msg-placeholder="Select {files} for upload...">
</div> </div>
</div> </div>
<input hidden id="coverImg" name="coverImg"> <input hidden id="coverImg" name="coverImg">
...@@ -113,7 +128,8 @@ ...@@ -113,7 +128,8 @@
<th:block th:include="include :: footer"/> <th:block th:include="include :: footer"/>
<th:block th:include="include :: select2-js"/> <th:block th:include="include :: select2-js"/>
<th:block th:include="include :: datetimepicker-js"/> <th:block th:include="include :: datetimepicker-js"/>
<th:block th:include="include :: bootstrap-fileinput-js" /> <th:block th:include="include :: bootstrap-fileinput-js"/>
<th:block th:include="include :: bootstrap-suggest-js"/>
<script type="text/javascript"> <script type="text/javascript">
var prefix = ctx + "kylin/banners"; var prefix = ctx + "kylin/banners";
var provinces = "[[${provinces}]]"; var provinces = "[[${provinces}]]";
...@@ -243,10 +259,10 @@ ...@@ -243,10 +259,10 @@
form.render();*/ form.render();*/
}); });
$('body').on('click', '.provincesDel', function (){ $('body').on('click', '.provincesDel', function () {
$(this).parents('.provincesAll').remove(); $(this).parents('.provincesAll').remove();
}) })
$('body').on('click', '.provincesAdd', function (){ $('body').on('click', '.provincesAdd', function () {
var selecthtml = $('.provincesList').eq(0).select2("destroy").html(); var selecthtml = $('.provincesList').eq(0).select2("destroy").html();
var html = '<div class="col-sm-12 provincesAll">' + var html = '<div class="col-sm-12 provincesAll">' +
' <label class="col-sm-2 control-label"></label>' + ' <label class="col-sm-2 control-label"></label>' +
...@@ -292,6 +308,80 @@ ...@@ -292,6 +308,80 @@
// 跳转类型选择事件 // 跳转类型选择事件
function targetObjBsSuggest(searchUrl, targetType) {
var taobaoBsSuggest = $("#targetObjSelect").bsSuggest({
indexId: 0, // data.value 每组数据的第几个数据，作为input输入框的 data-id，设为 -1 且 idField 为空则不设置此值
indexKey: 1, // data.value 的第几个数据，作为input输入框的内容
showBtn: false, //是否显示下拉按钮
hideOnSelect:true, //鼠标从列表单击选择了值时，是否隐藏选择列表
searchingTip: "获取中...",
allowNoKeyword: false, // 是否允许无关键字时请求数据
multiWord: false, // 以分隔符号分割的多关键字支持
separator: ",", // 多关键字支持时的分隔符，默认为空格
getDataMethod: "url", // 获取数据的方式，总是从 URL 获取
effectiveFieldsAlias: {
Id: "ID",
Keyword: "名称"
},
showHeader: true,
url: searchUrl + '&title=',
/*优先从url ajax 请求 json 帮助数据，注意最后一个参数为关键字请求参数*/
// jsonp: 'callback',
/*如果从 url 获取数据，并且需要跨域，则该参数必须设置*/
processData: function (json) { // url 获取数据时，对数据的处理，作为 getData 的回调函数
var i, len, data = {
value: []
};
if (!json) {
return false;
}
if (6 == targetType) {
dataList = json.value;
} else if(8 == targetType) {
dataList = json.rows;
} else if(24 == targetType) {
dataList = json.data;
} else if(26 == targetType) {
dataList = json.data;
} else {
dataList = json.data
}
console.log(dataList);
len = dataList.length;
for (i = 0; i < len; i++) {
var Title = '';
var Id = '';
if (6 == targetType) {
Id = dataList[i].performancesId;
Title = dataList[i].title;
} else if(8 == targetType) {
Id = dataList[i].roadShowId;
Title = dataList[i].title;
} else if(24 == targetType) {
Id = dataList[i].id;
Title = dataList[i].collect_name;
} else if(26 == targetType) {
Id = dataList[i].id;
Title = dataList[i].name;
} else {
Id = dataList[i].id;
Title = dataList[i].title;
}
data.value.push({
"Id": Id,
"Title": Title,
});
}
console.log(data);
return data;
}
});
}
$('#targetType').on('select2:select', function (e) { $('#targetType').on('select2:select', function (e) {
// var cardTypeW = $("#cardType option:checked").text(); // 获取选中的名 // var cardTypeW = $("#cardType option:checked").text(); // 获取选中的名
// var targetType = $("#targetType option:checked").val(); // var targetType = $("#targetType option:checked").val();
...@@ -304,11 +394,19 @@ ...@@ -304,11 +394,19 @@
$("#targetObjInput").hide(); $("#targetObjInput").hide();
} else { } else {
var urlVarName = 'url' + targetType; var urlVarName = 'url' + targetType;
var url = eval(urlVarName); var urleval = eval(urlVarName);
var arrEntities = {'lt':'<','gt':'>','nbsp':' ','amp':'&','quot':'"'}; var arrEntities = {'lt': '<', 'gt': '>', 'nbsp': ' ', 'amp': '&', 'quot': '"'};
url = url.replace(/&(lt|gt|nbsp|amp|quot);/ig,function(all,t){return arrEntities[t];}); searchUrl = urleval.replace(/&(lt|gt|nbsp|amp|quot);/ig, function (all, t) {
return arrEntities[t];
});
console.log(searchUrl)
$("#targetObjSelectShow").show();
$("#targetObjInput").hide();
targetObjBsSuggest(searchUrl, targetType);
// 获取相关数据 // 获取相关数据
var configUrl = { /*var configUrl = {
url: url, url: url,
type: "get", type: "get",
dataType: "json", dataType: "json",
...@@ -350,7 +448,7 @@ ...@@ -350,7 +448,7 @@
$("#targetObjSelect").html(html); $("#targetObjSelect").html(html);
} }
}; };
$.ajax(configUrl) $.ajax(configUrl)*/
} }
}); });
$("#fileinput-demo-1").fileinput({ $("#fileinput-demo-1").fileinput({
...@@ -362,7 +460,7 @@ ...@@ -362,7 +460,7 @@
dropZoneTitle: "请上传文件", dropZoneTitle: "请上传文件",
maxFileCount: 1 maxFileCount: 1
}); });
$("#fileinput-demo-1").on("fileuploaded", function(event, data, previewId, index) { $("#fileinput-demo-1").on("fileuploaded", function (event, data, previewId, index) {
$("#coverImg").val(data.response.uploadpath) $("#coverImg").val(data.response.uploadpath)
}); });
}) })
......
liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web.yml
View file @ ff46cac5
...@@ -23,7 +23,7 @@ liquidnet: ...@@ -23,7 +23,7 @@ liquidnet:
url1: "${liquidnet.client.admin.phpoMediaApiUrl}/api/video/list?per_page=50&page=1&type=1" #PGC点播 url1: "${liquidnet.client.admin.phpoMediaApiUrl}/api/video/list?per_page=50&page=1&type=1" #PGC点播
url2: "${liquidnet.client.admin.phpoMediaApiUrl}/api/video/list?per_page=50&page=1&type=2" #PGC直播 url2: "${liquidnet.client.admin.phpoMediaApiUrl}/api/video/list?per_page=50&page=1&type=2" #PGC直播
url5: "${liquidnet.client.admin.phpMallUrl}/admin/fieldListForQuick?page=1&per_page=50" #场地 url5: "${liquidnet.client.admin.phpMallUrl}/admin/fieldListForQuick?page=1&per_page=50" #场地
url6: "/kylin/performances/recommend/performance/status?pageNum=1&pageSize=50&status=(3,6,7,8,9,10)&title=''" #票务 url6: "https://devadmin.zhengzai.tv/kylin/performances/recommend/performance/status?pageNum=1&pageSize=50&status=(3,6,7,8,9,10)" #票务
url7: "${liquidnet.client.admin.phpMallUrl}/admin/goodListForQuick?page=1&per_page=50" #商品 url7: "${liquidnet.client.admin.phpMallUrl}/admin/goodListForQuick?page=1&per_page=50" #商品
url8: "${liquidnet.client.admin.kylinApiUrl}/kylin/performances/roadShow/list?pageNum=1&pageSize=50" #巡演 url8: "${liquidnet.client.admin.kylinApiUrl}/kylin/performances/roadShow/list?pageNum=1&pageSize=50" #巡演
url13: "${liquidnet.client.admin.phpMallUrl}/admin/integrationListForQuick?page=1&per_page=50" #积分商城 url13: "${liquidnet.client.admin.phpMallUrl}/admin/integrationListForQuick?page=1&per_page=50" #积分商城
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamEntersController.java
View file @ ff46cac5
...@@ -2,6 +2,8 @@ package com.liquidnet.service.adam.controller; ...@@ -2,6 +2,8 @@ package com.liquidnet.service.adam.controller;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.liquidnet.common.exception.constant.ErrorCode;
import com.liquidnet.commons.lang.constant.LnsRegex;
import com.liquidnet.commons.lang.util.CurrentUtil; import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.commons.lang.util.SensitizeUtil; import com.liquidnet.commons.lang.util.SensitizeUtil;
import com.liquidnet.service.adam.dto.AdamEntersParam; import com.liquidnet.service.adam.dto.AdamEntersParam;
...@@ -23,6 +25,7 @@ import javax.validation.Valid; ...@@ -23,6 +25,7 @@ import javax.validation.Valid;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.regex.Pattern;
/** /**
* <p> * <p>
...@@ -48,6 +51,12 @@ public class AdamEntersController { ...@@ -48,6 +51,12 @@ public class AdamEntersController {
@ApiOperation(value = "添加入场人") @ApiOperation(value = "添加入场人")
@PostMapping("add") @PostMapping("add")
public ResponseDto<String> add(@RequestBody @Valid AdamEntersParam parameter) { public ResponseDto<String> add(@RequestBody @Valid AdamEntersParam parameter) {
if (1 == parameter.getType()) {
if (!Pattern.matches(LnsRegex.Valid.CHINESE_HANZI, parameter.getName())) {
return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "姓名必须为2～20位汉字");
}
}
List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(CurrentUtil.getCurrentUid()); List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(CurrentUtil.getCurrentUid());
Optional<AdamEntersVo> any = vos.stream().filter(r -> (r.getIdCard().equals(parameter.getIdCard())) && r.getType().equals(parameter.getType())).findAny(); Optional<AdamEntersVo> any = vos.stream().filter(r -> (r.getIdCard().equals(parameter.getIdCard())) && r.getType().equals(parameter.getType())).findAny();
...@@ -93,6 +102,11 @@ public class AdamEntersController { ...@@ -93,6 +102,11 @@ public class AdamEntersController {
@ApiOperation(value = "编辑入场人") @ApiOperation(value = "编辑入场人")
@PostMapping("edit") @PostMapping("edit")
public ResponseDto<Object> edit(@RequestBody @Valid AdamEntersParam parameter) { public ResponseDto<Object> edit(@RequestBody @Valid AdamEntersParam parameter) {
if (1 == parameter.getType()) {
if (!Pattern.matches(LnsRegex.Valid.CHINESE_HANZI, parameter.getName())) {
return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "姓名必须为2～20位汉字");
}
}
if (StringUtils.isBlank(parameter.getEntersId())) { if (StringUtils.isBlank(parameter.getEntersId())) {
return ResponseDto.failure(ErrorMapping.get("10015")); return ResponseDto.failure(ErrorMapping.get("10015"));
} }
......
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