村庄规划成果包审查项（基本信息txt中村庄类型、村庄数量、规划人口）；专题制图功能接口

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

@@ -726,7 +726,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
             String line;
             while ((line = reader.readLine()) != null) {
                 if (StringUtils.isNotEmpty(line) && !line.contains("[")) {
-                    line = line.replace(" ", "");
+//                    line = line.replace(" ", "");
                     String[] curline = line.split("=");
                     if (curline.length == 1) {
                         continue;
@@ -969,6 +969,23 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
         return String.valueOf(year);
     }
 
+    /**
+     * 判断字符串是否为整型
+     * @param str
+     * @return
+     */
+    public static boolean isIntegerString(String str) {
+        if (str == null || str.isEmpty()) {
+            return false;
+        }
+        try {
+            Integer.parseInt(str);
+            return true;
+        } catch (NumberFormatException e) {
+            return false;
+        }
+    }
+
     public static boolean isNumeric(String str) {
         return str.matches("\\d+");
     }

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/Ztzt/ZttMbkDTO.java

@@ -0,0 +1,144 @@
+package com.onemap.analyse.domain.Ztzt;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+ * @ClassName ZttMbkDTO
+ * @Description TODO
+ * @Author 北京四维空间数码科技有限公司
+ * @Date 2023/6/12 9:19
+ * @Version 1.0
+ */
+@TableName("t_yzt_zttmbk")
+public class ZttMbkDTO
+{
+    private String bsm;
+    private String fzbsm;
+    private String mbmc;
+    private String mbwj;
+    private String mbms;
+    private Integer zt;
+    private byte[]  pic;
+
+    private String mbpath;
+
+
+    private String mbtype;
+    private String mbdtmc;
+    private String mbdtsm;
+    private String mbzzdw;
+    private String mbzzsj;
+    private String mbserverid;
+
+    public String getMbtype() {
+        return mbtype;
+    }
+
+    public void setMbtype(String mbtype) {
+        this.mbtype = mbtype;
+    }
+
+    public String getMbdtmc() {
+        return mbdtmc;
+    }
+
+    public void setMbdtmc(String mbdtmc) {
+        this.mbdtmc = mbdtmc;
+    }
+
+    public String getMbdtsm() {
+        return mbdtsm;
+    }
+
+    public void setMbdtsm(String mbdtsm) {
+        this.mbdtsm = mbdtsm;
+    }
+
+    public String getMbzzdw() {
+        return mbzzdw;
+    }
+
+    public void setMbzzdw(String mbzzdw) {
+        this.mbzzdw = mbzzdw;
+    }
+
+    public String getMbzzsj() {
+        return mbzzsj;
+    }
+
+    public void setMbzzsj(String mbzzsj) {
+        this.mbzzsj = mbzzsj;
+    }
+
+    public String getMbserverid() {
+        return mbserverid;
+    }
+
+    public void setMbserverid(String mbserverid) {
+        this.mbserverid = mbserverid;
+    }
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public String getFzbsm() {
+        return fzbsm;
+    }
+
+    public void setFzbsm(String fzbsm) {
+        this.fzbsm = fzbsm;
+    }
+
+    public String getMbmc() {
+        return mbmc;
+    }
+
+    public void setMbmc(String mbmc) {
+        this.mbmc = mbmc;
+    }
+
+    public String getMbwj() {
+        return mbwj;
+    }
+
+    public void setMbwj(String mbwj) {
+        this.mbwj = mbwj;
+    }
+
+    public String getMbms() {
+        return mbms;
+    }
+
+    public void setMbms(String mbms) {
+        this.mbms = mbms;
+    }
+
+    public Integer getZt() {
+        return zt;
+    }
+
+    public void setZt(Integer zt) {
+        this.zt = zt;
+    }
+
+    public byte[] getPic() {
+        return pic;
+    }
+
+    public void setPic(byte[] pic) {
+        this.pic = pic;
+    }
+
+    public String getMbpath() {
+        return mbpath;
+    }
+
+    public void setMbpath(String mbpath) {
+        this.mbpath = mbpath;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/Ztzt/ZttkDTO.java

@@ -0,0 +1,186 @@
+package com.onemap.analyse.domain.Ztzt;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+
+/**
+ * @ClassName ZttkDTO
+ * @Description TODO 专题制图新表
+ * @Author 北京四维空间数码科技有限公司
+ * @Date 2023/6/14 11:52
+ * @Version 1.0
+ */
+@TableName("t_yzt_zttk")
+public class ZttkDTO
+{
+    private String bsm;
+    private String mbbsm;
+    private String name;
+    private String dtsm;
+    private String zzdw;
+    private String zzsj;
+    private Integer count;
+
+
+    public Integer getCount() {
+        return count;
+    }
+
+    public void setCount(Integer count) {
+        this.count = count;
+    }
+
+    @TableField(exist = false)
+    private String mbmc;
+
+    public String getMbmc() {
+        return mbmc;
+    }
+
+    public void setMbmc(String mbmc) {
+        this.mbmc = mbmc;
+    }
+
+    private Integer ztzt;
+    private String zttwj;
+    private Date kssj;
+    private Date jssj;
+    private String cjyh;
+    private Date cjsj;
+    private String bz;
+    private String xzqdm;
+    private String filepath;
+    private String serverid;
+
+
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public String getMbbsm() {
+        return mbbsm;
+    }
+
+    public void setMbbsm(String mbbsm) {
+        this.mbbsm = mbbsm;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDtsm() {
+        return dtsm;
+    }
+
+    public void setDtsm(String dtsm) {
+        this.dtsm = dtsm;
+    }
+
+    public String getZzdw() {
+        return zzdw;
+    }
+
+    public void setZzdw(String zzdw) {
+        this.zzdw = zzdw;
+    }
+
+    public String getZzsj() {
+        return zzsj;
+    }
+
+    public void setZzsj(String zzsj) {
+        this.zzsj = zzsj;
+    }
+
+    public Integer getZtzt() {
+        return ztzt;
+    }
+
+    public void setZtzt(Integer ztzt) {
+        this.ztzt = ztzt;
+    }
+
+    public String getZttwj() {
+        return zttwj;
+    }
+
+    public void setZttwj(String zttwj) {
+        this.zttwj = zttwj;
+    }
+
+    public Date getKssj() {
+        return kssj;
+    }
+
+    public void setKssj(Date kssj) {
+        this.kssj = kssj;
+    }
+
+    public Date getJssj() {
+        return jssj;
+    }
+
+    public void setJssj(Date jssj) {
+        this.jssj = jssj;
+    }
+
+    public String getCjyh() {
+        return cjyh;
+    }
+
+    public void setCjyh(String cjyh) {
+        this.cjyh = cjyh;
+    }
+
+    public Date getCjsj() {
+        return cjsj;
+    }
+
+    public void setCjsj(Date cjsj) {
+        this.cjsj = cjsj;
+    }
+
+    public String getBz() {
+        return bz;
+    }
+
+    public void setBz(String bz) {
+        this.bz = bz;
+    }
+
+    public String getXzqdm() {
+        return xzqdm;
+    }
+
+    public void setXzqdm(String xzqdm) {
+        this.xzqdm = xzqdm;
+    }
+
+    public String getFilepath() {
+        return filepath;
+    }
+
+    public void setFilepath(String filepath) {
+        this.filepath = filepath;
+    }
+
+    public String getServerid() {
+        return serverid;
+    }
+
+    public void setServerid(String serverid) {
+        this.serverid = serverid;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/Ztzt/ZttmbTreeDTO.java

@@ -0,0 +1,33 @@
+package com.onemap.analyse.domain.Ztzt;
+
+import java.util.List;
+
+public class ZttmbTreeDTO {
+    private String value;
+    private String label;
+    private List<ZttmbTreeDTO> children;
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public List<ZttmbTreeDTO> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<ZttmbTreeDTO> children) {
+        this.children = children;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/ztzt/ZttKMapper.java

@@ -0,0 +1,30 @@
+package com.onemap.analyse.mapper.ztzt;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.analyse.domain.Ztzt.ZttMbkDTO;
+import com.onemap.analyse.domain.Ztzt.ZttkDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @ClassName ZttkMapper
+ * @Description TODO
+ * @Author 北京四维空间数码科技有限公司
+ * @Date 2023/6/14 14:37
+ * @Version 1.0
+ */
+@Mapper
+public interface ZttKMapper extends BaseMapper<ZttkDTO>
+{
+    String selectWaitCheck(String param);
+
+    List<ZttMbkDTO> GetMbkfzList(String param);
+
+    void updateWaitCheck(String param);
+
+    List<ZttkDTO> GetList(@Param("name") String name, @Param("zzdw") String zzdw);
+
+    void Delete(String id);
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/ztzt/ZttMbKMapper.java

@@ -0,0 +1,16 @@
+package com.onemap.analyse.mapper.ztzt;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.analyse.domain.Ztzt.ZttMbkDTO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @ClassName ZttMbKMapper
+ * @Description TODO
+ * @Author 北京四维空间数码科技有限公司
+ * @Date 2023/6/15 14:33
+ * @Version 1.0
+ */
+@Mapper
+public interface ZttMbKMapper extends BaseMapper<ZttMbkDTO>{
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/task/PythonExecute.java

@@ -71,6 +71,7 @@ public class PythonExecute {
 //        }
         //Runtime方式
         JSONObject json = new JSONObject(params);
+        System.out.println(String.format("%s %s %s %s", pythonexe, pythonfile, functionName, Base64Utils.base64Encode(json.toJSONString())));
         String[] arguments = new String[]{pythonexe, pythonfile, functionName, Base64Utils.base64Encode(json.toJSONString())};
         try {
             Process process = Runtime.getRuntime().exec(arguments);
@@ -78,6 +79,7 @@ public class PythonExecute {
             String line = null;
             while ((line = in.readLine()) != null) {
                 msg = line;
+                System.out.println(msg);
             }
             in.close();
             process.destroy();
@@ -103,7 +105,7 @@ public class PythonExecute {
             BufferedReader in = new BufferedReader(new InputStreamReader(process.getInputStream()));
             String line = null;
             while ((line = in.readLine()) != null) {
-                if(line.contains(".jpg")){
+                if (line.contains(".jpg")) {
                     res.add(line);
                 }
             }

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/task/ZttKSchedule.java

@@ -0,0 +1,141 @@
+package com.onemap.analyse.task;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.onemap.analyse.domain.Ztzt.ZttMbkDTO;
+import com.onemap.analyse.domain.Ztzt.ZttkDTO;
+import com.onemap.analyse.mapper.ztzt.ZttKMapper;
+import com.onemap.analyse.mapper.ztzt.ZttMbKMapper;
+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.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName ZttKSchedule
+ * @Description TODO
+ * @Author 北京四维空间数码科技有限公司
+ * @Date 2025/10/9 8:30
+ * @Version 1.0
+ */
+@Component
+public class ZttKSchedule
+{
+    //间隔时间 单位ms
+    public static final long TIME_INTERVAL = 1 * 20000;
+    //制图图片拼接时间戳格式
+    private SimpleDateFormat timeFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+    @Resource
+    private ZttKMapper zttKMapper;
+    @Resource
+    private ZttMbKMapper zttmbkmapper;
+
+//    @Value("${yzt.ztzt}")
+//    private String ztztUrl;
+
+    //专题图出图文件夹 需要已创建好的 后面会拼接编制时间文件夹加主标题文件名
+    @Value("${Ztt.exportLocation}")
+    private String exportLocation;
+    @Value("${Ztt.functionId}")
+    private String functionId;
+    @Value("${Hgxfx.temp}")
+    private String temp;
+
+    /**
+     * Scheduled 定时器参数
+     * cron表达式：指定任务在特定时间执行
+     * fixedDelay:表示上一次任务执行完成后多久再执行，参数类型long,单位：ms
+     * fixedDelayString:与fixedDelay一样，只是参数类型是String
+     * fixedRate:表示按一定的频率执行任务，参数类型long,单位：ms 如： fixedRate(5000)，表示这个定时器任务每5秒执行一次
+     * fixedRateString:与fixedRate一样，只是参数类型变为String
+     * initialDelay:表示延迟多久再第一次执行任务，参数类型为long ,单位：ms
+     * initialDelayString：与initialDelay一样，只是参数类型String
+     */
+    @Async("taskExecutor")
+    @Scheduled(fixedDelay = TIME_INTERVAL)
+    public void ZtztStatus()
+    {
+        try {
+            QueryWrapper<ZttkDTO> wrapper = new QueryWrapper<ZttkDTO>();
+            wrapper.eq("ztzt", "0"); //查找没做的专题图
+            wrapper.orderByAsc("cjsj");
+            //每次只操作一条记录，按照时间正序排列
+            List<ZttkDTO> ress = zttKMapper.selectList(wrapper);
+            if (ress.size() > 0)
+            {
+                ZttkDTO res = ress.get(0);
+                //更新数据库信息 开始时间 制图状态
+                res.setKssj(new Date());
+                res.setZtzt(1);
+                QueryWrapper<ZttkDTO> update = new QueryWrapper<ZttkDTO>();
+                update.eq("bsm", res.getBsm());
+                zttKMapper.update(res, update);
+
+                //查询模板位置
+                QueryWrapper<ZttMbkDTO> mb = new QueryWrapper<ZttMbkDTO>();
+                mb.eq("bsm", res.getMbbsm());
+                ZttMbkDTO mbDto = zttmbkmapper.selectOne(mb);
+                String mbposition = mbDto.getMbwj();
+
+                //判断目标文件夹是否存在，不存在则创建
+                String curTime = timeFormat.format(new Date());
+                String newfile = res.getZzsj() + "\\" + res.getName() + curTime + ".jpg";
+                String jpgpath = exportLocation + "\\" + newfile;
+                File file = new File(jpgpath);
+                if (!file.getParentFile().exists()) {
+                    file.getParentFile().mkdirs();
+                }
+
+                //执行python脚本  封装参数
+                Map<String, String> params = new HashMap<>();
+                params.put("bsm", res.getBsm());
+                params.put("mbposition", mbposition);
+                params.put("jpgpath", jpgpath);
+
+                try{
+                    String result = PythonExecute.Run(functionId, params);
+                    Date now = new Date();
+                    if (!StringUtils.isEmpty(result) && result.contains("OK")) {//成功
+                        res.setZtzt(2);
+                        res.setBz(result);
+                        res.setJssj(now);
+                        res.setZttwj(StringUtils.getFileStaticPath(jpgpath, temp));
+                        zttKMapper.update(res, update);
+                    }else{
+                        res.setJssj(now);
+                        res.setZtzt(3);
+                        res.setBz(result);
+                        QueryWrapper<ZttkDTO> update2 = new QueryWrapper<ZttkDTO>();
+                        update2.eq("bsm", res.getBsm());
+                        zttKMapper.update(res, update2);
+                    }
+                    //调用地址出图
+//                    String getUrl = ztztUrl + "" + res.getBsm()+"&mbposition="+ URLEncoder.encode(mbposition,"UTF-8")+"&jpgpath="+ URLEncoder.encode(jpgpath,"UTF-8")+"&newfile="+URLEncoder.encode(newfile,"UTF-8");
+//                    System.out.println("开始进行专题制图，调用地址" + getUrl);
+//                    String msg = HttpClientUtil.doGet(getUrl);
+//                    System.out.println("专题制图检查结果" + msg);
+//                    System.out.println("专题制图检查结果：" + res.getBsm() + "制图任务调用成果！！！！！！！！ " + new Date().toString());
+                }catch (Exception e){
+                    e.printStackTrace();
+                    res.setZtzt(3);
+                    res.setBz(e.getMessage());
+                    QueryWrapper<ZttkDTO> update2 = new QueryWrapper<ZttkDTO>();
+                    update2.eq("bsm", res.getBsm());
+                    zttKMapper.update(res, update2);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
+

onemap-modules/onemap-analyse/src/main/resources/mapper/oracle/ztzt/ZttKMapper.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.onemap.analyse.mapper.ztzt.ZttKMapper">
+
+
+    <select id="GetMbkfzList" parameterType="java.lang.String" resultType="com.onemap.analyse.domain.Ztzt.ZttMbkDTO">
+        select t.*, t.rowid from T_YZT_ZTTMBK t
+    </select>
+
+    <select id="selectWaitCheck" parameterType="java.lang.String"
+            resultType="java.lang.String">
+        select t.bsm from t_yzt_zttk t where  t.ztzt=#{param}
+    </select>
+
+    <update id="updateWaitCheck" parameterType="java.lang.String">
+        update t_yzt_zttk t set t.ztzt = '1'
+        where t.bsm = #{param}
+    </update>
+
+    <select id="GetList" parameterType="java.lang.String"
+            resultType="com.onemap.analyse.domain.Ztzt.ZttkDTO">
+        select t.bsm as "bsm",
+        mb.mbms as "mbms",
+        mb.mbmc as "mbmc",
+        t.name as "name",
+        t.dtsm as "dtsm",
+        t.zzdw as "zzdw",
+        t.zzsj as "zzsj",
+        t.ztzt as "ztzt",
+        t.count as "count",
+        t.serverid as "serverid",
+        t.filepath as "filepath",
+        t.zttwj as "zttwj" from t_yzt_zttk t left join t_yzt_zttmbk mb on mb.bsm = t.mbbsm
+        where 1 = 1
+        and t.name like '%%'
+        <if test="zzdw != null and zzdw != ''">
+            and t.zzdw like '%'||#{zzdw}||'%'
+        </if>
+        <if test="name != null and name != ''">
+            and t.name like '%'||#{name}||'%'
+        </if>
+        order by t.cjsj desc
+    </select>
+
+
+    <delete id="Delete" parameterType="java.lang.String">
+        delete from t_yzt_zttk t where t.bsm = #{id}
+    </delete>
+</mapper>

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

@@ -17,6 +17,7 @@ import com.onemap.common.core.utils.StringUtils;
 import com.onemap.common.core.utils.uuid.IdUtils;
 import com.onemap.common.core.web.domain.AjaxResult;
 import com.onemap.common.core.web.domain.WebResult;
+import com.onemap.common.security.utils.SecurityUtils;
 import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -102,8 +103,11 @@ public class SbSearchServiceImpl implements SbSearchService {
         if (StringUtils.isNotEmpty(subject)) {
             jsonObject.put("title", subject);
         }
+        //TODO wanger 如果没有选择行政区代码 则查询当前用户行政区代码
         if (StringUtils.isNotEmpty(divisionCode)) {
             jsonObject.put("divisionCode", divisionCode);
+        } else {
+            jsonObject.put("divisionCode", SecurityUtils.getLoginUserXzq());
         }
         return getRequestData(landGetRevisePageURI, jsonObject);
     }
@@ -117,8 +121,11 @@ public class SbSearchServiceImpl implements SbSearchService {
         if (StringUtils.isNotEmpty(subject)) {
             jsonObject.put("subject", subject);
         }
+        //TODO wanger 如果没有选择行政区代码 则查询当前用户行政区代码
         if (StringUtils.isNotEmpty(divisionCode)) {
             jsonObject.put("divisionCode", divisionCode);
+        } else {
+            jsonObject.put("divisionCode", SecurityUtils.getLoginUserXzq());
         }
         return getRequestData(landMyAttendsDataURI, jsonObject);
     }
@@ -132,8 +139,11 @@ public class SbSearchServiceImpl implements SbSearchService {
         if (StringUtils.isNotEmpty(subject)) {
             jsonObject.put("title", subject);
         }
+        //TODO wanger 如果没有选择行政区代码 则查询当前用户行政区代码
         if (StringUtils.isNotEmpty(divisionCode)) {
             jsonObject.put("divisionCode", divisionCode);
+        } else {
+            jsonObject.put("divisionCode", SecurityUtils.getLoginUserXzq());
         }
         return getRequestData(landGetAllTasksURI, jsonObject);
     }

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

@@ -787,6 +787,7 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
                 deleteCurDirectory(desc.getParent());
                 return AjaxResult.error("2---解析规划文本txt错误，请检查格式！");
             }
+            //TODO wanger 对成果包基本信息txt进行校验
             System.out.println("txtMap===" + txtMap);
             String xmmc = txtMap.get("xmmc") != null ? txtMap.get("xmmc") : relFileName;
             String xzqdm = txtMap.get("行政区代码");
@@ -794,11 +795,35 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
             String ghlxtext = txtMap.get("规划类型");
             String ghcjtext = txtMap.get("规划层级");
             String ghxstext = txtMap.get("成果形式");
+            String czlxtext = txtMap.get("村庄类型");
+            String czsltext = txtMap.get("村庄数量");
+            if (StringUtils.isEmpty(czlxtext)) {
+                return AjaxResult.error("2.1---村庄类型为空！");
+            }
+            if (StringUtils.isEmpty(czsltext)) {
+                return AjaxResult.error("2.2---村庄数量为空！");
+            } else if (czsltext.contains(" ")) {
+                return AjaxResult.error("2.3---村庄数量不能包含空格！");
+            }
+            //TODO wanger 基本信息txt中有关人口数量的校验
+            for (Map.Entry<String, String> entry : txtMap.entrySet()) {
+                String key = entry.getKey();
+                String value = entry.getValue();
+                if (key.endsWith("人口")) {
+                    System.out.println("找到人口相关数据 - Key: " + key + ", Value: " + value);
+                    // 判断value是否为整型字符串
+                    if (!isIntegerString(value)) {
+                        return AjaxResult.error("2.4---人口数量不能包含单位和空格！");
+                    }
+                }
+            }
             //TODO wanger 对成果包进行校验
             System.out.println("xmmc===" + xmmc);
             System.out.println("ghlxtext===" + ghlxtext);
             System.out.println("ghxstext===" + ghxstext);
             System.out.println("ghcjtext===" + ghcjtext);
+            System.out.println("czlxtext===" + czlxtext);
+            System.out.println("czsltext===" + czsltext);
             String sjbz_bsm = "";
             ObjectMapper objectMapper = new ObjectMapper();
             String txtjson = "";

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

@@ -61,7 +61,7 @@ public class ZttKSchedule
      * initialDelayString：与initialDelay一样，只是参数类型String
      */
     @Async("taskExecutor")
-    @Scheduled(fixedDelay = TIME_INTERVAL)
+//    @Scheduled(fixedDelay = TIME_INTERVAL)
     public void ZtztStatus()
     {
         try {

onemap-modules/onemap-apply/src/main/resources/mapper/oracle/yzt/ZymlMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.onemap.apply.mapper.yzt.ZymlGetMyCollectMapper">
+<mapper namespace="com.onemap.apply.mapper.yzt.ZymlMapper">
 
 
     <select id="GetList" parameterType="java.lang.String" resultType="com.onemap.apply.domain.yzt.ZymlDTO">