Merge branch 'dev' of http://192.168.0.203:8080/gitbucket/git/root/casic-iris-parent into dev

Fork: 0

codedev / casic_iris_parent_gz

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 527c30294e67b7356d4e6493f90446eb95e7f45e 2 parents 85559e7 + 8946121 lwh authored on 4 Dec 2019

Patch

Unified Split

Showing 39 changed files

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/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/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/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/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/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/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

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View casic-iris-device/src/main/java/com/casic/missiles/modular/system/warpper/DeviceWarpper.java

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

Show line notes below