Commit a04cd565 by Jiang

创建异常日志类,并添加相应的dao、service

层,在SysWhglController中querySjjkList修改为多条件查询日志
parent c61f566b
......@@ -70,6 +70,12 @@
<thymeleaf-layout-dialect.version>2.2.2</thymeleaf-layout-dialect.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
......@@ -83,7 +89,6 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
......
package com.founder;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.MultipartConfigFactory;
import org.springframework.cache.annotation.EnableCaching;
......@@ -33,7 +34,7 @@ public class XtbaBootApplication {
//单个文件最大
factory.setMaxFileSize("215040MB"); //210MB
/// 设置总上传数据总大小
factory.setMaxRequestSize("256000MB");//250MB
factory.setMaxRequestSize("256000MB");//250 MB
return factory.createMultipartConfig();
}
}
......@@ -67,6 +67,26 @@ public class SysWhgl implements Serializable {
*/
private String modifiedTime;
@Override
public String toString() {
return "SysWhgl{" +
"whbh='" + whbh + '\'' +
", bxdw='" + bxdw + '\'' +
", bxr='" + bxr + '\'' +
", bxsj='" + bxsj + '\'' +
", gzxx='" + gzxx + '\'' +
", gzlx='" + gzlx + '\'' +
", bxrlxdh='" + bxrlxdh + '\'' +
", clzt='" + clzt + '\'' +
", jjsj='" + jjsj + '\'' +
", scbz='" + scbz + '\'' +
", createUser='" + createUser + '\'' +
", createTime='" + createTime + '\'' +
", modifiedUser='" + modifiedUser + '\'' +
", modifiedTime='" + modifiedTime + '\'' +
'}';
}
public static long getSerialVersionUID() {
return serialVersionUID;
}
......@@ -182,4 +202,6 @@ public class SysWhgl implements Serializable {
public void setModifiedTime(String modifiedTime) {
this.modifiedTime = modifiedTime;
}
}
......@@ -3,6 +3,7 @@ package com.founder.sysWhgl.controller;
import com.founder.model.*;
import com.founder.module.redis.service.IDicItemService;
import com.founder.service.SequenceService;
import com.founder.sysWhgl.service.SysWhglLogService;
import com.founder.sysWhgl.service.SysWhglService;
import com.founder.utils.*;
import org.apache.commons.lang.StringUtils;
......@@ -34,6 +35,9 @@ public class SysWhglController {
private SysWhglService sysWhglService;
@Resource
private SysWhglLogService sysWhglLogService;
@Resource
private SequenceService sequenceService;
@Resource
......@@ -195,6 +199,7 @@ public class SysWhglController {
@ResponseBody
public EasyUIPage queryWhglList(@ModelAttribute SysWhgl sysWhgl, EasyUIPage easyUIPage, Integer rows, String type, HttpServletRequest request) {
easyUIPage.setPagePara(rows);
System.out.println(sysWhgl);
User user = (User) request.getSession().getAttribute("User");
easyUIPage = sysWhglService.queryWhglPage(easyUIPage, sysWhgl);
return easyUIPage;
......@@ -203,9 +208,14 @@ public class SysWhglController {
@RequestMapping("/querySjjkList")
@ResponseBody
public EasyUIPage querySjjkList(@ModelAttribute SysWhgl sysWhgl, EasyUIPage easyUIPage, Integer rows, String type, HttpServletRequest request) {
//查询日志
// System.out.println(rows);
// System.out.println(easyUIPage.getPage());
easyUIPage.setPagePara(rows);
// System.out.println(sysWhgl.getBxsj());
// System.out.println(sysWhgl.getJjsj());
User user = (User) request.getSession().getAttribute("User");
easyUIPage = sysWhglService.querySjjkPage(easyUIPage, sysWhgl);
easyUIPage = sysWhglLogService.queryWhglLogPage(easyUIPage, sysWhgl);
return easyUIPage;
}
......
package com.founder.sysWhgl.dao;
import com.founder.model.SysWhgl;
import com.founder.model.SysWhglLog;
import com.founder.utils.EasyUIPage;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
/**
*
* @author jlt
* @date 2021/07/13
*/
@Component
@Mapper
public interface SysWhglLogMapper {
/**
* 异常插入
* @param sysWhglLog
* @return
*/
boolean save(SysWhglLog sysWhglLog);
/**
* 根据编号查异常
* @param bxdw
* @return
*/
SysWhglLog queryByBxdw(String bxdw);
/**
* 多条件查询
* @param map
* @return
*/
public List<SysWhglLog> queryWhglLogPage(Map<String, Object> map);
/**
* 查询数
* @param map
* @return
*/
public int queryWhglLogPageCount(Map<String, Object> map);
}
......@@ -58,4 +58,11 @@ public interface SysWhglMapper {
* @return
*/
public List<SysWhgl> queryPageList(Map<String, Object> map);
public List<SysWhgl> querySjjkPage(Map<String,Object> map);
public Integer querySjjkPageCount(Map<String,Object> map);
public List<SysWhgl> querySjjkPageByTime(String bbsj,String jjsj);
}
package com.founder.sysWhgl.service;
import com.founder.model.SysWhgl;
import com.founder.model.SysWhglLog;
import com.founder.utils.EasyUIPage;
import java.util.List;
import java.util.Map;
/**
* @author jlt
* @date 2021/7/13
*/
public interface SysWhglLogService {
/**
* 异常日志存储
* @param sysWhglLog
* @return
*/
public boolean save(SysWhglLog sysWhglLog);
/**
* 维护管理多条件分页查询
* @param page
* @param sysWhgl
* @return
*/
public EasyUIPage queryWhglLogPage(EasyUIPage page, SysWhgl sysWhgl);
}
......@@ -71,4 +71,7 @@ public interface SysWhglService {
* @return
*/
List<SysWhgl> querySjjkList(SysWhgl sysWhgl);
}
package com.founder.sysWhgl.service.impl;
import com.founder.model.SysWhgl;
import com.founder.model.SysWhglLog;
import com.founder.sysWhgl.dao.SysWhglLogMapper;
import com.founder.sysWhgl.service.SysWhglLogService;
import com.founder.utils.EasyUIPage;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
/**
* @author jlt
* @date 2021/7/13
*/
@Service
public class SySWhglLogServiceImpl implements SysWhglLogService {
@Resource
private SysWhglLogMapper sysWhglLogMapper;
@Override
public boolean save(SysWhglLog sysWhglLog) {
String str=sysWhglLog.getBxdw().trim();
System.out.println(str);
if (sysWhglLogMapper.queryByBxdw(str)==null){
System.out.println("---");
return sysWhglLogMapper.save(sysWhglLog);
}
return false;
}
@Override
public EasyUIPage queryWhglLogPage(EasyUIPage page, SysWhgl sysWhgl) {
Map<String, Object> map = new HashMap<>();
map.put("begin", page.getBegin());
map.put("end", page.getEnd());
map.put("whgl", sysWhgl);
page.setTotal(sysWhglLogMapper.queryWhglLogPageCount(map));
if (page.getTotal() == 0) {
page.setRows(new ArrayList<>());
} else {
page.setRows(sysWhglLogMapper.queryWhglLogPage(map));
}
return page;
}
}
......@@ -66,21 +66,16 @@ public class SysWhglServiceImpl implements SysWhglService {
}
@Override
public EasyUIPage querySjjkPage(EasyUIPage page, SysWhgl sysWhgl) {
List<SysWhgl> lsts = new ArrayList<SysWhgl>();
SysWhgl sysWhgl1 = new SysWhgl();
SysWhgl sysWhgl2 = new SysWhgl();
sysWhgl1.setWhbh("2021-05-26 19:21:18");
sysWhgl1.setBxdw("R4690025200002021055034");
sysWhgl1.setBxr("琼海市公安局城南派出所");
sysWhgl1.setGzxx("该数据未及时上报至指纹系统!");
sysWhgl2.setWhbh("2021-05-28 10:03:37");
sysWhgl2.setBxdw("R4602035500002021055149");
sysWhgl2.setBxr("三亚市公安局天涯分局凤凰派出所");
sysWhgl2.setGzxx("该数据未及时上报至指纹系统!");
lsts.add(sysWhgl2);
lsts.add(sysWhgl1);
page.setTotal(2);
page.setRows(lsts);
Map<String, Object> map = new HashMap<>();
map.put("begin", page.getBegin());
map.put("end", page.getEnd());
map.put("whgl", sysWhgl);
page.setTotal(sysWhglMapper.querySjjkPageCount(map));
if (page.getTotal() == 0) {
page.setRows(new ArrayList<>());
} else {
page.setRows(sysWhglMapper.querySjjkPage(map));
}
return page;
}
......@@ -100,4 +95,6 @@ public class SysWhglServiceImpl implements SysWhglService {
map.put("end", "0");
return sysWhglMapper.queryPageList(map);
}
}
......@@ -18,45 +18,45 @@ mybatis.mapperLocations=classpath:mapper/*.xml
#协同数据源配置
spring.datasource.xzxtdb.url=jdbc:oracle:thin:@127.0.0.1:1521:orcl
spring.datasource.xzxtdb.username=XZXT
spring.datasource.xzxtdb.password=XZXT
spring.datasource.xzxtdb.username=xzxt
spring.datasource.xzxtdb.password=xzxt
spring.datasource.xzxtdb.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.xzxtdb.type: com.alibaba.druid.pool.DruidDataSource
#指纹数据源配置
spring.datasource.amsisdb.url=jdbc:oracle:thin:@127.0.0.1:1521:orcl
spring.datasource.amsisdb.username=WSZZPT
spring.datasource.amsisdb.password=WSZZPT
spring.datasource.amsisdb.username=xzxt
spring.datasource.amsisdb.password=xzxt
spring.datasource.amsisdb.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.amsisdb.type: com.alibaba.druid.pool.DruidDataSource
spring.datasource.amsisryzwdb.url=jdbc:oracle:thin:@127.0.0.1:1521:ORCL
spring.datasource.amsisryzwdb.username=WSZZPT
spring.datasource.amsisryzwdb.password=WSZZPT
spring.datasource.amsisryzwdb.username=xzxt
spring.datasource.amsisryzwdb.password=xzxt
spring.datasource.amsisryzwdb.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.amsisryzwdb.type: com.alibaba.druid.pool.DruidDataSource
spring.datasource.amsisAjzwdb.url=jdbc:oracle:thin:@127.0.0.1:1521:ORCL
spring.datasource.amsisAjzwdb.username=WSZZPT
spring.datasource.amsisAjzwdb.password=WSZZPT
spring.datasource.amsisAjzwdb.username=xzxt
spring.datasource.amsisAjzwdb.password=xzxt
spring.datasource.amsisAjzwdb.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.amsisAjzwdb.type: com.alibaba.druid.pool.DruidDataSource
#省厅指纹数据源配置
spring.datasource.stamsisdb.url=jdbc:oracle:thin:@127.0.0.1:1521:ORCL
spring.datasource.stamsisdb.username=WSZZPT
spring.datasource.stamsisdb.password=WSZZPT
spring.datasource.stamsisdb.username=xzxt
spring.datasource.stamsisdb.password=xzxt
spring.datasource.stamsisdb.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.stamsisdb.type: com.alibaba.druid.pool.DruidDataSource
spring.datasource.stamsisryzwdb.url=jdbc:oracle:thin:@127.0.0.1:1521:ORCL
spring.datasource.stamsisryzwdb.username=WSZZPT
spring.datasource.stamsisryzwdb.password=WSZZPT
spring.datasource.stamsisryzwdb.username=xzxt
spring.datasource.stamsisryzwdb.password=xzxt
spring.datasource.stamsisryzwdb.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.stamsisryzwdb.type: com.alibaba.druid.pool.DruidDataSource
spring.datasource.stamsisajzwdb.url=jdbc:oracle:thin:@127.0.0.1:1521:ORCL
spring.datasource.stamsisajzwdb.username=WSZZPT
spring.datasource.stamsisajzwdb.password=WSZZPT
spring.datasource.stamsisajzwdb.username=xzxt
spring.datasource.stamsisajzwdb.password=xzxt
spring.datasource.stamsisajzwdb.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.stamsisajzwdb.type: com.alibaba.druid.pool.DruidDataSource
#警综数据源配置(山西使用)
......@@ -68,15 +68,15 @@ spring.datasource.jwzhdb.type: com.alibaba.druid.pool.DruidDataSource
#在逃数据源配置
spring.datasource.ztrydb.url=jdbc:oracle:thin:127.0.0.1:1521:ORCL
spring.datasource.ztrydb.username=XZXT
spring.datasource.ztrydb.password=XZXT
spring.datasource.ztrydb.username=xzxt
spring.datasource.ztrydb.password=xzxt
spring.datasource.ztrydb.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.ztrydb.type: com.alibaba.druid.pool.DruidDataSource
#海南刑专数据源配置
spring.datasource.hnxzxtdb.url=jdbc:oracle:thin:@127.0.0.1:1521:ORCL
spring.datasource.hnxzxtdb.username=XZXT
spring.datasource.hnxzxtdb.password=XZXT
spring.datasource.hnxzxtdb.username=xzxt
spring.datasource.hnxzxtdb.password=xzxt
spring.datasource.hnxzxtdb.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.hnxzxtdb.type: com.alibaba.druid.pool.DruidDataSource
......
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.founder.sysWhgl.dao.SysWhglLogMapper">
<sql id="queryLog">
<if test="whgl.bxsj != null and whgl.bxsj != '' and whgl.jjsj != null and whgl.jjsj != ''">
where whbh between
to_date(#{whgl.bxsj , jdbcType=VARCHAR },'yyyy-mm-dd') AND
to_date(#{whgl.jjsj , jdbcType=VARCHAR },'yyyy-mm-dd')
</if>
<if test="whgl.bxsj != null and whgl.bxsj != '' and (whgl.jjsj == null or whgl.jjsj == '')">
where whbh &gt;=
to_date(#{whgl.bxsj , jdbcType=VARCHAR },'yyyy-mm-dd')
</if>
<if test="whgl.jjsj != null and whgl.jjsj != '' and (whgl.bxsj == null or whgl.bxsj =='')">
where whbh &lt;=
to_date(#{whgl.jjsj , jdbcType=VARCHAR },'yyyy-mm-dd')
</if>
</sql>
<insert id="save" parameterType="com.founder.model.SysWhglLog">
insert into SYS_WHGL_LOG (BXDW, WHBH, BXR, GZXX)
values (#{bxdw,jdbcType=VARCHAR},
to_date(#{whbh,jdbcType=VARCHAR}, 'yy-MM-dd HH24:MI:SS'),
#{bxr,jdbcType=VARCHAR},
#{gzxx,jdbcType=VARCHAR})
</insert>
<select id="queryByBxdw" resultType="com.founder.model.SysWhglLog" parameterType="String">
select bxdw, whbh, bxr, gzxx
from SYS_WHGL_LOG
where bxdw = #{bxdw}
</select>
<select id="queryWhglLogPage" resultType="com.founder.model.SysWhglLog" parameterType="map">
SELECT t.* FROM (
SELECT a.* , rownum r FROM ( select WHBH as "whbh",
BXDW as "bxdw",BXR as "bxr",GZXX as "gzxx"
from SYS_WHGL_LOG
<include refid="queryLog"></include>
ORDER BY whbh DESC
) a
WHERE ROWNUM &lt;= #{ end } ) t
WHERE r > #{ begin }
</select>
<select id="queryWhglLogPageCount" resultType="int" parameterType="map">
select count(1) from SYS_WHGL_LOG
<include refid="queryLog"/>
</select>
</mapper>
\ No newline at end of file
......@@ -32,6 +32,24 @@
</if>
</sql>
<sql id="queryLog">
<if test="whgl.bxsj != null and whgl.bxsj != '' and whgl.jjsj != null and whgl.jjsj != ''">
where whbh between
to_date(#{whgl.bxsj , jdbcType=VARCHAR },'yyyy-mm-dd') AND
to_date(#{whgl.jjsj , jdbcType=VARCHAR },'yyyy-mm-dd')
</if>
<if test="whgl.bxsj != null and whgl.bxsj != '' and (whgl.jjsj == null or whgl.jjsj == '')">
where whbh &gt;=
to_date(#{whgl.bxsj , jdbcType=VARCHAR },'yyyy-mm-dd')
</if>
<if test="whgl.jjsj != null and whgl.jjsj != '' and (whgl.bxsj != null or whgl.bxsj)">
where whbh &lt;=
to_date(#{whgl.jjsj , jdbcType=VARCHAR },'yyyy-mm-dd')
</if>
</sql>
<insert id="saveSysWhgl" parameterType="com.founder.model.SysWhgl">
insert into SYS_WHGL ( WHBH,BXDW,BXR,BXSJ,GZXX,GZLX,BXRLXDH,CLZT,JJSJ,SCBZ,CREATE_USER,CREATE_TIME,MODIFIED_USER,MODIFIED_TIME)
values (
......@@ -81,6 +99,27 @@
<include refid="queryWhere"/>
</select>
<select id="querySjjkPage" resultMap="BaseMap" resultType="com.founder.model.SysWhgl">
SELECT t.* FROM (
SELECT a.* , rownum r FROM ( select WHBH as "whbh",
BXDW as "bxdw",BXR as "bxr",GZXX as "gzxx"
from SYS_WHGL_LOG
<include refid="queryLog"></include>
ORDER BY whbh DESC
) a
WHERE ROWNUM &lt;= #{ end } ) t
WHERE r > #{ begin }
</select>
<select id="querySjjkPageCount" resultType="int" parameterType="map">
select count(1) from SYS_WHGL_LOG
<include refid="queryLog"/>
</select>
<select id="querySjjkPageByTime" resultType="com.founder.model.SysWhgl" parameterType="String">
select * from SYS_WHGL_LOG where WHBH between to_date(#{bbsj},'yyyy-mm-dd') and to_date(#{jjsj},'yyyy-mm-dd')
</select>
<select id="queryPageList" resultMap="BaseMap" parameterType="map">
SELECT t.* FROM (
SELECT a.* , rownum r FROM ( select WHBH as "whbh",
......
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