修改附件查询地址

.idea/workspace.xml

@@ -9,402 +9,24 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="29bcb86b-1634-41e0-a498-79481163cba8" name="Changes" comment="计费验证修改数据">
+    <list default="true" id="29bcb86b-1634-41e0-a498-79481163cba8" name="Changes" comment="餐饮预约核销修改">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/FileController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/SolveUserAndVehclePicController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/SolveUserAndVehcleServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/config/ThreadPoolConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/config/ThreadPoolConfig.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/AppointmentInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/AppointmentInfoController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/UserVehicleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/UserVehicleController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/AppointmentInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/AppointmentInfoService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ApponintmentInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ApponintmentInfoServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralLevelMessageServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralLevelMessageServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/MessagePushServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/MessagePushServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/SerivceAreaOperationMealServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/SerivceAreaOperationMealServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/UserVehicleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/UserVehicleServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/util/HttpClientUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/util/HttpClientUtil.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/util/ImageUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/util/ImageUtils.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/util/PathUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/util/PathUtil.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/util/PubTools.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/util/PubTools.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/META-INF/MANIFEST.MF" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/META-INF/spring.factories" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/com/nmgs/mapper/IntegrationListMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/com/nmgs/mapper/Mapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/com/nmgs/mapper/OperatorsMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/com/nmgs/mapper/PayIntegrationNumberMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/com/nmgs/mapper/ServiceAreaMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/com/nmgs/mapper/ServiceAreaPicMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/excel/Excel.xlsx" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/logback-spring.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/java/com/nmgs/mapper/IntegrationListMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/java/com/nmgs/mapper/Mapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/java/com/nmgs/mapper/OperatorsMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/java/com/nmgs/mapper/PayIntegrationNumberMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/java/com/nmgs/mapper/ServiceAreaMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/java/com/nmgs/mapper/ServiceAreaPicMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/META-INF/MANIFEST.MF" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/META-INF/spring.factories" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/excel/Excel.xlsx" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/logback-spring.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/HeatMap_min.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/bmap_offline_api_v3.0_min.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/demo01.html" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/Mario.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/blank.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/circle.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/closedhand.cur" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/copyright_logo.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/iw3.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/iw_close1d3.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/iw_minus.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/iw_plus.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/iw_plus1d3.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/iws3.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/m0.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/m1.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/m2.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/m3.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/m4.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/mapctrls1d3.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/mapctrls2d0.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/mapctrls2d0.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/marker_red_hd.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/marker_red_sprite.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/node.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/openhand.cur" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/panorama/close.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/panorama/indoor_exit.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/phone.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/point-collection/blue-marke-15x16.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/point-collection/red-marker-10x13.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/quanjing.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/ruler.cur" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/images/stop_icon.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/map_city.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/map_load.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/map_plus.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/autocomplete_punr3o.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/buslinesearch_vxmb31.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/canvablepath_dia5aw.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/citylistcontrol_ms3ahy.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/clayer_0hwrfx.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/common_wkrfcz.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/control_hlzh1t.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/convertor_d0ze2w.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/coordtrans_lmf5kv.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/coordtransutils_d33qf1.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/copyrightctrl_gmc2ps.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/draw_jb4osz.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/drawbycanvas_ufwkvb.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/drawbysvg_vxyn51.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/drawbyvml_whxmqq.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/geoctrl_xprajs.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/groundoverlay_ekozhc.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/hotspot_vuwxs4.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/infowindow_wtflsn.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/local_k0pcpi.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/map_dbwcej.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/mapclick_e40viw.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/marker_00uyqy.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/markeranimation_rfnmxu.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/menu_152mop.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/navictrl_h32mnb.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/newvectordrawlib_wbnuee.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/opmb_2c1ejz.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/oppc_10riq5.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/othersearch_pwg4ey.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/panorama_jbqj24.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/panoramaflash_dm4xq2.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/pcommon_yqek4k.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/pointcollection_feabuc.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/poly_r52vuo.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/pservice_j5tlrp.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/route_v4yyam.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/scommon_oadc3d.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/style_fkofpc.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/symbol_cq3a5n.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/tile_ok3b3m.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/vector_2hrruc.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/vectordrawlib_4pdipq.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/bmapOffline/modules/vmlcontext_phwtog.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/img/disConnect.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/img/normal.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/View/img/warning.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/main/resources/static/application.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/HeatMap_min.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/bmap_offline_api_v3.0_min.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/demo01.html" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/Mario.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/blank.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/circle.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/closedhand.cur" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/copyright_logo.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/iw3.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/iw_close1d3.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/iw_minus.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/iw_plus.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/iw_plus1d3.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/iws3.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/m0.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/m1.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/m2.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/m3.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/m4.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/mapctrls1d3.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/mapctrls2d0.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/mapctrls2d0.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/marker_red_hd.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/marker_red_sprite.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/node.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/openhand.cur" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/panorama/close.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/panorama/indoor_exit.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/phone.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/point-collection/blue-marke-15x16.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/point-collection/red-marker-10x13.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/quanjing.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/ruler.cur" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/images/stop_icon.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/map_city.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/map_load.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/map_plus.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/autocomplete_punr3o.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/buslinesearch_vxmb31.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/canvablepath_dia5aw.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/citylistcontrol_ms3ahy.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/clayer_0hwrfx.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/common_wkrfcz.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/control_hlzh1t.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/convertor_d0ze2w.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/coordtrans_lmf5kv.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/coordtransutils_d33qf1.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/copyrightctrl_gmc2ps.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/draw_jb4osz.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/drawbycanvas_ufwkvb.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/drawbysvg_vxyn51.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/drawbyvml_whxmqq.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/geoctrl_xprajs.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/groundoverlay_ekozhc.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/hotspot_vuwxs4.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/infowindow_wtflsn.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/local_k0pcpi.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/map_dbwcej.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/mapclick_e40viw.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/marker_00uyqy.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/markeranimation_rfnmxu.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/menu_152mop.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/navictrl_h32mnb.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/newvectordrawlib_wbnuee.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/opmb_2c1ejz.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/oppc_10riq5.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/othersearch_pwg4ey.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/panorama_jbqj24.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/panoramaflash_dm4xq2.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/pcommon_yqek4k.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/pointcollection_feabuc.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/poly_r52vuo.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/pservice_j5tlrp.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/route_v4yyam.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/scommon_oadc3d.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/style_fkofpc.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/symbol_cq3a5n.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/tile_ok3b3m.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/vector_2hrruc.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/vectordrawlib_4pdipq.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/bmapOffline/modules/vmlcontext_phwtog.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/img/disConnect.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/img/normal.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/View/img/warning.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/IntegralManager/WEB-INF/classes/static/application.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/META-INF/spring.factories" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/nmgs/mapper/IntegrationListMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/nmgs/mapper/Mapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/nmgs/mapper/OperatorsMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/nmgs/mapper/PayIntegrationNumberMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/nmgs/mapper/ServiceAreaMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/nmgs/mapper/ServiceAreaPicMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/excel/Excel.xlsx" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback-spring.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/java/com/nmgs/mapper/IntegrationListMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/java/com/nmgs/mapper/Mapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/java/com/nmgs/mapper/OperatorsMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/java/com/nmgs/mapper/PayIntegrationNumberMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/java/com/nmgs/mapper/ServiceAreaMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/java/com/nmgs/mapper/ServiceAreaPicMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/META-INF/MANIFEST.MF" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/META-INF/spring.factories" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/excel/Excel.xlsx" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/logback-spring.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/HeatMap_min.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/bmap_offline_api_v3.0_min.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/demo01.html" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/Mario.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/blank.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/circle.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/closedhand.cur" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/copyright_logo.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/iw3.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/iw_close1d3.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/iw_minus.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/iw_plus.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/iw_plus1d3.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/iws3.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/m0.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/m1.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/m2.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/m3.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/m4.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/mapctrls1d3.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/mapctrls2d0.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/mapctrls2d0.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/marker_red_hd.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/marker_red_sprite.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/node.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/openhand.cur" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/panorama/close.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/panorama/indoor_exit.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/phone.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/point-collection/blue-marke-15x16.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/point-collection/red-marker-10x13.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/quanjing.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/ruler.cur" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/images/stop_icon.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/map_city.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/map_load.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/map_plus.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/autocomplete_punr3o.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/buslinesearch_vxmb31.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/canvablepath_dia5aw.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/citylistcontrol_ms3ahy.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/clayer_0hwrfx.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/common_wkrfcz.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/control_hlzh1t.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/convertor_d0ze2w.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/coordtrans_lmf5kv.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/coordtransutils_d33qf1.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/copyrightctrl_gmc2ps.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/draw_jb4osz.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/drawbycanvas_ufwkvb.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/drawbysvg_vxyn51.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/drawbyvml_whxmqq.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/geoctrl_xprajs.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/groundoverlay_ekozhc.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/hotspot_vuwxs4.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/infowindow_wtflsn.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/local_k0pcpi.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/map_dbwcej.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/mapclick_e40viw.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/marker_00uyqy.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/markeranimation_rfnmxu.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/menu_152mop.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/navictrl_h32mnb.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/newvectordrawlib_wbnuee.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/opmb_2c1ejz.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/oppc_10riq5.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/othersearch_pwg4ey.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/panorama_jbqj24.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/panoramaflash_dm4xq2.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/pcommon_yqek4k.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/pointcollection_feabuc.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/poly_r52vuo.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/pservice_j5tlrp.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/route_v4yyam.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/scommon_oadc3d.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/style_fkofpc.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/symbol_cq3a5n.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/tile_ok3b3m.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/vector_2hrruc.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/vectordrawlib_4pdipq.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/bmapOffline/modules/vmlcontext_phwtog.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/img/disConnect.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/img/normal.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/View/img/warning.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/main/resources/static/application.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/HeatMap_min.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/bmap_offline_api_v3.0_min.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/demo01.html" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/Mario.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/blank.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/circle.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/closedhand.cur" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/copyright_logo.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/iw3.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/iw_close1d3.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/iw_minus.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/iw_plus.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/iw_plus1d3.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/iws3.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/m0.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/m1.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/m2.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/m3.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/m4.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/mapctrls1d3.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/mapctrls2d0.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/mapctrls2d0.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/marker_red_hd.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/marker_red_sprite.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/node.gif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/openhand.cur" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/panorama/close.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/panorama/indoor_exit.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/phone.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/point-collection/blue-marke-15x16.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/point-collection/red-marker-10x13.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/quanjing.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/ruler.cur" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/images/stop_icon.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/map_city.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/map_load.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/map_plus.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/autocomplete_punr3o.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/buslinesearch_vxmb31.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/canvablepath_dia5aw.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/citylistcontrol_ms3ahy.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/clayer_0hwrfx.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/common_wkrfcz.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/control_hlzh1t.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/convertor_d0ze2w.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/coordtrans_lmf5kv.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/coordtransutils_d33qf1.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/copyrightctrl_gmc2ps.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/draw_jb4osz.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/drawbycanvas_ufwkvb.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/drawbysvg_vxyn51.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/drawbyvml_whxmqq.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/geoctrl_xprajs.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/groundoverlay_ekozhc.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/hotspot_vuwxs4.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/infowindow_wtflsn.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/local_k0pcpi.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/map_dbwcej.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/mapclick_e40viw.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/marker_00uyqy.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/markeranimation_rfnmxu.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/menu_152mop.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/navictrl_h32mnb.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/newvectordrawlib_wbnuee.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/opmb_2c1ejz.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/oppc_10riq5.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/othersearch_pwg4ey.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/panorama_jbqj24.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/panoramaflash_dm4xq2.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/pcommon_yqek4k.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/pointcollection_feabuc.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/poly_r52vuo.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/pservice_j5tlrp.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/route_v4yyam.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/scommon_oadc3d.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/style_fkofpc.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/symbol_cq3a5n.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/tile_ok3b3m.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/vector_2hrruc.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/vectordrawlib_4pdipq.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/bmapOffline/modules/vmlcontext_phwtog.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/img/disConnect.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/img/normal.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/View/img/warning.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/static/application.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-archiver/pom.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -458,58 +80,58 @@
   <component name="ProjectViewState">
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
+  <component name="PropertiesComponent"><![CDATA[{
-  &quot;keyToString&quot;: {
+  "keyToString": {
-    &quot;Application.DivPassDataImpl.executor&quot;: &quot;Run&quot;,
+    "Application.DivPassDataImpl.executor": "Run",
-    &quot;Application.ImageUtils.executor&quot;: &quot;Debug&quot;,
+    "Application.ImageUtils.executor": "Run",
-    &quot;Application.PubTools.executor&quot;: &quot;Run&quot;,
+    "Application.PubTools.executor": "Run",
-    &quot;Application.QCodeInfoServiceImpl.executor&quot;: &quot;Debug&quot;,
+    "Application.QCodeInfoServiceImpl.executor": "Debug",
-    &quot;Application.SensitiveFilter.executor&quot;: &quot;Run&quot;,
+    "Application.SensitiveFilter.executor": "Run",
-    &quot;Application.main.executor&quot;: &quot;Debug&quot;,
+    "Application.main.executor": "Debug",
-    &quot;Application.redisConfigUtil.executor&quot;: &quot;Debug&quot;,
+    "Application.redisConfigUtil.executor": "Debug",
-    &quot;Maven.IntegraManager [clean].executor&quot;: &quot;Run&quot;,
+    "Maven.IntegraManager [clean].executor": "Run",
-    &quot;Maven.IntegraManager [install].executor&quot;: &quot;Run&quot;,
+    "Maven.IntegraManager [install].executor": "Run",
-    &quot;Maven.IntegralManager [clean].executor&quot;: &quot;Run&quot;,
+    "Maven.IntegralManager [clean].executor": "Run",
-    &quot;Maven.IntegralManager [install].executor&quot;: &quot;Run&quot;,
+    "Maven.IntegralManager [install].executor": "Run",
-    &quot;Maven.IntegralManager [validate].executor&quot;: &quot;Run&quot;,
+    "Maven.IntegralManager [validate].executor": "Run",
-    &quot;Maven.IntegralManagerSys [clean].executor&quot;: &quot;Run&quot;,
+    "Maven.IntegralManagerSys [clean].executor": "Run",
-    &quot;Maven.IntegralManagerSys [install].executor&quot;: &quot;Run&quot;,
+    "Maven.IntegralManagerSys [install].executor": "Run",
-    &quot;Maven.devProject [clean].executor&quot;: &quot;Run&quot;,
+    "Maven.devProject [clean].executor": "Run",
-    &quot;Maven.devProject [install].executor&quot;: &quot;Run&quot;,
+    "Maven.devProject [install].executor": "Run",
-    &quot;Maven.dev_project [clean].executor&quot;: &quot;Run&quot;,
+    "Maven.dev_project [clean].executor": "Run",
-    &quot;Maven.dev_project [install].executor&quot;: &quot;Run&quot;,
+    "Maven.dev_project [install].executor": "Run",
-    &quot;Maven.special_event [clean].executor&quot;: &quot;Run&quot;,
+    "Maven.special_event [clean].executor": "Run",
-    &quot;Maven.special_event [install].executor&quot;: &quot;Run&quot;,
+    "Maven.special_event [install].executor": "Run",
-    &quot;Maven.special_event [org.apache.maven.plugins:maven-assembly-plugin:3.3.0:single].executor&quot;: &quot;Run&quot;,
+    "Maven.special_event [org.apache.maven.plugins:maven-assembly-plugin:3.3.0:single].executor": "Run",
-    &quot;Maven.special_event [org.springframework.boot:spring-boot-maven-plugin:2.7.11:repackage].executor&quot;: &quot;Run&quot;,
+    "Maven.special_event [org.springframework.boot:spring-boot-maven-plugin:2.7.11:repackage].executor": "Run",
-    &quot;Maven.special_event [package].executor&quot;: &quot;Run&quot;,
+    "Maven.special_event [package].executor": "Run",
-    &quot;Maven.special_event [validate].executor&quot;: &quot;Run&quot;,
+    "Maven.special_event [validate].executor": "Run",
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    "RunOnceActivity.ShowReadmeOnStart": "true",
-    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    &quot;TomEE Server.special_event.executor&quot;: &quot;Debug&quot;,
+    "TomEE Server.special_event.executor": "Debug",
-    &quot;Tomcat Server.Tomcat 9.0.80.executor&quot;: &quot;Debug&quot;,
+    "Tomcat Server.Tomcat 9.0.80.executor": "Debug",
-    &quot;deletionFromPopupRequiresConfirmation&quot;: &quot;false&quot;,
+    "deletionFromPopupRequiresConfirmation": "false",
-    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    "git-widget-placeholder": "master",
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
+    "kotlin-language-version-configured": "true",
-    &quot;last_opened_file_path&quot;: &quot;E:/work/TGGLT-WorkSpace/IntegralManager&quot;,
+    "last_opened_file_path": "E:/work/TGGLT-WorkSpace/devProject",
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    "node.js.detected.package.eslint": "true",
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    "node.js.detected.package.tslint": "true",
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    "node.js.selected.package.eslint": "(autodetect)",
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    "node.js.selected.package.tslint": "(autodetect)",
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    "nodejs_package_manager_path": "npm",
-    &quot;project.structure.last.edited&quot;: &quot;Artifacts&quot;,
+    "project.structure.last.edited": "Modules",
-    &quot;project.structure.proportion&quot;: &quot;0.15&quot;,
+    "project.structure.proportion": "0.15",
-    &quot;project.structure.side.proportion&quot;: &quot;0.37169158&quot;,
+    "project.structure.side.proportion": "0.37169158",
-    &quot;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;,
+    "settings.editor.selected.configurable": "MavenSettings",
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+    "vue.rearranger.settings.migration": "true"
   },
-  &quot;keyToStringList&quot;: {
+  "keyToStringList": {
-    &quot;DatabaseDriversLRU&quot;: [
+    "DatabaseDriversLRU": [
-      &quot;oracle&quot;
+      "oracle"
     ]
   }
-}</component>
+}]]></component>
   <component name="ReactorSettings">
     <option name="notificationShown" value="true" />
   </component>
@@ -525,8 +147,8 @@
       <recent name="E:\work\TGGLT-WorkSpace\dev_project\src\main\java\com\nmgs\mapper" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="com.nmgs.service.impl" />
       <recent name="com.nmgs.controller" />
+      <recent name="com.nmgs.service.impl" />
       <recent name="com.nmgs.util" />
       <recent name="com.nmgs.service" />
       <recent name="com.nmgs.entity" />
@@ -889,7 +511,9 @@
       <workItem from="1726619960603" duration="38845000" />
       <workItem from="1727050580941" duration="672000" />
       <workItem from="1727055654134" duration="20084000" />
-      <workItem from="1727137902303" duration="303000" />
+      <workItem from="1727137902303" duration="45615000" />
+      <workItem from="1727309437039" duration="24407000" />
+      <workItem from="1727397615992" duration="18392000" />
     </task>
     <task id="LOCAL-00001" summary="特请处理">
       <option name="closed" value="true" />
@@ -923,7 +547,23 @@
       <option name="project" value="LOCAL" />
       <updated>1721810298082</updated>
     </task>
-    <option name="localTasksCounter" value="5" />
+    <task id="LOCAL-00005" summary="积分小程序修改">
+      <option name="closed" value="true" />
+      <created>1727138802549</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1727138802549</updated>
+    </task>
+    <task id="LOCAL-00006" summary="餐饮预约核销修改">
+      <option name="closed" value="true" />
+      <created>1727400199126</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1727400199127</updated>
+    </task>
+    <option name="localTasksCounter" value="7" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -934,7 +574,9 @@
     <MESSAGE value="特请处理" />
     <MESSAGE value="数据拆分流水，新加车牌颜色查询条件" />
     <MESSAGE value="计费验证修改数据" />
-    <option name="LAST_COMMIT_MESSAGE" value="计费验证修改数据" />
+    <MESSAGE value="积分小程序修改" />
+    <MESSAGE value="餐饮预约核销修改" />
+    <option name="LAST_COMMIT_MESSAGE" value="餐饮预约核销修改" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -949,6 +591,16 @@
           <line>1150</line>
           <option name="timeStamp" value="32" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/nmgs/controller/FileController.java</url>
+          <line>37</line>
+          <option name="timeStamp" value="51" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/nmgs/util/ImageUtils.java</url>
+          <line>38</line>
+          <option name="timeStamp" value="53" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>

pom.xml

@@ -213,6 +213,8 @@
             <artifactId>httpclient</artifactId>
             <version>4.5.14</version>
         </dependency>
+
+  
     </dependencies>
 
     <build>

src/main/java/com/nmgs/config/ThreadPoolConfig.java

@@ -27,6 +27,21 @@ public class ThreadPoolConfig {
         executor.initialize();
         return executor;
     }
+
+    @Bean("integralManagerHttpThreadPool")  //线程池实例名，多个线程池配置需要声明，一个线程池可有可无
+    public Executor executorNormalHttp() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(4);
+        executor.setMaxPoolSize(10);
+        executor.setQueueCapacity(3);
+        executor.setKeepAliveSeconds(60);
+        executor.setThreadNamePrefix("INTEGRAL_HTTP-");
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.AbortPolicy());
+        // 所有任务结束后关闭线程池
+        executor.setWaitForTasksToCompleteOnShutdown(true);
+        executor.initialize();
+        return executor;
+    }
     @Bean
     public ThreadPoolTaskScheduler threadPoolTaskScheduler() {
         ThreadPoolTaskScheduler ThreadPoolTaskScheduler = new ThreadPoolTaskScheduler();

src/main/java/com/nmgs/controller/AppointmentInfoController.java

@@ -135,9 +135,10 @@ public class AppointmentInfoController {
                                    @RequestParam(value = "operatorId",required = false) String operatorId,
                                    @RequestParam(value = "endDate",required = false) String endDate,
                                    @RequestParam(value = "appointmentType") String appointmentType,
+                                                      @RequestParam(value = "completeStatus", required = false) String completeStatus,
                                   @RequestParam(value = "isCurrentDateAfter") String isCurrentDateAfter,
                                    @RequestParam(value = "refreshDate",required = false) String refreshDate){
-        List ret =this.appointmentInfoService.getAppointListByServiceId(serviceAreaId,operatorId,beginDate,endDate,appointmentType,isCurrentDateAfter,refreshDate);
+        List ret = this.appointmentInfoService.getAppointListByServiceId(serviceAreaId, operatorId, beginDate, endDate, appointmentType, isCurrentDateAfter, refreshDate, completeStatus);
         if(ret ==null){
             return ResultData.fail("查询失败");
         }else{

src/main/java/com/nmgs/controller/FileController.java

@@ -0,0 +1,87 @@
+package com.nmgs.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.nmgs.config.ResultData;
+import com.nmgs.util.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.File;
+import java.util.Base64;
+import java.util.Properties;
+
+@RestController
+@RequestMapping(value = "/fileSolve")
+@Api(tags = "附件处理")
+@Async("integralManagerHttpThreadPool")
+public class FileController {
+    @RequestMapping(value = "/delFile", method = {RequestMethod.POST})
+    @ApiOperation(value = "删除附件")
+    public ResultData<String> delFile(@RequestParam(value = "fileName") String fileName, @RequestParam(value = "canDel") String canDel) {
+        boolean isXunhuan = false;
+        if ("Y".equals(canDel)) {
+            isXunhuan = true;
+        }
+        LogUtil.WriteLog_Info("附件删除接口执行开始===========" + PubTools.getCurrentDate() + "==参数fileName====" + fileName, "FileController");
+        ImageUtils.delFile(fileName, isXunhuan);
+        LogUtil.WriteLog_Info("附件删除接口执行结束===========" + PubTools.getCurrentDate(), "FileController");
+        return ResultData.success(1, "删除成功");
+    }
+
+    @RequestMapping(value = "/uploadFile", method = {RequestMethod.POST})
+    @ApiOperation(value = "上传附件到本项目和远程指定目录")
+    public ResultData<String> uploadFile(@RequestParam("jsonArray") String jsonArray) {
+        try {
+            LogUtil.WriteLog_Info("附件上传接口执行开始===========" + PubTools.getCurrentDate(), "FileController");
+            Properties props = System.getProperties();
+            String os = props.getProperty("os.name").toLowerCase();
+            String fileAddressLocal = PathUtil.uploadPath;
+            if (os.startsWith("win")) {
+                //    fileAddressLocal = PropertiesUtil.getValue("fileAddressWin");
+                fileAddressLocal = fileAddressLocal.replace("/", "\\");
+            } else {
+                //   fileAddressLocal = PropertiesUtil.getValue("fileAddressLinux");
+            }
+            LogUtil.WriteLog_Info("附件上传接口====fileAddressLocal====" + fileAddressLocal, "FileController");
+            if (!PubTools.isNull(fileAddressLocal)) {
+                File filePath = new File(fileAddressLocal);
+                if (!filePath.exists()) {
+                    filePath.mkdir();
+                }
+                JSONArray from = JSONObject.parseArray(jsonArray);
+                LogUtil.WriteLog_Info("附件上传接口====jsonArray====" + jsonArray, "FileController");
+                if (from.size() > 0) {
+                    for (int k = 0; k < from.size(); k++) {
+                        JSONObject map = (JSONObject) from.get(k);
+                        String fileName = map.get("fileName").toString();
+                        String imageBase64 = map.get("imageBase64").toString();
+                        if (PubTools.isNull(fileName) && PubTools.isNull(imageBase64)) {
+                            continue;
+                        }
+                        if (!PubTools.isNull(imageBase64)) {
+                            // ImageUtils.delFile(fileName, false);
+                            byte[] imageBytes = Base64.getDecoder().decode(imageBase64);
+                            // 创建文件
+                            File file = new File(fileAddressLocal, fileName); // 指定上传位置
+                            if (file.exists()) {
+                                file.delete();
+                            }
+                            // 保存文件
+                            LogUtil.WriteLog_Info("附件开始上传到服务器===========" + PubTools.getCurrentDate(), "FileController");
+                            org.apache.commons.io.FileUtils.writeByteArrayToFile(file, imageBytes);
+                            LogUtil.WriteLog_Info("附件上传到服务器结束===========" + PubTools.getCurrentDate(), "FileController");
+                        }
+                    }
+                }
+
+            }
+            LogUtil.WriteLog_Info("附件上传接口执行结束===========" + PubTools.getCurrentDate(), "FileController");
+        } catch (Exception e) {
+            return ResultData.fail("上传附件失败====" + e.getMessage());
+        }
+        return ResultData.success(1, "上传成功");
+    }
+}

src/main/java/com/nmgs/controller/SolveUserAndVehclePicController.java

@@ -0,0 +1,43 @@
+package com.nmgs.controller;
+
+import com.nmgs.config.ResultData;
+import com.nmgs.service.UserTableService;
+import com.nmgs.service.impl.SolveUserAndVehcleServiceImpl;
+import com.nmgs.util.PubTools;
+import com.nmgs.util.WebsocketUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("solveUserAndVehclePic")
+@Api(tags = "用户和车辆照片处理")
+public class SolveUserAndVehclePicController {
+
+    public SolveUserAndVehcleServiceImpl solveUserAndVehcleServiceImpl;
+
+    @Autowired
+    public void setUserTableService(SolveUserAndVehcleServiceImpl solveUserAndVehcleServiceImplT) {
+        this.solveUserAndVehcleServiceImpl = solveUserAndVehcleServiceImplT;
+    }
+
+    @RequestMapping(value = "syncFile",
+            method = {RequestMethod.POST}
+    )
+    @ApiOperation(value = "同步附件到服务器", httpMethod = "POST")
+    public ResultData<String> syncFile(@RequestParam("syncType") String syncType) {
+        try {
+            solveUserAndVehcleServiceImpl.syncFile(syncType);
+        } catch (Exception e) {
+            return ResultData.fail("同步失败====>" + e.getMessage());
+        }
+        return ResultData.success(1, "同步成功");
+    }
+
+}

src/main/java/com/nmgs/controller/UserVehicleController.java

@@ -142,7 +142,7 @@ public class UserVehicleController {
                                                 @RequestParam(value ="CERTIFICATION",required = false) String CERTIFICATION,
                                                 @RequestParam(value ="REFERRERCODE",required = false) String REFERRERCODE
                                                 ){
-        LogUtil.WriteLog_Info("更新用户车牌信息=====USERID==>"+USERID+"=====ACARNO======>"+ACARNO,"UserVehicleController");
+        LogUtil.WriteLog_Info("更新用户车牌信息=====USERID==>" + USERID + "=====ACARNO======>" + ACARNO + "======CHECKUSERNAME======" + CHECKUSERNAME + "====CHECKUSERNUMBER=====" + CHECKUSERNUMBER, "UserVehicleController");
         if(PubTools.isNull(LICENSEPIC) || PubTools.isNull(PERMITPIC) || PubTools.isNull(VEHICLEPIC)){
             return ResultData.fail("附件不允许为空");
         }

src/main/java/com/nmgs/service/AppointmentInfoService.java

@@ -46,9 +46,10 @@ public interface AppointmentInfoService {
     * @param endTime 结束时间
     * @param appointmentType 预约类型(加油还是加气)
     * @param isCurrentDateAfter 是否只查询今日及以后得数据
+    * @param completeStatus 核销状态
     * @return
     */
-   public List getAppointListByServiceId(String serviceAreaId,String operatorId,String beginTime,String endTime,String appointmentType,String isCurrentDateAfter,String refreshDate);
+   public List getAppointListByServiceId(String serviceAreaId, String operatorId, String beginTime, String endTime, String appointmentType, String isCurrentDateAfter, String refreshDate, String completeStatus);
 
    /**
     * 获取餐饮预约核销二维码

src/main/java/com/nmgs/service/impl/ApponintmentInfoServiceImpl.java

@@ -507,7 +507,7 @@ public class ApponintmentInfoServiceImpl implements AppointmentInfoService {
     }
 
     @Override
-    public List getAppointListByServiceId(String serviceAreaId,String operatorId, String beginTime, String endTime, String appointmentType,String isCurrentDateAfter,String refreshDate) {
+    public List getAppointListByServiceId(String serviceAreaId, String operatorId, String beginTime, String endTime, String appointmentType, String isCurrentDateAfter, String refreshDate, String completeStatus) {
         List ret=null;
         List listRet=new ArrayList();
         String sqlTemp=sql;
@@ -559,6 +559,9 @@ public class ApponintmentInfoServiceImpl implements AppointmentInfoService {
                     sqlTemp += " and ait.CREATETIME >=str_to_date('"+refreshDate+"','%Y-%m-%d %H:%i:%s')";
                 }
             }
+            if (!PubTools.isNull(completeStatus)) {
+                sqlTemp += " and ait.COMPLETESTATUS ='" + completeStatus + "'";
+            }
             sqlTemp +=" order by ait.APPOINTMENTTYPE ,ait.APPOINTMENTTIME DESC,ait.CREATETIME DESC";
             ret= this.mapperI.selectforlist(sqlTemp);
             if(ret != null && ret.size()>0){
@@ -578,6 +581,7 @@ public class ApponintmentInfoServiceImpl implements AppointmentInfoService {
                                     jo.put("MEALNAME",select.get("MEALNAME"));
                                     jo.put("APPOINTMENTTIME",map.get("APPOINTMENTTIME"));
                                     jo.put("CREATETIME",map.get("CREATETIME"));
+                                    jo.put("COMPLETESTATUS", map.get("COMPLETESTATUS"));
                                     jo.put("MEALCOUNT",splitMealCount[k]);
                                     jo.put("MEALINFO",select.get("MEALINFO"));
                                     jo.put("MEALPIC",PubTools.isEmpty(select.get("MEALPIC"))?"":(PubTools.isNull(PubTools.ClobToString(select.get("MEALPIC")))?"":PubTools.ClobToString(select.get("MEALPIC"))));

src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java

@@ -180,7 +180,7 @@ static{
                     Map<String, Object> obj1 = (Map<String, Object>) obj;
                     if(!PubTools.isEmpty(obj1.get("PICDATA")) ){
                         Object o=obj1.get("PICDATA");
-                        String s = ClobToString( o);
+                        String s = PubTools.ClobToString(o);
                         if(!PubTools.isNull(s)){
                             obj1.remove("PICDATA");
                             obj1.put("PICDATA",s);

src/main/java/com/nmgs/service/impl/SolveUserAndVehcleServiceImpl.java

@@ -0,0 +1,188 @@
+package com.nmgs.service.impl;
+
+import cn.hutool.core.collection.ListUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.nmgs.mapper.Mapper;
+import com.nmgs.util.HttpClientUtil;
+import com.nmgs.util.LogUtil;
+import com.nmgs.util.PropertiesUtil;
+import com.nmgs.util.PubTools;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+
+@Service
+public class SolveUserAndVehcleServiceImpl {
+    @Autowired
+    public Mapper mapperI;
+    public String userSql = "select wut.OPENID FROM WEIXN_USER_TABLE wut WHERE wut.CERTIFICATION in(1,2,3) ";
+    public String userVehcleSql = "select uvt.USERID,uvt.ACARNO,uvt.LICENSEPIC,uvt.PERMITPIC,uvt.VEHICLEPIC FROM USER_VEHICLE_TABLE uvt WHERE uvt.CERTIFICATION in(1,2,3)  ";
+
+    /**
+     * 同步附件到服务器
+     *
+     * @param syncType ALL 同步全部，PART 同步未同步过的数据
+     * @return
+     */
+    public void syncFile(String syncType) throws IOException, InterruptedException {
+        Properties props = System.getProperties();
+        String os = props.getProperty("os.name").toLowerCase();
+        String fileAddress = "";
+        if (os.startsWith("win")) {
+            fileAddress = PropertiesUtil.getValue("fileAddressWin");
+            fileAddress = fileAddress.replace("/", "\\");
+        } else {
+            fileAddress = PropertiesUtil.getValue("fileAddressLinux");
+        }
+        if (!"ALL".equals(syncType)) {
+            userSql += " AND (wut.NUMBERPICNAME IS NULL OR wut.NUMBERPICNAME='')";
+            userVehcleSql += "AND (uvt.LICENSEPICNAME IS NULL OR uvt.LICENSEPICNAME='')";
+        }
+
+        List selectforlist = this.mapperI.selectforlist(userSql);
+        List userVehcleList = this.mapperI.selectforlist(userVehcleSql);
+        Map<String, String> map = new HashMap<String, String>();
+        JSONArray jsonA = new JSONArray();
+        if (selectforlist != null && selectforlist.size() > 0) {
+            LogUtil.WriteLog_Info("人员附件开始同步====" + PubTools.getCurrentDate() + "==={执行数据量}====" + selectforlist.size(), "SolveUserAndVehcleServiceImpl");
+            for (int k = 0; k < selectforlist.size(); k++) {
+                Object o = selectforlist.get(k);
+                if (!PubTools.isEmpty(o)) {
+                    Map<String, Object> mapObjectUser = (Map<String, Object>) o;
+                    String openId = mapObjectUser.get("OPENID").toString();
+                    String sqlTemp = "select NUMBERPIC FROM WEIXN_USER_TABLE WHERE OPENID='" + openId + "'";
+                    Map<String, Object> mapObject = this.mapperI.select(sqlTemp);
+                    String numPicName = "";
+                    if (!PubTools.isEmpty(mapObject.get("NUMBERPIC"))) {
+                        String numberpic = PubTools.ClobToString(mapObject.get("NUMBERPIC"));
+                        String fileName = openId + "NUMPIC" + ".jpg";
+                        numPicName = fileName;
+                        byte[] imageBytes = Base64.getDecoder().decode(numberpic);
+                        // 创建文件
+                        File file = new File(fileAddress, fileName); // 指定上传位置
+                        //先删除附件
+                        if (file.exists()) {
+                            file.delete();
+                        }
+                        // 保存文件
+                        org.apache.commons.io.FileUtils.writeByteArrayToFile(file, imageBytes);
+                        JSONObject mapParam = new JSONObject();
+                        mapParam.put("fileName", fileName);
+                        mapParam.put("imageBase64", numberpic);
+                        jsonA.add(mapParam);
+
+                    }
+                    if (!PubTools.isNull(numPicName)) {
+                        String sql = "UPDATE WEIXN_USER_TABLE set NUMBERPICNAME='" + numPicName + "'  WHERE CERTIFICATION in(1,2,3) AND OPENID='" + openId + "'";
+                        this.mapperI.update(sql);
+                    }
+                }
+
+                if ((k + 1) % 5 == 0) {
+                    Thread.sleep(10 * 1000);
+                }
+            }
+        }
+        if (userVehcleList != null && userVehcleList.size() > 0) {
+            for (int k = 0; k < userVehcleList.size(); k++) {
+                Object o = userVehcleList.get(k);
+                if (!PubTools.isEmpty(o)) {
+                    Map<String, Object> mapObjectVeh = (Map<String, Object>) o;
+                    String vehPicName = "";
+                    String perPicName = "";
+                    String licPicName = "";
+                    String userId = mapObjectVeh.get("USERID").toString();
+                    String aCarNo = mapObjectVeh.get("ACARNO").toString();
+                    String fileNamePre = userId + "-" + aCarNo + "-";
+                    String fileNameAfter = ".jpg";
+
+                    String tempSql = "select uvt.LICENSEPIC,uvt.PERMITPIC,uvt.VEHICLEPIC FROM USER_VEHICLE_TABLE uvt WHERE uvt.CERTIFICATION in(1,2,3) AND uvt.USERID=" + userId + " AND uvt.ACARNO='" + aCarNo + "'";
+                    List selectforlist1 = this.mapperI.selectforlist(tempSql);
+                    Map<String, Object> mapObject = new HashMap<String, Object>();
+                    if (selectforlist1 != null && selectforlist1.size() > 0) {
+                        mapObject = (Map<String, Object>) selectforlist1.get(0);
+                    }
+                    if (!PubTools.isEmpty(mapObject.get("LICENSEPIC"))) {
+                        String numberpic = PubTools.ClobToString(mapObject.get("LICENSEPIC"));
+                        String fileName = fileNamePre + "LICPIC" + fileNameAfter;
+                        licPicName = fileName;
+                        byte[] imageBytes = Base64.getDecoder().decode(numberpic);
+                        // 创建文件
+                        File file = new File(fileAddress, fileName); // 指定上传位置
+                        //先删除附件
+                        if (file.exists()) {
+                            file.delete();
+                        }
+                        // 保存文件
+                        org.apache.commons.io.FileUtils.writeByteArrayToFile(file, imageBytes);
+                        Map<String, String> mapParam = new HashMap<String, String>();
+                        mapParam.put("fileName", fileName);
+                        mapParam.put("imageBase64", numberpic);
+                        jsonA.add(mapParam);
+
+                    }
+                    if (!PubTools.isEmpty(mapObject.get("PERMITPIC"))) {
+                        String numberpic = PubTools.ClobToString(mapObject.get("PERMITPIC"));
+                        String fileName = fileNamePre + "PERPIC" + fileNameAfter;
+                        perPicName = fileName;
+                        byte[] imageBytes = Base64.getDecoder().decode(numberpic);
+                        // 创建文件
+                        File file = new File(fileAddress, fileName); // 指定上传位置
+                        //先删除附件
+                        if (file.exists()) {
+                            file.delete();
+                        }
+                        // 保存文件
+                        org.apache.commons.io.FileUtils.writeByteArrayToFile(file, imageBytes);
+                        Map<String, String> mapParam = new HashMap<String, String>();
+                        mapParam.put("fileName", fileName);
+                        mapParam.put("imageBase64", numberpic);
+                        jsonA.add(mapParam);
+
+                    }
+                    if (!PubTools.isEmpty(mapObject.get("VEHICLEPIC"))) {
+                        String numberpic = PubTools.ClobToString(mapObject.get("VEHICLEPIC"));
+                        String fileName = fileNamePre + "VEHPIC" + fileNameAfter;
+                        vehPicName = fileName;
+                        byte[] imageBytes = Base64.getDecoder().decode(numberpic);
+                        // 创建文件
+                        File file = new File(fileAddress, fileName); // 指定上传位置
+                        //先删除附件
+                        if (file.exists()) {
+                            file.delete();
+                        }
+                        // 保存文件
+                        org.apache.commons.io.FileUtils.writeByteArrayToFile(file, imageBytes);
+                        JSONObject mapParam = new JSONObject();
+                        mapParam.put("fileName", fileName);
+                        mapParam.put("imageBase64", numberpic);
+                        jsonA.add(mapParam);
+
+                    }
+
+                    if (!PubTools.isNull(vehPicName) || !PubTools.isNull(perPicName) || !PubTools.isNull(licPicName)) {
+                        String sql = "UPDATE USER_VEHICLE_TABLE set LICENSEPICNAME='" + licPicName + "',PERMITPICNAME='" + perPicName + "',VEHICLEPICNAME='" + vehPicName + "'  WHERE CERTIFICATION in(1,2,3) AND USERID=" + userId + " AND ACARNO='" + aCarNo + "'";
+                        this.mapperI.update(sql);
+                    }
+                }
+                if ((k + 1) % 5 == 0) {
+                    Thread.sleep(10 * 1000);
+                }
+            }
+        }
+        if (jsonA.size() > 0) {
+            map.put("jsonArray", jsonA.toJSONString());
+            //保存到附件服务器上面
+            String fileUploadUrl = PropertiesUtil.getValue("fileUploadUrl");
+            LogUtil.WriteLog_Info("ImageUtils====附件上传接口fileUploadUrl=====" + fileUploadUrl, "FileController");
+            String s = HttpClientUtil.doPost(fileUploadUrl, map);
+            LogUtil.WriteLog_Info("ImageUtils====附件上传结果显示=====" + s, "FileController");
+        }
+    }
+
+}

src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java

@@ -37,6 +37,7 @@ public class UserTableServiceImpl implements UserTableService {
             " ROUND((ut.CAFENABLEINTEGRATION/100),1) AS CAFENABLEINTEGRATION," +
             " ROUND((ut.OGENABLEINTEGRATION/100),1) AS OGENABLEINTEGRATION," +
             " ROUND((ut.CPENABLEINTEGRATION/100),1) AS CPENABLEINTEGRATION," +
+            " ut.NUMBERPICNAME AS NUMBERPICNAME," +
             " ut.REFERRERCODE AS REFERRERCODE," +
             " cst.VALUE as CERTIFICATIONNAME" +
             " from WEIXN_USER_TABLE ut " +
@@ -57,6 +58,7 @@ public class UserTableServiceImpl implements UserTableService {
                     " ROUND((ut.OGENABLEINTEGRATION/100),1) AS OGENABLEINTEGRATION," +
                     " ROUND((ut.CPENABLEINTEGRATION/100),1) AS CPENABLEINTEGRATION," +
                     " ut.REFERRERCODE AS REFERRERCODE," +
+                    " ut.NUMBERPICNAME AS NUMBERPICNAME," +
                     " cst.VALUE as CERTIFICATIONNAME" +
                     " from WEIXN_USER_TABLE ut " +
                     " left join certification_status_text  cst on(ut.CERTIFICATION = cst.ID)" +
@@ -121,17 +123,19 @@ public class UserTableServiceImpl implements UserTableService {
         int ret=-1;
         try{
             //图片加水印
+            String fileName = userId + "NUMPIC" + ".jpg";
             if(!PubTools.isNull(numberPic)){
-                String permitpicPic = ImageUtils.addImageWaterMark(numberPic, "仅用于内蒙古交通货运车辆积分会员认证", userId + "NUMPIC" + ".jpg");
+                String permitpicPic = ImageUtils.addImageWaterMark(numberPic, "仅用于内蒙古交通货运车辆积分会员认证", fileName);
                 if(!PubTools.isNull(permitpicPic)){
                     numberPic=permitpicPic;
                 }
             }
+
             if("2".equals(DBType)){
                 numberPic=PubTools.StringToClob(numberPic);
             }
             String sql="update WEIXN_USER_TABLE " +
-                    " set CERTIFICATION=2 ";
+                    " set CERTIFICATION=2,NUMBERPICNAME='" + fileName + "'";
             if (!PubTools.isNull(realName)) {
                 sql += ",REALNAME='" + realName + "'";
             }
@@ -252,6 +256,7 @@ public class UserTableServiceImpl implements UserTableService {
                 " ROUND((ut.OGENABLEINTEGRATION/100),1) AS OGENABLEINTEGRATION," +
                 " ROUND((ut.CPENABLEINTEGRATION/100),1) AS CPENABLEINTEGRATION," +
                 " ut.REFERRERCODE AS REFERRERCODE," +
+                  " ut.NUMBERPICNAME AS NUMBERPICNAME," +
                 " cst.VALUE as CERTIFICATIONNAME" +
                 " from WEIXN_USER_TABLE ut " +
                 " left join certification_status_text  cst on(ut.CERTIFICATION = cst.ID)" +
@@ -265,7 +270,7 @@ public class UserTableServiceImpl implements UserTableService {
                 for(Object obj:list){
                     Map<String, Object> obj1 = (Map<String, Object>) obj;
                     Object o=obj1.get("NUMBERPIC");
-                        String s = ClobToString( o);
+                    String s = PubTools.ClobToString(o);
                         if(!PubTools.isNull(s)){
                             obj1.remove("NUMBERPIC");
                             obj1.put("NUMBERPIC",s);

src/main/java/com/nmgs/service/impl/UserVehicleServiceImpl.java

@@ -178,6 +178,9 @@ public class UserVehicleServiceImpl implements UserVehicleService {
                     " uvt.ACARNO,uvt.LICENSEPIC AS LICENSEPIC," +
                     " uvt.PERMITPIC AS PERMITPIC," +
                     " uvt.VEHICLEPIC AS VEHICLEPIC," +
+                    " uvt.PERMITPICNAME AS PERMITPICNAME," +
+                    " uvt.VEHICLEPICNAME AS VEHICLEPICNAME," +
+                    " uvt.LICENSEPICNAME AS LICENSEPICNAME," +
                     " uvt.CERTIFICATION," +
                     " uvt.UNPASSINFO," +
                     " COALESCE(uvt.REFERRERCODE,'') AS REFERRERCODE," +
@@ -195,6 +198,9 @@ public class UserVehicleServiceImpl implements UserVehicleService {
                         " uvt.ACARNO,uvt.LICENSEPIC AS LICENSEPIC," +
                         " uvt.PERMITPIC AS PERMITPIC," +
                         " uvt.VEHICLEPIC AS VEHICLEPIC," +
+                        " uvt.PERMITPICNAME AS PERMITPICNAME," +
+                        " uvt.VEHICLEPICNAME AS VEHICLEPICNAME," +
+                        " uvt.LICENSEPICNAME AS LICENSEPICNAME," +
                         " uvt.CERTIFICATION," +
                         " uvt.UNPASSINFO," +
                         " COALESCE(uvt.REFERRERCODE,'') AS REFERRERCODE," +
@@ -214,17 +220,17 @@ public class UserVehicleServiceImpl implements UserVehicleService {
                     Object o=obj1.get("LICENSEPIC");
                     Object oP=obj1.get("PERMITPIC");
                     Object oV=obj1.get("VEHICLEPIC");
-                        String s = ClobToString( o);
+                    String s = PubTools.ClobToString(o);
                         if(!PubTools.isNull(s)){
                             obj1.remove("LICENSEPIC");
                             obj1.put("LICENSEPIC", s);
                         }
-                        String s2 = ClobToString(oP);
+                    String s2 = PubTools.ClobToString(oP);
                         if(!PubTools.isNull(s2)){
                             obj1.remove("PERMITPIC");
                             obj1.put("PERMITPIC",s2);
                         }
-                        String s3 = ClobToString(oV);
+                    String s3 = PubTools.ClobToString(oV);
                         if(!PubTools.isNull(s3)){
                             obj1.remove("VEHICLEPIC");
                             obj1.put("VEHICLEPIC",s);
@@ -246,54 +252,60 @@ public class UserVehicleServiceImpl implements UserVehicleService {
                            String permitpic,String  vehiclePic,String certification,String referrerCode) {
         int ret=1;
         try{
+            String fileNamePre = userId + "-" + aCarNo + "-";
+            String fileNameAfter = ".jpg";
                    //图片加水印
                     if(!PubTools.isNull(permitpic)){
-                        String permitpicPic = ImageUtils.addImageWaterMark(permitpic, "仅用于内蒙古交通货运车辆积分会员认证", userId + aCarNo + "per.jpg");
+                        String permitpicPic = ImageUtils.addImageWaterMark(permitpic, "仅用于内蒙古交通货运车辆积分会员认证", fileNamePre + "PERPIC" + fileNameAfter);
                         if(!PubTools.isNull(permitpicPic)){
                             permitpic=permitpicPic;
                         }
                     }
-                   if(!PubTools.isNull(permitpic) && "2".equals(DBType)){
-                       permitpic=PubTools.StringToClob(permitpic);
-                   }else if(!PubTools.isNull(permitpic) && "4".equals(DBType)){
-
-                   }else{
-                       permitpic="";
-                   }
             //图片加水印
                     if(!PubTools.isNull(licensepic)){
-                        String permitpicPic = ImageUtils.addImageWaterMark(licensepic, "仅用于内蒙古交通货运车辆积分会员认证", userId + aCarNo + "lic.jpg");
+                        String permitpicPic = ImageUtils.addImageWaterMark(licensepic, "仅用于内蒙古交通货运车辆积分会员认证", fileNamePre + "LICPIC" + fileNameAfter);
                         if(!PubTools.isNull(permitpicPic)){
                             licensepic=permitpicPic;
                         }
                     }
-
-                    if(!PubTools.isNull(licensepic) && "2".equals(DBType)){
-                        licensepic=PubTools.StringToClob(licensepic);
-                    }else if(!PubTools.isNull(licensepic) && "4".equals(DBType)){
-
-                    }else{
-                        licensepic="";
-                    }
                 //图片加水印
                 if(!PubTools.isNull(vehiclePic)){
-                    String permitpicPic = ImageUtils.addImageWaterMark(vehiclePic, "仅用于内蒙古交通货运车辆积分会员认证", userId + aCarNo + "veh.jpg");
+                    String permitpicPic = ImageUtils.addImageWaterMark(vehiclePic, "仅用于内蒙古交通货运车辆积分会员认证", fileNamePre + "VEHPIC" + fileNameAfter);
                     if(!PubTools.isNull(permitpicPic)){
                         vehiclePic=permitpicPic;
                     }
                 }
-                    if(!PubTools.isNull(vehiclePic) && "2".equals(DBType)){
+            String sql = "update user_vehicle_table " +
-                        vehiclePic=PubTools.StringToClob(vehiclePic);
+                    " set CERTIFICATION=" + certification + "";
-                    }else if(!PubTools.isNull(vehiclePic) && "4".equals(DBType)){
+            if ("2".equals(DBType)) {
-
+                if (!PubTools.isNull(licensepic)) {
-                    }else{
+                    licensepic = PubTools.StringToClob(licensepic);
-                        vehiclePic="";
+                    sql += ",LICENSEPIC=" + licensepic;
-                    }
+                    sql += ",LICENSEPICNAME='" + fileNamePre + "LICPIC" + fileNameAfter + "'";
-
+                }
-                    String sql="update user_vehicle_table "+
+                if (!PubTools.isNull(permitpic)) {
-                            " set LICENSEPIC=" + licensepic + ",PERMITPIC=" + permitpic + ",VEHICLEPIC=" + vehiclePic + "  ";
+                    permitpic = PubTools.StringToClob(permitpic);
-            if (!PubTools.isNull(certification)) {
+                    sql += ",PERMITPIC=" + permitpic;
-                sql += ",CERTIFICATION=" + certification;
+                    sql += ",PERMITPICNAME='" + fileNamePre + "PERPIC" + fileNameAfter + "'";
+                }
+                if (!PubTools.isNull(vehiclePic)) {
+                    vehiclePic = PubTools.StringToClob(vehiclePic);
+                    sql += ",VEHICLEPIC=" + vehiclePic;
+                    sql += ",VEHICLEPICNAME='" + fileNamePre + "VEHPIC" + fileNameAfter + "'";
+                }
+            } else if ("4".equals(DBType)) {
+                if (!PubTools.isNull(licensepic)) {
+                    sql += ",LICENSEPIC='" + licensepic + "'";
+                    sql += ",LICENSEPICNAME='" + fileNamePre + "LICPIC" + fileNameAfter + "'";
+                }
+                if (!PubTools.isNull(permitpic)) {
+                    sql += ",PERMITPIC='" + permitpic + "'";
+                    sql += ",PERMITPICNAME='" + fileNamePre + "PERPIC" + fileNameAfter + "'";
+                }
+                if (!PubTools.isNull(vehiclePic)) {
+                    sql += ",VEHICLEPIC='" + vehiclePic + "'";
+                    sql += ",VEHICLEPICNAME='" + fileNamePre + "VEHPIC" + fileNameAfter + "'";
+                }
             }
             if (!PubTools.isNull(referrerCode)) {
                 sql += ",REFERRERCODE='" + referrerCode + "'";
@@ -307,29 +319,9 @@ public class UserVehicleServiceImpl implements UserVehicleService {
             if (!PubTools.isNull(referrerCode)) {
                 sql += ",REFERRERCODE='" + referrerCode + "'";
             }
-
             sql += " where USERID=" + userId + " and ACARNO='" + aCarNo + "' AND CERTIFICATION not in(4)";
-                    if("4".equals(DBType)){
+
-                        sql="update user_vehicle_table "+
+            this.mapperI.insert(sql);
-                                " set LICENSEPIC='" + licensepic + "',PERMITPIC='" + permitpic + "',VEHICLEPIC='" + vehiclePic + "'";
-                        if (!PubTools.isNull(certification)) {
-                            sql += ",CERTIFICATION=" + certification;
-                        }
-                        if (!PubTools.isNull(referrerCode)) {
-                            sql += ",REFERRERCODE='" + referrerCode + "'";
-                        }
-                        if (!PubTools.isNull(checkName)) {
-                            sql += ",CHECKUSERNAME='" + checkName + "'";
-                        }
-                        if (!PubTools.isNull(checkUserNumber) && !checkUserNumber.contains("*")) {
-                            sql += ",CHECKUSERNUMBER='" + checkUserNumber + "'";
-                        }
-                        if (!PubTools.isNull(referrerCode)) {
-                            sql += ",REFERRERCODE='" + referrerCode + "'";
-                        }
-                        sql += " where USERID=" + userId + " and ACARNO='" + aCarNo + "' AND CERTIFICATION not in(4)";
-                    }
-                    this.mapperI.insert(sql);
         }catch (Exception e){
             LogUtil.WriteLog_Error("批量修改车牌失败===>"+e.getMessage(),"UserVehicleServiceImpl");
             return ret=-1;

src/main/java/com/nmgs/util/HttpClientUtil.java

@@ -81,7 +81,7 @@ public class HttpClientUtil {
                     paramList.add(new BasicNameValuePair(key, param.get(key)));
                 }
                 // 模拟表单
-                UrlEncodedFormEntity entity = new UrlEncodedFormEntity(paramList);
+                UrlEncodedFormEntity entity = new UrlEncodedFormEntity(paramList, "UTF-8");
                 httpPost.setEntity(entity);
             }
             // 执行http请求
@@ -90,16 +90,18 @@ public class HttpClientUtil {
             if (response.getStatusLine().getStatusCode() == 200) {
                 resultString = EntityUtils.toString(response.getEntity(), "utf-8");
             }else{
-                resultString="积分变动通知失败";
+                resultString = "http请求失败";
             }
 
         } catch (Exception e) {
             e.printStackTrace();
+            LogUtil.WriteLog_Info("远程接口请求报错HttpClientUtil=========" + e.getMessage(), "FileController");
         } finally {
             try {
                 response.close();
             } catch (IOException e) {
                 e.printStackTrace();
+                LogUtil.WriteLog_Info("远程接口请求报错HttpClientUtil222=========" + e.getMessage(), "FileController");
             }
         }
         return resultString;

src/main/java/com/nmgs/util/PathUtil.java

@@ -48,21 +48,23 @@ public class PathUtil {
             isWin = true;
 //            TomcatPath = System.getProperty("user.dir").substring(0, System.getProperty("user.dir").lastIndexOf('\\'));
             webappsPath = TomcatPath + "\\webapps";
-            uploadPath = TomcatPath + "\\integralFile";
+            // uploadPath = TomcatPath + "\\integralFile";
             uploadWarPath = TomcatPath + "\\taskWarFiles\\uploadWarFile";
             downloadWarPath = TomcatPath + "\\taskWarFiles\\downloadWarFile";
             webPath = webPath.substring(1, webPath.length()) + webName;
         } else {
             webappsPath = TomcatPath + "/webapps";
-            uploadPath = TomcatPath + "/integralFile";
+            // uploadPath = TomcatPath + "/integralFile";
             uploadWarPath = TomcatPath + "/taskWarFiles/uploadWarFile";
             downloadWarPath = TomcatPath + "/taskWarFiles/downloadWarFile";
             webPath = webPath + webName;
         }
+        uploadPath = webappsPath + "/integralFile";
         applicationPath = webappsPath + "/application.properties";
         applicationTextPath = webappsPath + "/applicationText.properties";
         WebServiceWarPath = TomcatPath + "/WebServiceWar";
         tomcatUserXMLPath = TomcatPath + "/conf/tomcat-users.xml";
+
         //            hostAddress = Inet4Address.getLocalHost().getHostAddress();
         hostAddress = String.valueOf(getInet4Address());
         if(isWin){

src/main/java/com/nmgs/util/PubTools.java

@@ -221,6 +221,8 @@ public class PubTools {
                 reString = ((CLOB)clob).getSubString((long) 1, (int) ((CLOB)clob).length());
             }else if(clob instanceof Blob){
                 reString = clob.toString();
+            } else if (clob instanceof String) {
+                reString = clob.toString();
             }
         }catch (Exception e){
             reString="";