Skip to content

X
xzxt-control
Commit 416050d0 by wangling
Options

20190929---wangling---添加数据验证失败统计菜单及对应功能

parent a2880f62
Showing with 72 additions and 10 deletions
pom.xml
...@@ -147,6 +147,11 @@ ...@@ -147,6 +147,11 @@
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
src/main/java/com/cc/bean/Sjsblog.java
...@@ -37,6 +37,8 @@ public class Sjsblog extends BaseModel { ...@@ -37,6 +37,8 @@ public class Sjsblog extends BaseModel {
//比对状态 //比对状态
private String bdzt = null; private String bdzt = null;
private String rn = null; private String rn = null;
//验证失败数据
private String yzsbdata = null;
public String getXxzjbh() { public String getXxzjbh() {
return xxzjbh; return xxzjbh;
...@@ -141,4 +143,10 @@ public class Sjsblog extends BaseModel { ...@@ -141,4 +143,10 @@ public class Sjsblog extends BaseModel {
public void setFhsjEnd(String fhsjEnd) { public void setFhsjEnd(String fhsjEnd) {
this.fhsjEnd = fhsjEnd; this.fhsjEnd = fhsjEnd;
} }
public String getYzsbdata() {
return yzsbdata;
}
public void setYzsbdata(String yzsbdata) {
this.yzsbdata = yzsbdata;
}
} }
src/main/java/com/cc/config/MyMvcConfig.java
...@@ -28,5 +28,6 @@ public class MyMvcConfig extends WebMvcConfigurerAdapter { ...@@ -28,5 +28,6 @@ public class MyMvcConfig extends WebMvcConfigurerAdapter {
registry.addViewController("/sjsbtj").setViewName("sjsblog/sjsbtj"); registry.addViewController("/sjsbtj").setViewName("sjsblog/sjsbtj");
registry.addViewController("/sjsbyztj").setViewName("sjsblog/sjsbyztj"); registry.addViewController("/sjsbyztj").setViewName("sjsblog/sjsbyztj");
registry.addViewController("/bssjbd").setViewName("sjsblog/bssjbd"); registry.addViewController("/bssjbd").setViewName("sjsblog/bssjbd");
registry.addViewController("/sjyzsbtj").setViewName("sjsblog/sjyzsbtj");
} }
} }
src/main/resources/application-pro.yml
...@@ -52,3 +52,10 @@ ThreadPool: ...@@ -52,3 +52,10 @@ ThreadPool:
#任务队列容量（阻塞队列） #任务队列容量（阻塞队列）
queueCapacity: 10 queueCapacity: 10
fmqjdbc:
driverClassName: oracle.jdbc.driver.OracleDriver
url: jdbc:oracle:thin:@127.0.0.1:1521:XZXT
username: FMQ
password: FMQ
src/main/resources/application.properties
...@@ -20,6 +20,8 @@ spring.profiles.active=dev ...@@ -20,6 +20,8 @@ spring.profiles.active=dev
# \u5728\u5F53\u524D\u78C1\u76D8\u7684\u6839\u8DEF\u5F84\u4E0B\u521B\u5EFAspring\u6587\u4EF6\u5939\u548C\u91CC\u9762\u7684log\u6587\u4EF6\u5939\uFF1B\u4F7F\u7528?spring.log \u4F5C\u4E3A\u9ED8\u8BA4\u6587\u4EF6 # \u5728\u5F53\u524D\u78C1\u76D8\u7684\u6839\u8DEF\u5F84\u4E0B\u521B\u5EFAspring\u6587\u4EF6\u5939\u548C\u91CC\u9762\u7684log\u6587\u4EF6\u5939\uFF1B\u4F7F\u7528?spring.log \u4F5C\u4E3A\u9ED8\u8BA4\u6587\u4EF6
logging.path=/spring/log. logging.path=/spring/log.
# \u5728\u63A7\u5236\u53F0\u8F93\u51FA\u7684\u65E5\u5FD7\u7684\u683C\u5F0F # \u5728\u63A7\u5236\u53F0\u8F93\u51FA\u7684\u65E5\u5FD7\u7684\u683C\u5F0F
logging.pattern.console=%d{yyyy-MM-dd} ===application===[%thread] %-5level %logger{50} - %msg%n logging.pattern.console=%d{yyyy-MM-dd} ===application===[%thread] %-5level %logger{50} -
# \u6307\u5B9A\u6587\u4EF6\u4E2D\u65E5\u5FD7\u8F93\u51FA\u7684\u683C\u5F0F # \u6307\u5B9A\u6587\u4EF6\u4E2D\u65E5\u5FD7\u8F93\u51FA\u7684\u683C\u5F0F
logging.pattern.file=%d{yyyy-MM-dd} ===>===application=== [%thread] === %-5level === %logger{50} ==== %msg%n logging.pattern.file=%d{yyyy-MM-dd} ===>===application=== [%thread] === %-5level%msg%n === %logger{50} ==== %msg%n
\ No newline at end of file spring.thymeleaf.cache=true
spring.devtools.restart.enabled=true
\ No newline at end of file
src/main/resources/mybatis/mapper/xzxt/SjjhtjMapper.xml
...@@ -28,7 +28,19 @@ ...@@ -28,7 +28,19 @@
<if test="ywxxdm!=null and ywxxdm!=''"> and ywxxdm = #{ywxxdm, jdbcType=VARCHAR}</if> <if test="ywxxdm!=null and ywxxdm!=''"> and ywxxdm = #{ywxxdm, jdbcType=VARCHAR}</if>
<if test="tblname!=null and tblname!=''"> and tblname = #{tblname, jdbcType=VARCHAR}</if> <if test="tblname!=null and tblname!=''"> and tblname = #{tblname, jdbcType=VARCHAR}</if>
<if test="keyvalue!=null and keyvalue!=''"> and keyvalue = #{keyvalue, jdbcType=VARCHAR}</if> <if test="keyvalue!=null and keyvalue!=''"> and keyvalue = #{keyvalue, jdbcType=VARCHAR}</if>
<if test="fwzt!=null and fwzt!=''"> and fwzt = #{fwzt, jdbcType=VARCHAR}</if> <if test='yzsbdata=="no"'>
<if test="fwzt!=null and fwzt!=''">
<if test='fwzt=="3"'>
and fwzt in ('10201','10301','10302','10303','10304','10305','10306','10307','10308','19999')
</if>
<if test='fwzt!="3"'>
and fwzt = #{fwzt, jdbcType=VARCHAR}
</if>
</if>
</if>
<if test='yzsbdata=="yes"'>
and fwzt = '1'
</if>
<if test="bdzt!=null and bdzt!=''"> and bdzt = #{bdzt, jdbcType=VARCHAR}</if> <if test="bdzt!=null and bdzt!=''"> and bdzt = #{bdzt, jdbcType=VARCHAR}</if>
<if test="sbztdesc!=null and sbztdesc!=''"> and sbztdesc = #{sbztdesc, jdbcType=VARCHAR}</if> <if test="sbztdesc!=null and sbztdesc!=''"> and sbztdesc = #{sbztdesc, jdbcType=VARCHAR}</if>
<if test="fhsjStart!=null and fhsjStart!=''"> and fhsj <![CDATA[>=]]>(to_date(#{fhsjStart, jdbcType=VARCHAR},'yyyy-MM-dd'))</if> <if test="fhsjStart!=null and fhsjStart!=''"> and fhsj <![CDATA[>=]]>(to_date(#{fhsjStart, jdbcType=VARCHAR},'yyyy-MM-dd'))</if>
...@@ -49,7 +61,19 @@ ...@@ -49,7 +61,19 @@
<if test="ywxxdm!=null and ywxxdm!=''"> and ywxxdm = #{ywxxdm, jdbcType=VARCHAR}</if> <if test="ywxxdm!=null and ywxxdm!=''"> and ywxxdm = #{ywxxdm, jdbcType=VARCHAR}</if>
<if test="tblname!=null and tblname!=''"> and tblname = #{tblname, jdbcType=VARCHAR}</if> <if test="tblname!=null and tblname!=''"> and tblname = #{tblname, jdbcType=VARCHAR}</if>
<if test="keyvalue!=null and keyvalue!=''"> and keyvalue = #{keyvalue, jdbcType=VARCHAR}</if> <if test="keyvalue!=null and keyvalue!=''"> and keyvalue = #{keyvalue, jdbcType=VARCHAR}</if>
<if test="fwzt!=null and fwzt!=''"> and fwzt = #{fwzt, jdbcType=VARCHAR}</if> <if test='yzsbdata=="no"'>
<if test="fwzt!=null and fwzt!=''">
<if test='fwzt=="3"'>
and fwzt in ('10201','10301','10302','10303','10304','10305','10306','10307','10308','19999')
</if>
<if test='fwzt!="3"'>
and fwzt = #{fwzt, jdbcType=VARCHAR}
</if>
</if>
</if>
<if test='yzsbdata=="yes"'>
and fwzt = '1'
</if>
<if test="bdzt!=null and bdzt!=''"> and bdzt = #{bdzt, jdbcType=VARCHAR}</if> <if test="bdzt!=null and bdzt!=''"> and bdzt = #{bdzt, jdbcType=VARCHAR}</if>
<if test="sbztdesc!=null and sbztdesc!=''"> and sbztdesc = #{sbztdesc, jdbcType=VARCHAR}</if> <if test="sbztdesc!=null and sbztdesc!=''"> and sbztdesc = #{sbztdesc, jdbcType=VARCHAR}</if>
<if test="fhsjStart!=null and fhsjStart!=''"> and fhsj <![CDATA[>=]]>(to_date(#{fhsjStart, jdbcType=VARCHAR},'yyyy-MM-dd'))</if> <if test="fhsjStart!=null and fhsjStart!=''"> and fhsj <![CDATA[>=]]>(to_date(#{fhsjStart, jdbcType=VARCHAR},'yyyy-MM-dd'))</if>
...@@ -72,7 +96,7 @@ ...@@ -72,7 +96,7 @@
</update> </update>
<!-- 根据信息主键编号查询数据上报详情 --> <!-- 根据信息主键编号查询数据上报详情 -->
<select id="querySjsbxq" parameterType="com.cc.bean.Sjsblog" resultType="com.cc.bean.Sjsblog"> <select id="querySjsbxq" parameterType="com.cc.bean.Sjsblog" resultType="com.cc.bean.Sjsblog">
select (CASE WHEN fwzt=0 THEN '正在上报' WHEN fwzt=1 THEN '验证不通过' WHEN fwzt=2 THEN '未上报' WHEN fwzt=19999 THEN '上报失败' WHEN fwzt=10201 THEN '文档不合法' WHEN fwzt=10101 THEN '上报成功' END )as fwzt, select (CASE WHEN fwzt=0 THEN '正在上报' WHEN fwzt=1 THEN '验证不通过' WHEN fwzt=2 THEN '未上报' WHEN fwzt=19999 THEN '其他错误' WHEN fwzt=10201 THEN '文档不合法' WHEN fwzt=10301 THEN '业务信息代码错误' WHEN fwzt=10302 THEN '业务验证错误' WHEN fwzt=10303 THEN '数据验证错误' WHEN fwzt=10304 THEN '数据量超限' WHEN fwzt=10305 THEN '数据包编号重复' WHEN fwzt=10306 THEN '用户信息验证错误' WHEN fwzt=10307 THEN '参数验证错误' WHEN fwzt=10308 THEN '数据交换无法操作业务联动已经更新数据' WHEN fwzt=10101 THEN '上报成功' END )as fwzt,
(CASE WHEN scbz=0 THEN '未删除' WHEN scbz=1 THEN '已删除' END )as scbz, (CASE WHEN scbz=0 THEN '未删除' WHEN scbz=1 THEN '已删除' END )as scbz,
(CASE WHEN bdzt=0 THEN '通过' WHEN bdzt=1 THEN '不通过' END )as bdzt, (CASE WHEN bdzt=0 THEN '通过' WHEN bdzt=1 THEN '不通过' END )as bdzt,
xxzjbh,sjbbh,ywxxdm,tblname,keyvalue,sbztdesc,lrsj,gxsj,fhsj xxzjbh,sjbbh,ywxxdm,tblname,keyvalue,sbztdesc,lrsj,gxsj,fhsj
......
src/main/webapp/WEB-INF/common/index.jsp
...@@ -176,6 +176,12 @@ ...@@ -176,6 +176,12 @@
部省数据比对 部省数据比对
</a> </a>
</li> </li>
<li>
<a href="sjyzsbtj">
<i class="iconfont">&#xe6a7;</i>
验证失败数据
</a>
</li>
</ul> </ul>
</li> </li>
</ul> </ul>
......
src/main/webapp/WEB-INF/view/sjsblog/index.jsp
...@@ -32,6 +32,9 @@ ...@@ -32,6 +32,9 @@
<li class="left-list-ttitle" id="B050103"> <li class="left-list-ttitle" id="B050103">
<a href="javascript:void(0)" class="menu" target="mainFrame">部省数据比对</a> <a href="javascript:void(0)" class="menu" target="mainFrame">部省数据比对</a>
</li> </li>
<li class="left-list-ttitle" id="B050104">
<a href="javascript:void(0)" class="menu" target="mainFrame">验证失败数据</a>
</li>
</ul> </ul>
</li> </li>
</ul> </ul>
...@@ -49,6 +52,10 @@ ...@@ -49,6 +52,10 @@
<iframe name="myiframe" id="myrame" src="${pageContext.request.contextPath}/sjsblog/bssjbd.jsp" frameborder="0" align="left" width="100%" height="100%" scrolling="yes"> <iframe name="myiframe" id="myrame" src="${pageContext.request.contextPath}/sjsblog/bssjbd.jsp" frameborder="0" align="left" width="100%" height="100%" scrolling="yes">
</iframe> </iframe>
</div> </div>
<div class="module-content" style="display:none;">
<iframe name="myiframe" id="myrame" src="${pageContext.request.contextPath}/sjsblog/sjyzsbtj.jsp" frameborder="0" align="left" width="100%" height="100%" scrolling="yes">
</iframe>
</div>
</article> </article>
<script type="text/javascript" src="${pageContext.request.contextPath}/sjsblog/js/jquery.min.js"></script> <script type="text/javascript" src="${pageContext.request.contextPath}/sjsblog/js/jquery.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
......
src/main/webapp/WEB-INF/view/sjsblog/sjsbtj.jsp
...@@ -90,11 +90,11 @@ ...@@ -90,11 +90,11 @@
<td width="20%"> <td width="20%">
<select class="select-td" name="fwzt" id="fwzt"> <select class="select-td" name="fwzt" id="fwzt">
<option value="" selected = "selected">------请选择------</option> <option value="" selected = "selected">------请选择------</option>
<option value="2">未上报</option>
<option value="1">验证不通过</option>
<option value="0">正在上报</option> <option value="0">正在上报</option>
<option value="10101">上报成功</option> <option value="10101">上报成功</option>
<option value="19999">上报失败</option> <option value="3">上报失败</option>
<option value="1">验证不通过</option>
<option value="2">未上报</option>
</select> </select>
</td> </td>
</tr> </tr>
...@@ -148,6 +148,7 @@ ...@@ -148,6 +148,7 @@
<td colspan="4" style="text-align:center;"> <td colspan="4" style="text-align:center;">
<a class="btn_a btn_search" onclick="getSbsjcwList()">查询</a> <a class="btn_a btn_search" onclick="getSbsjcwList()">查询</a>
<a class="btn_a btn_empty" onclick="doClear()" style="margin-left: 9px;">清空</a> <a class="btn_a btn_empty" onclick="doClear()" style="margin-left: 9px;">清空</a>
<input type="hidden" id="yzsbdata" name="yzsbdata" value="no"/>
</td> </td>
<td colspan="2" ><a class='btn_a btn_search' onclick='shangbao()'>上报</a></td> <td colspan="2" ><a class='btn_a btn_search' onclick='shangbao()'>上报</a></td>
</tr> </tr>
...@@ -226,6 +227,7 @@ ...@@ -226,6 +227,7 @@
data["gxsjEnd"] = $("#gxsjEnd").val(); data["gxsjEnd"] = $("#gxsjEnd").val();
data["fhsjStart"] = $("#fhsjStart").val(); data["fhsjStart"] = $("#fhsjStart").val();
data["fhsjEnd"] = $("#fhsjEnd").val(); data["fhsjEnd"] = $("#fhsjEnd").val();
data["yzsbdata"] = $("#yzsbdata").val();
var tabelDataServer = getTableDataServer(tableid,url,queryColumns,data); var tabelDataServer = getTableDataServer(tableid,url,queryColumns,data);
} }
...@@ -247,7 +249,7 @@ ...@@ -247,7 +249,7 @@
return "未上报"; return "未上报";
}else if(str=="10101"){ }else if(str=="10101"){
return "上报成功"; return "上报成功";
}else if(str=="19999"){ }else if(str=="19999"||str=="10201"||str=="10301"||str=="10302"||str=="10303"||str=="10304"||str=="10305"||str=="10306"||str=="10307"||str=="10308"){
return "上报失败"; return "上报失败";
}else{ }else{
return str; return str;
......
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