diff --git a/.gitignore b/.gitignore index b134d04..5de4c42 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ cloud.zip cloud/haikangface/log/2019-11-15/13_文件保存回调.txt +cloud/mypulsar/mypulsar-1.0.0/ +cloud/mypulsar/mypulsar-1.0.0.jar diff --git a/cloud/dahua/src/main/java/com/example/dahua/MyTask.java b/cloud/dahua/src/main/java/com/example/dahua/MyTask.java index 67d177f..169e504 100644 --- a/cloud/dahua/src/main/java/com/example/dahua/MyTask.java +++ b/cloud/dahua/src/main/java/com/example/dahua/MyTask.java @@ -232,7 +232,7 @@ public class MyTask implements ApplicationRunner { } } - public void reloadPic() { + public synchronized void reloadPic() { /* Set set = lLongMap.keySet(); Iterator iterator = set.iterator(); @@ -244,16 +244,17 @@ public class MyTask implements ApplicationRunner { GateModule.realLoadPic(0,analyzerCallback,lLongMap.get(deviceId)); }*/ - for (DeviceInfoBean dev : - deviceInfoBeans) { - System.out.println("dev:" + dev.toString() + " -------llong:" + lLongMap.get(dev.getDevcieId())); - FileUtils.getInstance().writeLogs(dev.getDevcieId() + "------" + lLongMap.get(dev.getDevcieId()), FileUtils.device_login); - if (lLongMap.get(dev.getDevcieId()).intValue() > 0) - GateModule.realLoadPic(0, analyzerCallback, lLongMap.get(dev.getDevcieId())); + if (null!=deviceInfoBeans){ + for (DeviceInfoBean dev : + deviceInfoBeans) { + FileUtils.getInstance().writeLogs(dev.getDevcieId() + "------" + lLongMap.get(dev.getDevcieId()), FileUtils.device_login); + if (lLongMap.get(dev.getDevcieId()).intValue() > 0) + GateModule.realLoadPic(0, analyzerCallback, lLongMap.get(dev.getDevcieId())); - } + } - isHasNewDevice = false; + isHasNewDevice = false; + } } @@ -299,7 +300,8 @@ public class MyTask implements ApplicationRunner { card=cardNo(card); CardBean cardBean = userDao.getCards(card);//根据卡号获取身份信息 String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - snapPicPath = snapPicPath.replace("E:\\wwwhtdocs\\SmartCampus", "http://campus.myjxt.com"); + snapPicPath = snapPicPath.replaceFirst("\\.", "http://121.40.109.21:8991"); + snapPicPath = snapPicPath.replace("FaceRecoder","image"); if (cardBean.getType() == 0) {//老师 TeacherBean teacherBean = userDao.getTeacherWithId(cardBean.getUser_id()); sendRecordDao.addFaceRecoder("", teacherBean.getUser_id(), teacherBean.getName(), snapPicPath, 1, time, card); diff --git a/cloud/dahua/src/main/java/com/example/dahua/WebMvcConfigurer.java b/cloud/dahua/src/main/java/com/example/dahua/WebMvcConfigurer.java new file mode 100644 index 0000000..f6c2ce6 --- /dev/null +++ b/cloud/dahua/src/main/java/com/example/dahua/WebMvcConfigurer.java @@ -0,0 +1,29 @@ +package com.example.dahua; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; + +import java.io.File; + +@Configuration +public class WebMvcConfigurer extends WebMvcConfigurationSupport { + + + @Override + protected void addResourceHandlers(ResourceHandlerRegistry registry) { + super.addResourceHandlers(registry); + +// File file = new File("D:\\cloud\\FaceRecoder\\"); +// String imageSource = "C:\\Users\\taohandong\\Pictures\\"; +// if (file.exists())imageSource = file.getAbsolutePath(); + registry.addResourceHandler("/image/**").addResourceLocations("file:D:\\cloud\\FaceRecoder\\"); + //swagger界面 + registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/"); + registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/"); + + } + + +} diff --git a/cloud/dahua/src/main/java/com/example/dahua/async/MyScheduledTask.java b/cloud/dahua/src/main/java/com/example/dahua/async/MyScheduledTask.java index 5f30f47..206e540 100644 --- a/cloud/dahua/src/main/java/com/example/dahua/async/MyScheduledTask.java +++ b/cloud/dahua/src/main/java/com/example/dahua/async/MyScheduledTask.java @@ -6,6 +6,7 @@ import com.example.dahua.bean.StudentBean; import com.example.dahua.bean.UserInfoBean; import com.example.dahua.bean.WGBean; import com.example.dahua.dao.UserDao; +import com.example.dahua.lib.Utils; import com.example.dahua.mqtt.MqttManager; import com.example.dahua.utils.FileUtils; import com.example.dahua.xiananDao.SendRecordDao; @@ -168,6 +169,11 @@ public class MyScheduledTask { private synchronized void dealData(){ + String ip = new Utils().getHostAddress(); + System.out.println("ip:"+ip); + if (ip.startsWith("192")) + return; + /** * 微耕 */ diff --git a/cloud/dahua/src/main/java/com/example/dahua/async/SendUserInfoTask.java b/cloud/dahua/src/main/java/com/example/dahua/async/SendUserInfoTask.java index 1f27d56..46b55d1 100644 --- a/cloud/dahua/src/main/java/com/example/dahua/async/SendUserInfoTask.java +++ b/cloud/dahua/src/main/java/com/example/dahua/async/SendUserInfoTask.java @@ -27,10 +27,7 @@ import org.springframework.web.client.RestTemplate; import java.io.*; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; /** * 下发卡号的异步操作 @@ -565,9 +562,30 @@ public class SendUserInfoTask { break; } String filePath = String.format("E:\\wwwhtdocs\\SmartCampus\\face17e5\\School%s\\%s\\%s.jpg", sendRecordBean.getSchoolId(), userTy, userDao.getStudentCode(sendRecordBean.getCustomerid())); - String url = String.format("http://114.55.30.100:8089/facereco/sendStuCardAndImg?card=%s&deviceId=%s&endTime=%s&filePath=%s&name=%s&userType=%s&validTimeEnabled=%s&startTime=%s" - , sendRecordBean.getNum(), sendRecordBean.getDeviceID(), "2033-10-01 10:00:00", filePath, sendRecordBean.getName(), "2", "1", "2019-10-01 10:00:00"); - boolean result1 = restTemplate.getForObject(url, Boolean.class); + String url = "http://114.55.30.100:8089/facereco/sendStuCardAndImg?card={card}&deviceId={deviceId}&endTime={endTime}&" + + "filePath={filePath}&name={name}&userType={userType}&validTimeEnabled={validTimeEnabled}&startTime={startTime}"; + + Map map = new HashMap<>(); + + map.put("card",sendRecordBean.getNum()); + map.put("deviceId",sendRecordBean.getDeviceID()); + map.put("endTime","2033-10-01 10:00:00"); + map.put("filePath",filePath); + map.put("name",sendRecordBean.getName()); + map.put("userType",userType); + map.put("validTimeEnabled","1"); + map.put("startTime","2019-10-01 10:00:00"); + + ResponseEntity responseEntity = restTemplate.getForEntity(url,String.class,map); + + System.out.println("responseEntity:---------------------------"+map.toString()); + + String result = responseEntity.getBody(); + result = result.replace("",""); + result = result.replace("",""); + + boolean result1 = Boolean.parseBoolean(result); + if (result1) { System.out.println("下发成功:" + url); } else { diff --git a/cloud/dahua/src/main/resources/application.yaml b/cloud/dahua/src/main/resources/application.yaml index 88ca86c..949e07a 100644 --- a/cloud/dahua/src/main/resources/application.yaml +++ b/cloud/dahua/src/main/resources/application.yaml @@ -57,3 +57,6 @@ mybatis: #haikangpic: E:\wwwhtdocs\HFface\FaceLogs\ #haikangfaceurl: http://60.190.202.57:8899 + + + diff --git a/cloud/dahua/src/test/java/com/example/dahua/DahuaApplicationTests.java b/cloud/dahua/src/test/java/com/example/dahua/DahuaApplicationTests.java index 2802118..d2db643 100644 --- a/cloud/dahua/src/test/java/com/example/dahua/DahuaApplicationTests.java +++ b/cloud/dahua/src/test/java/com/example/dahua/DahuaApplicationTests.java @@ -310,36 +310,16 @@ public class DahuaApplicationTests { @Test public void test2() { - /* File file = new File("C:\\Users\\taohandong\\Desktop\\教师自拍(1)(1)\\教师自拍(1)"); - File[] files = file.listFiles(); - - for (int i = 0; i < files.length; i++) { - File file1 = files[i]; - try { - FileInputStream fileInputStream = new FileInputStream(file1); + RestTemplate restTemplate = new RestTemplate(); - FileOutputStream fileOutputStream = new FileOutputStream(new File(file.getAbsolutePath(),file1.getName().split("\\.")[0]+".png")); - int length = 0; + String url = "http://localhost:8991/user/checkFace?url=C:\\Users\\taohandong\\Pictures\\test.jpg"; - byte[] bytes = new byte[1024]; - while ((length=fileInputStream.read(bytes))!=-1){ - fileOutputStream.write(bytes,0,length); - } + System.out.println("result:"+ restTemplate.getForObject(url,String.class)); - fileInputStream.close(); - fileOutputStream.close(); - file1.deleteOnExit(); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } - - }*/ } @Test diff --git a/cloud/huoti/test.jpg b/cloud/huoti/test.jpg new file mode 100644 index 0000000..d176f17 Binary files /dev/null and b/cloud/huoti/test.jpg differ diff --git a/cloud/log/2019-12-24/下发指令.txt b/cloud/log/2019-12-24/下发指令.txt new file mode 100644 index 0000000..89d20a5 --- /dev/null +++ b/cloud/log/2019-12-24/下发指令.txt @@ -0,0 +1,14 @@ +2019-12-24 17:19:39 2019-12-24 17:19:39 30 + +2019-12-24 17:21:01 2019-12-24 17:21:01 30 + +2019-12-24 17:21:31 2019-12-24 17:21:31 30 + +2019-12-24 17:22:24 2019-12-24 17:22:24 30 + +2019-12-24 17:31:52 2019-12-24 17:31:52 30 + +2019-12-24 17:36:02 2019-12-24 17:36:02 30 + +2019-12-24 17:53:49 2019-12-24 17:53:49 30 + diff --git a/cloud/log/2019-12-25/10_sendUserInfo.txt b/cloud/log/2019-12-25/10_sendUserInfo.txt new file mode 100644 index 0000000..d178df6 --- /dev/null +++ b/cloud/log/2019-12-25/10_sendUserInfo.txt @@ -0,0 +1,2 @@ +2019-12-25 10:42:40 filePath:1 card:11111111 name:1 deviceId:11 + diff --git a/cloud/log/2019-12-25/检测成功.txt b/cloud/log/2019-12-25/检测成功.txt new file mode 100644 index 0000000..c2b001a --- /dev/null +++ b/cloud/log/2019-12-25/检测成功.txt @@ -0,0 +1,10 @@ +2019-12-25 14:29:00 检测成功:C:\Users\taohandong\Pictures\test.jpg + +2019-12-25 14:31:49 检测成功:C:\Users\taohandong\Pictures\test.jpg + +2019-12-25 14:32:36 检测成功:C:\Users\taohandong\Pictures\test.jpg + +2019-12-25 14:36:12 检测成功:C:\Users\taohandong\Pictures\test.jpg + +2019-12-25 14:36:58 检测成功:C:\Users\taohandong\Pictures\test.jpg + diff --git a/cloud/mypulsar/pom.xml b/cloud/mypulsar/pom.xml index 200d2bc..4f6524a 100644 --- a/cloud/mypulsar/pom.xml +++ b/cloud/mypulsar/pom.xml @@ -142,15 +142,14 @@ spring-boot-maven-plugin true - nothing nothing - --> + diff --git a/cloud/mypulsar/src/main/java/com/example/mypulsar/MyRunnerableInt.java b/cloud/mypulsar/src/main/java/com/example/mypulsar/MyRunnerableInt.java index 779b181..8f543f7 100644 --- a/cloud/mypulsar/src/main/java/com/example/mypulsar/MyRunnerableInt.java +++ b/cloud/mypulsar/src/main/java/com/example/mypulsar/MyRunnerableInt.java @@ -261,7 +261,7 @@ public class MyRunnerableInt implements ApplicationRunner { break; case "pir"://人体感应 - log("人体感应:" + (value.equals("pir") ? "有人" : "无人")); + log("人体感应:" + value); value = (value.equals("pir") ? "有人" : "无人"); deviceBean.setValue(value); calOpenOrCloseDevWithPir(deviceBean); -- libgit2 0.21.0