gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

来函增加函号的校验；

Browse Source 
来函统计修复取消来函的展示bug，修复分页问题。
This commit is contained in:
duandongmei
2019-01-06 12:46:42 +06:00
parent cecc8c90e9
commit 8cd631af13
9 changed files with 106 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
View File

@@ -76,17 +76,45 @@ public class RequestInfoController extends BaseController{
public String saveOrUpdate(RequestInfo requestInfo, HttpServletRequest request, Model model, RedirectAttributes redirectAttributes) { public String saveOrUpdate(RequestInfo requestInfo, HttpServletRequest request, Model model, RedirectAttributes redirectAttributes) {
try { try {
if(requestInfo.getId()!=null){ if(requestInfo.getId()!=null){
// 保存用户信息 RequestInfo requestNumber=new RequestInfo();
logger.info(requestInfo.getId()+"修改成功"); requestNumber.setRequestNumber(requestInfo.getRequestNumber());
requestInfoService.saveOrUpdate(requestInfo); requestNumber.setId(requestInfo.getId());
addMessage(redirectAttributes,"success","save_success"); RequestInfo requestTitle=new RequestInfo();
}else{ requestTitle.setRequestTitle(requestInfo.getRequestTitle());
if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){ requestTitle.setId(requestInfo.getId());
logger.info(requestInfo.getRequestNumber()+"重复数据"); if (!checkRequestInfo(requestNumber)){
logger.info(requestNumber.getRequestNumber()+"重复数据");
Properties props=this.getMsgProp(); Properties props=this.getMsgProp();
addMessage("error",model,props.getProperty("duplicate", "Duplicate")+" "+props.getProperty("title", "Title")); addMessage("error",model,props.getProperty("duplicate", "Duplicate")+" "+props.getProperty("title", "Title"));
return form(requestInfo, model); return form(requestInfo, model);
} }
if (!checkRequestInfo(requestTitle)){
logger.info(requestTitle.getRequestTitle()+"重复数据");
Properties props=this.getMsgProp();
addMessage("error",model,props.getProperty("duplicate", "Duplicate")+" "+props.getProperty("request_number", "Letter Number"));
return form(requestInfo, model);
}
// 保存用户信息
requestInfoService.saveOrUpdate(requestInfo);
logger.info(requestInfo.getId()+"修改成功");
addMessage(redirectAttributes,"success","save_success");
}else{
RequestInfo requestNumber=new RequestInfo();
requestNumber.setRequestNumber(requestInfo.getRequestNumber());
RequestInfo requestTitle=new RequestInfo();
requestTitle.setRequestTitle(requestInfo.getRequestTitle());
if (!checkRequestInfo(requestNumber)){
logger.info(requestNumber.getRequestNumber()+"重复数据");
Properties props=this.getMsgProp();
addMessage("error",model,props.getProperty("duplicate", "Duplicate")+" "+props.getProperty("title", "Title"));
return form(requestInfo, model);
}
if (!checkRequestInfo(requestTitle)){
logger.info(requestTitle.getRequestTitle()+"重复数据");
Properties props=this.getMsgProp();
addMessage("error",model,props.getProperty("duplicate", "Duplicate")+" "+props.getProperty("request_number", "Letter Number"));
return form(requestInfo, model);
}
// 保存用户信息 // 保存用户信息
requestInfoService.saveOrUpdate(requestInfo); requestInfoService.saveOrUpdate(requestInfo);
addMessage(redirectAttributes,"success","save_success"); addMessage(redirectAttributes,"success","save_success");
@@ -105,11 +133,11 @@ public class RequestInfoController extends BaseController{
*/ */
@ResponseBody @ResponseBody
@RequestMapping(value = "checkRequestNumber") @RequestMapping(value = "checkRequestNumber")
public String checkRequestNumber(String requestNumber) { public boolean checkRequestInfo(RequestInfo requestInfo) {
if (requestNumber !=null && requestInfoService.getRequestInfoByRequestNumber(requestNumber) == null) { if (requestInfo !=null && requestInfoService.getRequestInfoByRequest(requestInfo) == null) {
return "true"; return true;
} }
return "false"; return false;
} }
/** /**

39
src/main/java/com/nis/web/controller/configuration/statistics/ConfigureStatisticsController.java
View File

@@ -69,7 +69,7 @@ public class ConfigureStatisticsController extends BaseController{
Page requestPage = requestInfoService.findRequestInfo(new Page(request, response,"r"),requestInfo); Page requestPage = requestInfoService.findRequestInfo(new Page(request, response,"r"),requestInfo);
List<RequestInfo> requestInfos=requestPage.getList(); List<RequestInfo> requestInfos=requestPage.getList();
//4、根据当前页的requestInfo信息查询request统计信息 //4、根据当前页的requestInfo信息查询request统计信息
List<Object[]> requestStatisticList=new ArrayList<Object[]>(); List<Map> requestStatisticList=new ArrayList<Map>();
if(!StringUtil.isEmpty(requestInfos)){ if(!StringUtil.isEmpty(requestInfos)){
Date requestStatisticTime=configureStatisticsService.getRequestStatisticTime(); Date requestStatisticTime=configureStatisticsService.getRequestStatisticTime();
String requestStatisticTimeStr=""; String requestStatisticTimeStr="";
@@ -77,16 +77,28 @@ public class ConfigureStatisticsController extends BaseController{
requestStatisticTimeStr=sdf.format(requestStatisticTime); requestStatisticTimeStr=sdf.format(requestStatisticTime);
} }
requestStatisticList=configureStatisticsService.getRequestStateStatistics(requestInfos,menuList,requestStatisticTimeStr); requestStatisticList=configureStatisticsService.getRequestStateStatistics(requestInfos,menuList,requestStatisticTimeStr);
if(!StringUtil.isEmpty(requestStatisticList)){ if(!StringUtil.isEmpty(requestStatisticList)){
for (Iterator iterator = requestStatisticList.iterator(); iterator.hasNext();) { for (Iterator iterator = requestStatisticList.iterator(); iterator.hasNext();) {
Map map = (Map) iterator.next(); Map map = (Map) iterator.next();
RequestInfo removeRequest=null;
for (RequestInfo requestInfoO : requestInfos) { for (RequestInfo requestInfoO : requestInfos) {
if(requestInfoO.getId().toString().equals(map.get("request").toString())){ if(requestInfoO.getId().toString().equals(map.get("request").toString())){
map.put("request", requestInfoO.getRequestTitle()); map.put("request", requestInfoO.getRequestTitle());
removeRequest=requestInfoO;
} }
} }
if(removeRequest != null){
requestInfos.remove(removeRequest);
}
} }
} }
for (RequestInfo requestInfoA: requestInfos) {
Map map=new HashMap<>();
map.put("request", requestInfoA.getRequestTitle());
requestStatisticList.add(map);
}
model.addAttribute("requestStatisticTime", requestStatisticTimeStr); model.addAttribute("requestStatisticTime", requestStatisticTimeStr);
} }
requestPage.setList(requestStatisticList); requestPage.setList(requestStatisticList);
@@ -157,7 +169,7 @@ public class ConfigureStatisticsController extends BaseController{
Page requestPage = requestInfoService.findRequestInfo(page,requestInfo); Page requestPage = requestInfoService.findRequestInfo(page,requestInfo);
List<RequestInfo> requestInfos=requestPage.getList(); List<RequestInfo> requestInfos=requestPage.getList();
//4、根据当前页的requestInfo信息查询request统计信息 //4、根据当前页的requestInfo信息查询request统计信息
List<Object[]> requestStatisticList=new ArrayList<Object[]>(); List<Map> requestStatisticList=new ArrayList<Map>();
if(!StringUtil.isEmpty(requestInfos)){ if(!StringUtil.isEmpty(requestInfos)){
Date requestStatisticTime=configureStatisticsService.getRequestStatisticTime(); Date requestStatisticTime=configureStatisticsService.getRequestStatisticTime();
String requestStatisticTimeStr=""; String requestStatisticTimeStr="";
@@ -166,14 +178,25 @@ public class ConfigureStatisticsController extends BaseController{
} }
requestStatisticList=configureStatisticsService.getRequestStateStatistics(requestInfos,menuList,requestStatisticTimeStr); requestStatisticList=configureStatisticsService.getRequestStateStatistics(requestInfos,menuList,requestStatisticTimeStr);
if(!StringUtil.isEmpty(requestStatisticList)){ if(!StringUtil.isEmpty(requestStatisticList)){
for (Iterator iterator = requestStatisticList.iterator(); iterator.hasNext();) { for (Iterator iterator = requestStatisticList.iterator(); iterator.hasNext();) {
Map map = (Map) iterator.next(); Map map = (Map) iterator.next();
for (RequestInfo requestInfoO : requestInfos) { RequestInfo removeRequest=null;
if(requestInfoO.getId().toString().equals(map.get("request").toString())){ for (RequestInfo requestInfoO : requestInfos) {
map.put("request", requestInfoO.getRequestTitle()); if(requestInfoO.getId().toString().equals(map.get("request").toString())){
} map.put("request", requestInfoO.getRequestTitle());
removeRequest=requestInfoO;
} }
} }
if(removeRequest != null){
requestInfos.remove(removeRequest);
}
}
}
for (RequestInfo requestInfoA: requestInfos) {
Map map=new HashMap<>();
map.put("request", requestInfoA.getRequestTitle());
requestStatisticList.add(map);
} }
model.addAttribute("requestStatisticTime", requestStatisticTimeStr); model.addAttribute("requestStatisticTime", requestStatisticTimeStr);
} }

2
src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java
View File

@@ -15,7 +15,7 @@ public interface RequestInfoDao extends CrudDao {
List<RequestInfo> findRequestInfo(RequestInfo requestInfo); List<RequestInfo> findRequestInfo(RequestInfo requestInfo);
RequestInfo getRequestInfoByRequestNumber(@Param("requestNumber") String requestNumber); RequestInfo getRequestInfoByRequest(RequestInfo requestInfo);
RequestInfo getRequestInfoById(@Param("id") Long id); RequestInfo getRequestInfoById(@Param("id") Long id);
List<RequestInfo> getRequestInfoByIds(@Param("ids") String ids); List<RequestInfo> getRequestInfoByIds(@Param("ids") String ids);

15
src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
View File

@@ -95,11 +95,22 @@
</select> </select>
<!-- 根据来函号查询 --> <!-- 根据来函号查询 -->
<select id="getRequestInfoByRequestNumber" parameterType="java.lang.String" resultMap="BaseResultMap"> <select id="getRequestInfoByRequest" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from request_info from request_info
where request_number = #{requestNumber,jdbcType=VARCHAR} and is_valid !=-1 <where>
<if test="requestNumber != null and requestNumber != ''">
and request_number = #{requestNumber,jdbcType=VARCHAR}
</if>
<if test="requestTitle != null and requestTitle != ''">
and request_title = #{requestTitle,jdbcType=VARCHAR}
</if>
<if test="id != null">
and id != #{id}
</if>
and is_valid !=-1
</where>
</select> </select>
<!-- 根据来id查询 --> <!-- 根据来id查询 -->
<select id="getRequestInfoById" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="getRequestInfoById" parameterType="java.lang.Long" resultMap="BaseResultMap">

3
src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.java
View File

@@ -3,6 +3,7 @@ package com.nis.web.dao.configuration.statistics;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@@ -19,7 +20,7 @@ public interface ConfigureStatisticsDao {
public List<Object[]> getConfigStateStatistics(@Param("statisticTime")String statisticTime); public List<Object[]> getConfigStateStatistics(@Param("statisticTime")String statisticTime);
public Date getConfigStatisticTime(); public Date getConfigStatisticTime();
public Date getRequestStatisticTime(); public Date getRequestStatisticTime();
public List<Object[]> getRequestStateStatistics(@Param("requestList")List<RequestInfo> requestList,@Param("menuList")List<SysMenu> menuList,@Param("statisticTime")String statisticTime) ; public List<Map> getRequestStateStatistics(@Param("requestList")List<RequestInfo> requestList,@Param("menuList")List<SysMenu> menuList,@Param("statisticTime")String statisticTime) ;
/*public List<Object[]> getRequestStateStatistics(@Param("requestList")List<RequestInfo> requestList,@Param("serviceList")List<FunctionServiceDict> serviceList,@Param("statisticTime")String statisticTime) ;*/ /*public List<Object[]> getRequestStateStatistics(@Param("requestList")List<RequestInfo> requestList,@Param("serviceList")List<FunctionServiceDict> serviceList,@Param("statisticTime")String statisticTime) ;*/
public Integer getEffectiveCfgNum(@Param("serviceId")Integer serviceId); public Integer getEffectiveCfgNum(@Param("serviceId")Integer serviceId);
} }

10
src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.xml
View File

@@ -33,7 +33,15 @@
sum(case when c.function_id =${menu.functionId} then 1 else 0 end) as '${menu.functionId}_${menu.functionId}' sum(case when c.function_id =${menu.functionId} then 1 else 0 end) as '${menu.functionId}_${menu.functionId}'
</foreach> </foreach>
from request_num_statistics c from request_num_statistics c
where statistic_time =#{statisticTime} <where>
and statistic_time =#{statisticTime}
<if test="requestList != null">
and request_id in
<foreach collection="requestList" index="index" item="requestInfo" open="(" separator="," close=")">
#{requestInfo.id}
</foreach>
</if>
</where>
group by request_id group by request_id
</select> </select>
<!-- 来函业务配置数统计 20181126废弃 <!-- 来函业务配置数统计 20181126废弃

4
src/main/java/com/nis/web/service/configuration/RequestInfoService.java
View File

@@ -55,9 +55,9 @@ public class RequestInfoService extends BaseService{
} }
public RequestInfo getRequestInfoByRequestNumber(String requestNumber) { public RequestInfo getRequestInfoByRequest(RequestInfo req) {
return requestInfoDao.getRequestInfoByRequestNumber(requestNumber); return requestInfoDao.getRequestInfoByRequest(req);
} }
public RequestInfo getRequestInfoById(Long id) { public RequestInfo getRequestInfoById(Long id) {

5
src/main/java/com/nis/web/service/configuration/statistics/ConfigureStatisticsService.java
View File

@@ -2,6 +2,7 @@ package com.nis.web.service.configuration.statistics;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -38,8 +39,8 @@ public class ConfigureStatisticsService extends CrudService<NumCfgDao,NumBoundar
Date statisticTime=configureStatisticsDao.getRequestStatisticTime(); Date statisticTime=configureStatisticsDao.getRequestStatisticTime();
return statisticTime; return statisticTime;
} }
public List<Object[]> getRequestStateStatistics(List<RequestInfo> requestList,List<SysMenu> menuList,String statistcTime){ public List<Map> getRequestStateStatistics(List<RequestInfo> requestList,List<SysMenu> menuList,String statistcTime){
List<Object[]> dataList=configureStatisticsDao.getRequestStateStatistics(requestList,menuList,statistcTime); List<Map> dataList=configureStatisticsDao.getRequestStateStatistics(requestList,menuList,statistcTime);
return dataList; return dataList;
} }
/* public List<Object[]> getRequestStateStatistics(List<RequestInfo> requestList,List<FunctionServiceDict> serviceList,String statistcTime){ /* public List<Object[]> getRequestStateStatistics(List<RequestInfo> requestList,List<FunctionServiceDict> serviceList,String statistcTime){

7
src/main/webapp/WEB-INF/views/index.jsp
View File

@@ -378,7 +378,12 @@
<c:forEach items="${fns:getMenuCfgList() }" var="functionDict" varStatus="status" step="1"> <c:forEach items="${fns:getMenuCfgList() }" var="functionDict" varStatus="status" step="1">
<td> <td>
<c:set var="functionId" value="${functionDict.functionId}_${functionDict.functionId}"></c:set> <c:set var="functionId" value="${functionDict.functionId}_${functionDict.functionId}"></c:set>
${requestStatistics[functionId]} <c:if test="${empty requestStatistics[functionId]}">
0
</c:if>
<c:if test="${!empty requestStatistics[functionId]}">
${requestStatistics[functionId]}
</c:if>
</<td> </<td>
</c:forEach> </c:forEach>