生成时间添加

master
lvxinran 2020-09-04 13:37:14 +08:00
parent 05677941d1
commit c4e6475c56
6 changed files with 33 additions and 6 deletions

View File

@ -131,6 +131,7 @@ public class CdkInfoController {
cdkInfoVo.setPid(sCdkInfo.getPid()); cdkInfoVo.setPid(sCdkInfo.getPid());
cdkInfoVo.setRoleUseNum(sCdkInfo.getRoleUseNum()); cdkInfoVo.setRoleUseNum(sCdkInfo.getRoleUseNum());
cdkInfoVo.setServerId(sCdkInfo.getServerId()); cdkInfoVo.setServerId(sCdkInfo.getServerId());
cdkInfoVo.setBuildTime(sCdkInfo.getBuildTime()==0?"0":JsonUtil.timeStamp2Date(String.valueOf(sCdkInfo.getBuildTime())));
sCdkInfoListVo.add(cdkInfoVo); sCdkInfoListVo.add(cdkInfoVo);
} }
map.put("sCdkInfoList",sCdkInfoListVo); map.put("sCdkInfoList",sCdkInfoListVo);
@ -192,6 +193,7 @@ public class CdkInfoController {
sCdkInfo.setPid(Integer.parseInt(pid)); sCdkInfo.setPid(Integer.parseInt(pid));
sCdkInfo.setRoleUseNum(Integer.parseInt(roleUseNum)); sCdkInfo.setRoleUseNum(Integer.parseInt(roleUseNum));
sCdkInfo.setServerId(Integer.parseInt(serverId)); sCdkInfo.setServerId(Integer.parseInt(serverId));
sCdkInfo.setBuildTime(Calendar.getInstance().getTime().getTime());
cdkInfoDao.addCDKGoodsInfo(sCdkInfo); cdkInfoDao.addCDKGoodsInfo(sCdkInfo);
return "redirect:/toCDKBuild"; return "redirect:/toCDKBuild";
} }

View File

@ -4,6 +4,8 @@ import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.mapping.Document; import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.data.mongodb.core.mapping.Field; import org.springframework.data.mongodb.core.mapping.Field;
import java.util.Date;
@Document(collection = "cdk_add_info") @Document(collection = "cdk_add_info")
public class SCdkInfo { public class SCdkInfo {
@Id @Id
@ -44,7 +46,8 @@ public class SCdkInfo {
@Field(value = "serverId") @Field(value = "serverId")
private int serverId; private int serverId;
@Field(value = "buildTime")
private long buildTime;
public int getId() { public int getId() {
return id; return id;
} }
@ -140,5 +143,13 @@ public class SCdkInfo {
public void setServerId(int serverId) { public void setServerId(int serverId) {
this.serverId = serverId; this.serverId = serverId;
} }
public long getBuildTime() {
return buildTime;
}
public void setBuildTime(long buildTime) {
this.buildTime = buildTime;
}
} }

View File

@ -1,5 +1,7 @@
package com.jmfy.model.vo; package com.jmfy.model.vo;
import java.util.Date;
public class CDKInfoVo { public class CDKInfoVo {
public int id; public int id;
@ -24,6 +26,8 @@ public class CDKInfoVo {
public int serverId; public int serverId;
public String buildTime;
public void setId(int id) { public void setId(int id) {
this.id = id; this.id = id;
} }
@ -71,4 +75,12 @@ public class CDKInfoVo {
public void setServerId(int serverId) { public void setServerId(int serverId) {
this.serverId = serverId; this.serverId = serverId;
} }
public String getBuildTime() {
return buildTime;
}
public void setBuildTime(String buildTime) {
this.buildTime = buildTime;
}
} }

View File

@ -34,7 +34,7 @@
<input type="text" class="input-text" style="width:250px" placeholder="序列号id" id="cdkNum" name="cdkNum"><br><br> <input type="text" class="input-text" style="width:250px" placeholder="序列号id" id="cdkNum" name="cdkNum"><br><br>
<span class="CDKNUM"></span><br> <span class="CDKNUM"></span><br>
<!--<input type="text" class="input-text" style="width:250px" placeholder="生成数量" name="num">--> <!--<input type="text" class="input-text" style="width:250px" placeholder="生成数量" name="num">-->
<button type="submit" class="btn btn-success" ><i class="Hui-iconfont"></i> 序列查询</button> <button type="submit" class="btn btn-success" ><i class="Hui-iconfont"></i> 序列查询</button>
</form> </form>
</div> </div>
</div> </div>

View File

@ -21,7 +21,7 @@
<body> <body>
<nav class="breadcrumb"> <nav class="breadcrumb">
<i class="Hui-iconfont">&#xe67f;</i> 首页 <i class="Hui-iconfont">&#xe67f;</i> 首页
<span class="c-gray en">&gt;</span> 序列管理 <span class="c-gray en">&gt;</span> 序列生成 <span class="c-gray en">&gt;</span> 序列管理 <span class="c-gray en">&gt;</span> 序列生成
<a class="btn btn-success radius r" style="line-height:1.6em;margin-top:3px" href="javascript:location.replace('/toCDKBuild');" title="刷新" > <a class="btn btn-success radius r" style="line-height:1.6em;margin-top:3px" href="javascript:location.replace('/toCDKBuild');" title="刷新" >
<i class="Hui-iconfont">&#xe68f;</i></a></nav> <i class="Hui-iconfont">&#xe68f;</i></a></nav>
<div class="page-container" style="text-align: center"> <div class="page-container" style="text-align: center">
@ -43,6 +43,7 @@
<th width="200">礼包类型</th> <th width="200">礼包类型</th>
<th width="200">被使用数量</th> <th width="200">被使用数量</th>
<th width="200">角色使用数量</th> <th width="200">角色使用数量</th>
<th width="200">生成时间</th>
<th width="200">操作</th> <th width="200">操作</th>
</tr> </tr>
</thead> </thead>
@ -51,7 +52,7 @@
<!--<td><input type="checkbox" value="" name=""/></td>--> <!--<td><input type="checkbox" value="" name=""/></td>-->
<td th:text="${obj.goodsName}" style="text-align: center;"></td> <td th:text="${obj.goodsName}" style="text-align: center;"></td>
<td th:text="${obj.id}" style="text-align: center;"></td> <td th:text="${obj.id}" style="text-align: center;"></td>
<td th:text="${obj.serverId==0?'全服邮件':obj.serverId}" style="text-align: center;"></td> <td th:text="${obj.serverId==0?'全服通用':obj.serverId}" style="text-align: center;"></td>
<td th:text="${obj.pid}" style="text-align: center;"></td> <td th:text="${obj.pid}" style="text-align: center;"></td>
<td th:text="${obj.goodsNum}" style="text-align: center;"></td> <td th:text="${obj.goodsNum}" style="text-align: center;"></td>
<td th:text="${obj.startTime}" style="text-align: center;"></td> <td th:text="${obj.startTime}" style="text-align: center;"></td>
@ -60,6 +61,7 @@
<td th:text="${obj.type}" style="text-align: center;"></td> <td th:text="${obj.type}" style="text-align: center;"></td>
<td th:text="${obj.useNum}" style="text-align: center;"></td> <td th:text="${obj.useNum}" style="text-align: center;"></td>
<td th:text="${obj.roleUseNum}" style="text-align: center;"></td> <td th:text="${obj.roleUseNum}" style="text-align: center;"></td>
<td th:text="${obj.buildTime=='0'?'暂未生成':obj.buildTime}" style="text-align: center;"></td>
<td style="text-align: center; width: 300px"> <td style="text-align: center; width: 300px">
<button type="button" th:id="${obj.id}" class="btn btn-primary" onclick="return cdkAdd(this)"><i class="Hui-iconfont"></i> 序列號生成</button> <button type="button" th:id="${obj.id}" class="btn btn-primary" onclick="return cdkAdd(this)"><i class="Hui-iconfont"></i> 序列號生成</button>
<button type="button" th:id="${obj.id}" class="btn btn-success" onclick="return download(this)"><i class="Hui-iconfont"></i> 序列號导出</button> <button type="button" th:id="${obj.id}" class="btn btn-success" onclick="return download(this)"><i class="Hui-iconfont"></i> 序列號导出</button>

View File

@ -21,8 +21,8 @@
<body> <body>
<nav class="breadcrumb"> <nav class="breadcrumb">
<a href="javascript:;" onclick="history.go(-1)"><i class="Hui-iconfont">&#xe67f;</i> 首页</a> <a href="javascript:;" onclick="history.go(-1)"><i class="Hui-iconfont">&#xe67f;</i> 首页</a>
<span class="c-gray en">&gt;</span> 序列管理 <span class="c-gray en">&gt;</span> 序列管理
<span class="c-gray en">&gt;</span> 序列查询 <span class="c-gray en">&gt;</span> 序列查询
</nav> </nav>
<div class="page-container" style="text-align: center"> <div class="page-container" style="text-align: center">
<h2><span style="color:red;">序列號使用信息</span></h2> <h2><span style="color:red;">序列號使用信息</span></h2>