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..d07ffea 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, 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..d07ffea 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, 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..d07ffea 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, 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..d07ffea 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, 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..d07ffea 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, 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-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 91809ff..0770aa9 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -3,16 +3,16 @@ ################### 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数据源和多数据源配置 casic: kaptcha-open: false #是否开启登录时验证码 (true/false) nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram - export-temp-path: E:\soft\othersoft\203\casic-iris-parent\casic-web\src\main\resources\config\temp\ + export-temp-path: D:\java\boot\casic-web-1.0.0-SNAPSHOT\export\ mybatis-plus: global-config: sql-injector: com.casic.missiles.modular.metadata.inject.MetaSqlInject