master
gaojie 2019-04-28 14:15:47 +08:00
parent f82507eda2
commit f535a1ab85
2 changed files with 42 additions and 0 deletions

View File

@ -48,9 +48,13 @@ public class NoticeController {
String skipUrl = parameterMap.get("skipUrl");
String noticeTitle = parameterMap.get("noticeTitle");
String noticeContent = parameterMap.get("noticeContent");
int gameLabel = Integer.parseInt(parameterMap.get("gameLabel"));
int popCycle = Integer.parseInt(parameterMap.get("popCycle"));
String priorityLevel = parameterMap.get("priorityLevel");
// String startTime = JsonUtil.date2TimeStamp(parameterMap.get("startTime").replace("T00:00", " 00:00:00"));
// String endTime = JsonUtil.date2TimeStamp(parameterMap.get("endTime").replace("T00:00", " 00:00:00"));
String displayStartTime = JsonUtil.date2TimeStamp(parameterMap.get("displayStartTime"));
String displayEndTime = JsonUtil.date2TimeStamp(parameterMap.get("displayEndTime"));
String startTime = JsonUtil.date2TimeStamp(parameterMap.get("startTime"));
String endTime = JsonUtil.date2TimeStamp(parameterMap.get("endTime"));
String version = parameterMap.get("version");
@ -69,9 +73,13 @@ public class NoticeController {
cNotice.setNoticeCountent(noticeContent);
cNotice.setPriorityLv(Integer.parseInt(priorityLevel));
cNotice.setStartTime(Integer.parseInt(startTime));
cNotice.setGameLabel(gameLabel);
cNotice.setPopCycle(popCycle);
cNotice.setEndTime(Integer.parseInt(endTime));
cNotice.setVersion(version);
cNotice.setIsRed(Integer.parseInt(isRed));
cNotice.setDisplayStartTime(Integer.parseInt(displayStartTime));
cNotice.setDisplayEndTime(Integer.parseInt(displayEndTime));
return cNotice;
}

View File

@ -156,6 +156,7 @@
开始时间:</label>
<div class="formControls col-xs-8 col-sm-9">
<input type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',minDate:'#F{$dp.$D(\'datemin\')}' })" id="datemin" class="input-text Wdate" style="width:180px;" name="startTime">
<span class="STARTTIME"></span>
</div>
</div>
<div class="row cl">
@ -164,6 +165,25 @@
结束时间:</label>
<div class="formControls col-xs-8 col-sm-9">
<input type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',minDate:'#F{$dp.$D(\'datemin\')}' })" id="datemax" class="input-text Wdate" style="width:180px;" name="endTime">
<span class="ENDTIME"></span>
</div>
</div>
<div class="row cl">
<label class="form-label col-xs-4 col-sm-2">
<span class="c-red">*</span>
显示开始时间:</label>
<div class="formControls col-xs-8 col-sm-9">
<input type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',minDate:'#F{$dp.$D(\'datemin\')}' })" id="dis_start_time" class="input-text Wdate" style="width:180px;" name="displayStartTime">
<span class="DISPLAYSTARTTIME"></span>
</div>
</div>
<div class="row cl">
<label class="form-label col-xs-4 col-sm-2">
<span class="c-red">*</span>
显示结束时间:</label>
<div class="formControls col-xs-8 col-sm-9">
<input type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',minDate:'#F{$dp.$D(\'datemin\')}' })" id="dis_end_time" class="input-text Wdate" style="width:180px;" name="displayEndTime">
<span class="DISPLAYENDTIME"></span>
</div>
</div>
<div class="row cl">
@ -248,6 +268,8 @@ function sendNoticeCheck() {
var priorityLevel = $("input[name='priorityLevel']").val();
var startTime = $("input[name='startTime']").val();
var endTime = $("input[name='endTime']").val();
var displayStartTime = $("input[name='displayStartTime']").val();
var displayEndTime = $("input[name='displayEndTime']").val();
var version = $("input[name='version']").val();
var isSkip = document.getElementById("isSkip").value;
if (serverId === '' || serverId == null) {
@ -284,6 +306,16 @@ function sendNoticeCheck() {
erroCode.html('<span style="color: red; ">结束时间不能为空!</span>');
return false;
}
if (displayStartTime === '' || displayStartTime == null) {
erroCode = $('.DISPLAYSTARTTIME');
erroCode.html('<span style="color: red; ">显示开始时间不能为空!</span>');
return false;
}
if (displayEndTime === '' || displayEndTime == null) {
erroCode = $('.DISPLAYENDTIME');
erroCode.html('<span style="color: red; ">显示结束时间不能为空!</span>');
return false;
}
if (version === '' || version == null) {
erroCode = $('.VERSION');
erroCode.html('<span style="color: red; ">版本号不能为空!</span>');
@ -306,6 +338,8 @@ function sendNoticeCheck() {
"priorityLevel": priorityLevel,
"startTime": startTime,
"endTime": endTime,
"displayStartTime":displayStartTime,
"displayEndTime":displayEndTime,
"version": version
},
url: "/sendNotice",