增加漫游点查询接口,JSON格式2021年11月15日17:36:50

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

@@ -205,11 +205,11 @@ public class ImportDataController extends BaseController {
                 puck.put("y", puck.getDoubleValue("y") * -1);
                 puck.remove("z");
                 newJson.put("puck", puck);
-                newJson.put("subgroup", objectJson.getInteger("subgroup"));
+                newJson.put("subgroup", objectJson.getString("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")));
             FileUtils.writeFile(filePath + File.separator + "roamingPoint.json", JSON.toJSONString(subgroup));
 
             //数据上传oss，让计算服务器下载资源
@@ -562,11 +562,11 @@ public class ImportDataController extends BaseController {
                                 puck.put("y", puck.getDoubleValue("y") * -1);
                                 puck.remove("z");
                                 newJson.put("puck", puck);
-                                newJson.put("subgroup", objectJson.getInteger("subgroup"));
+                                newJson.put("subgroup", objectJson.getString("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")));
                             FileUtils.writeFile(basePath + File.separator + "roamingPoint.json", JSON.toJSONString(subgroup));
                             //数据上传oss，让计算服务器下载资源
                             uploadToOssUtil.upload(basePath + File.separator + "roamingPoint.json",

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

@@ -51,6 +51,9 @@ public interface IRenovationPartsDetailMapper extends IBaseMapper<RenovationPart
             "LEFT JOIN `tb_model_upload` b ON a.id = b.parts_detail_id " +
             "LEFT JOIN `tb_renovation_parts_type` c ON c.id = a.parts_type_id " +
             "LEFT JOIN `tb_renovation_parts` d ON d.id = c.parts_id " +
+            "LEFT JOIN `tb_renovation_parts_color` e ON e.id = a.parts_color_id " +
+            "LEFT JOIN `tb_renovation_parts_style` f ON f.id = a.parts_style_id " +
+            "LEFT JOIN `tb_renovation_parts_attaching` g ON g.parts_detail_id = a.id " +
             " WHERE a.rec_status = 'A' " +
             "<if test= 'param.userId != null'> " +
             " and b.user_id = #{param.userId} " +
@@ -64,6 +67,21 @@ public interface IRenovationPartsDetailMapper extends IBaseMapper<RenovationPart
             "<if test= 'param.partsId != null'> " +
             " and d.id  =#{param.partsId}" +
             "</if> " +
+            "<if test= 'param.partsColorId != null'> " +
+            " and e.id  =#{param.partsColorId}" +
+            "</if> " +
+            "<if test= 'param.partsStyleId != null'> " +
+            " and f.id  =#{param.partsStyleId}" +
+            "</if> " +
+            "<if test= 'param.partsAttachingId != null and param.partsAttachingId = 1 '> " +
+            " and g.wall_attaching= 1" +
+            "</if> " +
+            "<if test= 'param.ceil_attaching != null and param.partsAttachingId = 2 '> " +
+            " and g.floor_attaching = 1" +
+            "</if> " +
+            "<if test= 'param.partsAttachingId != null and param.partsAttachingId = 3 '> " +
+            " and g.ceil_attaching = 1" +
+            "</if> " +
             " GROUP BY a.name ORDER BY a.create_time desc" +
             "</script>")
     List<RenovationPartsDetailEntity> findAllByUserId(@Param("param") RequestRenovationParts param, @Param("name") String name);

sxz-modules/src/main/java/com/fdkk/sxz/vo/request/RequestRenovationParts.java

@@ -37,5 +37,12 @@ public class RequestRenovationParts extends RequestBase {
 
     private Integer isShow;
 
+    //-颜色id
+    private Long partsColorId;
+    //-风格id
+    private Long partsStyleId;
+    //-吸附方式
+    private Long partsAttachingId;
+
 
 }