Skip to content

H
hnxtbaboot
Commit 00dd4191 by Jiang
Options

Merge remote-tracking branch 'origin/ythcj_hainan' into ythcj_hainan

parents 1200f635 fdca2e0c
Showing with 589 additions and 106 deletions
src/main/java/com/founder/XtbaBootApplication.java
......@@ -6,6 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.MultipartConfigFactory;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.Bean;
import org.springframework.scheduling.annotation.EnableScheduling;
import javax.servlet.annotation.MultipartConfig;
......@@ -18,6 +19,9 @@ import javax.servlet.MultipartConfigElement;
@SpringBootApplication
@EnableCaching
//进行定时任务
@EnableScheduling
public class XtbaBootApplication {
public static void main(String[] args) {
......
src/main/java/com/founder/cjqx/controller/SysClientVpController.java
......@@ -7,6 +7,7 @@ import com.founder.model.SysClientVp;
import com.founder.model.User;
import com.founder.model.XzxtRestResult;
import com.founder.utils.SysUitl;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -85,6 +86,10 @@ public class SysClientVpController {
if(sysClientVp.getCjsblxcode()!=null&&sysClientVp.getCjsblxcode().equals("2")){
sysClientVp.setZrmjjh(user.getPolicemanid());
}
//添加最近更新时间默认值
if(StringUtils.isBlank(sysClientVp.getGxsjStr())){
sysClientVp.setGxsjStr("4");
}
//ip mac 加密 查询条件加密
if(sysClientVp.getIp()!=null&&!sysClientVp.getIp().equals("")){
sysClientVp.setIp(xzxtencode(sysClientVp.getIp()));
......@@ -103,7 +108,7 @@ public class SysClientVpController {
sysClientVp.setSsdwcode(sysClientVp.getSsdwcode().substring(0,8));
}
}
resultMap =sysClientVpService.ClientVpAll(sysClientVp);
resultMap =sysClientVpService.ClientVpZtjk(sysClientVp);
return resultMap;
}
......
src/main/java/com/founder/cjqx/dao/SysClientVpMapper.java
......@@ -10,8 +10,10 @@ import java.util.List;
@Mapper
public interface SysClientVpMapper {
List<SysClientVp> selectPageList(SysClientVp sysClientVp);
List<SysClientVp> selectsbztPageList(SysClientVp sysClientVp);
List<SysClientVp> selectClientVp(SysClientVp sysClientVp);
int selectPageCount(SysClientVp sysClientVp);
int selectsbztPageCount(SysClientVp sysClientVp);
int selectPageCountByRylrsj(SysClientVp sysClientVp);
int saveSysClientVp(SysClientVp sysClientVp);
SysClientVp selectSysClientVp(String id);
......
src/main/java/com/founder/cjqx/service/SysClientVpService.java
......@@ -12,6 +12,7 @@ import java.util.List;
*/
public interface SysClientVpService {
ResultMap ClientVpAll(SysClientVp SysClientVp);
ResultMap ClientVpZtjk(SysClientVp SysClientVp);
SysClientVp getClientVp(SysClientVp sysClientVp);
XzxtRestResult SaveClientVp(SysClientVp sysClientVp);
XzxtRestResult SelectClientVp(String id);
......
src/main/java/com/founder/cjqx/service/impl/SysClientVpServiceImpl.java
......@@ -12,8 +12,7 @@ import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.Date;
import java.util.List;
import java.util.*;
import static com.cc.utls.Base64Util.xzxtdecode;
import static com.cc.utls.Base64Util.xzxtencode;
......@@ -48,22 +47,53 @@ public class SysClientVpServiceImpl implements SysClientVpService {
if (sysClient.getMac() != null && sysClient.getMac().length() >= 24) {
sysClient.setMac(xzxtdecode(sysClient.getMac()));
}
Date date = new Date();
if (sysClient.getRylrsj() != null) {
int hour = DateUtil.differentDaysByMillisecond(sysClient.getRylrsj(), date);
if (hour <= 2) {
sysClient.setSbztstr("启用");
}else {
sysClient.setSbztstr("禁用");
}
}
int totals = sysClientVpMapper.selectPageCount(sysClientVp);
resultMap.setCount(totals);
resultMap.setData(sysClientVplist);
return resultMap;
}
return resultMap;
}
@Override
public ResultMap ClientVpZtjk(SysClientVp SysClientVp) {
int count = sysClientVpMapper.selectsbztPageCount(SysClientVp);
if("sbztstr".equals(SysClientVp.getField()) && "desc".equals(SysClientVp.getOrder())) {
SysClientVp.setBegin(0);
SysClientVp.setEnd(count);
SysClientVp.setLimit(count);
}
List<SysClientVp> sysClientVplist = sysClientVpMapper.selectsbztPageList(SysClientVp);
List<SysClientVp> resultList = new ArrayList<>();
ResultMap resultMap = new ResultMap();
for (SysClientVp sysClient : sysClientVplist) {
Date date = new Date();
if (sysClient.getRylrsj() != null) {
int days = DateUtil.differentDaysByMillisecond(sysClient.getRylrsj(), date);
if (days < 7) {
sysClient.setSbztstr("启用");
sysClient.setSpzt("1");
}else {
sysClient.setSbztstr("禁用");
sysClient.setSpzt("0");
}
}else {
sysClient.setSbztstr("禁用");
}
int totals = sysClientVpMapper.selectPageCountByRylrsj(sysClientVp);
if("禁用".equals(sysClient.getSbztstr()) && "sbztstr".equals(SysClientVp.getField()) && "desc".equals(SysClientVp.getOrder())){
resultList.add(sysClient);
}
}
if("sbztstr".equals(SysClientVp.getField()) && "desc".equals(SysClientVp.getOrder())) {
int totals = resultList.size();
resultMap.setCount(totals);
resultMap.setData(resultList);
}else {
int totals = count;
resultMap.setCount(totals);
resultMap.setData(sysClientVplist);
return resultMap;
}
return resultMap;
}
......
src/main/java/com/founder/config/FilterConfig.java
......@@ -20,7 +20,7 @@ public class FilterConfig extends WebMvcConfigurerAdapter {
excludePathPatterns("/","/toLogin","/hncsLogin","/hnzzLogin","/hnxtLogin","/hnhyLogin","/hnsyLogin","/hnyueyLogin","/hnzjjLogin","/hncdLogin","/hnyiyLogin","/hnczLogin","/hnyzLogin","/hnhhLogin","/hnldLogin","/hnxxLogin","/hainanLogin","/neimengLogin","/getSjcntDetail","/noLogin","/saveSwSjXx",
"/saveHmSjXx","/getSwSjXx","/getYthcjryxxByZjhm","/getYthcjUser","/getZfbaUser","/getZwbzJbxxCnt","/getCcbzJbxxCnt","/toswcj",
"/doLogin","/toHome","/static*//**","/refreshCodeCache","/qxdoLogin","/queryNameByCode","/queryTypeCode","/toFjxz","/toCzsmxz","/download/**","/toObjectKJ","/catchimg","/iframe1","/iframe2","/xj","/report","/SavePersonInfo4Nmtc","/singleLoginAct","/getZjxxbdjg","/toShowScan","/ajaxGettoAfisStr","/getTime","/savePersonScanBackInfo",
"/getYhkDetail","/getSwDetail","/getRyzjzpimages","/getRyzpimages","/getPmimages","/getGdimages"
"/getYhkDetail","/getSwDetail","/getRyzjzpimages","/getRyzpimages","/getPmimages","/getGdimages","/zipurlzw"
);
......
src/main/java/com/founder/controller/RyfkController.java
......@@ -54,11 +54,14 @@ public class RyfkController {
@GetMapping("/toRyfkDetail/{zjhm}")
public String toRyfkDetail(@PathVariable("zjhm") String zjhm, Model model,HttpServletRequest request){
User user =(User)request.getSession().getAttribute("User");
//获取常口信息
Qgckzp qgckzp = new Qgckzp();
AutoTbStRy ryjbxx=new AutoTbStRy();
ryjbxx=qgckzp.getQgckAllxxXml(zjhm);
if("admin".equals(user.getUsername())&&(ryjbxx==null||ryjbxx.getZjhm()==null)){
ryjbxx=qgckzp.getQgckAllxxXml("610104198607138331");
}
//ryjbxx.setRybh("R4601085600002020075001");
//ryjbxx.setXm("赵永类");
//ryjbxx.setZjhm("140101199001010255");
......@@ -83,7 +86,7 @@ public class RyfkController {
}
model.addAttribute("ryjbxx",ryjbxx); //常口
model.addAttribute("rycjjbxx",xyrC);
User user =(User)request.getSession().getAttribute("User");
model.addAttribute("user",user);
return "ryfk/ryfk";
}
......
src/main/java/com/founder/login/controller/LoginController.java
......@@ -203,6 +203,7 @@ public class LoginController {
request.getSession().setAttribute("xtflag",zhyyPath);//系统标志
System.out.println("doLogin的seesionid======="+request.getSession().getId());
if(user!=null){
returnMap.put("user",user);
returnMap.put("state","success");
returnMap.put("msg","登陆成功！");
//returnMap.put("user",user);
......
src/main/java/com/founder/model/Goods.java 0 → 100644
package com.founder.model;
import lombok.Data;
/**
* @author wcw
* @version 1.0
* @date 2021/7/10 15:49
*/
@Data
public class Goods {
private String GOODSCOLOR;
private String GOODSFEATURE;
private String GOODSFLAG;
private String GOODSNAME;
private String GOODSNO;
private String GOODSPATH;
private String GOODSSEQ;
private String GOODSTYPE;
private String GOODSVALUE;
private String GOODSVERSION;
}
src/main/java/com/founder/model/SysClientVp.java
......@@ -127,8 +127,29 @@ public class SysClientVp extends PageBean{
private String yysjstr;
private int yycsstr;
private String field;
private String order;
public void setField(String field) {
this.field = field;
}
public void setOrder(String order) {
this.order = order;
}
public String getField() {
return field;
}
public String getOrder() {
return order;
}
public Date getRylrsj() {
return rylrsj;
}
......
src/main/java/com/founder/ryswtz/controller/RyxxController.java
......@@ -667,8 +667,15 @@ public class RyxxController {
if(zjzpxxs!=null&&zjzpxxs.size()>0){
for(int i=0;i<zjzpxxs.size();i++){
AutoTbRyZp zjzp = zjzpxxs.get(i);
rstmap.put(zjzp.getZpbw(),GetImageStrsByByte(zjzp.getDzwjnr()));
if("11".equals(zjzp.getZpbw())){
rstmap.put("11",GetImageStrsByByte(zjzp.getDzwjnr()));
}else if(zjzpxxs.size()==2&&"12".equals(zjzp.getZpbw())){
rstmap.put("12",GetImageStrsByByte(zjzp.getDzwjnr()));
}else if(zjzpxxs.size()>2&&"21".equals(zjzp.getZpbw())){
rstmap.put("12",GetImageStrsByByte(zjzp.getDzwjnr()));
}
}
}
return rstmap;
}
......
src/main/java/com/founder/utils/FileUtils.java
......@@ -152,6 +152,107 @@ public class FileUtils {
}
//将照片转成二进制码
public static String fileToByte(File img) {
FileInputStream inputStream = null;
try {
Base64.Encoder encoder = Base64.getEncoder();
BASE64Decoder decoder = new sun.misc.BASE64Decoder();
inputStream = new FileInputStream(img);
int available = inputStream.available();
byte[] bytes = new byte[available];
inputStream.read(bytes);
String base64Str = encoder.encodeToString(bytes);
byte[] bytes1 = decoder.decodeBuffer(base64Str);
return base64Str;
} catch (Exception e) {
e.printStackTrace();
} finally {
try {
inputStream.close();
} catch (IOException e) {
e.printStackTrace();
}
}
return null;
}
// private static void searchFiles(String fileDir) {
// List<File> fileList = new ArrayList<File>();
// File file = new File(fileDir);
// File[] files = file.listFiles();// 获取目录下的所有文件或文件夹
// if (files == null) {// 如果目录为空，直接退出
// return;
// }
// // 遍历，目录下的所有文件
// for (File f : files) {
// if (f.isFile()) {
// fileList.add(f);
// } else if (f.isDirectory()) {
// System.out.println(f.getAbsolutePath());
// searchFiles(f.getAbsolutePath());
// }
// }
// for (File f1 : fileList) {
// System.out.println(f1.getName());
// }
// }
/**
* 查找文件名
* @param folder
* @param keyword
* @return
*/
public static List<File> searchFiles(File folder, String keyword) {
List<File> result = new ArrayList<File>();
if (folder.isFile())
result.add(folder);
//查找文件名
// File[] subFolders = folder.listFiles(new FileFilter() {
// @Override
// public boolean accept(File file) {
// if (file.isDirectory()) {
// return true;
// }
// if (file.getName().toLowerCase().contains(keyword)) {
// return true;
// }
// return false;
// }
// });
//查找后缀名
File[] subFolders = folder.listFiles(new FileFilter() {
@Override
public boolean accept(File file) {
if (file.isDirectory()) {
return true;
}
if (file.getName().toLowerCase().endsWith(keyword)) {
return true;
}
return false;
}
});
if (subFolders != null) {
for (File file : subFolders) {
if (file.isFile()) {
// 如果是文件则将文件添加到结果列表中
result.add(file);
} else {
// 如果是文件夹，则递归调用本方法，然后把所有的文件加到结果列表中
result.addAll(searchFiles(file, keyword));
}
}
}
return result;
}
//生成XML文件并且存入服务器端
public static void saveXmlFile(String xmlStr, String rybh, String xmlFilePath, String fileName, User user) {
String savePathS = "/xmlFile";
......@@ -492,46 +593,52 @@ public class FileUtils {
FileUtils.saveXmlFile(xmlStr,"R4302020000002019080001","C:/Oracle/Middleware/user_projects/domains/XTBA_domain/autodeploy/XZZYXT/upload","HMXX-R4302020000002019080001.xml",user);
*/
Map<String, Object> res = new HashMap<>();
List<NameValuePair> pairs = new ArrayList<NameValuePair>();
NameValuePair pair0 = new BasicNameValuePair("request_id", "123");
NameValuePair pair1 = new BasicNameValuePair("user_id", "admin");
NameValuePair pair2 = new BasicNameValuePair("user_dept", "430200000000");
NameValuePair pair3 = new BasicNameValuePair("version","1.00");
NameValuePair pair4 = new BasicNameValuePair("bcjr_zjhm","1212121212");
NameValuePair pair5 = new BasicNameValuePair("bcjr_xm","ceshi");
NameValuePair pair6 = new BasicNameValuePair("ywfssj","20190925104218");
NameValuePair pair7 = new BasicNameValuePair("hmzp_zy","1234141123123");
NameValuePair pair8 = new BasicNameValuePair("yyqsqkdm","0");
NameValuePair pair9 = new BasicNameValuePair("zy_xxzlpf","90");
pairs.add(pair0);
pairs.add(pair1);
pairs.add(pair2);
pairs.add(pair3);
pairs.add(pair4);
pairs.add(pair5);
pairs.add(pair6);
pairs.add(pair7);
pairs.add(pair8);
pairs.add(pair9);
res.put("user_id", "admin");
res.put("client_id", "hongba");
res.put("request_id", "123");
res.put("user_dept","430200000000");
res.put("bcjr_zjhm","121353454532212");
res.put("bcjr_xm","ceshi");
res.put("ywfssj","20190924154218");
res.put("version", "1.00");
res.put("hmzp_zy", "wewtecsfdsdfsfrw24234");
res.put("hmzp_yy", "sdfwrwrw32235aafsfwrwe");
res.put("yyqsqkdm", "0");
res.put("zyqsqkdm", "1");
res.put("zy_xxzlpf", "90");
res.put("yy_xxzlpf", "80");
System.out.println(res);
JSONObject jsonResult= requestByPost("http://127.0.0.1:9300/iris/regIris",res);
//JSONObject jsonResult= requestByPost_new(urlstr,pairs);
System.out.println(jsonResult.toJSONString());
// Map<String, Object> res = new HashMap<>();
// List<NameValuePair> pairs = new ArrayList<NameValuePair>();
// NameValuePair pair0 = new BasicNameValuePair("request_id", "123");
// NameValuePair pair1 = new BasicNameValuePair("user_id", "admin");
// NameValuePair pair2 = new BasicNameValuePair("user_dept", "430200000000");
// NameValuePair pair3 = new BasicNameValuePair("version","1.00");
// NameValuePair pair4 = new BasicNameValuePair("bcjr_zjhm","1212121212");
// NameValuePair pair5 = new BasicNameValuePair("bcjr_xm","ceshi");
// NameValuePair pair6 = new BasicNameValuePair("ywfssj","20190925104218");
// NameValuePair pair7 = new BasicNameValuePair("hmzp_zy","1234141123123");
// NameValuePair pair8 = new BasicNameValuePair("yyqsqkdm","0");
// NameValuePair pair9 = new BasicNameValuePair("zy_xxzlpf","90");
// pairs.add(pair0);
// pairs.add(pair1);
// pairs.add(pair2);
// pairs.add(pair3);
// pairs.add(pair4);
// pairs.add(pair5);
// pairs.add(pair6);
// pairs.add(pair7);
// pairs.add(pair8);
// pairs.add(pair9);
// res.put("user_id", "admin");
// res.put("client_id", "hongba");
// res.put("request_id", "123");
// res.put("user_dept","430200000000");
// res.put("bcjr_zjhm","121353454532212");
// res.put("bcjr_xm","ceshi");
// res.put("ywfssj","20190924154218");
// res.put("version", "1.00");
// res.put("hmzp_zy", "wewtecsfdsdfsfrw24234");
// res.put("hmzp_yy", "sdfwrwrw32235aafsfwrwe");
// res.put("yyqsqkdm", "0");
// res.put("zyqsqkdm", "1");
// res.put("zy_xxzlpf", "90");
// res.put("yy_xxzlpf", "80");
// System.out.println(res);
// JSONObject jsonResult= requestByPost("http://127.0.0.1:9300/iris/regIris",res);
// //JSONObject jsonResult= requestByPost_new(urlstr,pairs);
// System.out.println(jsonResult.toJSONString());
List<File> files =searchFiles(new File("F:/baidudownload/钉钉下载"),"zip");
// List<File> files = searchFiles(new File("E:\\tem"), "1");
System.out.println("共找到:" + files.size() + "个文件");
for (File file : files) {
System.out.println(file.getAbsolutePath());
}
}
public static String postUrl(String strURL, String params) {
......
src/main/java/com/founder/utils/ZipUtils.java 0 → 100644
package com.founder.utils;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.Charset;
import java.util.Enumeration;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
/**
* @author wcw
* @version 1.0
* @date 2021/7/10 14:30
*/
public class ZipUtils {
/**
* 进行zip文件解压
* @param zipFile
* @param descDir
* @return
*/
public static String unZipFiles(File zipFile, String descDir) {
//解压文件夹
String outPath = null;
ZipFile zip = null;//解决中文文件夹乱码
try {
zip = new ZipFile(zipFile, Charset.forName("GBK"));
String name = zip.getName().substring(zip.getName().lastIndexOf('\\')+1, zip.getName().lastIndexOf('.'));
// System.out.println(zip.getName().substring(zip.getName().lastIndexOf('.')+1, zip.getName().length()));
File pathFile = new File(descDir+name);
if (!pathFile.exists()) {
pathFile.mkdirs();
}
for (Enumeration<? extends ZipEntry> entries = zip.entries(); entries.hasMoreElements();) {
ZipEntry entry = (ZipEntry) entries.nextElement();
String zipEntryName = entry.getName();
InputStream in = zip.getInputStream(entry);
outPath = (descDir + name +"/"+ zipEntryName).replaceAll("\\*", "/");
// 判断路径是否存在,不存在则创建文件路径
File file = new File(outPath.substring(0, outPath.lastIndexOf('/')));
if (!file.exists()) {
file.mkdirs();
}
// 判断文件全路径是否为文件夹,如果是上面已经上传,不需要解压
if (new File(outPath).isDirectory()) {
continue;
}
// 输出文件路径信息
// System.out.println(outPath);
FileOutputStream out = new FileOutputStream(outPath);
byte[] buf1 = new byte[1024];
int len;
while ((len = in.read(buf1)) > 0) {
out.write(buf1, 0, len);
}
in.close();
out.flush();
out.close();
}
zip.close();
System.out.println("******************解压完毕********************");
} catch (IOException e) {
e.printStackTrace();
}finally {
//解压后删除压缩文件
boolean delete = zipFile.delete();
System.out.println("删除状态："+delete);
}
//返回解压后的路径
return outPath.substring(0, outPath.lastIndexOf('/'));
}
public static void main(String[] args) {
String unZipFiles = unZipFiles(new File("F:/baidudownload/钉钉下载/R4600000504012021072906.zip"), "F:/baidudownload/钉钉下载/");
// String xmlToString = PraseXML.xmlToString(new File(unZipFiles+"/Person.xml"));
// Map map = PraseXML.parse_XMLMap(xmlToString);
// PersonDto personDto = JSON.parseObject(JSONObject.toJSONString(map), PersonDto.class);
// System.out.println(xmlToString);
// System.out.println("********************");
// System.out.println(map);
// System.out.println(personDto.toString());
// String fileToByte = FileUtils.fileToByte(new File(unZipFiles + "/RightFoot.jpg"));//RightFoot.jpg
// FileUtils.base64StringToImage(fileToByte);
}
}
src/main/resources/application.properties
......@@ -20,4 +20,6 @@ qganurl=http://zhyy.xzxt.nm/getGabZyInfoByJyaqMatj.action
#内蒙古新警综WebService接口地址
nmjz_interfaceurl=http://26.169.99.50:9086/tcwebservice/services/ServiceImpl?wsdl
sbglqx=admin:123456
\ No newline at end of file
sbglqx=admin:123456
ftpUrl=F:/test
\ No newline at end of file
src/main/resources/mapper/AutoTbXwRycjSqlMap.xml
......@@ -120,6 +120,8 @@
<result column="XDHWDM" property="xdhwdm" jdbcType="VARCHAR"/>
<result column="XYDM" property="xydm" jdbcType="VARCHAR"/>
<result column="RXBDJG" property="rxbdjg" jdbcType="VARCHAR"/>
<result column="ZJLEFTXXBH" property="zjleftxxbh" jdbcType="VARCHAR"/>
<result column="ZJRIGHTXXBH" property="zjrightxxbh" jdbcType="VARCHAR"/>
</resultMap>
<sql id="queryWhere">
......@@ -232,7 +234,7 @@
<select id="getRyxxByToday" resultMap="baseMap" parameterType="map">
select *
from TB_RY_RYCJ where (SCBZ='0' or SCBZ is null) AND (IFHB<![CDATA[<>]]>'1' OR IFHB IS NULL) and lrsj>=sysdate-1
from TB_RY_RYCJ where (SCBZ='0' or SCBZ is null) AND (IFHB<![CDATA[<>]]>'1' OR IFHB IS NULL) and lrsj>=sysdate-1 order by lrsj desc
</select>
<select id="getRyxxByZjhm" resultMap="baseMap" parameterType="map">
......@@ -397,7 +399,10 @@
SFSWZT,
ZJLXDM,
XDHWDM,
XYDM
XYDM,
ZJLEFTXXBH,
ZJRIGHTXXBH,
ZWFKXX
)
values (
<if test="entity.rybh != null and entity.rybh != ''"> #{entity.rybh , jdbcType=VARCHAR } </if>
......@@ -590,6 +595,12 @@
<if test="entity.xdhwdm == null or entity.xdhwdm == ''">,NULL</if>
<if test="entity.xydm != null and entity.xydm != ''">, #{entity.xydm , jdbcType=VARCHAR } </if>
<if test="entity.xydm == null or entity.xydm == ''">,NULL</if>
<if test="entity.zjleftxxbh != null and entity.zjleftxxbh != ''">, #{entity.zjleftxxbh , jdbcType=VARCHAR }</if>
<if test="entity.zjleftxxbh == null or entity.zjleftxxbh == ''">,NULL</if>
<if test="entity.zjrightxxbh != null and entity.zjrightxxbh != ''">, #{entity.zjrightxxbh , jdbcType=VARCHAR }</if>
<if test="entity.zjrightxxbh == null or entity.zjrightxxbh == ''">,NULL</if>
<if test="entity.zwfkxx != null and entity.zwfkxx != ''">, #{entity.zwfkxx , jdbcType=VARCHAR }</if>
<if test="entity.zwfkxx == null or entity.zwfkxx == ''">,NULL</if>
)
</insert>
......@@ -708,6 +719,8 @@
<if test="entity.taryxq2 != null and entity.taryxq2 != ''"> taryxq2 = #{entity.taryxq2 , jdbcType=VARCHAR }, </if>
<if test="entity.tary3 != null and entity.tary3 != ''"> tary3 = #{entity.tary3 , jdbcType=VARCHAR }, </if>
<if test="entity.taryxq3 != null and entity.taryxq3 != ''"> taryxq3 = #{entity.taryxq3 , jdbcType=VARCHAR }, </if>
<if test="entity.zjleftxxbh != null and entity.zjleftxxbh != ''">ZJLEFTXXBH = #{entity.zjleftxxbh , jdbcType=VARCHAR },</if>
<if test="entity.zjrightxxbh != null and entity.zjrightxxbh != ''">ZJRIGHTXXBH = #{entity.zjrightxxbh , jdbcType=VARCHAR },</if>
GXSJ=SYSDATE
where RYBH = #{entity.rybh, jdbcType=VARCHAR}
</update>
......
src/main/resources/mapper/SysClientVpMapper.xml
......@@ -82,7 +82,7 @@
<if test="ifythcjy!=null and ifythcjy !=''">AND ifythcjy = #{ifythcjy}</if>
<if test="spzt!=null and spzt !=''">AND spzt = #{spzt}</if>
<if test="sbztstr!=null and sbztstr !=''">AND sbztstr = #{sbztstr}</if>
<if test="zrmjjh!=null and zrmjjh !=''">AND zrmjjh = #{zrmjjh}</if>
<!-- <if test="zrmjjh!=null and zrmjjh !=''">AND zrmjjh = #{zrmjjh}</if>-->
<if test="ssdwcode!=null and ssdwcode !=''">AND SSDW_CODE like #{ssdwcode}||'%'</if>
<if test="gxsjStr!=null and gxsjStr==1">
AND ry.LRSJ BETWEEN SYSDATE-1 and SYSDATE
......@@ -129,24 +129,103 @@
SELECT * FROM
(
SELECT A.*, ROWNUM RN
FROM (SELECT vp.*, ry.LRSJ as rylrsj
FROM Sys_Client_Vp vp
left join (select *
from (select max(LRSJ) as LRSJ, IP
from tb_ry_rycj
where ip is not null
group by ip)) ry
on vp.IP = (SELECT utl_raw.cast_to_varchar2(utl_encode.base64_encode(utl_raw.cast_to_raw(
utl_raw.cast_to_varchar2(
utl_encode.base64_encode(utl_raw.cast_to_raw(ry.IP ||'{xtba.hn}'))))))
FROM dual)
<include refid="queryWhereByRylrsj"/>
) A
FROM (SELECT * FROM Sys_Client_Vp
<include refid="queryWhere"/>) A
WHERE ROWNUM <![CDATA[ <= ]]> ${end}
)
WHERE RN <![CDATA[ >= ]]> ${begin}
</select>
<!-- 通过设备状态监控管理查询 -->
<select id="selectsbztPageList" parameterType="com.founder.model.SysClientVp" resultMap="BaseResultMap">
SELECT *
FROM (select a.*,ROWNUM as rn
from (select t.ycs as ZWCJY_NAME,
t.rylrsj,
(select name from SYS_DICTITEM where code = t.LRDWDM and GROUPID = 'CODE_UNIT') as SSDW_NAME,
(select TRUE_NAME from SYS_USER where USERNAME = ry.LRR) as IFYTHCJY
from (select LRDWDM, count(*) as ycs, max(LRSJ) as rylrsj
from tb_ry_rycj
where scbz = '0'
<if test="ssdwcode!=null and ssdwcode !=''">
and LRDWDM like #{ssdwcode}||'%'
</if>
group by LRDWDM) t,
TB_RY_RYCJ ry
where t.LRDWDM = ry.LRDWDM(+)
and t.rylrsj = ry.LRSJ
<if test="sbztstr!=null and sbztstr==1">
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 7
</if>
<if test="sbztstr!=null and sbztstr==2">
AND t.rylrsj <![CDATA[ < ]]> SYSDATE - 7
</if>
<if test="gxsjStr!=null and gxsjStr==1">
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 7
</if>
<if test="gxsjStr!=null and gxsjStr==2">
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 30
</if>
<if test="gxsjStr!=null and gxsjStr==3">
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 120
</if>
<if test="gxsjStr!=null and gxsjStr==4">
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 180
</if>
order by rylrsj desc) a
where ROWNUM <![CDATA[ <= ]]> ${end}
)
WHERE RN <![CDATA[ >= ]]> ${begin}
</select>
<!-- 通过条件分页查询，返回总记录数 人员录入时间 -->
<select id="selectsbztPageCount" parameterType="com.founder.model.SysClientVp" resultType="java.lang.Integer">
SELECT count(rn) FROM
(
select t.ycs as ZWCJYNAME,
t.rylrsj,
(select name from SYS_DICTITEM where code = t.LRDWDM and GROUPID = 'CODE_UNIT') as ssdwname,
(select TRUE_NAME from SYS_USER where USERNAME = ry.LRR) as ifythcjy,
ROWNUM as rn
from (
select LRDWDM, count(*) as ycs, max(LRSJ) as rylrsj
from tb_ry_rycj
where scbz = '0'
<if test="ssdwcode!=null and ssdwcode !=''">
and LRDWDM like #{ssdwcode}||'%'
</if>
group by LRDWDM
) t,
TB_RY_RYCJ ry
where t.LRDWDM = ry.LRDWDM(+)
and t.rylrsj = ry.LRSJ
<if test="sbztstr!=null and sbztstr==1">
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 7
</if>
<if test="sbztstr!=null and sbztstr==2">
AND t.rylrsj <![CDATA[ < ]]> SYSDATE - 7
</if>
<if test="gxsjStr!=null and gxsjStr==1">
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 7
</if>
<if test="gxsjStr!=null and gxsjStr==2">
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 30
</if>
<if test="gxsjStr!=null and gxsjStr==3">
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 120
</if>
<if test="gxsjStr!=null and gxsjStr==4">
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 180
</if>
)
</select>
<!-- 通过条件分页查询，返回数据集 -->
<select id="selectClientVp" parameterType="com.founder.model.SysClientVp" resultMap="BaseResultMap">
SELECT * FROM
......
src/main/resources/mapper/SysLogSystemSqlMapper.xml
......@@ -37,7 +37,7 @@
SCBZ
) values (
#{xxzjbh , jdbcType=VARCHAR },
to_date(#{rzsjStr , jdbcType=VARCHAR },'yyyy-mm-dd'),
sysdate,
#{yhjh , jdbcType=VARCHAR },
#{yhxm , jdbcType=VARCHAR },
#{yhidnum , jdbcType=VARCHAR },
......
src/main/resources/static/js/catchpic.chrome.js
......@@ -174,9 +174,9 @@ function setTP(tpCode,tpFile,tpShow,tpName,index){//将控件采集的信息放
frminput.tstzflag2.value = "0";
}
if(index==41){
frminput.zjflag1.value = "0";
frminput.bjflag1.value = "0";
}else if(index==42){
frminput.zjflag2.value = "0";
frminput.bjflag2.value = "0";
}
/*
......
src/main/resources/templates/cjqx/frame.html
......@@ -82,7 +82,7 @@
</li>
-->
<li>
<a href="javascript:void(0)" onclick="menuCAClick('sbztjkform',this,'page60001')"><i class="iconfont icon-kehu left"></i><font>设备监控监控</font></a>
<a href="javascript:void(0)" onclick="menuCAClick('sbztjkform',this,'page60001')"><i class="iconfont icon-kehu left"></i><font>设备状态监控</font></a>
</li>
<!--<li>
<a href="javascript:void(0)" onclick="menuCAClick('newShebcs',this,'page50001')"><i class="iconfont icon-kehu left"></i><font>新增设备厂商</font></a>
......
src/main/resources/templates/cjqx/sbztjkform.html
......@@ -23,6 +23,9 @@
.layui-form-selected dl {
height: 156px!important;
}
.layui-table-page {
position:fixed;
}
</script>
<body>
<!--查询条件-->
......@@ -31,18 +34,19 @@
<!-- <input type="hidden" name="ssdwcode" id="ssdwcode" th:value="${session.User.getUnitcode()}" class="layui-input">-->
<div class="layui-form-item">
<label class="layui-form-label">隶属单位：</label>
<label class="layui-form-label">采集单位：</label>
<div class="layui-input-block">
<input id="ssdwcode" name="ssdwcode" type="text" lay-verify="scode" style="width:66%; height:32px;" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_UNIT',method:'get',textField : 'text', valueField : 'id'"/>
<!-- <input type="hidden" id="ssdwname" name="ssdwname" th:value="${session.User.getUnitname()}" />-->
</div>
<input type="hidden" id="ssdwcodeStr" name="ssdwcodeStr" />
</div>
<div class="layui-form-item">
<label class="layui-form-label">IP：</label>
<div class="layui-input-block">
<input type="text" name="ip" id="ip" lay-verify="ip" placeholder="请输入IP" autocomplete="off" class="layui-input">
</div>
</div>
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">IP：</label>-->
<!-- <div class="layui-input-block">-->
<!-- <input type="text" name="ip" id="ip" lay-verify="ip" placeholder="请输入IP" autocomplete="off" class="layui-input">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">设备状态：</label>-->
<!-- <div class="layui-input-block">-->
......@@ -54,13 +58,25 @@
<!-- </div>-->
<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label">采集时间更新：</label>
<label class="layui-form-label">最近操作时间：</label>
<div class="layui-input-block">
<select name="gxsjStr" id="gxsjStr">
<option value="">请选择</option>
<option value="1">24小时内</option>
<option value="2">48小时内</option>
<option value="3">7天内未更新</option>
<option value="1">7天</option>
<option value="2">一个月</option>
<option value="3">三个月</option>
<option value="4" th:selected="true">半年</option>
</select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">最近使用状态：</label>
<div class="layui-input-block">
<select name="sbztstr" id="sbztstr">
<option value="">请选择</option>
<option value="1">on</option>
<option value="2">off</option>
<!-- <option value="4" th:selected="true">半年</option>-->
</select>
</div>
</div>
......@@ -71,8 +87,9 @@
</div>
</div>
</form>
<!--<div style="padding-bottom:20px;background:#eee;" >-->
<table class="layui-hide" id="test" lay-filter="test" width="98%"></table>
<!--</div>-->
<script type="text/html" id="jsifzwcjy">
 {{# if(d.ifzwcjy == '是'){ }}
......@@ -136,12 +153,6 @@
<script src="/static/layui/layui.js" charset="utf-8"></script>
<script src="/static/layui/layui.all.js" charset="utf-8"></script>
<script>
$(function() {
openCombotree('ssdwcode');
// $('#ssdwcode').combobox('clear');
// $("#ssdwcode").combotree("setValue",$("#ssdwname").val());
// $("#ssdwcode").text(codeFormatter($("#ssdwcode").val(),"CODE_UNIT"));
})
layui.use(['table', 'layer','form'], function(){
var date = new Date();
var table = layui.table,
......@@ -159,13 +170,14 @@
,cols: [
[
// { field:'spzt',fixed: 'left',title:'操作',align:'center', width:'10%',toolbar: '#toolbarDemo'}
{type:'numbers', title:'序号',align:'center', width:'10%'}
,{field:'ip', title:'IP地址',align:'center', width:'15%'}
,{field:'mac', title:'MAC地址',align:'center', width:'15%'}
,{field:'rylrsj', title:'最近更新时间',align:'center', width:'15%',templet : "<div>{{layui.util.toDateString(d.rylrsj, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
,{field:'ssdwname', title:'隶属单位',align:'center', width:'15%'}
,{field:'zrmjname', title:'负责人',align:'center', width:'15%'}
,{field:'sbztstr', title:'设备状态',align:'center', width:'15%',templet: '#ifsbzt'}
{type:'numbers', title:'序号',align:'center'}
,{field:'ssdwname', title:'采集单位',align:'center'}
,{field:'rylrsj', title:'最近操作时间',align:'center',templet : "<div>{{layui.util.toDateString(d.rylrsj, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
,{field:'ifythcjy', title:'最近操作人',align:'center'}
,{field:'zwcjyname', title:'采集数',align:'center'}
// ,{field:'ip', title:'IP地址',align:'center', width:'15%'}
,{field:'sbztstr', title:'最近使用状态',align:'center',templet: '#ifsbzt'}
// ,{field:'spzt', title:'审批状态',align:'center', width:'15%',templet: '#ifspzt'}
/* ,{field: 'right', title:'操作',align:'center', toolbar: '#barDemo', width:140}
,{field: 'right', title:'操作',align:'center', toolbar: '#barDemo4', width:140}*/
......@@ -191,9 +203,9 @@
//根据条件查询
,where: {
ssdwcode: $("#ssdwcode").combobox("getValue"),
ip: $('#ip').val(),
// ip: $('#ip').val(),
// sbztstr:$("#sbztstr option:selected").val(),
// spzt: $("#spzt option:selected").val(),
sbztstr: $("#sbztstr option:selected").val(),
gxsjStr: $("#gxsjStr option:selected").val(),
cjsblxcode:'1'
}
......@@ -279,5 +291,14 @@
</script>
<script>
$(function() {
openCombotree('ssdwcode');
// $('#ssdwcode').combobox('clear');
// $("#ssdwcode").combotree("setValue",$("#ssdwname").val());
// $("#ssdwcode").text(codeFormatter($("#ssdwcode").val(),"CODE_UNIT"));
})
</script>
</body>
</html>
\ No newline at end of file
src/main/resources/templates/login/login_hainan.html
......@@ -234,6 +234,7 @@
var msg=data.msg;
user=data.user;
if(state&&state=="success"){
addrz(user.unitcode,getCurrentTime(),user.trueName);
window.location.href="toHome";
}else{
alert(msg);
......@@ -243,6 +244,42 @@
// }
//});
}
function addrz(yhdwdm,rzsjstr,yhxm){
$.ajax({
url:"doAddsysLogs",
data:{"yhdwdm":yhdwdm,"rzsjStr":rzsjstr,"yhxm":yhxm,"rznr":"进行系统登录！"},
type:"post",
dataType:"json",
async: false,
success:function(data){
}
});
}
function getCurrentTime() {
var date = new Date();//当前时间
var month = zeroFill(date.getMonth() + 1);//月
var day = zeroFill(date.getDate());//日
var hour = zeroFill(date.getHours());//时
var minute = zeroFill(date.getMinutes());//分
var second = zeroFill(date.getSeconds());//秒
//当前时间
var curTime = date.getFullYear() + "-" + month + "-" + day
+ " " + hour + ":" + minute + ":" + second;
return curTime;
}
function zeroFill(i){
if (i >= 0 && i <= 9) {
return "0" + i;
} else {
return i;
}
}
function hide(){
$("#loadgif").hide();
}
......
src/main/resources/templates/rygl/addryxx.html
......@@ -364,9 +364,11 @@
if(id==""){
//新增
document.frminput.action = "/doAddRyxx";
addrz($("#unitcode").val(),"2021-07-12",$("#truename").val(),"进行人员新增操作，操作嫌疑人身份证号为："+$("#gmsfhm").val()+"！");
}else{
//修改
document.frminput.action = "/doEditRyxx";
addrz($("#unitcode").val(),"2021-07-12",$("#truename").val(),"对人员基本信息进行修改操作，修改嫌疑人人员编号为："+id+"！");
}
var rysx = $('input[name=rysx]:checked').val();
if(rysx=="02"||rysx=="03"||rysx=="04"){
......@@ -472,6 +474,18 @@
});
}
function addrz(yhdwdm,rzsjstr,yhxm,rznr){
$.ajax({
url:"doAddsysLogs",
data:{"yhdwdm":yhdwdm,"rzsjStr":rzsjstr,"yhxm":yhxm,"rznr":rznr},
type:"post",
dataType:"json",
async: false,
success:function(data){
}
});
}
function addRyzpimg() {//初始化数据
var FileReader = window.FileReader;
if (FileReader) {//chrome浏览器处理
......@@ -522,6 +536,16 @@
if(tstz2Base64!=null&&tstz2Base64!=""){
$("#imghead32").attr("src","data:image/jpg;base64,"+tstz2Base64);
}
var bj1Base64 = $("#bj1Base64").val();
if(bj1Base64!=null&&bj1Base64!=""){
$("#imghead41").attr("src","data:image/jpg;base64,"+bj1Base64);
$("#bjifcj").attr("src","/static/rygl/img/yes.png");
}
var bj2Base64 = $("#bj2Base64").val();
if(bj2Base64!=null&&bj2Base64!=""){
$("#imghead42").attr("src","data:image/jpg;base64,"+bj2Base64);
$("#bjifcj").attr("src","/static/rygl/img/yes.png");
}
}else {//IE等其他浏览器处理
var edzzplj = $("#edzzplj").val();
if(edzzplj!=null&&edzzplj!=""){
......@@ -1256,6 +1280,7 @@
$("#szzwbh").val(result.message);
}
$("#zwifcj").attr("src","/static/rygl/img/yes.png");
addrz($("#unitcode").val(),"2021-07-12",$("#truename").val(),"进行指纹采集操作，嫌疑人人员编号为："+$("#rybh").val()+"！");
$.messager.alert( '提示',"指纹采集成功！");
zwcjjss = 0;
clearInterval(timer);
......
src/main/resources/templates/rygl/demo.html
......@@ -40,6 +40,14 @@
window.parent.document.getElementById("imghead32").src=document.getElementById("thisimg").src;
window.parent.document.getElementById("tstz2Base64").value=tishixingxi;
window.parent.document.getElementById("tstzflag2").value="0";
}else if(zpbw==41){
window.parent.document.getElementById("imghead41").src=document.getElementById("thisimg").src;
window.parent.document.getElementById("bj1Base64").value=tishixingxi;
window.parent.document.getElementById("bjflag1").value="0";
}else if(zpbw==42){
window.parent.document.getElementById("imghead42").src=document.getElementById("thisimg").src;
window.parent.document.getElementById("bj2Base64").value=tishixingxi;
window.parent.document.getElementById("bjflag2").value="0";
}
}
function cjwc() {
......
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