工业级后台API v2
parent: 13a59c | patch | commitdiff
xufenglei
2018-03-13 d4f150414533b95324b2a1c8a81c11d92efb71ec
refs
author xufenglei <xufenglei>
Tuesday, March 13, 2018 16:25 +0800
committer xufenglei <xufenglei>
Tuesday, March 13, 2018 16:25 +0800
commitd4f150414533b95324b2a1c8a81c11d92efb71ec
tree ad3ecc61785b93ec31b3203fb488996b5ba03477 tree | zip | gz
parent 13a59c6455e5c7a0d30ec93d953359a05778120f view | diff
7f905053f3f879092e18558401185dd6595dbe10 view | diff 
Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git
7 files added
18 files modified
406 ■■■■■ changed files
src/main/java/com/moral/common/util/ReportTimeFormat.java 72 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/controller/OrganizationController.java 9 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/controller/ReportController.java 13 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/entity/charts/AreaRange.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/entity/charts/DataCondition.java 13 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/entity/charts/LineChartCriteria.java 12 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/entity/charts/PairData.java 9 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/entity/charts/TimePeriod.java 12 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/entity/charts/TimeUnits.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/mapper/HistoryMinutelyMapper.java 7 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/security/auth/jwt/SkipPathRequestMatcher.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/security/auth/login/LoginAwareAuthenticationSuccessHandler.java 7 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/security/config/WebSecurityConfig.java 1 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/security/endpoint/RefreshTokenEndpoint.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/HistoryMinutelyService.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/OrganizationService.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java 73 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/impl/OrganizationServiceImpl.java 7 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/impl/SensorServiceImpl.java 2 ●●●●● diff | view | raw | blame | history
src/main/resources/application.yml 19 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/HistoryMinutelyMapper.xml 57 ●●●●● diff | view | raw | blame | history
src/test/java/com/moral/JavaBeanToJsonOutPrint.java 45 ●●●●● diff | view | raw | blame | history
src/test/java/com/moral/ScreenApiApplicationTests.java 14 ●●●●● diff | view | raw | blame | history