上传图片

data-ui/src/views/data/basicdata/firehydrant/index.vue

@@ -263,6 +263,14 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="展示图片" prop="attachPaths">
+              <DataImageUpload ref="ImageUpload" :fileType="['png', 'jpg', 'jpeg']" :value="form.attachPaths"
+                               @input="getUrl"></DataImageUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -341,13 +349,15 @@
   import {checkLon, checkLat, validPhoneMobile} from "@/api/rules/rules";
   import {selectCenterMonitorlList} from "@/api/data/digitalforest/animal/animal";
   import ISuperMap from "@/views/data/common/ISuperMap";
+  import DataImageUpload from "@/components/ImageUpload/dataUpload.vue";
 
   export default {
     components: {
       deptselector,
       Treeselect,
       supermap,
-      ISuperMap
+      ISuperMap,
+      DataImageUpload
     },
     name: "Firehydrant",
     dicts: ['firehydrant'],
@@ -437,6 +447,12 @@
       });
     },
     methods: {
+      getUrl(url) {
+        //获取图片全路径  例：http://{{ ip }}:{{ port }}/group1/M00/00/07/wKgKEGVxMCiAZbvVAAJE9SGvagw915.jpg
+        this.form.attachPaths = url
+        //获取图片路径  例：group1/M00/00/07/wKgKEGVxL6eACFv2AAJE9SGvagw622.jpg
+        // this.form.attachPaths = this.$refs.ImageUpload.dialogName
+      },
       showMap() {
         this.ISuperMapvisible = true;
         this.$nextTick(() => {

data-ui/src/views/data/basicdata/watercrane/index.vue

@@ -221,6 +221,14 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="展示图片" prop="attachPaths">
+              <DataImageUpload ref="ImageUpload" :fileType="['png', 'jpg', 'jpeg']" :value="form.attachPaths"
+                               @input="getUrl"></DataImageUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -319,9 +327,11 @@
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
   import ISuperMap from "@/views/data/common/ISuperMap";
+  import DataImageUpload from "@/components/ImageUpload/dataUpload.vue";
 
   export default {
     components: {
+      DataImageUpload,
       deptselector,
       supermap,
       Treeselect,
@@ -409,6 +419,12 @@
       });
     },
     methods: {
+      getUrl(url) {
+        //获取图片全路径  例：http://{{ ip }}:{{ port }}/group1/M00/00/07/wKgKEGVxMCiAZbvVAAJE9SGvagw915.jpg
+        this.form.attachPaths = url
+        //获取图片路径  例：group1/M00/00/07/wKgKEGVxL6eACFv2AAJE9SGvagw622.jpg
+        // this.form.attachPaths = this.$refs.ImageUpload.dialogName
+      },
       /** 查询部门下拉树结构 */
       getTreeselect() {
         treeselect().then(response => {

data-ui/src/views/data/basicdata/waterintake/index.vue

@@ -221,6 +221,14 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="展示图片" prop="attachPaths">
+              <DataImageUpload ref="ImageUpload" :fileType="['png', 'jpg', 'jpeg']" :value="form.attachPaths"
+                               @input="getUrl"></DataImageUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm" v-show=!disabled>确 定</el-button>
@@ -257,12 +265,14 @@
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
   import ISuperMap from "@/views/data/common/ISuperMap";
+  import DataImageUpload from "@/components/ImageUpload/dataUpload.vue";
   export default {
     components: {
       deptselector,
       supermap,
       Treeselect,
-      ISuperMap
+      ISuperMap,
+      DataImageUpload
 
     },
     name: "Waterintake",
@@ -342,6 +352,12 @@
       });
     },
     methods: {
+      getUrl(url) {
+        //获取图片全路径  例：http://{{ ip }}:{{ port }}/group1/M00/00/07/wKgKEGVxMCiAZbvVAAJE9SGvagw915.jpg
+        this.form.attachPaths = url
+        //获取图片路径  例：group1/M00/00/07/wKgKEGVxL6eACFv2AAJE9SGvagw622.jpg
+        // this.form.attachPaths = this.$refs.ImageUpload.dialogName
+      },
       /** 查询部门下拉树结构 */
       getTreeselect() {
         treeselect().then(response => {

data-ui/src/views/data/digitalagriculture/agricultural_cooperatives/index.vue

@@ -298,6 +298,14 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="展示图片" prop="attachPaths">
+              <DataImageUpload ref="ImageUpload" :fileType="['png', 'jpg', 'jpeg']" :value="form.attachPaths"
+                               @input="getUrl"></DataImageUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <!--<el-form-item label-width="auto" label="备注" prop="remarks">-->
         <!--<el-input v-model="form.remarks" placeholder="请输入备注" />-->
         <!--</el-form-item>-->
@@ -367,6 +375,7 @@
   import {selectCenterMonitorlList} from "@/api/data/digitalforest/animal/animal";
   import request from "@/utils/request";
   import ISuperMap from "@/views/data/common/ISuperMap.vue";
+  import DataImageUpload from "@/components/ImageUpload/dataUpload.vue";
 
   export default {
     name: "Cooperatives",
@@ -376,6 +385,7 @@
       Deptselector,
       Treeselect,
       supermap,
+      DataImageUpload
     },
     data() {
       return {
@@ -505,6 +515,12 @@
       this.getTreeselect();
     },
     methods: {
+      getUrl(url) {
+        //获取图片全路径  例：http://{{ ip }}:{{ port }}/group1/M00/00/07/wKgKEGVxMCiAZbvVAAJE9SGvagw915.jpg
+        this.form.attachPaths = url
+        //获取图片路径  例：group1/M00/00/07/wKgKEGVxL6eACFv2AAJE9SGvagw622.jpg
+        // this.form.attachPaths = this.$refs.ImageUpload.dialogName
+      },
       showMap() {
         this.ISuperMapvisible = true;
         this.$nextTick(() => {

data-ui/src/views/data/digitalagriculture/botany_protect_info/index.vue

@@ -287,6 +287,14 @@
             <!--</el-form-item>-->
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="展示图片" prop="attachPaths">
+              <DataImageUpload ref="ImageUpload" :fileType="['png', 'jpg', 'jpeg']" :value="form.attachPaths"
+                               @input="getUrl"></DataImageUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -357,6 +365,7 @@
   import {selectCenterMonitorlList} from "@/api/data/digitalforest/animal/animal";
   import request from "@/utils/request";
   import ISuperMap from "@/views/data/common/ISuperMap.vue";
+  import DataImageUpload from "@/components/ImageUpload/dataUpload.vue";
 
   export default {
     name: "BotanyProtectInfo",
@@ -365,6 +374,7 @@
       Deptselector,
       Treeselect,
       supermap,
+      DataImageUpload
     },
     data() {
       return {
@@ -483,6 +493,12 @@
       this.getTreeselect();
     },
     methods: {
+      getUrl(url) {
+        //获取图片全路径  例：http://{{ ip }}:{{ port }}/group1/M00/00/07/wKgKEGVxMCiAZbvVAAJE9SGvagw915.jpg
+        this.form.attachPaths = url
+        //获取图片路径  例：group1/M00/00/07/wKgKEGVxL6eACFv2AAJE9SGvagw622.jpg
+        // this.form.attachPaths = this.$refs.ImageUpload.dialogName
+      },
       setDataDeptId(e) {
         this.form.deptId = e.deptId;
         this.form.deptName = e.deptName;

data-ui/src/views/data/digitalforest/channel/index.vue

@@ -279,6 +279,14 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="展示图片" prop="attachPaths">
+              <DataImageUpload ref="ImageUpload" :fileType="['png', 'jpg', 'jpeg']" :value="form.attachPaths"
+                               @input="getUrl"></DataImageUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm" v-show=!disabled>确 定</el-button>
@@ -313,10 +321,11 @@
   import {checkPositiveDecimal,validPhoneMobile,checkLat,checkLon} from "@/api/rules/rules";
   import {selectCenterMonitorlList} from "@/api/data/digitalforest/animal/animal";
   import ISuperMap from "@/views/data/common/ISuperMap";
+  import DataImageUpload from "@/components/ImageUpload/dataUpload.vue";
 
   export default {
     name: "Channel",
-    components: {deptselector, Treeselect, supermap,ISuperMap},
+    components: {DataImageUpload, deptselector, Treeselect, supermap,ISuperMap},
     data() {
       return {
         sign: 1,
@@ -414,6 +423,12 @@
       });
     },
     methods: {
+      getUrl(url) {
+        //获取图片全路径  例：http://{{ ip }}:{{ port }}/group1/M00/00/07/wKgKEGVxMCiAZbvVAAJE9SGvagw915.jpg
+        this.form.attachPaths = url
+        //获取图片路径  例：group1/M00/00/07/wKgKEGVxL6eACFv2AAJE9SGvagw622.jpg
+        // this.form.attachPaths = this.$refs.ImageUpload.dialogName
+      },
       hx(node) {
         this.form.dataDeptId = node.id
         this.form.deptId = node.id

data-ui/src/views/data/digitalforest/fireteam/index.vue

@@ -208,6 +208,14 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="展示图片" prop="attachPaths">
+              <DataImageUpload ref="ImageUpload" :fileType="['png', 'jpg', 'jpeg']" :value="form.attachPaths"
+                               @input="getUrl"></DataImageUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -268,10 +276,11 @@
   import supermap from '@/views/components/supermap';
   import {selectCenterMonitorlList} from "@/api/data/digitalforest/animal/animal";
   import ISuperMap from "@/views/data/common/ISuperMap";
+  import DataImageUpload from "@/components/ImageUpload/dataUpload.vue";
 
   export default {
     name: "Fireteam",
-    components: {Treeselect, deptselector, supermap, ISuperMap},
+    components: {Treeselect, deptselector, supermap, ISuperMap,DataImageUpload},
     dicts:['centerdata_forest_fire_zoning','centerdata_forest_fire_category','centerdata_forest_fire_reach_standard'],
     data() {
       return {
@@ -354,6 +363,12 @@
       });
     },
     methods: {
+      getUrl(url) {
+        //获取图片全路径  例：http://{{ ip }}:{{ port }}/group1/M00/00/07/wKgKEGVxMCiAZbvVAAJE9SGvagw915.jpg
+        this.form.attachPaths = url
+        //获取图片路径  例：group1/M00/00/07/wKgKEGVxL6eACFv2AAJE9SGvagw622.jpg
+        // this.form.attachPaths = this.$refs.ImageUpload.dialogName
+      },
       hx(node) {
         this.form.dataDeptId = node.id
         this.form.deptId = node.id

data-ui/src/views/data/digitalforest/keyFireproofPlots/index.vue

@@ -197,6 +197,14 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="展示图片" prop="attachPaths">
+              <DataImageUpload ref="ImageUpload" :fileType="['png', 'jpg', 'jpeg']" :value="form.attachPaths"
+                               @input="getUrl"></DataImageUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm" v-show=!disabled>确 定</el-button>
@@ -224,11 +232,12 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {validPhoneMobile, checkPositiveInteger, checkLat, checkLon, checkPositiveDecimal} from "@/api/rules/rules";
 import {selectCenterMonitorlList} from "@/api/data/digitalforest/animal/animal";
 import ISuperMap from "@/views/data/common/ISuperMap.vue";
+import DataImageUpload from "@/components/ImageUpload/dataUpload.vue";
 
 export default {
   name: "KeyFireproofPlots",
   dicts: ['dominant_tree_species'],
-  components: {deptselector, Treeselect,ISuperMap,Deptselector},
+  components: {deptselector, Treeselect,ISuperMap,Deptselector,DataImageUpload},
   data() {
     return {
       disabled:true,
@@ -305,6 +314,12 @@ export default {
     });
   },
   methods: {
+    getUrl(url) {
+      //获取图片全路径  例：http://{{ ip }}:{{ port }}/group1/M00/00/07/wKgKEGVxMCiAZbvVAAJE9SGvagw915.jpg
+      this.form.attachPaths = url
+      //获取图片路径  例：group1/M00/00/07/wKgKEGVxL6eACFv2AAJE9SGvagw622.jpg
+      // this.form.attachPaths = this.$refs.ImageUpload.dialogName
+    },
     hx(node) {
       this.form.dataDeptId = node.id
       this.form.deptId = node.id

data-ui/src/views/data/digitalforest/landing/index.vue

@@ -270,6 +270,14 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="展示图片" prop="attachPaths">
+              <DataImageUpload ref="ImageUpload" :fileType="['png', 'jpg', 'jpeg']" :value="form.attachPaths"
+                               @input="getUrl"></DataImageUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm" v-show=!disabled>确 定</el-button>
@@ -305,10 +313,11 @@ import supermap from '@/views/components/supermap';
 import {validPhoneMobile, checkPositiveInteger, checkLat, checkLon, checkPositiveDecimal} from "@/api/rules/rules";
 import {selectCenterMonitorlList} from "@/api/data/digitalforest/animal/animal";
 import ISuperMap from "@/views/data/common/ISuperMap.vue";
+import DataImageUpload from "@/components/ImageUpload/dataUpload.vue";
 
 export default {
   name: "Landing",
-  components: {deptselector, Treeselect, supermap,ISuperMap},
+  components: {deptselector, Treeselect, supermap,ISuperMap,DataImageUpload},
   data() {
     return {
       disabled:true,
@@ -399,6 +408,12 @@ export default {
     });
   },
   methods: {
+    getUrl(url) {
+      //获取图片全路径  例：http://{{ ip }}:{{ port }}/group1/M00/00/07/wKgKEGVxMCiAZbvVAAJE9SGvagw915.jpg
+      this.form.attachPaths = url
+      //获取图片路径  例：group1/M00/00/07/wKgKEGVxL6eACFv2AAJE9SGvagw622.jpg
+      // this.form.attachPaths = this.$refs.ImageUpload.dialogName
+    },
     hx(node) {
       this.form.dataDeptId = node.id
       this.form.deptId = node.id

src/main/java/com/sooka/sponest/data/basicdata/domain/CenterdataTForestFirehydrant.java

@@ -102,6 +102,34 @@ public class CenterdataTForestFirehydrant extends BaseBusinessEntity {
     private String deptName;
 
     /**
+     * 图片上传路径
+     */
+    @ApiModelProperty(value = "图片上传路径", required = false)
+    private String attachPaths;
+
+    /**
+     * 图片来源
+     */
+    @ApiModelProperty(value = "图片来源", required = false)
+    private String busSource;
+
+    public String getAttachPaths() {
+        return attachPaths;
+    }
+
+    public void setAttachPaths(String attachPaths) {
+        this.attachPaths = attachPaths;
+    }
+
+    public String getBusSource() {
+        return busSource;
+    }
+
+    public void setBusSource(String busSource) {
+        this.busSource = busSource;
+    }
+
+    /**
      * 数据状态(1-可用 2-不可用 ) - 字典
      */
 //    @Excel(name = "数据状态(1-可用 2-不可用 ) - 字典")

src/main/java/com/sooka/sponest/data/basicdata/domain/CenterdataTForestWatercrane.java

@@ -93,6 +93,18 @@ public class CenterdataTForestWatercrane extends BaseBusinessEntity {
     @Excel(name = "具体位置")
     private String specificLocation;
 
+    /**
+     * 图片上传路径
+     */
+    @ApiModelProperty(value = "图片上传路径", required = false)
+    private String attachPaths;
+
+    /**
+     * 图片来源
+     */
+    @ApiModelProperty(value = "图片来源", required = false)
+    private String busSource;
+
 
 
     /**

src/main/java/com/sooka/sponest/data/basicdata/domain/CenterdataTForestWaterintake.java

@@ -84,6 +84,33 @@ public class CenterdataTForestWaterintake extends BaseBusinessEntity {
     @NotBlank(message = "所属部门不能为空")
     private String deptName;
 
+    /**
+     * 图片上传路径
+     */
+    @ApiModelProperty(value = "图片上传路径", required = false)
+    private String attachPaths;
+
+    /**
+     * 图片来源
+     */
+    @ApiModelProperty(value = "图片来源", required = false)
+    private String busSource;
+
+    public String getAttachPaths() {
+        return attachPaths;
+    }
+
+    public void setAttachPaths(String attachPaths) {
+        this.attachPaths = attachPaths;
+    }
+
+    public String getBusSource() {
+        return busSource;
+    }
+
+    public void setBusSource(String busSource) {
+        this.busSource = busSource;
+    }
 
     public String getSpecificLocation() {
         return specificLocation;

src/main/java/com/sooka/sponest/data/basicdata/service/impl/CenterdataTForestFirehydrantServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sooka.sponest.data.basicdata.service.impl;
 
+import com.ruoyi.common.core.constant.DocumentNameConstants;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
@@ -13,6 +14,7 @@ import com.sooka.sponest.data.basicdata.service.ICenterdataTForestFirehydrantSer
 import com.sooka.sponest.data.digitalforest.domain.bo.VisuForestCloudEventTypeBO;
 import com.sooka.sponest.data.system.equipment.domain.CenterdataTEquipmentCamera;
 import com.sooka.sponest.data.system.equipment.service.ICenterdataTEquipmentCameraService;
+import com.sooka.sponest.data.utils.DataAttachUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -57,6 +59,7 @@ public class CenterdataTForestFirehydrantServiceImpl extends BaseServiceImpl imp
         CenterdataTForestFirehydrant data = centerdataTForestFirehydrantMapper.selectCenterdataTForestFirehydrantById(id);
         data.setFirehydrantTypeLabel(DictUtils.getDictDataByValue("firehydrant",data.getFirehydrantType()));
         data.setDeviceList(centerdataTEquipmentCameraService.selectCenterdataTEquipmentCameraByBusinessId(id));
+        data.setAttachPaths(DataAttachUtil.getDataAttachUpload(id));
         return data;
     }
 
@@ -72,6 +75,7 @@ public class CenterdataTForestFirehydrantServiceImpl extends BaseServiceImpl imp
         centerdataTForestFirehydrant.setCreateBy(SecurityUtils.getUserId().toString());
         centerdataTForestFirehydrant.setCreateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTForestFirehydrant.setCreateTime(DateUtils.getNowDate());
+        DataAttachUtil.dataAttachUpload(centerdataTForestFirehydrant.getId(),centerdataTForestFirehydrant.getAttachPaths(), DocumentNameConstants.FOREST_FIREHYDRANT1, centerdataTForestFirehydrant.getBusSource());
         if (StringUtils.isNotEmpty(centerdataTForestFirehydrant.getDeviceList())) {
             centerdataTForestFirehydrant.getDeviceList().forEach(item -> {
                 CenterdataTEquipmentCamera camera = new CenterdataTEquipmentCamera();
@@ -97,6 +101,7 @@ public class CenterdataTForestFirehydrantServiceImpl extends BaseServiceImpl imp
         centerdataTForestFirehydrant.setUpdateTime(DateUtils.getNowDate());
         centerdataTForestFirehydrant.setUpdateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTEquipmentCameraService.deleteCenterdataTEquipmentCameraByBusinessId(centerdataTForestFirehydrant.getId());
+        DataAttachUtil.dataAttachUpload(centerdataTForestFirehydrant.getId(),centerdataTForestFirehydrant.getAttachPaths(), DocumentNameConstants.FOREST_FIREHYDRANT1, centerdataTForestFirehydrant.getBusSource());
         if (StringUtils.isNotEmpty(centerdataTForestFirehydrant.getDeviceList())) {
             centerdataTForestFirehydrant.getDeviceList().forEach(item -> {
                 CenterdataTEquipmentCamera camera = new CenterdataTEquipmentCamera();

src/main/java/com/sooka/sponest/data/basicdata/service/impl/CenterdataTForestWatercraneServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sooka.sponest.data.basicdata.service.impl;
 
+import com.ruoyi.common.core.constant.DocumentNameConstants;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
@@ -12,6 +13,7 @@ import com.sooka.sponest.data.basicdata.service.ICenterdataTForestWatercraneServ
 import com.sooka.sponest.data.digitalforest.domain.bo.VisuForestCloudEventTypeBO;
 import com.sooka.sponest.data.system.equipment.domain.CenterdataTEquipmentCamera;
 import com.sooka.sponest.data.system.equipment.service.ICenterdataTEquipmentCameraService;
+import com.sooka.sponest.data.utils.DataAttachUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -53,9 +55,10 @@ public class CenterdataTForestWatercraneServiceImpl extends BaseServiceImpl impl
      */
     @Override
     public CenterdataTForestWatercrane selectCenterdataTForestWatercraneById(String id) {
-        CenterdataTForestWatercrane centerdataTForestWatercrane = centerdataTForestWatercraneMapper.selectCenterdataTForestWatercraneById(id);
-        centerdataTForestWatercrane.setDeviceList(centerdataTEquipmentCameraService.selectCenterdataTEquipmentCameraByBusinessId(id));
-        return centerdataTForestWatercrane;
+        CenterdataTForestWatercrane data = centerdataTForestWatercraneMapper.selectCenterdataTForestWatercraneById(id);
+        data.setDeviceList(centerdataTEquipmentCameraService.selectCenterdataTEquipmentCameraByBusinessId(id));
+        data.setAttachPaths(DataAttachUtil.getDataAttachUpload(id));
+        return data;
     }
 
     /**
@@ -70,6 +73,7 @@ public class CenterdataTForestWatercraneServiceImpl extends BaseServiceImpl impl
         centerdataTForestWatercrane.setCreateBy(SecurityUtils.getUserId().toString());
         centerdataTForestWatercrane.setCreateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTForestWatercrane.setCreateTime(DateUtils.getNowDate());
+        DataAttachUtil.dataAttachUpload(centerdataTForestWatercrane.getId(),centerdataTForestWatercrane.getAttachPaths(), DocumentNameConstants.FOREST_WATERCRANE, centerdataTForestWatercrane.getBusSource());
         if (StringUtils.isNotEmpty(centerdataTForestWatercrane.getDeviceList())) {
             centerdataTForestWatercrane.getDeviceList().forEach(item -> {
                 CenterdataTEquipmentCamera camera = new CenterdataTEquipmentCamera();
@@ -95,6 +99,7 @@ public class CenterdataTForestWatercraneServiceImpl extends BaseServiceImpl impl
         centerdataTForestWatercrane.setUpdateTime(DateUtils.getNowDate());
         centerdataTForestWatercrane.setUpdateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTEquipmentCameraService.deleteCenterdataTEquipmentCameraByBusinessId(centerdataTForestWatercrane.getId());
+        DataAttachUtil.dataAttachUpload(centerdataTForestWatercrane.getId(),centerdataTForestWatercrane.getAttachPaths(), DocumentNameConstants.FOREST_WATERCRANE, centerdataTForestWatercrane.getBusSource());
         if (StringUtils.isNotEmpty(centerdataTForestWatercrane.getDeviceList())) {
             centerdataTForestWatercrane.getDeviceList().forEach(item -> {
                 CenterdataTEquipmentCamera camera = new CenterdataTEquipmentCamera();

src/main/java/com/sooka/sponest/data/basicdata/service/impl/CenterdataTForestWaterintakeServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sooka.sponest.data.basicdata.service.impl;
 
+import com.ruoyi.common.core.constant.DocumentNameConstants;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
@@ -12,6 +13,7 @@ import com.sooka.sponest.data.basicdata.service.ICenterdataTForestWaterintakeSer
 import com.sooka.sponest.data.digitalforest.domain.bo.VisuForestCloudEventTypeBO;
 import com.sooka.sponest.data.system.equipment.domain.CenterdataTEquipmentCamera;
 import com.sooka.sponest.data.system.equipment.service.ICenterdataTEquipmentCameraService;
+import com.sooka.sponest.data.utils.DataAttachUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -53,9 +55,10 @@ public class CenterdataTForestWaterintakeServiceImpl extends BaseServiceImpl imp
      */
     @Override
     public CenterdataTForestWaterintake selectCenterdataTForestWaterintakeById(String id) {
-        CenterdataTForestWaterintake centerdataTForestWaterintake = centerdataTForestWaterintakeMapper.selectCenterdataTForestWaterintakeById(id);
-        centerdataTForestWaterintake.setDeviceList(centerdataTEquipmentCameraService.selectCenterdataTEquipmentCameraByBusinessId(id));
-        return centerdataTForestWaterintake;
+        CenterdataTForestWaterintake data = centerdataTForestWaterintakeMapper.selectCenterdataTForestWaterintakeById(id);
+        data.setDeviceList(centerdataTEquipmentCameraService.selectCenterdataTEquipmentCameraByBusinessId(id));
+        data.setAttachPaths(DataAttachUtil.getDataAttachUpload(id));
+        return data;
     }
 
     /**
@@ -70,6 +73,7 @@ public class CenterdataTForestWaterintakeServiceImpl extends BaseServiceImpl imp
         centerdataTForestWaterintake.setCreateBy(SecurityUtils.getUserId().toString());
         centerdataTForestWaterintake.setCreateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTForestWaterintake.setCreateTime(DateUtils.getNowDate());
+        DataAttachUtil.dataAttachUpload(centerdataTForestWaterintake.getId(),centerdataTForestWaterintake.getAttachPaths(), DocumentNameConstants.FOREST_WATERINTAKE, centerdataTForestWaterintake.getBusSource());
         if (StringUtils.isNotEmpty(centerdataTForestWaterintake.getDeviceList())) {
             centerdataTForestWaterintake.getDeviceList().forEach(item -> {
                 CenterdataTEquipmentCamera camera = new CenterdataTEquipmentCamera();
@@ -95,6 +99,7 @@ public class CenterdataTForestWaterintakeServiceImpl extends BaseServiceImpl imp
         centerdataTForestWaterintake.setUpdateTime(DateUtils.getNowDate());
         centerdataTForestWaterintake.setUpdateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTEquipmentCameraService.deleteCenterdataTEquipmentCameraByBusinessId(centerdataTForestWaterintake.getId());
+        DataAttachUtil.dataAttachUpload(centerdataTForestWaterintake.getId(),centerdataTForestWaterintake.getAttachPaths(), DocumentNameConstants.FOREST_WATERINTAKE, centerdataTForestWaterintake.getBusSource());
         if (StringUtils.isNotEmpty(centerdataTForestWaterintake.getDeviceList())) {
             centerdataTForestWaterintake.getDeviceList().forEach(item -> {
                 CenterdataTEquipmentCamera camera = new CenterdataTEquipmentCamera();

src/main/java/com/sooka/sponest/data/digitalagriculture/domain/CenterdataTFarmAgriculturalCooperatives.java

@@ -192,4 +192,16 @@ public class CenterdataTFarmAgriculturalCooperatives extends BaseBusinessEntity
     @ApiModelProperty(value = "设备中间表主键", required = false)
     private List<String> deviceList;
 
+    /**
+     * 图片上传路径
+     */
+    @ApiModelProperty(value = "图片上传路径", required = false)
+    private String attachPaths;
+
+    /**
+     * 图片来源
+     */
+    @ApiModelProperty(value = "图片来源", required = false)
+    private String busSource;
+
 }

src/main/java/com/sooka/sponest/data/digitalagriculture/domain/CenterdataTFarmBotanyProtectInfo.java

@@ -161,4 +161,16 @@ public class CenterdataTFarmBotanyProtectInfo extends BaseBusinessEntity {
      */
     @ApiModelProperty(value = "设备中间表主键", required = false)
     private List<String> deviceList;
+
+    /**
+     * 图片上传路径
+     */
+    @ApiModelProperty(value = "图片上传路径", required = false)
+    private String attachPaths;
+
+    /**
+     * 图片来源
+     */
+    @ApiModelProperty(value = "图片来源", required = false)
+    private String busSource;
 }

src/main/java/com/sooka/sponest/data/digitalagriculture/service/impl/CenterdataTFarmAgriculturalCooperativesServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sooka.sponest.data.digitalagriculture.service.impl;
 
+import com.ruoyi.common.core.constant.DocumentNameConstants;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
@@ -13,6 +14,7 @@ import com.sooka.sponest.data.digitalagriculture.mapper.CenterdataTFarmAgricultu
 import com.sooka.sponest.data.digitalagriculture.service.ICenterdataTFarmAgriculturalCooperativesService;
 import com.sooka.sponest.data.system.equipment.domain.CenterdataTEquipmentCamera;
 import com.sooka.sponest.data.system.equipment.service.ICenterdataTEquipmentCameraService;
+import com.sooka.sponest.data.utils.DataAttachUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -56,6 +58,7 @@ public class CenterdataTFarmAgriculturalCooperativesServiceImpl extends BaseServ
     public CenterdataTFarmAgriculturalCooperatives selectCenterdataTFarmAgriculturalCooperativesById(String id) {
         CenterdataTFarmAgriculturalCooperatives data = centerdataTFarmAgriculturalCooperativesMapper.selectCenterdataTFarmAgriculturalCooperativesById(id);
         data.setDeviceList(centerdataTEquipmentCameraService.selectCenterdataTEquipmentCameraByBusinessId(id));
+        data.setAttachPaths(DataAttachUtil.getDataAttachUpload(id));
         return data;
     }
 
@@ -71,6 +74,7 @@ public class CenterdataTFarmAgriculturalCooperativesServiceImpl extends BaseServ
         centerdataTFarmAgriculturalCooperatives.setCreateBy(SecurityUtils.getUserId().toString());
         centerdataTFarmAgriculturalCooperatives.setCreateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTFarmAgriculturalCooperatives.setCreateTime(DateUtils.getNowDate());
+        DataAttachUtil.dataAttachUpload(centerdataTFarmAgriculturalCooperatives.getId(),centerdataTFarmAgriculturalCooperatives.getAttachPaths(), DocumentNameConstants.FARM_AGRICULTURAL_COOPERATIVES, centerdataTFarmAgriculturalCooperatives.getBusSource());
         if (StringUtils.isNotEmpty(centerdataTFarmAgriculturalCooperatives.getDeviceList())) {
             centerdataTFarmAgriculturalCooperatives.getDeviceList().forEach(item -> {
                 CenterdataTEquipmentCamera camera = new CenterdataTEquipmentCamera();
@@ -96,6 +100,7 @@ public class CenterdataTFarmAgriculturalCooperativesServiceImpl extends BaseServ
         centerdataTFarmAgriculturalCooperatives.setUpdateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTFarmAgriculturalCooperatives.setUpdateTime(DateUtils.getNowDate());
         centerdataTEquipmentCameraService.deleteCenterdataTEquipmentCameraByBusinessId(centerdataTFarmAgriculturalCooperatives.getId());
+        DataAttachUtil.dataAttachUpload(centerdataTFarmAgriculturalCooperatives.getId(),centerdataTFarmAgriculturalCooperatives.getAttachPaths(), DocumentNameConstants.FARM_AGRICULTURAL_COOPERATIVES, centerdataTFarmAgriculturalCooperatives.getBusSource());
         if (StringUtils.isNotEmpty(centerdataTFarmAgriculturalCooperatives.getDeviceList())) {
             centerdataTFarmAgriculturalCooperatives.getDeviceList().forEach(item -> {
                 CenterdataTEquipmentCamera camera = new CenterdataTEquipmentCamera();

src/main/java/com/sooka/sponest/data/digitalagriculture/service/impl/CenterdataTFarmBotanyProtectInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sooka.sponest.data.digitalagriculture.service.impl;
 
+import com.ruoyi.common.core.constant.DocumentNameConstants;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
@@ -13,6 +14,7 @@ import com.sooka.sponest.data.digitalagriculture.mapper.CenterdataTFarmBotanyPro
 import com.sooka.sponest.data.digitalagriculture.service.ICenterdataTFarmBotanyProtectInfoService;
 import com.sooka.sponest.data.system.equipment.domain.CenterdataTEquipmentCamera;
 import com.sooka.sponest.data.system.equipment.service.ICenterdataTEquipmentCameraService;
+import com.sooka.sponest.data.utils.DataAttachUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -56,6 +58,7 @@ public class CenterdataTFarmBotanyProtectInfoServiceImpl extends BaseServiceImpl
     public CenterdataTFarmBotanyProtectInfo selectCenterdataTFarmBotanyProtectInfoById(String id) {
         CenterdataTFarmBotanyProtectInfo data = centerdataTFarmBotanyProtectInfoMapper.selectCenterdataTFarmBotanyProtectInfoById(id);
         data.setDeviceList(centerdataTEquipmentCameraService.selectCenterdataTEquipmentCameraByBusinessId(id));
+        data.setAttachPaths(DataAttachUtil.getDataAttachUpload(id));
         return data;
     }
 
@@ -71,6 +74,7 @@ public class CenterdataTFarmBotanyProtectInfoServiceImpl extends BaseServiceImpl
         centerdataTFarmBotanyProtectInfo.setCreateBy(SecurityUtils.getUserId().toString());
         centerdataTFarmBotanyProtectInfo.setCreateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTFarmBotanyProtectInfo.setCreateTime(DateUtils.getNowDate());
+        DataAttachUtil.dataAttachUpload(centerdataTFarmBotanyProtectInfo.getId(),centerdataTFarmBotanyProtectInfo.getAttachPaths(), DocumentNameConstants.FARM_BOTANY_PROTECT_INFO, centerdataTFarmBotanyProtectInfo.getBusSource());
         if (StringUtils.isNotEmpty(centerdataTFarmBotanyProtectInfo.getDeviceList())) {
             centerdataTFarmBotanyProtectInfo.getDeviceList().forEach(item -> {
                 CenterdataTEquipmentCamera camera = new CenterdataTEquipmentCamera();
@@ -96,6 +100,7 @@ public class CenterdataTFarmBotanyProtectInfoServiceImpl extends BaseServiceImpl
         centerdataTFarmBotanyProtectInfo.setUpdateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTFarmBotanyProtectInfo.setUpdateTime(DateUtils.getNowDate());
         centerdataTEquipmentCameraService.deleteCenterdataTEquipmentCameraByBusinessId(centerdataTFarmBotanyProtectInfo.getId());
+        DataAttachUtil.dataAttachUpload(centerdataTFarmBotanyProtectInfo.getId(),centerdataTFarmBotanyProtectInfo.getAttachPaths(), DocumentNameConstants.FARM_BOTANY_PROTECT_INFO, centerdataTFarmBotanyProtectInfo.getBusSource());
         if (StringUtils.isNotEmpty(centerdataTFarmBotanyProtectInfo.getDeviceList())) {
             centerdataTFarmBotanyProtectInfo.getDeviceList().forEach(item -> {
                 CenterdataTEquipmentCamera camera = new CenterdataTEquipmentCamera();

src/main/java/com/sooka/sponest/data/digitalforest/domain/CenterdataTForestChannel.java

@@ -160,4 +160,16 @@ public class CenterdataTForestChannel extends BaseBusinessEntity {
      */
     private List<String> deviceList;
 
+    /**
+     * 图片上传路径
+     */
+    @ApiModelProperty(value = "图片上传路径", required = false)
+    private String attachPaths;
+
+    /**
+     * 图片来源
+     */
+    @ApiModelProperty(value = "图片来源", required = false)
+    private String busSource;
+
 }

src/main/java/com/sooka/sponest/data/digitalforest/domain/CenterdataTForestFireteam.java

@@ -141,6 +141,18 @@ public class CenterdataTForestFireteam extends BaseBusinessEntity {
      */
     private List<String> deviceList;
 
+    /**
+     * 图片上传路径
+     */
+    @ApiModelProperty(value = "图片上传路径", required = false)
+    private String attachPaths;
+
+    /**
+     * 图片来源
+     */
+    @ApiModelProperty(value = "图片来源", required = false)
+    private String busSource;
+
     @Override
     public String toString() {
         return "CenterdataTForestFireteam{" + "id='" + id + '\'' + ", name='" + name + '\'' + ", longitude='" + longitude + '\'' + ", latitude='" + latitude + '\'' + ", fireteamPerson='" + fireteamPerson + '\'' + ", fireteamTel='" + fireteamTel + '\'' + ", deptId=" + deptId + ", deptName='" + deptName + '\'' + ", dataStatus='" + dataStatus + '\'' + ", dataDeptId=" + dataDeptId + '}';

src/main/java/com/sooka/sponest/data/digitalforest/domain/CenterdataTForestKeyFireproofPlots.java

@@ -100,4 +100,16 @@ public class CenterdataTForestKeyFireproofPlots extends BaseBusinessEntity {
      */
     private List<String> deviceList;
 
+    /**
+     * 图片上传路径
+     */
+    @ApiModelProperty(value = "图片上传路径", required = false)
+    private String attachPaths;
+
+    /**
+     * 图片来源
+     */
+    @ApiModelProperty(value = "图片来源", required = false)
+    private String busSource;
+
 }

src/main/java/com/sooka/sponest/data/digitalforest/service/impl/CenterdataTForestChannelServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sooka.sponest.data.digitalforest.service.impl;
 
+import com.ruoyi.common.core.constant.DocumentNameConstants;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
@@ -11,6 +12,7 @@ import com.sooka.sponest.data.digitalforest.mapper.CenterdataTForestChannelMappe
 import com.sooka.sponest.data.digitalforest.service.ICenterdataTForestChannelService;
 import com.sooka.sponest.data.system.equipment.domain.CenterdataTEquipmentCamera;
 import com.sooka.sponest.data.system.equipment.service.ICenterdataTEquipmentCameraService;
+import com.sooka.sponest.data.utils.DataAttachUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -52,9 +54,10 @@ public class CenterdataTForestChannelServiceImpl extends BaseServiceImpl impleme
      */
     @Override
     public CenterdataTForestChannel selectCenterdataTForestChannelById(String id) {
-        CenterdataTForestChannel centerdataTForestChannel = centerdataTForestChannelMapper.selectCenterdataTForestChannelById(id);
-        centerdataTForestChannel.setDeviceList(centerdataTEquipmentCameraService.selectCenterdataTEquipmentCameraByBusinessId(id));
-        return centerdataTForestChannel;
+        CenterdataTForestChannel data = centerdataTForestChannelMapper.selectCenterdataTForestChannelById(id);
+        data.setDeviceList(centerdataTEquipmentCameraService.selectCenterdataTEquipmentCameraByBusinessId(id));
+        data.setAttachPaths(DataAttachUtil.getDataAttachUpload(id));
+        return data;
     }
 
     /**
@@ -69,6 +72,7 @@ public class CenterdataTForestChannelServiceImpl extends BaseServiceImpl impleme
         centerdataTForestChannel.setCreateBy(SecurityUtils.getUserId().toString());
         centerdataTForestChannel.setCreateTime(DateUtils.getNowDate());
         centerdataTForestChannel.setCreateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
+        DataAttachUtil.dataAttachUpload(centerdataTForestChannel.getId(),centerdataTForestChannel.getAttachPaths(), DocumentNameConstants.FOREST_CHANNEL, centerdataTForestChannel.getBusSource());
         if (StringUtils.isNotEmpty(centerdataTForestChannel.getDeviceList())) {
             centerdataTForestChannel.getDeviceList().forEach(item -> {
                 CenterdataTEquipmentCamera camera = new CenterdataTEquipmentCamera();
@@ -94,6 +98,7 @@ public class CenterdataTForestChannelServiceImpl extends BaseServiceImpl impleme
         centerdataTForestChannel.setUpdateTime(DateUtils.getNowDate());
         centerdataTForestChannel.setUpdateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTEquipmentCameraService.deleteCenterdataTEquipmentCameraByBusinessId(centerdataTForestChannel.getId());
+        DataAttachUtil.dataAttachUpload(centerdataTForestChannel.getId(),centerdataTForestChannel.getAttachPaths(), DocumentNameConstants.FOREST_CHANNEL, centerdataTForestChannel.getBusSource());
         if (StringUtils.isNotEmpty(centerdataTForestChannel.getDeviceList())) {
             centerdataTForestChannel.getDeviceList().forEach(item -> {
                 CenterdataTEquipmentCamera camera = new CenterdataTEquipmentCamera();

src/main/java/com/sooka/sponest/data/digitalforest/service/impl/CenterdataTForestFireteamServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sooka.sponest.data.digitalforest.service.impl;
 
+import com.ruoyi.common.core.constant.DocumentNameConstants;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
@@ -13,6 +14,7 @@ import com.sooka.sponest.data.digitalforest.mapper.CenterdataTForestFireteamMapp
 import com.sooka.sponest.data.digitalforest.service.ICenterdataTForestFireteamService;
 import com.sooka.sponest.data.system.equipment.domain.CenterdataTEquipmentCamera;
 import com.sooka.sponest.data.system.equipment.service.ICenterdataTEquipmentCameraService;
+import com.sooka.sponest.data.utils.DataAttachUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -60,6 +62,7 @@ public class CenterdataTForestFireteamServiceImpl extends BaseServiceImpl implem
         data.setZoningLabel(DictUtils.getDictDataByValue("centerdata_forest_fire_zoning",data.getZoning()));
         data.setCategoryLabel(DictUtils.getDictDataByValue("centerdata_forest_fire_category",data.getCategory()));
         data.setStandardLabel(DictUtils.getDictDataByValue("centerdata_forest_fire_reach_standard",data.getStandard()));
+        data.setAttachPaths(DataAttachUtil.getDataAttachUpload(id));
         return data;
     }
 
@@ -75,6 +78,7 @@ public class CenterdataTForestFireteamServiceImpl extends BaseServiceImpl implem
         centerdataTForestFireteam.setCreateBy(SecurityUtils.getUserId().toString());
         centerdataTForestFireteam.setCreateTime(DateUtils.getNowDate());
         centerdataTForestFireteam.setCreateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
+        DataAttachUtil.dataAttachUpload(centerdataTForestFireteam.getId(),centerdataTForestFireteam.getAttachPaths(), DocumentNameConstants.FOREST_FIRETEAM, centerdataTForestFireteam.getBusSource());
         if (StringUtils.isNotEmpty(centerdataTForestFireteam.getDeviceList())) {
             centerdataTForestFireteam.getDeviceList().forEach(item -> {
                 CenterdataTEquipmentCamera camera = new CenterdataTEquipmentCamera();
@@ -100,6 +104,7 @@ public class CenterdataTForestFireteamServiceImpl extends BaseServiceImpl implem
         centerdataTForestFireteam.setUpdateTime(DateUtils.getNowDate());
         centerdataTForestFireteam.setUpdateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTEquipmentCameraService.deleteCenterdataTEquipmentCameraByBusinessId(centerdataTForestFireteam.getId());
+        DataAttachUtil.dataAttachUpload(centerdataTForestFireteam.getId(),centerdataTForestFireteam.getAttachPaths(), DocumentNameConstants.FOREST_FIRETEAM, centerdataTForestFireteam.getBusSource());
         if (StringUtils.isNotEmpty(centerdataTForestFireteam.getDeviceList())) {
             centerdataTForestFireteam.getDeviceList().forEach(item -> {
                 CenterdataTEquipmentCamera camera = new CenterdataTEquipmentCamera();

src/main/java/com/sooka/sponest/data/digitalforest/service/impl/CenterdataTForestKeyFireproofPlotsServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sooka.sponest.data.digitalforest.service.impl;
 
+import com.ruoyi.common.core.constant.DocumentNameConstants;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
@@ -12,6 +13,7 @@ import com.sooka.sponest.data.digitalforest.mapper.CenterdataTForestKeyFireproof
 import com.sooka.sponest.data.digitalforest.service.ICenterdataTForestKeyFireproofPlotsService;
 import com.sooka.sponest.data.system.equipment.domain.CenterdataTEquipmentCamera;
 import com.sooka.sponest.data.system.equipment.service.ICenterdataTEquipmentCameraService;
+import com.sooka.sponest.data.utils.DataAttachUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -57,6 +59,7 @@ public class CenterdataTForestKeyFireproofPlotsServiceImpl extends BaseServiceIm
         CenterdataTForestKeyFireproofPlots data = centerdataTForestKeyFireproofPlotsMapper.selectCenterdataTForestKeyFireproofPlotsById(id);
         data.setForestSpeciesLabel(DictUtils.getDictDataByValue("dominant_tree_species",data.getForestSpecies()));
         data.setDeviceList(centerdataTEquipmentCameraService.selectCenterdataTEquipmentCameraByBusinessId(id));
+        data.setAttachPaths(DataAttachUtil.getDataAttachUpload(id));
         return data;
     }
 
@@ -72,6 +75,7 @@ public class CenterdataTForestKeyFireproofPlotsServiceImpl extends BaseServiceIm
         centerdataTForestKeyFireproofPlots.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getUserId().toString());
         centerdataTForestKeyFireproofPlots.setCreateTime(DateUtils.getNowDate());
         centerdataTForestKeyFireproofPlots.setCreateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
+        DataAttachUtil.dataAttachUpload(centerdataTForestKeyFireproofPlots.getId(),centerdataTForestKeyFireproofPlots.getAttachPaths(), DocumentNameConstants.FOREST_KEY_FIREPROOF_PLOTS, centerdataTForestKeyFireproofPlots.getBusSource());
         if (StringUtils.isNotEmpty(centerdataTForestKeyFireproofPlots.getDeviceList())) {
             centerdataTForestKeyFireproofPlots.getDeviceList().forEach(item -> {
                 CenterdataTEquipmentCamera camera = new CenterdataTEquipmentCamera();
@@ -97,6 +101,7 @@ public class CenterdataTForestKeyFireproofPlotsServiceImpl extends BaseServiceIm
         centerdataTForestKeyFireproofPlots.setUpdateTime(DateUtils.getNowDate());
         centerdataTForestKeyFireproofPlots.setUpdateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTEquipmentCameraService.deleteCenterdataTEquipmentCameraByBusinessId(centerdataTForestKeyFireproofPlots.getId());
+        DataAttachUtil.dataAttachUpload(centerdataTForestKeyFireproofPlots.getId(),centerdataTForestKeyFireproofPlots.getAttachPaths(), DocumentNameConstants.FOREST_KEY_FIREPROOF_PLOTS, centerdataTForestKeyFireproofPlots.getBusSource());
         if (StringUtils.isNotEmpty(centerdataTForestKeyFireproofPlots.getDeviceList())) {
             centerdataTForestKeyFireproofPlots.getDeviceList().forEach(item -> {
                 CenterdataTEquipmentCamera camera = new CenterdataTEquipmentCamera();

src/main/java/com/sooka/sponest/data/digitalforest/service/impl/CenterdataTForestLandingServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sooka.sponest.data.digitalforest.service.impl;
 
+import com.ruoyi.common.core.constant.DocumentNameConstants;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
@@ -11,6 +12,7 @@ import com.sooka.sponest.data.digitalforest.mapper.CenterdataTForestLandingMappe
 import com.sooka.sponest.data.digitalforest.service.ICenterdataTForestLandingService;
 import com.sooka.sponest.data.system.equipment.domain.CenterdataTEquipmentCamera;
 import com.sooka.sponest.data.system.equipment.service.ICenterdataTEquipmentCameraService;
+import com.sooka.sponest.data.utils.DataAttachUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -52,9 +54,10 @@ public class CenterdataTForestLandingServiceImpl extends BaseServiceImpl impleme
      */
     @Override
     public CenterdataTForestLanding selectCenterdataTForestLandingById(String id) {
-        CenterdataTForestLanding centerdataTForestLanding = centerdataTForestLandingMapper.selectCenterdataTForestLandingById(id);
-        centerdataTForestLanding.setDeviceList(centerdataTEquipmentCameraService.selectCenterdataTEquipmentCameraByBusinessId(id));
-        return centerdataTForestLanding;
+        CenterdataTForestLanding data = centerdataTForestLandingMapper.selectCenterdataTForestLandingById(id);
+        data.setDeviceList(centerdataTEquipmentCameraService.selectCenterdataTEquipmentCameraByBusinessId(id));
+        data.setAttachPaths(DataAttachUtil.getDataAttachUpload(id));
+        return data;
     }
 
     /**
@@ -69,6 +72,7 @@ public class CenterdataTForestLandingServiceImpl extends BaseServiceImpl impleme
         centerdataTForestLanding.setCreateBy(SecurityUtils.getUserId().toString());
         centerdataTForestLanding.setCreateTime(DateUtils.getNowDate());
         centerdataTForestLanding.setCreateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
+        DataAttachUtil.dataAttachUpload(centerdataTForestLanding.getId(),centerdataTForestLanding.getAttachPaths(), DocumentNameConstants.FOREST_LANDING, centerdataTForestLanding.getBusSource());
         if (StringUtils.isNotEmpty(centerdataTForestLanding.getDeviceList())) {
             centerdataTForestLanding.getDeviceList().forEach(item -> {
                 CenterdataTEquipmentCamera camera = new CenterdataTEquipmentCamera();
@@ -94,6 +98,7 @@ public class CenterdataTForestLandingServiceImpl extends BaseServiceImpl impleme
         centerdataTForestLanding.setUpdateTime(DateUtils.getNowDate());
         centerdataTForestLanding.setUpdateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTEquipmentCameraService.deleteCenterdataTEquipmentCameraByBusinessId(centerdataTForestLanding.getId());
+        DataAttachUtil.dataAttachUpload(centerdataTForestLanding.getId(),centerdataTForestLanding.getAttachPaths(), DocumentNameConstants.FOREST_LANDING, centerdataTForestLanding.getBusSource());
         if (StringUtils.isNotEmpty(centerdataTForestLanding.getDeviceList())) {
             centerdataTForestLanding.getDeviceList().forEach(item -> {
                 CenterdataTEquipmentCamera camera = new CenterdataTEquipmentCamera();