增加漫游点查询接口,JSON格式 2021年11月15日18:09:38

sxz-application/src/main/java/com.fdkk.sxz/main.java

@@ -181,8 +181,9 @@ public class main {
             newJson.put("subgroup", objectJson.getInteger("subgroup"));
             roamingPoint.add(newJson);
         }
-        Map<Integer, List<JSONObject>> subgroup = roamingPoint.stream().collect(
-                Collectors.groupingBy(x -> x.getInteger("subgroup")));
+        Map<String, List<JSONObject>> subgroup = roamingPoint.stream().collect(
+                        Collectors.groupingBy(x -> x.getString("subgroup"))).entrySet().stream()
+                .collect(Collectors.toMap(e -> "floor" + e.getKey(), Map.Entry::getValue));
 
         System.out.println(JSON.toJSONString(subgroup));
     }

sxz-core/src/main/java/com/fdkk/sxz/webApi/controller/ImportDataController.java

@@ -209,7 +209,8 @@ public class ImportDataController extends BaseController {
                 roamingPoint.add(newJson);
             }
             Map<String, List<JSONObject>> subgroup = roamingPoint.stream().collect(
-                    Collectors.groupingBy(x -> x.getString("subgroup")));
+                            Collectors.groupingBy(x -> x.getString("subgroup"))).entrySet().stream()
+                    .collect(Collectors.toMap(e -> "floor" + e.getKey(), Map.Entry::getValue));
             FileUtils.writeFile(filePath + File.separator + "roamingPoint.json", JSON.toJSONString(subgroup));
 
             //数据上传oss，让计算服务器下载资源

sxz-core/src/main/java/com/fdkk/sxz/webApi/mapper/IRenovationPartsTypeMapper.java

@@ -16,6 +16,6 @@ import java.util.List;
 @Component("IRenovationPartsTypeMapper")
 public interface IRenovationPartsTypeMapper extends IBaseMapper<RenovationPartsTypeEntity> {
 
-    @Select("select id, description, key_word as keyWord, type, img from tb_renovation_parts_type where parts_id = #{partsId} and rec_status = 'A'")
+    @Select("select id, description, key_word as keyWord, type, img from tb_renovation_parts_type where parts_id = #{partsId} and rec_status = 'A' and is_show = 1")
     List<ResponseRenovationPartsType> findTypeByPartsId(Long partsId);
 }

sxz-modules/src/main/java/com/fdkk/sxz/entity/RenovationPartsTypeEntity.java

@@ -9,22 +9,25 @@ import lombok.Data;
  * Created by Hb_zzZ on 2020/8/11.
  */
 @Data
-@TableName( "tb_renovation_parts_type")
+@TableName("tb_renovation_parts_type")
 public class RenovationPartsTypeEntity extends BaseEntity {
 
-    @TableField( "parts_id")
+    @TableField("parts_id")
     private Long partsId;
 
-    @TableField( "key_word")
+    @TableField("key_word")
     private String keyWord;
 
-    @TableField( "type")
+    @TableField("type")
     private String type;
 
-    @TableField( "description")
+    @TableField("description")
     private String description;
 
-    @TableField( "img")
+    @TableField("img")
     private String img;
 
+    //0不显示，1显示
+    @TableField("is_show")
+    private Integer isShow;
 }