提交一版吧

onemap-auth/src/main/resources/bootstrap.yml

@@ -12,6 +12,8 @@ spring:
     active: dev
   cloud:
     nacos:
+      username: nacos
+      password: nacos
       discovery:
         # 服务注册地址
         server-addr: 127.0.0.1:8848

onemap-gateway/src/main/resources/bootstrap.yml

@@ -16,6 +16,8 @@ spring:
     active: dev
   cloud:
     nacos:
+      username: nacos
+      password: nacos
       discovery:
         # 服务注册地址
         server-addr: 127.0.0.1:8848

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/cggl/CgglController.java

@@ -470,4 +470,16 @@ public class CgglController extends BaseController {
         RequestResult res = cgglService.xbfiledownload(id, response);
         return res;
     }
+
+    /**
+     * 下载修编文件
+     *
+     * @param
+     * @return
+     */
+    @GetMapping("/updateCgBaseInfo")
+    public RequestResult updateCgBaseInfo(HttpServletResponse response) {
+        RequestResult res = cgglService.updateCgBaseInfo(response);
+        return res;
+    }
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/fzss/FzxzController.java

@@ -91,9 +91,9 @@ public class FzxzController extends BaseController {
      * @return
      */
     @GetMapping("/GetFzxzList")
-    public RecordTableDataInfo GetFzxzList(String xmmc, String kssj, String jssj, Integer limit, Integer page) {
+    public RecordTableDataInfo GetFzxzList(String xmmc, String kssj, String jssj, String rwly, Integer limit, Integer page) {
         startRecordPage();
-        List<FzxzEntityDTO> list = fzxzService.GetFzxzList(xmmc, kssj, jssj);
+        List<FzxzEntityDTO> list = fzxzService.GetFzxzList(xmmc, kssj, jssj, rwly);
         return getRecordDataTable(list);
     }
 

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/fzss/HgxfxController.java

@@ -39,9 +39,9 @@ public class HgxfxController extends BaseController {
      * @return
      */
     @GetMapping("/GetPage")
-    public RecordTableDataInfo GetPage(Integer page, Integer total, String kssj, String jssj, String xmmc, Integer limit, Integer allpage) {
+    public RecordTableDataInfo GetPage(Integer page, Integer total, String kssj, String jssj, String xmmc, String rwly, Integer limit, Integer allpage) {
         startRecordPage();
-        List<HgxfxDTO> list = hgxfxService.GetPage(kssj, jssj, xmmc);
+        List<HgxfxDTO> list = hgxfxService.GetPage(kssj, jssj, xmmc, rwly);
         return getRecordDataTable(list);
     }
 

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fzss/HgxfxDTO.java

@@ -1,6 +1,8 @@
 package com.onemap.apply.domain.fzss;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -17,6 +19,8 @@ public class HgxfxDTO {
     private Date rwkssj;
     private Date rwjssj;
     private String cjyh;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date cjsj;
 
     public String getBsm() {

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/cggl/EscalationMapper.java

@@ -2,6 +2,7 @@ package com.onemap.apply.mapper.cggl;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.onemap.apply.domain.cggl.*;
+import com.onemap.apply.domain.sbjk.XzczghcgsbDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -69,4 +70,8 @@ public interface EscalationMapper extends BaseMapper<EscalationDTO> {
     void deleteRedundancyFiles();
 
     void updateCgScZt(@Param("cgid") String cgid, @Param("sczt") String sczt);
+
+    List<EscalationFileDTO> getEscalationFile();
+
+    List<XzczghcgsbDTO> getXzczghcgsbFile();
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/fzss/FzxzMapper.java

@@ -17,5 +17,5 @@ public interface FzxzMapper extends BaseMapper<FzxzDTO> {
 
     List<FzxzDldmTreeDTO> GetDldmTree(String fzbs);
 
-    List<FzxzEntityDTO> GetFzxzList(@Param("xmmc") String xmmc, @Param("kssj") String kssj, @Param("jssj") String jssj, @Param("username") String username);
+    List<FzxzEntityDTO> GetFzxzList(@Param("xmmc") String xmmc, @Param("kssj") String kssj, @Param("jssj") String jssj, @Param("username") String username, @Param("rwly") String rwly);
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/fzss/HgxfxMapper.java

@@ -16,7 +16,7 @@ import java.util.List;
  */
 public interface HgxfxMapper extends BaseMapper<HgxfxScxDTO> {
 
-    List<HgxfxDTO> GetPage(@Param("kssj") String kssj, @Param("jssj") String jssj, @Param("xmmc") String xmmc, @Param("username") String username);
+    List<HgxfxDTO> GetPage(@Param("kssj") String kssj, @Param("jssj") String jssj, @Param("xmmc") String xmmc, @Param("username") String username, @Param("rwly") String rwly);
 
     List<HgxfxJcxsDTO> getJcxs(String bsm);
 
@@ -27,4 +27,8 @@ public interface HgxfxMapper extends BaseMapper<HgxfxScxDTO> {
     void unionResourceScx();
 
     Integer getScrwCount();
+
+    List<HgxfxDTO> selectOpenAPIList();
+
+    void updateHgxfxbg(@Param("bsm") String bsm, @Param("fxbg") String fxbg);
 }

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

@@ -58,4 +58,6 @@ public interface CgglService {
     RequestResult xbfiledownload(String id, HttpServletResponse response);
 
     RequestResult xbdelete(String id);
+
+    RequestResult updateCgBaseInfo(HttpServletResponse response);
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/fzss/IFzxzService.java

@@ -18,7 +18,7 @@ public interface IFzxzService {
 
     RequestResult AddTemplate(FzxzTemplateDTO fzxzTemplateDTO);
 
-    List<FzxzEntityDTO> GetFzxzList(String xmmc, String kssj, String jssj);
+    List<FzxzEntityDTO> GetFzxzList(String xmmc, String kssj, String jssj, String rwly);
 
     RequestResult DeleteXzjg(String bsm);
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/fzss/IHgxfxService.java

@@ -8,7 +8,7 @@ import java.util.List;
 public interface IHgxfxService {
     RequestResult GetScxList(String param);
 
-    List<HgxfxDTO> GetPage(String kssj, String jssj, String xmmc);
+    List<HgxfxDTO> GetPage(String kssj, String jssj, String xmmc, String rwly);
 
     RequestResult GetLog(String bsm);
 

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

@@ -765,7 +765,11 @@ public class CgglServiceImpl implements CgglService {
             return RequestResult.error("参数为传递", false);
         }
         List<EscalationRzDTO> res = escalationRzMapper.getStatus(id);
-        res.sort(Comparator.comparing(m -> sdf.format(m.getOperatetime())));
+        try {
+            res.sort(Comparator.comparing(m -> sdf.format(m.getOperatetime())));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         Collections.reverse(res);
         return RequestResult.success("查询成功！", res);
     }
@@ -1038,6 +1042,102 @@ public class CgglServiceImpl implements CgglService {
         return RequestResult.success("操作成功！", 1);
     }
 
+    @Override
+    public RequestResult updateCgBaseInfo(HttpServletResponse response) {
+        //TODO wanger 总体规划类型中除过 报批项目、重大项目外 统一更新T_CGGL_ESCALATION_FILE表的REMARK字段
+        List<EscalationFileDTO> ztghFiles = escalationMapper.getEscalationFile();
+        Integer ztghcount = 0;
+        for (EscalationFileDTO file : ztghFiles) {
+            String filepath = file.getUnzippath();
+            File folder = new File(filepath);
+            if (folder.exists() && folder.isDirectory()) {
+            } else {
+                System.out.println("文件夹不存在或路径不是目录");
+                continue;
+            }
+            String txtFilePath = FileSearch(filepath, "基本信息.txt");
+            if (StringUtils.isEmpty(txtFilePath)) {
+                String firstFolder = FirstDirectoryName(filepath);
+                if (StringUtils.isEmpty(firstFolder)) {
+                    System.out.println(filepath + "成果包中没有包含“xxx基本信息.txt”文件");
+                    continue;
+                }
+                filepath = filepath + "\\" + firstFolder;
+                txtFilePath = FileSearch(filepath, "基本信息.txt");
+                if (StringUtils.isEmpty(txtFilePath)) {
+                    System.out.println(filepath + "成果包中没有包含“xxx基本信息.txt”文件");
+                    continue;
+                }
+            }
+            System.out.println("txtFilePath===" + txtFilePath);
+            Map<String, String> txtMap = null;
+            try {
+                txtMap = readTxt(txtFilePath, charset);
+            } catch (Exception e) {
+                System.out.println(filepath + "2---解析规划文本txt错误，请检查格式！");
+                continue;
+            }
+            System.out.println("txtMap===" + txtMap);
+            ObjectMapper objectMapper = new ObjectMapper();
+            String txtjson = "";
+            try {
+                txtjson = objectMapper.writeValueAsString(txtMap);
+            } catch (JsonProcessingException e) {
+                e.printStackTrace();
+            }
+            file.setRemark(txtjson);
+            QueryWrapper<EscalationFileDTO> wrapper = new QueryWrapper();
+            wrapper.eq("id", file.getId());
+            escalationFileMapper.update(file, wrapper);
+            ztghcount++;
+        }
+        //TODO wanger 村庄规划 统一更新T_XZCZGHCGSB表的BZ字段
+        List<XzczghcgsbDTO> czghFiles = xzczghcgsbMapper.selectList(null);
+        Integer czghcount = 0;
+        for (XzczghcgsbDTO file : czghFiles) {
+            String filepath = file.getFilePath();
+            if (StringUtils.isEmpty(filepath)) {
+                continue;
+            }
+            File folder = new File(filepath);
+            if (folder.exists()) {
+            } else {
+                System.out.println("文件夹不存在或路径不是目录");
+                continue;
+            }
+            String parentFolder = folder.getParent();
+            String firstFolder = FirstDirectoryName(parentFolder);
+            filepath = parentFolder + "\\" + firstFolder;
+            String txtFilePath = FileSearch(filepath, "基本信息.txt");
+            if (StringUtils.isEmpty(txtFilePath)) {
+                System.out.println(filepath + "成果包中没有包含“xxx基本信息.txt”文件");
+                continue;
+            }
+            System.out.println("txtFilePath===" + txtFilePath);
+            Map<String, String> txtMap = null;
+            try {
+                txtMap = readTxt(txtFilePath, charset);
+            } catch (Exception e) {
+                System.out.println(filepath + "2---解析规划文本txt错误，请检查格式！");
+                continue;
+            }
+            System.out.println("txtMap===" + txtMap);
+            ObjectMapper objectMapper = new ObjectMapper();
+            String txtjson = "";
+            try {
+                txtjson = objectMapper.writeValueAsString(txtMap);
+            } catch (JsonProcessingException e) {
+                e.printStackTrace();
+            }
+            file.setBz(txtjson);
+            QueryWrapper<XzczghcgsbDTO> wrapper = new QueryWrapper();
+            wrapper.eq("uuid", file.getUuid());
+            xzczghcgsbMapper.update(file, wrapper);
+            czghcount++;
+        }
+        return RequestResult.success(String.format("共更新总体规划类型数据：%s条记录！共更新村庄规划类型数据：%s条记录！", ztghcount, czghcount));
+    }
+
     @Override
     public RequestResult xbfiledownload(String id, HttpServletResponse response) {
         if (StringUtils.isEmpty(id)) {

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/fzss/FzxzServiceImpl.java

@@ -116,10 +116,10 @@ public class FzxzServiceImpl implements IFzxzService {
     }
 
     @Override
-    public List<FzxzEntityDTO> GetFzxzList(String xmmc, String kssj, String jssj) {
+    public List<FzxzEntityDTO> GetFzxzList(String xmmc, String kssj, String jssj, String rwly) {
         try {
             String username = SecurityUtils.getUsername();
-            List<FzxzEntityDTO> res = fzxzMapper.GetFzxzList(xmmc, kssj, jssj, username);
+            List<FzxzEntityDTO> res = fzxzMapper.GetFzxzList(xmmc, kssj, jssj, username, rwly);
             return res;
         } catch (Exception e) {
             e.printStackTrace();

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/fzss/HgxfxServiceImpl.java

@@ -47,9 +47,9 @@ public class HgxfxServiceImpl implements IHgxfxService {
     }
 
     @Override
-    public List<HgxfxDTO> GetPage(String kssj, String jssj, String xmmc) {
+    public List<HgxfxDTO> GetPage(String kssj, String jssj, String xmmc, String rwly) {
         String username = SecurityUtils.getUsername();
-        List<HgxfxDTO> res = hgxfxMapper.GetPage(kssj, jssj, xmmc, username);
+        List<HgxfxDTO> res = hgxfxMapper.GetPage(kssj, jssj, xmmc, username, rwly);
         return res;
     }
 

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/task/HgxfxbgSchedule.java

@@ -0,0 +1,59 @@
+package com.onemap.apply.task;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.onemap.apply.domain.fzss.HgxfxDTO;
+import com.onemap.apply.mapper.cggl.EscalationMapper;
+import com.onemap.apply.mapper.fzss.HgxfxMapper;
+import com.onemap.apply.utils.HttpClientUtil;
+import com.onemap.common.core.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 合规性分析分析报告定时刷新任务
+ */
+@Component
+public class HgxfxbgSchedule {
+    //间隔时间 单位ms
+    public static final long TIME_INTERVAL = 1 * 2000000000;
+    @Resource
+    private HgxfxMapper hgxfxMapper;
+    @Value("${Cggl.temp}")
+    private String temppath;
+
+
+    @Async("taskExecutor")
+//    @Scheduled(fixedDelay = TIME_INTERVAL)
+    public void hgxfxbgSchedule() {
+        try {
+            List<HgxfxDTO> list = hgxfxMapper.selectOpenAPIList();
+            for(HgxfxDTO cur : list){
+                String bsm = cur.getBsm();
+                File folder = new File(temppath + "合规性检查报告\\" + bsm);
+                if (folder.exists() && folder.isDirectory()) {
+                    File[] files = folder.listFiles();
+                    for (File file1 : files) {
+                        String filetype = file1.getAbsolutePath().substring(file1.getAbsolutePath().lastIndexOf(".") + 1);
+                        if ("doc".equals(filetype) || "docx".equals(filetype)) {
+                            String path = String.format("/file/statics/合规性检查报告/%s/%s", bsm, file1.getName()) ;
+                            hgxfxMapper.updateHgxfxbg(bsm , path);
+                            break;
+                        }
+                    }
+                } else {
+                    System.out.println(folder.getAbsolutePath() + "-----文件夹不存在");
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/task/RedundancyFileSchedule.java

@@ -41,7 +41,7 @@ public class RedundancyFileSchedule {
      * initialDelayString：与initialDelay一样，只是参数类型String
      */
     @Async("taskExecutor")
-    @Scheduled(fixedDelay = TIME_INTERVAL)
+//    @Scheduled(fixedDelay = TIME_INTERVAL)
     public void CgscStatus() {
         try {
             //查询所有未关联上的规划成果包数据列表

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

@@ -27,6 +27,8 @@ spring:
     active: dev
   cloud:
     nacos:
+      username: nacos
+      password: nacos
       discovery:
         # 服务注册地址
         server-addr: 127.0.0.1:8848

onemap-modules/onemap-apply/src/main/resources/mapper/oracle/cggl/EscalationMapper.xml

@@ -506,6 +506,14 @@ select distinct (t.instid)
         select path from T_CGGL_ESCALATION_FILE t where t.id not in (select fileid from T_CGGL_ESCALATION tt)
     </select>
 
+    <select id="getEscalationFile" resultType="com.onemap.apply.domain.cggl.EscalationFileDTO">
+        select * from T_CGGL_ESCALATION_FILE t where t.id  in (select fileid from T_CGGL_ESCALATION tt)
+    </select>
+
+    <select id="getXzczghcgsbFile" resultType="com.onemap.apply.domain.sbjk.XzczghcgsbDTO">
+        select * from T_XZCZGHCGSB t
+    </select>
+
     <delete id="deleteRedundancyFiles">
         delete from T_CGGL_ESCALATION_FILE t where t.id not in (select fileid from T_CGGL_ESCALATION tt)
     </delete>

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

@@ -26,7 +26,10 @@
         t.rwzt as "rwzt",
         t.xzfw as "xzfw",
         t.zip as "zip" from t_fzss_fzxz t left join t_fzss_fzxz_sjy sjy on sjy.bsm = t.sjy
-        where t.rwly = 'Web'
+        where 1 = 1
+        <if test="rwly != null and rwly != ''">
+            and t.rwly = #{rwly}
+        </if>
         <if test="kssj != null and kssj != ''">
             and t.cjsj &gt;= to_date(#{kssj}, 'yyyy-MM-dd hh24:mi:ss')
         </if>

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

@@ -27,6 +27,9 @@
         <if test="username != null and username != ''">
             and t.cjyh = #{username}
         </if>
+        <if test="rwly != null and rwly != ''">
+            and t.rwly = #{rwly}
+        </if>
         order by t.cjsj desc
     </select>
 
@@ -106,4 +109,12 @@
         from t_yzt_zyml o where o.bsm = t.bsm) tjzd,
         '1' status from t_yzt_zyml t where t.sde like '%.%' and t.parent = '0'
     </insert>
+
+    <select id="selectOpenAPIList" parameterType="java.lang.String" resultType="com.onemap.apply.domain.fzss.HgxfxDTO">
+        select * from T_FZSS_HGXFX where rwzt = 2 and rwly = 'OpenAPI' and (fxbg = '' or fxbg is null)
+    </select>
+
+    <update id="updateHgxfxbg" parameterType="java.lang.String">
+        update T_FZSS_HGXFX set fxbg = #{fxbg} where bsm = #{bsm}
+    </update>
 </mapper> 

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

@@ -31,6 +31,8 @@ spring:
     active: dev
   cloud:
     nacos:
+      username: nacos
+      password: nacos
       discovery:
         # 服务注册地址
         server-addr: 127.0.0.1:8848

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

@@ -12,6 +12,8 @@ spring:
     active: dev
   cloud:
     nacos:
+      username: nacos
+      password: nacos
       discovery:
         # 服务注册地址
         server-addr: 127.0.0.1:8848