现场部署一系列适配提交

onemap-common/onemap-common-core/src/main/java/com/onemap/common/core/utils/StringUtils.java

@@ -1,5 +1,6 @@
 package com.onemap.common.core.utils;
 
+import java.io.*;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -657,4 +658,84 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
         String digits = str.replaceAll("\\D+", "");
         return digits;
     }
+
+    /**
+     * 查询输入字符串中  包含几次指定的字符
+     *
+     * @param str
+     * @param subStr
+     * @return int
+     */
+    public static int countOccurrences(String str, String subStr) {
+        if (str == null || subStr == null || str.length() < subStr.length()) {
+            return 0;
+        }
+        int count = 0;
+        int index = 0;
+        while ((index = str.indexOf(subStr, index)) != -1) {
+            count++;
+            index += subStr.length();
+        }
+        return count;
+    }
+
+    /**
+     * 搜索文件夹下指定文件名结尾的文件  默认返回第一个
+     *
+     * @param filepath
+     * @param endsWith
+     * @return String
+     */
+    public static String FileSearch(String filepath, String endsWith) {
+        File folder = new File(filepath);
+        File[] files = folder.listFiles(new FilenameFilter() {
+            @Override
+            public boolean accept(File dir, String name) {
+                return name.endsWith(endsWith);
+            }
+        });
+        if (files.length > 0) {
+            return files[0].getAbsolutePath();
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * 读取txt文本文件
+     *
+     * @param filepath
+     * @return Map<String, String>
+     */
+    public static Map<String, String> readTxt(String filepath, String charset) {
+        Map<String, String> resMap = new HashMap<>();
+        try {
+            File file = new File(filepath);
+            charset = isEmpty(charset) ? "UTF-8" : charset;
+//            BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), "GBK"));
+            BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), charset));
+            String line;
+            while ((line = reader.readLine()) != null) {
+                if (StringUtils.isNotEmpty(line) && !line.contains("[")) {
+                    line = line.replace(" ", "");
+                    String[] curline = line.split("=");
+                    if (curline.length == 1) {
+                        continue;
+                    }
+                    System.out.println("newnewnew");
+                    System.out.println(curline[0]);
+                    System.out.println(curline[1]);
+                    if (curline[0].contains("项目名称")) {
+                        System.out.println("---XMMC---");
+                        resMap.put("xmmc", curline[1]);
+                    }
+                    resMap.put(curline[0], curline[1]);
+                }
+            }
+            reader.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return resMap;
+    }
 }

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/utils/Fxfw2SdeUtils.java

@@ -109,7 +109,7 @@ public class Fxfw2SdeUtils {
                 features.add(feature);
                 esriModel.setFeatures(features);
             }
-            vectorFilePath = temp + "\\" + System.currentTimeMillis() + ".json";
+            vectorFilePath = temp + "\\temp\\" + System.currentTimeMillis() + ".json";
 
             //写入文件
             FileOutputStream fos = null;
@@ -195,7 +195,7 @@ public class Fxfw2SdeUtils {
             feature.setGeometry(geometry);
             features.add(feature);
             esriModel.setFeatures(features);
-            vectorFilePath = temp + "\\" + System.currentTimeMillis() + ".json";
+            vectorFilePath = temp + "\\temp\\" + System.currentTimeMillis() + ".json";
             //写入文件
             FileOutputStream fos = null;
             String fileinput = JSON.toJSONString(esriModel);

onemap-modules/onemap-analyse/src/main/resources/mapper/oracle/fzss/HgxfxMapper.xml

@@ -49,7 +49,7 @@
         sum(xz.mj) as "mj"
          from (select * from t_fzss_hgxfx_jg_gis t where t.scxbsm = (select hgscx.bsm from t_fzss_hgxfx_hgscx hgscx left join t_fzss_hgxfx_scx scx on scx.bsm = hgscx.scxbsm where scx.kzxjb = 0
         and hgscx.rwbsm = #{bsm})) t
-        inner join (select * from sde.xzydyh x where x.objectid in (select objid from t_fzss_hgxfx_jg_gis gis where gis.scxbsm = (select hgscx.bsm from t_fzss_hgxfx_hgscx hgscx left join t_fzss_hgxfx_scx scx on scx.bsm = hgscx.scxbsm where scx.kzxjb = 0
+        inner join (select * from KJGH_QY.XZYDYH x where x.objectid in (select objid from t_fzss_hgxfx_jg_gis gis where gis.scxbsm = (select hgscx.bsm from t_fzss_hgxfx_hgscx hgscx left join t_fzss_hgxfx_scx scx on scx.bsm = hgscx.scxbsm where scx.kzxjb = 0
         and hgscx.rwbsm = #{bsm}))
         ) xz on xz.objectid = t.objid
         group by xz.ydyhfldm,xz.ydyhflmc

onemap-modules/onemap-api/src/main/java/com/onemap/api/config/RestTemplateConfig.java

@@ -0,0 +1,17 @@
+package com.onemap.api.config;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.web.client.RestTemplate;
+
+@Configuration
+public class RestTemplateConfig {
+
+    @Bean
+    public RestTemplate restTemplate() {
+        SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
+        requestFactory.setConnectTimeout(999999999); // 设置连接超时时间为5000毫秒
+        requestFactory.setReadTimeout(999999999); // 设置读取超时时间为5000毫秒
+        return new RestTemplate(requestFactory);
+    }
+}

onemap-modules/onemap-api/src/main/java/com/onemap/api/controller/ResultsController.java

@@ -45,8 +45,8 @@ public class ResultsController extends BaseController {
      * @return
      */
     @PostMapping("/upload")
-    public RequestResult upload(String md5, Integer chunk, MultipartFile file) {
-        return ResultsService.upload(md5, chunk, file);
+    public RequestResult upload(String md5, String mD5, Integer chunk, MultipartFile file) {
+        return ResultsService.upload(md5, mD5, chunk, file);
     }
 
     /**
@@ -58,8 +58,8 @@ public class ResultsController extends BaseController {
      * @return
      */
     @PostMapping("/villageupload")
-    public RequestResult villageupload(String md5, Integer chunk, MultipartFile file) {
-        return ResultsService.upload(md5, chunk, file);
+    public RequestResult villageupload(String md5, String mD5, Integer chunk, MultipartFile file) {
+        return ResultsService.upload(md5, mD5, chunk, file);
     }
 
     /**

onemap-modules/onemap-api/src/main/java/com/onemap/api/controller/ZhxzController.java

@@ -29,4 +29,9 @@ public class ZhxzController extends BaseController {
         return zhxzService.authorize(authorizeDto, request);
     }
 
+
+    @PostMapping("/Authorize")
+    public RequestResult Authorize(@RequestBody AuthorizeDto authorizeDto, HttpServletRequest request) {
+        return zhxzService.authorize(authorizeDto, request);
+    }
 }

onemap-modules/onemap-api/src/main/java/com/onemap/api/domain/CompleteParams.java

@@ -5,11 +5,29 @@ package com.onemap.api.domain;
  */
 public class CompleteParams {
     private String md5;//文件md5值
+    private String mD5;//文件md5值
+    private String fileName;//文件名（带后缀“.zip”）
     private String filename;//文件名（带后缀“.zip”）
     private String type;//成果类型（0新上传 1更新）
     private String reason;//当成果类型为1时需要填写更新原因
     private String instid;//流程主键（补正流程需要）
 
+    public String getmD5() {
+        return mD5;
+    }
+
+    public void setmD5(String mD5) {
+        this.mD5 = mD5;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
     public String getMd5() {
         return md5;
     }

onemap-modules/onemap-api/src/main/java/com/onemap/api/service/ResultsService.java

@@ -12,7 +12,7 @@ public interface ResultsService {
 
     RequestResult md5(Map<String, Object> allParams);
 
-    RequestResult upload(String md5, Integer chunk, MultipartFile file);
+    RequestResult upload(String md5, String mD5, Integer chunk, MultipartFile file);
 
     RequestResult complete(CompleteParams completeParams);
 }

onemap-modules/onemap-api/src/main/java/com/onemap/api/service/impl/ResultsServiceImpl.java

@@ -57,6 +57,8 @@ public class ResultsServiceImpl implements ResultsService {
     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
     @Value("${Cggl.temp}")
     private String tempfolder;
+    @Value("${charset}")
+    private String charset;
     //成果级别
     private String cglevel = "1";
 
@@ -65,7 +67,7 @@ public class ResultsServiceImpl implements ResultsService {
     public RequestResult md5(Map<String, Object> allParams) {
         try {
             //TODO wanger 获取参数
-            if (allParams.get("md5") == null) {
+            if (allParams.get("md5") == null && allParams.get("mD5") == null) {
                 return RequestResult.error("文件MD5参数不能为空");
             } else if (allParams.get("size") == null) {
                 return RequestResult.error("文件分片总数量参数不能为空");
@@ -75,7 +77,7 @@ public class ResultsServiceImpl implements ResultsService {
                 isnew = Boolean.valueOf(String.valueOf(allParams.get("new")));
             }
             Integer size = Integer.valueOf(String.valueOf(allParams.get("size")));
-            String md5 = String.valueOf(allParams.get("md5"));
+            String md5 = allParams.get("md5") != null ? String.valueOf(allParams.get("md5")) : String.valueOf(allParams.get("mD5"));
             TSysOpenUser user = getOpenUser();
             if (user == null) {
                 return RequestResult.error("非法用户！");
@@ -119,12 +121,13 @@ public class ResultsServiceImpl implements ResultsService {
                 time = qxsbcg.getTime();
                 chunks = qxcgsbrwfpMapper.selectChunksByMd5(md5);
             }
-            Map<String, Object> res = new HashMap<>();
-            res.put("size", size);
-            res.put("chunks", chunks);
-            res.put("time", sdf.format(time));
+//            Map<String, Object> res = new HashMap<>();
+            allParams.put("md5", md5);
+            allParams.put("size", size);
+            allParams.put("chunks", chunks);
+            allParams.put("time", sdf.format(time));
             loginfo("md5接口请求成功！");
-            return RequestResult.success("操作成功", res);
+            return RequestResult.success("操作成功", allParams);
         } catch (Exception e) {
             e.printStackTrace();
             loginfo("md5接口请求失败！");
@@ -133,7 +136,8 @@ public class ResultsServiceImpl implements ResultsService {
     }
 
     @Override
-    public RequestResult upload(String md5, Integer chunk, MultipartFile file) {
+    public RequestResult upload(String md5, String mD5, Integer chunk, MultipartFile file) {
+        md5 = StringUtils.isEmpty(md5) ? mD5 : md5;
         if (StringUtils.isEmpty(md5)) {
             return RequestResult.error("文件MD5参数不能为空");
         } else if (chunk == null) {
@@ -191,8 +195,8 @@ public class ResultsServiceImpl implements ResultsService {
 
     @Override
     public RequestResult complete(CompleteParams completeParams) {
-        String md5 = completeParams.getMd5();
-        String filename = completeParams.getFilename();
+        String md5 = StringUtils.isNotEmpty(completeParams.getMd5()) ? completeParams.getMd5() : completeParams.getmD5();
+        String filename = StringUtils.isNotEmpty(completeParams.getFilename()) ? completeParams.getFilename() : completeParams.getFileName();
         String type = completeParams.getType();
         String reason = completeParams.getReason();
         String instid = completeParams.getInstid();
@@ -239,14 +243,14 @@ public class ResultsServiceImpl implements ResultsService {
 //            qxsbcg.setRwzt(rwzt.getHbsb());
             qxcgsbrwMapper.update(qxsbcg, sbrwwrapper);
 //            deleteQxsbrw(md5);
-            return RequestResult.error("合包失败，没找到合包后的文件，请联系管理员");
+            return RequestResult.error("1------合包失败，合包失败---");
         }
         File targetfile = new File(targetfilepath);
         String fileMd5 = getMD5(targetfile);
         if (!fileMd5.equals(md5)) {
             deleteQxsbrw(md5);
             deleteCurDirectory(targetfile.getParent());
-            return RequestResult.error("警告：文件的MD5不一致");
+            return RequestResult.error("2-----警告：文件的MD5不一致");
         }
         //TODO wanger 进行数据解压
         String filetype = StringUtils.getFileKzmx(filename);
@@ -262,81 +266,10 @@ public class ResultsServiceImpl implements ResultsService {
         if (!unzipfile.exists()) {
             deleteQxsbrw(md5);
             deleteCurDirectory(targetfile.getParent());
-            return RequestResult.error("压缩包名称与解压后的文件名称不一致，请检查！");
+            return RequestResult.error("3---压缩包名称与解压后的文件名称不一致，请检查！");
         }
-        //解析txt
-        String txtFilePath = FileSearch(unzippath, "基本信息.txt");
-        if (StringUtils.isEmpty(txtFilePath)) {
-            deleteQxsbrw(md5);
-            deleteCurDirectory(targetfile.getParent());
-            return RequestResult.error("成果包中必须包含“xxx基本信息.txt”文件，同时注意成果包中应包含“xxx规划成果”的根目录");
-        }
-        Map<String, String> txtMap = readTxt(txtFilePath);
-        ObjectMapper objectMapper = new ObjectMapper();
-        String txtjson = "";
-        try {
-            txtjson = objectMapper.writeValueAsString(txtMap);
-        } catch (JsonProcessingException e) {
-            e.printStackTrace();
-        }
-        String xmmc = txtMap.get("项目名称");
-        String xzqdm = txtMap.get("行政区代码");
-        String xzqmc = txtMap.get("行政区名称");
-        String ghlxtext = txtMap.get("规划类型");
-        String ghcjtext = txtMap.get("规划层级");
-        String ghxstext = txtMap.get("成果形式");
-        String pzsjtext = txtMap.get("批准时间");
-        String lxrtext = txtMap.get("联系人");
-        String lxdhtext = txtMap.get("联系电话");
-        //TODO wanger 对成果包进行校验
-        String sjbz_bsm = "";
-        if ("村庄规划".equals(ghlxtext)) {
-            sjbz_bsm = ghlxtext + "" + ghxstext;
-        } else {
-            sjbz_bsm = ghcjtext + "" + ghlxtext;
-        }
-        QueryWrapper<TCgglSjbzmlwjDto> sjbzwrapper = new QueryWrapper();
-        sjbzwrapper.eq("sjbz_bsm", sjbz_bsm);
-        sjbzwrapper.eq("ystj", "M");
-        sjbzwrapper.orderByAsc("px");
-        List<TCgglSjbzmlwjDto> sjbzlist = tCgglSjbzmlwjMapper.selectList(sjbzwrapper);
-        if (sjbzlist.size() == 0) {
-            deleteQxsbrw(md5);
-            deleteCurDirectory(targetfile.getParent());
-            return RequestResult.error(String.format("未授权的数据类型：%s，请联系管理人员！", sjbz_bsm));
-        }
-        //记录缺失的文件列表  字符串类型
-        List<String> missfiles = new ArrayList<>();
-        missfiles = checkMustFiles(unzipfile.getParent(), sjbzlist, "", missfiles, xzqdm, xzqmc);
-        if (missfiles.size() > 0) {
-            deleteQxsbrw(md5);
-            deleteCurDirectory(targetfile.getParent());
-            return RequestResult.error(String.format("成果数据缺少以下目录或文件：%s", String.join("\n", missfiles)), missfiles);
-        }
-        qxsbcg.setRwzt(rwzt.getWc());
-        qxsbcg.setCglj(unzippath);
-        qxsbcg.setCgwj(targetfilepath);
-        qxcgsbrwMapper.update(qxsbcg, sbrwwrapper);
-        //TODO wanger 插入到系统成果表
-        String ghlx = qxsbcg.getGhlx();
-        if ("9".equals(ghlx)) {//村庄规划
-            XzczghcgsbDTO xzczghcgsbDTO = new XzczghcgsbDTO();
-            xzczghcgsbDTO.setCglevel(cglevel);
-            xzczghcgsbDTO.setUuid(StringUtils.getUUID());
-            xzczghcgsbDTO.setFileName(xmmc);
-            xzczghcgsbDTO.setFilePath(targetfilepath);
-            xzczghcgsbDTO.setUploadStatus(2);
-            xzczghcgsbDTO.setUploadTime(new Date());
-            xzczghcgsbDTO.setXzqName(xzqmc);
-            xzczghcgsbDTO.setXzqCode(xzqdm);
-            xzczghcgsbDTO.setStatus("10");
-            xzczghcgsbDTO.setYear(pzsjtext);
-            xzczghcgsbDTO.setBz(txtjson);
-            if (StringUtils.isNotEmpty(instid)) {
-                xzczghcgsbDTO.setInstid(instid);
-            }
-            xzczghcgsbMapper.insert(xzczghcgsbDTO);
-        } else {//总体规划表
+        //TODO wanger 判断报批项目成果  非常重要
+        if ("6".equals(qxsbcg.getGhlx())) {
             String fileuuid = StringUtils.getUUID();
             //TODO wanger 插入file表
             EscalationFileDTO filedto = new EscalationFileDTO();
@@ -344,7 +277,8 @@ public class ResultsServiceImpl implements ResultsService {
             filedto.setName(filename);
             filedto.setPath(targetfilepath);
             filedto.setUnzippath(unzippath);
-            filedto.setStatus("9");
+            filedto.setStatus("1");
+            filedto.setRemark("");
             filedto.setUsername(user.getName());
             escalationFileMapper.insert(filedto);
             //TODO wanger 插入主表
@@ -352,23 +286,163 @@ public class ResultsServiceImpl implements ResultsService {
             escalationDTO.setId(StringUtils.getUUID());
             escalationDTO.setCglevel(cglevel);
             escalationDTO.setFileid(fileuuid);
-            escalationDTO.setPlantype(ghlx);
+            escalationDTO.setPlantype(qxsbcg.getGhlx());
             if (StringUtils.isNotEmpty(instid)) {
                 escalationDTO.setInstid(instid);
             }
             escalationDTO.setUploadstatus("0");
-            escalationDTO.setXzqdm(xzqdm);
-            escalationDTO.setXzqmc(xzqmc);
-            escalationDTO.setYear(pzsjtext);
+            escalationDTO.setXzqdm(user.getXzqdm());
+            escalationDTO.setXzqmc(user.getXzqmc());
+            escalationDTO.setYear("");
             escalationDTO.setUploadtime(new Date());
             escalationDTO.setUsername(user.getName());
-            escalationDTO.setSczt("4");
-            escalationDTO.setName(xmmc);
-            escalationDTO.setLxdh(lxdhtext);
-            escalationDTO.setLxr(lxrtext);
+            escalationDTO.setSczt("6");
+            escalationDTO.setName(fileRelName);
+            escalationDTO.setLxdh("");
+            escalationDTO.setLxr("");
             escalationMapper.insert(escalationDTO);
+        } else {
+            //解析txt
+            String txtFilePath = FileSearch(unzippath, "基本信息.txt");
+            if (StringUtils.isEmpty(txtFilePath)) {
+                deleteQxsbrw(md5);
+                deleteCurDirectory(targetfile.getParent());
+                return RequestResult.error("4----成果包中必须包含“xxx基本信息.txt”文件，同时注意成果包中应包含“xxx规划成果”的根目录");
+            }
+            System.out.println("txtFilePath===" + txtFilePath);
+            Map<String, String> txtMap = null;
+            try {
+                txtMap = readTxt(txtFilePath, charset);
+            } catch (Exception e) {
+                e.printStackTrace();
+                deleteQxsbrw(md5);
+                deleteCurDirectory(targetfile.getParent());
+                return RequestResult.error("4----解析规划文本txt错误，请检查格式！");
+            }
+            System.out.println("txtMap===" + txtMap);
+            String xmmc = txtMap.get("xmmc") != null ? txtMap.get("xmmc") : fileRelName;
+            String xzqdm = txtMap.get("行政区代码");
+            String xzqmc = txtMap.get("行政区名称");
+            String ghlxtext = txtMap.get("规划类型");
+            String ghcjtext = txtMap.get("规划层级");
+            String ghxstext = txtMap.get("成果形式");
+            String pzsjtext = txtMap.get("批准时间");
+            String lxrtext = txtMap.get("联系人");
+            String lxdhtext = txtMap.get("联系电话");
+            //TODO wanger 对成果包进行校验
+            System.out.println("xmmc===" + xmmc);
+            System.out.println("ghlxtext===" + ghlxtext);
+            System.out.println("ghxstext===" + ghxstext);
+            System.out.println("ghcjtext===" + ghcjtext);
+            String sjbz_bsm = "";
+            ObjectMapper objectMapper = new ObjectMapper();
+            String txtjson = "";
+            try {
+                txtjson = objectMapper.writeValueAsString(txtMap);
+            } catch (JsonProcessingException e) {
+                e.printStackTrace();
+            }
+            if ("村庄规划".equals(ghlxtext)) {
+                sjbz_bsm = ghlxtext + "" + ghxstext;
+            } else {
+                sjbz_bsm = ghcjtext + "" + ghlxtext;
+            }
+            QueryWrapper<TCgglSjbzmlwjDto> sjbzwrapper = new QueryWrapper();
+            sjbzwrapper.eq("sjbz_bsm", sjbz_bsm);
+//        sjbzwrapper.eq("ystj", "M");
+            sjbzwrapper.orderByAsc("px");
+            List<TCgglSjbzmlwjDto> sjbzlist = tCgglSjbzmlwjMapper.selectList(sjbzwrapper);
+            if (sjbzlist.size() == 0) {
+                deleteQxsbrw(md5);
+                deleteCurDirectory(targetfile.getParent());
+                return RequestResult.error(String.format("5-----未授权的数据类型：%s，请联系管理人员！", sjbz_bsm));
+            }
+            //TODO wanger 处理那些根目录带有“_报审”等的数据项
+            if (fileRelName.contains("_")) {
+                System.out.println("Important contains _");
+                int count = fileRelName.split("_").length;
+                for (TCgglSjbzmlwjDto sjbzmlwjDto : sjbzlist) {
+                    String bz = sjbzmlwjDto.getBz();
+                    if (StringUtils.isNotEmpty(bz) && bz.contains("根目录")) {
+                        String rule = sjbzmlwjDto.getGzmc();
+                        int rulecount = rule.split("_").length;
+                        if (rulecount == count) {
+                            //相等就代表命名规则一样，不需要处理
+                        } else {
+                            sjbzmlwjDto.setGzmc(rule + "_" + fileRelName.split("_")[fileRelName.split("_").length - 1]);
+                        }
+                        System.out.println("Important handle end  _" + "----" + sjbzmlwjDto.getGzmc());
+                        break;
+                    }
+                }
+            }
+            //记录缺失的文件列表  字符串类型
+            List<String> missfiles = new ArrayList<>();
+            missfiles = checkMustFiles(unzipfile.getParent(), sjbzlist, "", missfiles, xzqdm, xzqmc);
+            if (missfiles.size() > 0) {
+                deleteQxsbrw(md5);
+                deleteCurDirectory(targetfile.getParent());
+                return RequestResult.error(String.format("6------成果数据缺少以下目录或文件：%s", String.join("\n", missfiles)), missfiles);
+            }
+            qxsbcg.setRwzt(rwzt.getWc());
+            qxsbcg.setCglj(unzippath);
+            qxsbcg.setCgwj(targetfilepath);
+            qxcgsbrwMapper.update(qxsbcg, sbrwwrapper);
+            //TODO wanger 插入到系统成果表
+            String ghlx = qxsbcg.getGhlx();
+            System.out.println("xmmc===" + xmmc);
+            if ("9".equals(ghlx)) {//村庄规划
+                XzczghcgsbDTO xzczghcgsbDTO = new XzczghcgsbDTO();
+                xzczghcgsbDTO.setCglevel(cglevel);
+                xzczghcgsbDTO.setUuid(StringUtils.getUUID());
+                xzczghcgsbDTO.setFileName(xmmc);
+                xzczghcgsbDTO.setFilePath(targetfilepath);
+                xzczghcgsbDTO.setUploadStatus(2);
+                xzczghcgsbDTO.setUploadTime(new Date());
+                xzczghcgsbDTO.setXzqName(xzqmc);
+                xzczghcgsbDTO.setXzqCode(xzqdm);
+                xzczghcgsbDTO.setStatus("10");
+                xzczghcgsbDTO.setYear(pzsjtext);
+                xzczghcgsbDTO.setBz(txtjson);
+                if (StringUtils.isNotEmpty(instid)) {
+                    xzczghcgsbDTO.setInstid(instid);
+                }
+                xzczghcgsbMapper.insert(xzczghcgsbDTO);
+            } else {//总体规划表
+                String fileuuid = StringUtils.getUUID();
+                //TODO wanger 插入file表
+                EscalationFileDTO filedto = new EscalationFileDTO();
+                filedto.setId(fileuuid);
+                filedto.setName(filename);
+                filedto.setPath(targetfilepath);
+                filedto.setUnzippath(unzippath);
+                filedto.setStatus("9");
+                filedto.setRemark(txtjson);
+                filedto.setUsername(user.getName());
+                escalationFileMapper.insert(filedto);
+                //TODO wanger 插入主表
+                EscalationDTO escalationDTO = new EscalationDTO();
+                escalationDTO.setId(StringUtils.getUUID());
+                escalationDTO.setCglevel(cglevel);
+                escalationDTO.setFileid(fileuuid);
+                escalationDTO.setPlantype(ghlx);
+                if (StringUtils.isNotEmpty(instid)) {
+                    escalationDTO.setInstid(instid);
+                }
+                escalationDTO.setUploadstatus("0");
+                escalationDTO.setXzqdm(xzqdm);
+                escalationDTO.setXzqmc(xzqmc);
+                escalationDTO.setYear(pzsjtext);
+                escalationDTO.setUploadtime(new Date());
+                escalationDTO.setUsername(user.getName());
+                escalationDTO.setSczt("4");
+                escalationDTO.setName(xmmc);
+                escalationDTO.setLxdh(lxdhtext);
+                escalationDTO.setLxr(lxrtext);
+                escalationMapper.insert(escalationDTO);
+            }
         }
-        return RequestResult.success("操作成功", 1);
+        return RequestResult.success("7----操作成功", 1);
     }
 
     private void deleteCurDirectory(String parent) {
@@ -431,6 +505,9 @@ public class ResultsServiceImpl implements ResultsService {
                     .collect(Collectors.toList());
         }
         for (TCgglSjbzmlwjDto dto : filteredList) {
+            if ("O".equals(dto.getYstj()) || "C".equals(dto.getYstj())) {//跳过非必要审查项
+                continue;
+            }
             Integer lx = dto.getLx();
             String gzmc = dto.getGzmc();
             String mlmc = dto.getMlmc();

onemap-modules/onemap-api/src/main/java/com/onemap/api/util/utils.java

@@ -125,15 +125,27 @@ public class utils {
      * @param filepath
      * @return Map<String, String>
      */
-    public static Map<String, String> readTxt(String filepath) {
+    public static Map<String, String> readTxt(String filepath, String charset) {
         Map<String, String> resMap = new HashMap<>();
         try {
             File file = new File(filepath);
-            BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), "GBK"));
+//            BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), "GBK"));
+            BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), charset));
             String line;
             while ((line = reader.readLine()) != null) {
-                if (StringUtils.isNotEmpty(line)) {
+                if (StringUtils.isNotEmpty(line) && !line.contains("[")) {
+                    line = line.replace(" ", "");
                     String[] curline = line.split("=");
+                    if (curline.length == 1) {
+                        continue;
+                    }
+                    System.out.println("newnewnew");
+                    System.out.println(curline[0]);
+                    System.out.println(curline[1]);
+                    if (curline[0].contains("项目名称")) {
+                        System.out.println("---XMMC---");
+                        resMap.put("xmmc", curline[1]);
+                    }
                     resMap.put(curline[0], curline[1]);
                 }
             }
@@ -159,7 +171,7 @@ public class utils {
                 return name.endsWith(endsWith);
             }
         });
-        if (files != null) {
+        if (files.length > 0) {
             return files[0].getAbsolutePath();
         } else {
             return null;

onemap-modules/onemap-api/src/main/resources/bootstrap.yml

@@ -1,7 +1,13 @@
 # Tomcat
 server:
   port: 9209
-
+# application.yml
+feign:
+  client:
+    config:
+      default: # 全局配置，也可以针对特定服务配置不同的值（例如：your-service-id）
+        connectTimeout: 999999999 # 连接超时时间，单位毫秒
+        readTimeout: 999999999 # 读取超时时间，单位毫秒
 # Spring
 spring:
   servlet:
@@ -9,6 +15,9 @@ spring:
       enabled: true
       max-file-size: 10240MB
       max-request-size: 10240MB
+  mvc:
+    async:
+      request-timeout: 999999999
   application:
     # 应用名称
     name: onemap-api

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/sbjk/XzczghcgsbController.java

@@ -5,6 +5,7 @@ import com.onemap.apply.domain.cggl.CgscDto;
 import com.onemap.apply.domain.sbjk.TjpgsbDTO;
 import com.onemap.apply.domain.sbjk.XzczghcgsbDTO;
 import com.onemap.apply.service.sbjk.XzczghcgsbService;
+import com.onemap.apply.utils.ZipDownload;
 import com.onemap.common.core.utils.StringUtils;
 import com.onemap.common.core.utils.file.FileUtils;
 import com.onemap.common.core.web.controller.BaseController;
@@ -138,16 +139,19 @@ public class XzczghcgsbController extends BaseController {
                 response.getWriter().println("uuid不能为空!");
             }
             XzczghcgsbDTO xzczghcgsbDTO = xzczghcgsbService.selectByUuid(uuid);
-
             if (xzczghcgsbDTO != null) {
                 File file = new File(xzczghcgsbDTO.getFilePath());
-                if (!file.exists())
+                if (!file.exists()) {
                     throw new Exception();
+                }
                 // 下载名称
                 String downloadName = file.getName();
-                response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
-                FileUtils.setAttachmentResponseHeader(response, downloadName);
-                FileUtils.writeBytes(xzczghcgsbDTO.getFilePath(), response.getOutputStream());
+                ZipDownload.download(response, xzczghcgsbDTO.getFilePath(), downloadName);
+//                downloadName = downloadName.toLowerCase().replace(".txt", ".zip");
+//                System.out.println("downloadZip-------" + downloadName);
+//                response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+//                FileUtils.setAttachmentResponseHeader(response, downloadName);
+//                FileUtils.writeBytes(xzczghcgsbDTO.getFilePath(), response.getOutputStream());
             } else {
                 response.getWriter().println("没有找到结果文件");
             }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fxpj/TCzjsbsyqDo.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 城镇建设不适宜区结果汇总表
  */
-@TableName("sde.CZJSBSYQ")
+@TableName("KJGH_TABLE.CZJSBSYQ")
 public class TCzjsbsyqDo {
 
     /**

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fxpj/TCzjssyqDo.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 城镇建设适宜区结果汇总表
  */
-@TableName("sde.CZJSSYQ")
+@TableName("KJGH_TABLE.CZJSSYQ")
 public class TCzjssyqDo {
 
     /**

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fxpj/TDysczczgmDo.java

@@ -2,7 +2,7 @@ package com.onemap.apply.domain.fxpj;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 
-@TableName("sde.TDYSCZCZGM")
+@TableName("KJGH_TABLE.TDYSCZCZGM")
 public class TDysczczgmDo {
 
     /**

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fxpj/TDyskczgdgmDo.java

@@ -2,7 +2,7 @@ package com.onemap.apply.domain.fxpj;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 
-@TableName("sde.TDYSKCZGDGM")
+@TableName("KJGH_TABLE.TDYSKCZGDGM")
 public class TDyskczgdgmDo {
 
     /**

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fxpj/TGhwbDo.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 规划文本属性结构描述表
  */
-@TableName("sde.GHWB")
+@TableName("KJGH_TABLE.GHWB")
 public class TGhwbDo {
 
     /**

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fxpj/TNyscsyxpjDo.java

@@ -2,7 +2,7 @@ package com.onemap.apply.domain.fxpj;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 
-@TableName("sde.NYSCSYXPJ")
+@TableName("KJGH_TABLE.NYSCSYXPJ")
 public class TNyscsyxpjDo {
 
     /**

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fxpj/TSgtjDo.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 栅格图件属性结构描述表
  */
-@TableName("sde.SGTJ")
+@TableName("KJGH_TABLE.SGTJ")
 public class TSgtjDo {
 
     /**

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fxpj/TStbhzyxpjDo.java

@@ -2,7 +2,7 @@ package com.onemap.apply.domain.fxpj;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 
-@TableName("sde.STBHZYXPJ")
+@TableName("KJGH_TABLE.STBHZYXPJ")
 public class TStbhzyxpjDo {
 
     /**

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fxpj/TSysczczgmDo.java

@@ -2,7 +2,7 @@ package com.onemap.apply.domain.fxpj;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 
-@TableName("sde.SYSCZCZGM")
+@TableName("KJGH_TABLE.SYSCZCZGM")
 public class TSysczczgmDo {
 
     /**

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fxpj/TSyskczgdgmDo.java

@@ -2,7 +2,7 @@ package com.onemap.apply.domain.fxpj;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 
-@TableName("sde.SYSKCZGDGM")
+@TableName("KJGH_TABLE.SYSKCZGDGM")
 public class TSyskczgdgmDo {
 
     /**

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/cggl/CgglServiceImpl.java

@@ -44,6 +44,9 @@ import java.io.*;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+import static com.onemap.common.core.utils.StringUtils.FileSearch;
+import static com.onemap.common.core.utils.StringUtils.readTxt;
+
 
 @Service
 public class CgglServiceImpl implements CgglService {
@@ -87,6 +90,8 @@ public class CgglServiceImpl implements CgglService {
 
     @Value("${Cggl.cgsc}")
     private String cgscUrl;
+    @Value("${charset}")
+    private String charset;
 
 
     private String Authorization = "Basic c2FiZXI6c2FiZXJfc2VjcmV0";
@@ -197,6 +202,28 @@ public class CgglServiceImpl implements CgglService {
 //        {
 //            escalationDTO.setSczt("4");
 //        }
+        //TODO wanger 处理规划成果名称
+        QueryWrapper<EscalationFileDTO> filewrapper = new QueryWrapper<EscalationFileDTO>();
+        filewrapper.eq("id", escalationDTO.getFileid());
+        EscalationFileDTO fileDto = escalationFileMapper.selectOne(filewrapper);
+        if (fileDto != null) {
+            String filepath = fileDto.getUnzippath();
+            //解析txt
+            String txtFilePath = FileSearch(filepath, "基本信息.txt");
+            if (StringUtils.isNotEmpty(txtFilePath)) {
+                System.out.println("txtFilePath===" + txtFilePath);
+                Map<String, String> txtMap = null;
+                try {
+                    txtMap = readTxt(txtFilePath, charset);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                System.out.println("txtMap===" + txtMap);
+                if (StringUtils.isNotEmpty(txtMap.get("xmmc"))) {
+                    escalationDTO.setName(txtMap.get("xmmc"));
+                }
+            }
+        }
         escalationMapper.insert(escalationDTO);
         addCgglRz(escalationDTO);
 //        FixedThreadUtil.FIXED_THREAD_POOL.execute(() -> {

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/sbjk/XzczghcgsbServiceImpl.java

@@ -31,6 +31,9 @@ import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+import static com.onemap.common.core.utils.StringUtils.FileSearch;
+import static com.onemap.common.core.utils.StringUtils.readTxt;
+
 
 @Service
 public class XzczghcgsbServiceImpl implements XzczghcgsbService {
@@ -54,6 +57,8 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
     private String requireFileList;
     @Value("${xzczghcgsb.requirefile.filename}")
     private String requireFileName;
+    @Value("${charset}")
+    private String charset;
     @Autowired
     private RedisService redisService;
 
@@ -123,15 +128,15 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
     @Override
     public List<XzczghcgsbDTO> selectList(XzczghcgsbDTO xzczghcgsbDTO) {
         QueryWrapper<XzczghcgsbDTO> giswrapper = new QueryWrapper<>();
-        if (StringUtils.isNotEmpty(xzczghcgsbDTO.getCounty())) {
-            giswrapper.like("county", xzczghcgsbDTO.getCounty());
-        }
-        if (StringUtils.isNotEmpty(xzczghcgsbDTO.getTown())) {
-            giswrapper.like("town", xzczghcgsbDTO.getTown());
-        }
-        if (StringUtils.isNotEmpty(xzczghcgsbDTO.getVillage())) {
-            giswrapper.like("village", xzczghcgsbDTO.getVillage());
-        }
+//        if (StringUtils.isNotEmpty(xzczghcgsbDTO.getCounty())) {
+//            giswrapper.like("county", xzczghcgsbDTO.getCounty());
+//        }
+//        if (StringUtils.isNotEmpty(xzczghcgsbDTO.getTown())) {
+//            giswrapper.like("town", xzczghcgsbDTO.getTown());
+//        }
+//        if (StringUtils.isNotEmpty(xzczghcgsbDTO.getVillage())) {
+//            giswrapper.like("village", xzczghcgsbDTO.getVillage());
+//        }
         if (StringUtils.isNotEmpty(xzczghcgsbDTO.getXzqCode())) {
             giswrapper.like("xzq_code", xzczghcgsbDTO.getXzqCode());
         } else {
@@ -144,12 +149,12 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
             giswrapper.like("file_name", "%" + xzczghcgsbDTO.getFileName() + "%");
         }
         //市级用户只查看已上报到市级的数据
-        if ("2".equals(xzczghcgsbDTO.getCglevel())) {
-            List<String> status = new ArrayList<>();
-            status.add("12");
-            status.add("22");
-            giswrapper.in("status", status);
-        }
+//        if ("2".equals(xzczghcgsbDTO.getCglevel())) {
+//            List<String> status = new ArrayList<>();
+//            status.add("12");
+//            status.add("22");
+//            giswrapper.in("status", status);
+//        }
         giswrapper.orderByDesc("upload_time");
         return xzczghcgsbMapper.selectList(giswrapper);
     }
@@ -299,7 +304,22 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
             if (missfile.size() > 0) {
                 return AjaxResult.success("村庄规划成果上传失败:上传失败缺少以下文件或文件名称有误:", missfile);
             } else {
-                return AjaxResult.success(desc.getAbsolutePath());
+                //TODO wanger 获取规划文本中的项目名称
+                //解析txt
+                String txtFilePath = FileSearch(unzippath + File.separator + relFileName, "基本信息.txt");
+                if (StringUtils.isNotEmpty(txtFilePath)) {
+                    System.out.println("txtFilePath===" + txtFilePath);
+                    Map<String, String> txtMap = null;
+                    try {
+                        txtMap = readTxt(txtFilePath, charset);
+                    } catch (Exception e) {
+                    }
+                    System.out.println("txtMap===" + txtMap);
+                    if (StringUtils.isNotEmpty(txtMap.get("xmmc"))) {
+                        return AjaxResult.success(desc.getAbsolutePath() + "******" + txtMap.get("xmmc"));
+                    }
+                }
+                return AjaxResult.success(desc.getAbsolutePath() + "******" + relFileName);
             }
         } catch (IOException e) {
             e.printStackTrace();

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/utils/RInterfaceUtil.java

@@ -109,8 +109,8 @@ public class RInterfaceUtil {
                 //创建参数集合
                 httpPost.setEntity(new UrlEncodedFormEntity(list, "UTF-8"));
                 //配置请求时间、超时时间
-                RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(10000).setConnectTimeout(10000).build();
-                httpPost.setConfig(requestConfig);
+//                RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(10000).setConnectTimeout(10000).build();
+                httpPost.setConfig(config);
 
                 //开始发送请求
                 closeableHttpResponse = closeableHttpClient.execute(httpPost);

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/utils/ZipDownload.java

@@ -21,10 +21,14 @@ public class ZipDownload {
      */
     public static void download(HttpServletResponse response, String filepath, String name) {
         try {
-            response.setHeader("Content-Disposition", "attachment;filename=" + new String(name.getBytes("UTF-8"), "ISO-8859-1"));  // 需要编z码否则中文乱码
+            File file = new File(filepath);
+            String downloadName = file.getName();
+            downloadName = downloadName.toLowerCase().replace(".txt", ".zip");
+            response.setHeader("Content-Disposition", "attachment;filename=" + new String(downloadName.getBytes("UTF-8"), "ISO-8859-1"));  // 需要编z码否则中文乱码
+//            response.setHeader("Content-Disposition", "attachment;filename=" + downloadName);  // 需要编z码否则中文乱码
             response.setContentType("application/zip;charset=utf-8");
+            System.out.println("download-------" + downloadName);
             response.setCharacterEncoding("UTF-8");
-            File file = new File(filepath);
             if (file.length() >= Integer.MAX_VALUE) {
                 MappedBiggerFileReader reader = new MappedBiggerFileReader(filepath, 65536, response.getOutputStream());
                 while (reader.read() != -1) {

onemap-modules/onemap-apply/src/main/resources/mapper/oracle/fxpj/TDysczczgmMapper.xml

@@ -15,7 +15,7 @@
     <select id="selectList" resultMap="TDyskczgdgmMap">
 
         SELECT YSDM, XZQDM, XZQMC, KCZJSGM, XZCZJSYDMJ, BZ
-        FROM sde.TDYSCZCZGM
+        FROM KJGH_TABLE.TDYSCZCZGM
 
         <where>
             <choose>
@@ -29,10 +29,10 @@
     <select id="selectGroupByXzq" resultMap="TDyskczgdgmMap">
 
         SELECT YSDM, T1.XZQDM, T2.XZQMC, KCZJSGM, XZCZJSYDMJ, BZ
-        FROM sde.TDYSCZCZGM T1,
+        FROM KJGH_TABLE.TDYSCZCZGM T1,
              (
                  SELECT XZQDM, XZQMC
-                 FROM sde.TDYSCZCZGM
+                 FROM KJGH_TABLE.TDYSCZCZGM
              ) T2
 
         <where>

onemap-modules/onemap-apply/src/main/resources/mapper/oracle/fxpj/TDyskczgdgmMapper.xml

@@ -18,7 +18,7 @@
     <select id="selectList" parameterType="String" resultMap="TDyskczgdgmMap">
 
         SELECT YSDM, XZQDM, XZQMC, KCZGDMJ1, KCZGDMJ2, XZGDMJ1, XZGDMJ2, BZ
-        FROM sde.TDYSKCZGDGM
+        FROM KJGH_TABLE.TDYSKCZGDGM
 
         <where>
             <choose>
@@ -34,10 +34,10 @@
 
         SELECT T1.YSDM, T1.XZQDM, T1.XZQMC, T1.KCZGDMJ1, T1.KCZGDMJ2,
                T1.XZGDMJ1, T1.XZGDMJ2, T1.BZ
-        FROM sde.TDYSKCZGDGM T1,
+        FROM KJGH_TABLE.TDYSKCZGDGM T1,
         (
             SELECT XZQDM, XZQMC
-            FROM sde.TDYSKCZGDGM
+            FROM KJGH_TABLE.TDYSKCZGDGM
             GROUP BY XZQDM, XZQMC
         ) T2
 

onemap-modules/onemap-apply/src/main/resources/mapper/oracle/fxpj/TGhwbMapper.xml

@@ -15,7 +15,7 @@
     <select id="selectByYsdm" resultMap="TGhwbMap">
 
         SELECT YSDM, XZQDM, XZQMC, WDMC, WDWJ, BZ
-        FROM sde.GHWB
+        FROM KJGH_TABLE.GHWB
         WHERE YSDM = #{str}
 
     </select>

onemap-modules/onemap-apply/src/main/resources/mapper/oracle/fxpj/TSgtjMapper.xml

@@ -14,7 +14,7 @@
 
     <select id="selectByYsdm" resultMap="TSgtjMap">
         SELECT YSDM, XZQDM, XZQMC, TPMC, TPWJ, BZ
-        FROM sde.SGTJ
+        FROM KJGH_TABLE.SGTJ
                 WHERE YSDM IN
         <foreach collection="list" item="item" open="(" close=")" separator=" , ">
             #{item}

onemap-modules/onemap-apply/src/main/resources/mapper/oracle/fxpj/TSysczczgmMapper.xml

@@ -20,7 +20,7 @@
     <select id="selectList" resultMap="TSyskczgdgmMap">
 
         SELECT CZRJXSL, YSDM, XZQDM, XZQMC, QJ, CZKYSL, KZCZRKGM, RJCZJSYD, KCZCZJSYDGM, XZCZJSYDMJ, BZ
-        FROM sde.SYSCZCZGM
+        FROM KJGH_TABLE.SYSCZCZGM
 
         <where>
             <choose>
@@ -34,10 +34,10 @@
     <select id="selectListGroupByQjXzq" resultMap="TSyskczgdgmMap">
 
         SELECT CZRJXSL, YSDM, T1.XZQDM, T1.XZQMC, T1.QJ, CZKYSL, KZCZRKGM, RJCZJSYD, KCZCZJSYDGM, XZCZJSYDMJ, BZ
-        FROM sde.SYSCZCZGM T1,
+        FROM KJGH_TABLE.SYSCZCZGM T1,
         (
         SELECT QJ, XZQDM, XZQMC
-        FROM sde.SYSCZCZGM
+        FROM KJGH_TABLE.SYSCZCZGM
         GROUP BY QJ, XZQDM, XZQMC
         ) T2
 
@@ -50,7 +50,7 @@
 
     <select id="selectListGroupByQj" resultType="java.lang.String">
         select distinct(t.qj)
-        from sde.sysczczgm t
+        from KJGH_TABLE.sysczczgm t
         <where>
             <if test="xzqdm != null and xzqdm != ''">
                 t.xzqdm like ''||#{xzqdm}||'%'

onemap-modules/onemap-apply/src/main/resources/mapper/oracle/fxpj/TSyskczgdgmMapper.xml

@@ -24,7 +24,7 @@
     <select id="selectList" parameterType="String" resultMap="TSyskczgdgmMap">
 
         SELECT YSDM, XZQDM, XZQMC, QJ, NYYSL, NTGGSYXLYXS, MJGDGGYSL, KCZDGDGM1, KCZDGDGM2, GGGDMJ, YYGDMJ, XZGDMJ1, XZGDMJ2, BZ
-        FROM sde.SYSKCZGDGM
+        FROM KJGH_TABLE.SYSKCZGDGM
 
         <where>
             <choose>
@@ -41,10 +41,10 @@
         SELECT YSDM, T1.XZQDM, T1.XZQMC, T1.QJ, NYYSL,
                NTGGSYXLYXS, MJGDGGYSL, KCZDGDGM1, KCZDGDGM2, GGGDMJ,
                YYGDMJ, XZGDMJ1, XZGDMJ2, BZ
-        FROM sde.SYSKCZGDGM T1,
+        FROM KJGH_TABLE.SYSKCZGDGM T1,
         (
             SELECT QJ, XZQDM, XZQMC
-            FROM sde.SYSKCZGDGM
+            FROM KJGH_TABLE.SYSKCZGDGM
             GROUP BY QJ, XZQDM, XZQMC
         ) T2
 

onemap-modules/onemap-apply/src/main/resources/mapper/oracle/fzss/HgxfxMapper.xml

@@ -55,7 +55,7 @@
         sum(xz.mj) as "mj"
          from (select * from t_fzss_hgxfx_jg_gis t where t.scxbsm = (select hgscx.bsm from t_fzss_hgxfx_hgscx hgscx left join t_fzss_hgxfx_scx scx on scx.bsm = hgscx.scxbsm where scx.kzxjb = 0
         and hgscx.rwbsm = #{bsm})) t
-        inner join (select * from sde.xzydyh x where x.objectid in (select objid from t_fzss_hgxfx_jg_gis gis where gis.scxbsm = (select hgscx.bsm from t_fzss_hgxfx_hgscx hgscx left join t_fzss_hgxfx_scx scx on scx.bsm = hgscx.scxbsm where scx.kzxjb = 0
+        inner join (select * from KJGH_QY.XZYDYH x where x.objectid in (select objid from t_fzss_hgxfx_jg_gis gis where gis.scxbsm = (select hgscx.bsm from t_fzss_hgxfx_hgscx hgscx left join t_fzss_hgxfx_scx scx on scx.bsm = hgscx.scxbsm where scx.kzxjb = 0
         and hgscx.rwbsm = #{bsm}))
         ) xz on xz.objectid = t.objid
         group by xz.ydyhfldm,xz.ydyhflmc