datetime-local类型无法输出00秒,故弃用

master
duhui 2023-02-13 17:58:07 +08:00
parent 4d57b0fa7c
commit ac9f8bfd17
8 changed files with 20 additions and 25 deletions

View File

@ -5,10 +5,10 @@ import com.alibaba.fastjson.JSONObject;
import com.jmfy.WebSecurityConfig; import com.jmfy.WebSecurityConfig;
import com.jmfy.dao.*; import com.jmfy.dao.*;
import com.jmfy.model.*; import com.jmfy.model.*;
import com.jmfy.model.config.SRechargeCommodityConfig;
import com.jmfy.model.vo.OrderExcelVo; import com.jmfy.model.vo.OrderExcelVo;
import com.jmfy.redisProperties.RedisUserKey; import com.jmfy.redisProperties.RedisUserKey;
import com.jmfy.utils.*; import com.jmfy.utils.*;
import config.SRechargeCommodityConfig;
import org.apache.poi.hssf.usermodel.*; import org.apache.poi.hssf.usermodel.*;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -174,18 +174,13 @@ public class OrderInfoController {
/** /**
* *
* @param startTime
* @param endTime
* @param userId
* @param packId
* @param serverId
* @return * @return
* @throws Exception * @throws Exception
*/ */
private List<Corder> findOrders(HashMap<String, String> parameterMap) throws Exception { private List<Corder> findOrders(HashMap<String, String> parameterMap) throws Exception {
// 参数 // 参数
long startTime = DateUtil.timeToStamp2(parameterMap.get("startTime").replace("T"," ")); long startTime = DateUtil.timeToStamp2(parameterMap.get("startTime"));
long endTime = DateUtil.timeToStamp2(parameterMap.get("endTime").replace("T"," ")); long endTime = DateUtil.timeToStamp2(parameterMap.get("endTime"));
String serverId = parameterMap.get("serverId"); String serverId = parameterMap.get("serverId");
String userId = parameterMap.get("userId"); String userId = parameterMap.get("userId");
String packId = parameterMap.get("packId"); String packId = parameterMap.get("packId");

View File

@ -3,10 +3,10 @@ package com.jmfy.controller;
import com.jmfy.WebSecurityConfig; import com.jmfy.WebSecurityConfig;
import com.jmfy.dao.*; import com.jmfy.dao.*;
import com.jmfy.model.*; import com.jmfy.model.*;
import com.jmfy.model.config.SRechargeCommodityConfig;
import com.jmfy.model.vo.PowersEnum; import com.jmfy.model.vo.PowersEnum;
import com.jmfy.redisProperties.RedisUserKey; import com.jmfy.redisProperties.RedisUserKey;
import com.jmfy.utils.*; import com.jmfy.utils.*;
import config.SRechargeCommodityConfig;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;

View File

@ -1,4 +1,4 @@
package config; package com.jmfy.model.config;
import com.jmfy.utils.FileCacheUtils; import com.jmfy.utils.FileCacheUtils;
import com.jmfy.utils.JsonUtil; import com.jmfy.utils.JsonUtil;

View File

@ -1,10 +1,11 @@
package com.jmfy.utils; package com.jmfy.utils;
import config.SItemConfig; import config.SItemConfig;
import config.SRechargeCommodityConfig;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.jmfy.model.config.SRechargeCommodityConfig;
import java.io.*; import java.io.*;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.*; import java.util.*;

View File

@ -1,7 +1,8 @@
package com.jmfy.utils; package com.jmfy.utils;
import com.google.gson.Gson; import com.google.gson.Gson;
import config.SRechargeCommodityConfig; import com.jmfy.model.config.SRechargeCommodityConfig;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

View File

@ -66,12 +66,12 @@
<td th:text="${obj.getTypeDescription()}" style="text-align: center;"></td> <td th:text="${obj.getTypeDescription()}" style="text-align: center;"></td>
<td th:text="${obj.getServerNames()}" style="text-align: center;"></td> <td th:text="${obj.getServerNames()}" style="text-align: center;"></td>
<td style="text-align: center;"> <td style="text-align: center;">
<button type="button" th:id="${obj.getId()}" class="btn btn-success radius" onclick="return jumpActivityMissionInfo(this)">
档位
</button>
<button type="button" th:id="${obj.getId()}" class="btn btn-primary radius" onclick="return jumpUpdateActivity(this)"> <button type="button" th:id="${obj.getId()}" class="btn btn-primary radius" onclick="return jumpUpdateActivity(this)">
修改 修改
</button> </button>
<button type="button" th:id="${obj.getId()}" class="btn btn-success radius" onclick="return jumpActivityMissionInfo(this)">
档位
</button>
<button type="button" th:id="${obj.getId()}" th:name="${obj.getName()}" class="btn btn-danger radius" onclick="return deleteActivity(this)"> <button type="button" th:id="${obj.getId()}" th:name="${obj.getName()}" class="btn btn-danger radius" onclick="return deleteActivity(this)">
删除 删除
</button> </button>

View File

@ -48,7 +48,7 @@
<span class="c-red">*</span> <span class="c-red">*</span>
开始时间:</label> 开始时间:</label>
<div class="formControls col-xs-8 col-sm-9"> <div class="formControls col-xs-8 col-sm-9">
<input type="datetime-local" name="startTime" class="input-text" style="width: 210px" step="1"> <input type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" id="startTime" class="input-text Wdate" style="width:180px;" name="startTime">
</div> </div>
</div> </div>
<div class="row cl"> <div class="row cl">
@ -56,7 +56,7 @@
<span class="c-red">*</span> <span class="c-red">*</span>
结束时间:</label> 结束时间:</label>
<div class="formControls col-xs-8 col-sm-9"> <div class="formControls col-xs-8 col-sm-9">
<input type="datetime-local" name="endTime" class="input-text" style="width: 210px" step="1"> <input type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" id="endTime" class="input-text Wdate" style="width:180px;" name="endTime">
</div> </div>
</div> </div>
<div class="row cl"> <div class="row cl">

View File

@ -78,8 +78,8 @@
<input type="radio" th:id="always" name="effectTime" th:value="always"> <span>常驻</span> <input type="radio" th:id="always" name="effectTime" th:value="always"> <span>常驻</span>
<input type="radio" style="margin-left: 30px;" th:id="custom" name="effectTime" th:value="custom"> <span>自定义</span> <input type="radio" style="margin-left: 30px;" th:id="custom" name="effectTime" th:value="custom"> <span>自定义</span>
<div th:id="times" style="display: none;margin-top: 10px;"> <div th:id="times" style="display: none;margin-top: 10px;">
<input type="datetime-local" th:id="startTime" class="input-text" style="width: 210px" step="1"> <input type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" id="startTime" class="input-text Wdate" style="width:180px;" name="startTime">
<input type="datetime-local" th:id="endTime" class="input-text" style="width: 210px;margin-left: 10px;" step="1"> <input type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" id="endTime" class="input-text Wdate" style="width:180px;" name="endTime">
</div> </div>
</div> </div>
</div> </div>
@ -256,8 +256,6 @@
if (activity == null){ if (activity == null){
getFormat(); getFormat();
document.getElementById("always").checked = true; document.getElementById("always").checked = true;
document.getElementById("startTime").value = format;//赋初始值
document.getElementById("endTime").value = format;//赋初始值
}else { }else {
// 时间 // 时间
var timeType = activity.timeType; var timeType = activity.timeType;
@ -266,8 +264,8 @@
}else { }else {
document.getElementById("custom").checked = true; document.getElementById("custom").checked = true;
$("#times").css("display","block"); $("#times").css("display","block");
document.getElementById("startTime").value = activity.startTime.replace(" ","T");//赋初始值 document.getElementById("startTime").value = activity.startTime;//赋初始值
document.getElementById("endTime").value = activity.endTime.replace(" ","T");//赋初始值 document.getElementById("endTime").value = activity.endTime;//赋初始值
} }
// 类型 // 类型
typeInfos.update({ disabled: true }); typeInfos.update({ disabled: true });
@ -310,8 +308,8 @@
let startTime = "2000-01-01 00:00:00", endTime = "3000-01-01 00:00:00"; let startTime = "2000-01-01 00:00:00", endTime = "3000-01-01 00:00:00";
let effectTime = $("input[name='effectTime']:checked").val(); let effectTime = $("input[name='effectTime']:checked").val();
if (effectTime === "custom") { if (effectTime === "custom") {
startTime = document.getElementById("startTime").value.replace("T"," "); startTime = document.getElementById("startTime").value;
endTime = document.getElementById("endTime").value.replace("T"," "); endTime = document.getElementById("endTime").value;
} }
let DateStart = new Date(startTime); let DateStart = new Date(startTime);