Commit e0c5e0f8 authored by wangjinjing's avatar wangjinjing

修改配置

parent 57417292
...@@ -16,17 +16,22 @@ import org.springframework.http.ResponseEntity; ...@@ -16,17 +16,22 @@ import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import sun.misc.BASE64Decoder;
import sun.net.www.protocol.ftp.FtpURLConnection; import sun.net.www.protocol.ftp.FtpURLConnection;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.websocket.server.PathParam; import javax.websocket.server.PathParam;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.*; import java.io.*;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.List;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@Slf4j @Slf4j
......
...@@ -5,7 +5,7 @@ server.port=8082 ...@@ -5,7 +5,7 @@ server.port=8082
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=123456 spring.datasource.password=123456
spring.datasource.url=jdbc:mysql://192.168.168.212:3306/imagepro?useUnicode=true&characterEncoding=utf-8&useSSL=false spring.datasource.url=jdbc:mysql://172.16.24.153:3306/imagepro?useUnicode=true&characterEncoding=utf-8&useSSL=false
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.filters= stat spring.datasource.filters= stat
...@@ -25,7 +25,7 @@ spring.datasource.maxOpenPreparedStatements= 20 ...@@ -25,7 +25,7 @@ spring.datasource.maxOpenPreparedStatements= 20
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
spring.jackson.time-zone=GMT+8 spring.jackson.time-zone=GMT+8
# #
spring.redis.host=127.0.0.1 spring.redis.host=172.16.24.153
spring.redis.port=6379 spring.redis.port=6379
spring.cache.type=redis spring.cache.type=redis
spring.cache.redis.time-to-live=600000 spring.cache.redis.time-to-live=600000
......
...@@ -239,27 +239,27 @@ let vue_sjcx = new Vue({ ...@@ -239,27 +239,27 @@ let vue_sjcx = new Vue({
vue_sjcx.count = result.count; vue_sjcx.count = result.count;
vue_sjcx.data_table_wfpz = result.data; vue_sjcx.data_table_wfpz = result.data;
setTimeout(function () { // setTimeout(function () {
for(let i=0;i<result.data.length;i++){ // for(let i=0;i<result.data.length;i++){
var canvas = document.getElementById("cvs"+result.data[i].id); // var canvas = document.getElementById("cvs"+result.data[i].id);
if(null==canvas) continue; // if(null==canvas) continue;
//canvas.width=canvas.clientWidth; // //canvas.width=canvas.clientWidth;
//canvas.height=canvas.clientHeight; // //canvas.height=canvas.clientHeight;
// let img=document.getElementById("img"+result.data[i].id) // // let img=document.getElementById("img"+result.data[i].id)
//
// img.onload = function(){ // // img.onload = function(){
var ctx = canvas.getContext("2d"); // var ctx = canvas.getContext("2d");
ctx.strokeStyle = "#0000ff"; // ctx.strokeStyle = "#0000ff";
//ctx.setLineDash([5, 10]); // //ctx.setLineDash([5, 10]);
// ctx.lineWidth = 2; // // ctx.lineWidth = 2;
// canvas.width = img.offsetWidth; // // canvas.width = img.offsetWidth;
// canvas.height = img.offsetHeight; // // canvas.height = img.offsetHeight;
// 这一段如果不等img加载完成会无法绘制出图片 // // 这一段如果不等img加载完成会无法绘制出图片
//ctx.drawImage(img, 0, 0, canvas.clientWidth, canvas.clientHeight); // //ctx.drawImage(img, 0, 0, canvas.clientWidth, canvas.clientHeight);
ctx.strokeRect( parseInt(result.data[i].objx), parseInt(result.data[i].objy), 100,100); // ctx.strokeRect( parseInt(result.data[i].objx), parseInt(result.data[i].objy), 100,100);
// } // // }
} // }
}, 400); // }, 400);
if (items) { if (items) {
$("#fy4").bootstrapPaginator({ $("#fy4").bootstrapPaginator({
bootstrapMajorVersion: 3, //版本,这里设置为3,大于2即可 bootstrapMajorVersion: 3, //版本,这里设置为3,大于2即可
......
...@@ -80,9 +80,9 @@ ...@@ -80,9 +80,9 @@
<input type="checkbox" name="loginName" class="loginName" :value="item.id+'|'+item.channelid+'|'+item.fdid+'|'+item.recordtime+'|'+item.recordtype" @click="cli_input" style="width: 17px;height: 17px;margin-top: 0px;"> <input type="checkbox" name="loginName" class="loginName" :value="item.id+'|'+item.channelid+'|'+item.fdid+'|'+item.recordtime+'|'+item.recordtype" @click="cli_input" style="width: 17px;height: 17px;margin-top: 0px;">
</div> </div>
<div class="show-icon" :style="{'background':(item.processstatus==0||item.processstatus==null)?'#ff9c2b':(item.processstatus==2)?'#fc3939':(item.processstatus==1)?'#2fba08':'#cccccc'}" v-text="item.processstatus==0||item.processstatus==null?'未处理':item.processstatus==1?'正检':item.processstatus==2?'误检':'重复事件'"></div> <div class="show-icon" :style="{'background':(item.processstatus==0||item.processstatus==null)?'#ff9c2b':(item.processstatus==2)?'#fc3939':(item.processstatus==1)?'#2fba08':'#cccccc'}" v-text="item.processstatus==0||item.processstatus==null?'未处理':item.processstatus==1?'正检':item.processstatus==2?'误检':'重复事件'"></div>
<div class="li-top" style=" position: relative;"> <div class="li-top">
<img :src="'data:image/png;base64,'+item.imagedata" :id="'img'+item.id"> <img :src="'data:image/png;base64,'+item.imagedata" :id="'img'+item.id">
<canvas :id="'cvs'+item.id" style="position: absolute;pointer-events: none;left:0;width:100%;height:100%"></canvas> <!-- <canvas :id="'cvs'+item.id" style="position: absolute;pointer-events: none;left:0;width:100%;height:100%"></canvas>-->
</div> </div>
<div class="li-center"> <div class="li-center">
<div> <div>
......
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