树形结构修改

business-service/src/main/java/com/ozs/service/impl/BaseDeviceDynamicManagementServiceImpl.java

@@ -82,9 +82,11 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
 
 
                 if (!ObjectUtils.isEmpty(map.get(o.getRailwayCode()))) {
-                    CameraTree cameraTree1 = map.get(o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"));
+                    CameraTree cameraTree1 = map.get(o.getRailwayCode()+"-"+o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"));
                     if (ObjectUtils.isEmpty(cameraTree1)) {
-                        map.put(o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"), build1);
+                        map.put(o.getRailwayCode()+"-"+o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"), build1);
+                        map.get(o.getRailwayCode()).getChildren().add(build1);
+                    }else {
                         map.get(o.getRailwayCode()).getChildren().add(build1);
                     }
                 }
@@ -98,8 +100,8 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
                         .build();
 
 
-                if (!ObjectUtils.isEmpty(map.get(o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行")))) {
-                    map.get(o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行")).getChildren().add(build2);
+                if (!ObjectUtils.isEmpty(map.get(o.getRailwayCode()+"-"+o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行")))) {
+                    map.get(o.getRailwayCode()+"-"+o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行")).getChildren().add(build2);
                 }
             }
         }

business-service/src/main/resources/mapper/BaseDeviceDynamicManagementMapper.xml

@@ -24,23 +24,6 @@
 			<if test="mils != null and mils != ''">
 				concat(a.install_mile, a.begin_mile, a.end_mile) = #{mils}
 			</if>
-			<if test="!dsFlay">
-				and
-				<trim prefix="(" prefixOverrides="or" suffix=")">
-					<if test="dsUserId != null and dsUserId != ''">
-						or a.create_by=#{dsUserId}
-					</if>
-					<if test="dsDeptId != null and dsDeptId != 0">
-						or  a.dept_id=#{dsDeptId}
-					</if>
-					<if test="dsDeptIds != null">
-						or a.dept_id in
-						<foreach item="item" collection="dsDeptIds" separator="," open="(" close=")" index="">
-							#{item}
-						</foreach>
-					</if>
-				</trim>
-			</if>
 		</where>
 	</select>