删除 上传文件夹修改

fidms-admin/src/main/java/com/fidms/web/controller/FlowFieldInputController.java

@@ -108,7 +108,7 @@ public class FlowFieldInputController extends BaseController
     @GetMapping(value = "/FlowFieldexist/{id}")
     public boolean checktsExistence(@PathVariable("id") Long id)
     {
-        int count = flowFieldInputService.getflowfieldinputOption(id).size();
+        int count = flowFieldInputService.getflowfieldinputOption(id);
         return count>0;
     }
 }

fidms-admin/src/main/java/com/fidms/web/controller/FlowFieldOutputController.java

@@ -107,7 +107,7 @@ public class FlowFieldOutputController extends BaseController
     @GetMapping(value = "/FlowFieldoutexist/{id}")
     public boolean checktsExistence(@PathVariable("id") Long id)
     {
-        int count = flowFieldOutputService.getflowfieldoutputOption(id).size();
+        int count = flowFieldOutputService.getflowfieldoutputOption(id);
         return count>0;
     }
 

fidms-admin/src/main/java/com/fidms/web/controller/InfraredInputController.java

@@ -108,7 +108,7 @@ public class InfraredInputController extends BaseController
     @GetMapping(value = "/InfraredInputexist/{id}")
     public boolean checktsExistence(@PathVariable("id") Long id)
     {
-        int count = infraredInputService.getinfraredinputOption(id).size();
+        int count = infraredInputService.getinfraredinputOption(id);
         return count>0;
     }
 }

fidms-admin/src/main/java/com/fidms/web/controller/InfraredOutputController.java

@@ -132,7 +132,7 @@ public class InfraredOutputController extends BaseController
     @GetMapping(value = "/Infraredoutputexist/{id}")
     public boolean checktsExistence(@PathVariable("id") Long id)
     {
-        int count = infraredOutputService.getinfraredoutputOption(id).size();
+        int count = infraredOutputService.getinfraredoutputOption(id);
         return count>0;
     }
 

fidms-admin/src/main/java/com/fidms/web/mapper/FlowFieldInputMapper.java

@@ -66,7 +66,7 @@ public interface FlowFieldInputMapper
      * @param id
      * @return
      */
-    List getflowfieldinputOption(Long id);
+    public int getflowfieldinputOption(Long id);
 
 
 }

fidms-admin/src/main/java/com/fidms/web/mapper/FlowFieldOutputMapper.java

@@ -66,5 +66,5 @@ public interface FlowFieldOutputMapper
      * @param id
      * @return
      */
-    List getflowfieldoutputOption(Long id);
+    public int  getflowfieldoutputOption(Long id);
 }

fidms-admin/src/main/java/com/fidms/web/mapper/InfraredInputMapper.java

@@ -66,5 +66,5 @@ public interface InfraredInputMapper
      * @param id
      * @return
      */
-    List getinfraredinputOption(Long id);
+    public int  getinfraredinputOption(Long id);
 }

fidms-admin/src/main/java/com/fidms/web/mapper/InfraredOutputMapper.java

@@ -64,5 +64,5 @@ public interface InfraredOutputMapper
      * @param id
      * @return
      */
-    List getinfraredoutputOption(Long id);
+    public int  getinfraredoutputOption(Long id);
 }

fidms-admin/src/main/java/com/fidms/web/service/IFlowFieldInputService.java

@@ -61,5 +61,5 @@ public interface IFlowFieldInputService
 
     public List getFlowFieldInputList();
 
-    List getflowfieldinputOption(Long id);
+    public int  getflowfieldinputOption(Long id);
 }

fidms-admin/src/main/java/com/fidms/web/service/IFlowFieldOutputService.java

@@ -62,5 +62,5 @@ public interface IFlowFieldOutputService
     public List getFlowFieldOutputOption();
 
 
-    List getflowfieldoutputOption(Long id);
+    public int getflowfieldoutputOption(Long id);
 }

fidms-admin/src/main/java/com/fidms/web/service/IInfraredInputService.java

@@ -62,5 +62,5 @@ public interface IInfraredInputService
     public List getInfraredInputOption();
 
 
-    List getinfraredinputOption(Long id);
+    public int  getinfraredinputOption(Long id);
 }

fidms-admin/src/main/java/com/fidms/web/service/IInfraredOutputService.java

@@ -60,5 +60,5 @@ public interface IInfraredOutputService
     public int deleteInfraredOutputById(Long id);
 
 
-    List getinfraredoutputOption(Long id);
+    public int getinfraredoutputOption(Long id);
 }

fidms-admin/src/main/java/com/fidms/web/service/impl/FlowFieldInputServiceImpl.java

@@ -111,7 +111,7 @@ public class FlowFieldInputServiceImpl implements IFlowFieldInputService
     }
 
     @Override
-    public List getflowfieldinputOption(Long id) {
+    public int  getflowfieldinputOption(Long id) {
         return flowFieldInputMapper.getflowfieldinputOption(id);
     }
 }

fidms-admin/src/main/java/com/fidms/web/service/impl/FlowFieldOutputServiceImpl.java

@@ -99,7 +99,7 @@ public class FlowFieldOutputServiceImpl implements IFlowFieldOutputService
     public List getFlowFieldOutputOption(){return flowFieldOutputMapper.getFlowOutputOption();}
 
     @Override
-    public List getflowfieldoutputOption(Long id) {
+    public int getflowfieldoutputOption(Long id) {
         return flowFieldOutputMapper.getflowfieldoutputOption(id);
     }
 }

fidms-admin/src/main/java/com/fidms/web/service/impl/InfraredInputServiceImpl.java

@@ -103,7 +103,7 @@ public class InfraredInputServiceImpl implements IInfraredInputService
     }
 
     @Override
-    public List getinfraredinputOption(Long id) {
+    public int getinfraredinputOption(Long id) {
         return infraredInputMapper.getinfraredinputOption(id);
     }
 }

fidms-admin/src/main/java/com/fidms/web/service/impl/InfraredOutputServiceImpl.java

@@ -96,7 +96,7 @@ public class InfraredOutputServiceImpl implements IInfraredOutputService
     }
 
     @Override
-    public List getinfraredoutputOption(Long id) {
+    public int  getinfraredoutputOption(Long id) {
         return infraredOutputMapper.getinfraredoutputOption(id);
     }
 }

fidms-admin/src/main/resources/mapper/data/FlowFieldInputMapper.xml

@@ -210,9 +210,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id from bz_flow_field_input_t order by id desc
     </select>
 
-    <select id="getflowfieldinputOption" parameterType="Long" resultMap="FlowFieldInputResult">
-        select
-            *
+    <select id="getflowfieldinputOption" parameterType="Long" resultType="int">
+        select count(bz_flow_field_input_t.id)
         from
             bz_flow_field_input_t
         where bz_flow_field_input_t.model_3d_id = #{id}

fidms-admin/src/main/resources/mapper/data/FlowFieldOutputMapper.xml

@@ -152,9 +152,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="getflowfieldoutputOption" parameterType="Long" resultMap="FlowFieldOutputResult">
+    <select id="getflowfieldoutputOption" parameterType="Long" resultType="int">
         select
-            *
+            count(*)
         from
             bz_flow_field_output_t
         where

fidms-admin/src/main/resources/mapper/data/InfraredInputMapper.xml

@@ -114,9 +114,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id from bz_infrared_input_t order by id desc
     </select>
 
-    <select id="getinfraredinputOption" parameterType="Long" resultMap="InfraredInputResult">
+    <select id="getinfraredinputOption" parameterType="Long" resultType="int">
         select
-            *
+            count(*)
         from
             bz_infrared_input_t
         where

fidms-admin/src/main/resources/mapper/data/InfraredOutputMapper.xml

@@ -95,9 +95,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
 
-    <select id="getinfraredoutputOption" parameterType="Long" resultMap="InfraredOutputResult">
+    <select id="getinfraredoutputOption" parameterType="Long"  resultType="int">
         select
-            *
+            count(*)
         from
             bz_infrared_output_t
         where

fidms-ui/src/views/data/allinfo/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
 
       <el-form-item label="飞机类型" prop="aircraftType">
         <el-input
@@ -19,7 +19,7 @@
         />
       </el-form-item>
 
-      <el-form-item label="来流方向x" prop="flowDirectionX">
+      <el-form-item label="来流方向x" prop="flowDirectionX" >
         <el-input
           v-model="queryParams.flowDirectionX"
           placeholder="请输入来流方向x"
@@ -613,8 +613,8 @@ export default {
       this.$download.resource(path);
     },
     openFolder(path){
-      const newName = path.slice(0,path.lastIndexOf("/"))
-      getFolder(newName);
+      
+      getFolder(path);
     },
     isDecimalFormat(value) {
       const decimalRegex = /^\d{1,16}(\.\d{1,6})?$/;

fidms-ui/src/views/data/flowOut/index.vue

@@ -508,8 +508,7 @@ export default {
       })
     },
     openFolder(path){
-      const newName = path.slice(0,path.lastIndexOf("/"))
-      getFolder(newName);
+      getFolder(path);
     }
 
 

fidms-ui/src/views/data/infraredOut/index.vue

@@ -364,8 +364,8 @@ export default {
       getInfraredInputID().then(resp=>{this.infraredInputOption = resp.data})
     },
     openFolder(path){
-      const newName = path.slice(0,path.lastIndexOf("/"))
-      getFolder(newName);
+     
+      getFolder(path);
     },
      isDecimalFormat(value) {
       const decimalRegex = /^\d{1,16}(\.\d{1,6})?$/;

fidms-ui/src/views/data/model/index.vue

@@ -323,8 +323,8 @@ export default {
       this.$download.resource(path);
     },
     openFolder(path){
-      const newName = path.slice(0,path.lastIndexOf("/"))
-      getFolder(newName);
+      
+      getFolder(path);
     }
   }
 };

sql/ry_20230223.sql

@@ -1105,18 +1105,12 @@ ALTER TABLE bz_infrared_output_t
 
 
 --  SHOW COLUMNS FROM bz_infrared_output_t;
-ALTER TABLE bz_infrared_output_t
-DROP COLUMN flow_field_output_path;
-ALTER TABLE bz_infrared_output_t
-DROP COLUMN surface_material;
-ALTER TABLE bz_infrared_output_t
-DROP COLUMN infrared_obser_dist;
 
 
 
 -- 菜单 SQL
 insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('报表管理', '2030', '1', 'allinfo', 'data/allinfo/index', 1, 0, 'C', '0', '0', 'data:allinfo:list', '#', 'admin', sysdate(), '', null, '报表管理菜单');
+values('报表管理', '0', '1', 'allinfo', 'data/allinfo/index', 1, 0, 'C', '0', '0', 'data:allinfo:list', '#', 'admin', sysdate(), '', null, '报表管理菜单');
 
 -- 按钮父菜单ID
 SELECT @parentId := LAST_INSERT_ID();