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 V1.1.3 V1.1.2 V1.0.4-en V1.0.3-en V1.0.2
commit 9b949640257da02cd0cd4e73c6f6c0e1a8369bd0 2 parents 9925fc7 + 527c302 IRIS authored on 4 Dec 2019

Showing 46 changed files

• casic-iris-acs/pom.xml
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/constant/DoorConst.java
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StrategyController.java
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/DoorMapper.java
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/StrategyMapper.java
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/DoorMapper.xml
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/StrategyMapper.xml
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dict/DoorDict.java
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Door.java
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/RecognitionRecords.java
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Strategy.java
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IDoorService.java
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IPersonService.java
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IStrategyService.java
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/DoorServiceImpl.java
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/PersonServiceImpl.java
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/StrategyServiceImpl.java
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/warpper/DoorWarpper.java
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/warpper/RecognitionRecordsWarpper.java
• casic-iris-acs/src/main/java/com/casic/missiles/modular/system/warpper/StrategyWarpper.java
• casic-iris-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
• casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
• casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
• casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
• casic-iris-device/src/main/java/com/casic/missiles/modular/system/dict/DeviceDict.java
• casic-iris-device/src/main/java/com/casic/missiles/modular/system/model/Device.java
• casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
• casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
• casic-iris-device/src/main/java/com/casic/missiles/modular/system/util/SocketClientUtil.java
• casic-iris-device/src/main/java/com/casic/missiles/modular/system/warpper/DeviceWarpper.java
• casic-web/pom.xml
• casic-web/src/main/java/com/casic/missiles/CasicApplication.java
• casic-web/src/main/java/com/casic/missiles/controller/TableTestController.java
• casic-web/src/main/resources/application.yml
• casic-web/src/main/resources/config/application-dev.yml
• casic-web/src/main/resources/config/application-test.yml

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

Ignore Space Show notes View casic-iris-acs/src/main/java/com/casic/missiles/modular/system/constant/DoorConst.java 0 → 100644

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dict/DoorDict.java 0 → 100644

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View casic-iris-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java 0 → 100644

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

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

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

Ignore Space Show notes View casic-iris-device/src/main/java/com/casic/missiles/modular/system/dict/DeviceDict.java 0 → 100644

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

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

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

Ignore Space Show notes View casic-iris-device/src/main/java/com/casic/missiles/modular/system/util/SocketClientUtil.java 0 → 100644

Ignore Space Show notes View casic-iris-device/src/main/java/com/casic/missiles/modular/system/warpper/DeviceWarpper.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/java/com/casic/missiles/controller/TableTestController.java 0 → 100644

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 casic-web/src/main/resources/config/application-test.yml

Show line notes below