修改中图代码

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/controller/SanYaController.java

@@ -16,10 +16,7 @@ import com.onemap.common.core.utils.bean.BeanUtils;
 import com.onemap.common.core.web.controller.BaseController;
 import com.onemap.sanya.domain.*;
 import com.onemap.sanya.domain.CQBC.CompensateEstimateReport;
-import com.onemap.sanya.domain.GGP.ZtBillboardinfolistDto;
-import com.onemap.sanya.domain.GGP.ZtBillboardmodellistDto;
-import com.onemap.sanya.domain.GGP.ggpresultDto;
-import com.onemap.sanya.domain.GGP.templateParameterDto;
+import com.onemap.sanya.domain.GGP.*;
 import com.onemap.sanya.domain.business.ZtBillboardJt;
 import com.onemap.sanya.domain.business.ZtBillboardinfolist;
 import com.onemap.sanya.domain.business.ZtBillboardmodellist;
@@ -257,6 +254,16 @@ public class SanYaController extends BaseController {
                     ztBillboardmodellistDto.setIsReview("已审查");
                 }
 
+                Type AttachedDtoTypes = new TypeToken<List<AttachedDto>>() {}.getType();
+                List<AttachedDto> attachedDtos = new ArrayList<>();
+
+                if(ztBillboardmodellists.get(i).getAttachedData()!=null&&!"".equals(ztBillboardmodellists.get(i).getAttachedData())&&!"{}".equals(ztBillboardmodellists.get(i).getAttachedData())){
+                    Gson gson = new Gson();
+                    attachedDtos=gson.fromJson(ztBillboardmodellists.get(i).getAttachedData(), AttachedDtoTypes);
+                }
+                ztBillboardmodellistDto.setAttachedDatas(attachedDtos);
+
+
                 ztBillboardmodellistDtos.add(ztBillboardmodellistDto);
                 // 注意：BeanUtils.copyProperties的源对象和目标对象参数顺序是反的，即先目标后源
             }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/controller/spatial/ZDAnalyseController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -60,12 +61,24 @@ public class ZDAnalyseController extends BaseController {
 
     List<Jtowner> jtowners = new ArrayList<>();
     List<Jtuse> jtuses = new ArrayList<>();
-    String[] jtLikes = {
-            "村", "村民"};
+//    String[] jtLikes = {
+//            "村", "村民"};
+    //依据权属性质代码表
+// 10：国有土地所有权，20：国有土地使用权,21：国有无居民海岛使用权
+    String[] gyCodeLikes = {
+            "10", "20","21"};
+    //30:集体土地所有权,31:村民小组,32:村集体经济组织,33:乡集体经济组织,34:其他农民集体经济组织,40:集体土地使用权,41:集体无居民海岛使用权,
+    String[] jtCodeLikes = {
+            "30", "31","32","33","34","40","41"};
+
+
 
     String smfl = "乔木林地,竹林地,灌木林地,其他林地";
     String jjzwfl = "果园,茶园,橡胶园,其他园地";
     String nzwfl = "水田,水浇地，旱地";
+    String smflCode = "03";
+    String jjzwflCode ="02";
+    String nzwflCode ="01";
 
 
     ObjectMapper objectMapper = new ObjectMapper();
@@ -353,11 +366,15 @@ public class ZDAnalyseController extends BaseController {
         Double nzwMj = 0.00;
         List<SuperMapFreature> qmFreatures = new ArrayList<>();
         String dlmc="";
+        String dlbm="";
         String qsdw="";
+        String qsxzcode="";
         for (int i = 0; i < dltbs.size(); i++) {
             Dltb feature = dltbs.get(i);
              dlmc = feature.getDlmc();//地类名称
+            dlbm=feature.getDlbm();//地类编码
              qsdw=feature.getQsdwmc(); //权属单位
+            qsxzcode=feature.getQsxz();//权属性质
             Geometry geom = SpatialOperate.createPolygonByWkt(feature.getGeom());
             instertArea = setPrecision2(SpatialOperate.getIntersectsArea(polygon, geom)) ;//亩
             if (instertArea == 0)
@@ -365,23 +382,26 @@ public class ZDAnalyseController extends BaseController {
             Integer index = -1;
             SuperMapFreature superMapFreature=  SpatialOperate.  Feature2Supermap(feature,geom);
             //集体或者国有地类判断 权属字段包含 村/村民 为集体 否则为国有
-            if (isValueInList(jtLikes, qsdw)) {
-                jtmj = getaDouble(instertArea, jtdlData, jtmj, dlmc, index);
+            //改为使用权属性质字段判断
+//            if (isValueInList(jtCodeLikes, qsxzcode)) {
+            if (Arrays.stream(jtCodeLikes).anyMatch(qsxzcode::startsWith) ) {
+
+            jtmj = getaDouble(instertArea, jtdlData, jtmj, dlmc,dlbm, index);
                 jtFeatures.add(superMapFreature);
                 //青苗判断
-                if (smfl.indexOf(dlmc) > -1) {
+                if (smflCode.startsWith(dlbm)) {
                     smMj += instertArea;
                     qmFreatures.add(superMapFreature);
-                } else if (nzwfl.indexOf(dlmc) > -1) {
+                } else if (nzwflCode.startsWith(dlbm)){
                     jjzwMj += instertArea;
                     qmFreatures.add(superMapFreature);
-                } else if (jjzwfl.indexOf(dlmc) > -1) {
+                } else if (jjzwflCode.startsWith(dlbm)) {
                     nzwMj += instertArea;
                     qmFreatures.add(superMapFreature);
 
                 }
             } else {
-                gymj = getaDouble(instertArea, gydlData, gymj, dlmc, index);
+                gymj = getaDouble(instertArea, gydlData, gymj, dlmc,dlbm, index);
                 gyFeatures.add(superMapFreature);
             }
 
@@ -470,7 +490,7 @@ public class ZDAnalyseController extends BaseController {
         return Double.parseDouble(result);
     }
     @NotNull
-    private Double getaDouble(Double instertArea, List<DLItem> jtdlData, Double jtmj, String dlmc, Integer index) {
+    private Double getaDouble(Double instertArea, List<DLItem> jtdlData, Double jtmj, String dlmc,String dlbm, Integer index) {
         jtmj += instertArea;
         for (Integer j = 0; j < jtdlData.size(); j++) {
             if (jtdlData.get(j).getDlmc().toUpperCase().equals(dlmc.toUpperCase())) {
@@ -485,6 +505,7 @@ public class ZDAnalyseController extends BaseController {
             DLItem dlItem = new DLItem();
             dlItem.setMj(setPrecision2(instertArea));
             dlItem.setDlmc(dlmc);
+            dlItem.setDlbm(dlbm);
             jtdlData.add(dlItem);
         }
         return jtmj;
@@ -570,9 +591,6 @@ public class ZDAnalyseController extends BaseController {
                         item.getJg().equals(jg) &&item.getGrade().equals(finalGrade)).collect(Collectors.toList());
                 if(itemList.size()>0)
                     bcbzItem = cqBcbzItems.get(0);
-                else{
-                    bcbzItem.setBz(0.00);
-                }
                 signalPay = bcbzItem.getBz() * jzmj/10000;
                 signalPay=Double.parseDouble(  String.format("%.2f",signalPay));
             }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/GGP/AttachedDto.java

@@ -0,0 +1,37 @@
+package com.onemap.sanya.domain.GGP;
+
+import com.onemap.common.core.annotation.Excel;
+import com.onemap.common.core.web.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+/**
+ * 广告附属参数对象
+ *
+ * @author ruoyi
+ * @date 2024-08-26
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AttachedDto extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 键 */
+    @Excel(name = "键")
+    private String key;
+
+    /** 值 */
+    @Excel(name = "值")
+    private String value;
+
+    /** 数据 */
+    @Excel(name = "数据")
+    private dataDto data;
+
+
+
+}

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/GGP/ZtBillboardmodellistDto.java

@@ -135,6 +135,10 @@ public class ZtBillboardmodellistDto extends BaseEntity
     @Excel(name = "审核状态")
     private String IsReview;
 
+    /** 附属参数 */
+    @Excel(name = "附属参数")
+    private List<AttachedDto> AttachedDatas;
+
     /** 广告牌截图列表 */
     @Excel(name = "广告牌截图列表")
     private List<PicData> JTList;

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/GGP/dataDto.java

@@ -0,0 +1,28 @@
+package com.onemap.sanya.domain.GGP;
+
+import com.onemap.common.core.annotation.Excel;
+import com.onemap.common.core.web.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+/**
+ * 广告附属参数对象数据
+ *
+ * @author ruoyi
+ * @date 2024-08-26
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class dataDto extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** label */
+    @Excel(name = "label")
+    private String label;
+    /** value */
+    @Excel(name = "value")
+    private String value;
+}

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/business/ZtBillboardmodellist.java

@@ -109,6 +109,11 @@ public class ZtBillboardmodellist extends BaseEntity
     @Excel(name = "截图数量")
     private Integer jtsum;
 
+    /** 广告牌附属信息 */
+    @Excel(name = "广告牌附属信息")
+    @JsonProperty("AttachedData")
+    private String AttachedData;
+
     public void setId(String id) 
     {
         this.id = id;
@@ -312,6 +317,16 @@ public class ZtBillboardmodellist extends BaseEntity
         return jtsum;
     }
 
+
+    public void setAttachedData(String AttachedData)
+    {
+        this.AttachedData = AttachedData;
+    }
+
+    public String getAttachedData()
+    {
+        return AttachedData;
+    }
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -342,6 +357,8 @@ public class ZtBillboardmodellist extends BaseEntity
                 .append("viewing_angle", getviewing_angle())
                 .append("review_date", getreview_date())
                 .append("jtsum", getjtsum())
+                .append("AttachedData", getAttachedData())
+
             .toString();
     }
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/business/ZtBillboardmodellisthistory.java

@@ -109,6 +109,11 @@ public class ZtBillboardmodellisthistory extends BaseEntity
     @Excel(name = "截图数量")
     private Integer jtsum;
 
+    /** 广告牌附属信息 */
+    @Excel(name = "广告牌附属信息")
+    @JsonProperty("AttachedData")
+    private String AttachedData;
+
     public void setId(String id) 
     {
         this.id = id;
@@ -312,6 +317,16 @@ public class ZtBillboardmodellisthistory extends BaseEntity
         return jtsum;
     }
 
+    public void setAttachedData(String AttachedData)
+    {
+        this.AttachedData = AttachedData;
+    }
+
+    public String getAttachedData()
+    {
+        return AttachedData;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -342,6 +357,7 @@ public class ZtBillboardmodellisthistory extends BaseEntity
                 .append("viewing_angle", getviewing_angle())
                 .append("review_date", getreview_date())
                 .append("jtsum", getjtsum())
+                .append("AttachedData", getAttachedData())
             .toString();
     }
 }