es

src/main/java/com/sooka/sponest/mobile/data/digitalemergencycontroller/AppEmergencyPatrolpointController.java

@@ -0,0 +1,72 @@
+package com.sooka.sponest.mobile.data.digitalemergencycontroller;
+
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.PageDomain;
+import com.ruoyi.common.core.web.page.TableSupport;
+import com.sooka.sponest.data.api.digitalemergency.domain.EmergencyPatrolpoint;
+import com.sooka.sponest.data.api.digitalemergency.service.RemoteEmergencyPatrolpointService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 巡更点Controller
+ *
+ * @author ruoyi
+ * @date 2022-07-20
+ */
+@RestController
+@RequestMapping("/AppEmergencyPatrolpointController")
+public class AppEmergencyPatrolpointController extends BaseController {
+
+    @Resource
+    RemoteEmergencyPatrolpointService remoteEmergencyPatrolpointService;
+
+    /**
+     * 查询巡更点列表
+     */
+    @GetMapping("/EmergencyPatrolpoint/list")
+    public AjaxResult list(EmergencyPatrolpoint emergencyPatrolpoint) {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        String name = emergencyPatrolpoint.getName();
+        return AjaxResult.success(remoteEmergencyPatrolpointService.selectPatrolpointList(pageNum, pageSize, name).getRows());
+    }
+
+
+    /**
+     * 获取巡更点详细信息
+     */
+    @GetMapping("/EmergencyPatrolpoint/edit")
+    public AjaxResult getInfo(String id) {
+        return remoteEmergencyPatrolpointService.selectPatrolpointById(id);
+    }
+
+    /**
+     * 新增巡更点
+     */
+    @PostMapping("/EmergencyPatrolpoint")
+    public AjaxResult add(@RequestBody String json) {
+        return remoteEmergencyPatrolpointService.insertPatrolpoint(json);
+    }
+
+    /**
+     * 修改巡更点
+     */
+    @PostMapping("/EmergencyPatrolpoint/put")
+    public AjaxResult edit(@RequestBody String json) {
+        return remoteEmergencyPatrolpointService.updatePatrolpoint(json);
+    }
+
+    /**
+     * 删除巡更点
+     */
+    @GetMapping("/EmergencyPatrolpoint/del")
+    public AjaxResult remove(@RequestParam("id") List<String> id) {
+        return remoteEmergencyPatrolpointService.deletePatrolpointByIds(id.toArray(new String[0]));
+    }
+
+}

src/main/java/com/sooka/sponest/mobile/data/digitalenvironmentcontroller/ProhibitionAreaController.java

@@ -0,0 +1,71 @@
+package com.sooka.sponest.mobile.data.digitalenvironmentcontroller;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.PageDomain;
+import com.ruoyi.common.core.web.page.TableSupport;
+import com.sooka.sponest.data.api.digitalenvironment.domain.EnvironmentBiggas;
+import com.sooka.sponest.data.api.digitalenvironment.domain.EnvironmentProhibitionArea;
+import com.sooka.sponest.data.api.digitalenvironment.service.RemoteProhibitionAreaService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Author LG
+ * @Date 2023/9/6 - 14:41
+ */
+@RestController
+@RequestMapping("/AppProhibitionAreaController")
+public class ProhibitionAreaController {
+    @Resource
+    private RemoteProhibitionAreaService remoteProhibitionAreaService;
+
+
+    /**
+     * 查询禁烧区管理
+     */
+    @GetMapping("/prohibitionArea/list")
+    public AjaxResult list(EnvironmentProhibitionArea environmentProhibitionArea) {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        String name = environmentProhibitionArea.getName();
+        String address = environmentProhibitionArea.getAddress();
+        String principal = environmentProhibitionArea.getPrincipal();
+        return AjaxResult.success(remoteProhibitionAreaService.getList(pageNum, pageSize, name,address,principal).getRows());
+    }
+
+
+    /**
+     * 获取禁烧区管理详细信息
+     */
+    @GetMapping("/prohibitionArea/edit")
+    public AjaxResult getInfo(EnvironmentBiggas biggas) {
+        return remoteProhibitionAreaService.getEdit(biggas.getId());
+    }
+
+    /**
+     * 新增禁烧区管理
+     */
+    @PostMapping("/prohibitionArea")
+    public AjaxResult add(@RequestBody String json) {
+        return remoteProhibitionAreaService.add(json);
+    }
+
+    /**
+     * 修改禁烧区管理
+     */
+    @PostMapping("/prohibitionArea/put")
+    public AjaxResult edit(@RequestBody String json) {
+        return remoteProhibitionAreaService.edit(json);
+    }
+
+    /**
+     * 删除禁烧区管理
+     */
+    @GetMapping("/prohibitionArea/del")
+    public AjaxResult remove(@RequestParam("id") List<String> id) {
+        return remoteProhibitionAreaService.del(id.toArray(new String[0]));
+    }
+}

src/main/java/com/sooka/sponest/mobile/data/digitalforestController/CheckpointController.java

@@ -0,0 +1,80 @@
+package com.sooka.sponest.mobile.data.digitalforestController;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.PageDomain;
+import com.ruoyi.common.core.web.page.TableSupport;
+import com.sooka.sponest.data.api.digitalforest.domain.Checkpoint;
+import com.sooka.sponest.data.api.digitalforest.service.RemoteCheckpointService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@RequestMapping("AppCheckpointController")
+public class CheckpointController {
+    @Resource
+    RemoteCheckpointService remoteCheckpointService;
+
+    /**
+     * 获取防火检查站列表
+     *
+     * @param checkpoint
+     * @return
+     */
+    @GetMapping("/checkpoint/list")
+    public AjaxResult checkpointList(Checkpoint checkpoint) {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        String name = checkpoint.getName();
+        String checkpointPerson = checkpoint.getCheckpointPerson();
+        String checkpointTel = checkpoint.getCheckpointTel();
+        return AjaxResult.success(remoteCheckpointService.list(pageNum, pageSize, name, checkpointPerson, checkpointTel).getRows());
+
+    }
+
+    /**
+     * 获取防火检查站详情
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/checkpoint/edit")
+    public AjaxResult afforestationEdit(String id) {
+        return remoteCheckpointService.edit(id);
+    }
+
+    /**
+     * 新增防火检查站
+     *
+     * @param json
+     * @return
+     */
+    @PostMapping("/checkpoint")
+    public AjaxResult afforestation(@RequestBody String json) {
+        return remoteCheckpointService.add(json);
+    }
+
+    /**
+     * 修改防火检查站
+     *
+     * @param json
+     * @return
+     */
+    @PostMapping("/checkpoint/put")
+    public AjaxResult putAfforestation(@RequestBody String json) {
+        return remoteCheckpointService.put(json);
+    }
+
+    /**
+     * 删除防火检查站
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/checkpoint/del")
+    public AjaxResult delAfforestation(@RequestParam("id") List<String> id) {
+        return remoteCheckpointService.remove(id.toArray(new String[0]));
+    }
+}

src/main/java/com/sooka/sponest/mobile/data/digitalforestController/WeatherstationController.java

@@ -0,0 +1,81 @@
+package com.sooka.sponest.mobile.data.digitalforestController;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.PageDomain;
+import com.ruoyi.common.core.web.page.TableSupport;
+import com.sooka.sponest.data.api.digitalforest.domain.Weatherstation;
+import com.sooka.sponest.data.api.digitalforest.service.RemoteWeatherstationService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@RequestMapping("AppWeatherstationController")
+public class WeatherstationController {
+
+    @Resource
+    RemoteWeatherstationService remoteWeatherstationService;
+
+    /**
+     * 获取气象站
+     *
+     * @param weatherstation
+     * @return
+     */
+    @GetMapping("/weatherstation/list")
+    public AjaxResult weatherstationList(Weatherstation weatherstation) {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        String name = weatherstation.getName();
+        String weatherstationPerson = weatherstation.getWeatherstationPerson();
+        String weatherstationTel = weatherstation.getWeatherstationTel();
+        return AjaxResult.success(remoteWeatherstationService.list(pageNum, pageSize, name, weatherstationPerson, weatherstationTel).getRows());
+
+    }
+
+    /**
+     * 获取气象站详情
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/weatherstation/edit")
+    public AjaxResult weatherstationEdit(String id) {
+        return remoteWeatherstationService.edit(id);
+    }
+
+    /**
+     * 新增气象站
+     *
+     * @param json
+     * @return
+     */
+    @PostMapping("/weatherstation")
+    public AjaxResult weatherstation(@RequestBody String json) {
+        return remoteWeatherstationService.add(json);
+    }
+
+    /**
+     * 修改气象站
+     *
+     * @param json
+     * @return
+     */
+    @PostMapping("/weatherstation/put")
+    public AjaxResult putweatherstation(@RequestBody String json) {
+        return remoteWeatherstationService.put(json);
+    }
+
+    /**
+     * 删除气象站
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/weatherstation/del")
+    public AjaxResult delweatherstation(@RequestParam("id") List<String> id) {
+        return remoteWeatherstationService.remove(id.toArray(new String[0]));
+    }
+}

src/main/java/com/sooka/sponest/mobile/data/other/controller/BreedResourcesController.java

@@ -4,8 +4,8 @@ package com.sooka.sponest.mobile.data.other.controller;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableSupport;
-import com.sooka.sponest.mobile.data.other.domain.CenterdataTFarmBreedResources;
-import com.sooka.sponest.mobile.data.other.service.OtherService;
+import com.sooka.sponest.data.api.other.domain.CenterdataTFarmBreedResources;
+import com.sooka.sponest.data.api.other.service.OtherService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

src/main/java/com/sooka/sponest/mobile/data/other/controller/ForestController.java

@@ -4,8 +4,8 @@ package com.sooka.sponest.mobile.data.other.controller;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableSupport;
-import com.sooka.sponest.mobile.data.other.domain.CenterdataTResourcesForest;
-import com.sooka.sponest.mobile.data.other.service.OtherService;
+import com.sooka.sponest.data.api.other.domain.CenterdataTResourcesForest;
+import com.sooka.sponest.data.api.other.service.OtherService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

src/main/java/com/sooka/sponest/mobile/data/other/controller/HydroenergyController.java

@@ -4,8 +4,8 @@ package com.sooka.sponest.mobile.data.other.controller;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableSupport;
-import com.sooka.sponest.mobile.data.other.domain.CenterdataTResourcesHydroenergy;
-import com.sooka.sponest.mobile.data.other.service.OtherService;
+import com.sooka.sponest.data.api.other.domain.CenterdataTResourcesHydroenergy;
+import com.sooka.sponest.data.api.other.service.OtherService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

src/main/java/com/sooka/sponest/mobile/data/other/controller/LandController.java

@@ -4,8 +4,8 @@ package com.sooka.sponest.mobile.data.other.controller;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableSupport;
-import com.sooka.sponest.mobile.data.other.domain.CenterdataTResourcesLand;
-import com.sooka.sponest.mobile.data.other.service.OtherService;
+import com.sooka.sponest.data.api.other.domain.CenterdataTResourcesLand;
+import com.sooka.sponest.data.api.other.service.OtherService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

src/main/java/com/sooka/sponest/mobile/data/other/controller/LandInfoController.java

@@ -5,7 +5,7 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableSupport;
 import com.sooka.sponest.mobile.data.other.domain.CenterdataTFarmLandInfo;
-import com.sooka.sponest.mobile.data.other.service.OtherService;
+import com.sooka.sponest.data.api.other.service.OtherService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

src/main/java/com/sooka/sponest/mobile/data/other/controller/LiveStockProtectInfoController.java

@@ -4,8 +4,8 @@ package com.sooka.sponest.mobile.data.other.controller;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableSupport;
-import com.sooka.sponest.mobile.data.other.domain.CenterdataTFarmLivestockProtectInfo;
-import com.sooka.sponest.mobile.data.other.service.OtherService;
+import com.sooka.sponest.data.api.other.domain.CenterdataTFarmLivestockProtectInfo;
+import com.sooka.sponest.data.api.other.service.OtherService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

src/main/java/com/sooka/sponest/mobile/data/other/domain/CenterdataTFarmBreedResources.java

@@ -1,138 +0,0 @@
-package com.sooka.sponest.mobile.data.other.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * 养殖资源信息对象 centerdata_t_farm_breed_resources
- *
- * @author ruoyi
- * @date 2022-10-10
- */
-@Getter
-@Setter
-@ApiModel(description = "养殖资源信息对象")
-public class CenterdataTFarmBreedResources extends BaseBusinessEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键id", required = false)
-
-    /** $column.columnComment */
-    private String id;
-
-    @ApiModelProperty(value = "养殖户名称", required = false)
-
-    /** 养殖名称 */
-    @Excel(name = "养殖名称")
-    private String name;
-
-    /** 详细通讯地址 */
-    @ApiModelProperty(value = "详细通讯地址", required = false)
-
-    @Excel(name = "详细通讯地址")
-    private String address;
-
-    /** 地址坐标经度 */
-    @ApiModelProperty(value = "经度", required = false)
-
-    @Excel(name = "经度")
-    private String longitude;
-
-    /** 地址坐标纬度 */
-
-    @ApiModelProperty(value = "纬度", required = false)
-
-    @Excel(name = "纬度")
-    private String latitude;
-
-    /** 养殖户类型 */
-    @ApiModelProperty(value = "养殖户类型", required = false)
-
-    @Excel(name = "养殖户类型",dictType = "farm_farmer_type")
-    private String breederType;
-
-    private String breederTypeLabel;
-
-    /** 养殖类型 */
-    @ApiModelProperty(value = "养殖类型", required = false)
-
-    @Excel(name = "养殖类型",dictType = "farm_breed_type")
-    private String type;
-
-    private String typeLabel;
-
-    /** 养殖品种 */
-    @ApiModelProperty(value = "养殖品种", required = false)
-
-    @Excel(name = "养殖品种")
-    private String varieties;
-
-    /** 养殖数量 */
-    @ApiModelProperty(value = "养殖数量", required = false)
-
-
-    @Excel(name = "养殖数量")
-    private String quantity;
-
-    /** 粪污处理占地面积 */
-    @ApiModelProperty(value = "粪污处理占地面积", required = false)
-
-    @Excel(name = "粪污处理占地面积")
-    private String excrementArea;
-
-    /** 粪污处理产物 */
-    @ApiModelProperty(value = "粪污处理产物", required = false)
-
-    @Excel(name = "粪污处理产物")
-    private String excrementProduct;
-
-    /** 粪污处理说明 */
-    @ApiModelProperty(value = "粪污处理说明", required = false)
-
-    @Excel(name = "粪污处理说明")
-    private String excrementExplain;
-
-    @Excel(name = "营收情况")
-    private String revenue;
-
-    /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-//    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createDate;
-
-    /** 修改时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-//    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updateDate;
-
-    /** 备注 */
-//    @Excel(name = "备注")
-    @ApiModelProperty(value = "备注", required = false)
-
-    private String remarks;
-
-    /** 删除标识 */
-    @ApiModelProperty(value = "删除标识", required = false)
-
-    private String delFlag;
-
-    /** 部门ID */
-//    @Excel(name = "部门ID")
-    @ApiModelProperty(value = "部门ID", required = false)
-
-    private String deptId;
-
-    /** 部门名称 */
-    @ApiModelProperty(value = "部门名称", required = false)
-
-    @Excel(name = "部门名称")
-    private String deptName;
-}

src/main/java/com/sooka/sponest/mobile/data/other/domain/CenterdataTFarmLivestockProtectInfo.java

@@ -1,132 +0,0 @@
-package com.sooka.sponest.mobile.data.other.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * 畜保站信息对象 centerdata_t_farm_livestock_protect_info
- *
- * @author ruoyi
- * @date 2022-10-10
- */
-@Getter
-@Setter
-@ApiModel(description = "畜保站信息对象")
-
-public class CenterdataTFarmLivestockProtectInfo extends BaseBusinessEntity
-{
-    private static final long serialVersionUID = 1L;
-    @ApiModelProperty(value = "主键id", required = false)
-
-    /** $column.columnComment */
-    private String id;
-
-    /** 单位名称 */
-    @ApiModelProperty(value = "单位名称", required = false)
-
-    @Excel(name = "单位名称")
-    private String name;
-
-    /** 详细通讯地址 */
-    @ApiModelProperty(value = "详细通讯地址", required = false)
-
-    @Excel(name = "详细通讯地址")
-    private String address;
-
-    /** 地址坐标经度 */
-    @ApiModelProperty(value = "经度", required = false)
-
-    @Excel(name = "经度")
-    private String longitude;
-
-    /** 地址坐标纬度 */
-    @ApiModelProperty(value = "纬度", required = false)
-
-    @Excel(name = "纬度")
-    private String latitude;
-
-    /** 注册登记机关 */
-    @ApiModelProperty(value = "注册登记机关", required = false)
-
-    @Excel(name = "注册登记机关")
-    private String registrationAuthority;
-
-    /** 注册时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "注册时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date registerDate;
-
-    /** 注册资金 */
-    @ApiModelProperty(value = "注册资金", required = false)
-
-    @Excel(name = "注册资金")
-    private String registerCapital;
-
-    /** 法人姓名 */
-    @ApiModelProperty(value = "法人姓名", required = false)
-
-    @Excel(name = "法人姓名")
-    private String legalPerson;
-
-    /** 联系电话 */
-    @ApiModelProperty(value = "联系电话", required = false)
-
-    @Excel(name = "联系电话")
-    private String phone;
-
-    /** 经费来源 */
-    @ApiModelProperty(value = "经费来源", required = false)
-
-    @Excel(name = "经费来源")
-    private String landUseMode;
-
-    /** 举办单位 */
-    @ApiModelProperty(value = "举办单位", required = false)
-
-    @Excel(name = "举办单位")
-    private String leaseTerm;
-
-    /** 从业人数 */
-    @ApiModelProperty(value = "从业人数", required = false)
-
-    @Excel(name = "从业人数")
-    private String membersNum;
-
-    /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-//    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createDate;
-
-    /** 修改时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-//    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updateDate;
-
-    /** 备注 */
-//    @Excel(name = "备注")
-    //@Excel(name = "备注")
-
-    private String remarks;
-
-    /** 删除标识 */
-    private String delFlag;
-
-    /** 部门ID */
-//    @Excel(name = "部门ID")
-    @ApiModelProperty(value = "部门ID", required = false)
-
-    private String deptId;
-
-    /** 部门名称 */
-
-    @Excel(name = "所属部门")
-    @ApiModelProperty(value = "部门名称", required = false)
-    private String deptName;
-}

src/main/java/com/sooka/sponest/mobile/data/other/domain/CenterdataTResourcesForest.java

@@ -1,204 +0,0 @@
-package com.sooka.sponest.mobile.data.other.domain;
-
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 土地资源管理信息对象 centerdata_t_resources_forest
- *
- * @author ruoyi
- * @date 2023-02-21
- */
-public class CenterdataTResourcesForest extends BaseBusinessEntity
-        {
-private static final long serialVersionUID = 1L;
-
-    /** 主键id */
-    private String id;
-
-    /** 名称 */
-    @Excel(name = "名称")
-    private String name;
-
-    /** 占地范围 */
-    @Excel(name = "占地范围")
-    private String zdfw;
-
-    /** 占地面积(万公顷) */
-    @Excel(name = "占地面积(万公顷)")
-    private String landArea;
-
-    /** 经度 */
-    @Excel(name = "经度")
-    private String longitude;
-
-    /** 纬度 */
-    @Excel(name = "纬度")
-    private String latitude;
-
-    /** 部门id */
-    private Long deptId;
-
-    /** 部门名称 */
-    @Excel(name = "部门名称")
-    private String deptName;
-
-    public String getYear() {
-                return year;
-            }
-
-    public void setYear(String year) {
-                this.year = year;
-            }
-
-            /** 年份 */
-    @Excel(name = "年份")
-    private String year;
-
-    /** 简介 */
-    @Excel(name = "简介")
-    private String introduction;
-
-    /** 创建人名称 */
-    private String createName;
-
-    /** 更新人名称 */
-    private String updateName;
-
-    /** 数据状态 */
-    private String dataStatus;
-
-    public void setId(String id)
-            {
-            this.id = id;
-            }
-
-    public String getId()
-            {
-            return id;
-            }
-    public void setName(String name)
-            {
-            this.name = name;
-            }
-
-    public String getName()
-            {
-            return name;
-            }
-    public void setZdfw(String zdfw)
-            {
-            this.zdfw = zdfw;
-            }
-
-    public String getZdfw()
-            {
-            return zdfw;
-            }
-    public void setLandArea(String landArea)
-            {
-            this.landArea = landArea;
-            }
-
-    public String getLandArea()
-            {
-            return landArea;
-            }
-    public void setLongitude(String longitude)
-            {
-            this.longitude = longitude;
-            }
-
-    public String getLongitude()
-            {
-            return longitude;
-            }
-    public void setLatitude(String latitude)
-            {
-            this.latitude = latitude;
-            }
-
-    public String getLatitude()
-            {
-            return latitude;
-            }
-    public void setDeptId(Long deptId)
-            {
-            this.deptId = deptId;
-            }
-
-    public Long getDeptId()
-            {
-            return deptId;
-            }
-    public void setDeptName(String deptName)
-            {
-            this.deptName = deptName;
-            }
-
-    public String getDeptName()
-            {
-            return deptName;
-            }
-    public void setIntroduction(String introduction)
-            {
-            this.introduction = introduction;
-            }
-
-    public String getIntroduction()
-            {
-            return introduction;
-            }
-    public void setCreateName(String createName)
-            {
-            this.createName = createName;
-            }
-
-    public String getCreateName()
-            {
-            return createName;
-            }
-    public void setUpdateName(String updateName)
-            {
-            this.updateName = updateName;
-            }
-
-    public String getUpdateName()
-            {
-            return updateName;
-            }
-    public void setDataStatus(String dataStatus)
-            {
-            this.dataStatus = dataStatus;
-            }
-
-    public String getDataStatus()
-            {
-            return dataStatus;
-            }
-
-@Override
-public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("zdfw", getZdfw())
-            .append("landArea", getLandArea())
-            .append("longitude", getLongitude())
-            .append("latitude", getLatitude())
-            .append("deptId", getDeptId())
-            .append("deptName", getDeptName())
-            .append("introduction", getIntroduction())
-            .append("createBy", getCreateBy())
-            .append("createName", getCreateName())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateName", getUpdateName())
-            .append("updateTime", getUpdateTime())
-            .append("dataStatus", getDataStatus())
-            .append("year", getYear())
-        .toString();
-        }
-        }

src/main/java/com/sooka/sponest/mobile/data/other/domain/CenterdataTResourcesHydroenergy.java

@@ -1,291 +0,0 @@
-package com.sooka.sponest.mobile.data.other.domain;
-
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 水能资源对象 centerdata_t_resources_hydroenergy
- *
- * @author ruoyi
- * @date 2023-02-21
- */
-public class CenterdataTResourcesHydroenergy extends BaseBusinessEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    private String id;
-
-    /**
-     * 名称
-     */
-    @Excel(name = "名称")
-    private String name;
-
-    /**
-     * 水能源类型
-     */
-    @Excel(name = "水能源类型", dictType ="centerdata_hydroenergy_type")
-    private String hydroenergyType;
-
-    private String hydroenergyTypeLabel;
-
-    public String getHydroenergyTypeLabel() {
-        return hydroenergyTypeLabel;
-    }
-
-    public void setHydroenergyTypeLabel(String hydroenergyTypeLabel) {
-        this.hydroenergyTypeLabel = hydroenergyTypeLabel;
-    }
-
-
-
-    /**
-     * 位置
-     */
-    @Excel(name = "位置")
-    private String address;
-
-    /**
-     * 经度
-     */
-    @Excel(name = "经度")
-    private String longitude;
-
-    /**
-     * 纬度
-     */
-    @Excel(name = "纬度")
-    private String latitude;
-
-    /**
-     * 地下河总量
-     */
-    @Excel(name = "地下河总量")
-    private String riverTotal;
-
-    /**
-     * 地表总水量
-     */
-    @Excel(name = "地表总水量")
-    private String waterVolume;
-
-    /**
-     * 电话
-     */
-    @Excel(name = "电话")
-    private String phone;
-
-    /**
-     * 联系人
-     */
-    @Excel(name = "联系人")
-    private String person;
-
-    /**
-     * 部门id
-     */
-   // @Excel(name = "部门id")
-    private Long deptId;
-
-    /**
-     * 部门名称
-     */
-    @Excel(name = "部门名称")
-    private String deptName;
-
-    /**
-     * 简介
-     */
-    @Excel(name = "简介")
-    private String introduction;
-
-    /**
-     * 创建人名称
-     */
-    //@Excel(name = "创建人名称")
-    private String createName;
-
-    /**
-     * 更新人名称
-     */
-   // @Excel(name = "更新人名称")
-    private String updateName;
-    /**
-     * 备注
-     */
-    @Excel(name = "备注")
-    private String remark;
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    /**
-     * 数据状态
-     */
-    //@Excel(name = "数据状态")
-    private String dataStatus;
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setHydroenergyType(String hydroenergyType) {
-        this.hydroenergyType = hydroenergyType;
-    }
-
-    public String getHydroenergyType() {
-        return hydroenergyType;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setLongitude(String longitude) {
-        this.longitude = longitude;
-    }
-
-    public String getLongitude() {
-        return longitude;
-    }
-
-    public void setLatitude(String latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getLatitude() {
-        return latitude;
-    }
-
-    public void setRiverTotal(String riverTotal) {
-        this.riverTotal = riverTotal;
-    }
-
-    public String getRiverTotal() {
-        return riverTotal;
-    }
-
-    public void setWaterVolume(String waterVolume) {
-        this.waterVolume = waterVolume;
-    }
-
-    public String getWaterVolume() {
-        return waterVolume;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPerson(String person) {
-        this.person = person;
-    }
-
-    public String getPerson() {
-        return person;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setIntroduction(String introduction) {
-        this.introduction = introduction;
-    }
-
-    public String getIntroduction() {
-        return introduction;
-    }
-
-    public void setCreateName(String createName) {
-        this.createName = createName;
-    }
-
-    public String getCreateName() {
-        return createName;
-    }
-
-    public void setUpdateName(String updateName) {
-        this.updateName = updateName;
-    }
-
-    public String getUpdateName() {
-        return updateName;
-    }
-
-    public void setDataStatus(String dataStatus) {
-        this.dataStatus = dataStatus;
-    }
-
-    public String getDataStatus() {
-        return dataStatus;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("name", getName())
-                .append("hydroenergyType", getHydroenergyType())
-                .append("address", getAddress())
-                .append("longitude", getLongitude())
-                .append("latitude", getLatitude())
-                .append("riverTotal", getRiverTotal())
-                .append("waterVolume", getWaterVolume())
-                .append("phone", getPhone())
-                .append("person", getPerson())
-                .append("deptId", getDeptId())
-                .append("deptName", getDeptName())
-                .append("introduction", getIntroduction())
-                .append("createBy", getCreateBy())
-                .append("createName", getCreateName())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateName", getUpdateName())
-                .append("updateTime", getUpdateTime())
-                .append("dataStatus", getDataStatus())
-                .append("remark", getRemark())
-                .toString();
-    }
-}

src/main/java/com/sooka/sponest/mobile/data/other/domain/CenterdataTResourcesLand.java

@@ -1,202 +0,0 @@
-package com.sooka.sponest.mobile.data.other.domain;
-
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-
-/**
- * 土地资源管理信息对象 centerdata_t_resources_land
- *
- * @author ruoyi
- * @date 2023-02-21
- */
-public class CenterdataTResourcesLand extends BaseBusinessEntity
-        {
-private static final long serialVersionUID = 1L;
-
-    /** 主键id */
-    private String id;
-
-    /** 名称 */
-    @Excel(name = "名称")
-    private String name;
-
-    /** 占地类型 */
-    @Excel(name = "占地类型",dictType = "centerdata_landType")
-    private String landType;
-
-    private String landTypeLabel;
-
-            public String getLandTypeLabel() {
-                return landTypeLabel;
-            }
-
-            public void setLandTypeLabel(String landTypeLabel) {
-                this.landTypeLabel = landTypeLabel;
-            }
-
-            /** 占地面积(万公顷) */
-    @Excel(name = "占地面积(万公顷)")
-    private String landArea;
-
-    /** 经度 */
-    @Excel(name = "经度")
-    private String longitude;
-
-    /** 纬度 */
-    @Excel(name = "纬度")
-    private String latitude;
-
-    /** 部门id */
-    private Long deptId;
-
-    /** 部门名称 */
-    @Excel(name = "部门名称")
-    private String deptName;
-
-    /** 简介 */
-    @Excel(name = "简介")
-    private String introduction;
-
-    /** 创建人名称 */
-    private String createName;
-
-    /** 更新人名称 */
-    private String updateName;
-
-    /** 数据状态 */
-    private String dataStatus;
-
-    public void setId(String id)
-            {
-            this.id = id;
-            }
-
-    public String getId()
-            {
-            return id;
-            }
-    public void setName(String name)
-            {
-            this.name = name;
-            }
-
-    public String getName()
-            {
-            return name;
-            }
-    public void setLandType(String landType)
-            {
-            this.landType = landType;
-            }
-
-    public String getLandType()
-            {
-            return landType;
-            }
-    public void setLandArea(String landArea)
-            {
-            this.landArea = landArea;
-            }
-
-    public String getLandArea()
-            {
-            return landArea;
-            }
-    public void setLongitude(String longitude)
-            {
-            this.longitude = longitude;
-            }
-
-    public String getLongitude()
-            {
-            return longitude;
-            }
-    public void setLatitude(String latitude)
-            {
-            this.latitude = latitude;
-            }
-
-    public String getLatitude()
-            {
-            return latitude;
-            }
-    public void setDeptId(Long deptId)
-            {
-            this.deptId = deptId;
-            }
-
-    public Long getDeptId()
-            {
-            return deptId;
-            }
-    public void setDeptName(String deptName)
-            {
-            this.deptName = deptName;
-            }
-
-    public String getDeptName()
-            {
-            return deptName;
-            }
-    public void setIntroduction(String introduction)
-            {
-            this.introduction = introduction;
-            }
-
-    public String getIntroduction()
-            {
-            return introduction;
-            }
-    public void setCreateName(String createName)
-            {
-            this.createName = createName;
-            }
-
-    public String getCreateName()
-            {
-            return createName;
-            }
-    public void setUpdateName(String updateName)
-            {
-            this.updateName = updateName;
-            }
-
-    public String getUpdateName()
-            {
-            return updateName;
-            }
-    public void setDataStatus(String dataStatus)
-            {
-            this.dataStatus = dataStatus;
-            }
-
-    public String getDataStatus()
-            {
-            return dataStatus;
-            }
-
-@Override
-public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("landType", getLandType())
-            .append("landArea", getLandArea())
-            .append("longitude", getLongitude())
-            .append("latitude", getLatitude())
-            .append("deptId", getDeptId())
-            .append("deptName", getDeptName())
-            .append("introduction", getIntroduction())
-            .append("createBy", getCreateBy())
-            .append("createName", getCreateName())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateName", getUpdateName())
-            .append("updateTime", getUpdateTime())
-            .append("dataStatus", getDataStatus())
-        .toString();
-        }
-        }

src/main/java/com/sooka/sponest/mobile/data/other/service/OtherService.java

@@ -1,262 +0,0 @@
-package com.sooka.sponest.mobile.data.other.service;
-
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.sooka.sponest.mobile.base.domain.ModulesServiceNameContants;
-import com.sooka.sponest.mobile.remoteapi.factory.RemoteBaseServiceFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-@FeignClient(
-        contextId = "OtherService",
-        value = ModulesServiceNameContants.CENTER_DATA,
-        fallbackFactory = RemoteBaseServiceFallbackFactory.class
-//        ,url = ModulesServiceNameContants.CENTER_DATA_URL
-)
-public interface OtherService {
-    //森林资源管理信息
-    /**
-     * 新增 森林资源管理信息
-     * @param    centerdataTResourcesForest
-     * @return
-     */
-    @PostMapping("/forest")
-    public AjaxResult addForest(@RequestBody String centerdataTResourcesForest);
-
-    /**
-     * 修改 森林资源管理信息
-     * @param  centerdataTResourcesForest
-     * @return
-     */
-    @PutMapping("/forest")
-    public AjaxResult putForest(@RequestBody String centerdataTResourcesForest);
-
-    /**
-     * 删除 森林资源管理信息
-     * @param ids
-     * @return
-     */
-    @DeleteMapping("/forest/{ids}")
-    public AjaxResult delForest(@PathVariable("ids") String[] ids);
-
-    /**
-     * 获取 森林资源管理信息列表
-     *
-     * @return
-     */
-    @GetMapping("/forest/list")
-    public TableDataInfo forestList(@RequestParam(value = "pageNum") Integer pageNum, @RequestParam(value = "pageSize")Integer pageSize,@RequestParam(value = "name")String name);
-
-    /**
-     * 获取 森林资源管理信息详情
-     * @param id
-     * @return
-     */
-    @GetMapping("/forest/{id}")
-    public AjaxResult forestEdit(@PathVariable("id") String id);
-
-    //水能资源
-    /**
-     * 新增 水能资源
-     * @param    centerdataTResourcesHydroenergy
-     * @return
-     */
-    @PostMapping("/hydroenergy")
-    public AjaxResult addHydroenergy(@RequestBody String centerdataTResourcesHydroenergy);
-
-    /**
-     * 修改 水能资源
-     * @param  centerdataTResourcesHydroenergy
-     * @return
-     */
-    @PutMapping("/hydroenergy")
-    public AjaxResult putHydroenergy(@RequestBody String centerdataTResourcesHydroenergy);
-
-    /**
-     * 删除 水能资源
-     * @param ids
-     * @return
-     */
-    @DeleteMapping("/hydroenergy/{ids}")
-    public AjaxResult delHydroenergy(@PathVariable("ids") String[] ids);
-
-    /**
-     * 获取 水能资源列表
-     *
-     * @return
-     */
-    @GetMapping("/hydroenergy/list")
-    public TableDataInfo hydroenergyList(@RequestParam(value = "pageNum") Integer pageNum, @RequestParam(value = "pageSize")Integer pageSize,@RequestParam(value = "name")String name);
-
-    /**
-     * 获取 水能资源详情
-     * @param id
-     * @return
-     */
-    @GetMapping("/hydroenergy/{id}")
-    public AjaxResult hydroenergyEdit(@PathVariable("id") String id);
-
-    //耕地信息
-    /**
-     * 新增 耕地信息
-     * @param    centerdataTFarmLandInfo
-     * @return
-     */
-    @PostMapping("/LandInfo")
-    public AjaxResult addLandInfo(@RequestBody String centerdataTFarmLandInfo);
-
-    /**
-     * 修改 耕地信息
-     * @param  centerdataTFarmLandInfo
-     * @return
-     */
-    @PutMapping("/LandInfo")
-    public AjaxResult putLandInfo(@RequestBody String centerdataTFarmLandInfo);
-
-    /**
-     * 删除 耕地信息
-     * @param ids
-     * @return
-     */
-    @DeleteMapping("/LandInfo/{ids}")
-    public AjaxResult delLandInfo(@PathVariable("ids") String[] ids);
-
-    /**
-     * 获取 耕地信息列表
-     *
-     * @return
-     */
-    @GetMapping("/LandInfo/list")
-    public TableDataInfo landInfoList(@RequestParam(value = "pageNum") Integer pageNum, @RequestParam(value = "pageSize")Integer pageSize,@RequestParam(value = "name")String name,@RequestParam(value = "city")String city);
-
-    /**
-     * 获取 耕地信息详情
-     * @param id
-     * @return
-     */
-    @GetMapping("/LandInfo/{id}")
-    public AjaxResult landInfoEdit(@PathVariable("id") String id);
-
-    //畜保站信息
-    /**
-     * 新增 畜保站信息
-     * @param    centerdataTFarmLivestockProtectInfo
-     * @return
-     */
-    @PostMapping("/LivestockProtectInfo")
-    public AjaxResult addLivestockProtectInfo(@RequestBody String centerdataTFarmLivestockProtectInfo);
-
-    /**
-     * 修改 畜保站信息
-     * @param  centerdataTFarmLivestockProtectInfo
-     * @return
-     */
-    @PutMapping("/LivestockProtectInfo")
-    public AjaxResult putLivestockProtectInfo(@RequestBody String centerdataTFarmLivestockProtectInfo);
-
-    /**
-     * 删除 畜保站信息
-     * @param ids
-     * @return
-     */
-    @DeleteMapping("/LivestockProtectInfo/{ids}")
-    public AjaxResult delLivestockProtectInfo(@PathVariable("ids") String[] ids);
-
-    /**
-     * 获取 畜保站信息列表
-     *
-     * @return
-     */
-    @GetMapping("/LivestockProtectInfo/list")
-    public TableDataInfo livestockProtectInfoList(@RequestParam(value = "pageNum") Integer pageNum, @RequestParam(value = "pageSize")Integer pageSize,@RequestParam(value = "name")String name,@RequestParam(value = "phone")String phone);
-
-    /**
-     * 获取 畜保站信息详情
-     * @param id
-     * @return
-     */
-    @GetMapping("/LivestockProtectInfo/{id}")
-    public AjaxResult livestockProtectInfoEdit(@PathVariable("id") String id);
-
-    //养殖资源
-    /**
-     * 新增 养殖资源
-     * @param    centerdataTFarmBreedResources
-     * @return
-     */
-    @PostMapping("/BreedResources")
-    public AjaxResult addBreedResources(@RequestBody String centerdataTFarmBreedResources);
-
-    /**
-     * 修改 养殖资源
-     * @param  centerdataTFarmBreedResources
-     * @return
-     */
-    @PutMapping("/BreedResources")
-    public AjaxResult putBreedResources(@RequestBody String centerdataTFarmBreedResources);
-
-    /**
-     * 删除 养殖资源
-     * @param ids
-     * @return
-     */
-    @DeleteMapping("/BreedResources/{ids}")
-    public AjaxResult delBreedResources(@PathVariable("ids") String[] ids);
-
-    /**
-     * 获取 养殖资源列表
-     *
-     * @return
-     */
-    @GetMapping("/BreedResources/list")
-    public TableDataInfo breedResourcesList(@RequestParam(value = "pageNum") Integer pageNum, @RequestParam(value = "pageSize")Integer pageSize, @RequestParam(value = "name")String name);
-
-    /**
-     * 获取 养殖资源详情
-     * @param id
-     * @return
-     */
-    @GetMapping("/BreedResources/{id}")
-    public AjaxResult breedResourcesEdit(@PathVariable("id") String id);
-
-    //土地资源管理信息
-    /**
-     * 新增 土地资源管理信息
-     * @param    centerdataTResourcesLand
-     * @return
-     */
-    @PostMapping("/land")
-    public AjaxResult addLand(@RequestBody String centerdataTResourcesLand);
-
-    /**
-     * 修改 土地资源管理信息
-     * @param  centerdataTResourcesLand
-     * @return
-     */
-    @PutMapping("/land")
-    public AjaxResult putLand(@RequestBody String centerdataTResourcesLand);
-
-    /**
-     * 删除 土地资源管理信息
-     * @param ids
-     * @return
-     */
-    @DeleteMapping("/land/{ids}")
-    public AjaxResult delLand(@PathVariable("ids") String[] ids);
-
-    /**
-     * 获取 土地资源管理信息列表
-     *
-     * @return
-     */
-    @GetMapping("/land/list")
-    public TableDataInfo landList(@RequestParam(value = "pageNum") Integer pageNum, @RequestParam(value = "pageSize")Integer pageSize,@RequestParam(value = "name")String name,@RequestParam(value = "landArea")String landArea);
-
-    /**
-     * 获取 土地资源管理信息详情
-     * @param id
-     * @return
-     */
-    @GetMapping("/land/{id}")
-    public AjaxResult landEdit(@PathVariable("id") String id);
-}