merge

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/PlanVisual3dController.java

@@ -115,35 +115,27 @@ public class PlanVisual3dController extends BaseController {
      * @return 资源设备 or 数据项
      */
     @Authorization(ingore = true)
-    @GetMapping(value = "resource/common")
+    @GetMapping(value = "common/dataBind")
     @ApiOperation(value = "设备、数据项查询", notes = "按照资源类型type查询设备，按照资源类型type和设备id查询数据项")
     public CommonResponse getResourceCommon(
             @ApiParam(value = "资源类型") @RequestParam(required = false) String type,
             @ApiParam(value = "主键id") @RequestParam(required = false) Long id) {
-        if(!StringUtil.isNotEmpty(type)){
-            return CommonResponseUtil.success();
+        //1.查询数据类型
+        if (!StringUtil.isNotEmpty(type)) {
+            return CommonResponseUtil.success(planVisual3dService.getResourceTypeList());
         }
-        if(StringUtil.isNotEmpty(type) && !StringUtil.isNotEmpty(id)){
+        //2.查询类型对应数据
+        if (StringUtil.isNotEmpty(type) && !StringUtil.isNotEmpty(id)) {
             return planVisual3dService.getResourceListByType(type);
         }
-        if(StringUtil.isNotEmpty(type) && StringUtil.isNotEmpty(id)){
+        //3.查询绑定项数据
+        if (StringUtil.isNotEmpty(type) && StringUtil.isNotEmpty(id)) {
             List<Map<String, Object>> list = planVisual3dService.getResourceById(type, id);
             return CommonResponseUtil.success(list);
         }
         return CommonResponseUtil.success();
     }
 
-    /**
-     * 资源类型查询
-     * @return list
-     */
-    @Authorization(ingore = true)
-    @ApiOperation(value = "资源类型查询",notes = "资源类型查询")
-    @GetMapping(value ="resource/type/list")
-    public CommonResponse getResourceList(){
-        return CommonResponseUtil.success(planVisual3dService.getResourceTypeList());
-    }
-    
     @ApiOperation(value = "预案应用树", notes = "预案应用树")
     @GetMapping(value = "/plan/textPlanTree/{appId}")
     public CommonResponse getPlanTree(@PathVariable("appId") String appId) {
@@ -160,5 +152,4 @@ public class PlanVisual3dController extends BaseController {
 			return CommonResponseUtil.failure(e.getMessage());
 		}
     }
-    
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/PlanVisual3dMapper.java

@@ -6,7 +6,7 @@ import java.util.List;
 import java.util.Map;
 
 public interface PlanVisual3dMapper extends BaseMapper {
-    List<HashMap<String,String>> getResourceListByType(@Param("type") String type);
+    List<HashMap<String,Object>> getResourceListByType(@Param("type") String type);
 
     Map<String, Object> queryOneByTypeAndId(@Param("type") String type, @Param("id") Long id);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/PlanVisual3dServiceImpl.java

@@ -191,6 +191,9 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
         list = dictList.stream().map(e->{
             Map<String, Object> newMap = new HashMap<String, Object>();
             newMap.put("key",e.getDictValue());
+            newMap.put("value",e.getDictValue());//前端级联Cascader使用
+            newMap.put("isLeaf",false);////前端级联Cascader使用
+            newMap.put("dataType","type");
             newMap.put("label",e.getDictName());
             return newMap;
         }).collect(Collectors.toList());

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_3d_plan_visual.xml

@@ -5,7 +5,11 @@
 	<!--查询-->
 	<select id="getResourceListByType" resultType="java.util.HashMap">
 		SELECT
-		 rs.id as `key` ,rs.name as label,rs.code
+		 rs.id as `key` ,
+		 rs.id AS `value`,
+		 rs.name as label,
+		 rs.code ,
+		 'id' as dataType
 		from
 		<choose>
 			<when test="type=='fireCar'">