Selaa lähdekoodia

增加下载模板

liutao 3 päivää sitten
vanhempi
commit
52d2f3ce6d

+ 2 - 0
.gitignore

@@ -3,3 +3,5 @@ dist
 log
 log
 target
 target
 .idea
 .idea
+YHYZT/server/pom-xml-flattened
+YHYZT/server/pom-xml-flattened

+ 11 - 4
YHYZT/client/public/config.js

@@ -6,6 +6,12 @@ window.ApplicationConfig = {
   zhmhUrl: 'http://localhost:8088/#/yh-yzt/data-center',
   zhmhUrl: 'http://localhost:8088/#/yh-yzt/data-center',
   sysTitle: '余杭区一张图系统',
   sysTitle: '余杭区一张图系统',
   loginTitle: '余杭自然资源',
   loginTitle: '余杭自然资源',
+  templateUrls: {
+    gd: 'http://60.191.110.205:18099/files/gd.zip',
+    lsyd: 'http://60.191.110.205:18099/files/lsyd.zip',
+    nzy: 'http://60.191.110.205:18099/files/nzy.zip',
+    ssnyd: 'http://60.191.110.205:18099/files/ssnyd.zip'
+  },
   mapLayerConfig: {
   mapLayerConfig: {
     use: "outerNet",
     use: "outerNet",
     projection: {
     projection: {
@@ -192,7 +198,7 @@ window.ApplicationConfig = {
               enabled: true,
               enabled: true,
               visible: true,
               visible: true,
               serverType: "dynamic",
               serverType: "dynamic",
-              url: "http://60.191.110.204:6080/arcgis/rest/services/yh_yzt/YHYZT_PEWG_NEW/MapServer",
+              url: "http://60.191.110.204:6080/arcgis/rest/services/PEWG/MapServer",
               params: {
               params: {
                 layers: "show:0,1",
                 layers: "show:0,1",
                 layerDefs: {}
                 layerDefs: {}
@@ -216,7 +222,7 @@ window.ApplicationConfig = {
               enabled: true,
               enabled: true,
               visible: true,
               visible: true,
               serverType: "dynamic",
               serverType: "dynamic",
-              url: "http://60.191.110.204:6080/arcgis/rest/services/yh_yzt/YHYZT_ST_GDDK_NEW/MapServer",
+              url: "http://60.191.110.204:6080/arcgis/rest/services/ST_GDDK/MapServer",
               params: {
               params: {
                 layers: "show:0,1",
                 layers: "show:0,1",
                 layerDefs: {}
                 layerDefs: {}
@@ -229,7 +235,7 @@ window.ApplicationConfig = {
               visible: false,
               visible: false,
               opacity: 0.8,
               opacity: 0.8,
               serverType: "dynamic",
               serverType: "dynamic",
-              url: "http://60.191.110.204:6080/arcgis/rest/services/yh_yzt/YHYZT_LSYD/MapServer"
+              url: "http://60.191.110.204:6080/arcgis/rest/services/LSYD/MapServer"
             },
             },
             {
             {
               id: "YHYZT_SSNYD",
               id: "YHYZT_SSNYD",
@@ -238,7 +244,7 @@ window.ApplicationConfig = {
               visible: false,
               visible: false,
               opacity: 0.8,
               opacity: 0.8,
               serverType: "dynamic",
               serverType: "dynamic",
-              url: "http://60.191.110.204:6080/arcgis/rest/services/yh_yzt/SSNYD/MapServer"
+              url: "http://60.191.110.204:6080/arcgis/rest/services/SSNYD/MapServer"
             },
             },
             {
             {
               id: "YHYZT_KC_TKQ",
               id: "YHYZT_KC_TKQ",
@@ -311,6 +317,7 @@ window.ApplicationConfig = {
       { label: '余杭区', value: '330110' },
       { label: '余杭区', value: '330110' },
     ]
     ]
   },
   },
+
   mapFieldConfig: {
   mapFieldConfig: {
     "layersData": [
     "layersData": [
       { "name": "供地地块", "value": "st_gddk", "serverName": "供地数据", "serverId": "YHYZT_ST_GDDK_NEW", "isAnal": true },
       { "name": "供地地块", "value": "st_gddk", "serverName": "供地数据", "serverId": "YHYZT_ST_GDDK_NEW", "isAnal": true },

+ 6 - 1
YHYZT/client/src/views/DataManage/Gd.vue

@@ -68,12 +68,13 @@
                             :limit="3"
                             :limit="3"
                             :on-exceed="2"
                             :on-exceed="2"
                             accept=".zip">
                             accept=".zip">
-                          批量导入  
+                        批量导入  
                         </el-upload>
                         </el-upload>
                       </el-dropdown-item>
                       </el-dropdown-item>
                     </el-dropdown-menu>
                     </el-dropdown-menu>
                   </el-dropdown>
                   </el-dropdown>
                 </div>
                 </div>
+                <el-button type="primary" @click="downloadTemplate" style="margin-left: 12px">模板下载</el-button>
               </div>
               </div>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
@@ -333,6 +334,10 @@ export default {
       })
       })
           .catch(error => console.error(error.stack))
           .catch(error => console.error(error.stack))
     },
     },
+    downloadTemplate() {
+      // 模板下载地址
+      window.open(window.ApplicationConfig.templateUrls.gd);
+    }
   }
   }
 }
 }
 </script>
 </script>

+ 6 - 1
YHYZT/client/src/views/DataManage/Lsyd.vue

@@ -69,12 +69,13 @@
                             :limit="3"
                             :limit="3"
                             :on-exceed="2"
                             :on-exceed="2"
                             accept=".zip">
                             accept=".zip">
-                        &nbsp;&nbsp;批量导入&nbsp;&nbsp;
+                        批量导入&nbsp;&nbsp;
                         </el-upload>
                         </el-upload>
                       </el-dropdown-item>
                       </el-dropdown-item>
                     </el-dropdown-menu>
                     </el-dropdown-menu>
                   </el-dropdown>
                   </el-dropdown>
                 </div>
                 </div>
+                <el-button type="primary" @click="downloadTemplate" style="margin-left: 12px">模板下载</el-button>
               </div>
               </div>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
@@ -309,6 +310,10 @@ export default {
         console.error(error);
         console.error(error);
       });
       });
     },
     },
+    downloadTemplate() {
+      // 模板下载地址
+      window.open(window.ApplicationConfig.templateUrls.lsyd);
+    }
   }
   }
 }
 }
 </script>
 </script>

+ 6 - 1
YHYZT/client/src/views/DataManage/Nzy.vue

@@ -75,12 +75,13 @@
                             :limit="3"
                             :limit="3"
                             :on-exceed="2"
                             :on-exceed="2"
                             accept=".zip">
                             accept=".zip">
-                        &nbsp;&nbsp;批量导入&nbsp;&nbsp;
+                        批量导入&nbsp;&nbsp;
                         </el-upload>
                         </el-upload>
                       </el-dropdown-item>
                       </el-dropdown-item>
                     </el-dropdown-menu>
                     </el-dropdown-menu>
                   </el-dropdown>
                   </el-dropdown>
                 </div>
                 </div>
+                <el-button type="primary" @click="downloadTemplate" style="margin-left: 12px">模板下载</el-button>
               </div>
               </div>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
@@ -346,6 +347,10 @@ export default {
       })
       })
           .catch(error => console.error(error.stack))
           .catch(error => console.error(error.stack))
     },
     },
+    downloadTemplate() {
+      // 模板下载地址
+      window.open(window.ApplicationConfig.templateUrls.nzy);
+    }
   }
   }
 }
 }
 </script>
 </script>

+ 6 - 1
YHYZT/client/src/views/DataManage/Ssnyd.vue

@@ -68,12 +68,13 @@
                             :limit="3"
                             :limit="3"
                             :on-exceed="2"
                             :on-exceed="2"
                             accept=".zip">
                             accept=".zip">
-                        &nbsp;&nbsp;批量导入&nbsp;&nbsp;
+                        批量导入&nbsp;&nbsp;
                         </el-upload>
                         </el-upload>
                       </el-dropdown-item>
                       </el-dropdown-item>
                     </el-dropdown-menu>
                     </el-dropdown-menu>
                   </el-dropdown>
                   </el-dropdown>
                 </div>
                 </div>
+                <el-button type="primary" @click="downloadTemplate" style="margin-left: 12px">模板下载</el-button>
               </div>
               </div>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
@@ -324,6 +325,10 @@ export default {
         console.error(error);
         console.error(error);
       });
       });
     },
     },
+    downloadTemplate() {
+      // 模板下载地址
+      window.open(window.ApplicationConfig.templateUrls.ssnyd);
+    }
   }
   }
 }
 }
 </script>
 </script>

+ 3 - 3
YHYZT/server/pom-xml-flattened

@@ -30,8 +30,8 @@
       <version>${tinker.version}</version>
       <version>${tinker.version}</version>
       <exclusions>
       <exclusions>
         <exclusion>
         <exclusion>
-          <groupId>com.github.jsqlparser</groupId>
           <artifactId>jsqlparser</artifactId>
           <artifactId>jsqlparser</artifactId>
+          <groupId>com.github.jsqlparser</groupId>
         </exclusion>
         </exclusion>
       </exclusions>
       </exclusions>
     </dependency>
     </dependency>
@@ -69,8 +69,8 @@
       <version>3.8</version>
       <version>3.8</version>
       <exclusions>
       <exclusions>
         <exclusion>
         <exclusion>
-          <groupId>commons-codec</groupId>
           <artifactId>commons-codec</artifactId>
           <artifactId>commons-codec</artifactId>
+          <groupId>commons-codec</groupId>
         </exclusion>
         </exclusion>
       </exclusions>
       </exclusions>
     </dependency>
     </dependency>
@@ -110,8 +110,8 @@
       <version>19.0</version>
       <version>19.0</version>
       <exclusions>
       <exclusions>
         <exclusion>
         <exclusion>
-          <groupId>jsqlparser</groupId>
           <artifactId>jsqlparser</artifactId>
           <artifactId>jsqlparser</artifactId>
+          <groupId>jsqlparser</groupId>
         </exclusion>
         </exclusion>
       </exclusions>
       </exclusions>
     </dependency>
     </dependency>

+ 1 - 1
YHYZT/server/src/main/resources/application.yml

@@ -31,5 +31,5 @@ jwt:
   token-header: ZJUGIS-Authorization
   token-header: ZJUGIS-Authorization
   header-prefix:
   header-prefix:
   # 过期时间 2 小时
   # 过期时间 2 小时
-  expiration: 7200
+  expiration: 86400
   secret: sdewecdwqewecxc&1adas
   secret: sdewecdwqewecxc&1adas