Przeglądaj źródła

添加模板下载

suntianwu 3 lat temu
rodzic
commit
b144da8479

+ 31 - 0
src/main/java/com/iden/bms/init/FaceMonitorInit.java

@@ -0,0 +1,31 @@
+package com.iden.bms.init;
+
+
+
+import com.iden.bms.service.SysDictService;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
+
+import javax.annotation.Resource;
+
+
+@Order(1)
+public class FaceMonitorInit implements CommandLineRunner {
+
+    private static final Logger logger = LogManager.getLogger(FaceMonitorInit.class);
+
+    @Resource
+    private SysDictService sysDictService;
+
+
+    @Override
+    public void run(String... args) throws Exception {
+        logger.info("初始化字典 start ...........................");
+        sysDictService.initDictCache();
+        logger.info("初始化字典 end ...........................");
+    }
+
+}
+

+ 1 - 1
src/main/java/com/iden/bms/schedule/FaceIdenSchedule.java

@@ -1,7 +1,7 @@
 package com.iden.bms.schedule;
 
 
-import com.iden.bms.face.FaceIdenService;
+import com.iden.bms.service.FaceIdenService;
 import com.iden.common.cache.RedisKeyConstant;
 import com.iden.common.cache.RedisUtil;
 import org.springframework.context.annotation.Configuration;

+ 4 - 4
src/main/java/com/iden/bms/face/FaceIdenService.java

@@ -1,4 +1,4 @@
-package com.iden.bms.face;
+package com.iden.bms.service;
 
 
 
@@ -7,7 +7,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.face.monitor.FaceMonitor;
 import com.face.monitor.model.FaceModel;
-import com.iden.bms.service.PersonService;
+import com.iden.bms.tool.FaceIdenTool;
 import com.iden.common.cache.RedisKeyConstant;
 import com.iden.common.cache.RedisUtil;
 import com.iden.common.entity.*;
@@ -85,9 +85,9 @@ public class FaceIdenService {
                 //递归获取人员图像目录下的图像文件
                 File[] imgPersonFiles = FileUtil.getFiles(personImageDir);
 
-                logger.info("FaceIdenService.handleCameraImage 2...");
+                logger.info("FaceIdenService.handleCameraImage 2...imgPersonFiles==" + imgPersonFiles);
                 FaceMonitor faceMonitorPerson = null;
-                if(imgPersonFiles.length > 0){
+                if(imgPersonFiles != null && imgPersonFiles.length > 0){
                     faceMonitorPerson = FaceIdenTool.initFaceMonitor(idenRoot,imgPersonFiles);
                 }
 

+ 1 - 3
src/main/java/com/iden/bms/service/PersonService.java

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.iden.bms.face.FaceIdenTool;
+import com.iden.bms.tool.FaceIdenTool;
 import com.iden.common.cache.DictCache;
 import com.iden.common.entity.IdenCommunity;
 import com.iden.common.entity.IdenCrowd;
@@ -27,13 +27,11 @@ import com.iden.common.service.IdenPersonCrowdRefService;
 import com.iden.common.service.IdenPersonService;
 import com.iden.common.util.DateUtils;
 import com.iden.common.util.ImgUtil;
-import com.iden.common.util.StringUtil;
 import com.iden.common.vo.*;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.poi.POIXMLDocumentPart;
-import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.*;
 import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker;

+ 1 - 2
src/main/java/com/iden/bms/service/TraceService.java

@@ -3,7 +3,6 @@ package com.iden.bms.service;
 import cn.hutool.core.bean.BeanUtil;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
@@ -11,7 +10,7 @@ import com.alibaba.excel.write.metadata.fill.FillConfig;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.face.monitor.FaceMonitor;
 import com.face.monitor.model.FaceModel;
-import com.iden.bms.face.FaceIdenTool;
+import com.iden.bms.tool.FaceIdenTool;
 import com.iden.common.entity.IdenCamera;
 import com.iden.common.entity.IdenCameraVideo;
 import com.iden.common.entity.IdenCommunity;

+ 1 - 1
src/main/java/com/iden/bms/face/FaceIdenTool.java

@@ -1,4 +1,4 @@
-package com.iden.bms.face;
+package com.iden.bms.tool;
 
 import com.face.monitor.FaceMonitor;
 import com.face.monitor.model.FaceModel;