底图管理相关接口优化提交

onemap-modules/onemap-overlap/src/main/java/com/onemap/overlap/controller/DataController.java

@@ -407,9 +407,9 @@ public class DataController {
      * @return
      */
     @PostMapping("/basemap")
-    public RequestResult basemap(MultipartFile file, String name, String invalid, String serviceuri, String id, String image) {
+    public RequestResult basemap(MultipartFile file, String name, String invalid, String serviceuri, String id, String image, String indexnum) {
         try {
-            return dataService.basemap(file, name, invalid, serviceuri, id, image);
+            return dataService.basemap(file, name, invalid, serviceuri, id, image, indexnum);
         } catch (Exception e) {
             e.printStackTrace();
             return RequestResult.error("失败", null);

onemap-modules/onemap-overlap/src/main/java/com/onemap/overlap/service/DataService.java

@@ -62,7 +62,7 @@ public interface DataService {
 
     RequestResult upload(MultipartFile file);
 
-    RequestResult basemap(MultipartFile file, String name, String invalid, String serviceuri, String id, String image);
+    RequestResult basemap(MultipartFile file, String name, String invalid, String serviceuri, String id, String image, String indexnum);
 
     RequestResult getbasemap(String name, String invalid);
 

onemap-modules/onemap-overlap/src/main/java/com/onemap/overlap/service/impl/DataImp.java

@@ -1037,7 +1037,7 @@ public class DataImp implements DataService {
     }
 
     @Override
-    public RequestResult basemap(MultipartFile file, String name, String invalid, String serviceuri, String id, String image) {
+    public RequestResult basemap(MultipartFile file, String name, String invalid, String serviceuri, String id, String image, String indexnum) {
         String imageuri = "";
         if (file != null) {
             String filename = file.getOriginalFilename();
@@ -1059,8 +1059,8 @@ public class DataImp implements DataService {
                 String deleteSQL = String.format("delete from t_basemap where id = '%s'", id);
                 statement.execute(deleteSQL);
             }
-            String insertSQL = String.format("insert into t_basemap (image, name , invalid, serviceuri) values ('%s', '%s','%s','%s')",
-                    imageuri, name, invalid, serviceuri);
+            String insertSQL = String.format("insert into t_basemap (image, name , invalid, serviceuri, indexnum) values ('%s', '%s','%s','%s','%s')",
+                    imageuri, name, invalid, serviceuri, indexnum);
             statement.execute(insertSQL);
             statement.close();
             connection.close();
@@ -1079,10 +1079,11 @@ public class DataImp implements DataService {
             if (StringUtils.isEmpty(name)) {
                 name = "";
             }
-            String querySQL = "select * from t_basemap where name like '%" + name + "%'" ;
-            if (StringUtils.isNotEmpty(invalid)){
+            String querySQL = "select * from t_basemap where name like '%" + name + "%' ";
+            if (StringUtils.isNotEmpty(invalid)) {
                 querySQL += " and invalid = '" + invalid + "'";
             }
+            querySQL += " order by indexnum";
             ResultSet resultSet = statement.executeQuery(querySQL);
             List<Map> res = new ArrayList<Map>();
             while (resultSet.next()) {
@@ -1092,6 +1093,7 @@ public class DataImp implements DataService {
                 cur.put("invalid", resultSet.getString("invalid"));
                 cur.put("serviceuri", resultSet.getString("serviceuri"));
                 cur.put("name", resultSet.getString("name"));
+                cur.put("indexnum", resultSet.getString("indexnum"));
                 res.add(cur);
             }
             resultSet.close();