diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java index ce623d0..27e0b8f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java @@ -41,10 +41,10 @@ */ @RequestMapping(value = "/listStaff") @ResponseBody - public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime){ + public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime){ Page> page = new PageFactory>().defaultPage(); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); page.setRecords(list); return ResponseData.success(super.packForBT(page)); @@ -55,13 +55,13 @@ */ @RequestMapping(value = "/exportStaff") @ResponseBody - public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime) throws IOException { + public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime) throws IOException { Page> page = new PageFactory>().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); super.exportExcel(AcsExportEnum.STAFF_RECORDS_EXPORT, list, response); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java index ce623d0..27e0b8f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java @@ -41,10 +41,10 @@ */ @RequestMapping(value = "/listStaff") @ResponseBody - public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime){ + public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime){ Page> page = new PageFactory>().defaultPage(); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); page.setRecords(list); return ResponseData.success(super.packForBT(page)); @@ -55,13 +55,13 @@ */ @RequestMapping(value = "/exportStaff") @ResponseBody - public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime) throws IOException { + public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime) throws IOException { Page> page = new PageFactory>().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); super.exportExcel(AcsExportEnum.STAFF_RECORDS_EXPORT, list, response); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java index 8fe1c78..2518229 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java @@ -19,7 +19,7 @@ * @since 2019-12-02 */ public interface RecognitionRecordsMapper extends BaseMapper { - List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); + List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> selectVisitorDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> statisticByDept(@Param("doorCode") String doorCode,@Param("deptIds")String deptIds, @Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("inoutType") String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java index ce623d0..27e0b8f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java @@ -41,10 +41,10 @@ */ @RequestMapping(value = "/listStaff") @ResponseBody - public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime){ + public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime){ Page> page = new PageFactory>().defaultPage(); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); page.setRecords(list); return ResponseData.success(super.packForBT(page)); @@ -55,13 +55,13 @@ */ @RequestMapping(value = "/exportStaff") @ResponseBody - public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime) throws IOException { + public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime) throws IOException { Page> page = new PageFactory>().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); super.exportExcel(AcsExportEnum.STAFF_RECORDS_EXPORT, list, response); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java index 8fe1c78..2518229 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java @@ -19,7 +19,7 @@ * @since 2019-12-02 */ public interface RecognitionRecordsMapper extends BaseMapper { - List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); + List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> selectVisitorDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> statisticByDept(@Param("doorCode") String doorCode,@Param("deptIds")String deptIds, @Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("inoutType") String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml index 7a6573d..b95e968 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml @@ -23,6 +23,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.ID_CARD_NO AS idCard, @@ -46,6 +47,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} @@ -60,6 +71,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.CERTIFICATION_UNIT AS personDeptName, @@ -81,6 +93,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java index ce623d0..27e0b8f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java @@ -41,10 +41,10 @@ */ @RequestMapping(value = "/listStaff") @ResponseBody - public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime){ + public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime){ Page> page = new PageFactory>().defaultPage(); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); page.setRecords(list); return ResponseData.success(super.packForBT(page)); @@ -55,13 +55,13 @@ */ @RequestMapping(value = "/exportStaff") @ResponseBody - public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime) throws IOException { + public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime) throws IOException { Page> page = new PageFactory>().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); super.exportExcel(AcsExportEnum.STAFF_RECORDS_EXPORT, list, response); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java index 8fe1c78..2518229 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java @@ -19,7 +19,7 @@ * @since 2019-12-02 */ public interface RecognitionRecordsMapper extends BaseMapper { - List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); + List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> selectVisitorDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> statisticByDept(@Param("doorCode") String doorCode,@Param("deptIds")String deptIds, @Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("inoutType") String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml index 7a6573d..b95e968 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml @@ -23,6 +23,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.ID_CARD_NO AS idCard, @@ -46,6 +47,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} @@ -60,6 +71,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.CERTIFICATION_UNIT AS personDeptName, @@ -81,6 +93,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java index 6415047..986c732 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java @@ -3,12 +3,15 @@ import java.io.Serializable; import com.baomidou.mybatisplus.enums.IdType; + +import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableName; import lombok.Data; +import org.apache.ibatis.annotations.Param; /** *

@@ -57,6 +60,9 @@ @TableField("INOUT_TYPE") private String inoutType; + @TableField("TEMPERATURE") + private String temperature; + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java index ce623d0..27e0b8f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java @@ -41,10 +41,10 @@ */ @RequestMapping(value = "/listStaff") @ResponseBody - public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime){ + public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime){ Page> page = new PageFactory>().defaultPage(); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); page.setRecords(list); return ResponseData.success(super.packForBT(page)); @@ -55,13 +55,13 @@ */ @RequestMapping(value = "/exportStaff") @ResponseBody - public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime) throws IOException { + public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime) throws IOException { Page> page = new PageFactory>().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); super.exportExcel(AcsExportEnum.STAFF_RECORDS_EXPORT, list, response); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java index 8fe1c78..2518229 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java @@ -19,7 +19,7 @@ * @since 2019-12-02 */ public interface RecognitionRecordsMapper extends BaseMapper { - List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); + List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> selectVisitorDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> statisticByDept(@Param("doorCode") String doorCode,@Param("deptIds")String deptIds, @Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("inoutType") String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml index 7a6573d..b95e968 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml @@ -23,6 +23,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.ID_CARD_NO AS idCard, @@ -46,6 +47,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} @@ -60,6 +71,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.CERTIFICATION_UNIT AS personDeptName, @@ -81,6 +93,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java index 6415047..986c732 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java @@ -3,12 +3,15 @@ import java.io.Serializable; import com.baomidou.mybatisplus.enums.IdType; + +import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableName; import lombok.Data; +import org.apache.ibatis.annotations.Param; /** *

@@ -57,6 +60,9 @@ @TableField("INOUT_TYPE") private String inoutType; + @TableField("TEMPERATURE") + private String temperature; + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java index 0416aeb..e85e166 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java @@ -17,7 +17,7 @@ * @since 2019-12-02 */ public interface IRecognitionRecordsService extends IService { - List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String beginTime, String endTime); + List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime); List> selectVisitorDataScopePage(DataScope dataScope, Page page, String keyword, String doorCode, String devCode, String beginTime, String endTime); List> statisticByDept(String doorCode,String beginTime, String endTime,String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java index ce623d0..27e0b8f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java @@ -41,10 +41,10 @@ */ @RequestMapping(value = "/listStaff") @ResponseBody - public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime){ + public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime){ Page> page = new PageFactory>().defaultPage(); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); page.setRecords(list); return ResponseData.success(super.packForBT(page)); @@ -55,13 +55,13 @@ */ @RequestMapping(value = "/exportStaff") @ResponseBody - public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime) throws IOException { + public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime) throws IOException { Page> page = new PageFactory>().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); super.exportExcel(AcsExportEnum.STAFF_RECORDS_EXPORT, list, response); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java index 8fe1c78..2518229 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java @@ -19,7 +19,7 @@ * @since 2019-12-02 */ public interface RecognitionRecordsMapper extends BaseMapper { - List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); + List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> selectVisitorDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> statisticByDept(@Param("doorCode") String doorCode,@Param("deptIds")String deptIds, @Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("inoutType") String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml index 7a6573d..b95e968 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml @@ -23,6 +23,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.ID_CARD_NO AS idCard, @@ -46,6 +47,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} @@ -60,6 +71,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.CERTIFICATION_UNIT AS personDeptName, @@ -81,6 +93,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java index 6415047..986c732 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java @@ -3,12 +3,15 @@ import java.io.Serializable; import com.baomidou.mybatisplus.enums.IdType; + +import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableName; import lombok.Data; +import org.apache.ibatis.annotations.Param; /** *

@@ -57,6 +60,9 @@ @TableField("INOUT_TYPE") private String inoutType; + @TableField("TEMPERATURE") + private String temperature; + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java index 0416aeb..e85e166 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java @@ -17,7 +17,7 @@ * @since 2019-12-02 */ public interface IRecognitionRecordsService extends IService { - List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String beginTime, String endTime); + List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime); List> selectVisitorDataScopePage(DataScope dataScope, Page page, String keyword, String doorCode, String devCode, String beginTime, String endTime); List> statisticByDept(String doorCode,String beginTime, String endTime,String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java index a77da92..deed198 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java @@ -42,8 +42,8 @@ private IDeviceService deviceService; @Override - public List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String beginTime, String endTime) { - List> list = this.baseMapper.selectStaffDataScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, beginTime, endTime); + public List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime) { + List> list = this.baseMapper.selectStaffDataScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, isAbnormal, beginTime, endTime); for (Map res : list) { Long deptid = Long.valueOf(String.valueOf(res.get("personDeptId"))); String deptName = permissionService.getDeptName(deptid); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java index ce623d0..27e0b8f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java @@ -41,10 +41,10 @@ */ @RequestMapping(value = "/listStaff") @ResponseBody - public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime){ + public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime){ Page> page = new PageFactory>().defaultPage(); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); page.setRecords(list); return ResponseData.success(super.packForBT(page)); @@ -55,13 +55,13 @@ */ @RequestMapping(value = "/exportStaff") @ResponseBody - public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime) throws IOException { + public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime) throws IOException { Page> page = new PageFactory>().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); super.exportExcel(AcsExportEnum.STAFF_RECORDS_EXPORT, list, response); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java index 8fe1c78..2518229 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java @@ -19,7 +19,7 @@ * @since 2019-12-02 */ public interface RecognitionRecordsMapper extends BaseMapper { - List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); + List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> selectVisitorDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> statisticByDept(@Param("doorCode") String doorCode,@Param("deptIds")String deptIds, @Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("inoutType") String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml index 7a6573d..b95e968 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml @@ -23,6 +23,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.ID_CARD_NO AS idCard, @@ -46,6 +47,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} @@ -60,6 +71,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.CERTIFICATION_UNIT AS personDeptName, @@ -81,6 +93,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java index 6415047..986c732 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java @@ -3,12 +3,15 @@ import java.io.Serializable; import com.baomidou.mybatisplus.enums.IdType; + +import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableName; import lombok.Data; +import org.apache.ibatis.annotations.Param; /** *

@@ -57,6 +60,9 @@ @TableField("INOUT_TYPE") private String inoutType; + @TableField("TEMPERATURE") + private String temperature; + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java index 0416aeb..e85e166 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java @@ -17,7 +17,7 @@ * @since 2019-12-02 */ public interface IRecognitionRecordsService extends IService { - List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String beginTime, String endTime); + List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime); List> selectVisitorDataScopePage(DataScope dataScope, Page page, String keyword, String doorCode, String devCode, String beginTime, String endTime); List> statisticByDept(String doorCode,String beginTime, String endTime,String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java index a77da92..deed198 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java @@ -42,8 +42,8 @@ private IDeviceService deviceService; @Override - public List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String beginTime, String endTime) { - List> list = this.baseMapper.selectStaffDataScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, beginTime, endTime); + public List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime) { + List> list = this.baseMapper.selectStaffDataScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, isAbnormal, beginTime, endTime); for (Map res : list) { Long deptid = Long.valueOf(String.valueOf(res.get("personDeptId"))); String deptName = permissionService.getDeptName(deptid); diff --git a/casic-iris-register/pom.xml b/casic-iris-register/pom.xml index 6b80048..5fbb354 100644 --- a/casic-iris-register/pom.xml +++ b/casic-iris-register/pom.xml @@ -29,7 +29,16 @@ casic-iris-support ${casic.version} - + + com.casic + casic-metadata-support + ${casic.version} + + + com.casic + casic-export-support + ${casic.version} + diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java index ce623d0..27e0b8f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java @@ -41,10 +41,10 @@ */ @RequestMapping(value = "/listStaff") @ResponseBody - public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime){ + public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime){ Page> page = new PageFactory>().defaultPage(); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); page.setRecords(list); return ResponseData.success(super.packForBT(page)); @@ -55,13 +55,13 @@ */ @RequestMapping(value = "/exportStaff") @ResponseBody - public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime) throws IOException { + public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime) throws IOException { Page> page = new PageFactory>().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); super.exportExcel(AcsExportEnum.STAFF_RECORDS_EXPORT, list, response); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java index 8fe1c78..2518229 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java @@ -19,7 +19,7 @@ * @since 2019-12-02 */ public interface RecognitionRecordsMapper extends BaseMapper { - List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); + List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> selectVisitorDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> statisticByDept(@Param("doorCode") String doorCode,@Param("deptIds")String deptIds, @Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("inoutType") String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml index 7a6573d..b95e968 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml @@ -23,6 +23,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.ID_CARD_NO AS idCard, @@ -46,6 +47,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} @@ -60,6 +71,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.CERTIFICATION_UNIT AS personDeptName, @@ -81,6 +93,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java index 6415047..986c732 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java @@ -3,12 +3,15 @@ import java.io.Serializable; import com.baomidou.mybatisplus.enums.IdType; + +import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableName; import lombok.Data; +import org.apache.ibatis.annotations.Param; /** *

@@ -57,6 +60,9 @@ @TableField("INOUT_TYPE") private String inoutType; + @TableField("TEMPERATURE") + private String temperature; + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java index 0416aeb..e85e166 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java @@ -17,7 +17,7 @@ * @since 2019-12-02 */ public interface IRecognitionRecordsService extends IService { - List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String beginTime, String endTime); + List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime); List> selectVisitorDataScopePage(DataScope dataScope, Page page, String keyword, String doorCode, String devCode, String beginTime, String endTime); List> statisticByDept(String doorCode,String beginTime, String endTime,String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java index a77da92..deed198 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java @@ -42,8 +42,8 @@ private IDeviceService deviceService; @Override - public List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String beginTime, String endTime) { - List> list = this.baseMapper.selectStaffDataScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, beginTime, endTime); + public List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime) { + List> list = this.baseMapper.selectStaffDataScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, isAbnormal, beginTime, endTime); for (Map res : list) { Long deptid = Long.valueOf(String.valueOf(res.get("personDeptId"))); String deptName = permissionService.getDeptName(deptid); diff --git a/casic-iris-register/pom.xml b/casic-iris-register/pom.xml index 6b80048..5fbb354 100644 --- a/casic-iris-register/pom.xml +++ b/casic-iris-register/pom.xml @@ -29,7 +29,16 @@ casic-iris-support ${casic.version} - + + com.casic + casic-metadata-support + ${casic.version} + + + com.casic + casic-export-support + ${casic.version} + diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java new file mode 100644 index 0000000..a2738c0 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.register.constant; + +public class IrisPersonConst { + /** + * sex + */ + public static final String PERSON_SEX_KEY = "sex"; + /** + * dutyType + */ + public static final String PERSON_DUTYTYPE_KEY = "duty"; + /** + * nationType + */ + public static final String PERSON_NATIONTYPE_KEY = "nation"; + + /** + * cardType + */ + public static final String PERSON_CARDTYPE_KEY = "cardType"; + /** + * cardType + */ + public static final String PERSON_CREATETIME_KEY = "createtime"; +} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java index ce623d0..27e0b8f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java @@ -41,10 +41,10 @@ */ @RequestMapping(value = "/listStaff") @ResponseBody - public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime){ + public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime){ Page> page = new PageFactory>().defaultPage(); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); page.setRecords(list); return ResponseData.success(super.packForBT(page)); @@ -55,13 +55,13 @@ */ @RequestMapping(value = "/exportStaff") @ResponseBody - public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime) throws IOException { + public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime) throws IOException { Page> page = new PageFactory>().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); super.exportExcel(AcsExportEnum.STAFF_RECORDS_EXPORT, list, response); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java index 8fe1c78..2518229 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java @@ -19,7 +19,7 @@ * @since 2019-12-02 */ public interface RecognitionRecordsMapper extends BaseMapper { - List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); + List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> selectVisitorDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> statisticByDept(@Param("doorCode") String doorCode,@Param("deptIds")String deptIds, @Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("inoutType") String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml index 7a6573d..b95e968 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml @@ -23,6 +23,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.ID_CARD_NO AS idCard, @@ -46,6 +47,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} @@ -60,6 +71,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.CERTIFICATION_UNIT AS personDeptName, @@ -81,6 +93,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java index 6415047..986c732 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java @@ -3,12 +3,15 @@ import java.io.Serializable; import com.baomidou.mybatisplus.enums.IdType; + +import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableName; import lombok.Data; +import org.apache.ibatis.annotations.Param; /** *

@@ -57,6 +60,9 @@ @TableField("INOUT_TYPE") private String inoutType; + @TableField("TEMPERATURE") + private String temperature; + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java index 0416aeb..e85e166 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java @@ -17,7 +17,7 @@ * @since 2019-12-02 */ public interface IRecognitionRecordsService extends IService { - List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String beginTime, String endTime); + List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime); List> selectVisitorDataScopePage(DataScope dataScope, Page page, String keyword, String doorCode, String devCode, String beginTime, String endTime); List> statisticByDept(String doorCode,String beginTime, String endTime,String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java index a77da92..deed198 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java @@ -42,8 +42,8 @@ private IDeviceService deviceService; @Override - public List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String beginTime, String endTime) { - List> list = this.baseMapper.selectStaffDataScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, beginTime, endTime); + public List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime) { + List> list = this.baseMapper.selectStaffDataScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, isAbnormal, beginTime, endTime); for (Map res : list) { Long deptid = Long.valueOf(String.valueOf(res.get("personDeptId"))); String deptName = permissionService.getDeptName(deptid); diff --git a/casic-iris-register/pom.xml b/casic-iris-register/pom.xml index 6b80048..5fbb354 100644 --- a/casic-iris-register/pom.xml +++ b/casic-iris-register/pom.xml @@ -29,7 +29,16 @@ casic-iris-support ${casic.version} - + + com.casic + casic-metadata-support + ${casic.version} + + + com.casic + casic-export-support + ${casic.version} + diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java new file mode 100644 index 0000000..a2738c0 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.register.constant; + +public class IrisPersonConst { + /** + * sex + */ + public static final String PERSON_SEX_KEY = "sex"; + /** + * dutyType + */ + public static final String PERSON_DUTYTYPE_KEY = "duty"; + /** + * nationType + */ + public static final String PERSON_NATIONTYPE_KEY = "nation"; + + /** + * cardType + */ + public static final String PERSON_CARDTYPE_KEY = "cardType"; + /** + * cardType + */ + public static final String PERSON_CREATETIME_KEY = "createtime"; +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 56cb280..01ffff9 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -41,7 +41,10 @@ @Value("${casic.file.uploadPath:C://casic//tmp//}") private String filePath; - + @Value("${casic.iris.recServiceHost:localhost}") + private String recServiceHost; + @Value("${casic.iris.recServicePort:20004}") + private Integer recServicePort; @Autowired private IIrisDataService irisDataService; @@ -322,7 +325,7 @@ byte[] irisCode = new byte[1024]; //1.创建客户端Socket，指定服务器地址和端口 - Socket socket=new Socket("localhost", 20005); + Socket socket=new Socket(recServiceHost, recServicePort); //2.获取输出流，向服务器端发送信息 OutputStream os=socket.getOutputStream();//字节输出流 diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java index ce623d0..27e0b8f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java @@ -41,10 +41,10 @@ */ @RequestMapping(value = "/listStaff") @ResponseBody - public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime){ + public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime){ Page> page = new PageFactory>().defaultPage(); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); page.setRecords(list); return ResponseData.success(super.packForBT(page)); @@ -55,13 +55,13 @@ */ @RequestMapping(value = "/exportStaff") @ResponseBody - public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime) throws IOException { + public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime) throws IOException { Page> page = new PageFactory>().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); super.exportExcel(AcsExportEnum.STAFF_RECORDS_EXPORT, list, response); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java index 8fe1c78..2518229 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java @@ -19,7 +19,7 @@ * @since 2019-12-02 */ public interface RecognitionRecordsMapper extends BaseMapper { - List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); + List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> selectVisitorDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> statisticByDept(@Param("doorCode") String doorCode,@Param("deptIds")String deptIds, @Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("inoutType") String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml index 7a6573d..b95e968 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml @@ -23,6 +23,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.ID_CARD_NO AS idCard, @@ -46,6 +47,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} @@ -60,6 +71,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.CERTIFICATION_UNIT AS personDeptName, @@ -81,6 +93,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java index 6415047..986c732 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java @@ -3,12 +3,15 @@ import java.io.Serializable; import com.baomidou.mybatisplus.enums.IdType; + +import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableName; import lombok.Data; +import org.apache.ibatis.annotations.Param; /** *

@@ -57,6 +60,9 @@ @TableField("INOUT_TYPE") private String inoutType; + @TableField("TEMPERATURE") + private String temperature; + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java index 0416aeb..e85e166 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java @@ -17,7 +17,7 @@ * @since 2019-12-02 */ public interface IRecognitionRecordsService extends IService { - List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String beginTime, String endTime); + List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime); List> selectVisitorDataScopePage(DataScope dataScope, Page page, String keyword, String doorCode, String devCode, String beginTime, String endTime); List> statisticByDept(String doorCode,String beginTime, String endTime,String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java index a77da92..deed198 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java @@ -42,8 +42,8 @@ private IDeviceService deviceService; @Override - public List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String beginTime, String endTime) { - List> list = this.baseMapper.selectStaffDataScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, beginTime, endTime); + public List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime) { + List> list = this.baseMapper.selectStaffDataScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, isAbnormal, beginTime, endTime); for (Map res : list) { Long deptid = Long.valueOf(String.valueOf(res.get("personDeptId"))); String deptName = permissionService.getDeptName(deptid); diff --git a/casic-iris-register/pom.xml b/casic-iris-register/pom.xml index 6b80048..5fbb354 100644 --- a/casic-iris-register/pom.xml +++ b/casic-iris-register/pom.xml @@ -29,7 +29,16 @@ casic-iris-support ${casic.version} - + + com.casic + casic-metadata-support + ${casic.version} + + + com.casic + casic-export-support + ${casic.version} + diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java new file mode 100644 index 0000000..a2738c0 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.register.constant; + +public class IrisPersonConst { + /** + * sex + */ + public static final String PERSON_SEX_KEY = "sex"; + /** + * dutyType + */ + public static final String PERSON_DUTYTYPE_KEY = "duty"; + /** + * nationType + */ + public static final String PERSON_NATIONTYPE_KEY = "nation"; + + /** + * cardType + */ + public static final String PERSON_CARDTYPE_KEY = "cardType"; + /** + * cardType + */ + public static final String PERSON_CREATETIME_KEY = "createtime"; +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 56cb280..01ffff9 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -41,7 +41,10 @@ @Value("${casic.file.uploadPath:C://casic//tmp//}") private String filePath; - + @Value("${casic.iris.recServiceHost:localhost}") + private String recServiceHost; + @Value("${casic.iris.recServicePort:20004}") + private Integer recServicePort; @Autowired private IIrisDataService irisDataService; @@ -322,7 +325,7 @@ byte[] irisCode = new byte[1024]; //1.创建客户端Socket，指定服务器地址和端口 - Socket socket=new Socket("localhost", 20005); + Socket socket=new Socket(recServiceHost, recServicePort); //2.获取输出流，向服务器端发送信息 OutputStream os=socket.getOutputStream();//字节输出流 diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java new file mode 100644 index 0000000..04cfaea --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java @@ -0,0 +1,111 @@ +package com.casic.missiles.modular.register.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.Const; +import com.casic.missiles.core.common.constant.PersonConst; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.core.common.service.ICommonPermissionService; +import com.casic.missiles.core.common.service.ICommonPersonService; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.metadata.service.IMetadataSupportService; +import com.casic.missiles.modular.register.enums.IrisExportEnum; +import com.casic.missiles.modular.register.service.IIrisPersonService; +import com.casic.missiles.modular.system.dto.PersonDto; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; + +/** + * 人员管理控制器 + * + * @author dev + * @Date 2019-12-03 17:45:18 + */ +@RestController +@RequestMapping("/person") +public class IrisPersonController extends ExportController { + + @Autowired + private ICommonPermissionService permissionService; + + @Autowired + private IIrisPersonService irisPersonService; + + @Autowired + private ICommonPersonService personService; + @Value("${casic.person.visitor:false}") + private boolean iscVisitor; + + /** + * 人员导出列表 + */ + @RequestMapping(value = "/batchExport") + @ResponseBody + public void batchExport(HttpServletResponse response, String keywords, String sex, String duty, String deptid, String personType, String startTime, String endTime) throws IOException { + DataScope scope = permissionService.getCurrUserDataScope(); + Page> defaultPage = new PageFactory>().defaultPage(); + defaultPage.setSize(Integer.MAX_VALUE); + defaultPage.setSearchCount(false); + if (iscVisitor && Const.ZERO.equals(personType)) { + scope = null; + } + Page> page = getPersonPage(defaultPage, keywords, sex, duty, deptid, personType, startTime, endTime, scope); + super.exportExcel(Const.ZERO.equals(personType) ? IrisExportEnum.VISITOR_EXPORT : IrisExportEnum.PERSON_EXPORT, page.getRecords(), response); + } + + /** + * 获取人员管理分页列表 + */ + @RequestMapping(value = "/irisListPage") + @ResponseBody + public Object listPage(String keywords, String sex, String duty, String deptid, String personType, String startTime, String endTime) { + Page> defaultPage = new PageFactory>().defaultPage(); + DataScope scope = permissionService.getCurrUserDataScope(); + Page> page = getPersonPage(defaultPage, keywords, sex, duty, deptid, personType, startTime, endTime, scope); + return ResponseData.success(super.packForBT(page)); + } + + private Page> getPersonPage(Page> defaultPage, String keywords, String sex, String duty, String deptId, String personType, String startTime, String endTime, DataScope scope) { + EntityWrapper> query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(startTime)) { + query.gt(PersonConst.TABLE_CREATETIME, startTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + query.lt(PersonConst.TABLE_CREATETIME, endTime); + } + if (ToolUtil.isNotEmpty(personType)) { + query.eq(PersonConst.TABLE_PERSONTYPE, personType); + } + + if (ToolUtil.isNotEmpty(duty)) { + query.eq(PersonConst.TABLE_DUTY, duty); + } + if (ToolUtil.isNotEmpty(deptId)) { + query.eq(PersonConst.TABLE_DEPTID, deptId); + } + if (ToolUtil.isNotEmpty(sex)) { + query.eq(PersonConst.TABLE_SEX, sex); + } + if (ToolUtil.isNotEmpty(keywords)) { + query.andNew().like(PersonConst.TABLE_PERSONNAME, keywords).or().like(PersonConst.TABLE_CARDNO, keywords); + } + query.eq(PersonConst.TABLE_DELFLAG, 0); + List> scopePersons = irisPersonService.selectDataScopePersonMap(defaultPage, scope, query); + defaultPage.setRecords(scopePersons); + query.orderBy(PersonConst.TABLE_PERSONCODE); + //展示数据封装 + return defaultPage; + } +} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java index ce623d0..27e0b8f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java @@ -41,10 +41,10 @@ */ @RequestMapping(value = "/listStaff") @ResponseBody - public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime){ + public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime){ Page> page = new PageFactory>().defaultPage(); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); page.setRecords(list); return ResponseData.success(super.packForBT(page)); @@ -55,13 +55,13 @@ */ @RequestMapping(value = "/exportStaff") @ResponseBody - public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime) throws IOException { + public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime) throws IOException { Page> page = new PageFactory>().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); super.exportExcel(AcsExportEnum.STAFF_RECORDS_EXPORT, list, response); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java index 8fe1c78..2518229 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java @@ -19,7 +19,7 @@ * @since 2019-12-02 */ public interface RecognitionRecordsMapper extends BaseMapper { - List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); + List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> selectVisitorDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> statisticByDept(@Param("doorCode") String doorCode,@Param("deptIds")String deptIds, @Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("inoutType") String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml index 7a6573d..b95e968 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml @@ -23,6 +23,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.ID_CARD_NO AS idCard, @@ -46,6 +47,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} @@ -60,6 +71,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.CERTIFICATION_UNIT AS personDeptName, @@ -81,6 +93,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java index 6415047..986c732 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java @@ -3,12 +3,15 @@ import java.io.Serializable; import com.baomidou.mybatisplus.enums.IdType; + +import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableName; import lombok.Data; +import org.apache.ibatis.annotations.Param; /** *

@@ -57,6 +60,9 @@ @TableField("INOUT_TYPE") private String inoutType; + @TableField("TEMPERATURE") + private String temperature; + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java index 0416aeb..e85e166 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java @@ -17,7 +17,7 @@ * @since 2019-12-02 */ public interface IRecognitionRecordsService extends IService { - List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String beginTime, String endTime); + List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime); List> selectVisitorDataScopePage(DataScope dataScope, Page page, String keyword, String doorCode, String devCode, String beginTime, String endTime); List> statisticByDept(String doorCode,String beginTime, String endTime,String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java index a77da92..deed198 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java @@ -42,8 +42,8 @@ private IDeviceService deviceService; @Override - public List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String beginTime, String endTime) { - List> list = this.baseMapper.selectStaffDataScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, beginTime, endTime); + public List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime) { + List> list = this.baseMapper.selectStaffDataScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, isAbnormal, beginTime, endTime); for (Map res : list) { Long deptid = Long.valueOf(String.valueOf(res.get("personDeptId"))); String deptName = permissionService.getDeptName(deptid); diff --git a/casic-iris-register/pom.xml b/casic-iris-register/pom.xml index 6b80048..5fbb354 100644 --- a/casic-iris-register/pom.xml +++ b/casic-iris-register/pom.xml @@ -29,7 +29,16 @@ casic-iris-support ${casic.version} - + + com.casic + casic-metadata-support + ${casic.version} + + + com.casic + casic-export-support + ${casic.version} + diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java new file mode 100644 index 0000000..a2738c0 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.register.constant; + +public class IrisPersonConst { + /** + * sex + */ + public static final String PERSON_SEX_KEY = "sex"; + /** + * dutyType + */ + public static final String PERSON_DUTYTYPE_KEY = "duty"; + /** + * nationType + */ + public static final String PERSON_NATIONTYPE_KEY = "nation"; + + /** + * cardType + */ + public static final String PERSON_CARDTYPE_KEY = "cardType"; + /** + * cardType + */ + public static final String PERSON_CREATETIME_KEY = "createtime"; +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 56cb280..01ffff9 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -41,7 +41,10 @@ @Value("${casic.file.uploadPath:C://casic//tmp//}") private String filePath; - + @Value("${casic.iris.recServiceHost:localhost}") + private String recServiceHost; + @Value("${casic.iris.recServicePort:20004}") + private Integer recServicePort; @Autowired private IIrisDataService irisDataService; @@ -322,7 +325,7 @@ byte[] irisCode = new byte[1024]; //1.创建客户端Socket，指定服务器地址和端口 - Socket socket=new Socket("localhost", 20005); + Socket socket=new Socket(recServiceHost, recServicePort); //2.获取输出流，向服务器端发送信息 OutputStream os=socket.getOutputStream();//字节输出流 diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java new file mode 100644 index 0000000..04cfaea --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java @@ -0,0 +1,111 @@ +package com.casic.missiles.modular.register.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.Const; +import com.casic.missiles.core.common.constant.PersonConst; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.core.common.service.ICommonPermissionService; +import com.casic.missiles.core.common.service.ICommonPersonService; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.metadata.service.IMetadataSupportService; +import com.casic.missiles.modular.register.enums.IrisExportEnum; +import com.casic.missiles.modular.register.service.IIrisPersonService; +import com.casic.missiles.modular.system.dto.PersonDto; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; + +/** + * 人员管理控制器 + * + * @author dev + * @Date 2019-12-03 17:45:18 + */ +@RestController +@RequestMapping("/person") +public class IrisPersonController extends ExportController { + + @Autowired + private ICommonPermissionService permissionService; + + @Autowired + private IIrisPersonService irisPersonService; + + @Autowired + private ICommonPersonService personService; + @Value("${casic.person.visitor:false}") + private boolean iscVisitor; + + /** + * 人员导出列表 + */ + @RequestMapping(value = "/batchExport") + @ResponseBody + public void batchExport(HttpServletResponse response, String keywords, String sex, String duty, String deptid, String personType, String startTime, String endTime) throws IOException { + DataScope scope = permissionService.getCurrUserDataScope(); + Page> defaultPage = new PageFactory>().defaultPage(); + defaultPage.setSize(Integer.MAX_VALUE); + defaultPage.setSearchCount(false); + if (iscVisitor && Const.ZERO.equals(personType)) { + scope = null; + } + Page> page = getPersonPage(defaultPage, keywords, sex, duty, deptid, personType, startTime, endTime, scope); + super.exportExcel(Const.ZERO.equals(personType) ? IrisExportEnum.VISITOR_EXPORT : IrisExportEnum.PERSON_EXPORT, page.getRecords(), response); + } + + /** + * 获取人员管理分页列表 + */ + @RequestMapping(value = "/irisListPage") + @ResponseBody + public Object listPage(String keywords, String sex, String duty, String deptid, String personType, String startTime, String endTime) { + Page> defaultPage = new PageFactory>().defaultPage(); + DataScope scope = permissionService.getCurrUserDataScope(); + Page> page = getPersonPage(defaultPage, keywords, sex, duty, deptid, personType, startTime, endTime, scope); + return ResponseData.success(super.packForBT(page)); + } + + private Page> getPersonPage(Page> defaultPage, String keywords, String sex, String duty, String deptId, String personType, String startTime, String endTime, DataScope scope) { + EntityWrapper> query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(startTime)) { + query.gt(PersonConst.TABLE_CREATETIME, startTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + query.lt(PersonConst.TABLE_CREATETIME, endTime); + } + if (ToolUtil.isNotEmpty(personType)) { + query.eq(PersonConst.TABLE_PERSONTYPE, personType); + } + + if (ToolUtil.isNotEmpty(duty)) { + query.eq(PersonConst.TABLE_DUTY, duty); + } + if (ToolUtil.isNotEmpty(deptId)) { + query.eq(PersonConst.TABLE_DEPTID, deptId); + } + if (ToolUtil.isNotEmpty(sex)) { + query.eq(PersonConst.TABLE_SEX, sex); + } + if (ToolUtil.isNotEmpty(keywords)) { + query.andNew().like(PersonConst.TABLE_PERSONNAME, keywords).or().like(PersonConst.TABLE_CARDNO, keywords); + } + query.eq(PersonConst.TABLE_DELFLAG, 0); + List> scopePersons = irisPersonService.selectDataScopePersonMap(defaultPage, scope, query); + defaultPage.setRecords(scopePersons); + query.orderBy(PersonConst.TABLE_PERSONCODE); + //展示数据封装 + return defaultPage; + } +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisDataMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisDataMapper.java index 45d1421..b49b025 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisDataMapper.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisDataMapper.java @@ -4,17 +4,27 @@ import com.casic.missiles.modular.register.model.IrisData; import com.baomidou.mybatisplus.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.Map; +import java.util.Set; /** *

- * Mapper 接口 + * Mapper 接口 *

* * @author stylefeng123 * @since 2019-11-29 */ public interface IrisDataMapper extends BaseMapper { - Map selectByPersonId(@Param("personId") String personId); + Map selectByPersonId(@Param("personId") String personId); + + /** + * 判定人员是否已注册 + * + * @return + */ + @Select("select PERSON_ID from iris_data GROUP BY PERSON_ID") + Set selectPersonIdExist(); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java index ce623d0..27e0b8f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java @@ -41,10 +41,10 @@ */ @RequestMapping(value = "/listStaff") @ResponseBody - public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime){ + public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime){ Page> page = new PageFactory>().defaultPage(); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); page.setRecords(list); return ResponseData.success(super.packForBT(page)); @@ -55,13 +55,13 @@ */ @RequestMapping(value = "/exportStaff") @ResponseBody - public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime) throws IOException { + public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime) throws IOException { Page> page = new PageFactory>().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); super.exportExcel(AcsExportEnum.STAFF_RECORDS_EXPORT, list, response); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java index 8fe1c78..2518229 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java @@ -19,7 +19,7 @@ * @since 2019-12-02 */ public interface RecognitionRecordsMapper extends BaseMapper { - List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); + List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> selectVisitorDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> statisticByDept(@Param("doorCode") String doorCode,@Param("deptIds")String deptIds, @Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("inoutType") String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml index 7a6573d..b95e968 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml @@ -23,6 +23,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.ID_CARD_NO AS idCard, @@ -46,6 +47,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} @@ -60,6 +71,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.CERTIFICATION_UNIT AS personDeptName, @@ -81,6 +93,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java index 6415047..986c732 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java @@ -3,12 +3,15 @@ import java.io.Serializable; import com.baomidou.mybatisplus.enums.IdType; + +import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableName; import lombok.Data; +import org.apache.ibatis.annotations.Param; /** *

@@ -57,6 +60,9 @@ @TableField("INOUT_TYPE") private String inoutType; + @TableField("TEMPERATURE") + private String temperature; + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java index 0416aeb..e85e166 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java @@ -17,7 +17,7 @@ * @since 2019-12-02 */ public interface IRecognitionRecordsService extends IService { - List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String beginTime, String endTime); + List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime); List> selectVisitorDataScopePage(DataScope dataScope, Page page, String keyword, String doorCode, String devCode, String beginTime, String endTime); List> statisticByDept(String doorCode,String beginTime, String endTime,String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java index a77da92..deed198 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java @@ -42,8 +42,8 @@ private IDeviceService deviceService; @Override - public List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String beginTime, String endTime) { - List> list = this.baseMapper.selectStaffDataScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, beginTime, endTime); + public List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime) { + List> list = this.baseMapper.selectStaffDataScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, isAbnormal, beginTime, endTime); for (Map res : list) { Long deptid = Long.valueOf(String.valueOf(res.get("personDeptId"))); String deptName = permissionService.getDeptName(deptid); diff --git a/casic-iris-register/pom.xml b/casic-iris-register/pom.xml index 6b80048..5fbb354 100644 --- a/casic-iris-register/pom.xml +++ b/casic-iris-register/pom.xml @@ -29,7 +29,16 @@ casic-iris-support ${casic.version} - + + com.casic + casic-metadata-support + ${casic.version} + + + com.casic + casic-export-support + ${casic.version} + diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java new file mode 100644 index 0000000..a2738c0 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.register.constant; + +public class IrisPersonConst { + /** + * sex + */ + public static final String PERSON_SEX_KEY = "sex"; + /** + * dutyType + */ + public static final String PERSON_DUTYTYPE_KEY = "duty"; + /** + * nationType + */ + public static final String PERSON_NATIONTYPE_KEY = "nation"; + + /** + * cardType + */ + public static final String PERSON_CARDTYPE_KEY = "cardType"; + /** + * cardType + */ + public static final String PERSON_CREATETIME_KEY = "createtime"; +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 56cb280..01ffff9 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -41,7 +41,10 @@ @Value("${casic.file.uploadPath:C://casic//tmp//}") private String filePath; - + @Value("${casic.iris.recServiceHost:localhost}") + private String recServiceHost; + @Value("${casic.iris.recServicePort:20004}") + private Integer recServicePort; @Autowired private IIrisDataService irisDataService; @@ -322,7 +325,7 @@ byte[] irisCode = new byte[1024]; //1.创建客户端Socket，指定服务器地址和端口 - Socket socket=new Socket("localhost", 20005); + Socket socket=new Socket(recServiceHost, recServicePort); //2.获取输出流，向服务器端发送信息 OutputStream os=socket.getOutputStream();//字节输出流 diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java new file mode 100644 index 0000000..04cfaea --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java @@ -0,0 +1,111 @@ +package com.casic.missiles.modular.register.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.Const; +import com.casic.missiles.core.common.constant.PersonConst; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.core.common.service.ICommonPermissionService; +import com.casic.missiles.core.common.service.ICommonPersonService; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.metadata.service.IMetadataSupportService; +import com.casic.missiles.modular.register.enums.IrisExportEnum; +import com.casic.missiles.modular.register.service.IIrisPersonService; +import com.casic.missiles.modular.system.dto.PersonDto; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; + +/** + * 人员管理控制器 + * + * @author dev + * @Date 2019-12-03 17:45:18 + */ +@RestController +@RequestMapping("/person") +public class IrisPersonController extends ExportController { + + @Autowired + private ICommonPermissionService permissionService; + + @Autowired + private IIrisPersonService irisPersonService; + + @Autowired + private ICommonPersonService personService; + @Value("${casic.person.visitor:false}") + private boolean iscVisitor; + + /** + * 人员导出列表 + */ + @RequestMapping(value = "/batchExport") + @ResponseBody + public void batchExport(HttpServletResponse response, String keywords, String sex, String duty, String deptid, String personType, String startTime, String endTime) throws IOException { + DataScope scope = permissionService.getCurrUserDataScope(); + Page> defaultPage = new PageFactory>().defaultPage(); + defaultPage.setSize(Integer.MAX_VALUE); + defaultPage.setSearchCount(false); + if (iscVisitor && Const.ZERO.equals(personType)) { + scope = null; + } + Page> page = getPersonPage(defaultPage, keywords, sex, duty, deptid, personType, startTime, endTime, scope); + super.exportExcel(Const.ZERO.equals(personType) ? IrisExportEnum.VISITOR_EXPORT : IrisExportEnum.PERSON_EXPORT, page.getRecords(), response); + } + + /** + * 获取人员管理分页列表 + */ + @RequestMapping(value = "/irisListPage") + @ResponseBody + public Object listPage(String keywords, String sex, String duty, String deptid, String personType, String startTime, String endTime) { + Page> defaultPage = new PageFactory>().defaultPage(); + DataScope scope = permissionService.getCurrUserDataScope(); + Page> page = getPersonPage(defaultPage, keywords, sex, duty, deptid, personType, startTime, endTime, scope); + return ResponseData.success(super.packForBT(page)); + } + + private Page> getPersonPage(Page> defaultPage, String keywords, String sex, String duty, String deptId, String personType, String startTime, String endTime, DataScope scope) { + EntityWrapper> query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(startTime)) { + query.gt(PersonConst.TABLE_CREATETIME, startTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + query.lt(PersonConst.TABLE_CREATETIME, endTime); + } + if (ToolUtil.isNotEmpty(personType)) { + query.eq(PersonConst.TABLE_PERSONTYPE, personType); + } + + if (ToolUtil.isNotEmpty(duty)) { + query.eq(PersonConst.TABLE_DUTY, duty); + } + if (ToolUtil.isNotEmpty(deptId)) { + query.eq(PersonConst.TABLE_DEPTID, deptId); + } + if (ToolUtil.isNotEmpty(sex)) { + query.eq(PersonConst.TABLE_SEX, sex); + } + if (ToolUtil.isNotEmpty(keywords)) { + query.andNew().like(PersonConst.TABLE_PERSONNAME, keywords).or().like(PersonConst.TABLE_CARDNO, keywords); + } + query.eq(PersonConst.TABLE_DELFLAG, 0); + List> scopePersons = irisPersonService.selectDataScopePersonMap(defaultPage, scope, query); + defaultPage.setRecords(scopePersons); + query.orderBy(PersonConst.TABLE_PERSONCODE); + //展示数据封装 + return defaultPage; + } +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisDataMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisDataMapper.java index 45d1421..b49b025 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisDataMapper.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisDataMapper.java @@ -4,17 +4,27 @@ import com.casic.missiles.modular.register.model.IrisData; import com.baomidou.mybatisplus.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.Map; +import java.util.Set; /** *

- * Mapper 接口 + * Mapper 接口 *

* * @author stylefeng123 * @since 2019-11-29 */ public interface IrisDataMapper extends BaseMapper { - Map selectByPersonId(@Param("personId") String personId); + Map selectByPersonId(@Param("personId") String personId); + + /** + * 判定人员是否已注册 + * + * @return + */ + @Select("select PERSON_ID from iris_data GROUP BY PERSON_ID") + Set selectPersonIdExist(); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/enums/IrisExportEnum.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/enums/IrisExportEnum.java new file mode 100644 index 0000000..e39cffd --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/enums/IrisExportEnum.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.register.enums; + +import com.casic.missiles.config.properties.CasicProperties; +import com.casic.missiles.core.enums.ExportExcelEnum; +import com.casic.missiles.core.util.SpringContextHolder; + +public enum IrisExportEnum implements ExportExcelEnum { + + PERSON_EXPORT("personTemp.xlsx", "personTemp.xlsx", "员工列表"), + VISITOR_EXPORT("visitorTemp.xlsx", "visitorTemp.xlsx", "访客列表"); + + IrisExportEnum(String fileTempPath, String fileName, String description) { + this.fileTempPath = SpringContextHolder.getBean(CasicProperties.class).getExportTempPath().concat(fileTempPath); + this.fileName = fileName; + this.description = description; + } + + /** + * 导出模板相对路径 + */ + private String fileTempPath; + /** + * 下载文件名 + */ + private String fileName; + /** + * 描述信息 + */ + private String description; + + @Override + public String getFileTempPath() { + return fileTempPath; + } + + @Override + public String getFileName() { + return fileName; + } + + @Override + public String getDescription() { + return description; + } +} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java index ce623d0..27e0b8f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java @@ -41,10 +41,10 @@ */ @RequestMapping(value = "/listStaff") @ResponseBody - public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime){ + public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime){ Page> page = new PageFactory>().defaultPage(); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); page.setRecords(list); return ResponseData.success(super.packForBT(page)); @@ -55,13 +55,13 @@ */ @RequestMapping(value = "/exportStaff") @ResponseBody - public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime) throws IOException { + public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime) throws IOException { Page> page = new PageFactory>().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); super.exportExcel(AcsExportEnum.STAFF_RECORDS_EXPORT, list, response); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java index 8fe1c78..2518229 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java @@ -19,7 +19,7 @@ * @since 2019-12-02 */ public interface RecognitionRecordsMapper extends BaseMapper { - List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); + List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> selectVisitorDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> statisticByDept(@Param("doorCode") String doorCode,@Param("deptIds")String deptIds, @Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("inoutType") String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml index 7a6573d..b95e968 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml @@ -23,6 +23,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.ID_CARD_NO AS idCard, @@ -46,6 +47,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} @@ -60,6 +71,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.CERTIFICATION_UNIT AS personDeptName, @@ -81,6 +93,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java index 6415047..986c732 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java @@ -3,12 +3,15 @@ import java.io.Serializable; import com.baomidou.mybatisplus.enums.IdType; + +import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableName; import lombok.Data; +import org.apache.ibatis.annotations.Param; /** *

@@ -57,6 +60,9 @@ @TableField("INOUT_TYPE") private String inoutType; + @TableField("TEMPERATURE") + private String temperature; + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java index 0416aeb..e85e166 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java @@ -17,7 +17,7 @@ * @since 2019-12-02 */ public interface IRecognitionRecordsService extends IService { - List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String beginTime, String endTime); + List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime); List> selectVisitorDataScopePage(DataScope dataScope, Page page, String keyword, String doorCode, String devCode, String beginTime, String endTime); List> statisticByDept(String doorCode,String beginTime, String endTime,String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java index a77da92..deed198 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java @@ -42,8 +42,8 @@ private IDeviceService deviceService; @Override - public List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String beginTime, String endTime) { - List> list = this.baseMapper.selectStaffDataScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, beginTime, endTime); + public List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime) { + List> list = this.baseMapper.selectStaffDataScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, isAbnormal, beginTime, endTime); for (Map res : list) { Long deptid = Long.valueOf(String.valueOf(res.get("personDeptId"))); String deptName = permissionService.getDeptName(deptid); diff --git a/casic-iris-register/pom.xml b/casic-iris-register/pom.xml index 6b80048..5fbb354 100644 --- a/casic-iris-register/pom.xml +++ b/casic-iris-register/pom.xml @@ -29,7 +29,16 @@ casic-iris-support ${casic.version} - + + com.casic + casic-metadata-support + ${casic.version} + + + com.casic + casic-export-support + ${casic.version} + diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java new file mode 100644 index 0000000..a2738c0 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.register.constant; + +public class IrisPersonConst { + /** + * sex + */ + public static final String PERSON_SEX_KEY = "sex"; + /** + * dutyType + */ + public static final String PERSON_DUTYTYPE_KEY = "duty"; + /** + * nationType + */ + public static final String PERSON_NATIONTYPE_KEY = "nation"; + + /** + * cardType + */ + public static final String PERSON_CARDTYPE_KEY = "cardType"; + /** + * cardType + */ + public static final String PERSON_CREATETIME_KEY = "createtime"; +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 56cb280..01ffff9 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -41,7 +41,10 @@ @Value("${casic.file.uploadPath:C://casic//tmp//}") private String filePath; - + @Value("${casic.iris.recServiceHost:localhost}") + private String recServiceHost; + @Value("${casic.iris.recServicePort:20004}") + private Integer recServicePort; @Autowired private IIrisDataService irisDataService; @@ -322,7 +325,7 @@ byte[] irisCode = new byte[1024]; //1.创建客户端Socket，指定服务器地址和端口 - Socket socket=new Socket("localhost", 20005); + Socket socket=new Socket(recServiceHost, recServicePort); //2.获取输出流，向服务器端发送信息 OutputStream os=socket.getOutputStream();//字节输出流 diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java new file mode 100644 index 0000000..04cfaea --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java @@ -0,0 +1,111 @@ +package com.casic.missiles.modular.register.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.Const; +import com.casic.missiles.core.common.constant.PersonConst; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.core.common.service.ICommonPermissionService; +import com.casic.missiles.core.common.service.ICommonPersonService; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.metadata.service.IMetadataSupportService; +import com.casic.missiles.modular.register.enums.IrisExportEnum; +import com.casic.missiles.modular.register.service.IIrisPersonService; +import com.casic.missiles.modular.system.dto.PersonDto; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; + +/** + * 人员管理控制器 + * + * @author dev + * @Date 2019-12-03 17:45:18 + */ +@RestController +@RequestMapping("/person") +public class IrisPersonController extends ExportController { + + @Autowired + private ICommonPermissionService permissionService; + + @Autowired + private IIrisPersonService irisPersonService; + + @Autowired + private ICommonPersonService personService; + @Value("${casic.person.visitor:false}") + private boolean iscVisitor; + + /** + * 人员导出列表 + */ + @RequestMapping(value = "/batchExport") + @ResponseBody + public void batchExport(HttpServletResponse response, String keywords, String sex, String duty, String deptid, String personType, String startTime, String endTime) throws IOException { + DataScope scope = permissionService.getCurrUserDataScope(); + Page> defaultPage = new PageFactory>().defaultPage(); + defaultPage.setSize(Integer.MAX_VALUE); + defaultPage.setSearchCount(false); + if (iscVisitor && Const.ZERO.equals(personType)) { + scope = null; + } + Page> page = getPersonPage(defaultPage, keywords, sex, duty, deptid, personType, startTime, endTime, scope); + super.exportExcel(Const.ZERO.equals(personType) ? IrisExportEnum.VISITOR_EXPORT : IrisExportEnum.PERSON_EXPORT, page.getRecords(), response); + } + + /** + * 获取人员管理分页列表 + */ + @RequestMapping(value = "/irisListPage") + @ResponseBody + public Object listPage(String keywords, String sex, String duty, String deptid, String personType, String startTime, String endTime) { + Page> defaultPage = new PageFactory>().defaultPage(); + DataScope scope = permissionService.getCurrUserDataScope(); + Page> page = getPersonPage(defaultPage, keywords, sex, duty, deptid, personType, startTime, endTime, scope); + return ResponseData.success(super.packForBT(page)); + } + + private Page> getPersonPage(Page> defaultPage, String keywords, String sex, String duty, String deptId, String personType, String startTime, String endTime, DataScope scope) { + EntityWrapper> query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(startTime)) { + query.gt(PersonConst.TABLE_CREATETIME, startTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + query.lt(PersonConst.TABLE_CREATETIME, endTime); + } + if (ToolUtil.isNotEmpty(personType)) { + query.eq(PersonConst.TABLE_PERSONTYPE, personType); + } + + if (ToolUtil.isNotEmpty(duty)) { + query.eq(PersonConst.TABLE_DUTY, duty); + } + if (ToolUtil.isNotEmpty(deptId)) { + query.eq(PersonConst.TABLE_DEPTID, deptId); + } + if (ToolUtil.isNotEmpty(sex)) { + query.eq(PersonConst.TABLE_SEX, sex); + } + if (ToolUtil.isNotEmpty(keywords)) { + query.andNew().like(PersonConst.TABLE_PERSONNAME, keywords).or().like(PersonConst.TABLE_CARDNO, keywords); + } + query.eq(PersonConst.TABLE_DELFLAG, 0); + List> scopePersons = irisPersonService.selectDataScopePersonMap(defaultPage, scope, query); + defaultPage.setRecords(scopePersons); + query.orderBy(PersonConst.TABLE_PERSONCODE); + //展示数据封装 + return defaultPage; + } +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisDataMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisDataMapper.java index 45d1421..b49b025 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisDataMapper.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisDataMapper.java @@ -4,17 +4,27 @@ import com.casic.missiles.modular.register.model.IrisData; import com.baomidou.mybatisplus.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.Map; +import java.util.Set; /** *

- * Mapper 接口 + * Mapper 接口 *

* * @author stylefeng123 * @since 2019-11-29 */ public interface IrisDataMapper extends BaseMapper { - Map selectByPersonId(@Param("personId") String personId); + Map selectByPersonId(@Param("personId") String personId); + + /** + * 判定人员是否已注册 + * + * @return + */ + @Select("select PERSON_ID from iris_data GROUP BY PERSON_ID") + Set selectPersonIdExist(); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/enums/IrisExportEnum.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/enums/IrisExportEnum.java new file mode 100644 index 0000000..e39cffd --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/enums/IrisExportEnum.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.register.enums; + +import com.casic.missiles.config.properties.CasicProperties; +import com.casic.missiles.core.enums.ExportExcelEnum; +import com.casic.missiles.core.util.SpringContextHolder; + +public enum IrisExportEnum implements ExportExcelEnum { + + PERSON_EXPORT("personTemp.xlsx", "personTemp.xlsx", "员工列表"), + VISITOR_EXPORT("visitorTemp.xlsx", "visitorTemp.xlsx", "访客列表"); + + IrisExportEnum(String fileTempPath, String fileName, String description) { + this.fileTempPath = SpringContextHolder.getBean(CasicProperties.class).getExportTempPath().concat(fileTempPath); + this.fileName = fileName; + this.description = description; + } + + /** + * 导出模板相对路径 + */ + private String fileTempPath; + /** + * 下载文件名 + */ + private String fileName; + /** + * 描述信息 + */ + private String description; + + @Override + public String getFileTempPath() { + return fileTempPath; + } + + @Override + public String getFileName() { + return fileName; + } + + @Override + public String getDescription() { + return description; + } +} 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 new file mode 100644 index 0000000..1896ec5 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.register.service; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.register.model.IrisData; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2019-11-29 + */ +public interface IIrisPersonService { + List> selectDataScopePersonMap(Page> page, DataScope dataScope, EntityWrapper wrapper); +} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java index ce623d0..27e0b8f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java @@ -41,10 +41,10 @@ */ @RequestMapping(value = "/listStaff") @ResponseBody - public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime){ + public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime){ Page> page = new PageFactory>().defaultPage(); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); page.setRecords(list); return ResponseData.success(super.packForBT(page)); @@ -55,13 +55,13 @@ */ @RequestMapping(value = "/exportStaff") @ResponseBody - public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime) throws IOException { + public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime) throws IOException { Page> page = new PageFactory>().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); super.exportExcel(AcsExportEnum.STAFF_RECORDS_EXPORT, list, response); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java index 8fe1c78..2518229 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java @@ -19,7 +19,7 @@ * @since 2019-12-02 */ public interface RecognitionRecordsMapper extends BaseMapper { - List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); + List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> selectVisitorDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> statisticByDept(@Param("doorCode") String doorCode,@Param("deptIds")String deptIds, @Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("inoutType") String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml index 7a6573d..b95e968 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml @@ -23,6 +23,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.ID_CARD_NO AS idCard, @@ -46,6 +47,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} @@ -60,6 +71,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.CERTIFICATION_UNIT AS personDeptName, @@ -81,6 +93,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java index 6415047..986c732 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java @@ -3,12 +3,15 @@ import java.io.Serializable; import com.baomidou.mybatisplus.enums.IdType; + +import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableName; import lombok.Data; +import org.apache.ibatis.annotations.Param; /** *

@@ -57,6 +60,9 @@ @TableField("INOUT_TYPE") private String inoutType; + @TableField("TEMPERATURE") + private String temperature; + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java index 0416aeb..e85e166 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java @@ -17,7 +17,7 @@ * @since 2019-12-02 */ public interface IRecognitionRecordsService extends IService { - List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String beginTime, String endTime); + List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime); List> selectVisitorDataScopePage(DataScope dataScope, Page page, String keyword, String doorCode, String devCode, String beginTime, String endTime); List> statisticByDept(String doorCode,String beginTime, String endTime,String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java index a77da92..deed198 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java @@ -42,8 +42,8 @@ private IDeviceService deviceService; @Override - public List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String beginTime, String endTime) { - List> list = this.baseMapper.selectStaffDataScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, beginTime, endTime); + public List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime) { + List> list = this.baseMapper.selectStaffDataScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, isAbnormal, beginTime, endTime); for (Map res : list) { Long deptid = Long.valueOf(String.valueOf(res.get("personDeptId"))); String deptName = permissionService.getDeptName(deptid); diff --git a/casic-iris-register/pom.xml b/casic-iris-register/pom.xml index 6b80048..5fbb354 100644 --- a/casic-iris-register/pom.xml +++ b/casic-iris-register/pom.xml @@ -29,7 +29,16 @@ casic-iris-support ${casic.version} - + + com.casic + casic-metadata-support + ${casic.version} + + + com.casic + casic-export-support + ${casic.version} + diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java new file mode 100644 index 0000000..a2738c0 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.register.constant; + +public class IrisPersonConst { + /** + * sex + */ + public static final String PERSON_SEX_KEY = "sex"; + /** + * dutyType + */ + public static final String PERSON_DUTYTYPE_KEY = "duty"; + /** + * nationType + */ + public static final String PERSON_NATIONTYPE_KEY = "nation"; + + /** + * cardType + */ + public static final String PERSON_CARDTYPE_KEY = "cardType"; + /** + * cardType + */ + public static final String PERSON_CREATETIME_KEY = "createtime"; +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 56cb280..01ffff9 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -41,7 +41,10 @@ @Value("${casic.file.uploadPath:C://casic//tmp//}") private String filePath; - + @Value("${casic.iris.recServiceHost:localhost}") + private String recServiceHost; + @Value("${casic.iris.recServicePort:20004}") + private Integer recServicePort; @Autowired private IIrisDataService irisDataService; @@ -322,7 +325,7 @@ byte[] irisCode = new byte[1024]; //1.创建客户端Socket，指定服务器地址和端口 - Socket socket=new Socket("localhost", 20005); + Socket socket=new Socket(recServiceHost, recServicePort); //2.获取输出流，向服务器端发送信息 OutputStream os=socket.getOutputStream();//字节输出流 diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java new file mode 100644 index 0000000..04cfaea --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java @@ -0,0 +1,111 @@ +package com.casic.missiles.modular.register.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.Const; +import com.casic.missiles.core.common.constant.PersonConst; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.core.common.service.ICommonPermissionService; +import com.casic.missiles.core.common.service.ICommonPersonService; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.metadata.service.IMetadataSupportService; +import com.casic.missiles.modular.register.enums.IrisExportEnum; +import com.casic.missiles.modular.register.service.IIrisPersonService; +import com.casic.missiles.modular.system.dto.PersonDto; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; + +/** + * 人员管理控制器 + * + * @author dev + * @Date 2019-12-03 17:45:18 + */ +@RestController +@RequestMapping("/person") +public class IrisPersonController extends ExportController { + + @Autowired + private ICommonPermissionService permissionService; + + @Autowired + private IIrisPersonService irisPersonService; + + @Autowired + private ICommonPersonService personService; + @Value("${casic.person.visitor:false}") + private boolean iscVisitor; + + /** + * 人员导出列表 + */ + @RequestMapping(value = "/batchExport") + @ResponseBody + public void batchExport(HttpServletResponse response, String keywords, String sex, String duty, String deptid, String personType, String startTime, String endTime) throws IOException { + DataScope scope = permissionService.getCurrUserDataScope(); + Page> defaultPage = new PageFactory>().defaultPage(); + defaultPage.setSize(Integer.MAX_VALUE); + defaultPage.setSearchCount(false); + if (iscVisitor && Const.ZERO.equals(personType)) { + scope = null; + } + Page> page = getPersonPage(defaultPage, keywords, sex, duty, deptid, personType, startTime, endTime, scope); + super.exportExcel(Const.ZERO.equals(personType) ? IrisExportEnum.VISITOR_EXPORT : IrisExportEnum.PERSON_EXPORT, page.getRecords(), response); + } + + /** + * 获取人员管理分页列表 + */ + @RequestMapping(value = "/irisListPage") + @ResponseBody + public Object listPage(String keywords, String sex, String duty, String deptid, String personType, String startTime, String endTime) { + Page> defaultPage = new PageFactory>().defaultPage(); + DataScope scope = permissionService.getCurrUserDataScope(); + Page> page = getPersonPage(defaultPage, keywords, sex, duty, deptid, personType, startTime, endTime, scope); + return ResponseData.success(super.packForBT(page)); + } + + private Page> getPersonPage(Page> defaultPage, String keywords, String sex, String duty, String deptId, String personType, String startTime, String endTime, DataScope scope) { + EntityWrapper> query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(startTime)) { + query.gt(PersonConst.TABLE_CREATETIME, startTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + query.lt(PersonConst.TABLE_CREATETIME, endTime); + } + if (ToolUtil.isNotEmpty(personType)) { + query.eq(PersonConst.TABLE_PERSONTYPE, personType); + } + + if (ToolUtil.isNotEmpty(duty)) { + query.eq(PersonConst.TABLE_DUTY, duty); + } + if (ToolUtil.isNotEmpty(deptId)) { + query.eq(PersonConst.TABLE_DEPTID, deptId); + } + if (ToolUtil.isNotEmpty(sex)) { + query.eq(PersonConst.TABLE_SEX, sex); + } + if (ToolUtil.isNotEmpty(keywords)) { + query.andNew().like(PersonConst.TABLE_PERSONNAME, keywords).or().like(PersonConst.TABLE_CARDNO, keywords); + } + query.eq(PersonConst.TABLE_DELFLAG, 0); + List> scopePersons = irisPersonService.selectDataScopePersonMap(defaultPage, scope, query); + defaultPage.setRecords(scopePersons); + query.orderBy(PersonConst.TABLE_PERSONCODE); + //展示数据封装 + return defaultPage; + } +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisDataMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisDataMapper.java index 45d1421..b49b025 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisDataMapper.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisDataMapper.java @@ -4,17 +4,27 @@ import com.casic.missiles.modular.register.model.IrisData; import com.baomidou.mybatisplus.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.Map; +import java.util.Set; /** *

- * Mapper 接口 + * Mapper 接口 *

* * @author stylefeng123 * @since 2019-11-29 */ public interface IrisDataMapper extends BaseMapper { - Map selectByPersonId(@Param("personId") String personId); + Map selectByPersonId(@Param("personId") String personId); + + /** + * 判定人员是否已注册 + * + * @return + */ + @Select("select PERSON_ID from iris_data GROUP BY PERSON_ID") + Set selectPersonIdExist(); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/enums/IrisExportEnum.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/enums/IrisExportEnum.java new file mode 100644 index 0000000..e39cffd --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/enums/IrisExportEnum.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.register.enums; + +import com.casic.missiles.config.properties.CasicProperties; +import com.casic.missiles.core.enums.ExportExcelEnum; +import com.casic.missiles.core.util.SpringContextHolder; + +public enum IrisExportEnum implements ExportExcelEnum { + + PERSON_EXPORT("personTemp.xlsx", "personTemp.xlsx", "员工列表"), + VISITOR_EXPORT("visitorTemp.xlsx", "visitorTemp.xlsx", "访客列表"); + + IrisExportEnum(String fileTempPath, String fileName, String description) { + this.fileTempPath = SpringContextHolder.getBean(CasicProperties.class).getExportTempPath().concat(fileTempPath); + this.fileName = fileName; + this.description = description; + } + + /** + * 导出模板相对路径 + */ + private String fileTempPath; + /** + * 下载文件名 + */ + private String fileName; + /** + * 描述信息 + */ + private String description; + + @Override + public String getFileTempPath() { + return fileTempPath; + } + + @Override + public String getFileName() { + return fileName; + } + + @Override + public String getDescription() { + return description; + } +} 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 new file mode 100644 index 0000000..1896ec5 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.register.service; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.register.model.IrisData; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2019-11-29 + */ +public interface IIrisPersonService { + List> selectDataScopePersonMap(Page> page, DataScope dataScope, EntityWrapper wrapper); +} 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 new file mode 100644 index 0000000..7a75f34 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java @@ -0,0 +1,74 @@ +package com.casic.missiles.modular.register.service.impl; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.common.constant.Const; +import com.casic.missiles.core.common.service.ICommonPermissionService; +import com.casic.missiles.core.common.service.ICommonPersonService; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.meta.annotations.MetaDataBean; +import com.casic.missiles.core.util.DateUtil; +import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.metadata.service.IMetadataSupportService; +import com.casic.missiles.modular.register.constant.IrisPersonConst; +import com.casic.missiles.modular.register.dao.IrisDataMapper; +import com.casic.missiles.modular.register.service.IIrisPersonService; +import com.casic.missiles.modular.system.dto.PersonDto; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.io.Serializable; +import java.sql.Timestamp; +import java.util.List; +import java.util.Map; +import java.util.Set; + +@Service +public class IrisPersonServiceImpl implements IIrisPersonService { + @Autowired + private ICommonPersonService personService; + @Autowired + private ICommonPermissionService permissionService; + @Autowired(required = false) + private IrisDataMapper mapper; + @Autowired + private IMetadataSupportService supportService; + + @Transactional(rollbackFor = Exception.class) + @Override + public List> selectDataScopePersonMap(Page> page, DataScope dataScope, EntityWrapper wrapper) { + List> scopePersons = personService.selectDataScopePersonMap(page, dataScope, wrapper); + MetaDataBean bean = PersonDto.class.getAnnotation(MetaDataBean.class); + if (ToolUtil.isNotEmpty(scopePersons)) { + Set personSet = mapper.selectPersonIdExist(); + for (Map scopePerson : scopePersons) { + Long id = (Long) scopePerson.get("id"); + wrap(scopePerson); + scopePerson.put("ext", supportService.selectOneMetaDataByTargetId(bean.name(), id)); + String isRegist = String.valueOf(personSet.contains(id) ? 1 : 0); + scopePerson.put("isRegist",isRegist); + scopePerson.put("isRegistName", Const.ONE.equals(isRegist) ? "已注册" : "未注册"); + } + } + return scopePersons; + } + + private void wrap(Map map) { + map.put("deptName", permissionService.getDeptName((Serializable) map.get("deptid"))); + if (ToolUtil.isNotEmpty(map.get(IrisPersonConst.PERSON_SEX_KEY))) { + map.put("sexName", permissionService.getDictNameByCode("sysSex", (String) map.get("sex"))); + } + map.put("personTypeName", permissionService.getDictNameByCode("personType", (String) map.get("personType"))); + if (ToolUtil.isNotEmpty(map.get(IrisPersonConst.PERSON_DUTYTYPE_KEY))) { + map.put("dutyName", permissionService.getDictNameByCode("dutyType", (String) map.get("duty"))); + } + if (ToolUtil.isNotEmpty(map.get(IrisPersonConst.PERSON_NATIONTYPE_KEY))) { + map.put("nationName", permissionService.getDictNameByCode("nationType", (String) map.get("nation"))); + } + if (ToolUtil.isNotEmpty(map.get(IrisPersonConst.PERSON_CARDTYPE_KEY))) { + map.put("cardTypeName", permissionService.getDictNameByCode("cardType", (String) map.get("cardType"))); + } + map.put(IrisPersonConst.PERSON_CREATETIME_KEY, DateUtil.format((Timestamp) map.get(IrisPersonConst.PERSON_CREATETIME_KEY), "yyyy-MM-dd HH:mm:ss")); + } +} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java index ce623d0..27e0b8f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java @@ -41,10 +41,10 @@ */ @RequestMapping(value = "/listStaff") @ResponseBody - public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime){ + public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime){ Page> page = new PageFactory>().defaultPage(); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); page.setRecords(list); return ResponseData.success(super.packForBT(page)); @@ -55,13 +55,13 @@ */ @RequestMapping(value = "/exportStaff") @ResponseBody - public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime) throws IOException { + public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime) throws IOException { Page> page = new PageFactory>().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); super.exportExcel(AcsExportEnum.STAFF_RECORDS_EXPORT, list, response); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java index 8fe1c78..2518229 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java @@ -19,7 +19,7 @@ * @since 2019-12-02 */ public interface RecognitionRecordsMapper extends BaseMapper { - List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); + List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> selectVisitorDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> statisticByDept(@Param("doorCode") String doorCode,@Param("deptIds")String deptIds, @Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("inoutType") String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml index 7a6573d..b95e968 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml @@ -23,6 +23,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.ID_CARD_NO AS idCard, @@ -46,6 +47,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} @@ -60,6 +71,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.CERTIFICATION_UNIT AS personDeptName, @@ -81,6 +93,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java index 6415047..986c732 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java @@ -3,12 +3,15 @@ import java.io.Serializable; import com.baomidou.mybatisplus.enums.IdType; + +import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableName; import lombok.Data; +import org.apache.ibatis.annotations.Param; /** *

@@ -57,6 +60,9 @@ @TableField("INOUT_TYPE") private String inoutType; + @TableField("TEMPERATURE") + private String temperature; + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java index 0416aeb..e85e166 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java @@ -17,7 +17,7 @@ * @since 2019-12-02 */ public interface IRecognitionRecordsService extends IService { - List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String beginTime, String endTime); + List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime); List> selectVisitorDataScopePage(DataScope dataScope, Page page, String keyword, String doorCode, String devCode, String beginTime, String endTime); List> statisticByDept(String doorCode,String beginTime, String endTime,String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java index a77da92..deed198 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java @@ -42,8 +42,8 @@ private IDeviceService deviceService; @Override - public List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String beginTime, String endTime) { - List> list = this.baseMapper.selectStaffDataScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, beginTime, endTime); + public List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime) { + List> list = this.baseMapper.selectStaffDataScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, isAbnormal, beginTime, endTime); for (Map res : list) { Long deptid = Long.valueOf(String.valueOf(res.get("personDeptId"))); String deptName = permissionService.getDeptName(deptid); diff --git a/casic-iris-register/pom.xml b/casic-iris-register/pom.xml index 6b80048..5fbb354 100644 --- a/casic-iris-register/pom.xml +++ b/casic-iris-register/pom.xml @@ -29,7 +29,16 @@ casic-iris-support ${casic.version} - + + com.casic + casic-metadata-support + ${casic.version} + + + com.casic + casic-export-support + ${casic.version} + diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java new file mode 100644 index 0000000..a2738c0 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.register.constant; + +public class IrisPersonConst { + /** + * sex + */ + public static final String PERSON_SEX_KEY = "sex"; + /** + * dutyType + */ + public static final String PERSON_DUTYTYPE_KEY = "duty"; + /** + * nationType + */ + public static final String PERSON_NATIONTYPE_KEY = "nation"; + + /** + * cardType + */ + public static final String PERSON_CARDTYPE_KEY = "cardType"; + /** + * cardType + */ + public static final String PERSON_CREATETIME_KEY = "createtime"; +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 56cb280..01ffff9 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -41,7 +41,10 @@ @Value("${casic.file.uploadPath:C://casic//tmp//}") private String filePath; - + @Value("${casic.iris.recServiceHost:localhost}") + private String recServiceHost; + @Value("${casic.iris.recServicePort:20004}") + private Integer recServicePort; @Autowired private IIrisDataService irisDataService; @@ -322,7 +325,7 @@ byte[] irisCode = new byte[1024]; //1.创建客户端Socket，指定服务器地址和端口 - Socket socket=new Socket("localhost", 20005); + Socket socket=new Socket(recServiceHost, recServicePort); //2.获取输出流，向服务器端发送信息 OutputStream os=socket.getOutputStream();//字节输出流 diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java new file mode 100644 index 0000000..04cfaea --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java @@ -0,0 +1,111 @@ +package com.casic.missiles.modular.register.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.Const; +import com.casic.missiles.core.common.constant.PersonConst; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.core.common.service.ICommonPermissionService; +import com.casic.missiles.core.common.service.ICommonPersonService; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.metadata.service.IMetadataSupportService; +import com.casic.missiles.modular.register.enums.IrisExportEnum; +import com.casic.missiles.modular.register.service.IIrisPersonService; +import com.casic.missiles.modular.system.dto.PersonDto; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; + +/** + * 人员管理控制器 + * + * @author dev + * @Date 2019-12-03 17:45:18 + */ +@RestController +@RequestMapping("/person") +public class IrisPersonController extends ExportController { + + @Autowired + private ICommonPermissionService permissionService; + + @Autowired + private IIrisPersonService irisPersonService; + + @Autowired + private ICommonPersonService personService; + @Value("${casic.person.visitor:false}") + private boolean iscVisitor; + + /** + * 人员导出列表 + */ + @RequestMapping(value = "/batchExport") + @ResponseBody + public void batchExport(HttpServletResponse response, String keywords, String sex, String duty, String deptid, String personType, String startTime, String endTime) throws IOException { + DataScope scope = permissionService.getCurrUserDataScope(); + Page> defaultPage = new PageFactory>().defaultPage(); + defaultPage.setSize(Integer.MAX_VALUE); + defaultPage.setSearchCount(false); + if (iscVisitor && Const.ZERO.equals(personType)) { + scope = null; + } + Page> page = getPersonPage(defaultPage, keywords, sex, duty, deptid, personType, startTime, endTime, scope); + super.exportExcel(Const.ZERO.equals(personType) ? IrisExportEnum.VISITOR_EXPORT : IrisExportEnum.PERSON_EXPORT, page.getRecords(), response); + } + + /** + * 获取人员管理分页列表 + */ + @RequestMapping(value = "/irisListPage") + @ResponseBody + public Object listPage(String keywords, String sex, String duty, String deptid, String personType, String startTime, String endTime) { + Page> defaultPage = new PageFactory>().defaultPage(); + DataScope scope = permissionService.getCurrUserDataScope(); + Page> page = getPersonPage(defaultPage, keywords, sex, duty, deptid, personType, startTime, endTime, scope); + return ResponseData.success(super.packForBT(page)); + } + + private Page> getPersonPage(Page> defaultPage, String keywords, String sex, String duty, String deptId, String personType, String startTime, String endTime, DataScope scope) { + EntityWrapper> query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(startTime)) { + query.gt(PersonConst.TABLE_CREATETIME, startTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + query.lt(PersonConst.TABLE_CREATETIME, endTime); + } + if (ToolUtil.isNotEmpty(personType)) { + query.eq(PersonConst.TABLE_PERSONTYPE, personType); + } + + if (ToolUtil.isNotEmpty(duty)) { + query.eq(PersonConst.TABLE_DUTY, duty); + } + if (ToolUtil.isNotEmpty(deptId)) { + query.eq(PersonConst.TABLE_DEPTID, deptId); + } + if (ToolUtil.isNotEmpty(sex)) { + query.eq(PersonConst.TABLE_SEX, sex); + } + if (ToolUtil.isNotEmpty(keywords)) { + query.andNew().like(PersonConst.TABLE_PERSONNAME, keywords).or().like(PersonConst.TABLE_CARDNO, keywords); + } + query.eq(PersonConst.TABLE_DELFLAG, 0); + List> scopePersons = irisPersonService.selectDataScopePersonMap(defaultPage, scope, query); + defaultPage.setRecords(scopePersons); + query.orderBy(PersonConst.TABLE_PERSONCODE); + //展示数据封装 + return defaultPage; + } +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisDataMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisDataMapper.java index 45d1421..b49b025 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisDataMapper.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisDataMapper.java @@ -4,17 +4,27 @@ import com.casic.missiles.modular.register.model.IrisData; import com.baomidou.mybatisplus.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.Map; +import java.util.Set; /** *

- * Mapper 接口 + * Mapper 接口 *

* * @author stylefeng123 * @since 2019-11-29 */ public interface IrisDataMapper extends BaseMapper { - Map selectByPersonId(@Param("personId") String personId); + Map selectByPersonId(@Param("personId") String personId); + + /** + * 判定人员是否已注册 + * + * @return + */ + @Select("select PERSON_ID from iris_data GROUP BY PERSON_ID") + Set selectPersonIdExist(); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/enums/IrisExportEnum.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/enums/IrisExportEnum.java new file mode 100644 index 0000000..e39cffd --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/enums/IrisExportEnum.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.register.enums; + +import com.casic.missiles.config.properties.CasicProperties; +import com.casic.missiles.core.enums.ExportExcelEnum; +import com.casic.missiles.core.util.SpringContextHolder; + +public enum IrisExportEnum implements ExportExcelEnum { + + PERSON_EXPORT("personTemp.xlsx", "personTemp.xlsx", "员工列表"), + VISITOR_EXPORT("visitorTemp.xlsx", "visitorTemp.xlsx", "访客列表"); + + IrisExportEnum(String fileTempPath, String fileName, String description) { + this.fileTempPath = SpringContextHolder.getBean(CasicProperties.class).getExportTempPath().concat(fileTempPath); + this.fileName = fileName; + this.description = description; + } + + /** + * 导出模板相对路径 + */ + private String fileTempPath; + /** + * 下载文件名 + */ + private String fileName; + /** + * 描述信息 + */ + private String description; + + @Override + public String getFileTempPath() { + return fileTempPath; + } + + @Override + public String getFileName() { + return fileName; + } + + @Override + public String getDescription() { + return description; + } +} 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 new file mode 100644 index 0000000..1896ec5 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.register.service; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.register.model.IrisData; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2019-11-29 + */ +public interface IIrisPersonService { + List> selectDataScopePersonMap(Page> page, DataScope dataScope, EntityWrapper wrapper); +} 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 new file mode 100644 index 0000000..7a75f34 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java @@ -0,0 +1,74 @@ +package com.casic.missiles.modular.register.service.impl; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.common.constant.Const; +import com.casic.missiles.core.common.service.ICommonPermissionService; +import com.casic.missiles.core.common.service.ICommonPersonService; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.meta.annotations.MetaDataBean; +import com.casic.missiles.core.util.DateUtil; +import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.metadata.service.IMetadataSupportService; +import com.casic.missiles.modular.register.constant.IrisPersonConst; +import com.casic.missiles.modular.register.dao.IrisDataMapper; +import com.casic.missiles.modular.register.service.IIrisPersonService; +import com.casic.missiles.modular.system.dto.PersonDto; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.io.Serializable; +import java.sql.Timestamp; +import java.util.List; +import java.util.Map; +import java.util.Set; + +@Service +public class IrisPersonServiceImpl implements IIrisPersonService { + @Autowired + private ICommonPersonService personService; + @Autowired + private ICommonPermissionService permissionService; + @Autowired(required = false) + private IrisDataMapper mapper; + @Autowired + private IMetadataSupportService supportService; + + @Transactional(rollbackFor = Exception.class) + @Override + public List> selectDataScopePersonMap(Page> page, DataScope dataScope, EntityWrapper wrapper) { + List> scopePersons = personService.selectDataScopePersonMap(page, dataScope, wrapper); + MetaDataBean bean = PersonDto.class.getAnnotation(MetaDataBean.class); + if (ToolUtil.isNotEmpty(scopePersons)) { + Set personSet = mapper.selectPersonIdExist(); + for (Map scopePerson : scopePersons) { + Long id = (Long) scopePerson.get("id"); + wrap(scopePerson); + scopePerson.put("ext", supportService.selectOneMetaDataByTargetId(bean.name(), id)); + String isRegist = String.valueOf(personSet.contains(id) ? 1 : 0); + scopePerson.put("isRegist",isRegist); + scopePerson.put("isRegistName", Const.ONE.equals(isRegist) ? "已注册" : "未注册"); + } + } + return scopePersons; + } + + private void wrap(Map map) { + map.put("deptName", permissionService.getDeptName((Serializable) map.get("deptid"))); + if (ToolUtil.isNotEmpty(map.get(IrisPersonConst.PERSON_SEX_KEY))) { + map.put("sexName", permissionService.getDictNameByCode("sysSex", (String) map.get("sex"))); + } + map.put("personTypeName", permissionService.getDictNameByCode("personType", (String) map.get("personType"))); + if (ToolUtil.isNotEmpty(map.get(IrisPersonConst.PERSON_DUTYTYPE_KEY))) { + map.put("dutyName", permissionService.getDictNameByCode("dutyType", (String) map.get("duty"))); + } + if (ToolUtil.isNotEmpty(map.get(IrisPersonConst.PERSON_NATIONTYPE_KEY))) { + map.put("nationName", permissionService.getDictNameByCode("nationType", (String) map.get("nation"))); + } + if (ToolUtil.isNotEmpty(map.get(IrisPersonConst.PERSON_CARDTYPE_KEY))) { + map.put("cardTypeName", permissionService.getDictNameByCode("cardType", (String) map.get("cardType"))); + } + map.put(IrisPersonConst.PERSON_CREATETIME_KEY, DateUtil.format((Timestamp) map.get(IrisPersonConst.PERSON_CREATETIME_KEY), "yyyy-MM-dd HH:mm:ss")); + } +} diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 91809ff..9e93411 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -3,9 +3,9 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://192.168.0.212:3306/casic_iris?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://139.198.16.38:8098/casic_iris?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: root + password: Casic203 initial-size: 2 min-idle: 1 #flowable数据源和多数据源配置 diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java index ce623d0..27e0b8f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java @@ -41,10 +41,10 @@ */ @RequestMapping(value = "/listStaff") @ResponseBody - public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime){ + public Object listStaff(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime){ Page> page = new PageFactory>().defaultPage(); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); page.setRecords(list); return ResponseData.success(super.packForBT(page)); @@ -55,13 +55,13 @@ */ @RequestMapping(value = "/exportStaff") @ResponseBody - public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String beginTime,String endTime) throws IOException { + public void exportStaff(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime) throws IOException { Page> page = new PageFactory>().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,beginTime,endTime); + List> list = recordsService.selectStaffDataScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime); new RecognitionRecordsWarpper(list).warp(); super.exportExcel(AcsExportEnum.STAFF_RECORDS_EXPORT, list, response); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java index 8fe1c78..2518229 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java @@ -19,7 +19,7 @@ * @since 2019-12-02 */ public interface RecognitionRecordsMapper extends BaseMapper { - List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); + List> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> selectVisitorDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime); List> statisticByDept(@Param("doorCode") String doorCode,@Param("deptIds")String deptIds, @Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("inoutType") String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml index 7a6573d..b95e968 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml @@ -23,6 +23,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.ID_CARD_NO AS idCard, @@ -46,6 +47,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} @@ -60,6 +71,7 @@ door.DEPTID AS deptId, re.DEV_CODE AS devCode, re.INOUT_TYPE AS inoutType, + re.TEMPERATURE AS temperature, p.NAME AS personName, p.PERSON_CODE AS personCode, p.CERTIFICATION_UNIT AS personDeptName, @@ -81,6 +93,16 @@ AND re.DEV_CODE = #{devCode} + + + + AND re.TEMPERATURE 37.2 + + + AND re.TEMPERATURE ]]> 37.2 + + + AND re.DATETIME = ]]> #{beginTime} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java index 6415047..986c732 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java @@ -3,12 +3,15 @@ import java.io.Serializable; import com.baomidou.mybatisplus.enums.IdType; + +import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableName; import lombok.Data; +import org.apache.ibatis.annotations.Param; /** *

@@ -57,6 +60,9 @@ @TableField("INOUT_TYPE") private String inoutType; + @TableField("TEMPERATURE") + private String temperature; + @Override protected Serializable pkVal() { return this.id; diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java index 0416aeb..e85e166 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java @@ -17,7 +17,7 @@ * @since 2019-12-02 */ public interface IRecognitionRecordsService extends IService { - List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String beginTime, String endTime); + List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime); List> selectVisitorDataScopePage(DataScope dataScope, Page page, String keyword, String doorCode, String devCode, String beginTime, String endTime); List> statisticByDept(String doorCode,String beginTime, String endTime,String inoutType); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java index a77da92..deed198 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java @@ -42,8 +42,8 @@ private IDeviceService deviceService; @Override - public List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String beginTime, String endTime) { - List> list = this.baseMapper.selectStaffDataScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, beginTime, endTime); + public List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime) { + List> list = this.baseMapper.selectStaffDataScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, isAbnormal, beginTime, endTime); for (Map res : list) { Long deptid = Long.valueOf(String.valueOf(res.get("personDeptId"))); String deptName = permissionService.getDeptName(deptid); diff --git a/casic-iris-register/pom.xml b/casic-iris-register/pom.xml index 6b80048..5fbb354 100644 --- a/casic-iris-register/pom.xml +++ b/casic-iris-register/pom.xml @@ -29,7 +29,16 @@ casic-iris-support ${casic.version} - + + com.casic + casic-metadata-support + ${casic.version} + + + com.casic + casic-export-support + ${casic.version} + diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java new file mode 100644 index 0000000..a2738c0 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/constant/IrisPersonConst.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.register.constant; + +public class IrisPersonConst { + /** + * sex + */ + public static final String PERSON_SEX_KEY = "sex"; + /** + * dutyType + */ + public static final String PERSON_DUTYTYPE_KEY = "duty"; + /** + * nationType + */ + public static final String PERSON_NATIONTYPE_KEY = "nation"; + + /** + * cardType + */ + public static final String PERSON_CARDTYPE_KEY = "cardType"; + /** + * cardType + */ + public static final String PERSON_CREATETIME_KEY = "createtime"; +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 56cb280..01ffff9 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -41,7 +41,10 @@ @Value("${casic.file.uploadPath:C://casic//tmp//}") private String filePath; - + @Value("${casic.iris.recServiceHost:localhost}") + private String recServiceHost; + @Value("${casic.iris.recServicePort:20004}") + private Integer recServicePort; @Autowired private IIrisDataService irisDataService; @@ -322,7 +325,7 @@ byte[] irisCode = new byte[1024]; //1.创建客户端Socket，指定服务器地址和端口 - Socket socket=new Socket("localhost", 20005); + Socket socket=new Socket(recServiceHost, recServicePort); //2.获取输出流，向服务器端发送信息 OutputStream os=socket.getOutputStream();//字节输出流 diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java new file mode 100644 index 0000000..04cfaea --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java @@ -0,0 +1,111 @@ +package com.casic.missiles.modular.register.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.Const; +import com.casic.missiles.core.common.constant.PersonConst; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.core.common.service.ICommonPermissionService; +import com.casic.missiles.core.common.service.ICommonPersonService; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.metadata.service.IMetadataSupportService; +import com.casic.missiles.modular.register.enums.IrisExportEnum; +import com.casic.missiles.modular.register.service.IIrisPersonService; +import com.casic.missiles.modular.system.dto.PersonDto; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; + +/** + * 人员管理控制器 + * + * @author dev + * @Date 2019-12-03 17:45:18 + */ +@RestController +@RequestMapping("/person") +public class IrisPersonController extends ExportController { + + @Autowired + private ICommonPermissionService permissionService; + + @Autowired + private IIrisPersonService irisPersonService; + + @Autowired + private ICommonPersonService personService; + @Value("${casic.person.visitor:false}") + private boolean iscVisitor; + + /** + * 人员导出列表 + */ + @RequestMapping(value = "/batchExport") + @ResponseBody + public void batchExport(HttpServletResponse response, String keywords, String sex, String duty, String deptid, String personType, String startTime, String endTime) throws IOException { + DataScope scope = permissionService.getCurrUserDataScope(); + Page> defaultPage = new PageFactory>().defaultPage(); + defaultPage.setSize(Integer.MAX_VALUE); + defaultPage.setSearchCount(false); + if (iscVisitor && Const.ZERO.equals(personType)) { + scope = null; + } + Page> page = getPersonPage(defaultPage, keywords, sex, duty, deptid, personType, startTime, endTime, scope); + super.exportExcel(Const.ZERO.equals(personType) ? IrisExportEnum.VISITOR_EXPORT : IrisExportEnum.PERSON_EXPORT, page.getRecords(), response); + } + + /** + * 获取人员管理分页列表 + */ + @RequestMapping(value = "/irisListPage") + @ResponseBody + public Object listPage(String keywords, String sex, String duty, String deptid, String personType, String startTime, String endTime) { + Page> defaultPage = new PageFactory>().defaultPage(); + DataScope scope = permissionService.getCurrUserDataScope(); + Page> page = getPersonPage(defaultPage, keywords, sex, duty, deptid, personType, startTime, endTime, scope); + return ResponseData.success(super.packForBT(page)); + } + + private Page> getPersonPage(Page> defaultPage, String keywords, String sex, String duty, String deptId, String personType, String startTime, String endTime, DataScope scope) { + EntityWrapper> query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(startTime)) { + query.gt(PersonConst.TABLE_CREATETIME, startTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + query.lt(PersonConst.TABLE_CREATETIME, endTime); + } + if (ToolUtil.isNotEmpty(personType)) { + query.eq(PersonConst.TABLE_PERSONTYPE, personType); + } + + if (ToolUtil.isNotEmpty(duty)) { + query.eq(PersonConst.TABLE_DUTY, duty); + } + if (ToolUtil.isNotEmpty(deptId)) { + query.eq(PersonConst.TABLE_DEPTID, deptId); + } + if (ToolUtil.isNotEmpty(sex)) { + query.eq(PersonConst.TABLE_SEX, sex); + } + if (ToolUtil.isNotEmpty(keywords)) { + query.andNew().like(PersonConst.TABLE_PERSONNAME, keywords).or().like(PersonConst.TABLE_CARDNO, keywords); + } + query.eq(PersonConst.TABLE_DELFLAG, 0); + List> scopePersons = irisPersonService.selectDataScopePersonMap(defaultPage, scope, query); + defaultPage.setRecords(scopePersons); + query.orderBy(PersonConst.TABLE_PERSONCODE); + //展示数据封装 + return defaultPage; + } +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisDataMapper.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisDataMapper.java index 45d1421..b49b025 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisDataMapper.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dao/IrisDataMapper.java @@ -4,17 +4,27 @@ import com.casic.missiles.modular.register.model.IrisData; import com.baomidou.mybatisplus.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.Map; +import java.util.Set; /** *

- * Mapper 接口 + * Mapper 接口 *

* * @author stylefeng123 * @since 2019-11-29 */ public interface IrisDataMapper extends BaseMapper { - Map selectByPersonId(@Param("personId") String personId); + Map selectByPersonId(@Param("personId") String personId); + + /** + * 判定人员是否已注册 + * + * @return + */ + @Select("select PERSON_ID from iris_data GROUP BY PERSON_ID") + Set selectPersonIdExist(); } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/enums/IrisExportEnum.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/enums/IrisExportEnum.java new file mode 100644 index 0000000..e39cffd --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/enums/IrisExportEnum.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.register.enums; + +import com.casic.missiles.config.properties.CasicProperties; +import com.casic.missiles.core.enums.ExportExcelEnum; +import com.casic.missiles.core.util.SpringContextHolder; + +public enum IrisExportEnum implements ExportExcelEnum { + + PERSON_EXPORT("personTemp.xlsx", "personTemp.xlsx", "员工列表"), + VISITOR_EXPORT("visitorTemp.xlsx", "visitorTemp.xlsx", "访客列表"); + + IrisExportEnum(String fileTempPath, String fileName, String description) { + this.fileTempPath = SpringContextHolder.getBean(CasicProperties.class).getExportTempPath().concat(fileTempPath); + this.fileName = fileName; + this.description = description; + } + + /** + * 导出模板相对路径 + */ + private String fileTempPath; + /** + * 下载文件名 + */ + private String fileName; + /** + * 描述信息 + */ + private String description; + + @Override + public String getFileTempPath() { + return fileTempPath; + } + + @Override + public String getFileName() { + return fileName; + } + + @Override + public String getDescription() { + return description; + } +} 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 new file mode 100644 index 0000000..1896ec5 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.register.service; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.register.model.IrisData; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 服务类 + *

+ * + * @author stylefeng123 + * @since 2019-11-29 + */ +public interface IIrisPersonService { + List> selectDataScopePersonMap(Page> page, DataScope dataScope, EntityWrapper wrapper); +} 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 new file mode 100644 index 0000000..7a75f34 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java @@ -0,0 +1,74 @@ +package com.casic.missiles.modular.register.service.impl; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.common.constant.Const; +import com.casic.missiles.core.common.service.ICommonPermissionService; +import com.casic.missiles.core.common.service.ICommonPersonService; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.meta.annotations.MetaDataBean; +import com.casic.missiles.core.util.DateUtil; +import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.metadata.service.IMetadataSupportService; +import com.casic.missiles.modular.register.constant.IrisPersonConst; +import com.casic.missiles.modular.register.dao.IrisDataMapper; +import com.casic.missiles.modular.register.service.IIrisPersonService; +import com.casic.missiles.modular.system.dto.PersonDto; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.io.Serializable; +import java.sql.Timestamp; +import java.util.List; +import java.util.Map; +import java.util.Set; + +@Service +public class IrisPersonServiceImpl implements IIrisPersonService { + @Autowired + private ICommonPersonService personService; + @Autowired + private ICommonPermissionService permissionService; + @Autowired(required = false) + private IrisDataMapper mapper; + @Autowired + private IMetadataSupportService supportService; + + @Transactional(rollbackFor = Exception.class) + @Override + public List> selectDataScopePersonMap(Page> page, DataScope dataScope, EntityWrapper wrapper) { + List> scopePersons = personService.selectDataScopePersonMap(page, dataScope, wrapper); + MetaDataBean bean = PersonDto.class.getAnnotation(MetaDataBean.class); + if (ToolUtil.isNotEmpty(scopePersons)) { + Set personSet = mapper.selectPersonIdExist(); + for (Map scopePerson : scopePersons) { + Long id = (Long) scopePerson.get("id"); + wrap(scopePerson); + scopePerson.put("ext", supportService.selectOneMetaDataByTargetId(bean.name(), id)); + String isRegist = String.valueOf(personSet.contains(id) ? 1 : 0); + scopePerson.put("isRegist",isRegist); + scopePerson.put("isRegistName", Const.ONE.equals(isRegist) ? "已注册" : "未注册"); + } + } + return scopePersons; + } + + private void wrap(Map map) { + map.put("deptName", permissionService.getDeptName((Serializable) map.get("deptid"))); + if (ToolUtil.isNotEmpty(map.get(IrisPersonConst.PERSON_SEX_KEY))) { + map.put("sexName", permissionService.getDictNameByCode("sysSex", (String) map.get("sex"))); + } + map.put("personTypeName", permissionService.getDictNameByCode("personType", (String) map.get("personType"))); + if (ToolUtil.isNotEmpty(map.get(IrisPersonConst.PERSON_DUTYTYPE_KEY))) { + map.put("dutyName", permissionService.getDictNameByCode("dutyType", (String) map.get("duty"))); + } + if (ToolUtil.isNotEmpty(map.get(IrisPersonConst.PERSON_NATIONTYPE_KEY))) { + map.put("nationName", permissionService.getDictNameByCode("nationType", (String) map.get("nation"))); + } + if (ToolUtil.isNotEmpty(map.get(IrisPersonConst.PERSON_CARDTYPE_KEY))) { + map.put("cardTypeName", permissionService.getDictNameByCode("cardType", (String) map.get("cardType"))); + } + map.put(IrisPersonConst.PERSON_CREATETIME_KEY, DateUtil.format((Timestamp) map.get(IrisPersonConst.PERSON_CREATETIME_KEY), "yyyy-MM-dd HH:mm:ss")); + } +} diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 91809ff..9e93411 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -3,9 +3,9 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://192.168.0.212:3306/casic_iris?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://139.198.16.38:8098/casic_iris?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: root + password: Casic203 initial-size: 2 min-idle: 1 #flowable数据源和多数据源配置 diff --git a/casic-web/src/main/resources/config/temp/personTemp.xlsx b/casic-web/src/main/resources/config/temp/personTemp.xlsx index 5ba8cef..57b85c0 100644 --- a/casic-web/src/main/resources/config/temp/personTemp.xlsx +++ b/casic-web/src/main/resources/config/temp/personTemp.xlsx Binary files differ