diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java index 0cbb418..aac8f3a 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.task; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.controller.AcsPermissionController; import com.casic.missiles.modular.system.model.Device; @@ -39,7 +40,9 @@ String startTime = sdf.format(calendar.getTime()); System.out.println(sdf.format(new Date()) + ":" + startTime + " " + endTime); - List deviceList = deviceService.selectList(null); + EntityWrapper query = new EntityWrapper(); + query.notLike("DEV_TYPE","5"); + List deviceList = deviceService.selectList(query); List deviceIds = new ArrayList<>(); for (Device device : deviceList) { deviceIds.add(Long.valueOf(device.getId())); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java index 0cbb418..aac8f3a 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.task; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.controller.AcsPermissionController; import com.casic.missiles.modular.system.model.Device; @@ -39,7 +40,9 @@ String startTime = sdf.format(calendar.getTime()); System.out.println(sdf.format(new Date()) + ":" + startTime + " " + endTime); - List deviceList = deviceService.selectList(null); + EntityWrapper query = new EntityWrapper(); + query.notLike("DEV_TYPE","5"); + List deviceList = deviceService.selectList(query); List deviceIds = new ArrayList<>(); for (Device device : deviceList) { deviceIds.add(Long.valueOf(device.getId())); diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 122cc0c..2c36416 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -31,4 +31,5 @@ List selectDeviceByType(String devType); List> selectListAll(); + } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java index 0cbb418..aac8f3a 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.task; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.controller.AcsPermissionController; import com.casic.missiles.modular.system.model.Device; @@ -39,7 +40,9 @@ String startTime = sdf.format(calendar.getTime()); System.out.println(sdf.format(new Date()) + ":" + startTime + " " + endTime); - List deviceList = deviceService.selectList(null); + EntityWrapper query = new EntityWrapper(); + query.notLike("DEV_TYPE","5"); + List deviceList = deviceService.selectList(query); List deviceIds = new ArrayList<>(); for (Device device : deviceList) { deviceIds.add(Long.valueOf(device.getId())); diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 122cc0c..2c36416 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -31,4 +31,5 @@ List selectDeviceByType(String devType); List> selectListAll(); + } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index c005a94..6a8a055 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -69,6 +69,13 @@ } @Override + public Device selectDeviceByCode(String deviceCode) { + EntityWrapper query = new EntityWrapper(); + query.eq("DEV_CODE",deviceCode); + return this.selectOne(query); + } + + @Override public List batchUpdateDB(List ids) { List failedIds = new ArrayList<>(); for (Integer id : ids) { diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java index 0cbb418..aac8f3a 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.task; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.controller.AcsPermissionController; import com.casic.missiles.modular.system.model.Device; @@ -39,7 +40,9 @@ String startTime = sdf.format(calendar.getTime()); System.out.println(sdf.format(new Date()) + ":" + startTime + " " + endTime); - List deviceList = deviceService.selectList(null); + EntityWrapper query = new EntityWrapper(); + query.notLike("DEV_TYPE","5"); + List deviceList = deviceService.selectList(query); List deviceIds = new ArrayList<>(); for (Device device : deviceList) { deviceIds.add(Long.valueOf(device.getId())); diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 122cc0c..2c36416 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -31,4 +31,5 @@ List selectDeviceByType(String devType); List> selectListAll(); + } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index c005a94..6a8a055 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -69,6 +69,13 @@ } @Override + public Device selectDeviceByCode(String deviceCode) { + EntityWrapper query = new EntityWrapper(); + query.eq("DEV_CODE",deviceCode); + return this.selectOne(query); + } + + @Override public List batchUpdateDB(List ids) { List failedIds = new ArrayList<>(); for (Integer id : ids) { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java index d3f9b9d..f45f961 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java @@ -45,17 +45,7 @@ @Autowired private IIrisDataService iIrisDataService; @Autowired - private ICommonFileService fileService; - @Autowired - private ICommonPersonService commonPersonService; - @Autowired - private IIrisPersonPhotoService personPhotoService; - @Autowired - private IIrisPersonService iIrisPersonService; - @Autowired private IIrisOfflineService iIrisOfflineService; - @Value("${casic.file.uploadPath:C://casic//tmp//}") - private String filePath; @RequestMapping("/dept/listAll") @ResponseBody diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java index 0cbb418..aac8f3a 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.task; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.controller.AcsPermissionController; import com.casic.missiles.modular.system.model.Device; @@ -39,7 +40,9 @@ String startTime = sdf.format(calendar.getTime()); System.out.println(sdf.format(new Date()) + ":" + startTime + " " + endTime); - List deviceList = deviceService.selectList(null); + EntityWrapper query = new EntityWrapper(); + query.notLike("DEV_TYPE","5"); + List deviceList = deviceService.selectList(query); List deviceIds = new ArrayList<>(); for (Device device : deviceList) { deviceIds.add(Long.valueOf(device.getId())); diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 122cc0c..2c36416 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -31,4 +31,5 @@ List selectDeviceByType(String devType); List> selectListAll(); + } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index c005a94..6a8a055 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -69,6 +69,13 @@ } @Override + public Device selectDeviceByCode(String deviceCode) { + EntityWrapper query = new EntityWrapper(); + query.eq("DEV_CODE",deviceCode); + return this.selectOne(query); + } + + @Override public List batchUpdateDB(List ids) { List failedIds = new ArrayList<>(); for (Integer id : ids) { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java index d3f9b9d..f45f961 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java @@ -45,17 +45,7 @@ @Autowired private IIrisDataService iIrisDataService; @Autowired - private ICommonFileService fileService; - @Autowired - private ICommonPersonService commonPersonService; - @Autowired - private IIrisPersonPhotoService personPhotoService; - @Autowired - private IIrisPersonService iIrisPersonService; - @Autowired private IIrisOfflineService iIrisOfflineService; - @Value("${casic.file.uploadPath:C://casic//tmp//}") - private String filePath; @RequestMapping("/dept/listAll") @ResponseBody diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java index 9db5b1c..57fa5f9 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java @@ -1,6 +1,8 @@ package com.casic.missiles.modular.register.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -9,4 +11,7 @@ @Select("select person_code from sys_person where person_code is not null") List personCodeList(); + + + List listIdsByType(@Param("deptIds") List deptIds, @Param("personType") String personType); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java index 0cbb418..aac8f3a 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.task; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.controller.AcsPermissionController; import com.casic.missiles.modular.system.model.Device; @@ -39,7 +40,9 @@ String startTime = sdf.format(calendar.getTime()); System.out.println(sdf.format(new Date()) + ":" + startTime + " " + endTime); - List deviceList = deviceService.selectList(null); + EntityWrapper query = new EntityWrapper(); + query.notLike("DEV_TYPE","5"); + List deviceList = deviceService.selectList(query); List deviceIds = new ArrayList<>(); for (Device device : deviceList) { deviceIds.add(Long.valueOf(device.getId())); diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 122cc0c..2c36416 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -31,4 +31,5 @@ List selectDeviceByType(String devType); List> selectListAll(); + } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index c005a94..6a8a055 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -69,6 +69,13 @@ } @Override + public Device selectDeviceByCode(String deviceCode) { + EntityWrapper query = new EntityWrapper(); + query.eq("DEV_CODE",deviceCode); + return this.selectOne(query); + } + + @Override public List batchUpdateDB(List ids) { List failedIds = new ArrayList<>(); for (Integer id : ids) { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java index d3f9b9d..f45f961 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java @@ -45,17 +45,7 @@ @Autowired private IIrisDataService iIrisDataService; @Autowired - private ICommonFileService fileService; - @Autowired - private ICommonPersonService commonPersonService; - @Autowired - private IIrisPersonPhotoService personPhotoService; - @Autowired - private IIrisPersonService iIrisPersonService; - @Autowired private IIrisOfflineService iIrisOfflineService; - @Value("${casic.file.uploadPath:C://casic//tmp//}") - private String filePath; @RequestMapping("/dept/listAll") @ResponseBody diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java index 9db5b1c..57fa5f9 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java @@ -1,6 +1,8 @@ package com.casic.missiles.modular.register.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -9,4 +11,7 @@ @Select("select person_code from sys_person where person_code is not null") List personCodeList(); + + + List listIdsByType(@Param("deptIds") List deptIds, @Param("personType") String personType); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java index 706ff7b..aea9bac 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java @@ -6,6 +6,7 @@ import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; import java.util.List; import java.util.Map; @@ -26,5 +27,7 @@ Long recognize(byte[] irisL1,byte[] irisL2,byte[] irisR1,byte[] irisR2) throws IOException; + byte[] getIrisCode(InputStream fis) throws IOException; + Map sendMessage(String msg); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java index 0cbb418..aac8f3a 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.task; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.controller.AcsPermissionController; import com.casic.missiles.modular.system.model.Device; @@ -39,7 +40,9 @@ String startTime = sdf.format(calendar.getTime()); System.out.println(sdf.format(new Date()) + ":" + startTime + " " + endTime); - List deviceList = deviceService.selectList(null); + EntityWrapper query = new EntityWrapper(); + query.notLike("DEV_TYPE","5"); + List deviceList = deviceService.selectList(query); List deviceIds = new ArrayList<>(); for (Device device : deviceList) { deviceIds.add(Long.valueOf(device.getId())); diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 122cc0c..2c36416 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -31,4 +31,5 @@ List selectDeviceByType(String devType); List> selectListAll(); + } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index c005a94..6a8a055 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -69,6 +69,13 @@ } @Override + public Device selectDeviceByCode(String deviceCode) { + EntityWrapper query = new EntityWrapper(); + query.eq("DEV_CODE",deviceCode); + return this.selectOne(query); + } + + @Override public List batchUpdateDB(List ids) { List failedIds = new ArrayList<>(); for (Integer id : ids) { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java index d3f9b9d..f45f961 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java @@ -45,17 +45,7 @@ @Autowired private IIrisDataService iIrisDataService; @Autowired - private ICommonFileService fileService; - @Autowired - private ICommonPersonService commonPersonService; - @Autowired - private IIrisPersonPhotoService personPhotoService; - @Autowired - private IIrisPersonService iIrisPersonService; - @Autowired private IIrisOfflineService iIrisOfflineService; - @Value("${casic.file.uploadPath:C://casic//tmp//}") - private String filePath; @RequestMapping("/dept/listAll") @ResponseBody diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java index 9db5b1c..57fa5f9 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java @@ -1,6 +1,8 @@ package com.casic.missiles.modular.register.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -9,4 +11,7 @@ @Select("select person_code from sys_person where person_code is not null") List personCodeList(); + + + List listIdsByType(@Param("deptIds") List deptIds, @Param("personType") String personType); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java index 706ff7b..aea9bac 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java @@ -6,6 +6,7 @@ import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; import java.util.List; import java.util.Map; @@ -26,5 +27,7 @@ Long recognize(byte[] irisL1,byte[] irisL2,byte[] irisR1,byte[] irisR2) throws IOException; + byte[] getIrisCode(InputStream fis) throws IOException; + Map sendMessage(String msg); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java index 48ad205..7f9986f 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java @@ -50,4 +50,6 @@ List personCodeList(); List updateData(List personIds, List deviceIds); + + } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java index 0cbb418..aac8f3a 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.task; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.controller.AcsPermissionController; import com.casic.missiles.modular.system.model.Device; @@ -39,7 +40,9 @@ String startTime = sdf.format(calendar.getTime()); System.out.println(sdf.format(new Date()) + ":" + startTime + " " + endTime); - List deviceList = deviceService.selectList(null); + EntityWrapper query = new EntityWrapper(); + query.notLike("DEV_TYPE","5"); + List deviceList = deviceService.selectList(query); List deviceIds = new ArrayList<>(); for (Device device : deviceList) { deviceIds.add(Long.valueOf(device.getId())); diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 122cc0c..2c36416 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -31,4 +31,5 @@ List selectDeviceByType(String devType); List> selectListAll(); + } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index c005a94..6a8a055 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -69,6 +69,13 @@ } @Override + public Device selectDeviceByCode(String deviceCode) { + EntityWrapper query = new EntityWrapper(); + query.eq("DEV_CODE",deviceCode); + return this.selectOne(query); + } + + @Override public List batchUpdateDB(List ids) { List failedIds = new ArrayList<>(); for (Integer id : ids) { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java index d3f9b9d..f45f961 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java @@ -45,17 +45,7 @@ @Autowired private IIrisDataService iIrisDataService; @Autowired - private ICommonFileService fileService; - @Autowired - private ICommonPersonService commonPersonService; - @Autowired - private IIrisPersonPhotoService personPhotoService; - @Autowired - private IIrisPersonService iIrisPersonService; - @Autowired private IIrisOfflineService iIrisOfflineService; - @Value("${casic.file.uploadPath:C://casic//tmp//}") - private String filePath; @RequestMapping("/dept/listAll") @ResponseBody diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java index 9db5b1c..57fa5f9 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java @@ -1,6 +1,8 @@ package com.casic.missiles.modular.register.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -9,4 +11,7 @@ @Select("select person_code from sys_person where person_code is not null") List personCodeList(); + + + List listIdsByType(@Param("deptIds") List deptIds, @Param("personType") String personType); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java index 706ff7b..aea9bac 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java @@ -6,6 +6,7 @@ import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; import java.util.List; import java.util.Map; @@ -26,5 +27,7 @@ Long recognize(byte[] irisL1,byte[] irisL2,byte[] irisR1,byte[] irisR2) throws IOException; + byte[] getIrisCode(InputStream fis) throws IOException; + Map sendMessage(String msg); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java index 48ad205..7f9986f 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java @@ -50,4 +50,6 @@ List personCodeList(); List updateData(List personIds, List deviceIds); + + } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java index e7c3cc4..00c9efa 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java @@ -159,6 +159,7 @@ } //与c#的服务通信，获取虹膜编码 + @Override public byte[] getIrisCode(InputStream fis) throws IOException { byte[] irisCode = new byte[1024]; diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java index 0cbb418..aac8f3a 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.task; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.controller.AcsPermissionController; import com.casic.missiles.modular.system.model.Device; @@ -39,7 +40,9 @@ String startTime = sdf.format(calendar.getTime()); System.out.println(sdf.format(new Date()) + ":" + startTime + " " + endTime); - List deviceList = deviceService.selectList(null); + EntityWrapper query = new EntityWrapper(); + query.notLike("DEV_TYPE","5"); + List deviceList = deviceService.selectList(query); List deviceIds = new ArrayList<>(); for (Device device : deviceList) { deviceIds.add(Long.valueOf(device.getId())); diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 122cc0c..2c36416 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -31,4 +31,5 @@ List selectDeviceByType(String devType); List> selectListAll(); + } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index c005a94..6a8a055 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -69,6 +69,13 @@ } @Override + public Device selectDeviceByCode(String deviceCode) { + EntityWrapper query = new EntityWrapper(); + query.eq("DEV_CODE",deviceCode); + return this.selectOne(query); + } + + @Override public List batchUpdateDB(List ids) { List failedIds = new ArrayList<>(); for (Integer id : ids) { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java index d3f9b9d..f45f961 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java @@ -45,17 +45,7 @@ @Autowired private IIrisDataService iIrisDataService; @Autowired - private ICommonFileService fileService; - @Autowired - private ICommonPersonService commonPersonService; - @Autowired - private IIrisPersonPhotoService personPhotoService; - @Autowired - private IIrisPersonService iIrisPersonService; - @Autowired private IIrisOfflineService iIrisOfflineService; - @Value("${casic.file.uploadPath:C://casic//tmp//}") - private String filePath; @RequestMapping("/dept/listAll") @ResponseBody diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java index 9db5b1c..57fa5f9 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java @@ -1,6 +1,8 @@ package com.casic.missiles.modular.register.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -9,4 +11,7 @@ @Select("select person_code from sys_person where person_code is not null") List personCodeList(); + + + List listIdsByType(@Param("deptIds") List deptIds, @Param("personType") String personType); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java index 706ff7b..aea9bac 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java @@ -6,6 +6,7 @@ import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; import java.util.List; import java.util.Map; @@ -26,5 +27,7 @@ Long recognize(byte[] irisL1,byte[] irisL2,byte[] irisR1,byte[] irisR2) throws IOException; + byte[] getIrisCode(InputStream fis) throws IOException; + Map sendMessage(String msg); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java index 48ad205..7f9986f 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java @@ -50,4 +50,6 @@ List personCodeList(); List updateData(List personIds, List deviceIds); + + } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java index e7c3cc4..00c9efa 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java @@ -159,6 +159,7 @@ } //与c#的服务通信，获取虹膜编码 + @Override public byte[] getIrisCode(InputStream fis) throws IOException { byte[] irisCode = new byte[1024]; diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java index ace7d17..5a9fac5 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java @@ -32,7 +32,6 @@ public class IrisOfflineServiceImpl implements IIrisOfflineService { private static final Logger logger = LoggerFactory.getLogger(IrisOfflineServiceImpl.class); - @Autowired private ICommonDeptService deptService; @Autowired @@ -45,8 +44,7 @@ private IIrisPersonPhotoService personPhotoService; @Autowired private IIrisPersonService iIrisPersonService; - @Value("${casic.file.uploadPath:C://casic//tmp//}") - private String filePath; + @Override @Transactional(rollbackFor = Exception.class) @@ -66,12 +64,6 @@ if(ToolUtil.isNotEmpty(uploadDTO.getIrisL1())) { irisL1 = Base64.getDecoder().decode(uploadDTO.getIrisL1()); } -// if(ToolUtil.isNotEmpty(uploadDTO.getImageL1Data())){ -// String path = fileService.saveFileBase64Image(uploadDTO.getImageL1Data()); -// irisL1 = iIrisDataService.getIrisCode(new FileInputStream(this.filePath + path)); -// System.out.println(irisL1); -// System.out.println(Base64.getDecoder().decode(uploadDTO.getIrisL1())); -// } byte[] irisL2 = null; if(ToolUtil.isNotEmpty(uploadDTO.getIrisL2())) { @@ -128,6 +120,9 @@ Person person = new Person(); Long id = IdWorker.getId(); person.setId(id); + person.setDelflag("0"); + person.setPersonType("1"); + person.setOprationId((long)1); if(ToolUtil.isNotEmpty(uploadDTO.getStaffNo())){ person.setPersonCode(uploadDTO.getStaffNo()); }else { diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java index 0cbb418..aac8f3a 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.task; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.controller.AcsPermissionController; import com.casic.missiles.modular.system.model.Device; @@ -39,7 +40,9 @@ String startTime = sdf.format(calendar.getTime()); System.out.println(sdf.format(new Date()) + ":" + startTime + " " + endTime); - List deviceList = deviceService.selectList(null); + EntityWrapper query = new EntityWrapper(); + query.notLike("DEV_TYPE","5"); + List deviceList = deviceService.selectList(query); List deviceIds = new ArrayList<>(); for (Device device : deviceList) { deviceIds.add(Long.valueOf(device.getId())); diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 122cc0c..2c36416 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -31,4 +31,5 @@ List selectDeviceByType(String devType); List> selectListAll(); + } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index c005a94..6a8a055 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -69,6 +69,13 @@ } @Override + public Device selectDeviceByCode(String deviceCode) { + EntityWrapper query = new EntityWrapper(); + query.eq("DEV_CODE",deviceCode); + return this.selectOne(query); + } + + @Override public List batchUpdateDB(List ids) { List failedIds = new ArrayList<>(); for (Integer id : ids) { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java index d3f9b9d..f45f961 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java @@ -45,17 +45,7 @@ @Autowired private IIrisDataService iIrisDataService; @Autowired - private ICommonFileService fileService; - @Autowired - private ICommonPersonService commonPersonService; - @Autowired - private IIrisPersonPhotoService personPhotoService; - @Autowired - private IIrisPersonService iIrisPersonService; - @Autowired private IIrisOfflineService iIrisOfflineService; - @Value("${casic.file.uploadPath:C://casic//tmp//}") - private String filePath; @RequestMapping("/dept/listAll") @ResponseBody diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java index 9db5b1c..57fa5f9 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java @@ -1,6 +1,8 @@ package com.casic.missiles.modular.register.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -9,4 +11,7 @@ @Select("select person_code from sys_person where person_code is not null") List personCodeList(); + + + List listIdsByType(@Param("deptIds") List deptIds, @Param("personType") String personType); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java index 706ff7b..aea9bac 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java @@ -6,6 +6,7 @@ import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; import java.util.List; import java.util.Map; @@ -26,5 +27,7 @@ Long recognize(byte[] irisL1,byte[] irisL2,byte[] irisR1,byte[] irisR2) throws IOException; + byte[] getIrisCode(InputStream fis) throws IOException; + Map sendMessage(String msg); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java index 48ad205..7f9986f 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java @@ -50,4 +50,6 @@ List personCodeList(); List updateData(List personIds, List deviceIds); + + } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java index e7c3cc4..00c9efa 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java @@ -159,6 +159,7 @@ } //与c#的服务通信，获取虹膜编码 + @Override public byte[] getIrisCode(InputStream fis) throws IOException { byte[] irisCode = new byte[1024]; diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java index ace7d17..5a9fac5 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java @@ -32,7 +32,6 @@ public class IrisOfflineServiceImpl implements IIrisOfflineService { private static final Logger logger = LoggerFactory.getLogger(IrisOfflineServiceImpl.class); - @Autowired private ICommonDeptService deptService; @Autowired @@ -45,8 +44,7 @@ private IIrisPersonPhotoService personPhotoService; @Autowired private IIrisPersonService iIrisPersonService; - @Value("${casic.file.uploadPath:C://casic//tmp//}") - private String filePath; + @Override @Transactional(rollbackFor = Exception.class) @@ -66,12 +64,6 @@ if(ToolUtil.isNotEmpty(uploadDTO.getIrisL1())) { irisL1 = Base64.getDecoder().decode(uploadDTO.getIrisL1()); } -// if(ToolUtil.isNotEmpty(uploadDTO.getImageL1Data())){ -// String path = fileService.saveFileBase64Image(uploadDTO.getImageL1Data()); -// irisL1 = iIrisDataService.getIrisCode(new FileInputStream(this.filePath + path)); -// System.out.println(irisL1); -// System.out.println(Base64.getDecoder().decode(uploadDTO.getIrisL1())); -// } byte[] irisL2 = null; if(ToolUtil.isNotEmpty(uploadDTO.getIrisL2())) { @@ -128,6 +120,9 @@ Person person = new Person(); Long id = IdWorker.getId(); person.setId(id); + person.setDelflag("0"); + person.setPersonType("1"); + person.setOprationId((long)1); if(ToolUtil.isNotEmpty(uploadDTO.getStaffNo())){ person.setPersonCode(uploadDTO.getStaffNo()); }else { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java index b5e6a7e..7b65ad5 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java @@ -1,10 +1,12 @@ package com.casic.missiles.modular.register.service.impl; import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.register.dao.IrisPersonPhotoMapper; import com.casic.missiles.modular.register.model.IrisPersonPhoto; import com.casic.missiles.modular.register.service.IIrisPersonPhotoService; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.service.IPersonPhotoSupportService; import org.springframework.stereotype.Service; import java.util.List; @@ -18,7 +20,7 @@ * @since 2020-04-01 */ @Service -public class IrisPersonPhotoServiceImpl extends ServiceImpl implements IIrisPersonPhotoService { +public class IrisPersonPhotoServiceImpl extends ServiceImpl implements IIrisPersonPhotoService, IPersonPhotoSupportService { @Override public List selectByPersonIds(List personIds) { @@ -26,4 +28,14 @@ query.in("PERSON_ID",personIds); return this.selectList(query); } + + @Override + public String selectPhotoDataById(Long personId) { + IrisPersonPhoto irisPersonPhoto = this.selectById(personId); + if(ToolUtil.isNotEmpty(irisPersonPhoto)){ + return irisPersonPhoto.getPhotoData(); + }else{ + return null; + } + } } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java index 0cbb418..aac8f3a 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.task; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.controller.AcsPermissionController; import com.casic.missiles.modular.system.model.Device; @@ -39,7 +40,9 @@ String startTime = sdf.format(calendar.getTime()); System.out.println(sdf.format(new Date()) + ":" + startTime + " " + endTime); - List deviceList = deviceService.selectList(null); + EntityWrapper query = new EntityWrapper(); + query.notLike("DEV_TYPE","5"); + List deviceList = deviceService.selectList(query); List deviceIds = new ArrayList<>(); for (Device device : deviceList) { deviceIds.add(Long.valueOf(device.getId())); diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 122cc0c..2c36416 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -31,4 +31,5 @@ List selectDeviceByType(String devType); List> selectListAll(); + } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index c005a94..6a8a055 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -69,6 +69,13 @@ } @Override + public Device selectDeviceByCode(String deviceCode) { + EntityWrapper query = new EntityWrapper(); + query.eq("DEV_CODE",deviceCode); + return this.selectOne(query); + } + + @Override public List batchUpdateDB(List ids) { List failedIds = new ArrayList<>(); for (Integer id : ids) { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java index d3f9b9d..f45f961 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java @@ -45,17 +45,7 @@ @Autowired private IIrisDataService iIrisDataService; @Autowired - private ICommonFileService fileService; - @Autowired - private ICommonPersonService commonPersonService; - @Autowired - private IIrisPersonPhotoService personPhotoService; - @Autowired - private IIrisPersonService iIrisPersonService; - @Autowired private IIrisOfflineService iIrisOfflineService; - @Value("${casic.file.uploadPath:C://casic//tmp//}") - private String filePath; @RequestMapping("/dept/listAll") @ResponseBody diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java index 9db5b1c..57fa5f9 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java @@ -1,6 +1,8 @@ package com.casic.missiles.modular.register.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -9,4 +11,7 @@ @Select("select person_code from sys_person where person_code is not null") List personCodeList(); + + + List listIdsByType(@Param("deptIds") List deptIds, @Param("personType") String personType); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java index 706ff7b..aea9bac 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java @@ -6,6 +6,7 @@ import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; import java.util.List; import java.util.Map; @@ -26,5 +27,7 @@ Long recognize(byte[] irisL1,byte[] irisL2,byte[] irisR1,byte[] irisR2) throws IOException; + byte[] getIrisCode(InputStream fis) throws IOException; + Map sendMessage(String msg); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java index 48ad205..7f9986f 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java @@ -50,4 +50,6 @@ List personCodeList(); List updateData(List personIds, List deviceIds); + + } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java index e7c3cc4..00c9efa 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java @@ -159,6 +159,7 @@ } //与c#的服务通信，获取虹膜编码 + @Override public byte[] getIrisCode(InputStream fis) throws IOException { byte[] irisCode = new byte[1024]; diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java index ace7d17..5a9fac5 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java @@ -32,7 +32,6 @@ public class IrisOfflineServiceImpl implements IIrisOfflineService { private static final Logger logger = LoggerFactory.getLogger(IrisOfflineServiceImpl.class); - @Autowired private ICommonDeptService deptService; @Autowired @@ -45,8 +44,7 @@ private IIrisPersonPhotoService personPhotoService; @Autowired private IIrisPersonService iIrisPersonService; - @Value("${casic.file.uploadPath:C://casic//tmp//}") - private String filePath; + @Override @Transactional(rollbackFor = Exception.class) @@ -66,12 +64,6 @@ if(ToolUtil.isNotEmpty(uploadDTO.getIrisL1())) { irisL1 = Base64.getDecoder().decode(uploadDTO.getIrisL1()); } -// if(ToolUtil.isNotEmpty(uploadDTO.getImageL1Data())){ -// String path = fileService.saveFileBase64Image(uploadDTO.getImageL1Data()); -// irisL1 = iIrisDataService.getIrisCode(new FileInputStream(this.filePath + path)); -// System.out.println(irisL1); -// System.out.println(Base64.getDecoder().decode(uploadDTO.getIrisL1())); -// } byte[] irisL2 = null; if(ToolUtil.isNotEmpty(uploadDTO.getIrisL2())) { @@ -128,6 +120,9 @@ Person person = new Person(); Long id = IdWorker.getId(); person.setId(id); + person.setDelflag("0"); + person.setPersonType("1"); + person.setOprationId((long)1); if(ToolUtil.isNotEmpty(uploadDTO.getStaffNo())){ person.setPersonCode(uploadDTO.getStaffNo()); }else { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java index b5e6a7e..7b65ad5 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java @@ -1,10 +1,12 @@ package com.casic.missiles.modular.register.service.impl; import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.register.dao.IrisPersonPhotoMapper; import com.casic.missiles.modular.register.model.IrisPersonPhoto; import com.casic.missiles.modular.register.service.IIrisPersonPhotoService; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.service.IPersonPhotoSupportService; import org.springframework.stereotype.Service; import java.util.List; @@ -18,7 +20,7 @@ * @since 2020-04-01 */ @Service -public class IrisPersonPhotoServiceImpl extends ServiceImpl implements IIrisPersonPhotoService { +public class IrisPersonPhotoServiceImpl extends ServiceImpl implements IIrisPersonPhotoService, IPersonPhotoSupportService { @Override public List selectByPersonIds(List personIds) { @@ -26,4 +28,14 @@ query.in("PERSON_ID",personIds); return this.selectList(query); } + + @Override + public String selectPhotoDataById(Long personId) { + IrisPersonPhoto irisPersonPhoto = this.selectById(personId); + if(ToolUtil.isNotEmpty(irisPersonPhoto)){ + return irisPersonPhoto.getPhotoData(); + }else{ + return null; + } + } } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java index b6fb18c..46ae909 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java @@ -34,6 +34,7 @@ import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.model.Person; import com.casic.missiles.modular.system.service.IDeviceSupportService; +import com.casic.missiles.modular.system.service.IIrisPersonSupportService; import com.casic.missiles.modular.system.util.SocketClientUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,7 +54,7 @@ import java.util.*; @Service -public class IrisPersonServiceImpl implements IIrisPersonService { +public class IrisPersonServiceImpl implements IIrisPersonService, IIrisPersonSupportService { private static final Logger logger = LoggerFactory.getLogger(IrisPersonServiceImpl.class); protected static final Map mapperExcel = new HashMap<>(); static { @@ -338,4 +339,9 @@ } return errorList; } + + @Override + public List listIdsByType(DataScope dataScope, String personType) { + return irisPersonMapper.listIdsByType(dataScope.getDeptIds(), personType); + } } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java index 0cbb418..aac8f3a 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.task; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.controller.AcsPermissionController; import com.casic.missiles.modular.system.model.Device; @@ -39,7 +40,9 @@ String startTime = sdf.format(calendar.getTime()); System.out.println(sdf.format(new Date()) + ":" + startTime + " " + endTime); - List deviceList = deviceService.selectList(null); + EntityWrapper query = new EntityWrapper(); + query.notLike("DEV_TYPE","5"); + List deviceList = deviceService.selectList(query); List deviceIds = new ArrayList<>(); for (Device device : deviceList) { deviceIds.add(Long.valueOf(device.getId())); diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 122cc0c..2c36416 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -31,4 +31,5 @@ List selectDeviceByType(String devType); List> selectListAll(); + } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index c005a94..6a8a055 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -69,6 +69,13 @@ } @Override + public Device selectDeviceByCode(String deviceCode) { + EntityWrapper query = new EntityWrapper(); + query.eq("DEV_CODE",deviceCode); + return this.selectOne(query); + } + + @Override public List batchUpdateDB(List ids) { List failedIds = new ArrayList<>(); for (Integer id : ids) { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java index d3f9b9d..f45f961 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java @@ -45,17 +45,7 @@ @Autowired private IIrisDataService iIrisDataService; @Autowired - private ICommonFileService fileService; - @Autowired - private ICommonPersonService commonPersonService; - @Autowired - private IIrisPersonPhotoService personPhotoService; - @Autowired - private IIrisPersonService iIrisPersonService; - @Autowired private IIrisOfflineService iIrisOfflineService; - @Value("${casic.file.uploadPath:C://casic//tmp//}") - private String filePath; @RequestMapping("/dept/listAll") @ResponseBody diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java index 9db5b1c..57fa5f9 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java @@ -1,6 +1,8 @@ package com.casic.missiles.modular.register.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -9,4 +11,7 @@ @Select("select person_code from sys_person where person_code is not null") List personCodeList(); + + + List listIdsByType(@Param("deptIds") List deptIds, @Param("personType") String personType); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java index 706ff7b..aea9bac 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java @@ -6,6 +6,7 @@ import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; import java.util.List; import java.util.Map; @@ -26,5 +27,7 @@ Long recognize(byte[] irisL1,byte[] irisL2,byte[] irisR1,byte[] irisR2) throws IOException; + byte[] getIrisCode(InputStream fis) throws IOException; + Map sendMessage(String msg); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java index 48ad205..7f9986f 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java @@ -50,4 +50,6 @@ List personCodeList(); List updateData(List personIds, List deviceIds); + + } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java index e7c3cc4..00c9efa 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java @@ -159,6 +159,7 @@ } //与c#的服务通信，获取虹膜编码 + @Override public byte[] getIrisCode(InputStream fis) throws IOException { byte[] irisCode = new byte[1024]; diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java index ace7d17..5a9fac5 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java @@ -32,7 +32,6 @@ public class IrisOfflineServiceImpl implements IIrisOfflineService { private static final Logger logger = LoggerFactory.getLogger(IrisOfflineServiceImpl.class); - @Autowired private ICommonDeptService deptService; @Autowired @@ -45,8 +44,7 @@ private IIrisPersonPhotoService personPhotoService; @Autowired private IIrisPersonService iIrisPersonService; - @Value("${casic.file.uploadPath:C://casic//tmp//}") - private String filePath; + @Override @Transactional(rollbackFor = Exception.class) @@ -66,12 +64,6 @@ if(ToolUtil.isNotEmpty(uploadDTO.getIrisL1())) { irisL1 = Base64.getDecoder().decode(uploadDTO.getIrisL1()); } -// if(ToolUtil.isNotEmpty(uploadDTO.getImageL1Data())){ -// String path = fileService.saveFileBase64Image(uploadDTO.getImageL1Data()); -// irisL1 = iIrisDataService.getIrisCode(new FileInputStream(this.filePath + path)); -// System.out.println(irisL1); -// System.out.println(Base64.getDecoder().decode(uploadDTO.getIrisL1())); -// } byte[] irisL2 = null; if(ToolUtil.isNotEmpty(uploadDTO.getIrisL2())) { @@ -128,6 +120,9 @@ Person person = new Person(); Long id = IdWorker.getId(); person.setId(id); + person.setDelflag("0"); + person.setPersonType("1"); + person.setOprationId((long)1); if(ToolUtil.isNotEmpty(uploadDTO.getStaffNo())){ person.setPersonCode(uploadDTO.getStaffNo()); }else { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java index b5e6a7e..7b65ad5 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java @@ -1,10 +1,12 @@ package com.casic.missiles.modular.register.service.impl; import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.register.dao.IrisPersonPhotoMapper; import com.casic.missiles.modular.register.model.IrisPersonPhoto; import com.casic.missiles.modular.register.service.IIrisPersonPhotoService; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.service.IPersonPhotoSupportService; import org.springframework.stereotype.Service; import java.util.List; @@ -18,7 +20,7 @@ * @since 2020-04-01 */ @Service -public class IrisPersonPhotoServiceImpl extends ServiceImpl implements IIrisPersonPhotoService { +public class IrisPersonPhotoServiceImpl extends ServiceImpl implements IIrisPersonPhotoService, IPersonPhotoSupportService { @Override public List selectByPersonIds(List personIds) { @@ -26,4 +28,14 @@ query.in("PERSON_ID",personIds); return this.selectList(query); } + + @Override + public String selectPhotoDataById(Long personId) { + IrisPersonPhoto irisPersonPhoto = this.selectById(personId); + if(ToolUtil.isNotEmpty(irisPersonPhoto)){ + return irisPersonPhoto.getPhotoData(); + }else{ + return null; + } + } } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java index b6fb18c..46ae909 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java @@ -34,6 +34,7 @@ import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.model.Person; import com.casic.missiles.modular.system.service.IDeviceSupportService; +import com.casic.missiles.modular.system.service.IIrisPersonSupportService; import com.casic.missiles.modular.system.util.SocketClientUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,7 +54,7 @@ import java.util.*; @Service -public class IrisPersonServiceImpl implements IIrisPersonService { +public class IrisPersonServiceImpl implements IIrisPersonService, IIrisPersonSupportService { private static final Logger logger = LoggerFactory.getLogger(IrisPersonServiceImpl.class); protected static final Map mapperExcel = new HashMap<>(); static { @@ -338,4 +339,9 @@ } return errorList; } + + @Override + public List listIdsByType(DataScope dataScope, String personType) { + return irisPersonMapper.listIdsByType(dataScope.getDeptIds(), personType); + } } diff --git a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java index 161167e..ce73011 100644 --- a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java +++ b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java @@ -16,5 +16,7 @@ List selectDeviceByDoor(String doorCode); + Device selectDeviceByCode(String deviceCode); + Device selectById(Serializable id); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java index 0cbb418..aac8f3a 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.task; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.controller.AcsPermissionController; import com.casic.missiles.modular.system.model.Device; @@ -39,7 +40,9 @@ String startTime = sdf.format(calendar.getTime()); System.out.println(sdf.format(new Date()) + ":" + startTime + " " + endTime); - List deviceList = deviceService.selectList(null); + EntityWrapper query = new EntityWrapper(); + query.notLike("DEV_TYPE","5"); + List deviceList = deviceService.selectList(query); List deviceIds = new ArrayList<>(); for (Device device : deviceList) { deviceIds.add(Long.valueOf(device.getId())); diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 122cc0c..2c36416 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -31,4 +31,5 @@ List selectDeviceByType(String devType); List> selectListAll(); + } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index c005a94..6a8a055 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -69,6 +69,13 @@ } @Override + public Device selectDeviceByCode(String deviceCode) { + EntityWrapper query = new EntityWrapper(); + query.eq("DEV_CODE",deviceCode); + return this.selectOne(query); + } + + @Override public List batchUpdateDB(List ids) { List failedIds = new ArrayList<>(); for (Integer id : ids) { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java index d3f9b9d..f45f961 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java @@ -45,17 +45,7 @@ @Autowired private IIrisDataService iIrisDataService; @Autowired - private ICommonFileService fileService; - @Autowired - private ICommonPersonService commonPersonService; - @Autowired - private IIrisPersonPhotoService personPhotoService; - @Autowired - private IIrisPersonService iIrisPersonService; - @Autowired private IIrisOfflineService iIrisOfflineService; - @Value("${casic.file.uploadPath:C://casic//tmp//}") - private String filePath; @RequestMapping("/dept/listAll") @ResponseBody diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java index 9db5b1c..57fa5f9 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java @@ -1,6 +1,8 @@ package com.casic.missiles.modular.register.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -9,4 +11,7 @@ @Select("select person_code from sys_person where person_code is not null") List personCodeList(); + + + List listIdsByType(@Param("deptIds") List deptIds, @Param("personType") String personType); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java index 706ff7b..aea9bac 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java @@ -6,6 +6,7 @@ import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; import java.util.List; import java.util.Map; @@ -26,5 +27,7 @@ Long recognize(byte[] irisL1,byte[] irisL2,byte[] irisR1,byte[] irisR2) throws IOException; + byte[] getIrisCode(InputStream fis) throws IOException; + Map sendMessage(String msg); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java index 48ad205..7f9986f 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java @@ -50,4 +50,6 @@ List personCodeList(); List updateData(List personIds, List deviceIds); + + } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java index e7c3cc4..00c9efa 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java @@ -159,6 +159,7 @@ } //与c#的服务通信，获取虹膜编码 + @Override public byte[] getIrisCode(InputStream fis) throws IOException { byte[] irisCode = new byte[1024]; diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java index ace7d17..5a9fac5 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java @@ -32,7 +32,6 @@ public class IrisOfflineServiceImpl implements IIrisOfflineService { private static final Logger logger = LoggerFactory.getLogger(IrisOfflineServiceImpl.class); - @Autowired private ICommonDeptService deptService; @Autowired @@ -45,8 +44,7 @@ private IIrisPersonPhotoService personPhotoService; @Autowired private IIrisPersonService iIrisPersonService; - @Value("${casic.file.uploadPath:C://casic//tmp//}") - private String filePath; + @Override @Transactional(rollbackFor = Exception.class) @@ -66,12 +64,6 @@ if(ToolUtil.isNotEmpty(uploadDTO.getIrisL1())) { irisL1 = Base64.getDecoder().decode(uploadDTO.getIrisL1()); } -// if(ToolUtil.isNotEmpty(uploadDTO.getImageL1Data())){ -// String path = fileService.saveFileBase64Image(uploadDTO.getImageL1Data()); -// irisL1 = iIrisDataService.getIrisCode(new FileInputStream(this.filePath + path)); -// System.out.println(irisL1); -// System.out.println(Base64.getDecoder().decode(uploadDTO.getIrisL1())); -// } byte[] irisL2 = null; if(ToolUtil.isNotEmpty(uploadDTO.getIrisL2())) { @@ -128,6 +120,9 @@ Person person = new Person(); Long id = IdWorker.getId(); person.setId(id); + person.setDelflag("0"); + person.setPersonType("1"); + person.setOprationId((long)1); if(ToolUtil.isNotEmpty(uploadDTO.getStaffNo())){ person.setPersonCode(uploadDTO.getStaffNo()); }else { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java index b5e6a7e..7b65ad5 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java @@ -1,10 +1,12 @@ package com.casic.missiles.modular.register.service.impl; import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.register.dao.IrisPersonPhotoMapper; import com.casic.missiles.modular.register.model.IrisPersonPhoto; import com.casic.missiles.modular.register.service.IIrisPersonPhotoService; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.service.IPersonPhotoSupportService; import org.springframework.stereotype.Service; import java.util.List; @@ -18,7 +20,7 @@ * @since 2020-04-01 */ @Service -public class IrisPersonPhotoServiceImpl extends ServiceImpl implements IIrisPersonPhotoService { +public class IrisPersonPhotoServiceImpl extends ServiceImpl implements IIrisPersonPhotoService, IPersonPhotoSupportService { @Override public List selectByPersonIds(List personIds) { @@ -26,4 +28,14 @@ query.in("PERSON_ID",personIds); return this.selectList(query); } + + @Override + public String selectPhotoDataById(Long personId) { + IrisPersonPhoto irisPersonPhoto = this.selectById(personId); + if(ToolUtil.isNotEmpty(irisPersonPhoto)){ + return irisPersonPhoto.getPhotoData(); + }else{ + return null; + } + } } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java index b6fb18c..46ae909 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java @@ -34,6 +34,7 @@ import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.model.Person; import com.casic.missiles.modular.system.service.IDeviceSupportService; +import com.casic.missiles.modular.system.service.IIrisPersonSupportService; import com.casic.missiles.modular.system.util.SocketClientUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,7 +54,7 @@ import java.util.*; @Service -public class IrisPersonServiceImpl implements IIrisPersonService { +public class IrisPersonServiceImpl implements IIrisPersonService, IIrisPersonSupportService { private static final Logger logger = LoggerFactory.getLogger(IrisPersonServiceImpl.class); protected static final Map mapperExcel = new HashMap<>(); static { @@ -338,4 +339,9 @@ } return errorList; } + + @Override + public List listIdsByType(DataScope dataScope, String personType) { + return irisPersonMapper.listIdsByType(dataScope.getDeptIds(), personType); + } } diff --git a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java index 161167e..ce73011 100644 --- a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java +++ b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java @@ -16,5 +16,7 @@ List selectDeviceByDoor(String doorCode); + Device selectDeviceByCode(String deviceCode); + Device selectById(Serializable id); } diff --git a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IRecordSupportService.java b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IRecordSupportService.java index caeef71..0113fd1 100644 --- a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IRecordSupportService.java +++ b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IRecordSupportService.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.system.service; +import com.casic.missiles.modular.system.model.RecognitionRecords; + import java.util.List; public interface IRecordSupportService { @@ -12,4 +14,8 @@ * @return 返回同步失败的设备编号 */ List syncRecords(List devIds, String startTime, String endTime); + + boolean insert(RecognitionRecords record); + + boolean insertBatch(List records); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java index 0cbb418..aac8f3a 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.task; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.controller.AcsPermissionController; import com.casic.missiles.modular.system.model.Device; @@ -39,7 +40,9 @@ String startTime = sdf.format(calendar.getTime()); System.out.println(sdf.format(new Date()) + ":" + startTime + " " + endTime); - List deviceList = deviceService.selectList(null); + EntityWrapper query = new EntityWrapper(); + query.notLike("DEV_TYPE","5"); + List deviceList = deviceService.selectList(query); List deviceIds = new ArrayList<>(); for (Device device : deviceList) { deviceIds.add(Long.valueOf(device.getId())); diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 122cc0c..2c36416 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -31,4 +31,5 @@ List selectDeviceByType(String devType); List> selectListAll(); + } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index c005a94..6a8a055 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -69,6 +69,13 @@ } @Override + public Device selectDeviceByCode(String deviceCode) { + EntityWrapper query = new EntityWrapper(); + query.eq("DEV_CODE",deviceCode); + return this.selectOne(query); + } + + @Override public List batchUpdateDB(List ids) { List failedIds = new ArrayList<>(); for (Integer id : ids) { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java index d3f9b9d..f45f961 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java @@ -45,17 +45,7 @@ @Autowired private IIrisDataService iIrisDataService; @Autowired - private ICommonFileService fileService; - @Autowired - private ICommonPersonService commonPersonService; - @Autowired - private IIrisPersonPhotoService personPhotoService; - @Autowired - private IIrisPersonService iIrisPersonService; - @Autowired private IIrisOfflineService iIrisOfflineService; - @Value("${casic.file.uploadPath:C://casic//tmp//}") - private String filePath; @RequestMapping("/dept/listAll") @ResponseBody diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java index 9db5b1c..57fa5f9 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java @@ -1,6 +1,8 @@ package com.casic.missiles.modular.register.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -9,4 +11,7 @@ @Select("select person_code from sys_person where person_code is not null") List personCodeList(); + + + List listIdsByType(@Param("deptIds") List deptIds, @Param("personType") String personType); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java index 706ff7b..aea9bac 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java @@ -6,6 +6,7 @@ import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; import java.util.List; import java.util.Map; @@ -26,5 +27,7 @@ Long recognize(byte[] irisL1,byte[] irisL2,byte[] irisR1,byte[] irisR2) throws IOException; + byte[] getIrisCode(InputStream fis) throws IOException; + Map sendMessage(String msg); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java index 48ad205..7f9986f 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java @@ -50,4 +50,6 @@ List personCodeList(); List updateData(List personIds, List deviceIds); + + } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java index e7c3cc4..00c9efa 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java @@ -159,6 +159,7 @@ } //与c#的服务通信，获取虹膜编码 + @Override public byte[] getIrisCode(InputStream fis) throws IOException { byte[] irisCode = new byte[1024]; diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java index ace7d17..5a9fac5 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java @@ -32,7 +32,6 @@ public class IrisOfflineServiceImpl implements IIrisOfflineService { private static final Logger logger = LoggerFactory.getLogger(IrisOfflineServiceImpl.class); - @Autowired private ICommonDeptService deptService; @Autowired @@ -45,8 +44,7 @@ private IIrisPersonPhotoService personPhotoService; @Autowired private IIrisPersonService iIrisPersonService; - @Value("${casic.file.uploadPath:C://casic//tmp//}") - private String filePath; + @Override @Transactional(rollbackFor = Exception.class) @@ -66,12 +64,6 @@ if(ToolUtil.isNotEmpty(uploadDTO.getIrisL1())) { irisL1 = Base64.getDecoder().decode(uploadDTO.getIrisL1()); } -// if(ToolUtil.isNotEmpty(uploadDTO.getImageL1Data())){ -// String path = fileService.saveFileBase64Image(uploadDTO.getImageL1Data()); -// irisL1 = iIrisDataService.getIrisCode(new FileInputStream(this.filePath + path)); -// System.out.println(irisL1); -// System.out.println(Base64.getDecoder().decode(uploadDTO.getIrisL1())); -// } byte[] irisL2 = null; if(ToolUtil.isNotEmpty(uploadDTO.getIrisL2())) { @@ -128,6 +120,9 @@ Person person = new Person(); Long id = IdWorker.getId(); person.setId(id); + person.setDelflag("0"); + person.setPersonType("1"); + person.setOprationId((long)1); if(ToolUtil.isNotEmpty(uploadDTO.getStaffNo())){ person.setPersonCode(uploadDTO.getStaffNo()); }else { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java index b5e6a7e..7b65ad5 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java @@ -1,10 +1,12 @@ package com.casic.missiles.modular.register.service.impl; import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.register.dao.IrisPersonPhotoMapper; import com.casic.missiles.modular.register.model.IrisPersonPhoto; import com.casic.missiles.modular.register.service.IIrisPersonPhotoService; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.service.IPersonPhotoSupportService; import org.springframework.stereotype.Service; import java.util.List; @@ -18,7 +20,7 @@ * @since 2020-04-01 */ @Service -public class IrisPersonPhotoServiceImpl extends ServiceImpl implements IIrisPersonPhotoService { +public class IrisPersonPhotoServiceImpl extends ServiceImpl implements IIrisPersonPhotoService, IPersonPhotoSupportService { @Override public List selectByPersonIds(List personIds) { @@ -26,4 +28,14 @@ query.in("PERSON_ID",personIds); return this.selectList(query); } + + @Override + public String selectPhotoDataById(Long personId) { + IrisPersonPhoto irisPersonPhoto = this.selectById(personId); + if(ToolUtil.isNotEmpty(irisPersonPhoto)){ + return irisPersonPhoto.getPhotoData(); + }else{ + return null; + } + } } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java index b6fb18c..46ae909 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java @@ -34,6 +34,7 @@ import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.model.Person; import com.casic.missiles.modular.system.service.IDeviceSupportService; +import com.casic.missiles.modular.system.service.IIrisPersonSupportService; import com.casic.missiles.modular.system.util.SocketClientUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,7 +54,7 @@ import java.util.*; @Service -public class IrisPersonServiceImpl implements IIrisPersonService { +public class IrisPersonServiceImpl implements IIrisPersonService, IIrisPersonSupportService { private static final Logger logger = LoggerFactory.getLogger(IrisPersonServiceImpl.class); protected static final Map mapperExcel = new HashMap<>(); static { @@ -338,4 +339,9 @@ } return errorList; } + + @Override + public List listIdsByType(DataScope dataScope, String personType) { + return irisPersonMapper.listIdsByType(dataScope.getDeptIds(), personType); + } } diff --git a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java index 161167e..ce73011 100644 --- a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java +++ b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java @@ -16,5 +16,7 @@ List selectDeviceByDoor(String doorCode); + Device selectDeviceByCode(String deviceCode); + Device selectById(Serializable id); } diff --git a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IRecordSupportService.java b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IRecordSupportService.java index caeef71..0113fd1 100644 --- a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IRecordSupportService.java +++ b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IRecordSupportService.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.system.service; +import com.casic.missiles.modular.system.model.RecognitionRecords; + import java.util.List; public interface IRecordSupportService { @@ -12,4 +14,8 @@ * @return 返回同步失败的设备编号 */ List syncRecords(List devIds, String startTime, String endTime); + + boolean insert(RecognitionRecords record); + + boolean insertBatch(List records); } diff --git a/casic-web/pom.xml b/casic-web/pom.xml index df051e9..9d7ea12 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -143,6 +143,11 @@ casic-iris-atd ${pro.version} + + com.casic + casic-face-sync + ${pro.version} + org.springframework.boot diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java index 0cbb418..aac8f3a 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.task; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.controller.AcsPermissionController; import com.casic.missiles.modular.system.model.Device; @@ -39,7 +40,9 @@ String startTime = sdf.format(calendar.getTime()); System.out.println(sdf.format(new Date()) + ":" + startTime + " " + endTime); - List deviceList = deviceService.selectList(null); + EntityWrapper query = new EntityWrapper(); + query.notLike("DEV_TYPE","5"); + List deviceList = deviceService.selectList(query); List deviceIds = new ArrayList<>(); for (Device device : deviceList) { deviceIds.add(Long.valueOf(device.getId())); diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 122cc0c..2c36416 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -31,4 +31,5 @@ List selectDeviceByType(String devType); List> selectListAll(); + } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index c005a94..6a8a055 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -69,6 +69,13 @@ } @Override + public Device selectDeviceByCode(String deviceCode) { + EntityWrapper query = new EntityWrapper(); + query.eq("DEV_CODE",deviceCode); + return this.selectOne(query); + } + + @Override public List batchUpdateDB(List ids) { List failedIds = new ArrayList<>(); for (Integer id : ids) { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java index d3f9b9d..f45f961 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java @@ -45,17 +45,7 @@ @Autowired private IIrisDataService iIrisDataService; @Autowired - private ICommonFileService fileService; - @Autowired - private ICommonPersonService commonPersonService; - @Autowired - private IIrisPersonPhotoService personPhotoService; - @Autowired - private IIrisPersonService iIrisPersonService; - @Autowired private IIrisOfflineService iIrisOfflineService; - @Value("${casic.file.uploadPath:C://casic//tmp//}") - private String filePath; @RequestMapping("/dept/listAll") @ResponseBody diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java index 9db5b1c..57fa5f9 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java @@ -1,6 +1,8 @@ package com.casic.missiles.modular.register.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -9,4 +11,7 @@ @Select("select person_code from sys_person where person_code is not null") List personCodeList(); + + + List listIdsByType(@Param("deptIds") List deptIds, @Param("personType") String personType); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java index 706ff7b..aea9bac 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java @@ -6,6 +6,7 @@ import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; import java.util.List; import java.util.Map; @@ -26,5 +27,7 @@ Long recognize(byte[] irisL1,byte[] irisL2,byte[] irisR1,byte[] irisR2) throws IOException; + byte[] getIrisCode(InputStream fis) throws IOException; + Map sendMessage(String msg); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java index 48ad205..7f9986f 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java @@ -50,4 +50,6 @@ List personCodeList(); List updateData(List personIds, List deviceIds); + + } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java index e7c3cc4..00c9efa 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java @@ -159,6 +159,7 @@ } //与c#的服务通信，获取虹膜编码 + @Override public byte[] getIrisCode(InputStream fis) throws IOException { byte[] irisCode = new byte[1024]; diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java index ace7d17..5a9fac5 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java @@ -32,7 +32,6 @@ public class IrisOfflineServiceImpl implements IIrisOfflineService { private static final Logger logger = LoggerFactory.getLogger(IrisOfflineServiceImpl.class); - @Autowired private ICommonDeptService deptService; @Autowired @@ -45,8 +44,7 @@ private IIrisPersonPhotoService personPhotoService; @Autowired private IIrisPersonService iIrisPersonService; - @Value("${casic.file.uploadPath:C://casic//tmp//}") - private String filePath; + @Override @Transactional(rollbackFor = Exception.class) @@ -66,12 +64,6 @@ if(ToolUtil.isNotEmpty(uploadDTO.getIrisL1())) { irisL1 = Base64.getDecoder().decode(uploadDTO.getIrisL1()); } -// if(ToolUtil.isNotEmpty(uploadDTO.getImageL1Data())){ -// String path = fileService.saveFileBase64Image(uploadDTO.getImageL1Data()); -// irisL1 = iIrisDataService.getIrisCode(new FileInputStream(this.filePath + path)); -// System.out.println(irisL1); -// System.out.println(Base64.getDecoder().decode(uploadDTO.getIrisL1())); -// } byte[] irisL2 = null; if(ToolUtil.isNotEmpty(uploadDTO.getIrisL2())) { @@ -128,6 +120,9 @@ Person person = new Person(); Long id = IdWorker.getId(); person.setId(id); + person.setDelflag("0"); + person.setPersonType("1"); + person.setOprationId((long)1); if(ToolUtil.isNotEmpty(uploadDTO.getStaffNo())){ person.setPersonCode(uploadDTO.getStaffNo()); }else { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java index b5e6a7e..7b65ad5 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java @@ -1,10 +1,12 @@ package com.casic.missiles.modular.register.service.impl; import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.register.dao.IrisPersonPhotoMapper; import com.casic.missiles.modular.register.model.IrisPersonPhoto; import com.casic.missiles.modular.register.service.IIrisPersonPhotoService; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.service.IPersonPhotoSupportService; import org.springframework.stereotype.Service; import java.util.List; @@ -18,7 +20,7 @@ * @since 2020-04-01 */ @Service -public class IrisPersonPhotoServiceImpl extends ServiceImpl implements IIrisPersonPhotoService { +public class IrisPersonPhotoServiceImpl extends ServiceImpl implements IIrisPersonPhotoService, IPersonPhotoSupportService { @Override public List selectByPersonIds(List personIds) { @@ -26,4 +28,14 @@ query.in("PERSON_ID",personIds); return this.selectList(query); } + + @Override + public String selectPhotoDataById(Long personId) { + IrisPersonPhoto irisPersonPhoto = this.selectById(personId); + if(ToolUtil.isNotEmpty(irisPersonPhoto)){ + return irisPersonPhoto.getPhotoData(); + }else{ + return null; + } + } } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java index b6fb18c..46ae909 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java @@ -34,6 +34,7 @@ import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.model.Person; import com.casic.missiles.modular.system.service.IDeviceSupportService; +import com.casic.missiles.modular.system.service.IIrisPersonSupportService; import com.casic.missiles.modular.system.util.SocketClientUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,7 +54,7 @@ import java.util.*; @Service -public class IrisPersonServiceImpl implements IIrisPersonService { +public class IrisPersonServiceImpl implements IIrisPersonService, IIrisPersonSupportService { private static final Logger logger = LoggerFactory.getLogger(IrisPersonServiceImpl.class); protected static final Map mapperExcel = new HashMap<>(); static { @@ -338,4 +339,9 @@ } return errorList; } + + @Override + public List listIdsByType(DataScope dataScope, String personType) { + return irisPersonMapper.listIdsByType(dataScope.getDeptIds(), personType); + } } diff --git a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java index 161167e..ce73011 100644 --- a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java +++ b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java @@ -16,5 +16,7 @@ List selectDeviceByDoor(String doorCode); + Device selectDeviceByCode(String deviceCode); + Device selectById(Serializable id); } diff --git a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IRecordSupportService.java b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IRecordSupportService.java index caeef71..0113fd1 100644 --- a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IRecordSupportService.java +++ b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IRecordSupportService.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.system.service; +import com.casic.missiles.modular.system.model.RecognitionRecords; + import java.util.List; public interface IRecordSupportService { @@ -12,4 +14,8 @@ * @return 返回同步失败的设备编号 */ List syncRecords(List devIds, String startTime, String endTime); + + boolean insert(RecognitionRecords record); + + boolean insertBatch(List records); } diff --git a/casic-web/pom.xml b/casic-web/pom.xml index df051e9..9d7ea12 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -143,6 +143,11 @@ casic-iris-atd ${pro.version} + + com.casic + casic-face-sync + ${pro.version} + org.springframework.boot diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index bf4297b..a0fd630 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -1,17 +1,20 @@ server: - port: 8095 + port: 8080 ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://111.198.10.15:11102/casic_iris_203?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull +# url: jdbc:mysql://111.198.10.15:11102/casic_iris_203?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull +# username: root +# password: Casic203! + url: jdbc:mysql://127.0.0.1:3306/casic_iris_temperature_2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: Casic203! + password: root initial-size: 2 min-idle: 1 #flowable数据源和多数据源配置 casic: kaptcha-open: false #是否开启登录时验证码 (true/false) - nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram + nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram,/LAPI/V1.0/System/Event/Notification/PersonVerification export-temp-path: D:\java\boot\casic-web-1.0.0-SNAPSHOT\export\ iris: recServiceHost: localhost @@ -33,10 +36,15 @@ logging: level.root: info level.com.casic: debug + #level.org.springframework: debug path: logs/ file: missiles.log + iris: socket-port: 8000 config: - export-path: D:\java\boot\casic-web-1.0.0-SNAPSHOT\export\ + export-path: C:\casic\casic-web-1.0.0-SNAPSHOT\temp\ static-location: C:\casic\tmp\ + face: + initSubscribe: false + serverHost: 192.168.1.16 diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java index 0cbb418..aac8f3a 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.task; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.controller.AcsPermissionController; import com.casic.missiles.modular.system.model.Device; @@ -39,7 +40,9 @@ String startTime = sdf.format(calendar.getTime()); System.out.println(sdf.format(new Date()) + ":" + startTime + " " + endTime); - List deviceList = deviceService.selectList(null); + EntityWrapper query = new EntityWrapper(); + query.notLike("DEV_TYPE","5"); + List deviceList = deviceService.selectList(query); List deviceIds = new ArrayList<>(); for (Device device : deviceList) { deviceIds.add(Long.valueOf(device.getId())); diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 122cc0c..2c36416 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -31,4 +31,5 @@ List selectDeviceByType(String devType); List> selectListAll(); + } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index c005a94..6a8a055 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -69,6 +69,13 @@ } @Override + public Device selectDeviceByCode(String deviceCode) { + EntityWrapper query = new EntityWrapper(); + query.eq("DEV_CODE",deviceCode); + return this.selectOne(query); + } + + @Override public List batchUpdateDB(List ids) { List failedIds = new ArrayList<>(); for (Integer id : ids) { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java index d3f9b9d..f45f961 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java @@ -45,17 +45,7 @@ @Autowired private IIrisDataService iIrisDataService; @Autowired - private ICommonFileService fileService; - @Autowired - private ICommonPersonService commonPersonService; - @Autowired - private IIrisPersonPhotoService personPhotoService; - @Autowired - private IIrisPersonService iIrisPersonService; - @Autowired private IIrisOfflineService iIrisOfflineService; - @Value("${casic.file.uploadPath:C://casic//tmp//}") - private String filePath; @RequestMapping("/dept/listAll") @ResponseBody diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java index 9db5b1c..57fa5f9 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java @@ -1,6 +1,8 @@ package com.casic.missiles.modular.register.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -9,4 +11,7 @@ @Select("select person_code from sys_person where person_code is not null") List personCodeList(); + + + List listIdsByType(@Param("deptIds") List deptIds, @Param("personType") String personType); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java index 706ff7b..aea9bac 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java @@ -6,6 +6,7 @@ import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; import java.util.List; import java.util.Map; @@ -26,5 +27,7 @@ Long recognize(byte[] irisL1,byte[] irisL2,byte[] irisR1,byte[] irisR2) throws IOException; + byte[] getIrisCode(InputStream fis) throws IOException; + Map sendMessage(String msg); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java index 48ad205..7f9986f 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java @@ -50,4 +50,6 @@ List personCodeList(); List updateData(List personIds, List deviceIds); + + } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java index e7c3cc4..00c9efa 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java @@ -159,6 +159,7 @@ } //与c#的服务通信，获取虹膜编码 + @Override public byte[] getIrisCode(InputStream fis) throws IOException { byte[] irisCode = new byte[1024]; diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java index ace7d17..5a9fac5 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java @@ -32,7 +32,6 @@ public class IrisOfflineServiceImpl implements IIrisOfflineService { private static final Logger logger = LoggerFactory.getLogger(IrisOfflineServiceImpl.class); - @Autowired private ICommonDeptService deptService; @Autowired @@ -45,8 +44,7 @@ private IIrisPersonPhotoService personPhotoService; @Autowired private IIrisPersonService iIrisPersonService; - @Value("${casic.file.uploadPath:C://casic//tmp//}") - private String filePath; + @Override @Transactional(rollbackFor = Exception.class) @@ -66,12 +64,6 @@ if(ToolUtil.isNotEmpty(uploadDTO.getIrisL1())) { irisL1 = Base64.getDecoder().decode(uploadDTO.getIrisL1()); } -// if(ToolUtil.isNotEmpty(uploadDTO.getImageL1Data())){ -// String path = fileService.saveFileBase64Image(uploadDTO.getImageL1Data()); -// irisL1 = iIrisDataService.getIrisCode(new FileInputStream(this.filePath + path)); -// System.out.println(irisL1); -// System.out.println(Base64.getDecoder().decode(uploadDTO.getIrisL1())); -// } byte[] irisL2 = null; if(ToolUtil.isNotEmpty(uploadDTO.getIrisL2())) { @@ -128,6 +120,9 @@ Person person = new Person(); Long id = IdWorker.getId(); person.setId(id); + person.setDelflag("0"); + person.setPersonType("1"); + person.setOprationId((long)1); if(ToolUtil.isNotEmpty(uploadDTO.getStaffNo())){ person.setPersonCode(uploadDTO.getStaffNo()); }else { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java index b5e6a7e..7b65ad5 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java @@ -1,10 +1,12 @@ package com.casic.missiles.modular.register.service.impl; import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.register.dao.IrisPersonPhotoMapper; import com.casic.missiles.modular.register.model.IrisPersonPhoto; import com.casic.missiles.modular.register.service.IIrisPersonPhotoService; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.service.IPersonPhotoSupportService; import org.springframework.stereotype.Service; import java.util.List; @@ -18,7 +20,7 @@ * @since 2020-04-01 */ @Service -public class IrisPersonPhotoServiceImpl extends ServiceImpl implements IIrisPersonPhotoService { +public class IrisPersonPhotoServiceImpl extends ServiceImpl implements IIrisPersonPhotoService, IPersonPhotoSupportService { @Override public List selectByPersonIds(List personIds) { @@ -26,4 +28,14 @@ query.in("PERSON_ID",personIds); return this.selectList(query); } + + @Override + public String selectPhotoDataById(Long personId) { + IrisPersonPhoto irisPersonPhoto = this.selectById(personId); + if(ToolUtil.isNotEmpty(irisPersonPhoto)){ + return irisPersonPhoto.getPhotoData(); + }else{ + return null; + } + } } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java index b6fb18c..46ae909 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java @@ -34,6 +34,7 @@ import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.model.Person; import com.casic.missiles.modular.system.service.IDeviceSupportService; +import com.casic.missiles.modular.system.service.IIrisPersonSupportService; import com.casic.missiles.modular.system.util.SocketClientUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,7 +54,7 @@ import java.util.*; @Service -public class IrisPersonServiceImpl implements IIrisPersonService { +public class IrisPersonServiceImpl implements IIrisPersonService, IIrisPersonSupportService { private static final Logger logger = LoggerFactory.getLogger(IrisPersonServiceImpl.class); protected static final Map mapperExcel = new HashMap<>(); static { @@ -338,4 +339,9 @@ } return errorList; } + + @Override + public List listIdsByType(DataScope dataScope, String personType) { + return irisPersonMapper.listIdsByType(dataScope.getDeptIds(), personType); + } } diff --git a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java index 161167e..ce73011 100644 --- a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java +++ b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java @@ -16,5 +16,7 @@ List selectDeviceByDoor(String doorCode); + Device selectDeviceByCode(String deviceCode); + Device selectById(Serializable id); } diff --git a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IRecordSupportService.java b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IRecordSupportService.java index caeef71..0113fd1 100644 --- a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IRecordSupportService.java +++ b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IRecordSupportService.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.system.service; +import com.casic.missiles.modular.system.model.RecognitionRecords; + import java.util.List; public interface IRecordSupportService { @@ -12,4 +14,8 @@ * @return 返回同步失败的设备编号 */ List syncRecords(List devIds, String startTime, String endTime); + + boolean insert(RecognitionRecords record); + + boolean insertBatch(List records); } diff --git a/casic-web/pom.xml b/casic-web/pom.xml index df051e9..9d7ea12 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -143,6 +143,11 @@ casic-iris-atd ${pro.version} + + com.casic + casic-face-sync + ${pro.version} + org.springframework.boot diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index bf4297b..a0fd630 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -1,17 +1,20 @@ server: - port: 8095 + port: 8080 ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://111.198.10.15:11102/casic_iris_203?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull +# url: jdbc:mysql://111.198.10.15:11102/casic_iris_203?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull +# username: root +# password: Casic203! + url: jdbc:mysql://127.0.0.1:3306/casic_iris_temperature_2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: Casic203! + password: root initial-size: 2 min-idle: 1 #flowable数据源和多数据源配置 casic: kaptcha-open: false #是否开启登录时验证码 (true/false) - nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram + nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram,/LAPI/V1.0/System/Event/Notification/PersonVerification export-temp-path: D:\java\boot\casic-web-1.0.0-SNAPSHOT\export\ iris: recServiceHost: localhost @@ -33,10 +36,15 @@ logging: level.root: info level.com.casic: debug + #level.org.springframework: debug path: logs/ file: missiles.log + iris: socket-port: 8000 config: - export-path: D:\java\boot\casic-web-1.0.0-SNAPSHOT\export\ + export-path: C:\casic\casic-web-1.0.0-SNAPSHOT\temp\ static-location: C:\casic\tmp\ + face: + initSubscribe: false + serverHost: 192.168.1.16 diff --git a/casic-web/src/main/resources/config/application-prod.yml b/casic-web/src/main/resources/config/application-prod.yml index 971b0cf..8b9a8d9 100644 --- a/casic-web/src/main/resources/config/application-prod.yml +++ b/casic-web/src/main/resources/config/application-prod.yml @@ -3,16 +3,16 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://111.198.10.15:11102/casic_iris_temperature?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://127.0.0.1:3306/casic_iris_temperature?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: Casic203! + password: root initial-size: 2 min-idle: 1 #flowable数据源和多数据源配置 casic: kaptcha-open: false #是否开启登录时验证码 (true/false) nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram,/dept/listAll,/device/receiveMsg,/person/uploadPerson - export-temp-path: D:\java\boot\casic-web-1.0.0-SNAPSHOT\export\ + export-temp-path: C:\casic\casic-web-1.0.0-SNAPSHOT\temp\ iris: recServiceHost: localhost recServicePort: 20004 @@ -22,10 +22,10 @@ generate: cron: "0 08 18 * * ?" #每天凌晨4点执行一次 jdbc: - port: 11102 + port: 3306 dbName: casic_iris_temperature userName: root - userPwd: Casic203! + userPwd: root mybatis-plus: global-config: sql-injector: com.casic.missiles.modular.metadata.inject.MetaSqlInject @@ -38,5 +38,8 @@ iris: socket-port: 8000 config: - export-path: D:\java\boot\casic-web-1.0.0-SNAPSHOT\export\ + export-path: C:\casic\casic-web-1.0.0-SNAPSHOT\temp\ static-location: C:\casic\tmp\ + face: + initSubscribe: false + serverHost: 192.168.1.16 diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java index 0cbb418..aac8f3a 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.task; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.controller.AcsPermissionController; import com.casic.missiles.modular.system.model.Device; @@ -39,7 +40,9 @@ String startTime = sdf.format(calendar.getTime()); System.out.println(sdf.format(new Date()) + ":" + startTime + " " + endTime); - List deviceList = deviceService.selectList(null); + EntityWrapper query = new EntityWrapper(); + query.notLike("DEV_TYPE","5"); + List deviceList = deviceService.selectList(query); List deviceIds = new ArrayList<>(); for (Device device : deviceList) { deviceIds.add(Long.valueOf(device.getId())); diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 122cc0c..2c36416 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -31,4 +31,5 @@ List selectDeviceByType(String devType); List> selectListAll(); + } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index c005a94..6a8a055 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -69,6 +69,13 @@ } @Override + public Device selectDeviceByCode(String deviceCode) { + EntityWrapper query = new EntityWrapper(); + query.eq("DEV_CODE",deviceCode); + return this.selectOne(query); + } + + @Override public List batchUpdateDB(List ids) { List failedIds = new ArrayList<>(); for (Integer id : ids) { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java index d3f9b9d..f45f961 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java @@ -45,17 +45,7 @@ @Autowired private IIrisDataService iIrisDataService; @Autowired - private ICommonFileService fileService; - @Autowired - private ICommonPersonService commonPersonService; - @Autowired - private IIrisPersonPhotoService personPhotoService; - @Autowired - private IIrisPersonService iIrisPersonService; - @Autowired private IIrisOfflineService iIrisOfflineService; - @Value("${casic.file.uploadPath:C://casic//tmp//}") - private String filePath; @RequestMapping("/dept/listAll") @ResponseBody diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java index 9db5b1c..57fa5f9 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisPersonMapper.java @@ -1,6 +1,8 @@ package com.casic.missiles.modular.register.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -9,4 +11,7 @@ @Select("select person_code from sys_person where person_code is not null") List personCodeList(); + + + List listIdsByType(@Param("deptIds") List deptIds, @Param("personType") String personType); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java index 706ff7b..aea9bac 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisDataService.java @@ -6,6 +6,7 @@ import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; import java.util.List; import java.util.Map; @@ -26,5 +27,7 @@ Long recognize(byte[] irisL1,byte[] irisL2,byte[] irisR1,byte[] irisR2) throws IOException; + byte[] getIrisCode(InputStream fis) throws IOException; + Map sendMessage(String msg); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java index 48ad205..7f9986f 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java @@ -50,4 +50,6 @@ List personCodeList(); List updateData(List personIds, List deviceIds); + + } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java index e7c3cc4..00c9efa 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisDataServiceImpl.java @@ -159,6 +159,7 @@ } //与c#的服务通信，获取虹膜编码 + @Override public byte[] getIrisCode(InputStream fis) throws IOException { byte[] irisCode = new byte[1024]; diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java index ace7d17..5a9fac5 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisOfflineServiceImpl.java @@ -32,7 +32,6 @@ public class IrisOfflineServiceImpl implements IIrisOfflineService { private static final Logger logger = LoggerFactory.getLogger(IrisOfflineServiceImpl.class); - @Autowired private ICommonDeptService deptService; @Autowired @@ -45,8 +44,7 @@ private IIrisPersonPhotoService personPhotoService; @Autowired private IIrisPersonService iIrisPersonService; - @Value("${casic.file.uploadPath:C://casic//tmp//}") - private String filePath; + @Override @Transactional(rollbackFor = Exception.class) @@ -66,12 +64,6 @@ if(ToolUtil.isNotEmpty(uploadDTO.getIrisL1())) { irisL1 = Base64.getDecoder().decode(uploadDTO.getIrisL1()); } -// if(ToolUtil.isNotEmpty(uploadDTO.getImageL1Data())){ -// String path = fileService.saveFileBase64Image(uploadDTO.getImageL1Data()); -// irisL1 = iIrisDataService.getIrisCode(new FileInputStream(this.filePath + path)); -// System.out.println(irisL1); -// System.out.println(Base64.getDecoder().decode(uploadDTO.getIrisL1())); -// } byte[] irisL2 = null; if(ToolUtil.isNotEmpty(uploadDTO.getIrisL2())) { @@ -128,6 +120,9 @@ Person person = new Person(); Long id = IdWorker.getId(); person.setId(id); + person.setDelflag("0"); + person.setPersonType("1"); + person.setOprationId((long)1); if(ToolUtil.isNotEmpty(uploadDTO.getStaffNo())){ person.setPersonCode(uploadDTO.getStaffNo()); }else { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java index b5e6a7e..7b65ad5 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonPhotoServiceImpl.java @@ -1,10 +1,12 @@ package com.casic.missiles.modular.register.service.impl; import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.register.dao.IrisPersonPhotoMapper; import com.casic.missiles.modular.register.model.IrisPersonPhoto; import com.casic.missiles.modular.register.service.IIrisPersonPhotoService; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.service.IPersonPhotoSupportService; import org.springframework.stereotype.Service; import java.util.List; @@ -18,7 +20,7 @@ * @since 2020-04-01 */ @Service -public class IrisPersonPhotoServiceImpl extends ServiceImpl implements IIrisPersonPhotoService { +public class IrisPersonPhotoServiceImpl extends ServiceImpl implements IIrisPersonPhotoService, IPersonPhotoSupportService { @Override public List selectByPersonIds(List personIds) { @@ -26,4 +28,14 @@ query.in("PERSON_ID",personIds); return this.selectList(query); } + + @Override + public String selectPhotoDataById(Long personId) { + IrisPersonPhoto irisPersonPhoto = this.selectById(personId); + if(ToolUtil.isNotEmpty(irisPersonPhoto)){ + return irisPersonPhoto.getPhotoData(); + }else{ + return null; + } + } } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java index b6fb18c..46ae909 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java @@ -34,6 +34,7 @@ import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.model.Person; import com.casic.missiles.modular.system.service.IDeviceSupportService; +import com.casic.missiles.modular.system.service.IIrisPersonSupportService; import com.casic.missiles.modular.system.util.SocketClientUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,7 +54,7 @@ import java.util.*; @Service -public class IrisPersonServiceImpl implements IIrisPersonService { +public class IrisPersonServiceImpl implements IIrisPersonService, IIrisPersonSupportService { private static final Logger logger = LoggerFactory.getLogger(IrisPersonServiceImpl.class); protected static final Map mapperExcel = new HashMap<>(); static { @@ -338,4 +339,9 @@ } return errorList; } + + @Override + public List listIdsByType(DataScope dataScope, String personType) { + return irisPersonMapper.listIdsByType(dataScope.getDeptIds(), personType); + } } diff --git a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java index 161167e..ce73011 100644 --- a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java +++ b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java @@ -16,5 +16,7 @@ List selectDeviceByDoor(String doorCode); + Device selectDeviceByCode(String deviceCode); + Device selectById(Serializable id); } diff --git a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IRecordSupportService.java b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IRecordSupportService.java index caeef71..0113fd1 100644 --- a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IRecordSupportService.java +++ b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IRecordSupportService.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.system.service; +import com.casic.missiles.modular.system.model.RecognitionRecords; + import java.util.List; public interface IRecordSupportService { @@ -12,4 +14,8 @@ * @return 返回同步失败的设备编号 */ List syncRecords(List devIds, String startTime, String endTime); + + boolean insert(RecognitionRecords record); + + boolean insertBatch(List records); } diff --git a/casic-web/pom.xml b/casic-web/pom.xml index df051e9..9d7ea12 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -143,6 +143,11 @@ casic-iris-atd ${pro.version} + + com.casic + casic-face-sync + ${pro.version} + org.springframework.boot diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index bf4297b..a0fd630 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -1,17 +1,20 @@ server: - port: 8095 + port: 8080 ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://111.198.10.15:11102/casic_iris_203?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull +# url: jdbc:mysql://111.198.10.15:11102/casic_iris_203?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull +# username: root +# password: Casic203! + url: jdbc:mysql://127.0.0.1:3306/casic_iris_temperature_2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: Casic203! + password: root initial-size: 2 min-idle: 1 #flowable数据源和多数据源配置 casic: kaptcha-open: false #是否开启登录时验证码 (true/false) - nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram + nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram,/LAPI/V1.0/System/Event/Notification/PersonVerification export-temp-path: D:\java\boot\casic-web-1.0.0-SNAPSHOT\export\ iris: recServiceHost: localhost @@ -33,10 +36,15 @@ logging: level.root: info level.com.casic: debug + #level.org.springframework: debug path: logs/ file: missiles.log + iris: socket-port: 8000 config: - export-path: D:\java\boot\casic-web-1.0.0-SNAPSHOT\export\ + export-path: C:\casic\casic-web-1.0.0-SNAPSHOT\temp\ static-location: C:\casic\tmp\ + face: + initSubscribe: false + serverHost: 192.168.1.16 diff --git a/casic-web/src/main/resources/config/application-prod.yml b/casic-web/src/main/resources/config/application-prod.yml index 971b0cf..8b9a8d9 100644 --- a/casic-web/src/main/resources/config/application-prod.yml +++ b/casic-web/src/main/resources/config/application-prod.yml @@ -3,16 +3,16 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://111.198.10.15:11102/casic_iris_temperature?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://127.0.0.1:3306/casic_iris_temperature?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: Casic203! + password: root initial-size: 2 min-idle: 1 #flowable数据源和多数据源配置 casic: kaptcha-open: false #是否开启登录时验证码 (true/false) nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram,/dept/listAll,/device/receiveMsg,/person/uploadPerson - export-temp-path: D:\java\boot\casic-web-1.0.0-SNAPSHOT\export\ + export-temp-path: C:\casic\casic-web-1.0.0-SNAPSHOT\temp\ iris: recServiceHost: localhost recServicePort: 20004 @@ -22,10 +22,10 @@ generate: cron: "0 08 18 * * ?" #每天凌晨4点执行一次 jdbc: - port: 11102 + port: 3306 dbName: casic_iris_temperature userName: root - userPwd: Casic203! + userPwd: root mybatis-plus: global-config: sql-injector: com.casic.missiles.modular.metadata.inject.MetaSqlInject @@ -38,5 +38,8 @@ iris: socket-port: 8000 config: - export-path: D:\java\boot\casic-web-1.0.0-SNAPSHOT\export\ + export-path: C:\casic\casic-web-1.0.0-SNAPSHOT\temp\ static-location: C:\casic\tmp\ + face: + initSubscribe: false + serverHost: 192.168.1.16 diff --git a/pom.xml b/pom.xml index a4a043c..6d858b5 100644 --- a/pom.xml +++ b/pom.xml @@ -13,6 +13,7 @@ casic-iris-support casic-iris-register casic-iris-atd + casic-face-sync