diff --git a/ant-design-vue-jeecg/.env.development b/ant-design-vue-jeecg/.env.development index c9c6c757..2010d213 100644 --- a/ant-design-vue-jeecg/.env.development +++ b/ant-design-vue-jeecg/.env.development @@ -1,5 +1,5 @@ NODE_ENV=development -VUE_APP_API_BASE_URL=http://localhost:8080/jeecg-boot +VUE_APP_API_BASE_URL=http://192.168.0.7:8080/jeecg-boot VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview diff --git a/ant-design-vue-jeecg/src/App.vue b/ant-design-vue-jeecg/src/App.vue index 9f4f7a8f..59e39f6b 100644 --- a/ant-design-vue-jeecg/src/App.vue +++ b/ant-design-vue-jeecg/src/App.vue @@ -1,44 +1,44 @@ \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/assets/imgs/bg/background.png b/ant-design-vue-jeecg/src/assets/imgs/bg/background.png new file mode 100644 index 00000000..61758183 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/bg/background.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/bg/bgBottom.png b/ant-design-vue-jeecg/src/assets/imgs/bg/bgBottom.png new file mode 100644 index 00000000..52e7ee1b Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/bg/bgBottom.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/bg/bgTop.png b/ant-design-vue-jeecg/src/assets/imgs/bg/bgTop.png new file mode 100644 index 00000000..05a2b925 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/bg/bgTop.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/bg/lgBg.jpg b/ant-design-vue-jeecg/src/assets/imgs/bg/lgBg.jpg new file mode 100644 index 00000000..c4fd3c8d Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/bg/lgBg.jpg differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/bg/lginputBg.png b/ant-design-vue-jeecg/src/assets/imgs/bg/lginputBg.png new file mode 100644 index 00000000..92b3f024 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/bg/lginputBg.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/bg/lginputBgs.png b/ant-design-vue-jeecg/src/assets/imgs/bg/lginputBgs.png new file mode 100644 index 00000000..15b0f076 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/bg/lginputBgs.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/bg/loginBg.png b/ant-design-vue-jeecg/src/assets/imgs/bg/loginBg.png new file mode 100644 index 00000000..9ba98ddc Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/bg/loginBg.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/bg/loginbtnBg.png b/ant-design-vue-jeecg/src/assets/imgs/bg/loginbtnBg.png new file mode 100644 index 00000000..c0b031dd Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/bg/loginbtnBg.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/bg/loginbtnBgs.png b/ant-design-vue-jeecg/src/assets/imgs/bg/loginbtnBgs.png new file mode 100644 index 00000000..c09d434c Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/bg/loginbtnBgs.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/bg/menu2Bg.png b/ant-design-vue-jeecg/src/assets/imgs/bg/menu2Bg.png new file mode 100644 index 00000000..0ae5da81 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/bg/menu2Bg.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/bg/menu3Bg.png b/ant-design-vue-jeecg/src/assets/imgs/bg/menu3Bg.png new file mode 100644 index 00000000..0a58da54 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/bg/menu3Bg.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/bg/menuBg.png b/ant-design-vue-jeecg/src/assets/imgs/bg/menuBg.png new file mode 100644 index 00000000..9c56eb5e Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/bg/menuBg.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/bg/menuBgL.png b/ant-design-vue-jeecg/src/assets/imgs/bg/menuBgL.png new file mode 100644 index 00000000..5d60650e Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/bg/menuBgL.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/bg/menuBgLs.png b/ant-design-vue-jeecg/src/assets/imgs/bg/menuBgLs.png new file mode 100644 index 00000000..89ad0763 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/bg/menuBgLs.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/bg/menuBgR.png b/ant-design-vue-jeecg/src/assets/imgs/bg/menuBgR.png new file mode 100644 index 00000000..b27c7dc7 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/bg/menuBgR.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/bg/menuBgs.png b/ant-design-vue-jeecg/src/assets/imgs/bg/menuBgs.png new file mode 100644 index 00000000..8ecd6d2f Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/bg/menuBgs.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/bg/pwd.png b/ant-design-vue-jeecg/src/assets/imgs/bg/pwd.png new file mode 100644 index 00000000..04868625 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/bg/pwd.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/bg/usm.png b/ant-design-vue-jeecg/src/assets/imgs/bg/usm.png new file mode 100644 index 00000000..f74cec1c Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/bg/usm.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/bg/viewBg.png b/ant-design-vue-jeecg/src/assets/imgs/bg/viewBg.png new file mode 100644 index 00000000..e0d11c05 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/bg/viewBg.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/choose16.png b/ant-design-vue-jeecg/src/assets/imgs/choose16.png new file mode 100644 index 00000000..c463db4c Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/choose16.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/choose20.png b/ant-design-vue-jeecg/src/assets/imgs/choose20.png new file mode 100644 index 00000000..b0bcfa17 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/choose20.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/close.png b/ant-design-vue-jeecg/src/assets/imgs/close.png new file mode 100644 index 00000000..39e2b95d Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/close.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/icon1.png b/ant-design-vue-jeecg/src/assets/imgs/icon1.png new file mode 100644 index 00000000..383b93ec Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/icon1.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/icon2.png b/ant-design-vue-jeecg/src/assets/imgs/icon2.png new file mode 100644 index 00000000..1bab71b8 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/icon2.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/icon3.png b/ant-design-vue-jeecg/src/assets/imgs/icon3.png new file mode 100644 index 00000000..c7b49861 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/icon3.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/icon4.png b/ant-design-vue-jeecg/src/assets/imgs/icon4.png new file mode 100644 index 00000000..09df12c5 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/icon4.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/icon5.png b/ant-design-vue-jeecg/src/assets/imgs/icon5.png new file mode 100644 index 00000000..600d4946 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/icon5.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/icon6.png b/ant-design-vue-jeecg/src/assets/imgs/icon6.png new file mode 100644 index 00000000..fffd5cfb Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/icon6.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/leftline.png b/ant-design-vue-jeecg/src/assets/imgs/leftline.png new file mode 100644 index 00000000..76030b50 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/leftline.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/line.png b/ant-design-vue-jeecg/src/assets/imgs/line.png new file mode 100644 index 00000000..8809d5af Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/line.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/loginlogo.png b/ant-design-vue-jeecg/src/assets/imgs/loginlogo.png new file mode 100644 index 00000000..0019b6aa Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/loginlogo.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/logo.png b/ant-design-vue-jeecg/src/assets/imgs/logo.png new file mode 100644 index 00000000..8fd9544f Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/logo.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/menu1.png b/ant-design-vue-jeecg/src/assets/imgs/menu1.png new file mode 100644 index 00000000..578301ab Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/menu1.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/menu2.png b/ant-design-vue-jeecg/src/assets/imgs/menu2.png new file mode 100644 index 00000000..842c02d5 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/menu2.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/menu2/data1.png b/ant-design-vue-jeecg/src/assets/imgs/menu2/data1.png new file mode 100644 index 00000000..f47ee897 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/menu2/data1.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/menu2/data2.png b/ant-design-vue-jeecg/src/assets/imgs/menu2/data2.png new file mode 100644 index 00000000..117c0cc1 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/menu2/data2.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/menu2/data3.png b/ant-design-vue-jeecg/src/assets/imgs/menu2/data3.png new file mode 100644 index 00000000..4c10707a Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/menu2/data3.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/menu2/data4.png b/ant-design-vue-jeecg/src/assets/imgs/menu2/data4.png new file mode 100644 index 00000000..63f4b393 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/menu2/data4.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/menu2/data5.png b/ant-design-vue-jeecg/src/assets/imgs/menu2/data5.png new file mode 100644 index 00000000..ed2b594b Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/menu2/data5.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/menu2/data6.png b/ant-design-vue-jeecg/src/assets/imgs/menu2/data6.png new file mode 100644 index 00000000..376bde23 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/menu2/data6.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/menu2/data7.png b/ant-design-vue-jeecg/src/assets/imgs/menu2/data7.png new file mode 100644 index 00000000..14e94f4f Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/menu2/data7.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/menu2/gis1.png b/ant-design-vue-jeecg/src/assets/imgs/menu2/gis1.png new file mode 100644 index 00000000..51ebd031 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/menu2/gis1.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/menu2/gis2.png b/ant-design-vue-jeecg/src/assets/imgs/menu2/gis2.png new file mode 100644 index 00000000..5bfcf9bd Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/menu2/gis2.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/menu2/gis3.png b/ant-design-vue-jeecg/src/assets/imgs/menu2/gis3.png new file mode 100644 index 00000000..ada0c3c4 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/menu2/gis3.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/menu2/gis4.png b/ant-design-vue-jeecg/src/assets/imgs/menu2/gis4.png new file mode 100644 index 00000000..43f87d98 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/menu2/gis4.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/menu2/gis5.png b/ant-design-vue-jeecg/src/assets/imgs/menu2/gis5.png new file mode 100644 index 00000000..f4e5150f Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/menu2/gis5.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/menu2/system1.png b/ant-design-vue-jeecg/src/assets/imgs/menu2/system1.png new file mode 100644 index 00000000..2bf012fb Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/menu2/system1.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/menu2/system2.png b/ant-design-vue-jeecg/src/assets/imgs/menu2/system2.png new file mode 100644 index 00000000..a662b8c4 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/menu2/system2.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/menu2/system3.png b/ant-design-vue-jeecg/src/assets/imgs/menu2/system3.png new file mode 100644 index 00000000..38331166 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/menu2/system3.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/menu2/system4.png b/ant-design-vue-jeecg/src/assets/imgs/menu2/system4.png new file mode 100644 index 00000000..f9cff281 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/menu2/system4.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/menu2/system5.png b/ant-design-vue-jeecg/src/assets/imgs/menu2/system5.png new file mode 100644 index 00000000..50b7a534 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/menu2/system5.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/menu3.png b/ant-design-vue-jeecg/src/assets/imgs/menu3.png new file mode 100644 index 00000000..e4189e7e Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/menu3.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/menu4.png b/ant-design-vue-jeecg/src/assets/imgs/menu4.png new file mode 100644 index 00000000..08639b9d Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/menu4.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/menu5.png b/ant-design-vue-jeecg/src/assets/imgs/menu5.png new file mode 100644 index 00000000..641ab300 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/menu5.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/menu6.png b/ant-design-vue-jeecg/src/assets/imgs/menu6.png new file mode 100644 index 00000000..aa0eb94f Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/menu6.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/mode1.png b/ant-design-vue-jeecg/src/assets/imgs/mode1.png new file mode 100644 index 00000000..6a8cf5c1 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/mode1.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/mode2.png b/ant-design-vue-jeecg/src/assets/imgs/mode2.png new file mode 100644 index 00000000..a4d314ad Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/mode2.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/mode3.png b/ant-design-vue-jeecg/src/assets/imgs/mode3.png new file mode 100644 index 00000000..e2a0d607 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/mode3.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/mode4.png b/ant-design-vue-jeecg/src/assets/imgs/mode4.png new file mode 100644 index 00000000..68cad386 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/mode4.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/mode5.png b/ant-design-vue-jeecg/src/assets/imgs/mode5.png new file mode 100644 index 00000000..e8120d43 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/mode5.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/rightline.png b/ant-design-vue-jeecg/src/assets/imgs/rightline.png new file mode 100644 index 00000000..5aa0336a Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/rightline.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/unchoose16.png b/ant-design-vue-jeecg/src/assets/imgs/unchoose16.png new file mode 100644 index 00000000..ea29d6a4 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/unchoose16.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/unchoose20.png b/ant-design-vue-jeecg/src/assets/imgs/unchoose20.png new file mode 100644 index 00000000..6312d647 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/unchoose20.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/usericon.png b/ant-design-vue-jeecg/src/assets/imgs/usericon.png new file mode 100644 index 00000000..4170006e Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/usericon.png differ diff --git a/ant-design-vue-jeecg/src/assets/imgs/viewicon.png b/ant-design-vue-jeecg/src/assets/imgs/viewicon.png new file mode 100644 index 00000000..714a92fc Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/imgs/viewicon.png differ diff --git a/ant-design-vue-jeecg/src/assets/less/Suless.less b/ant-design-vue-jeecg/src/assets/less/Suless.less new file mode 100644 index 00000000..bb34c00d --- /dev/null +++ b/ant-design-vue-jeecg/src/assets/less/Suless.less @@ -0,0 +1,1156 @@ +@bordercolor : #327290; +@headercolor : #1f232a; +@backcolor : #0F3B4F; +@inpuitbackcolor : rgba(35,91,116,0.66); +@labelDeaultColor : #24B4D3; +@defaultWhiteColor: #eeeeee; +@fontfamily : 'Microsoft YaHei'; + + + + + + +/* 滚动条优化 start */ +::-webkit-scrollbar { + width : 10px; + height: 8px; +} + +::-webkit-scrollbar-track { + background : #3a3d4e; + border-radius: 2px; +} + +::-webkit-scrollbar-thumb { + background : #717483; + border-radius: 10px; +} + +::-webkit-scrollbar-thumb:hover { + background: #717483; +} + +::-webkit-scrollbar-corner { + background: #3a3d4e; +} + +/* 滚动条优化 end */ +.ant-col { + margin-bottom: 6px; +} + +body { + // 打开滚动条固定显示 + overflow-y: hidden; + + &.colorWeak { + filter: invert(80%); + } +} + +.logoLabel { + font-size : 36px !important; + color : @defaultWhiteColor !important; + font-family : @fontfamily; + letter-spacing: 10px; +} + +.ant-select-selection--multiple .ant-select-selection__choice { + background-color: #3f4354 !important; + border : 1px solid #3f4354 !important; +} + +.ant-select-selection--multiple .ant-select-selection__choice__remove { + color: #8a8e9e !important; +} + +/* chrome 记住密码样式 */ +.user-layout-login .has-success input:-webkit-autofill { + box-shadow : inset 0 0 1000px #252c40 !important; + -webkit-text-fill-color: @labelDeaultColor !important; +} + +.ant-layout { + background: url('~@/assets/img/layoutbg.png') no-repeat !important; +} + +.ant-layout-header { + background: url('~@/assets/img/header_bg.png') no-repeat !important; +} + +.drawer-bootom-button { + bottom : 0; + width : 100%; + border-top : 1px solid #e8e8e8; + padding : 10px 16px; + background : transparent; + border-radius: 0 0 2px 2px; +} + +.signdiv, +.ant-card-head, +.ant-form-item label, +.ant-form-item label:hover, +.ant-breadcrumb, +.ant-breadcrumb-separator, +.border-card, +.ant-tabs-tab { + font-family: @fontfamily; + font-weight: 400 !important; + font-size : 16px !important; + color : @labelDeaultColor !important; +} + +.ant-radio-disabled+span { + color: @labelDeaultColor !important; +} + +/* tab背景 */ +.ant-tabs-bar { + border-bottom: 1px solid #336591 !important; +} + +.ant-tabs-tab { + border-bottom: 2px solid #336591 !important; + text-align : center; + width : 142px; + height : 30px !important; + padding : 2px 16px !important; + margin : 0 -8px 0 0px !important; + background : #092C3C; + display: flex; + justify-content: center; + align-items: center; +} + +.ant-tabs-tab-active { + z-index : 200 !important; + border-bottom: 0px !important; + background: #15668A; +} + +.ant-tabs-tab:first-child { + width : 172px; + // background: url('~@/assets/img/tab_bg_1_default.png') no-repeat; +} + +.ant-tabs-tab-active:first-child { + // background: url('~@/assets/img/tab_bg_1_active.png') no-repeat; +} + +.ant-tabs-tab:nth-child(1) { + z-index: 100; +} + +.ant-tabs-tab:nth-child(2) { + z-index: 90; +} + +.ant-tabs-tab:nth-child(3) { + z-index: 80; +} + +.ant-tabs-tab:nth-child(4) { + z-index: 70; +} + +.ant-tabs-tab:nth-child(5) { + z-index: 60; +} + +.ant-tabs-tab:nth-child(6) { + z-index: 50; +} + +.ant-tabs-tab:nth-child(7) { + z-index: 40; +} + +.ant-tabs-tab:nth-child(8) { + z-index: 30; +} + +.ant-tabs-tab:nth-child(9) { + z-index: 20; +} + +.ant-tabs-tab:nth-child(10) { + z-index: 10; +} + + + +input { + border-radius: 0px; +} + +.ant-form-item { + margin-bottom: 0px !important; +} + +.ant-form-item-label { + text-align : left !important; + line-height: 32px !important; +} + +.ant-form-item-control { + line-height: 32px; +} + +.ant-input-number { + border: none; + height: 30px; +} + +ul { + list-style : none; + padding-left: 0; +} + +ul li { + line-height: 32px; + font-family: @fontfamily; + font-weight: 400 !important; + font-size : 16px !important; + color : #d4d4d4 !important; +} + +.table-page-search-wrapper { + padding: 8px 0; +} + + + +.ant-menu-horizontal, +.ant-menu-dark { + background: none !important; +} + +.ant-layout-header { + height: 160px !important; +} + +.libraryConfiguration .border-card { + height: 670px !important; +} + +.border-card, +.border-card img { + height : 655px; + overflow-y: auto; +} + +.ant-pagination-item, +.ant-pagination-item-active, +.ant-pagination-prev .ant-pagination-item-link, +.ant-pagination-next .ant-pagination-item-link, +.ant-table-placeholder, +.ant-checkbox-inner, +.ant-tree-checkbox-inner, +.ant-radio-inner, +.ant-table-tbody .ant-table-row-cell-break-word, +.ant-dropdown-menu-item-active, +.ant-menu.ant-menu-dark .ant-menu-item-selected, +.ant-layout-sider-children { + background-color: transparent !important; +} + +.ant-radio-inner, +.ant-checkbox-inner, +.ant-tree-checkbox-inner { + border-color: @bordercolor !important; +} + +.ant-radio-button-wrapper { + background: #0F3B4F !important; + border: 1px solid #00F0FF !important; + color: #00F0FF !important; +} + +.ant-radio-button-wrapper-checked { + background: #00F0FF !important; + color: #ffffff !important; +} + +.ant-card-bordered, +.ant-pagination-item, +.ant-pagination-item-active, +.ant-pagination-prev .ant-pagination-item-link, +.ant-pagination-next .ant-pagination-item-link, +.ant-table-placeholder { + border: none !important; +} + +.ant-pagination-item-active a, +.ant-pagination-item a:hover { + background-color: #3d4151 !important; + border-radius : 30px; +} + +.ant-pagination-prev .ant-pagination-item-link, +.ant-pagination-next .ant-pagination-item-link { + color: #40a9ff; +} +.signdivbg, +.ant-empty-description, +.ant-pagination-disabled .ant-pagination-item-link, +.ant-pagination-item a, +.ant-empty-normal, +.anticon.anticon-schedule， .border-card:hover, +.ant-tabs-tab-active, +.ant-tabs-tab:hover, +.ant-form-item, +.ant-select-arrow, +.ant-calendar-picker-icon, +.ant-input-password-icon, +.ant-dropdown-menu-item>a, +.ant-dropdown-menu-submenu-title>a { + color: @defaultWhiteColor !important; +} + +.ant-breadcrumb { + font-size : 16px; + font-family: @fontfamily; +} + +.ant-breadcrumb>span:last-child { + color: #00c3ff !important; +} + +.ant-layout-content { + margin : 0 30px; + padding : 30px 50px !important; + background : url(~@/assets/img/layoutcontentTop.png) 0 0 no-repeat, url(~@/assets/img/layoutcontentMiddle.png) 0 24px no-repeat, url(~@/assets/img/layoutcontentBottom.png) 0 750px no-repeat; + background-size: 1860px 24px, 1860px 726px, 1860px 24px; + height : 716px !important; +} + +.layout { + min-height: 100vh !important; + overflow-x: hidden; + + &.ant-layout-has-sider { + flex-direction: row; + } + + .trigger { + font-size : 22px; + line-height: 42px; + padding : 0 18px; + cursor : pointer; + transition : color 300ms, background 300ms; + + &:hover { + background: rgba(255, 255, 255, 0.3); + } + } + + .topmenu { + .ant-header-fixedHeader { + position : fixed; + top : 0; + right : 0; + z-index : 9; + width : 100%; + transition: width 0.2s; + + &.ant-header-side-opened { + width: 100%; + } + + &.ant-header-side-closed { + width: 100%; + } + } + + /* 必须为 topmenu 才能启用流式布局 */ + &.content-width-Fluid { + .header-index-wide { + max-width : unset; + margin-left: 24px; + } + + .page-header-index-wide { + max-width: unset; + } + } + } + + + .header { + height : 80px; + padding : 0 12px 0 0; + background: @defaultWhiteColor; + box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08); + position : relative; + } + + .header, + .top-nav-header-index { + .user-wrapper { + float : right; + height: 100%; + + .action { + cursor : pointer; + padding : 0 14px; + display : inline-block; + transition: all 0.3s; + + height : 70%; + line-height: 46px; + + &.action-full { + height: 100%; + } + + &:hover { + background: rgba(255, 255, 255, 0.3); + } + + .avatar { + margin : 20px 10px 20px 0; + color : #1890ff; + background : hsla(0, 0%, 100%, 0.85); + vertical-align: middle; + } + + .icon { + font-size: 16px; + padding : 4px; + } + + .anticon { + color: inherit; + } + } + } + + &.dark { + .user-wrapper { + .action { + color: black; + + &:hover { + background: rgba(0, 0, 0, 0.05); + } + + .anticon { + color: inherit; + } + } + } + } + } + + &.tablet { + + // overflow: hidden; text-overflow:ellipsis; white-space: nowrap; + .top-nav-header-index { + .header-index-wide { + .header-index-left { + .logo>a { + overflow : hidden; + text-overflow: ellipsis; + white-space : nowrap; + } + } + } + } + } + + .top-nav-header-index { + box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08); + position : relative; + transition: background 0.3s, width 0.2s; + + .header-index-wide { + width : 100%; + margin : auto; + padding: 0 20px 0 0; + display: flex; + height : 80px; + + .ant-menu.ant-menu-horizontal { + border : none; + height : 80px; + line-height: 80px; + } + + .header-index-left { + display: block; + + .logo.top-nav-header { + width : 165px; + height : 80px; + position : relative; + line-height: 80px; + transition : all 0.3s; + overflow : hidden; + + img { + display : inline-block; + vertical-align: middle; + height : 32px; + } + + h1 { + color : @defaultWhiteColor; + display : inline-block; + vertical-align: top; + font-size : 16px; + margin : 0 0 0 12px; + font-weight : 400; + } + } + } + + .header-index-right { + float : right; + height : 80px; + overflow: hidden; + + .action:hover { + background-color: rgba(0, 0, 0, 0.05); + } + } + } + + &.dark { + .user-wrapper { + .action { + color: white; + + &:hover { + background: rgba(255, 255, 255, 0.3); + } + } + } + + .header-index-wide .header-index-left .trigger:hover { + background: rgba(255, 255, 255, 0.3); + } + } + } + + // 内容区 + .layout-content { + margin : 24px 24px 0px; + height : 64px; + padding: 0 12px 0 0; + } +} + + + + + + + + +.ant-btn-background-ghost { + display: none !important; +} + +.ant-popover-inner { + background: @inpuitbackcolor !important; +} + +input:not(.ant-calendar-input):not(.ant-select-search__field):not(.ant-input-lg), +textarea, +// .ant-modal-confirm-title, +// .ant-modal-confirm-content, +.ant-select-selection, +.ant-calendar-picker-input, +.ant-input-number-handler-wrap, +.ant-input-number-handler-up-inner, +.ant-input-number-handler-down-inner, +.ant-select-tree-dropdown, +.ant-select-dropdown-menu-item, +.ant-select-dropdown-menu-item-selected, +.ant-select-dropdown-content { + background: @inpuitbackcolor !important; +} + +.ant-popover-message, +input:not(.ant-calendar-input):not(.ant-select-search__field):not(.ant-input-lg), +textarea, +.ant-modal-confirm-title, +.ant-modal-confirm-content, +.ant-select-selection, +.ant-calendar-picker-input, +.ant-input-number-handler-wrap, +.ant-input-number-handler-up-inner, +.ant-input-number-handler-down-inner, +.ant-select-tree-dropdown, +.ant-select-dropdown-menu-item, +.ant-select-dropdown-menu-item-selected, +.ant-select-dropdown-content , +.ant-select-dropdown.ant-select-dropdown--multiple .ant-select-dropdown-menu-item-selected .ant-select-selected-icon, +.ant-select-dropdown.ant-select-dropdown--multiple .ant-select-dropdown-menu-item:hover .ant-select-selected-icon { + color: @defaultWhiteColor !important; +} + +input:not(.ant-calendar-input):not(.ant-select-search__field):not(.ant-input-lg), +textarea, +.ant-select-selection, +.ant-calendar-picker-input, +.ant-input-number-handler-wrap, +.ant-select-dropdown-content { + border : 1px solid @bordercolor !important; + border-radius: 0 !important; +} + +.ant-input-number-handler-down { + border-top: 1px solid @bordercolor !important; +} + +.ant-dropdown-menu, +.ant-modal-content, +.ant-drawer-content { + overflow : hidden !important; + background: @backcolor !important; + border : 1px solid #5a91c7 !important; + + .ant-modal-header, + .ant-drawer-header { + // border-bottom: 0; + border-color: #315c6e; + background : @backcolor !important; + padding : 10px 24px; + .ant-modal-title { + color: #00e1f0 !important; + } + } + + .ant-modal-close-x { + width : 36px; + height : 36px; + line-height: 36px; + right : 30px !important; + } + + .ant-modal-title, + .ant-modal-close, + .ant-drawer-title, + .ant-drawer-close { + color: #919499 !important; + } + + .ant-modal-body, + .ant-drawer-body { + + .drawer-bootom-button { + background-color: @backcolor !important; + border-top : 1px solid @backcolor; + } + + .ant-table-tbody tr th, + .ant-table-tbody tr td { + background-color: @backcolor !important; + color : @defaultWhiteColor; + + // height: 50px; + a { + color: @defaultWhiteColor !important; + } + } + + .ant-table-align-center, + .ant-table-thead tr th { + background-color: @backcolor !important; + color : @labelDeaultColor !important; + } + + .ant-table-bordered .ant-table-thead>tr>th, + .ant-table-bordered .ant-table-tbody>tr>td, + .ant-table-content .ant-table-thead>tr>th, + .ant-table-content .ant-table-tbody>tr>td { + border-right : 0 !important; + border-bottom: 1px solid #31343d !important; + line-height : 22px; + } + } + + .ant-modal-footer { + border-top: 1px solid @backcolor; + } +} + +.ant-checkbox-disabled+span { + color: @labelDeaultColor !important; +} + +.ant-btn { + width : 160px !important; + height : 36px !important; + font-family: @fontfamily; + color : @defaultWhiteColor !important; +} + +.ant-btn, +.ant-input-search-button { + background : #1A91C5 !important; + border : none !important; + border-radius: 0 !important; + width: auto !important; + cursor: pointer !important; +} + +.ant-input-search-button { + margin-left: 10px; +} + +.ant-btn:hover, +.ant-btn:active, +.ant-btn:focus { + // background: #0F3B4F !important; + cursor: pointer !important; +} + +.ant-menu-light { + // height : 850px; + // padding-bottom: 10px; + // overflow-y : scroll; +} + +.ant-layout-sider { + margin-left : 50px; + min-width : 286px !important; + background-color: transparent !important; +} + +.ant-tree li .ant-tree-node-content-wrapper { + height : 32px !important; + line-height: 32px !important; +} + +.ant-tree-node-content-wrapper, +.anticon { + color: @labelDeaultColor !important; +} + +.ant-notification-notice-icon-error { + color: #f5222d !important; +} +.ant-notification-notice-icon-success { + color: #52c41a !important; +} +.ant-notification-notice-icon-info { + color: #1890ff !important; +} +.ant-notification-notice-icon-warning { + color: #faad14 !important; +} +.ant-notification-notice-icon-error { + color: #f5222d !important; +} +.ant-menu-submenu-inline>.ant-menu-submenu-title .ant-menu-submenu-arrow::before, +.ant-menu-submenu-inline>.ant-menu-submenu-title:hover .ant-menu-submenu-arrow::before, +.ant-menu-submenu-inline>.ant-menu-submenu-title .ant-menu-submenu-arrow::after, +.ant-menu-submenu-inline>.ant-menu-submenu-title:hover .ant-menu-submenu-arrow::after { + background: linear-gradient(to right, @bordercolor, @bordercolor) !important; +} + +.ant-menu-submenu-open>.ant-menu-submenu-title .ant-menu-submenu-arrow::before, +.ant-menu-submenu-open>.ant-menu-submenu-title:hover .ant-menu-submenu-arrow::before, +.ant-menu-submenu-open>.ant-menu-submenu-title .ant-menu-submenu-arrow::after, +.ant-menu-submenu-open>.ant-menu-submenu-title:hover .ant-menu-submenu-arrow::after { + background: linear-gradient(to right, #04DEFF, #04DEFF) !important; +} + +.ant-menu-inline .ant-menu-item::after { + border: 0px !important; +} + +.ant-menu-horizontal .ant-menu-item, +.ant-menu-submenu.ant-menu-submenu-horizontal { + background : url('~@/assets/img/menuDefault.png') no-repeat; + width : 176px !important; + margin : 0 20px !important; + min-height : 60px !important; + line-height : 60px !important; + text-align : center; + font-weight : bold; + font-size : 18px !important; + padding-left : 0px !important; + vertical-align: middle !important; + font-family : @fontfamily; +} + +.ant-menu-item>a>span, +.ant-menu-submenu { + color: #787a89 !important; +} + +.ant-menu-item-selected>a>span, +.ant-menu-item-active>a>span, +.ant-menu-submenu:hover, +.ant-menu-submenu-selected .ant-menu-submenu-title, +.ant-menu-submenu-title:hover { + color: @defaultWhiteColor !important; +} + +.ant-menu-submenu-horizontal.ant-menu-submenu-selected, +.ant-menu-submenu-horizontal.ant-menu-submenu-open, +.ant-menu-horizontal .ant-menu-item-active { + background: url('~@/assets/img/menuSelect.png') no-repeat !important; +} + +.ant-menu-vertical .ant-menu-item, +.ant-menu-submenu.ant-menu-submenu-vertical { + background : url('~@/assets/img/MenuSecDefault.png') no-repeat; + width : 195px !important; + height : 44px !important; + margin-bottom: 0 !important; + margin-top : -1px !important; +} + +.ant-menu-vertical .ant-menu-submenu-title { + margin-top: 0px !important; +} + +.ant-menu-submenu-vertical.ant-menu-submenu-selected, +.ant-menu-submenu-vertical.ant-menu-submenu-open, +.ant-menu-vertical .ant-menu-item-selected, +.ant-menu-vertical .ant-menu-item-active { + background: url('~@/assets/img/MenuSecSelect.png') no-repeat; +} + +.ant-menu-submenu-placement-rightTop { + left: 194px !important; + top : 0 !important; +} + +.ant-layout.ant-layout-has-sider>.ant-layout, +.ant-layout.ant-layout-has-sider>.ant-layout-content { + overflow-y: hidden; +} + +.ant-card, +.ant-card-body, +.ant-layout-footer, +.ant-input-group-addon { + background: transparent !important; +} + +.ant-card-body { + padding: 0 !important; +} + + + +// drawer-sider 自定义 +.ant-drawer.drawer-sider { + .sider { + box-shadow: none; + } + + &.dark { + .ant-drawer-content { + background-color: rgb(0, 21, 41); + } + } + + &.light { + box-shadow: none; + + .ant-drawer-content { + background-color: @defaultWhiteColor; + } + } + + .ant-drawer-body { + padding: 0; + } +} + + + +.ant-menu-inline .ant-menu-submenu-title { + font-size: 16px !important; +} + +// 外置的样式控制 +.user-dropdown-menu-wrapper.ant-dropdown-menu { + padding: 4px 0; + + .ant-dropdown-menu-item { + width: 160px; + } + + .ant-dropdown-menu-item>.anticon:first-child, + .ant-dropdown-menu-item>a>.anticon:first-child, + .ant-dropdown-menu-submenu-title>.anticon:first-child .ant-dropdown-menu-submenu-title>a>.anticon:first-child { + min-width : 12px; + margin-right: 8px; + } +} + +// 数据列表 样式 +.table-alert { + margin-bottom: 16px; +} + +.ant-table-align-center, +.ant-table-selection-column, +.ant-table-thead th, +.ant-table-row-expand-icon { + background-color: transparent !important; + color : @labelDeaultColor !important; + font-family : @fontfamily; + font-weight : 400 !important; + font-size : 16px !important; +} + +.ant-table-header, +.ant-table-fixed-header>.ant-table-content>.ant-table-scroll>.ant-table-body, +.ant-table-fixed-left table, +.ant-table-fixed-right table, +tr.ant-table-expanded-row, +tr.ant-table-expanded-row:hover { + background: transparent !important; +} + +// .ant-table-bordered .ant-table-thead > tr > th:first-child +// { +// background-color:#112834; +// color:#00DEF4; +// } +.ant-table-row, +.ant-table-row .ant-table-selection-column, +.ant-avatar, +.ant-table-tbody>tr td, +.ant-table-row>td>span>a { + background-color: transparent !important; + color : @defaultWhiteColor; + height : 50px; + font-family : @fontfamily; + font-weight : 400 !important; + font-size : 16px !important; +} + +.ant-table-tbody>tr.ant-table-row-hover>td, +.ant-table-tbody>tr.ant-table-row-hover>td>span>a, +.ant-table-tbody>tr.ant-table-row-selected>td, +.ant-table-tbody>tr.ant-table-row-selected>td>span>a { + color: #08c0ef !important; +} + + +// a { +// color: #00DEF4 !important; +// } + +// .ant-table-body { +// overflow-x: auto !important; +// } + +.ant-alert-info, +// .ant-pagination, +// .ant-table-pagination， .ant-tabs-no-animation, +.ant-tabs-editable-card { + display: none; +} + +// .ant-table-fixed-right, +// .ant-table-fixed-columns-in-body, +// .ant-table-row-cell-break-word, +// .ant-table-selection-column, +// .ant-alert-info, +// .ant-table-pagination { +// display: none; +// } +.ant-table-small, +.ant-table-small.ant-table-bordered .ant-table-content, +.ant-table-fixed, +.ant-table-body table { + border : 0px solid #096A87 !important; + border-right : 0px !important; + border-bottom: 0px !important; +} + +.ant-table-fixed-right .ant-table-fixed { + border-left : 0 !important; + border-right: 0 !important; +} + +.ant-table-thead>tr>th, +.ant-table-tbody>tr>td { + border-right : 0px solid #096A87 !important; + border-bottom: 1px solid #31343d !important; +} + +.ant-alert-info { + background-color: #3D4145; + border : none; + color : @defaultWhiteColor; +} + +.ant-alert-info>a { + color: @defaultWhiteColor; +} + +.ant-card-body { + background-color: #282B2C; +} + +.ant-layout-footer { + background-color: #010101; +} + +.ant-pagination { + color: @defaultWhiteColor; +} + +.layout .header, +.sider.light .logo { + background-color: transparent !important; +} + +.table-page-search-wrapper { + .ant-form-inline { + .ant-form-item { + display : flex; + margin-bottom: 10px; + margin-right : 0; + + .ant-form-item-control-wrapper { + flex : 1 1; + display : inline-block; + vertical-align: middle; + } + + >.ant-form-item-label { + line-height : 32px; + padding-right: 8px; + width : auto; + } + + .ant-form-item-control { + height : 32px; + line-height: 32px; + } + } + } + + .table-page-search-submitButtons { + display : block; + margin-bottom: 0px; + white-space : nowrap; + } +} + +.content { + .table-operator { + margin-bottom: 18px; + + button { + margin-right: 8px; + } + } +} + + + + + +.ant-timeline-item-head { + background : transparent; + background-color: transparent !important; +} + +.ant-timeline-item-head-yallow { + color: #ff9812; +} + +.ant-timeline-item-content { + top : -10px !important; + margin: 0 0 0 20px !important; +} + +.ant-timeline-item-tail { + position: absolute; + top : 15px !important; + height : calc(100% - 20px) !important; +} +.page-header-index-wide::-webkit-scrollbar { + width: 1px; +} +.page-header-index-wide::-webkit-scrollbar-thumb { + /* border-radius: 10px; */ + /* -webkit-box-shadow: inset 0 0 5px rgba(9, 74, 238, 0.7); */ + /* background: rgba(32, 50, 96, .7); */ +} +.page-header-index-wide::-webkit-scrollbar-track { + /* -webkit-box-shadow: inset 0 0 5px rgba(9, 74, 238, 0.7); */ + /* border-radius: 0; */ + /* background: rgba(0, 0, 0, 0.1); */ +} +.ant-calendar-range-picker-separator{ + color: #327290 !important; +} + + +.flex0Center{ + display: flex; + align-items: center; +} +.flexCenterCenter{ + display: flex; + justify-content: center; + align-items: center; +} +.flexEndCenter{ + display: flex; + justify-content: flex-end; + align-items: center; +} +.flexRowStart{ + display: flex; + flex-direction: row; + align-items: flex-start; +} +.flexRowCenter{ + display: flex; + flex-direction: row; + align-items: center; +} +.flexRowEnd{ + display: flex; + flex-direction: row; + align-items: flex-end; +} +.flexSpaceBetweenStart{ + display: flex; + justify-content: space-between; + align-items: flex-start; +} +.flexSpaceBetweenCenter{ + display: flex; + justify-content: space-between; + align-items: center; +} +.flexColumnCenterCenter{ + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; +} + +.flexColumnCenter0{ + display: flex; + flex-direction: column; + justify-content: center; +} +.shaixuan_float_left{ + float: left; + margin-right: 23px; +} +.ant-menu-submenu-vertical-left{ + background-color: #0E0F14; + border-bottom: 1px solid #005173; + border-left: 1px solid #005173; + border-right: 1px solid #005173; +} \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/assets/less/sulesss.less b/ant-design-vue-jeecg/src/assets/less/sulesss.less new file mode 100644 index 00000000..d90a76fe --- /dev/null +++ b/ant-design-vue-jeecg/src/assets/less/sulesss.less @@ -0,0 +1,239 @@ +.ant-calendar, +.ant-calendar-panel, +.ant-calendar-header, +.ant-calendar-footer, +.ant-calendar-input-wrap { + background-color: #042b4f !important; + border-color: #1673cb !important; +} + +.ant-calendar-column-header-inner, +.ant-calendar-year-select, +.ant-calendar-month-select, +.ant-calendar-date { + color: #fff !important; +} + +.ant-calendar-selected-day .ant-calendar-date, +.ant-calendar-date:hover { + background: #1890FF !important; +} + +.ant-calendar-input { + background-color: #042b4f !important; + color: #7ba7c6 !important; +} + +.ant-calendar-next-month-btn:hover:before, +.ant-calendar-next-year-btn:hover::before, +.ant-calendar-next-year-btn:hover::after, +.ant-calendar-prev-year-btn:hover::before, +.ant-calendar-prev-year-btn:hover::after, +.ant-calendar-prev-month-btn:hover::before { + border-color: #fff !important; +} + +.ant-calendar-picker-icon { + color: #1b9ee8 !important; +} + +//select +.ant-select-arrow { + color: #00b1ff !important; +} + +.ant-select-dropdown-menu-item { + color: #7ba7c6 !important; +} + +.ant-select-dropdown-menu-item-selected, +.ant-select-dropdown-menu-item-active { + background-color: #1673cb !important; +} +//ant-tab +.ant-tabs-bar { + border-color: #1673cb !important; + margin: 10px 20px 0px 20px !important; +} +.ant-tabs-nav-wrap +{ + margin: 0 !important; +} +.ant-tabs-ink-bar +{ + display: none !important; +} +.ant-tabs-nav .ant-tabs-tab { + background-image: linear-gradient(0deg, + #021831 0%, + #064576 60%, + #0971ba 100%), + linear-gradient(#2261a6, + #2261a6); + background-blend-mode: normal, + normal; + border: solid 1px #0a7bc4; + margin: 0 !important; + padding: 6px 31px !important; + color: #9acef7 !important; +} + +.ant-tabs-nav .ant-tabs-tab-active { + background-image: linear-gradient(0deg, + #042e5c 0%, + #0262ae 60%, + #0096ff 100%), + linear-gradient(#2261a6, + #2261a6); + background-blend-mode: normal, + normal; + color: #ffffff !important; +} + +//input +.ant-select-selection, +.ant-select-dropdown, +.ant-input:not(.logininput) { + background-color: #042b4f !important; + box-shadow: 0px 4px 6px 0px rgba(0, 0, 0, 0.44) !important; + border: solid 1px #1673cb !important; + border-radius: 0 !important; + color: #7ba7c6 !important; + font-size: 16px; +} + +.ant-input:hover:not(.logininput) { + + background-color: #042b4f !important; + box-shadow: 0px 4px 6px 0px rgba(0, 0, 0, 0.44) !important; + border: solid 1px #1673cb !important; + color: #7ba7c6; +} + +.ant-input:focus { + box-shadow: 0px 4px 6px 0px rgba(0, 0, 0, 0.44) !important; + color: #7ba7c6; +} + +input:-webkit-autofill { + box-shadow: none !important; + -webkit-text-fill-color: #d32424 !important; +} + +.ant-btn-cannel { + width: 60px !important; + height: 30px !important; + background-color: #658199 !important; + border: none !important; + color: #ffffff !important; + border-radius: 0 !important; +} + +.ant-btn-ok { + width: 60px !important; + height: 30px !important; + background-color: #1a89e7 !important; + border: none !important; + color: #ffffff !important; + border-radius: 0 !important; +} + +.footerButton { + display: flex; + justify-content: center; + align-items: center; + + .ant-btn { + margin: 0 10px; + } +} + +.ant-table-body table { + border-left: 1px solid #1877d0 !important; +} + +.ant-table-tbody tr:nth-child(odd)>th, +.ant-table-tbody tr:nth-child(odd)>td { + background-color: #042b4f; + color: #ffffff; +} + +.ant-table-tbody tr:nth-child(even)>th, +.ant-table-tbody tr:nth-child(even)>td { + background-color: #093a68; + color: #ffffff; +} + +.ant-table-tbody tr:hover>th, +.ant-table-tbody tr:hover>td { + background-color: #0c4377 !important; +} + +.ant-table-placeholder { + background-color: #042b4f !important; + border: 1px solid #1877d0 !important; + border-radius: 0 !important; +} + +.ant-table-placeholder .ant-empty-normal { + color: #ffffff !important; +} + +.ant-table-align-center, +.ant-table-thead tr th { + background-image: linear-gradient(0deg, #06478a 14%, #00aeff 100%), linear-gradient(#008aff, #008aff) !important; + background-blend-mode: normal, + normal; + color: #ffffff !important; +} + +.ant-table-bordered .ant-table-thead>tr>th, +.ant-table-bordered .ant-table-tbody>tr>td, +.ant-table-content .ant-table-thead>tr>th, +.ant-table-content .ant-table-tbody>tr>td { + border-right: 1px solid #1877d0 !important; + border-bottom: 1px solid #1877d0 !important; + line-height: 22px; + font-size: 14px; + border-radius: 0 !important; +} + + + +/* 滚动条优化 start */ +::-webkit-scrollbar { + width: 10px; + height: 8px; +} + +::-webkit-scrollbar-track { + background: #3a3d4e; + border-radius: 2px; +} + +::-webkit-scrollbar-thumb { + background: #717483; + border-radius: 10px; +} + +::-webkit-scrollbar-thumb:hover { + background: #717483; +} + +::-webkit-scrollbar-corner { + background: #3a3d4e; +} + +/* 滚动条优化 end */ +.ant-col { + margin-bottom: 6px; +} + +body { + // 打开滚动条固定显示 + overflow-y: hidden; + + &.colorWeak { + filter: invert(80%); + } +} \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/components/layouts/TabLayout.vue b/ant-design-vue-jeecg/src/components/layouts/TabLayout.vue index 4249c190..b3fad574 100644 --- a/ant-design-vue-jeecg/src/components/layouts/TabLayout.vue +++ b/ant-design-vue-jeecg/src/components/layouts/TabLayout.vue @@ -3,7 +3,7 @@ - {{ page.meta.title }} - -
+ --> +
diff --git a/ant-design-vue-jeecg/src/components/layouts/UserLayout.vue b/ant-design-vue-jeecg/src/components/layouts/UserLayout.vue index ca3de555..2819ca73 100644 --- a/ant-design-vue-jeecg/src/components/layouts/UserLayout.vue +++ b/ant-design-vue-jeecg/src/components/layouts/UserLayout.vue @@ -1,150 +1,35 @@ - \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue b/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue index 7b0aa51b..8f0b6f8b 100644 --- a/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue +++ b/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue @@ -1,64 +1,10 @@ + diff --git a/ant-design-vue-jeecg/src/views/dashboard/Monitor.vue b/ant-design-vue-jeecg/src/views/dashboard/Monitor.vue deleted file mode 100644 index 144e237e..00000000 --- a/ant-design-vue-jeecg/src/views/dashboard/Monitor.vue +++ /dev/null @@ -1,15 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/dashboard/Overview.vue b/ant-design-vue-jeecg/src/views/dashboard/Overview.vue new file mode 100644 index 00000000..cf7f2c94 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/dashboard/Overview.vue @@ -0,0 +1,991 @@ + + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/dashboard/config.js b/ant-design-vue-jeecg/src/views/dashboard/config.js new file mode 100644 index 00000000..7e8377b6 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/dashboard/config.js @@ -0,0 +1,36 @@ +export const CONTENT_WORD = { + centerTitle: '计算软件计算软件计算软件计算软件', + modalname1: '源项分析', + modalname2: '扩散分析', + modalname3: '剂量计算', + modalname4: '剂量评估', + modalname5: '路径优化', + modalname6: '报表展示', + modeChoosename1: '场景选择', + modename1: 'HXX', + modename2: 'HXX', + modename3: 'HXX', + modename4: '泄露', + modename5: '待开发', + modename6: '待开发', + modeChoosename2: '模式选择', + mode2name1: '精细模拟', + mode2name2: '快速评估', + data1name: '模板参数配置', + data2name: '气象数据管理', + data3name: 'xx模块', + data4name: 'WQ类型数据管理', + data5name: '地形数据管理', + data6name: '目标管理', + data7name: '机动与防护装备管理', + system1name: '用户管理', + system2name: '角色管理', + system3name: 'GIS工具箱管理', + system4name: '服务器监控', + system5name: '帮助文档', + gis1name: '待开发', + gis2name: '待开发', + gis3name: '待开发', + gis4name: '待开发', + gis5name: '待开发', + } \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/user/Login.vue b/ant-design-vue-jeecg/src/views/user/Login.vue index 3f6401ae..91f742fa 100644 --- a/ant-design-vue-jeecg/src/views/user/Login.vue +++ b/ant-design-vue-jeecg/src/views/user/Login.vue @@ -1,214 +1,177 @@ - \ No newline at end of file diff --git a/ant-design-vue-jeecg/vue.config.js b/ant-design-vue-jeecg/vue.config.js index dd1ecae9..76edd43c 100644 --- a/ant-design-vue-jeecg/vue.config.js +++ b/ant-design-vue-jeecg/vue.config.js @@ -108,7 +108,7 @@ module.exports = { /* 注意：jeecgboot前端做了改造，此处不需要配置跨域和后台接口（只需要改.env相关配置文件即可） issues/3462 很多人此处做了配置，导致刷新前端404问题，请一定注意*/ '/jeecg-boot': { - target: 'http://localhost:8080', + target: 'http://192.168.0.7:8080', ws: false, changeOrigin: true }, diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/listener/FileListener.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/listener/FileListener.java new file mode 100644 index 00000000..1e6eb8d8 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/listener/FileListener.java @@ -0,0 +1,102 @@ +package org.jeecg.modules.listener; + +import java.io.File; +import java.io.IOException; +import java.util.concurrent.TimeUnit; + +import org.apache.commons.io.filefilter.FileFilterUtils; +import org.apache.commons.io.filefilter.HiddenFileFilter; +import org.apache.commons.io.filefilter.IOFileFilter; +import org.apache.commons.io.monitor.FileAlterationListenerAdaptor; +import org.apache.commons.io.monitor.FileAlterationMonitor; +import org.apache.commons.io.monitor.FileAlterationObserver; + + +public class FileListener extends FileAlterationListenerAdaptor { + /** + * 文件创建执行 + */ + public void onFileCreate(File file) { + //也可以打印日志 + System.out.println("文件[新建]:" + file.getAbsolutePath()); + } + /** + * 文件创建修改 + */ + public void onFileChange(File file) { + System.out.println("文件[修改]:" + file.getAbsolutePath()); + //目标文件路径 + String str = "d:\\test\\est.txt"; + //如果被修改的是目标文件，执行自己的业务操作 + if(str.equals(file.getAbsolutePath())){ +// try { +// readTest.readAW(); +// } catch (IOException e) { +// e.printStackTrace(); +// } + } + } + /** + * 文件删除 + */ + public void onFileDelete(File file) { + + System.out.println("文件[删除]:" + file.getAbsolutePath()); + } + /** + * 目录创建 + */ + public void onDirectoryCreate(File directory) { + + System.out.println("[新建]:" + directory.getAbsolutePath()); + } + /** + * 目录修改 + */ + public void onDirectoryChange(File directory) { + System.out.println("[修改]:" + directory.getAbsolutePath()); + } + /** + * 目录删除 + */ + public void onDirectoryDelete(File directory) { + + System.out.println("[删除]:" + directory.getAbsolutePath()); + } + public void onStart(FileAlterationObserver observer) { + // TODO Auto-generated method stub + super.onStart(observer); + } + public void onStop(FileAlterationObserver observer) { + // TODO Auto-generated method stub + super.onStop(observer); + } + + public static void main(String[] args) throws Exception{ + // 监控目录 + String rootDir = "D://test"; + // 轮询间隔 + long interval = TimeUnit.SECONDS.toMillis(1); + // 创建过滤器 + IOFileFilter directories = FileFilterUtils.and( + // 只监听文件夹、目录 + FileFilterUtils.directoryFileFilter(), + // 此过滤器接受File隐藏的 + HiddenFileFilter.VISIBLE); + IOFileFilter files = FileFilterUtils.and( + // 只监听文件 + FileFilterUtils.fileFileFilter(), + // 只监听文件后缀为txt的文件 + FileFilterUtils.suffixFileFilter(".txt")); + IOFileFilter filter = FileFilterUtils.or(directories, files); + // 使用过滤器 + FileAlterationObserver observer = new FileAlterationObserver(new File(rootDir), filter); + //不使用过滤器 + //FileAlterationObserver observer = new FileAlterationObserver(new File(rootDir)); + observer.addListener(new FileListener()); + //创建文件变化监听器 + FileAlterationMonitor monitor = new FileAlterationMonitor(interval, observer); + // 开始监控 + monitor.start(); + } +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/listener/ReadTest.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/listener/ReadTest.java new file mode 100644 index 00000000..6b1980fd --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/listener/ReadTest.java @@ -0,0 +1,26 @@ +package org.jeecg.modules.listener; + +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; + +public class ReadTest { + //设置变量 记录上次读取位置 + private long num = 0; + + public void readAW() throws IOException { + File file = new File("d://test//est.txt"); + RandomAccessFile randomAccessFile = new RandomAccessFile(file,"rw"); + //将文件定位到偏移量所指位置，在该位置发生下一个读取或写入操作 + randomAccessFile.seek(num); + //获取按行读取的数据并落库 + String s = randomAccessFile.readLine(); + for(;s!= null;s = randomAccessFile.readLine()){ +// User user = new User(); +// user.setUserName(s); +// userServer.insertUser(user); + } + //重新计算偏移量，做下一次读取时的初始偏移量 + num= randomAccessFile.length(); + } +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizCityAim/controller/BizCityAimController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizCityAim/controller/BizCityAimController.java index adafbc23..cb68f2e3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizCityAim/controller/BizCityAimController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizCityAim/controller/BizCityAimController.java @@ -50,7 +50,7 @@ public class BizCityAimController extends JeecgController> queryPageList(BizCityAim bizCityAim, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="pageSize", defaultValue="10000") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizCityAim, req.getParameterMap()); Page page = new Page(pageNo, pageSize); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizFacilityAim/controller/BizFacilityAimController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizFacilityAim/controller/BizFacilityAimController.java index 4de37fa1..e13f9536 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizFacilityAim/controller/BizFacilityAimController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizFacilityAim/controller/BizFacilityAimController.java @@ -65,7 +65,7 @@ public class BizFacilityAimController extends JeecgController> queryPageList(BizFacilityAim bizFacilityAim, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="pageSize", defaultValue="10000") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizFacilityAim, req.getParameterMap()); Page page = new Page(pageNo, pageSize); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/controller/BizEngineeringController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/controller/BizEngineeringController.java index aece28eb..9020ff3e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/controller/BizEngineeringController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/controller/BizEngineeringController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; import java.util.List; -@Api(tags="BizEngineering") +@Api(tags="工程管理") @RestController @RequestMapping("/bizEngineering") @Slf4j @@ -34,6 +34,8 @@ public class BizEngineeringController { * * @return */ + @AutoLog(value = "工程管理-查询用户所有工程") + @ApiOperation(value="工程管理-查询用户所有工程", notes="工程管理-查询用户所有工程") @GetMapping(value = "/list") public Result> list() { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); @@ -64,8 +66,8 @@ public class BizEngineeringController { * @param bizEngineering * @return */ - @AutoLog(value = "BizEngineering-添加") - @ApiOperation(value="BizEngineering-添加", notes="BizEngineering-添加") + @AutoLog(value = "工程管理-添加") + @ApiOperation(value="工程管理-添加", notes="工程管理-添加") //@RequiresPermissions("bizWrf:biz_wrf:add") @PostMapping(value = "/add") public Result add(@RequestBody BizEngineering bizEngineering) { @@ -82,8 +84,8 @@ public class BizEngineeringController { * @param bizEngineering * @return */ - @AutoLog(value = "BizEngineering-编辑") - @ApiOperation(value="BizEngineering-编辑", notes="BizEngineering-编辑") + @AutoLog(value = "工程管理-编辑") + @ApiOperation(value="工程管理-编辑", notes="工程管理-编辑") //@RequiresPermissions("bizWrf:biz_wrf:add") @PutMapping(value = "/edit") public Result edit(@RequestBody BizEngineering bizEngineering) { @@ -107,12 +109,14 @@ public class BizEngineeringController { // } /** - * 查询选中工程 + * 查询最新工程 * * @return */ - @GetMapping(value = "/getBizEngineeringByState") - public Result getBizEngineeringByState() { - return Result.ok(bizEngineeringService.getBizEngineeringByState()); + @AutoLog(value = "工程管理-查询最新工程") + @ApiOperation(value="工程管理-查询最新工程", notes="工程管理-查询最新工程") + @GetMapping(value = "/getBizEngineeringByTime") + public Result getBizEngineeringByTime() { + return Result.ok(bizEngineeringService.getBizEngineeringByTime()); } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/service/IBizEngineeringService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/service/IBizEngineeringService.java index 59bb9eb6..c18306ec 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/service/IBizEngineeringService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/service/IBizEngineeringService.java @@ -4,5 +4,5 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.project.baseConfig.bizEngineering.entity.BizEngineering; public interface IBizEngineeringService extends IService { - BizEngineering getBizEngineeringByState(); + BizEngineering getBizEngineeringByTime(); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/service/impl/BizEngineeringServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/service/impl/BizEngineeringServiceImpl.java index 03a19e2c..68d46f32 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/service/impl/BizEngineeringServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/service/impl/BizEngineeringServiceImpl.java @@ -20,7 +20,7 @@ public class BizEngineeringServiceImpl extends ServiceImpl bizEngineerings = this.baseMapper.selectList(new LambdaQueryWrapper(). eq(BizEngineering::getCreateBy,sysUser.getUsername()). diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizNuclide/controller/BizNuclideController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizNuclide/controller/BizNuclideController.java index c723e226..3b801b71 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizNuclide/controller/BizNuclideController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizNuclide/controller/BizNuclideController.java @@ -50,7 +50,7 @@ public class BizNuclideController extends JeecgController> queryPageList(BizNuclide bizNuclide, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="pageSize", defaultValue="10000") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizNuclide, req.getParameterMap()); Page page = new Page(pageNo, pageSize); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizRole/controller/BizRoleController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizRole/controller/BizRoleController.java new file mode 100644 index 00000000..c028b5b7 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizRole/controller/BizRoleController.java @@ -0,0 +1,195 @@ +package org.jeecg.modules.project.baseConfig.bizRole.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.project.baseConfig.bizRole.entity.BizRole; +import org.jeecg.modules.project.baseConfig.bizRole.service.IBizRoleService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: Gis和角色权限管理表 + * @Author: jeecg-boot + * @Date: 2023-09-22 + * @Version: V1.0 + */ +@Api(tags="Gis和角色权限管理表") +@RestController +@RequestMapping("/bizRole/bizRole") +@Slf4j +public class BizRoleController extends JeecgController { + @Autowired + private IBizRoleService bizRoleService; + + /** + * 分页列表查询 + * + * @param bizRole + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "Gis和角色权限管理表-分页列表查询") + @ApiOperation(value="Gis和角色权限管理表-分页列表查询", notes="Gis和角色权限管理表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(BizRole bizRole, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10000") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizRole, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = bizRoleService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param bizRole + * @return + */ + @AutoLog(value = "Gis和角色权限管理表-添加") + @ApiOperation(value="Gis和角色权限管理表-添加", notes="Gis和角色权限管理表-添加") + @RequiresPermissions("bizRole:biz_role:add") + @PostMapping(value = "/add") + public Result add(@RequestBody BizRole bizRole) { + bizRoleService.save(bizRole); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param bizRole + * @return + */ + @AutoLog(value = "Gis和角色权限管理表-编辑") + @ApiOperation(value="Gis和角色权限管理表-编辑", notes="Gis和角色权限管理表-编辑") + @RequiresPermissions("bizRole:biz_role:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody BizRole bizRole) { + bizRoleService.updateById(bizRole); + return Result.OK("编辑成功!"); + } + + /** + * 批量编辑 + * + * @param bizRoles + * @return + */ + @AutoLog(value = "Gis和角色权限管理表-批量编辑") + @ApiOperation(value="Gis和角色权限管理表-批量编辑", notes="Gis和角色权限管理表-批量编辑") + @RequiresPermissions("bizRole:biz_role:editBatch") + @RequestMapping(value = "/editBatch", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result editBatch(@RequestBody List bizRoles) { + for (BizRole bizRole : bizRoles) { + bizRoleService.updateById(bizRole); + } + return Result.OK("批量编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "Gis和角色权限管理表-通过id删除") + @ApiOperation(value="Gis和角色权限管理表-通过id删除", notes="Gis和角色权限管理表-通过id删除") + @RequiresPermissions("bizRole:biz_role:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + bizRoleService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "Gis和角色权限管理表-批量删除") + @ApiOperation(value="Gis和角色权限管理表-批量删除", notes="Gis和角色权限管理表-批量删除") + @RequiresPermissions("bizRole:biz_role:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.bizRoleService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "Gis和角色权限管理表-通过id查询") + @ApiOperation(value="Gis和角色权限管理表-通过id查询", notes="Gis和角色权限管理表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + BizRole bizRole = bizRoleService.getById(id); + if(bizRole==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(bizRole); + } + + /** + * 导出excel + * + * @param request + * @param bizRole + */ + @RequiresPermissions("bizRole:biz_role:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, BizRole bizRole) { + return super.exportXls(request, bizRole, BizRole.class, "Gis和角色权限管理表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("bizRole:biz_role:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, BizRole.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizRole/entity/BizRole.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizRole/entity/BizRole.java new file mode 100644 index 00000000..3081b105 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizRole/entity/BizRole.java @@ -0,0 +1,67 @@ +package org.jeecg.modules.project.baseConfig.bizRole.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: Gis和角色权限管理表 + * @Author: jeecg-boot + * @Date: 2023-09-22 + * @Version: V1.0 + */ +@Data +@TableName("biz_role") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="biz_role对象", description="Gis和角色权限管理表") +public class BizRole implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**角色名称*/ + @Excel(name = "角色名称", width = 15) + @ApiModelProperty(value = "角色名称") + private String roleName; + /**角色权限*/ + @Excel(name = "角色权限", width = 15) + @ApiModelProperty(value = "角色权限") + private String rolePermission; + /**gis权限*/ + @Excel(name = "gis权限", width = 15) + @ApiModelProperty(value = "gis权限") + private String gisPermission; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizRole/mapper/BizRoleMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizRole/mapper/BizRoleMapper.java new file mode 100644 index 00000000..d537040c --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizRole/mapper/BizRoleMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.project.baseConfig.bizRole.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.project.baseConfig.bizRole.entity.BizRole; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: Gis和角色权限管理表 + * @Author: jeecg-boot + * @Date: 2023-09-22 + * @Version: V1.0 + */ +public interface BizRoleMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizRole/mapper/xml/BizRoleMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizRole/mapper/xml/BizRoleMapper.xml new file mode 100644 index 00000000..4d422861 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizRole/mapper/xml/BizRoleMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizRole/service/IBizRoleService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizRole/service/IBizRoleService.java new file mode 100644 index 00000000..8194c83c --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizRole/service/IBizRoleService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.project.baseConfig.bizRole.service; + +import org.jeecg.modules.project.baseConfig.bizRole.entity.BizRole; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: Gis和角色权限管理表 + * @Author: jeecg-boot + * @Date: 2023-09-22 + * @Version: V1.0 + */ +public interface IBizRoleService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizRole/service/impl/BizRoleServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizRole/service/impl/BizRoleServiceImpl.java new file mode 100644 index 00000000..67b9f923 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizRole/service/impl/BizRoleServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.project.baseConfig.bizRole.service.impl; + +import org.jeecg.modules.project.baseConfig.bizRole.entity.BizRole; +import org.jeecg.modules.project.baseConfig.bizRole.mapper.BizRoleMapper; +import org.jeecg.modules.project.baseConfig.bizRole.service.IBizRoleService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: Gis和角色权限管理表 + * @Author: jeecg-boot + * @Date: 2023-09-22 + * @Version: V1.0 + */ +@Service +public class BizRoleServiceImpl extends ServiceImpl implements IBizRoleService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizTopography/bizTopographyInfo/controller/BizTopographyInfoController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizTopography/bizTopographyInfo/controller/BizTopographyInfoController.java index a722e706..ab0f9777 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizTopography/bizTopographyInfo/controller/BizTopographyInfoController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizTopography/bizTopographyInfo/controller/BizTopographyInfoController.java @@ -50,7 +50,7 @@ public class BizTopographyInfoController extends JeecgController> queryPageList(BizTopographyInfo bizTopographyInfo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="pageSize", defaultValue="10000") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizTopographyInfo, req.getParameterMap()); Page page = new Page(pageNo, pageSize); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizWeapon/controller/BizWeaponController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizWeapon/controller/BizWeaponController.java index c7248d90..f3f88f3a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizWeapon/controller/BizWeaponController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizWeapon/controller/BizWeaponController.java @@ -50,7 +50,7 @@ public class BizWeaponController extends JeecgController> queryPageList(BizWeapon bizWeapon, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="pageSize", defaultValue="10000") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizWeapon, req.getParameterMap()); Page page = new Page(pageNo, pageSize); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentMotor/controller/BizEquipmentMotorController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentMotor/controller/BizEquipmentMotorController.java index 8409ee68..12c12c24 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentMotor/controller/BizEquipmentMotorController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentMotor/controller/BizEquipmentMotorController.java @@ -50,7 +50,7 @@ public class BizEquipmentMotorController extends JeecgController> queryPageList(BizEquipmentMotor bizEquipmentMotor, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="pageSize", defaultValue="10000") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizEquipmentMotor, req.getParameterMap()); Page page = new Page(pageNo, pageSize); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentProtection/controller/BizEquipmentProtectionController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentProtection/controller/BizEquipmentProtectionController.java index 052d7fc0..c3d66414 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentProtection/controller/BizEquipmentProtectionController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentProtection/controller/BizEquipmentProtectionController.java @@ -50,7 +50,7 @@ public class BizEquipmentProtectionController extends JeecgController> queryPageList(BizEquipmentProtection bizEquipmentProtection, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="pageSize", defaultValue="10000") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizEquipmentProtection, req.getParameterMap()); Page page = new Page(pageNo, pageSize); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/controller/BizWeatherForecastController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/controller/BizWeatherForecastController.java index d2de9123..d38f4c12 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/controller/BizWeatherForecastController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/controller/BizWeatherForecastController.java @@ -50,7 +50,7 @@ public class BizWeatherForecastController extends JeecgController> queryPageList(BizWeatherForecast bizWeatherForecast, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="pageSize", defaultValue="10000") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizWeatherForecast, req.getParameterMap()); Page page = new Page(pageNo, pageSize); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/entity/BizWeatherForecast.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/entity/BizWeatherForecast.java index c8f8ed8d..24deeb0e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/entity/BizWeatherForecast.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/entity/BizWeatherForecast.java @@ -63,8 +63,4 @@ public class BizWeatherForecast implements Serializable { @Excel(name = "预报文件路径", width = 15) @ApiModelProperty(value = "预报文件路径") private String forecastPath; - /**预报类别*/ - @Excel(name = "预报类别", width = 15) - @ApiModelProperty(value = "预报类别") - private Integer forecastType; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/controller/BizWeatherHistoryController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/controller/BizWeatherHistoryController.java index 5924694d..08f0d2b3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/controller/BizWeatherHistoryController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/controller/BizWeatherHistoryController.java @@ -50,7 +50,7 @@ public class BizWeatherHistoryController extends JeecgController> queryPageList(BizWeatherHistory bizWeatherHistory, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="pageSize", defaultValue="10000") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizWeatherHistory, req.getParameterMap()); Page page = new Page(pageNo, pageSize); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/entity/BizWeatherHistory.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/entity/BizWeatherHistory.java index b748ddc7..450c5d66 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/entity/BizWeatherHistory.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/entity/BizWeatherHistory.java @@ -58,9 +58,9 @@ public class BizWeatherHistory implements Serializable { @ApiModelProperty(value = "气象类别") private Integer weatherType; /**气象时间*/ - @Excel(name = "气象时间", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @Excel(name = "气象时间", width = 15, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "气象时间") private Date weatherTime; /**文件路径*/ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/controller/BizCmaqController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/controller/BizCmaqController.java index 924606ff..294f3c7a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/controller/BizCmaqController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/controller/BizCmaqController.java @@ -61,7 +61,7 @@ public class BizCmaqController extends JeecgController @GetMapping(value = "/list") public Result> queryPageList(BizCmaq bizCmaq, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="pageSize", defaultValue="10000") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizCmaq, req.getParameterMap()); Page page = new Page(pageNo, pageSize); @@ -216,11 +216,10 @@ public class BizCmaqController extends JeecgController * * @return */ - //@AutoLog(value = "cmaq-通过temType查询模板") @ApiOperation(value="cmaq-通过temType查询模板", notes="cmaq-通过temType查询模板") @GetMapping(value = "/getCmaqTem") - public Result getCmaqTem() { - BizCmaq bizCmaq = bizCmaqService.getOne(new LambdaQueryWrapper().eq(BizCmaq::getTemType,0)); + public Result getCmaqTem(Integer temType) { + BizCmaq bizCmaq = bizCmaqService.getOne(new LambdaQueryWrapper().eq(BizCmaq::getTemType,temType)); if(bizCmaq==null) { return Result.error("未找到对应数据"); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/service/impl/BizCmaqServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/service/impl/BizCmaqServiceImpl.java index c94bea01..3d006479 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/service/impl/BizCmaqServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/service/impl/BizCmaqServiceImpl.java @@ -212,7 +212,7 @@ public class BizCmaqServiceImpl extends ServiceImpl impl BizCmaq cmaq = getOne(new LambdaQueryWrapper().eq(BizCmaq::getEngineeringId,engineeringId)); BizOpenfoam openfoam = bizOpenfoamService.getOne(new LambdaQueryWrapper().eq(BizOpenfoam::getEngineeringId, engineeringId)); String allRunPath = baseHome + wrf.getCreateBy() + "/" + engineering.getEngineeringName() + "/"; - String targetFilePath = localFilePrefix + wrf.getCreateBy() + "/" + engineering.getEngineeringName() + "/" + "CCTM/"; + String targetFilePath = localFilePrefix + wrf.getCreateBy() + "/" + engineering.getEngineeringName() + "/"; String ymdFormat = "yyyy-MM-dd"; String yymdFormat = "yyMMdd"; @@ -251,14 +251,14 @@ public class BizCmaqServiceImpl extends ServiceImpl impl } try { // todo step2 cctm - String cctmFileName = genCctmShell(allRunPath,targetFilePath,newStartTime,newEndTime,cmaq.getSttime(), cmaq.getNsteps(), cmaq.getTstep()); + String cctmFileName = genCctmShell(allRunPath,targetFilePath + "CCTM/",newStartTime,newEndTime,cmaq.getSttime(), cmaq.getNsteps(), cmaq.getTstep()); // todo 执行cctm.csh runCmd(allRunPath + "CMAQ/","CCTM",cctmFileName); String ncName = "CCTM_ACONC_v532_2016_12SE1_"+newStartTime.replace("-","")+".nc"; String ncLocalName = "CCTM_ACONC_v532_2016_12SE1_"+DateUtil.format(new Date(startTimeSecs), ymdFormat).replace("-","")+".nc"; SFTPUtil sftpUtil = new SFTPUtil(); sftpUtil.login(username, password,ip,port); - sftpUtil.download(allRunPath + "CMAQ/data/output/v532_2016_12SE1/",ncName,localFilePrefix + ncLocalName); + sftpUtil.download(allRunPath + "CMAQ/data/output/v532_2016_12SE1/",ncName,targetFilePath + ncLocalName); sftpUtil.logout(); } catch (Exception e) { return false; @@ -273,15 +273,18 @@ public class BizCmaqServiceImpl extends ServiceImpl impl SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); BizEngineering bizEngineering = bizEngineeringService.getById(engineeringId); BizCmaq bizCmaq = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(BizCmaq::getEngineeringId,bizEngineering.getId())); + + String targetFilePath = localFilePrefix + bizCmaq.getCreateBy() + "/" + bizEngineering.getEngineeringName() + "/"; + if(bizCmaq != null) { // NetcdfFile griddot2d = NetcdfDataset.open("C:\\Users\\13673\\Desktop\\某源\\Nuclear\\file\\wrfout_d01_2016-07-01_00_00_00"); // NetcdfFile ncfile = NetcdfDataset.open("C:\\Users\\13673\\Desktop\\某源\\Nuclear\\file\\CCTM_ACONC_v532_2016_12SE1_20160701.nc"); String ncName = "CCTM_ACONC_v532_2016_12SE1_" + sdf.format(sdf.parse(bizCmaq.getStartDate())).replace("-", "") + ".nc"; - NetcdfFile ncfile = NetcdfDataset.open(localFilePrefix + ncName); + NetcdfFile ncfile = NetcdfDataset.open(targetFilePath + ncName); BizWrf bizWrf = bizWrfService.getOne(new LambdaQueryWrapper().eq(BizWrf::getEngineeringId, bizEngineering.getId())); String ncNameWrf = "wrfout_d01_" + bizWrf.getStartTime(); - NetcdfFile griddot2d = NetcdfDataset.open(localFilePrefix + ncNameWrf); + NetcdfFile griddot2d = NetcdfDataset.open(targetFilePath + ncNameWrf); List>> coAllList = getNCByName(ncfile, "CO", layer); List>> no2AllList = getNCByName(ncfile, "NO2", layer); List>> no3AllList = getNCByName(ncfile, "NO3", layer); @@ -324,6 +327,8 @@ public class BizCmaqServiceImpl extends ServiceImpl impl BizCmaq bizCmaq = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(BizCmaq::getEngineeringId,bizEngineering.getId())); BizWrf bizWrf = bizWrfService.getOne(new LambdaQueryWrapper().eq(BizWrf::getEngineeringId, bizEngineering.getId())); + String targetFilePath = localFilePrefix + bizCmaq.getCreateBy() + "/" + bizEngineering.getEngineeringName() + "/"; + String ymdFormat = "yyyy-MM-dd"; String format = "yyyy-MM-dd_hh:mm:ss"; DateTime startTime = DateUtil.parse(bizWrf.getStartTime(), format); @@ -335,7 +340,7 @@ public class BizCmaqServiceImpl extends ServiceImpl impl String newStartTime = DateUtil.format(new Date(startTimeSecs + oneDaySecs), ymdFormat); String ncName = "CCTM_ACONC_v532_2016_12SE1_" + newStartTime.replace("-", "") + ".nc"; try { - NetcdfFile ncfile = NetcdfDataset.open(localFilePrefix + ncName); + NetcdfFile ncfile = NetcdfDataset.open(targetFilePath + ncName); List variables = ncfile.getVariables(); variables.forEach(li ->{ variableNames.add(li.getShortName()); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigChemistry/controller/BizConfigChemistryController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigChemistry/controller/BizConfigChemistryController.java index 0fa1dccc..bb6d2e64 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigChemistry/controller/BizConfigChemistryController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigChemistry/controller/BizConfigChemistryController.java @@ -65,7 +65,7 @@ public class BizConfigChemistryController extends JeecgController> queryPageList(BizConfigChemistry bizConfigChemistry, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="pageSize", defaultValue="10000") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizConfigChemistry, req.getParameterMap()); Page page = new Page(pageNo, pageSize); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigFacility/controller/BizConfigFacilityController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigFacility/controller/BizConfigFacilityController.java index ad46ef53..8102e0f1 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigFacility/controller/BizConfigFacilityController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigFacility/controller/BizConfigFacilityController.java @@ -65,7 +65,7 @@ public class BizConfigFacilityController extends JeecgController> queryPageList(BizConfigFacility bizConfigFacility, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="pageSize", defaultValue="10000") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizConfigFacility, req.getParameterMap()); Page page = new Page(pageNo, pageSize); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigLeak/controller/BizConfigLeakController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigLeak/controller/BizConfigLeakController.java index 2854c0d1..c8ff3ea5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigLeak/controller/BizConfigLeakController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigLeak/controller/BizConfigLeakController.java @@ -65,7 +65,7 @@ public class BizConfigLeakController extends JeecgController> queryPageList(BizConfigLeak bizConfigLeak, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="pageSize", defaultValue="10000") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizConfigLeak, req.getParameterMap()); Page page = new Page(pageNo, pageSize); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigNucleus/controller/BizConfigNucleusController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigNucleus/controller/BizConfigNucleusController.java index 3ef6f9b4..fbc3e7ee 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigNucleus/controller/BizConfigNucleusController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigNucleus/controller/BizConfigNucleusController.java @@ -65,7 +65,7 @@ public class BizConfigNucleusController extends JeecgController> queryPageList(BizConfigNucleus bizConfigNucleus, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="pageSize", defaultValue="10000") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizConfigNucleus, req.getParameterMap()); Page page = new Page(pageNo, pageSize); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizOpenfoam/controller/BizOpenfoamController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizOpenfoam/controller/BizOpenfoamController.java index fa6723bf..a9d9df06 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizOpenfoam/controller/BizOpenfoamController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizOpenfoam/controller/BizOpenfoamController.java @@ -54,8 +54,8 @@ public class BizOpenfoamController extends JeecgController> queryPageList(BizOpenfoam bizOpenfoam, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="pageSize", defaultValue="10000") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizOpenfoam, req.getParameterMap()); Page page = new Page(pageNo, pageSize); @@ -145,7 +145,7 @@ public class BizOpenfoamController extends JeecgController().eq(BizOpenfoam::getEngineeringId,engineeringId)); - String openFoamPath = baseHome + "OpenFOAM/openfoam-8/run/" + openfoam.getCreateBy() + "/" + engineering.getEngineeringName(); + String openFoamPath = localFilePrefix + "OpenFOAM/" + openfoam.getCreateBy() + "/" + engineering.getEngineeringName(); String runCmd = String.format("cd %s;%s;",openFoamPath,openfoam.getFoam()); RemoteExecuteCommand.runRemoteLinuxCmd(ip, username, password, runCmd); return "运行成功"; @@ -185,7 +185,7 @@ public class BizOpenfoamController extends JeecgController().eq(BizWrf::getEngineeringId,engineeringId)); - String openFoamPath = baseHome + "OpenFOAM/openfoam-8/run/" + wrf.getCreateBy() + "/" + engineering.getEngineeringName(); + String openFoamPath = localFilePrefix + "OpenFOAM/" + wrf.getCreateBy() + "/" + engineering.getEngineeringName(); // String openFoamPath = "C:\\Users\\13673\\Desktop\\Nuclear\\file\\openfoam\\bak\\cylinder_U"; String systemPath = openFoamPath + "/system/"; @@ -233,7 +233,7 @@ public class BizOpenfoamController extends JeecgController getCoAndPecInfo(BizWrf wrf) { - String openFoamPath = baseHome + "OpenFOAM/openfoam-8/run/" + wrf.getEngineeringId(); + BizEngineering engineering = bizEngineeringService.getById(wrf.getEngineeringId()); + String openFoamPath = localFilePrefix + "OpenFOAM/" + wrf.getCreateBy() + "/" + engineering.getEngineeringName(); String stepFileName = getStepFileName(openFoamPath); try { diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/controller/BizWrfController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/controller/BizWrfController.java index 56b30799..7771c8bf 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/controller/BizWrfController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/controller/BizWrfController.java @@ -4,6 +4,7 @@ import java.io.*; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -16,6 +17,7 @@ import com.jcraft.jsch.SftpException; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.RemoteExecuteCommand; +import org.jeecg.modules.message.websocket.WebSocket; import org.jeecg.modules.project.baseConfig.bizEngineering.entity.BizEngineering; import org.jeecg.modules.project.baseConfig.bizEngineering.service.IBizEngineeringService; import org.jeecg.modules.project.calculateConfig.bizOpenfoam.entity.BizOpenfoam; @@ -61,9 +63,10 @@ public class BizWrfController extends JeecgController { private IBizWrfService bizWrfService; @Autowired private IBizOpenfoamService bizOpenfoamService; - @Autowired private IBizEngineeringService bizEngineeringService; + @Resource + private WebSocket webSocket; @Value("${spring.baseHome}") private String baseHome; @@ -102,7 +105,7 @@ public class BizWrfController extends JeecgController { @GetMapping(value = "/list") public Result> queryPageList(BizWrf bizWrf, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="pageSize", defaultValue="10000") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizWrf, req.getParameterMap()); Page page = new Page(pageNo, pageSize); @@ -139,13 +142,8 @@ public class BizWrfController extends JeecgController { BizEngineering engineering = bizEngineeringService.getById(bizWrf.getEngineeringId()); String newAllRunPath = String.format("%s%s/%s/", baseHome, bizWrf.getCreateBy(),engineering.getEngineeringName()); - File file = new File(newAllRunPath); - if (!file.exists()) { - file.mkdir(); - }else{ - RemoteExecuteCommand.runRemoteLinuxCmd(ip, username, password, String.format("rm -rf %s",newAllRunPath)); - file.mkdir(); - } + RemoteExecuteCommand.runRemoteLinuxCmd(ip, username, password, String.format("rm -rf %s",newAllRunPath)); + RemoteExecuteCommand.runRemoteLinuxCmd(ip, username, password, String.format("mkdir %s",baseHome + bizWrf.getCreateBy())); String runCmd = String.format("cp -r %sAll_Run %s", baseHome, newAllRunPath); RemoteExecuteCommand.runRemoteLinuxCmd(ip, username, password, runCmd); saveWpsFile(bizWrf,engineering.getEngineeringName()); @@ -390,10 +388,11 @@ public class BizWrfController extends JeecgController { SFTPUtil sftpUtil = new SFTPUtil(); sftpUtil.login(username, password,ip,port); -// sftpUtil.download(allRunPath + "WRF/run/","rsl.out.0000",localFilePrefix + "rsl.out.0000"); - sftpUtil.download(allRunPath + "WRF/run","wrf.log",localFilePath + "wrf.log"); + sftpUtil.download(allRunPath + "WRF/run/","rsl.out.0000",localFilePath + "rsl.out.0000"); +// sftpUtil.download(allRunPath + "WRF/run","wrf.log",localFilePath + "wrf.log"); sftpUtil.logout(); - String wrfLog = new String(readAllBytes(get(localFilePath + "wrf.log"))); +// String wrfLog = new String(readAllBytes(get(localFilePath + "wrf.log"))); + String wrfLog = new String(readAllBytes(get(localFilePath + "rsl.out.0000"))); // String wrfLog = new String(readAllBytes(get("C:\\Users\\13673\\Desktop\\Nuclear\\file\\wrf.log"))); return Result.OK(wrfLog); }catch (Exception e){ @@ -644,8 +643,8 @@ public class BizWrfController extends JeecgController { //@AutoLog(value = "wrf-通过temType查询模板") @ApiOperation(value="wrf-通过temType查询模板", notes="wrf-通过temType查询模板") @GetMapping(value = "/getWrfTem") - public Result getWrfTem() { - BizWrf bizWrf = bizWrfService.getOne(new LambdaQueryWrapper().eq(BizWrf::getTemType,0)); + public Result getWrfTem(Integer temType) { + BizWrf bizWrf = bizWrfService.getOne(new LambdaQueryWrapper().eq(BizWrf::getTemType,temType)); if(bizWrf==null) { return Result.error("未找到对应数据"); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/entity/BizWrf.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/entity/BizWrf.java index e0e8db32..40023a16 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/entity/BizWrf.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/entity/BizWrf.java @@ -171,7 +171,7 @@ public class BizWrf implements Serializable { @ApiModelProperty(value = "yIndex") private int yIndex; @Excel(name = "temType", width = 15) - @ApiModelProperty(value = "temType") + @ApiModelProperty(value = "temType(模板:0,核:1,设施:2,化学:3,泄露:4)") private int temType; /* diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDiffuse/controller/BizResultDiffuseController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDiffuse/controller/BizResultDiffuseController.java index aef1ba84..2a58db7d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDiffuse/controller/BizResultDiffuseController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDiffuse/controller/BizResultDiffuseController.java @@ -67,7 +67,7 @@ public class BizResultDiffuseController extends JeecgController> queryPageList(BizResultDiffuse bizResultDiffuse, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="pageSize", defaultValue="10000") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizResultDiffuse, req.getParameterMap()); Page page = new Page(pageNo, pageSize); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDosage/controller/BizResultDosageController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDosage/controller/BizResultDosageController.java index b0421fb8..8570b3f3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDosage/controller/BizResultDosageController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDosage/controller/BizResultDosageController.java @@ -68,7 +68,7 @@ public class BizResultDosageController extends JeecgController> queryPageList(BizResultDosage bizResultDosage, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="pageSize", defaultValue="10000") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizResultDosage, req.getParameterMap()); Page page = new Page(pageNo, pageSize); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultOptimize/controller/BizResultOptimizeController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultOptimize/controller/BizResultOptimizeController.java index 50f83428..2635d4ec 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultOptimize/controller/BizResultOptimizeController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultOptimize/controller/BizResultOptimizeController.java @@ -68,7 +68,7 @@ public class BizResultOptimizeController extends JeecgController> queryPageList(BizResultOptimize bizResultOptimize, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="pageSize", defaultValue="10000") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizResultOptimize, req.getParameterMap()); Page page = new Page(pageNo, pageSize); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultSourceItem/controller/BizResultSourceItemController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultSourceItem/controller/BizResultSourceItemController.java index 6889b068..5a4353dd 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultSourceItem/controller/BizResultSourceItemController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultSourceItem/controller/BizResultSourceItemController.java @@ -68,7 +68,7 @@ public class BizResultSourceItemController extends JeecgController> queryPageList(BizResultSourceItem bizResultSourceItem, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="pageSize", defaultValue="10000") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizResultSourceItem, req.getParameterMap()); Page page = new Page(pageNo, pageSize); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index fa76eae9..3e8096a9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -26,6 +26,8 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.*; +import org.jeecg.modules.project.baseConfig.bizRole.entity.BizRole; +import org.jeecg.modules.project.baseConfig.bizRole.service.IBizRoleService; import org.jeecg.modules.system.entity.*; import org.jeecg.modules.system.model.DepartIdModel; import org.jeecg.modules.system.model.SysUserSysDepartModel; @@ -101,6 +103,9 @@ public class SysUserController { @Autowired private ISysUserTenantService userTenantService; + @Autowired + private IBizRoleService bizRoleService; + /** * 获取租户下用户数据（支持租户隔离） * @param user @@ -128,7 +133,15 @@ public class SysUserController { //update-end---author:wangshuai ---date:20221223 for：[QQYUN-3371]租户逻辑改造，改成关系表------------ } //------------------------------------------------------------------------------------------------ - return sysUserService.queryPageList(req, queryWrapper, pageSize, pageNo); + Result> iPageResult = sysUserService.queryPageList(req, queryWrapper, pageSize, pageNo); + List records = iPageResult.getResult().getRecords(); + List bizRoles = bizRoleService.list(); + Map roleMap = bizRoles.stream().collect(Collectors.toMap(BizRole::getId, BizRole::getRoleName)); + for (SysUser record : records) { + record.setRoleName(roleMap.get(record.getRoleId())); + } + iPageResult.getResult().setRecords(records); + return iPageResult; } /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java index 7f9f4575..bbcfb069 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java @@ -204,4 +204,15 @@ public class SysUser implements Serializable { * 流程状态 */ private String bpmStatus; + + /** + * Gis和角色权限管理表ID + */ + private String roleId; + + /** + * Gis和角色权限管理表名称 + */ + @TableField(exist = false) + private String roleName; } diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index f71ee852..a4053121 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8088 + port: 8080 tomcat: max-swallow-size: -1 error: @@ -21,8 +21,8 @@ management: spring: baseHome: /home/wmhr/ - cshTemFielPath: /home/wmhr/java/tem/ - localFilePrefix: /home/wmhr/java/file/ + cshTemFielPath: C:\Users\Administrator\Desktop\tem\ + localFilePrefix: C:\Users\Administrator\Desktop\resultFile\ WRF: geog_data_path: /home/wmhr/Build_WRF/WPS_GEOG fnldataPath: /home/wmhr/Build_WRF/WPS/fnldata/