diff --git a/BigDataSql/第一页/专任教师师生比.sql b/BigDataSql/第一页/专任教师师生比.sql new file mode 100644 index 00000000..8d31ec29 --- /dev/null +++ b/BigDataSql/第一页/专任教师师生比.sql @@ -0,0 +1,6 @@ +select * from mv_dp_zrjsssbl +order by +(case when stage='Сѧ' then 1 + when stage='' then 2 + when stage='' then 3 + end) diff --git a/BigDataSql/第一页/办学条件情况(按城乡类型).sql b/BigDataSql/第一页/办学条件情况(按城乡类型).sql new file mode 100644 index 00000000..0b55af43 --- /dev/null +++ b/BigDataSql/第一页/办学条件情况(按城乡类型).sql @@ -0,0 +1,11 @@ +select t1.stage,t1.citycountrygroup,zhandimianjino,t2.zaixiaono as studentno from mv_db_base_banxuetiaojian as t1 +inner join mv_db_base_student as t2 on t1.stage=t2.stage and t1.citycountrygroup=t2.citycountrygroup +order by +(case when t1.stage='小学' then 1 + when t1.stage='初中' then 2 + when t1.stage='高中' then 3 + end), + (case when t1.citycountrygroup='城区' then 1 + when t1.citycountrygroup='镇区' then 2 + when t1.citycountrygroup='乡村' then 3 + end) \ No newline at end of file diff --git a/BigDataSql/第一页/各阶段学校数量.sql b/BigDataSql/第一页/各阶段学校数量.sql new file mode 100644 index 00000000..5565de08 --- /dev/null +++ b/BigDataSql/第一页/各阶段学校数量.sql @@ -0,0 +1,9 @@ +select businesstype,count as total from mv_dp_gjdxxsl order by +(case when businesstype='小学' then 1 + when businesstype='初级中学' then 2 + when businesstype='九年一贯制学校' then 3 + when businesstype='高级中学' then 4 + when businesstype='完全中学' then 5 + when businesstype='十二年一贯制学校' then 6 + end) + diff --git a/BigDataSql/第一页/城乡专任教师师生比.sql b/BigDataSql/第一页/城乡专任教师师生比.sql new file mode 100644 index 00000000..53b26a4e --- /dev/null +++ b/BigDataSql/第一页/城乡专任教师师生比.sql @@ -0,0 +1,10 @@ +select * from mv_dp_cxzrssb as t1 + order by +(case when t1.stage='Сѧ' then 1 + when t1.stage='' then 2 + when t1.stage='' then 3 + end), + (case when t1.citycountrygroup='' then 1 + when t1.citycountrygroup='' then 2 + when t1.citycountrygroup='' then 3 + end) \ No newline at end of file diff --git a/BigDataSql/第一页/学校教师学生总数.sql b/BigDataSql/第一页/学校教师学生总数.sql new file mode 100644 index 00000000..4f240fc9 --- /dev/null +++ b/BigDataSql/第一页/学校教师学生总数.sql @@ -0,0 +1,5 @@ +SELECT '学校总数' AS title,sum(count) AS count FROM mv_db_base_school +UNION ALL +SELECT '教职工总数' AS title, jzgno AS count FROM mv_db_base_jiaozhigong +UNION ALL +SELECT '学生总数' AS title, sum(zaixiaono) AS count FROM mv_db_base_student \ No newline at end of file diff --git a/BigDataSql/第一页/学校规模情况.sql b/BigDataSql/第一页/学校规模情况.sql new file mode 100644 index 00000000..e5ceb1ca --- /dev/null +++ b/BigDataSql/第一页/学校规模情况.sql @@ -0,0 +1,5 @@ +select stage,studentno as total from mv_dp_xxgmqk order by +(case when stage='小学' then 1 + when stage='初中' then 2 + when stage='高中' then 3 + end) diff --git a/BigDataSql/第一页/学生情况.sql b/BigDataSql/第一页/学生情况.sql new file mode 100644 index 00000000..3fec972f --- /dev/null +++ b/BigDataSql/第一页/学生情况.sql @@ -0,0 +1,5 @@ +select t1.stage,sum(t1.zhaoshengno) as zhaoshengno,sum(t1.biyeno) as biyeno,sum(t1.zaixiaono) as zaixiaono from mv_db_base_student as t1 GROUP BY t1.stage order by +(case when t1.stage='Сѧ' then 1 + when t1.stage='' then 2 + when t1.stage='' then 3 + end) \ No newline at end of file diff --git a/BigDataSql/第一页/班额.sql b/BigDataSql/第一页/班额.sql new file mode 100644 index 00000000..dbe0dd0e --- /dev/null +++ b/BigDataSql/第一页/班额.sql @@ -0,0 +1,21 @@ +SELECT stage,d, + (case d when '03' then '25˼' + when '04' then '26-30' + when '05' then '31-35' + when '06' then '36-40' + when '07' then '41-45' + when '08' then '46-50' + when '09' then '51-55' + when '10' then '56-60' + when '11' then '61-65' + when '12' then '66˼' end + ), + sum(sum) AS total + FROM mv_dp_bane_stage_chengxiang + GROUP BY d,stage + + order by +(case when stage='Сѧ' then 1 + when stage='' then 2 + when stage='' then 3 + end),d \ No newline at end of file diff --git a/BigDataSql/第一页/留守儿童情况.sql b/BigDataSql/第一页/留守儿童情况.sql new file mode 100644 index 00000000..77e0651f --- /dev/null +++ b/BigDataSql/第一页/留守儿童情况.sql @@ -0,0 +1,5 @@ +select * from mv_db_lsetqk +order by +(case when stage='Сѧ' then 1 + when stage='' then 2 + end),(case when citycountrygroup='' then 1 when citycountrygroup='' then 2 else 3 end) diff --git a/BigDataSql/第一页/随迁子女情况.txt b/BigDataSql/第一页/随迁子女情况.txt new file mode 100644 index 00000000..e5003c86 --- /dev/null +++ b/BigDataSql/第一页/随迁子女情况.txt @@ -0,0 +1,9 @@ + select stage,didgroup,sum(zaixiaono) as total from mv_db_sqznqk GROUP BY didgroup,stage +order by +(case when stage='Сѧ' then 1 + when stage='' then 2 + when stage='' then 3 + end) + + + select sum(zaixiaono) as total from mv_db_base_student \ No newline at end of file diff --git a/BigDataSql/第三页/占地面积情况.sql b/BigDataSql/第三页/占地面积情况.sql new file mode 100644 index 00000000..ca75e24d --- /dev/null +++ b/BigDataSql/第三页/占地面积情况.sql @@ -0,0 +1 @@ +select stage,citycountrygroup,zhandimianjino from mv_db_base_banxuetiaojian \ No newline at end of file diff --git a/BigDataSql/第三页/宿舍面积情况.sql b/BigDataSql/第三页/宿舍面积情况.sql new file mode 100644 index 00000000..565c40cd --- /dev/null +++ b/BigDataSql/第三页/宿舍面积情况.sql @@ -0,0 +1,4 @@ +--寄宿生 +select stage,citycountrygroup,jisuno from mv_db_base_student +--宿舍面积 +select stage,citycountrygroup,xueshengsushe from mv_db_base_banxuetiaojian \ No newline at end of file diff --git a/BigDataSql/第三页/教学及辅助面积情况.sql b/BigDataSql/第三页/教学及辅助面积情况.sql new file mode 100644 index 00000000..6d9724c1 --- /dev/null +++ b/BigDataSql/第三页/教学及辅助面积情况.sql @@ -0,0 +1 @@ +select stage,citycountrygroup,jiaoxuejiaofuno from mv_db_base_banxuetiaojian \ No newline at end of file diff --git a/BigDataSql/第三页/校舍建筑面积情况.sql b/BigDataSql/第三页/校舍建筑面积情况.sql new file mode 100644 index 00000000..ff035e35 --- /dev/null +++ b/BigDataSql/第三页/校舍建筑面积情况.sql @@ -0,0 +1 @@ +select stage,citycountrygroup,xiaosheno from mv_db_base_banxuetiaojian \ No newline at end of file diff --git a/BigDataSql/第三页/运动场地面积情况.sql b/BigDataSql/第三页/运动场地面积情况.sql new file mode 100644 index 00000000..976fb836 --- /dev/null +++ b/BigDataSql/第三页/运动场地面积情况.sql @@ -0,0 +1 @@ +select stage,citycountrygroup,yundongchangdino from mv_db_base_banxuetiaojian \ No newline at end of file diff --git a/BigDataSql/第二页/专任教师学历情况.sql b/BigDataSql/第二页/专任教师学历情况.sql new file mode 100644 index 00000000..508f5603 --- /dev/null +++ b/BigDataSql/第二页/专任教师学历情况.sql @@ -0,0 +1 @@ +select * from mv_db_zrjsxlqk \ No newline at end of file diff --git a/BigDataSql/第二页/专任教师师生比.sql b/BigDataSql/第二页/专任教师师生比.sql new file mode 100644 index 00000000..bf22cf6b --- /dev/null +++ b/BigDataSql/第二页/专任教师师生比.sql @@ -0,0 +1 @@ +select * from mv_dp_zrjsssbl \ No newline at end of file diff --git a/BigDataSql/第二页/专任教师年龄情况.sql b/BigDataSql/第二页/专任教师年龄情况.sql new file mode 100644 index 00000000..9c3203dc --- /dev/null +++ b/BigDataSql/第二页/专任教师年龄情况.sql @@ -0,0 +1 @@ +select * from mv_dp_zrjsnl \ No newline at end of file diff --git a/BigDataSql/第二页/专任教师职称情况.sql b/BigDataSql/第二页/专任教师职称情况.sql new file mode 100644 index 00000000..b3427dcb --- /dev/null +++ b/BigDataSql/第二页/专任教师职称情况.sql @@ -0,0 +1 @@ +select * from mv_db_zrjszcqk \ No newline at end of file diff --git a/BigDataSql/第二页/城乡专任教师师生比.sql b/BigDataSql/第二页/城乡专任教师师生比.sql new file mode 100644 index 00000000..bfdf4b2a --- /dev/null +++ b/BigDataSql/第二页/城乡专任教师师生比.sql @@ -0,0 +1,66 @@ +select t1.a as stage,t1.citycountrygroup,sum(c1) as studentNo,sum(c2) as teacherNo from ( + select * from ( + SELECT '小学' as a,'学生' as b,sbr.cityCountryGroup,sum(j+k+l+m+n+o) as c1,0 as c2 + from schoolBusinessRelation sbr + inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno + inner join J312 as j on j.instanceid =it.instanceid and j.did in (1,37,38,39,40,41,42,43,44,45,46,47) + where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('211','218','219','312','345') and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019 + group by sbr.cityCountryGroup + + union all + + SELECT '初中' as a,'学生' as b,sbr.cityCountryGroup,sum(i+j+k+l) as c1,0 as c2 + from schoolBusinessRelation sbr + inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno + inner join J313 as j on j.instanceid =it.instanceid and j.did in (1,36,37,38,39,40,41,42,43,44) + where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('311','312','319','341','345') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019 + group by sbr.cityCountryGroup + + union all + + SELECT '高中' as a,'学生' as b,sbr.cityCountryGroup,sum(i+j+k) as c1,0 as c2 + from schoolBusinessRelation sbr + inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno + inner join J314 as j on j.instanceid =it.instanceid and did in (1,11,12,13,14,15,16,17,18,19) + inner join v_areainfo va on va.region_name =sbr.gatherregionc + where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('341','342','345','349') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019 + group by sbr.cityCountryGroup + ) as t + + + union all + + + select * from ( + SELECT '高中' as a ,'老师' as b ,sbr.cityCountryGroup ,0 as c1, sum (F + G + H + I +j+k+l+ M + N ) as c2 + from schoolBusinessRelation sbr + inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno + inner join J422 as j on j.instanceid =it.instanceid and did in (22,23,24,25,26,27) + inner join v_areainfo va on va.region_name =sbr.gatherregionc + where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in ('341','342','345') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019 + group by sbr.cityCountryGroup + + union all + + + SELECT '初中' as a ,'老师' as b ,sbr.cityCountryGroup ,0 as c1, sum (F + G + H + I +j+k+l+ M + N ) as c2 + from schoolBusinessRelation sbr + inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno + inner join J422 as j on j.instanceid =it.instanceid and did in (13,14,15,16,17,18) + inner join v_areainfo va on va.region_name =sbr.gatherregionc + where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('311','312','341','345') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019 + group by sbr.cityCountryGroup + + + union all + + SELECT '小学' as a ,'老师' as b ,sbr.cityCountryGroup ,0 as c1, sum (F + G + H + I +j+k+l+ M + N ) as c2 + from schoolBusinessRelation sbr + inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno + inner join J422 as j on j.instanceid =it.instanceid and did in (4,5,6,7,8,9) + inner join v_areainfo va on va.region_name =sbr.gatherregionc + where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in ('211','218','312','345') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019 + group by sbr.cityCountryGroup + + ) as t + ) as t1 group by a,citycountrygroup order by a,citycountrygroup \ No newline at end of file diff --git a/BigDataSql/第二页/整体情况.sql b/BigDataSql/第二页/整体情况.sql new file mode 100644 index 00000000..0df97a13 --- /dev/null +++ b/BigDataSql/第二页/整体情况.sql @@ -0,0 +1,7 @@ +select '教职工总人数' as title,jzgno as count from mv_db_base_jiaozhigong +union all +select '女教职工总人数' as title,nv_jzgno as count from mv_db_base_jiaozhigong +union all +select '专任教师总人数' as title,sum(teacherno) from mv_db_base_zhuanrenjiaoshi +union all +select '在编教师总人数' as title,count from mv_db_base_zaibian \ No newline at end of file diff --git a/Document/MINIO部署文档.txt b/Document/MINIO部署文档.txt new file mode 100644 index 00000000..f9ee926a --- /dev/null +++ b/Document/MINIO部署文档.txt @@ -0,0 +1,22 @@ +# 服务器端部署 +wget https://dl.min.io/server/minio/release/darwin-amd64/minio +chmod 755 minio +./minio server /data + +# 访问地址 +http://10.10.14.165:9000 +minioadmin +minioadmin + +# 如果需要指定AK,SK，那么 +export MINIO_ACCESS_KEY="minio" +export MINIO_SECRET_KEY="minio123" + + +# 下载客户端 +wget https://dl.min.io/client/mc/release/linux-amd64/mc +chmod +x mc +./mc --help + +# 删除七天前的数据，配合crontab使用 +./mc rm --recursive --force --dangerous --older-than 7d /data/bigdata/image/ \ No newline at end of file diff --git a/Document/大数据数据仓库整体架构设计.vsdx b/Document/大数据数据仓库整体架构设计.vsdx deleted file mode 100644 index 660e9720..00000000 Binary files a/Document/大数据数据仓库整体架构设计.vsdx and /dev/null differ diff --git a/Document/大数据研发组周工作汇报(2020-05-25至2020-05-29).doc b/Document/大数据研发组周工作汇报(2020-05-25至2020-05-29).doc deleted file mode 100644 index 9cee896c..00000000 Binary files a/Document/大数据研发组周工作汇报(2020-05-25至2020-05-29).doc and /dev/null differ diff --git a/Document/大数据研发组周工作汇报(2020-06-01至2020-06-05).doc b/Document/大数据研发组周工作汇报(2020-06-01至2020-06-05).doc deleted file mode 100644 index 3c6fdfa5..00000000 Binary files a/Document/大数据研发组周工作汇报(2020-06-01至2020-06-05).doc and /dev/null differ diff --git a/Document/大数据研发组周工作汇报(2020-06-08至2020-06-12) .doc b/Document/大数据研发组周工作汇报(2020-06-08至2020-06-12) .doc deleted file mode 100644 index 572a37b7..00000000 Binary files a/Document/大数据研发组周工作汇报(2020-06-08至2020-06-12) .doc and /dev/null differ diff --git a/Document/大数据组本周工作总结（2020-07-03） .mmap b/Document/大数据组本周工作总结（2020-07-03） .mmap deleted file mode 100644 index 5aa6b6bc..00000000 Binary files a/Document/大数据组本周工作总结（2020-07-03） .mmap and /dev/null differ diff --git a/dsSso/docs/docs.go b/dsSso/docs/docs.go index 95bc25c0..082d847f 100644 --- a/dsSso/docs/docs.go +++ b/dsSso/docs/docs.go @@ -663,7 +663,7 @@ type swaggerInfo struct { // SwaggerInfo holds exported Swagger Info so clients can modify it var SwaggerInfo = swaggerInfo{ Version: "2.0", - Host: "10.10.14.187:8000", + Host: "127.0.0.1:8000", BasePath: "", Schemes: []string{}, Title: "东师理想统一认证中心(OAuth2+Sso)", diff --git a/dsSso/docs/swagger.json b/dsSso/docs/swagger.json index 8d86d57a..a06edb04 100644 --- a/dsSso/docs/swagger.json +++ b/dsSso/docs/swagger.json @@ -6,7 +6,7 @@ "contact": {}, "version": "2.0" }, - "host": "10.10.14.187:8000", + "host": "127.0.0.1:8000", "paths": { "/oauth2/AddClient": { "post": { diff --git a/dsSso/docs/swagger.yaml b/dsSso/docs/swagger.yaml index 81501496..5832322d 100644 --- a/dsSso/docs/swagger.yaml +++ b/dsSso/docs/swagger.yaml @@ -32,7 +32,7 @@ definitions: description: 个数 type: object type: object -host: 10.10.14.187:8000 +host: 127.0.0.1:8000 info: contact: {} description: 参考自xxl-sso diff --git a/dsSso/main.go b/dsSso/main.go index 8a5e8bc8..820981f4 100644 --- a/dsSso/main.go +++ b/dsSso/main.go @@ -58,7 +58,7 @@ func startOAuth2Server() { // @title 东师理想统一认证中心(OAuth2+Sso) // @version 2.0 // @description 参考自xxl-sso -// @host 10.10.14.187:8000 +// @host 127.0.0.1:8000 func main() { // 发布模式 //gin.SetMode(gin.ReleaseMode) diff --git a/dsSso/接入示例/JavaDemo/.idea/compiler.xml b/dsSso/接入示例/JavaDemo/.idea/compiler.xml index 0b8502a4..5cb1abd0 100644 --- a/dsSso/接入示例/JavaDemo/.idea/compiler.xml +++ b/dsSso/接入示例/JavaDemo/.idea/compiler.xml @@ -7,11 +7,13 @@ + diff --git a/dsSso/接入示例/JavaDemo/.idea/encodings.xml b/dsSso/接入示例/JavaDemo/.idea/encodings.xml index b26911bd..af673e73 100644 --- a/dsSso/接入示例/JavaDemo/.idea/encodings.xml +++ b/dsSso/接入示例/JavaDemo/.idea/encodings.xml @@ -2,5 +2,7 @@ + + \ No newline at end of file diff --git a/dsSso/接入示例/JavaDemo/.idea/jarRepositories.xml b/dsSso/接入示例/JavaDemo/.idea/jarRepositories.xml new file mode 100644 index 00000000..95646c74 --- /dev/null +++ b/dsSso/接入示例/JavaDemo/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/dsSso/接入示例/JavaDemo/.idea/vcs.xml b/dsSso/接入示例/JavaDemo/.idea/vcs.xml new file mode 100644 index 00000000..c2365ab1 --- /dev/null +++ b/dsSso/接入示例/JavaDemo/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/dsSso/接入示例/JavaDemo/.idea/workspace.xml b/dsSso/接入示例/JavaDemo/.idea/workspace.xml index 0a938b89..e1d600dc 100644 --- a/dsSso/接入示例/JavaDemo/.idea/workspace.xml +++ b/dsSso/接入示例/JavaDemo/.idea/workspace.xml @@ -1,10 +1,17 @@ + + - - - - + + + + @@ -88,34 +100,36 @@ + + + + + + - - - + + + + + @@ -137,6 +152,7 @@ @@ -178,7 +194,18 @@ - + + @@ -186,7 +213,6 @@ file://$PROJECT_DIR$/src/main/java/com/demo/index/IndexController.java 43 - diff --git a/dsSso/接入示例/JavaDemo/Target/classes/com/demo/index/IndexController.class b/dsSso/接入示例/JavaDemo/Target/classes/com/demo/index/IndexController.class index e46d0a56..f07afd2f 100644 Binary files a/dsSso/接入示例/JavaDemo/Target/classes/com/demo/index/IndexController.class and b/dsSso/接入示例/JavaDemo/Target/classes/com/demo/index/IndexController.class differ diff --git a/dsSso/接入示例/JavaDemo/Target/classes/com/demo/testRpc$OkHttpClientObject.class b/dsSso/接入示例/JavaDemo/Target/classes/com/demo/testRpc$OkHttpClientObject.class deleted file mode 100644 index 649c899a..00000000 Binary files a/dsSso/接入示例/JavaDemo/Target/classes/com/demo/testRpc$OkHttpClientObject.class and /dev/null differ diff --git a/dsSso/接入示例/JavaDemo/Target/classes/com/demo/testRpc.class b/dsSso/接入示例/JavaDemo/Target/classes/com/demo/testRpc.class deleted file mode 100644 index 0a34af72..00000000 Binary files a/dsSso/接入示例/JavaDemo/Target/classes/com/demo/testRpc.class and /dev/null differ diff --git a/dsSso/接入示例/JavaDemo/src/main/java/com/demo/index/IndexController.java b/dsSso/接入示例/JavaDemo/src/main/java/com/demo/index/IndexController.java index 0541700c..adc20560 100644 --- a/dsSso/接入示例/JavaDemo/src/main/java/com/demo/index/IndexController.java +++ b/dsSso/接入示例/JavaDemo/src/main/java/com/demo/index/IndexController.java @@ -10,13 +10,13 @@ import java.util.Base64; public class IndexController extends Controller { //服务器的位置信息 - String OAuth2Server = "http://fort.edusoa.com:7777"; + String OAuth2Server = "http://10.10.14.187"; String authCodeURI = OAuth2Server + "/oauth2/authorize"; String authTokenURI = OAuth2Server + "/oauth2/access_token"; //在服务器注册生成的用户和密码 - String clientId = "bsh6f9anium2jd4h8sng"; - String clientSecret = "01eef69qb14sw00jxyw5rvw9rq"; + String clientId = "bu3pcf7cl45ug8dup8og"; + String clientSecret = "01emmt5qdyszh9ndbpbg4zk4tn"; String redirectURI = "http://127.0.0.1:8003/code"; String oauthCallback = "http://127.0.0.1:8003/success";