合并冲突

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/gdbh/GdbhController.java

@@ -0,0 +1,61 @@
+package com.onemap.apply.controller.gdbh;
+
+import com.onemap.apply.domain.gdbh.GdbhDto;
+import com.onemap.apply.service.gdbh.IGdbhService;
+import com.onemap.common.core.web.controller.BaseController;
+import com.onemap.common.core.web.domain.RequestResult;
+import com.onemap.common.core.web.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/gdbh")
+public class GdbhController extends BaseController {
+
+    @Autowired
+    private IGdbhService gdbhService;
+
+    /**
+     * 获取模型
+     *
+     * @param param 预留
+     * @return
+     */
+    @GetMapping("/GetMxList")
+    public RequestResult GetMxList(String param) {
+        RequestResult list = gdbhService.GetMxList(param);
+        return list;
+    }
+
+    /**
+     * 获取因子库
+     *
+     * @return
+     */
+    @GetMapping("/GetFactorList")
+    public RequestResult GetFactorList() {
+        RequestResult list = gdbhService.GetFactorList();
+        return list;
+    }
+
+    @PostMapping("/AddGdbh")
+    public RequestResult AddGdbh(@RequestBody GdbhDto gdbhDto) {
+        RequestResult list = gdbhService.AddGdbh(gdbhDto);
+        return list;
+    }
+
+    @DeleteMapping("/DeleteGdbh/{bsm}")
+    public RequestResult DeleteGdbh(@PathVariable String bsm) {
+        RequestResult list = gdbhService.DeleteGdbh(bsm);
+        return list;
+    }
+
+    @GetMapping("/SelectGdbhList")
+    public TableDataInfo SelectGdbhList(GdbhDto gdbhDto) {
+        startPage();
+        List<GdbhDto> list = gdbhService.SelectGdbhList(gdbhDto);
+        return getDataTable(list);
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/gdbh/GdbhDto.java

@@ -0,0 +1,151 @@
+package com.onemap.apply.domain.gdbh;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+import java.util.List;
+
+@TableName("t_gdbh")
+public class GdbhDto {
+    private String bsm;
+    private String xmmc;//项目名称
+    private String xzfw;//选址范围
+    private Double xzmj;//选址面积
+    private Date rwkssj;//开始
+    private Date rwjssj;//结束
+    private Date rwcjsj;//创建
+    @TableField(value = "cj_user_id")
+    private String cjUserId;
+    private Date rwscsj;//删除
+    private Integer status; //可用状态 1可用 0删除
+    private Integer rwzt; //任务状态(0创建 1执行中 2完成 3错误)
+    @TableField(exist = false)
+    private String geom;
+    @TableField(exist = false)
+    private String kssj;//开始 前端使用
+    @TableField(exist = false)
+    private String jssj;//结束 前端使用
+    @TableField(exist = false)
+    private List<GdbhMxDto> mxlist;
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public String getXmmc() {
+        return xmmc;
+    }
+
+    public void setXmmc(String xmmc) {
+        this.xmmc = xmmc;
+    }
+
+    public String getXzfw() {
+        return xzfw;
+    }
+
+    public void setXzfw(String xzfw) {
+        this.xzfw = xzfw;
+    }
+
+    public Double getXzmj() {
+        return xzmj;
+    }
+
+    public void setXzmj(Double xzmj) {
+        this.xzmj = xzmj;
+    }
+
+    public Date getRwkssj() {
+        return rwkssj;
+    }
+
+    public void setRwkssj(Date rwkssj) {
+        this.rwkssj = rwkssj;
+    }
+
+    public Date getRwjssj() {
+        return rwjssj;
+    }
+
+    public void setRwjssj(Date rwjssj) {
+        this.rwjssj = rwjssj;
+    }
+
+    public Date getRwcjsj() {
+        return rwcjsj;
+    }
+
+    public void setRwcjsj(Date rwcjsj) {
+        this.rwcjsj = rwcjsj;
+    }
+
+    public Date getRwscsj() {
+        return rwscsj;
+    }
+
+    public void setRwscsj(Date rwscsj) {
+        this.rwscsj = rwscsj;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getRwzt() {
+        return rwzt;
+    }
+
+    public void setRwzt(Integer rwzt) {
+        this.rwzt = rwzt;
+    }
+
+    public String getGeom() {
+        return geom;
+    }
+
+    public void setGeom(String geom) {
+        this.geom = geom;
+    }
+
+    public List<GdbhMxDto> getMxlist() {
+        return mxlist;
+    }
+
+    public void setMxlist(List<GdbhMxDto> mxlist) {
+        this.mxlist = mxlist;
+    }
+
+    public String getKssj() {
+        return kssj;
+    }
+
+    public void setKssj(String kssj) {
+        this.kssj = kssj;
+    }
+
+    public String getJssj() {
+        return jssj;
+    }
+
+    public void setJssj(String jssj) {
+        this.jssj = jssj;
+    }
+
+    public String getCjUserId() {
+        return cjUserId;
+    }
+
+    public void setCjUserId(String cjUserId) {
+        this.cjUserId = cjUserId;
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/gdbh/GdbhMxDto.java

@@ -0,0 +1,84 @@
+package com.onemap.apply.domain.gdbh;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.List;
+
+@TableName("t_gdbh_mx")
+public class GdbhMxDto {
+    private String bsm; //
+    private String bsmmc; //
+    private String pbsm; // 父级审核项标识码
+    private String kzxjb; //
+    private String xssx; //显示顺序
+    private Integer status; //可用状态 1可用 0不可用
+    private String parameter; //json参数
+
+    @TableField(exist = false)
+    private List<GdbhMxYzDto> gdbhMxYz;
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public String getBsmmc() {
+        return bsmmc;
+    }
+
+    public void setBsmmc(String bsmmc) {
+        this.bsmmc = bsmmc;
+    }
+
+    public String getPbsm() {
+        return pbsm;
+    }
+
+    public void setPbsm(String pbsm) {
+        this.pbsm = pbsm;
+    }
+
+    public String getKzxjb() {
+        return kzxjb;
+    }
+
+    public void setKzxjb(String kzxjb) {
+        this.kzxjb = kzxjb;
+    }
+
+    public String getXssx() {
+        return xssx;
+    }
+
+    public void setXssx(String xssx) {
+        this.xssx = xssx;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getParameter() {
+        return parameter;
+    }
+
+    public void setParameter(String parameter) {
+        this.parameter = parameter;
+    }
+
+    public List<GdbhMxYzDto> getGdbhMxYz() {
+        return gdbhMxYz;
+    }
+
+    public void setGdbhMxYz(List<GdbhMxYzDto> gdbhMxYz) {
+        this.gdbhMxYz = gdbhMxYz;
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/gdbh/GdbhMxYzDto.java

@@ -0,0 +1,45 @@
+package com.onemap.apply.domain.gdbh;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+@TableName("t_gdbh_mx_yz")
+public class GdbhMxYzDto {
+    @TableField(value = "mx_bsm")
+    private String mxBsm; //
+    private String bsm; //
+    private String bsmmc; //
+    private Integer status; //可用状态 1可用 0不可用
+
+    public String getMxBsm() {
+        return mxBsm;
+    }
+
+    public void setMxBsm(String mxBsm) {
+        this.mxBsm = mxBsm;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getBsmmc() {
+        return bsmmc;
+    }
+
+    public void setBsmmc(String bsmmc) {
+        this.bsmmc = bsmmc;
+    }
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/gdbh/GdbhYzDTO.java

@@ -0,0 +1,95 @@
+package com.onemap.apply.domain.gdbh;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+@TableName("t_gdbh_yz")
+public class GdbhYzDTO {
+    // id
+    private String id;
+    // 标识码
+    private String bsm;
+    // 影响因子名称
+    private String name;
+    // 目录等级
+    private Integer level;
+    // 上级标识码
+    @TableField("parent_id")
+    private String parentId;
+    // 是否包含影响值
+    @TableField("order_index")
+    @JsonIgnore
+    private Float orderIndex;
+    // 状态 1启用 2禁用
+    @JsonIgnore
+    private Integer status;
+    // 条件信息
+    @TableField("condition_info")
+    private String conditionInfo;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getLevel() {
+        return level;
+    }
+
+    public void setLevel(Integer level) {
+        this.level = level;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    public Float getOrderIndex() {
+        return orderIndex;
+    }
+
+    public void setOrderIndex(Float orderIndex) {
+        this.orderIndex = orderIndex;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getConditionInfo() {
+        return conditionInfo;
+    }
+
+    public void setConditionInfo(String conditionInfo) {
+        this.conditionInfo = conditionInfo;
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/gdbh/GdbhMapper.java

@@ -0,0 +1,11 @@
+package com.onemap.apply.mapper.gdbh;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.apply.domain.gdbh.GdbhDto;
+
+import java.util.List;
+
+public interface GdbhMapper extends BaseMapper<GdbhDto> {
+
+    List<GdbhDto> selectGdbhList(GdbhDto gdbh);
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/gdbh/GdbhMxMapper.java

@@ -0,0 +1,7 @@
+package com.onemap.apply.mapper.gdbh;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.apply.domain.gdbh.GdbhMxDto;
+
+public interface GdbhMxMapper extends BaseMapper<GdbhMxDto> {
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/gdbh/GdbhMxYzMapper.java

@@ -0,0 +1,7 @@
+package com.onemap.apply.mapper.gdbh;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.apply.domain.gdbh.GdbhMxYzDto;
+
+public interface GdbhMxYzMapper extends BaseMapper<GdbhMxYzDto> {
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/gdbh/GdbhYzMapper.java

@@ -0,0 +1,7 @@
+package com.onemap.apply.mapper.gdbh;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.apply.domain.gdbh.GdbhYzDTO;
+
+public interface GdbhYzMapper extends BaseMapper<GdbhYzDTO> {
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/gdbh/IGdbhService.java

@@ -0,0 +1,19 @@
+package com.onemap.apply.service.gdbh;
+
+import com.onemap.apply.domain.gdbh.GdbhDto;
+import com.onemap.common.core.web.domain.RequestResult;
+
+import java.util.List;
+
+public interface IGdbhService {
+    RequestResult GetMxList(String param);
+
+    RequestResult GetFactorList();
+
+    RequestResult AddGdbh(GdbhDto gdbhDto);
+
+    RequestResult DeleteGdbh(String bsm);
+
+    List<GdbhDto> SelectGdbhList(GdbhDto gdbhDto);
+
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/gdbh/impl/GdbhServiceImpl.java

@@ -0,0 +1,108 @@
+package com.onemap.apply.service.gdbh.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.onemap.apply.domain.config.fzss.FzxzFactorDTO;
+import com.onemap.apply.domain.config.fzss.HgxfxScxDTO;
+import com.onemap.apply.domain.gdbh.GdbhDto;
+import com.onemap.apply.domain.gdbh.GdbhMxDto;
+import com.onemap.apply.domain.gdbh.GdbhMxYzDto;
+import com.onemap.apply.domain.gdbh.GdbhYzDTO;
+import com.onemap.apply.mapper.gdbh.GdbhMapper;
+import com.onemap.apply.mapper.gdbh.GdbhMxMapper;
+import com.onemap.apply.mapper.gdbh.GdbhMxYzMapper;
+import com.onemap.apply.mapper.gdbh.GdbhYzMapper;
+import com.onemap.apply.service.gdbh.IGdbhService;
+import com.onemap.common.core.utils.StringUtils;
+import com.onemap.common.core.web.domain.RequestResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class GdbhServiceImpl implements IGdbhService {
+
+    @Autowired
+    private GdbhMxMapper gdbhMxMapper;
+    @Autowired
+    private GdbhMxYzMapper gdbhMxYzMapper;
+    @Autowired
+    private GdbhYzMapper gdbhYzMapper;
+    @Autowired
+    private GdbhMapper gdbhMapper;
+
+
+    @Override
+    public RequestResult GetMxList(String param) {
+        try {
+            QueryWrapper<GdbhMxDto> gdbhWrapper = new QueryWrapper<GdbhMxDto>();
+            gdbhWrapper.eq("status", 1);
+            gdbhWrapper.orderByAsc("xssx").orderByAsc("kzxjb");
+            List<GdbhMxDto> resGdbhMx = gdbhMxMapper.selectList(gdbhWrapper);
+
+            for (GdbhMxDto gdbhMx : resGdbhMx) {
+                QueryWrapper<GdbhMxYzDto> gdbhyzwrapper = new QueryWrapper<GdbhMxYzDto>();
+                gdbhyzwrapper.eq("status", 1);
+                gdbhyzwrapper.eq("mx_bsm", gdbhMx.getBsm());
+                List<GdbhMxYzDto> resGdbhyz = gdbhMxYzMapper.selectList(gdbhyzwrapper);
+                gdbhMx.setGdbhMxYz(resGdbhyz);
+            }
+            return RequestResult.success("查询成功", resGdbhMx);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return RequestResult.error("查询失败", null);
+        }
+    }
+
+
+    @Override
+    public RequestResult GetFactorList() {
+        try {
+            QueryWrapper<GdbhYzDTO> wrapper = new QueryWrapper<>();
+            wrapper.eq("status", 1);
+            wrapper.orderByAsc("order_index");
+            List<GdbhYzDTO> res = gdbhYzMapper.selectList(wrapper);
+            return RequestResult.success("查询成功", res);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return RequestResult.error("查询失败", null);
+        }
+    }
+
+    @Override
+    public RequestResult AddGdbh(GdbhDto gdbhDto) {
+        try {
+            gdbhDto.setBsm(StringUtils.getUUID());
+            gdbhDto.setStatus(1);
+            gdbhDto.setRwcjsj(new Date());
+            gdbhDto.setRwzt(0);
+            gdbhMapper.insert(gdbhDto);
+            return RequestResult.success("添加成功", 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return RequestResult.error("添加失败", null);
+        }
+    }
+
+    @Override
+    public List<GdbhDto> SelectGdbhList(GdbhDto gdbhDto) {
+        return gdbhMapper.selectGdbhList(gdbhDto);
+    }
+
+    @Override
+    public RequestResult DeleteGdbh(String bsm) {
+        try {
+            GdbhDto dto = new GdbhDto();
+            dto.setStatus(0);
+            dto.setRwscsj(new Date());
+            QueryWrapper<GdbhDto> wrapper = new QueryWrapper<>();
+            wrapper.eq("bsm", bsm);
+            gdbhMapper.update(dto, wrapper);
+            return RequestResult.success("删除成功", 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return RequestResult.error("删除失败", null);
+        }
+    }
+}

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/gdbh/GdbhMapper.xml

@@ -0,0 +1,26 @@
+<?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.apply.mapper.gdbh.GdbhMapper">
+
+    <select id="selectGdbhList" resultType="com.onemap.apply.domain.gdbh.GdbhDto">
+        select bsm, xmmc, xzfw, xzmj, status,rwcjsj,rwzt
+        from t_gdbh t
+        where t.status = 1
+        <if test="xmmc != null and xmmc != ''">
+            and t.xmmc like concat('%',#{xmmc},'%')
+        </if>
+        <if test="kssj != null and kssj != ''">
+            and t.rwcjsj &gt;= to_date(#{kssj}, 'yyyy-MM-dd hh24:mi:ss')
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and t.rwcjsj &lt;= to_date(#{jssj}, 'yyyy-MM-dd hh24:mi:ss')
+        </if>
+        <if test="cjUserId != null and cjUserId != ''">
+            and t.cj_user_id = #{cjUserId}
+        </if>
+        order by t.rwcjsj desc
+    </select>
+
+</mapper>

sql/pgsql/0_init.sql

@@ -68,3 +68,46 @@ return 'OK';
 END;
 $$ LANGUAGE plpgsql;
 
+-- 20240829
+DROP TABLE IF EXISTS base.t_gdbh_mx;
+
+CREATE TABLE base.t_gdbh_mx (
+                                bsm varchar(50) NOT NULL,
+                                bsmmc varchar(255) DEFAULT NULL::character varying NULL,
+                                pbsm varchar(50) NOT NULL, -- 父级审核项标识码
+                                kzxjb numeric(2) DEFAULT NULL::numeric NULL,
+                                xssx numeric(3) DEFAULT NULL::numeric NULL, -- 显示顺序
+                                status numeric(1) DEFAULT NULL::numeric NULL, -- 可用状态 1可用 0不可用
+                                "parameter" varchar(500) NULL, -- json参数
+                                CONSTRAINT t_gdbh_mx_pkey PRIMARY KEY (bsm)
+);
+COMMENT ON TABLE base.t_gdbh_mx IS '耕地保护模型';
+
+-- Column comments
+
+COMMENT ON COLUMN base.t_gdbh_mx.bsm IS '模型项标识码';
+COMMENT ON COLUMN base.t_gdbh_mx.bsmmc IS '模型项标识码名称';
+COMMENT ON COLUMN base.t_gdbh_mx.pbsm IS '父级审核项标识码';
+COMMENT ON COLUMN base.t_gdbh_mx.kzxjb IS '控制线级别0前端显示，不选中 1前端显示选中 2前端不显示，后台默认选中';
+COMMENT ON COLUMN base.t_gdbh_mx.xssx IS '显示顺序';
+COMMENT ON COLUMN base.t_gdbh_mx.status IS '可用状态 1可用 0不可用';
+COMMENT ON COLUMN base.t_gdbh_mx."parameter" IS 'json参数';
+
+
+
+
+DROP TABLE IF EXISTS base.t_gdbh_mx_yz;
+
+CREATE TABLE base.t_gdbh_mx_yz (
+                                   mx_bsm varchar(50) NOT NULL,
+                                   bsm varchar(50) NOT NULL,
+                                   bsmmc varchar(255) DEFAULT NULL::character varying NULL,
+                                   status numeric(1) DEFAULT NULL::numeric NULL,
+                                   CONSTRAINT t_gdbh_mx_yz_pkey PRIMARY KEY (bsm)
+);
+COMMENT ON TABLE base.t_gdbh_mx_yz IS '耕地保护模型对应的因子';
+
+COMMENT ON COLUMN base.t_gdbh_mx_yz.bsm IS '模型对应的标识码';
+COMMENT ON COLUMN base.t_gdbh_mx_yz.bsm IS '因子标识码';
+COMMENT ON COLUMN base.t_gdbh_mx_yz.bsmmc IS '因子标识码名称';
+COMMENT ON COLUMN base.t_gdbh_mx_yz.status IS '可用状态 1可用 0不可用';