Browse code Merge branch 'dev' of http://192.168.0.203:8080/gitbucket/git/root/casic-iris-parent into dev dev master V1.3.1 V1.3.0
commit f769d503d76317a9f0047033c504528727ef8ea1 2 parents 3221d76 + 5f5bfaf zhangyingjie authored on 5 Jun 2020

Showing 65 changed files

• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java
• casic-iris-atd/pom.xml
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/AtdRulesController.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/MakeReportController.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/RemarksController.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/ReportController.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/SpecialDayController.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/SyncController.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dao/AtdRulesMapper.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dao/OtReportMapper.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dao/RecRecordMapper.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dao/RemarksMapper.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dao/ReportMapper.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dao/SpecialDayMapper.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dao/mapping/AtdRulesMapper.xml
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dao/mapping/OtReportMapper.xml
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecRecordMapper.xml
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dao/mapping/RemarksMapper.xml
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dao/mapping/ReportMapper.xml
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dao/mapping/SpecialDayMapper.xml
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dto/RemarksDTO.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/enums/AtdExportEnum.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/enums/RemarksType.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/enums/RemarksTypeSecond.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/model/AtdRules.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/model/OtReport.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/model/RecRecord.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/model/Remarks.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/model/Report.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/model/ReportRules.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/model/SpecialDay.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/IAtdPersonService.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/IAtdRulesService.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/IGenerateReportService.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/IOtReportService.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/IRecRecordService.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/IRemarksService.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/IReportService.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/ISpecialDayImportService.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/ISpecialDayService.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/AtdPersonServiceImpl.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/AtdRulesServiceImpl.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/OtReportServiceImpl.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/RecRecordServiceImpl.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/RemarksServiceImpl.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/ReportServiceImpl.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/SpecialDayImportServiceImpl.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/SpecialDayServiceImpl.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/task/GenerateReportTask.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/warpper/AtdRulesWarpper.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/warpper/ReportWarpper.java
• casic-iris-atd/src/main/java/com/casic/missiles/modular/system/warpper/SpecialDayWarpper.java
• casic-iris-device/pom.xml
• casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java
• casic-iris-register/src/main/java/com/casic/missiles/modular/register/dto/PersonAtdDTO.java
• casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java
• casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java
• casic-iris-register/src/main/java/com/casic/missiles/modular/register/warpper/IrisPersonWarpper.java
• casic-web/pom.xml
• casic-web/src/main/java/com/casic/missiles/CasicApplication.java
• casic-web/src/main/resources/application.yml
• casic-web/src/main/resources/config/application-dev.yml
• pom.xml

Ignore Space Show notes View casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java

Ignore Space Show notes View casic-iris-atd/pom.xml 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/AtdRulesController.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/MakeReportController.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/RemarksController.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/ReportController.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/SpecialDayController.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/SyncController.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dao/AtdRulesMapper.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dao/OtReportMapper.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dao/RecRecordMapper.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dao/RemarksMapper.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dao/ReportMapper.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dao/SpecialDayMapper.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dao/mapping/AtdRulesMapper.xml 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dao/mapping/OtReportMapper.xml 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecRecordMapper.xml 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dao/mapping/RemarksMapper.xml 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dao/mapping/ReportMapper.xml 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dao/mapping/SpecialDayMapper.xml 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/dto/RemarksDTO.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/enums/AtdExportEnum.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/enums/RemarksType.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/enums/RemarksTypeSecond.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/model/AtdRules.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/model/OtReport.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/model/RecRecord.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/model/Remarks.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/model/Report.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/model/ReportRules.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/model/SpecialDay.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/IAtdPersonService.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/IAtdRulesService.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/IGenerateReportService.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/IOtReportService.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/IRecRecordService.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/IRemarksService.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/IReportService.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/ISpecialDayImportService.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/ISpecialDayService.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/AtdPersonServiceImpl.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/AtdRulesServiceImpl.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/OtReportServiceImpl.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/RecRecordServiceImpl.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/RemarksServiceImpl.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/ReportServiceImpl.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/SpecialDayImportServiceImpl.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/SpecialDayServiceImpl.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/task/GenerateReportTask.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/warpper/AtdRulesWarpper.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/warpper/ReportWarpper.java 0 → 100644

Ignore Space Show notes View casic-iris-atd/src/main/java/com/casic/missiles/modular/system/warpper/SpecialDayWarpper.java 0 → 100644

Ignore Space Show notes View casic-iris-device/pom.xml

Ignore Space Show notes View casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java

Ignore Space Show notes View casic-iris-register/src/main/java/com/casic/missiles/modular/register/dto/PersonAtdDTO.java 0 → 100644

Ignore Space Show notes View casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/IIrisPersonService.java

Ignore Space Show notes View casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java

Ignore Space Show notes View casic-iris-register/src/main/java/com/casic/missiles/modular/register/warpper/IrisPersonWarpper.java 0 → 100644

Ignore Space Show notes View casic-web/pom.xml

Ignore Space Show notes View casic-web/src/main/java/com/casic/missiles/CasicApplication.java

Ignore Space Show notes View casic-web/src/main/resources/application.yml

Ignore Space Show notes View casic-web/src/main/resources/config/application-dev.yml

Ignore Space Show notes View pom.xml

Show line notes below