Browse Source

Merge branch 'dev' of http://114.244.114.158:8802/siwei/sanya-data-management-back into dev

gushoubang 11 tháng trước cách đây
mục cha
commit
ded461a59d
14 tập tin đã thay đổi với 151 bổ sung331 xóa
  1. 9 0
      onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/zymlapplication/MyApplicationController.java
  2. 9 0
      onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/zymlapplication/MyExamineController.java
  3. 10 0
      onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/zymlapplication/ShareConfigurationController.java
  4. 17 5
      onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/zymlapplication/ShareResourcesController.java
  5. 12 25
      onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/zymlapplication/TZymlApplicationRecord.java
  6. 13 3
      onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/zymlapplication/TZymlFiled.java
  7. 15 5
      onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/zymlapplication/MyExamineServiceImpl.java
  8. 18 22
      onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/zymlapplication/ShareConfigurationServiceImp.java
  9. 7 1
      onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/zymlapplication/TZymlApplicationRecordMapper.xml
  10. 6 3
      onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/zymlapplication/TZymlFiledMapper.xml
  11. 7 18
      onemap-modules/onemap-spatial/src/main/java/com/onemap/spatial/controller/ProxyHandleControllect.java
  12. 0 200
      onemap-modules/onemap-spatial/src/main/java/com/onemap/spatial/controller/ProxyHandleControllectBak.java
  13. 3 3
      onemap-modules/onemap-spatial/src/main/java/com/onemap/spatial/domain/TZymlApplicationRecordVo.java
  14. 25 46
      onemap-modules/onemap-spatial/src/main/java/com/onemap/spatial/service/impl/ProxyHandleServiceImpl.java

+ 9 - 0
onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/zymlapplication/MyApplicationController.java

@@ -8,6 +8,7 @@ import com.onemap.common.core.web.domain.AjaxResult;
 import com.onemap.common.core.web.page.TableDataInfo;
 import com.onemap.common.log.annotation.Log;
 import com.onemap.common.log.enums.BusinessType;
+import com.onemap.common.security.annotation.RequiresPermissions;
 import com.onemap.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -67,5 +68,13 @@ public class MyApplicationController extends BaseController {
         return toAjax(tZymlApplicationRecordService.updateTZymlApplicationRecord(newRecord));
     }
 
+    /**
+     * 详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id) {
+        return success(tZymlApplicationRecordService.selectTZymlApplicationRecordById(id));
+    }
+
 
 }

+ 9 - 0
onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/zymlapplication/MyExamineController.java

@@ -70,7 +70,16 @@ public class MyExamineController extends BaseController {
         newRecord.setDeadline(tZymlApplicationRecord.getDeadline());
         newRecord.setSpReason(tZymlApplicationRecord.getSpReason());
         newRecord.setZymlUrl(myExamineService.getProxyServerUrl(fwKey, record.getZymlId()));
+        newRecord.setFwKey(fwKey);
         return toAjax(zymlApplicationRecordService.updateTZymlApplicationRecord(newRecord));
     }
 
+    /**
+     * 详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id) {
+        return success(zymlApplicationRecordService.selectTZymlApplicationRecordById(id));
+    }
+
 }

+ 10 - 0
onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/zymlapplication/ShareConfigurationController.java

@@ -26,6 +26,8 @@ public class ShareConfigurationController extends BaseController {
 
     @Resource
     private IShareConfigurationService shareConfigurationService;
+    @Autowired
+    private ITZymlApplicationRecordService tZymlApplicationRecordService;
 
     /**
      * 共享资源配置
@@ -57,4 +59,12 @@ public class ShareConfigurationController extends BaseController {
         return AjaxResult.success(shareConfigurationService.selectTZymlFiledList(tZymlApplicationRecord.getId()));
     }
 
+    /**
+     * 详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id) {
+        return success(tZymlApplicationRecordService.selectTZymlApplicationRecordById(id));
+    }
+
 }

+ 17 - 5
onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/zymlapplication/ShareResourcesController.java

@@ -2,12 +2,12 @@ package com.onemap.apply.controller.zymlapplication;
 
 import com.onemap.apply.domain.zymlapplication.TZymlApplicationRecord;
 import com.onemap.apply.service.zymlapplication.ITZymlApplicationRecordService;
+import com.onemap.common.core.utils.StringUtils;
 import com.onemap.common.core.web.controller.BaseController;
 import com.onemap.common.core.web.domain.AjaxResult;
 import com.onemap.common.core.web.page.TableDataInfo;
 import com.onemap.common.log.annotation.Log;
 import com.onemap.common.log.enums.BusinessType;
-import com.onemap.common.security.annotation.RequiresPermissions;
 import com.onemap.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -16,7 +16,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * 资源共享页面需要接口
+ * 资源共享页面
  */
 @RestController
 @RequestMapping("/share/resources")
@@ -37,8 +37,13 @@ public class ShareResourcesController extends BaseController {
         tZymlApplicationRecord.setSpTime(null);
         tZymlApplicationRecord.setSpUserBy(null);
         tZymlApplicationRecord.setSpUserId(null);
-        tZymlApplicationRecord.setSqUserBy(SecurityUtils.getUsername());
-        tZymlApplicationRecord.setSqUserId(SecurityUtils.getUserId());
+        if (StringUtils.isNotEmpty(SecurityUtils.getUsername())) {
+            tZymlApplicationRecord.setSqUserBy(SecurityUtils.getUsername());
+            tZymlApplicationRecord.setSqUserId(SecurityUtils.getUserId());
+        } else {
+            tZymlApplicationRecord.setSqUserBy("admin");
+            tZymlApplicationRecord.setSqUserId(1L);
+        }
         tZymlApplicationRecord.setSqTime(new Date());
         tZymlApplicationRecord.setState(1);
         return toAjax(tZymlApplicationRecordService.insertTZymlApplicationRecord(tZymlApplicationRecord));
@@ -47,7 +52,6 @@ public class ShareResourcesController extends BaseController {
     /**
      * 查询我的申请列表
      */
-//    @RequiresPermissions("@ss.hasPermi('share:resources:application:list')")
     @GetMapping("/list")
     public TableDataInfo list(TZymlApplicationRecord tZymlApplicationRecord) {
         startPage();
@@ -56,4 +60,12 @@ public class ShareResourcesController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id) {
+        return success(tZymlApplicationRecordService.selectTZymlApplicationRecordById(id));
+    }
+
 }

+ 12 - 25
onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/zymlapplication/TZymlApplicationRecord.java

@@ -172,6 +172,9 @@ public class TZymlApplicationRecord extends BaseEntity {
     @Excel(name = "状态", readConverterExp = "$column.readConverterExp()")
     private Integer state;
 
+    @Excel(name = "服务KEY")
+    private String fwKey;
+
     public void setId(String id) {
         this.id = id;
     }
@@ -372,32 +375,16 @@ public class TZymlApplicationRecord extends BaseEntity {
         this.sqRevokeReason = sqRevokeReason;
     }
 
+    public String getFwKey() {
+        return fwKey;
+    }
+
+    public void setFwKey(String fwKey) {
+        this.fwKey = fwKey;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("sqUserId", getSqUserId())
-                .append("sqUserBy", getSqUserBy())
-                .append("sqTime", getSqTime())
-                .append("sqDepartmentId", getSqDepartmentId())
-                .append("sqDepartmentBy", getSqDepartmentBy())
-                .append("zymlId", getZymlId())
-                .append("zymlBy", getZymlBy())
-                .append("zymlTypeCode", getZymlTypeCode())
-                .append("zymlTypeName", getZymlTypeName())
-                .append("sqFw", getSqFw())
-                .append("sqReason", getSqReason())
-                .append("systemName", getSystemName())
-                .append("callIp", getCallIp())
-                .append("deadline", getDeadline())
-                .append("attachment", getAttachment())
-                .append("sqDeadline", getSqDeadline())
-                .append("spUserId", getSpUserId())
-                .append("spUserBy", getSpUserBy())
-                .append("spTime", getSpTime())
-                .append("spReason", getSpReason())
-                .append("state", getState())
-                .append("zymlUrl", getZymlUrl())
-                .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("sqUserId", getSqUserId()).append("sqUserBy", getSqUserBy()).append("sqTime", getSqTime()).append("sqDepartmentId", getSqDepartmentId()).append("sqDepartmentBy", getSqDepartmentBy()).append("zymlId", getZymlId()).append("zymlBy", getZymlBy()).append("zymlTypeCode", getZymlTypeCode()).append("zymlTypeName", getZymlTypeName()).append("sqFw", getSqFw()).append("sqReason", getSqReason()).append("systemName", getSystemName()).append("callIp", getCallIp()).append("deadline", getDeadline()).append("attachment", getAttachment()).append("sqDeadline", getSqDeadline()).append("spUserId", getSpUserId()).append("spUserBy", getSpUserBy()).append("spTime", getSpTime()).append("spReason", getSpReason()).append("state", getState()).append("zymlUrl", getZymlUrl()).toString();
     }
 }

+ 13 - 3
onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/zymlapplication/TZymlFiled.java

@@ -24,9 +24,11 @@ public class TZymlFiled extends BaseEntity {
     private String filedName;
     //    private String filed_name_zh;
     private String filedNameZh;
+    private String filedType;
     //    private String share_display;
     private String shareDisplay;
-    private String sort;
+    private Integer sort;
+
     public String getId() {
         return id;
     }
@@ -59,6 +61,14 @@ public class TZymlFiled extends BaseEntity {
         this.filedNameZh = filedNameZh;
     }
 
+    public String getFiledType() {
+        return filedType;
+    }
+
+    public void setFiledType(String filedType) {
+        this.filedType = filedType;
+    }
+
     public String getShareDisplay() {
         return shareDisplay;
     }
@@ -67,11 +77,11 @@ public class TZymlFiled extends BaseEntity {
         this.shareDisplay = shareDisplay;
     }
 
-    public String getSort() {
+    public Integer getSort() {
         return sort;
     }
 
-    public void setSort(String sort) {
+    public void setSort(Integer sort) {
         this.sort = sort;
     }
 }

+ 15 - 5
onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/zymlapplication/MyExamineServiceImpl.java

@@ -4,6 +4,7 @@ import com.onemap.apply.mapper.zymlapplication.TMyExamineMapper;
 import com.onemap.apply.service.zymlapplication.IMyExamineService;
 import com.onemap.common.core.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
@@ -13,7 +14,10 @@ public class MyExamineServiceImpl implements IMyExamineService {
 
     @Autowired
     private TMyExamineMapper myExamineMapper;
-    private String paroxy_url = "http://192.168.60.2:8080/proxy/handle/{token}/";
+
+    @Value("${siweiserver.paroxy.url}")
+    public String serverParoxyUrl;
+//    private String serverParoxyUrl = "http://192.168.60.2:8080/proxy/handle/{token}/siweiserver/";
 
     @Override
     public String getProxyServerUrl(String fwKey, String fwid) {
@@ -23,9 +27,11 @@ public class MyExamineServiceImpl implements IMyExamineService {
         }
         String server_type = (String) mapfwData.get("server_type");
         String type = (String) mapfwData.get("type");
-//        String url = (String) mapfwData.get("url");
+        String url = (String) mapfwData.get("url");
         //判断geoserver
         if (StringUtils.isNotEmpty(server_type) && "geoserver".equals(server_type.toLowerCase())) {
+            int len = url.indexOf("geoserver");
+            url = url.substring(len + 10);
             String fwmc = (String) mapfwData.get("fwmc");
             String fwgzkj = (String) mapfwData.get("fwgzkj");
             String qpfa = (String) mapfwData.get("qpfa");
@@ -34,7 +40,7 @@ public class MyExamineServiceImpl implements IMyExamineService {
             Integer maximumlevel = (Integer) mapfwData.get("maximumlevel");
             Integer minimumlevel = (Integer) mapfwData.get("minimumlevel");
             String params = "";
-            params = params + paroxy_url.replace("{token}", fwKey) + "siweigeoserver" + "?";
+            params = params + serverParoxyUrl.replace("{token}", fwKey) + url + "?";
             params = params + paramsTogether("server_type", type, true);
             params = params + paramsTogether("fwmc", fwmc, true);
             params = params + paramsTogether("fwgzkj", fwgzkj, true);
@@ -47,14 +53,18 @@ public class MyExamineServiceImpl implements IMyExamineService {
         } else {
             //判断3DTiles
             if (StringUtils.isNotEmpty(type) && "3DTiles".toLowerCase().equals(type.toLowerCase())) {
+                int len = url.indexOf("3Dtiles");
+                url = url.substring(len + 8);
                 String params = "";
-                params = params + paroxy_url.replace("{token}", fwKey) + "siwei3dtiles";
+                params = params + serverParoxyUrl.replace("{token}", fwKey) + url;
                 return params;
             } else {
                 //超图的
+                int len = url.indexOf("iserver");
+                url = url.substring(len + 8);
                 String sde = (String) mapfwData.get("sde");
                 String params = "";
-                params = params + paroxy_url.replace("{token}", fwKey) + "siweisupermap" + "?";
+                params = params + serverParoxyUrl.replace("{token}", fwKey) + url + "?";
                 params = params + paramsTogether("server_type", type, true);
                 params = params + paramsTogether("sde", sde, false);
                 return params;

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 18 - 22
onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/zymlapplication/ShareConfigurationServiceImp.java


+ 7 - 1
onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/zymlapplication/TZymlApplicationRecordMapper.xml

@@ -30,10 +30,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="state"    column="state"    />
         <result property="sqRevokeTime"    column="sq_revoke_time"    />
         <result property="sqRevokeReason"    column="sq_revoke_reason"    />
+        <result property="fwKey"    column="fw_key"    />
     </resultMap>
 
     <sql id="selectTZymlApplicationRecordVo">
-        select id, sq_user_id, sq_user_by, sq_time, sq_department_id, sq_department_by, zyml_id, zyml_by, zyml_type_code, zyml_type_name, sq_fw, sq_reason, system_name, call_ip, deadline, attachment, sq_deadline, sp_user_id, sp_user_by, sp_time, sp_reason,zyml_url,  state from t_zyml_application_record
+        select id, sq_user_id, sq_user_by, sq_time, sq_department_id, sq_department_by, zyml_id, zyml_by, zyml_type_code,
+               zyml_type_name, sq_fw, sq_reason, system_name, call_ip, deadline, attachment, sq_deadline,
+               sp_user_id, sp_user_by, sp_time, sp_reason,zyml_url,  state,fw_key,sq_revoke_reason,sq_revoke_time
+        from t_zyml_application_record
     </sql>
 
     <select id="selectTZymlApplicationRecordList" parameterType="TZymlApplicationRecord" resultMap="TZymlApplicationRecordResult">
@@ -60,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spTime != null "> and sp_time = #{spTime}</if>
             <if test="spReason != null  and spReason != ''"> and sp_reason = #{spReason}</if>
             <if test="state != null "> and state = #{state}</if>
+            <if test="fwKey != null "> and fw_key = #{fwKey}</if>
         </where>
     </select>
 
@@ -147,6 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sqRevokeTime != null">sq_revoke_time = #{sqRevokeTime},</if>
             <if test="sqRevokeReason != null  and sqRevokeReason != '' ">sq_revoke_reason = #{sqRevokeReason},</if>
             <if test="zymlUrl != null  and zymlUrl != '' ">zyml_url = #{zymlUrl},</if>
+            <if test="fwKey != null ">fw_key = #{fwKey,}</if>
         </trim>
         where id = #{id}
     </update>

+ 6 - 3
onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/zymlapplication/TZymlFiledMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="zymlId"    column="zyml_id"    />
         <result property="filedName"    column="filed_name"    />
         <result property="filedNameZh"    column="filed_name_zh"    />
+        <result property="filedType"    column="filed_type"    />
         <result property="shareDisplay"    column="share_display"    />
         <result property="sort"    column="sort"    />
     </resultMap>
@@ -38,17 +39,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zymlId != null">zyml_id,</if>
             <if test="filedName != null">filed_name,</if>
             <if test="filedNameZh != null">filed_name_zh,</if>
+            <if test="filedType != null">filed_type,</if>
             <if test="shareDisplay != null">share_display,</if>
-            <if test="sort != sort">sort,</if>
-         </trim>
+            <if test="sort != null">sort,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="zymlId != null">#{zymlId},</if>
             <if test="filedName != null">#{filedName},</if>
             <if test="filedNameZh != null">#{filedNameZh},</if>
+            <if test="filedType != null">#{filedType},</if>
             <if test="shareDisplay != null">#{shareDisplay},</if>
             <if test="sort != null">#{sort},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateTZymlFiled" parameterType="TZymlFiled">

+ 7 - 18
onemap-modules/onemap-spatial/src/main/java/com/onemap/spatial/controller/ProxyHandleControllect.java

@@ -27,23 +27,7 @@ public class ProxyHandleControllect {
     @Resource
     private IProxyHandleService proxyHandleService;
 
-    @GetMapping("/{token}/siweigeoserver/**")
-    public void geoserverHandle(@PathVariable("token") String token, HttpServletRequest request, HttpServletResponse response) throws IOException {
-        String fwId = proxyHandleService.proxyServerCheck(token, request, response);
-        if (StringUtils.isEmpty(fwId)) {
-            isCheckFull(response);
-            return;
-        }
-        TYztZyml serverUrlData = proxyHandleService.proxyServerData(fwId);
-        if (serverUrlData == null) {
-            isCheckFull(response);
-            return;
-        }
-        proxyHandleService.proxyGeoServer(serverUrlData, request, response);
-    }
-
-    //    @GetMapping("/{token}/siweisupermap/**", "/{token}/siweisupermap/**")
-    @RequestMapping(value = {"/{token}/siweisupermap*", "/{token}/siweisupermap/**"}, method = {RequestMethod.GET})
+    @RequestMapping(value = {"/{token}/siweiserver*", "/{token}/siweiserver/**"}, method = {RequestMethod.GET})
     public void supermapserverHandle(@PathVariable("token") String token, HttpServletRequest request, HttpServletResponse response) throws IOException {
         String fwId = proxyHandleService.proxyServerCheck(token, request, response);
         if (StringUtils.isEmpty(fwId)) {
@@ -55,7 +39,12 @@ public class ProxyHandleControllect {
             isCheckFull(response);
             return;
         }
-        proxyHandleService.proxySuperMapServer(serverUrlData, request, response);
+        String server_type = serverUrlData.getServerType();
+        if (StringUtils.isNotEmpty(server_type) && "geoserver".equals(server_type.toLowerCase())) {
+            proxyHandleService.proxyGeoServer(serverUrlData, request, response);
+        } else {
+            proxyHandleService.proxySuperMapServer(serverUrlData, request, response);
+        }
     }
 
     private void isCheckFull(HttpServletResponse response) throws IOException {

+ 0 - 200
onemap-modules/onemap-spatial/src/main/java/com/onemap/spatial/controller/ProxyHandleControllectBak.java

@@ -1,200 +0,0 @@
-package com.onemap.spatial.controller;
-
-import com.onemap.common.core.utils.StringUtils;
-import com.onemap.spatial.domain.TYztZyml;
-import com.onemap.spatial.service.IProxyHandleService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-
-//代理测试
-public class ProxyHandleControllectBak {
-
-    @Resource
-    private IProxyHandleService proxyHandleService;
-
-    public void geoserverHandle(@PathVariable("token") String token, HttpServletRequest request, HttpServletResponse response) throws IOException {
-        String fwId = proxyHandleService.proxyServerCheck(token, request, response);
-        if (StringUtils.isEmpty(fwId)) {
-            isCheckFull(response);
-            return;
-        }
-        TYztZyml serverUrlData = proxyHandleService.proxyServerData(fwId);
-        if (serverUrlData == null) {
-            isCheckFull(response);
-            return;
-        }
-        proxyHandleService.proxyGeoServer(serverUrlData, request, response);
-        //a484b75e2ac24016a62ccbef76c8b138
-        //http://192.168.60.4:9201/proxy/handle/2/siweigeoserver?service=wms&format=image%2Fpng&transparent=true&version=1.1.1&request=GetMap&styles=&layers=sanya_workspace%3ATB_CZKFBJ&bbox=111.09374999999999%2C21.093750000000004%2C112.50000000000003%2C22.5&width=256&height=256&srs=EPSG%3A4326
-
-//        String url = getCompleteURL(request);
-//        int len = url.indexOf("siweigeoserver");
-//        String paramsurl = url.substring(len+14);
-//        String serverUrl = serverUrlData.getUrl();
-//        String qqurl = serverUrl + paramsurl;
-//
-//        System.out.println("wz:" + url);
-//        System.out.println("len:" + len);
-//        System.out.println("paramsurl:" + paramsurl);
-//        System.out.println("serverUrl:" + serverUrl);
-//        System.out.println("qqurl:" + qqurl);
-
-//        System.out.println("token:" + token);
-
-//        String ipAddr = IpUtils.getIpAddr(request);
-//        System.out.println("ipAddr:" + ipAddr);
-
-
-//        //请求地址
-//        String url = request.getRequestURI();
-//        System.out.println("url:" + url);
-//
-//        int len = url.indexOf("siweigeoserver");
-//        String paramsurl = url.substring(len + 14);
-//        String serverUrl = serverUrlData.getUrl();
-//        String qqurl = serverUrl + paramsurl;
-//
-//        System.out.println("wz:" + url);
-//        System.out.println("len:" + len);
-//        System.out.println("paramsurl:" + paramsurl);
-//        System.out.println("serverUrl:" + serverUrl);
-//        System.out.println("qqurl:" + qqurl);
-//
-//
-//        Map params = new HashMap();
-//        Enumeration<String> parameters = request.getParameterNames();
-//        while (parameters.hasMoreElements()) {
-//            String paramName = parameters.nextElement();
-//            String paramValue = request.getParameter(paramName);
-//            // 处理参数
-////            System.out.println("paramName:"+paramName);
-////            System.out.println("paramValue:"+paramValue);
-//            params.put(paramName, paramValue);
-//        }
-//        String url_new = qqurl;
-//        formatFileResponse(url_new, params, response);
-    }
-
-    public void test(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        String url = getCompleteURL(request);
-        System.out.println("wz:" + url);
-        //请求地址
-        String uri = request.getRequestURI();
-        System.out.println("url:" + uri);
-
-        Map params = new HashMap();
-        Enumeration<String> parameters = request.getParameterNames();
-        while (parameters.hasMoreElements()) {
-            String paramName = parameters.nextElement();
-            String paramValue = request.getParameter(paramName);
-            // 处理参数
-            System.out.println("paramName:" + paramName);
-            System.out.println("paramValue:" + paramValue);
-            params.put(paramName, paramValue);
-        }
-        String url_new = "http://192.168.60.2:8089/geoserver/sanya_workspace/wms";
-        formatFileResponse(url_new, params, response);
-    }
-
-    private void isCheckFull(HttpServletResponse response) throws IOException {
-        /*
-         * 在调用getWriter之前未设置编码(既调用setContentType或者setCharacterEncoding方法设置编码),
-         * HttpServletResponse则会返回一个用默认的编码(既ISO-8859-1)编码的PrintWriter实例。这样就会
-         * 造成中文乱码。而且设置编码时必须在调用getWriter之前设置,不然是无效的。
-         * */
-        response.setContentType("text/html;charset=utf-8");
-        //response.setCharacterEncoding("UTF-8");
-        PrintWriter out = response.getWriter();
-        //JSON在传递过程中是普通字符串形式传递的,这里简单拼接一个做测试
-        String jsonString = "{\"code\":401,\"msg\":\"权限校验失败!!!\"}";
-        out.println(jsonString);
-        out.flush();
-        out.close();
-    }
-
-    private String getCompleteURL(HttpServletRequest request) {
-        StringBuilder sb = new StringBuilder();
-        // 获取协议
-        String protocol = request.isSecure() ? "https://" : "http://";
-        sb.append(protocol);
-        // 获取请求的主机名
-        sb.append(request.getServerName());
-        // 获取端口号(如果为默认端口则不添加)
-        int port = request.getServerPort();
-        if ((port != 80 && !request.isSecure()) || (port != 443 && request.isSecure())) {
-            sb.append(":").append(port);
-        }
-        // 获取上下文路径
-        sb.append(request.getContextPath());
-        // 获取请求URI
-        sb.append(request.getRequestURI());
-        // 获取查询字符串(如果存在)
-        if (request.getQueryString() != null) {
-            sb.append("?").append(request.getQueryString());
-        }
-        return sb.toString();
-    }
-
-    private void formatFileResponse(String uri, Map params, HttpServletResponse response) throws IOException {
-        try {
-            uri = uriJoinParam(uri, params);
-            URL url = new URL(uri);
-            URLConnection con = url.openConnection();
-            System.out.println(con.getContentType());
-            InputStream headimgIs = con.getInputStream();
-//            response.setContentType("application/json;charset=UTF-8");
-            response.setContentType(con.getContentType());
-//            response.setHeader("Content-Disposition","inline; filename=sanya_workspace-TB_CZKFBJ.png");
-            response.setHeader("Access-Control-Allow-Origin", "*");
-//            response.setHeader("Access-Control-Allow-Credentials","true");
-//            response.setHeader("X-Frame-Options","SAMEORIGIN");
-//            response.setHeader("X-Content-Type-Options","nosniff");
-            ServletOutputStream outputStream = response.getOutputStream();
-            int len = 0;
-            byte[] bytes = new byte[1024];
-            while ((len = headimgIs.read(bytes)) > 0) {
-                outputStream.write(bytes, 0, len);
-            }
-            headimgIs.close();
-            outputStream.close();
-        } catch (Exception e) {
-            System.err.println("获取文件流出错");
-        }
-    }
-
-    /**
-     * get请求方式针对uri的参数封装
-     *
-     * @param uri
-     * @param params
-     * @return
-     */
-    private String uriJoinParam(String uri, Map params) {
-        StringBuilder sbf = new StringBuilder(uri);
-        if (uri.indexOf("?") > 0) {
-            sbf.append("&");
-        } else {
-            sbf.append("?");
-        }
-        for (Object key : params.keySet()) {
-            sbf.append(key).append("=").append(params.get(key)).append("&");
-        }
-        return sbf.toString();
-    }
-
-}

+ 3 - 3
onemap-modules/onemap-spatial/src/main/java/com/onemap/spatial/domain/TZymlApplicationRecordVo.java

@@ -24,7 +24,7 @@ public class TZymlApplicationRecordVo {
     private Date deadline;
     private Integer state;
     @TableField(value = "fw_key")
-    private Integer fwKey;
+    private String fwKey;
 
     public String getId() {
         return id;
@@ -74,11 +74,11 @@ public class TZymlApplicationRecordVo {
         this.state = state;
     }
 
-    public Integer getFwKey() {
+    public String getFwKey() {
         return fwKey;
     }
 
-    public void setFwKey(Integer fwKey) {
+    public void setFwKey(String fwKey) {
         this.fwKey = fwKey;
     }
 }

+ 25 - 46
onemap-modules/onemap-spatial/src/main/java/com/onemap/spatial/service/impl/ProxyHandleServiceImpl.java

@@ -19,7 +19,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.net.URLConnection;
 import java.net.URLEncoder;
 import java.util.*;
 
@@ -104,27 +103,19 @@ public class ProxyHandleServiceImpl implements IProxyHandleService {
     @Override
     public void proxyGeoServer(TYztZyml serverData, HttpServletRequest request, HttpServletResponse response) {
         //请求地址
-        String url = geURL(request);
-        ////System.out.println("url:" + url);
+        String requestUrl = geURL(request);
 
-        int len = url.indexOf("siweigeoserver");
-        String paramsurl = url.substring(len + 14);
-        String serverUrl = serverData.getUrl();
+        int requestUrllen = requestUrl.indexOf("siweiserver");
+        String requestUrllenQ = requestUrl.substring(0, requestUrllen + 11);
+        String requestUrllenH = requestUrl.substring(requestUrllen + 11);
 
-        //判断ows
-        int owsLen = paramsurl.indexOf("/ows");
-        String qqurl = "";
-        if (owsLen == 0) {
-            int wmslen = serverUrl.indexOf("geoserver");
-            qqurl = serverUrl.substring(0, wmslen + 9) + paramsurl;
-        } else {
-            qqurl = serverUrl + paramsurl;
-        }
-        ////System.out.println("wz:" + url);
-        ////System.out.println("len:" + len);
-        ////System.out.println("paramsurl:" + paramsurl);
-        ////System.out.println("serverUrl:" + serverUrl);
-        ////System.out.println("qqurl:" + qqurl);
+        //服务真实地址
+        String dbUrl = serverData.getUrl();
+        int dbUrllen = dbUrl.indexOf("geoserver");
+        String dbUrlQ = dbUrl.substring(0, dbUrllen + 9);
+        String dbUrlH = dbUrl.substring(dbUrllen + 9);
+
+        String qqurl = dbUrlQ + requestUrllenH;
 
         Map params = new HashMap();
         Enumeration<String> parameters = request.getParameterNames();
@@ -132,8 +123,6 @@ public class ProxyHandleServiceImpl implements IProxyHandleService {
             String paramName = parameters.nextElement();
             String paramValue = request.getParameter(paramName);
 //            处理参数
-//            ////System.out.println("paramName:"+paramName);
-//            ////System.out.println("paramValue:"+paramValue);
             params.put(paramName, paramValue);
         }
         String url_new = qqurl;
@@ -143,23 +132,18 @@ public class ProxyHandleServiceImpl implements IProxyHandleService {
 
     @Override
     public void proxySuperMapServer(TYztZyml serverData, HttpServletRequest request, HttpServletResponse response) {
-        //请求地址
-        String url = geURL(request);
-        System.out.println("url:" + url);
+        //代理请求地址
+        String requestUrl = geURL(request);
+        int requestUrllen = requestUrl.indexOf("siweiserver");
+        String requestUrllenQ = requestUrl.substring(0, requestUrllen + 11);
+            String requestUrllenH = requestUrl.substring(requestUrllen + 11);
 
-        int len = url.indexOf("siweisupermap");
-        String siweiUrl = url.substring(0, len + 13);
-        String paramsurl = url.substring(len + 13);
-        String serverUrl = serverData.getUrl();
-        //判断output ,修改查询信息
-        int outputLen = paramsurl.indexOf("/output");
-        String qqurl = "";
-        if (outputLen == 0) {
-            int wmslen = serverUrl.indexOf("iserver");
-            qqurl = serverUrl.substring(0, wmslen + 7) + paramsurl;
-        } else {
-            qqurl = serverUrl + paramsurl;
-        }
+        //服务真实地址
+        String dbUrl = serverData.getUrl();
+        int dbUrllen = dbUrl.indexOf("iserver");
+        String dbUrlQ = dbUrl.substring(0, dbUrllen + 7);
+        String dbUrlH = dbUrl.substring(dbUrllen + 7);
+        String qqurl = dbUrlQ + requestUrllenH;
         Map params = new HashMap();
         Enumeration<String> parameters = request.getParameterNames();
         while (parameters.hasMoreElements()) {
@@ -169,12 +153,9 @@ public class ProxyHandleServiceImpl implements IProxyHandleService {
         }
         String url_new = qqurl;
 //        判断legend.json,替换查询参数
-        int owsLen = paramsurl.indexOf("/legend.json");
-        if (owsLen == 0) {
-            int olen = serverUrl.lastIndexOf("iserver");
-            String oldData = serverUrl.substring(0, olen + 7);
-            String newData = siweiUrl;
-            formaServerJsonReplace(url_new, params, response, oldData, newData);
+        int owsLen = requestUrllenH.lastIndexOf("/legend.json");
+        if (owsLen > 0 && (requestUrllenH.length() - 12 == owsLen)) {
+            formaServerJsonReplace(url_new, params, response, dbUrlQ, requestUrllenQ);
         } else {
             formaServerResponse(url_new, params, response);
         }
@@ -248,7 +229,6 @@ public class ProxyHandleServiceImpl implements IProxyHandleService {
     private void formaServerResponse(String uri, Map params, HttpServletResponse response) {
         try {
             uri = uriJoinParam(uri, params);
-            System.out.println("uri:" + uri);
             URL url = new URL(uri);
             HttpURLConnection con = (HttpURLConnection) url.openConnection();
             if (con.getResponseCode() == 400) {
@@ -324,7 +304,6 @@ public class ProxyHandleServiceImpl implements IProxyHandleService {
                 is.close();
                 con.disconnect();
                 result = strBuffer.toString();
-//                System.out.println("result:" + result);
                 response.setHeader("Access-Control-Allow-Origin", "*");
                 ServletOutputStream outputStream = response.getOutputStream();
                 String newStringData = result.replaceAll(oldData, newData);

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác