Browse Source

新增滨江控规批量新增接口

songxy 1 year ago
parent
commit
d5524925c5
21 changed files with 311 additions and 21 deletions
  1. 28 0
      BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/controller/rest/BjkgController.java
  2. 23 0
      BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/dao/BjkgMapper.java
  3. 208 0
      BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/domain/entity/BjKgDO.java
  4. 12 0
      BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/domain/vo/BjKgReqVO.java
  5. 11 0
      BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/service/BjkgService.java
  6. 29 0
      BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/service/impl/BjkgServiceImpl.java
  7. 0 21
      BJYSYBZ_S/ysgzybz.iml
  8. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  9. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/components/SlideCard/SlideCard.js.map
  10. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/components/navigationBar/navigationBar.js.map
  11. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map
  12. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/main/index.js.map
  13. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/nocheckDetail/index.js.map
  14. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/received/index.js.map
  15. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/receivedDetail/index.js.map
  16. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.js.map
  17. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.js.map
  18. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.js.map
  19. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.js.map
  20. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.js.map
  21. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map

+ 28 - 0
BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/controller/rest/BjkgController.java

@@ -0,0 +1,28 @@
+package com.zjugis.ysgzybz.controller.rest;
+
+import com.zjugis.ysgzybz.controller.BaseRestController;
+import com.zjugis.ysgzybz.domain.vo.BjKgReqVO;
+import com.zjugis.ysgzybz.service.BjkgService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/bj-kg")
+public class BjkgController extends BaseRestController {
+
+    @Autowired
+    private BjkgService bjkgService;
+
+    @PostMapping("/batch/add")
+    public Object addBatch(@RequestBody BjKgReqVO bjKgReqVO){
+        try{
+            return result(bjkgService.addBath(bjKgReqVO));
+        }catch (Exception err){
+            err.printStackTrace();
+            return error(err.getMessage(), ErrorCode.DEFAULT);
+        }
+    }
+}

+ 23 - 0
BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/dao/BjkgMapper.java

@@ -0,0 +1,23 @@
+package com.zjugis.ysgzybz.dao;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zjugis.ysgzybz.domain.entity.BjKgDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface BjkgMapper extends BaseMapper<BjKgDO> {
+
+    default int insertOrUpdate(List<BjKgDO> lists){
+        QueryWrapper<BjKgDO> queryWrapper = new QueryWrapper<>();
+        for(BjKgDO bjKgDO: lists){
+            queryWrapper.eq("featureguid", bjKgDO.getFeatureguid());
+            if(update(bjKgDO, queryWrapper) == 0 ){
+                insert(bjKgDO);
+            }
+        }
+        return lists.size();
+    }
+}

+ 208 - 0
BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/domain/entity/BjKgDO.java

@@ -0,0 +1,208 @@
+package com.zjugis.ysgzybz.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@TableName("ysybz.ybz_bj_kg")
+@KeySequence(value = "ybz_bj_kg_seq")
+public class BjKgDO {
+
+    /**
+     * 主键ID
+     * **/
+    @TableId
+    private BigDecimal id;
+
+    /**
+     * 单元名称
+     * **/
+    @TableField("dymc")
+    private String dymc;
+
+    /**
+     * 批复时间
+     * **/
+    @TableField("pfsj")
+    private Date pfsj;
+
+    /**
+     * 批复文号
+     * **/
+    @TableField("pfwh")
+    private String pfwh;
+
+    /**
+     * 地块编号
+     * **/
+    @TableField("dkbh")
+    private String dkbh;
+
+    /**
+     * 地类代码
+     * **/
+    @TableField("dldm")
+    private String dldm;
+
+    /**
+     * 地类名称
+     * **/
+    @TableField("dlmc")
+    private String dlmc;
+
+    /**
+     * 地类编码
+     * **/
+    @TableField("dlbm")
+    private String dlbm;
+
+    /**
+     * 主地类代码
+     * **/
+    @TableField("zdldm")
+    private String zdldm;
+
+    /**
+     * 用地兼容比例
+     * **/
+    @TableField("jrbl")
+    private String jrbl;
+
+    /**
+     * 用地面积
+     * **/
+    @TableField("mj")
+    private BigDecimal mj;
+
+    /**
+     * 容积率
+     * **/
+    @TableField("rjl")
+    private BigDecimal rjl;
+
+    /**
+     * 绿地率
+     * **/
+    @TableField("ldl")
+    private BigDecimal ldl;
+
+    /**
+     * 建筑密度
+     * **/
+    @TableField("jzmd")
+    private BigDecimal jzmd;
+
+    /**
+     * 建筑高度
+     * **/
+    @TableField("jzgd")
+    private BigDecimal jzgd;
+
+    /**
+     * 限高类型
+     * **/
+    @TableField("xglx")
+    private String xglx;
+
+    /**
+     * 附建设施1
+     * **/
+    @TableField("fjss1")
+    private String fjss1;
+
+    /**
+     * 附建设施2
+     * **/
+    @TableField("fjss2")
+    private String fjss2;
+
+    /**
+     * 城市设计刚性要求
+     * **/
+    @TableField("gxyq")
+    private String gxyq;
+
+    /**
+     * 城市设计弹性要求
+     * **/
+    @TableField("txyq")
+    private String txyq;
+
+    /**
+     * 规划动态
+     * **/
+    @TableField("ghdt")
+    private String ghdt;
+
+    /**
+     * 选择用地
+     * **/
+    @TableField("xzyd")
+    private String xzyd;
+
+    /**
+     * 耕地净面积
+     * **/
+    @TableField("gdmj")
+    private BigDecimal gdmj;
+
+    /**
+     * 用地分类
+     * **/
+    @TableField("fl")
+    private String fl;
+
+    /**
+     * 土地码
+     * **/
+    @TableField("tdm")
+    private String tdm;
+
+    /**
+     * 备注
+     * **/
+    @TableField("bz")
+    private String bz;
+
+    @TableField("ssqx")
+    private String ssqx;
+
+    @TableField("sffd")
+    private String sffd;
+
+    @TableField("dabh")
+    private String dabh;
+
+    @TableField("jcmj")
+    private BigDecimal jcmj;
+
+    @TableField("gkyq")
+    private String gkyq;
+
+    @TableField("lstz")
+    private String lstz;
+
+    @TableField("featureguid")
+    private String featureguid;
+
+    @TableField("updatetime")
+    private Date updatetime;
+
+    @TableField("taskinid")
+    private String taskinid;
+
+    @TableField("shape")
+    private Object shape;
+
+    @TableField("shape_Length")
+    private BigDecimal shape_Length;
+
+    @TableField("shape_Area")
+    private BigDecimal shape_Area;
+}

+ 12 - 0
BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/domain/vo/BjKgReqVO.java

@@ -0,0 +1,12 @@
+package com.zjugis.ysgzybz.domain.vo;
+
+import com.zjugis.ysgzybz.domain.entity.BjKgDO;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BjKgReqVO {
+
+    private List<BjKgDO> data;
+}

+ 11 - 0
BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/service/BjkgService.java

@@ -0,0 +1,11 @@
+package com.zjugis.ysgzybz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zjugis.ysgzybz.domain.entity.BjKgDO;
+import com.zjugis.ysgzybz.domain.vo.BjKgReqVO;
+
+public interface BjkgService extends IService<BjKgDO> {
+
+    Integer addBath(BjKgReqVO reqVO);
+
+}

+ 29 - 0
BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/service/impl/BjkgServiceImpl.java

@@ -0,0 +1,29 @@
+package com.zjugis.ysgzybz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zjugis.ysgzybz.dao.BjkgMapper;
+import com.zjugis.ysgzybz.domain.entity.BjKgDO;
+import com.zjugis.ysgzybz.domain.vo.BjKgReqVO;
+import com.zjugis.ysgzybz.service.BjkgService;
+import org.apache.ibatis.session.ExecutorType;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Objects;
+
+@Service
+public class BjkgServiceImpl extends ServiceImpl<BjkgMapper, BjKgDO> implements BjkgService {
+
+    @Resource
+    private BjkgMapper bjkgMapper;
+
+    @Override
+    public Integer addBath(BjKgReqVO reqVO) {
+        if(Objects.isNull(reqVO.getData())) throw new NullPointerException("请求data字段数据不能为空!");
+        return bjkgMapper.insertOrUpdate(reqVO.getData());
+    }
+}

+ 0 - 21
BJYSYBZ_S/ysgzybz.iml

@@ -20,7 +20,6 @@
     </content>
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.7.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.7.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.7.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.7.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.7.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.7.2" level="project" />
@@ -159,27 +158,7 @@
     <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
     <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
     <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
     <orderEntry type="library" name="Maven: org.geotools:gt-data:19.0" level="project" />
     <orderEntry type="library" name="Maven: org.geotools:gt-data:19.0" level="project" />
-    <orderEntry type="library" name="Maven: org.geotools:gt-main:19.0" level="project" />
-    <orderEntry type="library" name="Maven: org.geotools:gt-api:19.0" level="project" />
-    <orderEntry type="library" name="Maven: org.geotools:gt-referencing:19.0" level="project" />
-    <orderEntry type="library" name="Maven: org.ejml:ejml-ddense:0.32" level="project" />
-    <orderEntry type="library" name="Maven: org.ejml:ejml-core:0.32" level="project" />
-    <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.6" level="project" />
-    <orderEntry type="library" name="Maven: org.geotools:gt-metadata:19.0" level="project" />
-    <orderEntry type="library" name="Maven: org.geotools:gt-opengis:19.0" level="project" />
-    <orderEntry type="library" name="Maven: net.java.dev.jsr-275:jsr-275:1.0-beta-2" level="project" />
-    <orderEntry type="library" name="Maven: jgridshift:jgridshift:1.0" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.geographiclib:GeographicLib-Java:1.44" level="project" />
-    <orderEntry type="library" name="Maven: com.vividsolutions:jts-core:1.14.0" level="project" />
-    <orderEntry type="library" name="Maven: org.jdom:jdom2:2.0.6.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.media:jai_core:1.1.3" level="project" />
     <orderEntry type="library" name="Maven: org.geotools:gt-geojson:19.0" level="project" />
     <orderEntry type="library" name="Maven: org.geotools:gt-geojson:19.0" level="project" />
     <orderEntry type="library" name="Maven: com.zjugis:gis:1.4.2-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.zjugis:gis:1.4.2-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: com.healthmarketscience.jackcess:jackcess:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.geotools:gt-shapefile:19.0" level="project" />
-    <orderEntry type="library" name="Maven: com.oracle:ojdbc6:11.2.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.osgeo:proj4j:0.1.0" level="project" />
   </component>
   </component>
 </module>
 </module>

File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/components/SlideCard/SlideCard.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/components/navigationBar/navigationBar.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/main/index.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/nocheckDetail/index.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/received/index.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/receivedDetail/index.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


Some files were not shown because too many files changed in this diff