bug 修复，sql整合

src/main/java/com/elephant/framework/galaxy/aroad/module/system/controller/DeptController.java

@@ -6,7 +6,9 @@ import com.elephant.framework.galaxy.aroad.module.common.controller.BaseControll
 import com.elephant.framework.galaxy.aroad.module.system.entity.Dept;
 import com.elephant.framework.galaxy.aroad.module.system.service.DeptService;
 import com.elephant.framework.galaxy.aroad.response.R;
+import io.swagger.models.auth.In;
 import lombok.AllArgsConstructor;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -110,5 +112,26 @@ public class DeptController extends BaseController {
     public R isProvince(@PathVariable Integer deptId){
         return new R(deptService.isProvince(deptId));
     }
+    /**
+     * @Description: 根据ids，返回name
+     * @Param: [ids]
+     * @Date: 2019/6/21
+     */
+    @GetMapping("/getName/{ids}")
+    public String getNameByids(@PathVariable String ids){
+        String names="";
+        if (StringUtils.isNotEmpty(ids)) {
+            String[] id_arr = ids.split(",");
+            for (int i = 0; i <id_arr.length ; i++) {
+                names +=deptService.getById(Integer.parseInt(id_arr[i])).getName();
+                if (i<id_arr.length-1){
+                    names+=",";
+                }
+            }
+        }
+        System.out.println(names);
+        return names;
+    }
+
 }
 

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/service/impl/ZhjcGhjhFghjdzbServiceImpl.java

@@ -33,12 +33,9 @@ public class ZhjcGhjhFghjdzbServiceImpl extends ServiceImpl<ZhjcGhjhFghjdzbMappe
      */
     @Transactional
     public Boolean addFGhjdzb(ZhjcGhjhFghjdzb new_zb) {
-        ZhjcGhjhFghjdzb old_zb = zhjcGhjhFghjdzbMapper.selectOne(Wrappers.<ZhjcGhjhFghjdzb>query().lambda().eq(ZhjcGhjhFghjdzb::getXmid,new_zb.getXmid()));
-         if (old_zb!=null){
-             zhjcGhjhFghjdzbMapper.deleteById(old_zb);
-         }
-        String shape = zhjcGhjhGhjdzbService.shapeConversion(new_zb.getGeomfeature());
-        new_zb.setGeomfeature(shape.substring(1, shape.length()-1));
+       // ZhjcGhjhFghjdzb old_zb = zhjcGhjhFghjdzbMapper.selectOne(Wrappers.<ZhjcGhjhFghjdzb>query().lambda().eq(ZhjcGhjhFghjdzb::getXmid,new_zb.getXmid()));
+//        String shape = zhjcGhjhGhjdzbService.shapeConversion(new_zb.getGeomfeature());
+//        new_zb.setGeomfeature(shape.substring(1, shape.length()-1));
         int code =zhjcGhjhFghjdzbMapper.insert(new_zb);
         return code>0;
     }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/service/impl/ZhjcGhjhGhjdzbServiceImpl.java

@@ -56,14 +56,11 @@ public class ZhjcGhjhGhjdzbServiceImpl extends ServiceImpl<ZhjcGhjhGhjdzbMapper,
      */
     @Transactional
     public Boolean addGhjdzb(ZhjcGhjhGhjdzb new_zb) {
-        ZhjcGhjhGhjdzb old_zb = zhjcGhjhGhjdzbMapper.selectOne(Wrappers.<ZhjcGhjhGhjdzb>query().lambda().eq(ZhjcGhjhGhjdzb::getXmid,new_zb.getXmid()));
-        if (old_zb!=null){
-            zhjcGhjhGhjdzbMapper.deleteById(old_zb);
-        }
+        //ZhjcGhjhGhjdzb old_zb = zhjcGhjhGhjdzbMapper.selectOne(Wrappers.<ZhjcGhjhGhjdzb>query().lambda().eq(ZhjcGhjhGhjdzb::getXmid,new_zb.getXmid()));
         //String shape1 = "LINESTRING(120.2835866 36.59739551, 120.2835586 36.59739777, 120.2834693 36.59740525, 120.2833769 36.5974129, 120.2832823 36.59742033, 120.2831857 36.59742705, 120.2830881 36.59743413, 120.2829894 36.59743883, 120.2828872 36.59744482, 120.282782 36.59745183, 120.282682 36.59745845, 120.2825859 36.59746501, 120.2824941 36.59747146, 120.2824055 36.59747767, 120.2823188 36.59748375, 120.2822324 36.59748957, 120.282146 36.5974957, 120.2820581 36.59750175, 120.2819686 36.59750821, 120.2818773 36.59751471, 120.2817849 36.59752183, 120.2816922 36.59752748, 120.2815955 36.59753231, 120.2814962 36.5975354, 120.2813913 36.59753782, 120.2812835 36.59753822, 120.2811729 36.59753961, 120.2810642 36.59754773, 120.2809469 36.59755343, 120.2808214 36.59755489, 120.2807039 36.59756627, 120.2805787 36.5975809, 120.2804506 36.59759343, 120.2803211 36.59760528, 120.28019 36.59761539, 120.2800578 36.59761782, 120.2799291 36.59762848, 120.2797965 36.5976413, 120.2796618 36.59765353, 120.2795278 36.59766669, 120.2793976 36.59767911, 120.279273 36.5976914, 120.2791519 36.59770294, 120.279038 36.59771046, 120.2789265 36.59771708, 120.278704 36.59773171, 120.2784819 36.59774603, 120.2783699 36.59775518, 120.2782579 36.59776209, 120.2780287 36.5977764, 120.2779154 36.59778276, 120.2778033 36.59779225, 120.2776934 36.59779936, 120.2774756 36.59781547, 120.2772638 36.59783368, 120.2771543 36.59784545, 120.2770477 36.59784908, 120.2768266 36.59786029, 120.2767113 36.59786752, 120.2765928 36.59787562, 120.2764744 36.59788335, 120.2763541 36.59788896, 120.2762386 36.59789941, 120.2761206 36.59790812, 120.2760021 36.59791606, 120.2758883 36.59792337, 120.2757755 36.59792804, 120.275666 36.59793318, 120.2754583 36.59795917, 120.2753522 36.59796842, 120.2752538 36.59797579, 120.275161 36.59798157, 120.2750686 36.59798951, 120.274976 36.59799667, 120.2748815 36.59800325, 120.2747861 36.59800884, 120.2746891 36.59801501, 120.2745913 36.5980209, 120.2744937 36.59802629, 120.274395 36.59803356, 120.2742959 36.59804416, 120.2741971 36.59804892, 120.2740963 36.59805554, 120.2739938 36.5980638, 120.2738899 36.59806894, 120.2737862 36.59807678, 120.2736778 36.59808443, 120.27357 36.59809117, 120.2734689 36.59809433, 120.2733707 36.59809612, 120.2732662 36.59808125, 120.2731685 36.59811564, 120.2730636 36.59812282, 120.2729604 36.59812832, 120.2728446 36.59814519, 120.2727388 36.59815165, 120.2726307 36.59815866, 120.2725211 36.59816636, 120.272416 36.59817066, 120.2723044 36.59817867, 120.2721931 36.59818594, 120.2720819 36.59819218, 120.2719697 36.59819912, 120.271859 36.59820525, 120.2717485 36.59821254, 120.271636 36.59821863, 120.2715227 36.59822637, 120.2714105 36.59823394, 120.2712958 36.59824187, 120.2711807 36.59824939, 120.2710694 36.59825068, 120.2709589 36.59825197, 120.2708414 36.59825826, 120.2707266 36.59826618, 120.2706138 36.59827348, 120.2705026 36.5982815, 120.2703928 36.59829028, 120.2702823 36.59829967, 120.2701739 36.59830489, 120.2700627 36.59831329, 120.26995 36.59832006, 120.2698365 36.59832804, 120.2697238 36.59833577, 120.2696136 36.59834236, 120.2695033 36.5983499, 120.2693918 36.59835725, 120.2692832 36.59836352, 120.2691735 36.59836779, 120.2690666 36.59837198, 120.2689617 36.59837953, 120.2688526 36.59838342, 120.2687422 36.59838341, 120.2686312 36.59838189, 120.2685195 36.5983788, 120.2684073 36.59837439, 120.2682925 36.59836835, 120.268183 36.59835778, 120.2680733 36.59834142, 120.2679688 36.59831983, 120.2678679 36.59829487, 120.2677673 36.59826463, 120.2676598 36.59823784, 120.267557 36.59820585, 120.2674518 36.59817299, 120.2673463 36.59813536, 120.2672425 36.59809373, 120.2671378 36.59805019, 120.2670346 36.59800804, 120.2669296 36.59796327, 120.2668214 36.59791872, 120.2667106 36.59787298, 120.266599 36.5978308, 120.2664851 36.59778502, 120.266369 36.59773917, 120.2662543 36.59769114, 120.2661371 36.59764055, 120.2660215 36.59758973, 120.2659047 36.59753999, 120.2657859 36.59749088, 120.265667 36.59744521, 120.2655474 36.59739619, 120.2654253 36.59734687, 120.2653076 36.59729693, 120.2651927 36.59724681, 120.2650809 36.59720176, 120.264967 36.59715885, 120.2648549 36.597112, 120.26474 36.59706624, 120.2646218 36.5970151, 120.2645065 36.59696668, 120.2643936 36.59692399, 120.2642802 36.59688028, 120.2641702 36.59683527, 120.2640621 36.59679059, 120.2639629 36.5967484, 120.2638586 36.59670481, 120.2637577 36.59666324, 120.263657 36.59662113, 120.2635538 36.59657926, 120.2634493 36.59653659, 120.2633464 36.59649518, 120.2632453 36.59645626, 120.2631446 36.59641536, 120.2630432 36.59637557, 120.2629408 36.59633494, 120.2628387 36.59629385, 120.2627376 36.59625155, 120.2626373 36.5962089, 120.2625366 36.59616693, 120.2624345 36.59611916, 120.2623311 36.59607302, 120.262227 36.59602934, 120.2621218 36.59598804, 120.2620154 36.59594756, 120.2619094 36.59590494, 120.2618021 36.59586092, 120.2616974 36.59581478, 120.2615884 36.5957713, 120.2614792 36.5957274, 120.2613648 36.59568017, 120.2612557 36.59563606, 120.2611483 36.59559286, 120.261043 36.59554969, 120.260942 36.59550783, 120.2608455 36.59546421, 120.260755 36.59542004, 120.2606672 36.59538198, 120.2605844 36.59534477, 120.260501 36.59530762, 120.2604129 36.59526928, 120.2603189 36.59523326, 120.2602265 36.59519851, 120.2601233 36.5951631, 120.2600242 36.5951271, 120.2599248 36.59508898, 120.2598257 36.59505014, 120.2597244 36.59500862, 120.2596237 36.5949671, 120.2595231 36.59492666, 120.2594178 36.59488415, 120.2593129 36.59484011, 120.259209 36.59479461, 120.2591012 36.59474898, 120.258993 36.59470405, 120.2588858 36.59465799, 120.2587769 36.59461282, 120.2586659 36.59456729, 120.2585541 36.5945204, 120.2584416 36.59447335, 120.2583281 36.59442593, 120.2582148 36.59437981, 120.2580969 36.59434041, 120.2579843 36.59429276, 120.257871 36.59424613, 120.2577601 36.59420077, 120.2576493 36.59415458, 120.2575419 36.59410891, 120.2574284 36.59406317, 120.2573147 36.5940175, 120.2572008 36.59396968, 120.2570873 36.593924, 120.2569733 36.59387668, 120.2568593 36.5938309, 120.2567448 36.59378372, 120.2566322 36.59373673, 120.2565209 36.59368846, 120.2564102 36.59364153, 120.2563027 36.59359427, 120.2562038 36.59355069, 120.2560968 36.59350664, 120.2559884 36.59346238, 120.2558795 36.59341819, 120.2557696 36.59337418, 120.2556608 36.59333003, 120.2555534 36.59328572, 120.2554448 36.59324165, 120.2553397 36.59319722, 120.25524 36.59315435, 120.2551429 36.59311548, 120.2550457 36.59308008, 120.2549474 36.59305387, 120.2548499 36.59303372, 120.2547546 36.59301618, 120.2546504 36.5930021, 120.2545474 36.59299103, 120.2544463 36.59297961, 120.2543433 36.59296837, 120.2542383 36.5929582, 120.2541311 36.59294923, 120.2540221 36.59294031, 120.253902 36.59293515, 120.2537905 36.59292614, 120.2536774 36.59291711, 120.2535633 36.59290898, 120.2534494 36.59290283, 120.2533365 36.5928957, 120.2532243 36.59288692, 120.2531125 36.59287722, 120.2530009 36.59286828, 120.2528901 36.59286049, 120.2527808 36.59285328, 120.2526708 36.59284599, 120.2525582 36.59283834, 120.2524431 36.59283042, 120.2523257 36.592822, 120.2522063 36.59281298, 120.2520853 36.59280231, 120.2519622 36.59279041, 120.2518373 36.59277867, 120.2517123 36.59276635, 120.2515888 36.59275405, 120.2514666 36.59274248, 120.2513435 36.5927311, 120.2512185 36.59272019, 120.2510901 36.59270974, 120.2509578 36.59269898, 120.250822 36.59268704, 120.2506837 36.59267456, 120.2505446 36.59266285, 120.2504051 36.59265137, 120.2502665 36.59263996, 120.2501305 36.5926291, 120.2499974 36.59261956, 120.2498646 36.5926103, 120.249732 36.59260019, 120.2495993 36.59258951, 120.2494676 36.5925788, 120.2493368 36.59256831, 120.2492071 36.59255754, 120.2490798 36.59254656, 120.2489548 36.59253598, 120.2488327 36.59252578, 120.2487136 36.59251603, 120.2485982 36.59250688, 120.2484872 36.59249496, 120.2483798 36.59247875, 120.2482728 36.59245743, 120.2481668 36.59243053, 120.2480619 36.59239848, 120.247957 36.59236381, 120.2478519 36.59233049, 120.2477466 36.59229983, 120.2476404 36.59226704, 120.2475424 36.5922337, 120.2474345 36.59219806, 120.2473276 36.59215879, 120.2472255 36.59212691, 120.2471224 36.59209349, 120.2470172 36.59205961, 120.2469095 36.59202664, 120.2468029 36.59199326, 120.2466968 36.59195944, 120.2465892 36.5919251, 120.2464804 36.5918954, 120.2463709 36.59186343, 120.2462607 36.5918311, 120.2461496 36.59179623, 120.2460426 36.59176345, 120.2459326 36.59172744, 120.245818 36.59169458, 120.2457041 36.5916586, 120.2455897 36.59162013, 120.2454765 36.59158474, 120.2453635 36.59155032, 120.2452585 36.5915123, 120.2451489 36.59147574, 120.2450367 36.59144012, 120.2449257 36.59140379, 120.244812 36.59136813, 120.2447079 36.59133429, 120.2445921 36.59130068, 120.2444795 36.59126811, 120.2443652 36.5912396, 120.2442499 36.59121427, 120.2441353 36.59119204, 120.2440254 36.5911746, 120.2439126 36.59116022, 120.2437978 36.5911473, 120.2436818 36.59113693, 120.2435662 36.59112387, 120.2434505 36.59111018, 120.2433352 36.59109991, 120.2432165 36.59108582, 120.2430956 36.59107316, 120.2429758 36.59106256, 120.2428537 36.59104977, 120.2427314 36.59103812, 120.2426092 36.59102669, 120.2424862 36.59101206, 120.2423602 36.59099848, 120.2422347 36.59098674, 120.2421094 36.59097325, 120.2419823 36.59095943, 120.2418533 36.59094649, 120.2417263 36.59093322, 120.2415967 36.59091893, 120.2414658 36.59090123, 120.2413344 36.59088065, 120.2412028 36.59086015, 120.2410701 36.59083955, 120.2409382 36.59082062, 120.2408063 36.59080005, 120.2406752 36.59077813, 120.2405448 36.59075603, 120.2404135 36.59073057, 120.2402832 36.59070696, 120.2401543 36.59068579, 120.2400265 36.59066573, 120.2398979 36.59064335, 120.2397683 36.59061826, 120.2396373 36.59059171, 120.239508 36.59056456, 120.2393763 36.59054275, 120.2392499 36.59052498, 120.239127 36.59050419, 120.2390065 36.59048533, 120.2388906 36.5904655, 120.2387816 36.59044603, 120.2386711 36.59042647, 120.2385625 36.59040356, 120.2384562 36.59038041, 120.2383499 36.59035894, 120.2382449 36.59033698, 120.238137 36.5903165, 120.238028 36.59030105, 120.23792 36.5902766, 120.2378101 36.59025225, 120.2376997 36.59023002, 120.2375869 36.59020755, 120.2374766 36.59018775, 120.237368 36.59016567, 120.2372638 36.59015439, 120.2371582 36.59014021, 120.2370499 36.59013021, 120.2369419 36.59012812, 120.2368348 36.59013331, 120.2367299 36.59013649, 120.2366201 36.59013906, 120.2365057 36.59013812, 120.236389 36.59013906, 120.2361644 36.59014827, 120.2360523 36.59014913, 120.2359446 36.59015192, 120.2358363 36.59015599, 120.2357293 36.5901614, 120.2356191 36.5901667, 120.2355078 36.59016975, 120.2353978 36.59017414, 120.2352849 36.59017552, 120.2351675 36.59018025, 120.2350451 36.59018387, 120.2349208 36.59018779, 120.2347911 36.59019215, 120.2346579 36.59019561, 120.2345205 36.5901996, 120.2343802 36.59020255, 120.2342389 36.5902063, 120.2340979 36.59021061, 120.2339533 36.5902153, 120.2338099 36.59021756, 120.2336674 36.59021617, 120.2335257 36.59021264, 120.2333759 36.59022193, 120.2332276 36.59022788, 120.2330791 36.59023561, 120.2329357 36.59023982, 120.2327966 36.59024422, 120.2326582 36.59024754, 120.2325189 36.59025446, 120.2323811 36.59026095, 120.2322438 36.59026647, 120.2321073 36.59027157, 120.2319751 36.59027675, 120.2318466 36.59028261, 120.2317225 36.59028785, 120.231601 36.59029228, 120.231477 36.59029751, 120.2313523 36.59030037, 120.2312268 36.59030209, 120.2311003 36.59030399, 120.2309727 36.59030741, 120.2308425 36.59031301, 120.2307124 36.59031957, 120.2305818 36.59032509, 120.230452 36.59033197, 120.2303226 36.59033398, 120.2301952 36.59033689, 120.2300704 36.59033918, 120.2299465 36.59034154, 120.2298218 36.59034149, 120.2296982 36.59034243, 120.229574 36.59034446, 120.2294486 36.59034856, 120.2293282 36.59035021, 120.2292071 36.59035268, 120.229087 36.59035569, 120.2289697 36.59036464, 120.2288535 36.59036937, 120.228738 36.59037372, 120.2286237 36.59037672, 120.2285091 36.59038291, 120.228397 36.5903893, 120.2282865 36.59039572, 120.2281792 36.59040101, 120.2280729 36.59040303, 120.227968 36.59040808, 120.2278655 36.59041008, 120.2277649 36.59041238, 120.2276652 36.59041377, 120.2275646 36.59041552, 120.2274603 36.59041768, 120.2273541 36.59042226, 120.2272468 36.59042376, 120.2271388 36.59042499, 120.2270263 36.59042627, 120.2269072 36.59042768, 120.226787 36.59043161, 120.2266647 36.59043246, 120.2265523 36.5904346, 120.2264279 36.59043788, 120.2263032 36.59044144, 120.2261777 36.59044495, 120.2260537 36.59045005, 120.2259309 36.5904528, 120.2258087 36.59045833, 120.2256906 36.59046398, 120.2255727 36.59046641, 120.2254545 36.59046812, 120.2253356 36.59047009, 120.2252126 36.59047424, 120.2250893 36.59047856, 120.2249657 36.59048228, 120.2248416 36.59048602, 120.2247173 36.5904895, 120.2244688 36.5904974, 120.2243464 36.59049895, 120.2242243 36.5905011, 120.2241043 36.59050298, 120.2239843 36.59050481, 120.2238645 36.59050496, 120.2237427 36.59050665, 120.2236212 36.59051143, 120.2234967 36.59052009, 120.2233691 36.59052823, 120.2232383 36.59053429, 120.2231082 36.59053825, 120.2228445 36.59054594, 120.2227114 36.59055038, 120.2225772 36.59055588, 120.2224423 36.59056045, 120.2223058 36.59056501, 120.2221734 36.59056786, 120.2220412 36.59057136, 120.2219064 36.59057669, 120.221771 36.59058357, 120.2216364 36.59058787, 120.2214982 36.59059118, 120.2213642 36.59059525, 120.2212317 36.59059676, 120.2210992 36.59059638, 120.2209649 36.59059812, 120.2208301 36.59060178, 120.2206956 36.5906078, 120.2205604 36.59062011, 120.2204383 36.59062947, 120.2203178 36.59063531, 120.2202005 36.5906392, 120.2200834 36.59063957, 120.2199683 36.59064289, 120.2198535 36.59064744, 120.2197425 36.59065385, 120.2196284 36.59065881, 120.2195159 36.59066266, 120.219404 36.59066523, 120.2192886 36.59066719, 120.2191767 36.59066664, 120.2190633 36.59066572, 120.2189496 36.59067334, 120.2188407 36.59067741, 120.2187267 36.59067968, 120.2186122 36.59068446, 120.2184911 36.59068638, 120.2183762 36.59068948, 120.2182591 36.59069208, 120.2181459 36.59069519, 120.2180339 36.59069643, 120.2179186 36.59069568, 120.2178161 36.59070582, 120.2177093 36.59071158, 120.2175976 36.59072122, 120.217486 36.59072274, 120.2173715 36.59072458, 120.2172569 36.59072631, 120.2171424 36.59072813, 120.2170294 36.59072942, 120.2169173 36.59073392, 120.2168082 36.59073839, 120.2167021 36.59074537, 120.216597 36.59075354, 120.2164952 36.59075908, 120.2163884 36.59076623, 120.2162867 36.59076977, 120.2161879 36.5907731, 120.2160949 36.59077805, 120.2160033 36.59078212, 120.2159134 36.59078421, 120.2158229 36.59078579, 120.215737 36.5907889, 120.2156547 36.59079084, 120.2155695 36.59079097, 120.2154816 36.59079174, 120.215391 36.59078998, 120.2153004 36.5907895, 120.2152079 36.59079149, 120.2151004 36.59079638, 120.2150068 36.59079487, 120.2149137 36.59080392, 120.2148133 36.59080338, 120.2147182 36.59080692, 120.2146255 36.59081341, 120.2145321 36.59081937, 120.2144345 36.59082329, 120.2143367 36.59082678, 120.214237 36.59082948, 120.2141354 36.59083242, 120.2140323 36.59083484, 120.2139275 36.59083806, 120.2138219 36.59084179, 120.2137156 36.59084597, 120.2136089 36.59085015, 120.2135026 36.59085498, 120.2133976 36.59085873, 120.2132945 36.59086325, 120.2131918 36.59086642, 120.2130891 36.59087142, 120.2129859 36.59087662, 120.2128819 36.59087999, 120.2127734 36.59084863, 120.2126655 36.59085093, 120.2125552 36.59085159, 120.212451 36.59088165, 120.2123396 36.59088395, 120.2122243 36.59088577, 120.212105 36.59089141, 120.2119831 36.5908966, 120.2118634 36.59089722, 120.2117448 36.59090021, 120.2116316 36.59090334, 120.2115105 36.59091043, 120.2113926 36.5909196, 120.2112771 36.59092082, 120.2111619 36.59092227, 120.2110452 36.59092412, 120.2109226 36.59093117, 120.2108025 36.59093308, 120.2106843 36.59093877, 120.2105639 36.59094239, 120.2104432 36.59094968, 120.2103233 36.59095497, 120.2102016 36.59095761, 120.2100796 36.59096255, 120.2099633 36.5909652, 120.2098458 36.59096859, 120.2097295 36.59097083, 120.2096136 36.59097509, 120.2094991 36.59097867, 120.2093887 36.59098163, 120.209275 36.59098565, 120.2091617 36.59098895, 120.2090504 36.59099289, 120.2089404 36.59099782, 120.208828 36.59100078, 120.2087133 36.59100345, 120.2085993 36.59100744, 120.2084894 36.59101098, 120.2083829 36.5910144, 120.2081763 36.59102339, 120.2080741 36.59103175, 120.2079752 36.59103586, 120.2078771 36.59103448)";
         //String shape = shapeConversion(shape1);
-        String shape = shapeConversion(new_zb.getGeomfeature());
-        new_zb.setGeomfeature(shape.substring(1,shape.length()-1));
+//        String shape = shapeConversion(new_zb.getGeomfeature());
+//        new_zb.setGeomfeature(shape.substring(1,shape.length()-1));
         int code =zhjcGhjhGhjdzbMapper.insert(new_zb);
         return code>0;
     }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/controller/ZhjgDckhRwController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
 import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjh;
 import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRw;
 import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRwFf;
 import com.elephant.framework.galaxy.aroad.module.zhjg.service.ZhjgDckhRwFfService;
@@ -18,6 +19,8 @@ import org.apache.poi.ss.formula.functions.T;
 import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 
 /**
  * 督查情况任务表
@@ -43,7 +46,7 @@ public class ZhjgDckhRwController extends BaseController {
      */
     @GetMapping("/page")
     public R getZhjgDckhRwPage(Page page, ZhjgDckhRw zhjgDckhRw) {
-        IPage<T> iPage = null;
+        Page<ZhjgDckhRw> iPage = new Page<ZhjgDckhRw>();
         //是否具备创建任务的权限
         boolean isCreatRw = SecurityUtils.isMenue("zhjg_dckhdctg_add");
         if (isCreatRw) {
@@ -54,10 +57,19 @@ public class ZhjgDckhRwController extends BaseController {
             if (zhjgDckhRw.getZrdwid() != null) {
                 queryWrapper.eq("zrdwid", zhjgDckhRw.getZrdwid());
             }
-             iPage = zhjgDckhRwService.page(page, queryWrapper);
+              List<ZhjgDckhRw> list = zhjgDckhRwService.list(queryWrapper);
+              for (ZhjgDckhRw rw :list){
+                  rw.setCydws(rw.getCydw().split(","));
+              }
+
+              iPage.setRecords(list);
+              iPage.setCurrent(page.getSize());
+              iPage.setTotal(list.size());
+              iPage.setSize(page.getSize());
+
          } else {
-            //loginDeptId = SecurityUtils.getDeptId();
-            iPage = zhjgDckhRwService.selectRwForPage(page, zhjgDckhRw, loginDeptId);
+
+           // iPage = zhjgDckhRwService.selectRwForPage(page, zhjgDckhRw, loginDeptId);
          }
 
 

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/controller/ZhjgLzglFglbzxktzController.java

@@ -59,7 +59,7 @@ public class ZhjgLzglFglbzxktzController extends BaseController  {
   public R save(@RequestBody ZhjgLzglFglbzxktz zhjgLzglFglbzxktz){
     String uuid = UUID.randomUUID().toString().replaceAll("-","");
     zhjgLzglFglbzxktz.setId(uuid);
-    zhjgLzglFglbzxktz.setCreateTime((new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(new Date()));
+    zhjgLzglFglbzxktz.setCreatetime((new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(new Date()));
     return new R<>(zhjgLzglFglbzxktzService.save(zhjgLzglFglbzxktz));
   }
 

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/entity/ZhjgDckhRw.java

 package com.elephant.framework.galaxy.aroad.module.zhjg.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
@@ -125,5 +124,7 @@ public class ZhjgDckhRw extends Model<ZhjgDckhRw> {
      * 备注信息
      */
     private String remarks;
+    @TableField(exist = false)
+    private String[] cydws;
 
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/entity/ZhjgDckhRwFk.java

@@ -49,6 +49,9 @@ private static final long serialVersionUID = 1L;
   /**
    * 上传文档
    */
-  private String scwd;
-
+  private String wdmc;
+  /**
+   * 文档url
+   */
+  private String wdurl;
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/entity/ZhjgLzglFglbzxktz.java

@@ -112,6 +112,6 @@ private static final long serialVersionUID = 1L;
   /**
    * 创建时间
    */
-  private String createTime;
+  private String createtime;
 
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/service/impl/ZhjgDckhRwServiceImpl.java

@@ -49,12 +49,12 @@ public class ZhjgDckhRwServiceImpl extends ServiceImpl<ZhjgDckhRwMapper, ZhjgDck
             rwnum =  baseMapper.updateById(dckhRw);
         }
         if(dckhRw.getCydw()!=null){
-            String[] cydwids = dckhRw.getCydw().split(",");
-            for (int i = 0; i <cydwids.length ; i++) {
+            String[] cydwmc = dckhRw.getCydw().split(",");
+            for (int i = 0; i <cydwmc.length ; i++) {
                 ZhjgDckhRwFf rwff = new ZhjgDckhRwFf();
                 rwff.setRwid(id);
-                rwff.setRwmc(dckhRw.getRwmc());
-                rwff.setDwdm(Integer.parseInt(cydwids[i]));
+                rwff.setRwmc(cydwmc[i]);
+
                 rwff.setZt("1");
                 rwff.setCreateTime(LocalDateTime.now());
                 zhjgDckhRwFfMapper.insert(rwff);

src/main/java/com/elephant/framework/galaxy/aroad/security/config/ResourceServerConfiguration.java

@@ -23,7 +23,7 @@ public class ResourceServerConfiguration extends ResourceServerConfigurerAdapter
 				.authorizeRequests()
 				.antMatchers("/roadconditionevent/**", "/zhyh/lkpd/**","/zhyh/dzxgcglgcxx/**", "/zhyh/dzxgcglgcjd/**", "/zhyh/dzxgcgljlzf/**", "/zhyh/dzxgcglysgl/**",
 						"/zhjc/ghjhghjdzb/**", "/zhjc/ghjhtzzh/**", "/zhjc/ghjh/**", "/zhjc/ghjhfghjdzb/**",
-						"/zhyh/qldtjglrbsjhql/**", "/zhyh/qldtjgsjzdjgql/**", "/szgl/spdwvideo/**","/szgl/spdwvideojn/**","/zhjg/zhjgaqscyhpctj/save","/zhjg/zhjgaqscdsaqqklh/save")
+						"/zhyh/qldtjglrbsjhql/**", "/zhyh/qldtjgsjzdjgql/**", "/szgl/spdwvideo/**","/szgl/spdwvideojn/**","/zhjg/zhjgaqscyhpctj/save","/zhjg/zhjgaqscdsaqqklh/save","/upload/**")
 				.permitAll()
 				.anyRequest()
 				.authenticated()

src/main/resources/mapper/zhjg/ZhjgDckhRwFkMapper.xml

@@ -11,6 +11,7 @@
         <result property="fknr" column="fknr"/>
         <result property="fksj" column="fksj"/>
         <result property="fkdw" column="fkdw"/>
-        <result property="scwd" column="scwd"/>
+        <result property="wdmc" column="wdmc"/>
+        <result property="wdurl" column="wdurl"/>
   </resultMap>
 </mapper>

src/main/resources/mapper/zhjg/ZhjgLzglFglbzxktzMapper.xml

@@ -27,6 +27,6 @@
         <result property="bzsj" column="bzsj"/>
         <result property="bcqx" column="bcqx"/>
         <result property="sqsfjid" column="sqsfjid"/>
-        <result property="createTime" column="createTime"/>
+        <result property="createtime" column="createtime"/>
   </resultMap>
 </mapper>