es

src/main/java/com/sooka/sponest/middleware/data/consumer/DataListener.java

@@ -20,6 +20,7 @@ import com.sooka.sponest.data.api.digitaltraffic.domain.Bridge;
 import com.sooka.sponest.data.api.digitaltraffic.domain.Culvert;
 import com.sooka.sponest.data.api.digitaltraffic.domain.WarningSign;
 import com.sooka.sponest.data.api.digitalwater.domain.*;
+import com.sooka.sponest.data.api.other.domain.*;
 import com.sooka.sponest.middleware.data.basicdata.service.IFirehydrantService;
 import com.sooka.sponest.middleware.data.basicdata.service.IWatercraneService;
 import com.sooka.sponest.middleware.data.basicdata.service.IWaterintakeService;
@@ -260,7 +261,7 @@ public class DataListener {
                 if (dataBO.getType().equals(BusinessType.DELETE)) {
                     SpringUtils.getBean(ICenterdataTFarmLivestockProtectInfoService.class).deleteAllById(result);
                 } else {
-                    FarmLivestockProtectInfo farmLivestockProtectInfo = JSON.parseObject(dataBO.getModelStr(), FarmLivestockProtectInfo.class);
+                    CenterdataTFarmLivestockProtectInfo farmLivestockProtectInfo = JSON.parseObject(dataBO.getModelStr(), CenterdataTFarmLivestockProtectInfo.class);
                     SpringUtils.getBean(ICenterdataTFarmLivestockProtectInfoService.class).save(farmLivestockProtectInfo);
                 }
                 break;
@@ -268,7 +269,7 @@ public class DataListener {
                 if (dataBO.getType().equals(BusinessType.DELETE)) {
                     SpringUtils.getBean(ICenterdataTFarmBreedResourcesService.class).deleteAllById(result);
                 } else {
-                    FarmBreedResources farmBreedResources = JSON.parseObject(dataBO.getModelStr(), FarmBreedResources.class);
+                    CenterdataTFarmBreedResources farmBreedResources = JSON.parseObject(dataBO.getModelStr(), CenterdataTFarmBreedResources.class);
                     SpringUtils.getBean(ICenterdataTFarmBreedResourcesService.class).save(farmBreedResources);
                 }
                 break;
@@ -497,7 +498,7 @@ public class DataListener {
                 if (BusinessType.DELETE.equals(dataBO.getType())) {
                     SpringUtils.getBean(LandDao.class).deleteAllById(result);
                 } else {
-                    Land land = JSON.parseObject(dataBO.getModelStr(), Land.class);
+                    CenterdataTResourcesLand land = JSON.parseObject(dataBO.getModelStr(), CenterdataTResourcesLand.class);
                     SpringUtils.getBean(ILandService.class).save(land);
                 }
                 break;
@@ -505,7 +506,7 @@ public class DataListener {
                 if (BusinessType.DELETE.equals(dataBO.getType())) {
                     SpringUtils.getBean(ForestDao.class).deleteAllById(result);
                 } else {
-                    Forest forest = JSON.parseObject(dataBO.getModelStr(), Forest.class);
+                    CenterdataTResourcesForest forest = JSON.parseObject(dataBO.getModelStr(), CenterdataTResourcesForest.class);
                     SpringUtils.getBean(IForestService.class).save(forest);
                 }
                 break;
@@ -513,7 +514,7 @@ public class DataListener {
                 if (BusinessType.DELETE.equals(dataBO.getType())) {
                     SpringUtils.getBean(HydroenergyDao.class).deleteAllById(result);
                 } else {
-                    Hydroenergy hydroenergy = JSON.parseObject(dataBO.getModelStr(), Hydroenergy.class);
+                    CenterdataTResourcesHydroenergy hydroenergy = JSON.parseObject(dataBO.getModelStr(), CenterdataTResourcesHydroenergy.class);
                     SpringUtils.getBean(IHydroenergyService.class).save(hydroenergy);
                 }
                 break;

src/main/java/com/sooka/sponest/middleware/data/digitalagriculture/dao/CenterdataTFarmBreedResourcesDao.java

@@ -1,10 +1,8 @@
 package com.sooka.sponest.middleware.data.digitalagriculture.dao;
 
-import com.sooka.sponest.data.api.digitalagriculture.domain.FarmBreedResources;
-import com.sooka.sponest.data.api.digitalagriculture.domain.FarmExcrementDispose;
-import com.sooka.sponest.data.api.digitalagriculture.domain.FarmLivestockProtectInfo;
+import com.sooka.sponest.data.api.other.domain.CenterdataTFarmBreedResources;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
 
-public interface CenterdataTFarmBreedResourcesDao extends ElasticsearchRepository<FarmBreedResources, String> {
+public interface CenterdataTFarmBreedResourcesDao extends ElasticsearchRepository<CenterdataTFarmBreedResources, String> {
 
 }

src/main/java/com/sooka/sponest/middleware/data/digitalagriculture/dao/CenterdataTFarmLivestockProtectInfoDao.java

@@ -1,9 +1,8 @@
 package com.sooka.sponest.middleware.data.digitalagriculture.dao;
 
-import com.sooka.sponest.data.api.digitalagriculture.domain.FarmExcrementDispose;
-import com.sooka.sponest.data.api.digitalagriculture.domain.FarmLivestockProtectInfo;
+import com.sooka.sponest.data.api.other.domain.CenterdataTFarmLivestockProtectInfo;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
 
-public interface CenterdataTFarmLivestockProtectInfoDao extends ElasticsearchRepository<FarmLivestockProtectInfo, String> {
+public interface CenterdataTFarmLivestockProtectInfoDao extends ElasticsearchRepository<CenterdataTFarmLivestockProtectInfo, String> {
 
 }

src/main/java/com/sooka/sponest/middleware/data/digitalagriculture/service/ICenterdataTFarmBreedResourcesService.java

@@ -1,6 +1,6 @@
 package com.sooka.sponest.middleware.data.digitalagriculture.service;
 
-import com.sooka.sponest.data.api.digitalagriculture.domain.FarmBreedResources;
+import com.sooka.sponest.data.api.other.domain.CenterdataTFarmBreedResources;
 
 import java.util.List;
 
@@ -11,7 +11,7 @@ public interface ICenterdataTFarmBreedResourcesService {
      *
      * @param
      */
-    void save(FarmBreedResources farmBreedResources);
+    void save(CenterdataTFarmBreedResources farmBreedResources);
 
     /**
      * 批量删除

src/main/java/com/sooka/sponest/middleware/data/digitalagriculture/service/ICenterdataTFarmLivestockProtectInfoService.java

@@ -1,6 +1,6 @@
 package com.sooka.sponest.middleware.data.digitalagriculture.service;
 
-import com.sooka.sponest.data.api.digitalagriculture.domain.FarmLivestockProtectInfo;
+import com.sooka.sponest.data.api.other.domain.CenterdataTFarmLivestockProtectInfo;
 
 import java.util.List;
 
@@ -11,7 +11,7 @@ public interface ICenterdataTFarmLivestockProtectInfoService {
      *
      * @param
      */
-    void save(FarmLivestockProtectInfo farmLivestockProtectInfo);
+    void save(CenterdataTFarmLivestockProtectInfo farmLivestockProtectInfo);
 
     /**
      * 批量删除

src/main/java/com/sooka/sponest/middleware/data/digitalagriculture/service/impl/ICenterdataTFarmBreedResourcesServiceImpl.java

@@ -1,11 +1,8 @@
 package com.sooka.sponest.middleware.data.digitalagriculture.service.impl;
 
-import com.sooka.sponest.data.api.digitalagriculture.domain.FarmBreedResources;
-import com.sooka.sponest.data.api.digitalagriculture.domain.FarmLivestockProtectInfo;
+import com.sooka.sponest.data.api.other.domain.CenterdataTFarmBreedResources;
 import com.sooka.sponest.middleware.data.digitalagriculture.dao.CenterdataTFarmBreedResourcesDao;
-import com.sooka.sponest.middleware.data.digitalagriculture.dao.CenterdataTFarmExcrementDisposeDao;
 import com.sooka.sponest.middleware.data.digitalagriculture.service.ICenterdataTFarmBreedResourcesService;
-import com.sooka.sponest.middleware.data.digitalagriculture.service.ICenterdataTFarmLivestockProtectInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.elasticsearch.core.geo.GeoPoint;
 import org.springframework.stereotype.Service;
@@ -19,7 +16,7 @@ public class ICenterdataTFarmBreedResourcesServiceImpl implements ICenterdataTFa
     private CenterdataTFarmBreedResourcesDao centerdataTFarmBreedResourcesDao;
 
     @Override
-    public void save(FarmBreedResources farmBreedResources) {
+    public void save(CenterdataTFarmBreedResources farmBreedResources) {
         farmBreedResources.setLocation(new GeoPoint(Double.valueOf(farmBreedResources.getLatitude()), Double.valueOf(farmBreedResources.getLongitude())));
         centerdataTFarmBreedResourcesDao.save(farmBreedResources);
     }

src/main/java/com/sooka/sponest/middleware/data/digitalagriculture/service/impl/ICenterdataTFarmLivestockProtectInfoServiceImpl.java

@@ -1,11 +1,7 @@
 package com.sooka.sponest.middleware.data.digitalagriculture.service.impl;
 
-import com.sooka.sponest.data.api.digitalagriculture.domain.FarmExcrementDispose;
-import com.sooka.sponest.data.api.digitalagriculture.domain.FarmLivestockProtectInfo;
-import com.sooka.sponest.middleware.data.digitalagriculture.dao.CenterdataTFarmBreedResourcesDao;
-import com.sooka.sponest.middleware.data.digitalagriculture.dao.CenterdataTFarmExcrementDisposeDao;
+import com.sooka.sponest.data.api.other.domain.CenterdataTFarmLivestockProtectInfo;
 import com.sooka.sponest.middleware.data.digitalagriculture.dao.CenterdataTFarmLivestockProtectInfoDao;
-import com.sooka.sponest.middleware.data.digitalagriculture.service.ICenterdataTFarmExcrementDisposeService;
 import com.sooka.sponest.middleware.data.digitalagriculture.service.ICenterdataTFarmLivestockProtectInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.elasticsearch.core.geo.GeoPoint;
@@ -20,7 +16,7 @@ public class ICenterdataTFarmLivestockProtectInfoServiceImpl implements ICenterd
     private CenterdataTFarmLivestockProtectInfoDao centerdataTFarmLivestockProtectInfoDao;
 
     @Override
-    public void save(FarmLivestockProtectInfo farmLivestockProtectInfo) {
+    public void save(CenterdataTFarmLivestockProtectInfo farmLivestockProtectInfo) {
         farmLivestockProtectInfo.setLocation(new GeoPoint(Double.valueOf(farmLivestockProtectInfo.getLatitude()), Double.valueOf(farmLivestockProtectInfo.getLongitude())));
         centerdataTFarmLivestockProtectInfoDao.save(farmLivestockProtectInfo);
     }

src/main/java/com/sooka/sponest/middleware/data/digitalresource/dao/ForestDao.java

@@ -1,12 +1,12 @@
 package com.sooka.sponest.middleware.data.digitalresource.dao;
 
-import com.sooka.sponest.data.api.digitalresource.domain.Forest;
+import com.sooka.sponest.data.api.other.domain.CenterdataTResourcesForest;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
 
 /**
  * @author zhaozhan
  * @date 2023/7/20
  */
-public interface ForestDao extends ElasticsearchRepository<Forest, String> {
+public interface ForestDao extends ElasticsearchRepository<CenterdataTResourcesForest, String> {
 
 }

src/main/java/com/sooka/sponest/middleware/data/digitalresource/dao/HydroenergyDao.java

@@ -1,12 +1,12 @@
 package com.sooka.sponest.middleware.data.digitalresource.dao;
 
-import com.sooka.sponest.data.api.digitalresource.domain.Hydroenergy;
+import com.sooka.sponest.data.api.other.domain.CenterdataTResourcesHydroenergy;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
 
 /**
  * @author zhaozhan
  * @date 2023/7/20
  */
-public interface HydroenergyDao extends ElasticsearchRepository<Hydroenergy, String> {
+public interface HydroenergyDao extends ElasticsearchRepository<CenterdataTResourcesHydroenergy, String> {
 
 }

src/main/java/com/sooka/sponest/middleware/data/digitalresource/dao/LandDao.java

@@ -1,12 +1,12 @@
 package com.sooka.sponest.middleware.data.digitalresource.dao;
 
-import com.sooka.sponest.data.api.digitalresource.domain.Land;
+import com.sooka.sponest.data.api.other.domain.CenterdataTResourcesLand;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
 
 /**
  * @author zhaozhan
  * @date 2023/7/20
  */
-public interface LandDao extends ElasticsearchRepository<Land, String> {
+public interface LandDao extends ElasticsearchRepository<CenterdataTResourcesLand, String> {
 
 }

src/main/java/com/sooka/sponest/middleware/data/digitalresource/service/IForestService.java

@@ -1,6 +1,6 @@
 package com.sooka.sponest.middleware.data.digitalresource.service;
 
-import com.sooka.sponest.data.api.digitalresource.domain.Forest;
+import com.sooka.sponest.data.api.other.domain.CenterdataTResourcesForest;
 
 /**
  * @author lidongyu
@@ -8,5 +8,5 @@ import com.sooka.sponest.data.api.digitalresource.domain.Forest;
  */
 public interface IForestService {
 
-    void save(Forest forest);
+    void save(CenterdataTResourcesForest forest);
 }

src/main/java/com/sooka/sponest/middleware/data/digitalresource/service/IHydroenergyService.java

@@ -1,6 +1,6 @@
 package com.sooka.sponest.middleware.data.digitalresource.service;
 
-import com.sooka.sponest.data.api.digitalresource.domain.Hydroenergy;
+import com.sooka.sponest.data.api.other.domain.CenterdataTResourcesHydroenergy;
 
 /**
  * @author lidongyu
@@ -8,5 +8,5 @@ import com.sooka.sponest.data.api.digitalresource.domain.Hydroenergy;
  */
 public interface IHydroenergyService {
 
-    void save(Hydroenergy hydroenergy);
+    void save(CenterdataTResourcesHydroenergy hydroenergy);
 }

src/main/java/com/sooka/sponest/middleware/data/digitalresource/service/ILandService.java

@@ -1,6 +1,6 @@
 package com.sooka.sponest.middleware.data.digitalresource.service;
 
-import com.sooka.sponest.data.api.digitalresource.domain.Land;
+import com.sooka.sponest.data.api.other.domain.CenterdataTResourcesLand;
 
 /**
  * @author lidongyu
@@ -8,5 +8,5 @@ import com.sooka.sponest.data.api.digitalresource.domain.Land;
  */
 public interface ILandService {
 
-    void save(Land land);
+    void save(CenterdataTResourcesLand land);
 }

src/main/java/com/sooka/sponest/middleware/data/digitalresource/service/impl/ForestServiceImpl.java

@@ -1,12 +1,8 @@
 package com.sooka.sponest.middleware.data.digitalresource.service.impl;
 
 
-import com.ruoyi.common.security.utils.DictUtils;
-import com.sooka.sponest.data.api.digitalresource.domain.Deposit;
-import com.sooka.sponest.data.api.digitalresource.domain.Forest;
-import com.sooka.sponest.middleware.data.digitalresource.dao.DepositDao;
+import com.sooka.sponest.data.api.other.domain.CenterdataTResourcesForest;
 import com.sooka.sponest.middleware.data.digitalresource.dao.ForestDao;
-import com.sooka.sponest.middleware.data.digitalresource.service.IDepositService;
 import com.sooka.sponest.middleware.data.digitalresource.service.IForestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.elasticsearch.core.geo.GeoPoint;
@@ -23,7 +19,7 @@ public class ForestServiceImpl implements IForestService {
     private ForestDao forestDao;
 
     @Override
-    public void save(Forest forest) {
+    public void save(CenterdataTResourcesForest forest) {
         forest.setLocation(new GeoPoint(Double.valueOf(forest.getLatitude()), Double.valueOf(forest.getLongitude())));
         forestDao.save(forest);
     }

src/main/java/com/sooka/sponest/middleware/data/digitalresource/service/impl/HydroenergyServiceImpl.java

@@ -2,7 +2,7 @@ package com.sooka.sponest.middleware.data.digitalresource.service.impl;
 
 
 import com.ruoyi.common.security.utils.DictUtils;
-import com.sooka.sponest.data.api.digitalresource.domain.Hydroenergy;
+import com.sooka.sponest.data.api.other.domain.CenterdataTResourcesHydroenergy;
 import com.sooka.sponest.middleware.data.digitalresource.dao.HydroenergyDao;
 import com.sooka.sponest.middleware.data.digitalresource.service.IHydroenergyService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +20,7 @@ public class HydroenergyServiceImpl implements IHydroenergyService {
     private HydroenergyDao hydroenergyDao;
 
     @Override
-    public void save(Hydroenergy hydroenergy) {
+    public void save(CenterdataTResourcesHydroenergy hydroenergy) {
         hydroenergy.setLocation(new GeoPoint(Double.valueOf(hydroenergy.getLatitude()), Double.valueOf(hydroenergy.getLongitude())));
         hydroenergy.setHydroenergyTypeLabel(DictUtils.getDictDataByValue("centerdata_hydroenergy_type",hydroenergy.getHydroenergyType()));
         hydroenergyDao.save(hydroenergy);

src/main/java/com/sooka/sponest/middleware/data/digitalresource/service/impl/LandServiceImpl.java

@@ -2,8 +2,7 @@ package com.sooka.sponest.middleware.data.digitalresource.service.impl;
 
 
 import com.ruoyi.common.security.utils.DictUtils;
-import com.sooka.sponest.data.api.digitalresource.domain.Deposit;
-import com.sooka.sponest.data.api.digitalresource.domain.Land;
+import com.sooka.sponest.data.api.other.domain.CenterdataTResourcesLand;
 import com.sooka.sponest.middleware.data.digitalresource.dao.LandDao;
 import com.sooka.sponest.middleware.data.digitalresource.service.ILandService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +20,7 @@ public class LandServiceImpl implements ILandService {
     private LandDao landDao;
 
     @Override
-    public void save(Land land) {
+    public void save(CenterdataTResourcesLand land) {
         land.setLocation(new GeoPoint(Double.valueOf(land.getLatitude()), Double.valueOf(land.getLongitude())));
         land.setLandTypeLabel(DictUtils.getDictDataByValue("centerdata_landType",land.getLandType()));
         landDao.save(land);