data/db_tab.sql | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/lf/server/controller/show/ExportController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/lf/server/service/show/ExportService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/lf/server/service/show/MarkService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
说明.txt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
data/db_tab.sql
@@ -788,7 +788,7 @@ comment on table lf.sys_download is 'ä¸è½½è®°å½è¡¨'; comment on column lf.sys_download.id is '主é®ID'; comment on column lf.sys_download.name is 'åç§°'; comment on column lf.sys_download.type is 'ç±»åï¼1-ä¸è½½æ°æ®,2-ä¸è½½ä¸é¢å¾'; comment on column lf.sys_download.type is 'ç±»åï¼1-ShapeFileï¼2-ä¸é¢å¾'; comment on column lf.sys_download.depid is 'åä½ID'; comment on column lf.sys_download.dcount is 'ä¸è½½æ¬¡æ°'; comment on column lf.sys_download.pwd is 'MD5'; src/main/java/com/lf/server/controller/show/ExportController.java
@@ -7,7 +7,6 @@ import com.lf.server.entity.show.ExportEntity; import com.lf.server.entity.sys.UserEntity; import com.lf.server.helper.StringHelper; import com.lf.server.service.data.DownloadService; import com.lf.server.service.show.ExportService; import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; @@ -33,9 +32,6 @@ @Autowired TokenService tokenService; @Autowired DownloadService downloadService; @SysLog() @ApiOperation(value = "å页æ¥è¯¢") @@ -81,14 +77,12 @@ return fail("ç¨æ·æªç»å½"); } String str = exportService.post(entity); String str = exportService.post(ue, entity); if (StringHelper.isNull(str)) { return fail("åºå¾å¤±è´¥"); } // return success(str); return success("åºå¾æå", str); } catch (Exception ex) { return fail(ex.getMessage()); } src/main/java/com/lf/server/service/show/ExportService.java
@@ -2,18 +2,21 @@ import com.alibaba.fastjson.JSON; import com.lf.server.entity.all.ResponseMsg; import com.lf.server.entity.data.DownloadEntity; import com.lf.server.entity.show.ExportEntity; import com.lf.server.entity.sys.UserEntity; import com.lf.server.helper.FileHelper; import com.lf.server.helper.PathHelper; import com.lf.server.helper.RestHelper; import com.lf.server.helper.StringHelper; import org.apache.http.NameValuePair; import org.apache.http.message.BasicNameValuePair; import com.lf.server.service.data.DownloadService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.io.File; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; /** @@ -25,8 +28,22 @@ @Value("${sys.path.exportServer}") private String exportServer; public String post(ExportEntity entity) { Map<String, Object> map = getPostEntity(entity); @Autowired PathHelper pathHelper; @Autowired DownloadService downloadService; /** * POST请æ±åºå¾æå¡ * * @param ue ç¨æ·ç±» * @param entity å¨çº¿å¶å¾ç±» * @return æå * @throws Exception */ public String post(UserEntity ue, ExportEntity entity) throws Exception { Map<String, Object> map = getMapData(entity); String url = exportServer + "/Export/Start"; String str = RestHelper.postForRest(url, map); @@ -39,10 +56,22 @@ return null; } return msg.getResult(); String file = pathHelper.getConfig().getDownloadPath() + File.separator + msg.getResult(); File f = new File(file); if (!f.exists() && !f.isDirectory()) { return null; } DownloadEntity de = getDownloadEntity(ue, file); int rows = downloadService.insert(de); return rows > 0 ? de.getGuid() : null; } private Map<String, Object> getPostEntity(ExportEntity entity) { /** * è·åMapæ°æ® */ private Map<String, Object> getMapData(ExportEntity entity) { Map<String, Object> map = new HashMap<String, Object>(); Field[] fields = entity.getClass().getDeclaredFields(); @@ -63,4 +92,23 @@ return map; } /** * è·åä¸è½½å®ä½ç±» */ private DownloadEntity getDownloadEntity(UserEntity ue, String file) throws Exception { DownloadEntity de = new DownloadEntity(); de.setName(FileHelper.getFileName(file)); de.setType(2); de.setDepid(ue.getDepid()); de.setDcount(0); // de.setPwd(null) de.setUrl(FileHelper.getRelativePath(file)); de.setDescr("ä¸é¢å¾æä»¶"); de.setGuid(FileHelper.getFileMd5(file)); de.setCreateUser(ue.getId()); // de.setGeom(null) return de; } } src/main/java/com/lf/server/service/show/MarkService.java
@@ -181,7 +181,7 @@ de.setDcount(0); // de.setPwd(null) de.setUrl(FileHelper.getRelativePath(file)); de.setDescr("ä¸è½½ShapeFileæä»¶"); de.setDescr("ShapeFileæä»¶"); de.setGuid(FileHelper.getFileMd5(file)); de.setCreateUser(ue.getId()); // de.setGeom(null) ˵Ã÷.txt
@@ -39,9 +39,9 @@ 38.å¼åæ ¹æ®å®ä½åç§°è¿è¡å¨æå页æ¥è¯¢ 39.å¼åæ ¹æ®å®ä½åç§°+åæ®µ+弿¨¡ç³æç´¢å10æ¡è®°å½ 40.å¼åæ ¹æ®å®ä½åç§°æ¥è¯¢ç©ºé´è¡¨çWKTè®°å½ 41.æå»ºQGIS+Pythonå¼åç¯å¢ < 42. 43. 41.æå»ºQGIS+Pythonå¼åç¯å¢ 42.å¼åæ ¹æ®åç§°æ¨¡ç³æç´¢ç¨æ·ãåä½çå10æ¡è®°å½ 43.æå»ºQGISå·¥ç¨ï¼ä½¿ç¨Pythonè¿è¡å·¥ç¨ < 44. 45. 46. @@ -50,10 +50,8 @@ 49. 50. ----------------------------------------------- .å¼åæ ¹æ®åç§°æ¨¡ç³æç´¢ç¨æ·ãåä½çå10æ¡è®°å½ .å¼åæ ¹æ®æ ç»JSONæ°æ®çæshpæä»¶å¹¶ä¸è½½ .å¼åä¸ä¼ shpæä»¶è½¬æ¢ä¸ºJSONæ°æ®æ¥å£ .æå»ºQGISå·¥ç¨ï¼ä½¿ç¨Pythonè¿è¡å·¥ç¨ .å建QGISåºå¾æ¨¡æ¿ .å¼åPythonåºå¾åè½ .å¼åQGISåºå¾çC#æå¡