生鲜乳收购站/屠宰企业/饲料企业/备案畜禽规模养殖场/种畜禽养殖场信息/区域性粪污处置中心/肉牛基层繁改站/棚膜信息/沙场资源管理 新增图片多选上传功能

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

@@ -230,6 +230,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="展示图片" prop="attachPaths">
+              <DataImageUpload ref="ImageUpload" :file-type="['png','jpg','jpeg']" :value="form.attachPaths" @input="getUrl"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -265,11 +272,11 @@
   import Treeselect from '@riophae/vue-treeselect'
   import '@riophae/vue-treeselect/dist/vue-treeselect.css'
   import ISuperMap from "@/views/data/common/ISuperMap.vue";
-
+  import DataImageUpload from "@/components/ImageUpload/dataUpload.vue"
   export default {
     name: "Enterprise",
     dicts: ['sys_dept_type'],
-    components: {ISuperMap, Deptselector, Supermap,fileUpload , Treeselect},
+    components: {ISuperMap, Deptselector, Supermap,fileUpload , Treeselect ,DataImageUpload},
     data() {
       return {
         ISuperMapvisible: false,
@@ -395,7 +402,7 @@
         this.$refs.form.validateField('deptId');
       },
       getUrl(url) {
-        alert('0');
+        this.form.attachPaths = url
       },
       setFileName(fileName) {
         let that = this

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

@@ -176,6 +176,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="展示图片" prop="attachPaths">
+              <DataImageUpload ref="ImageUpload" :file-type="['png','jpg','jpeg']" :value="form.attachPaths" @input="getUrl"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -214,10 +221,12 @@
   import Treeselect from '@riophae/vue-treeselect'
   import '@riophae/vue-treeselect/dist/vue-treeselect.css'
   import ISuperMap from "@/views/data/common/ISuperMap.vue";
+  import DataImageUpload from "@/components/ImageUpload/dataUpload.vue";
 
   export default {
     name: "Excrementdispose",
     components: {
+      DataImageUpload,
       ISuperMap,
       Deptselector,
       Treeselect,
@@ -325,6 +334,9 @@
           })
         })
       },
+      getUrl(url) {
+        this.form.attachPaths = url
+      },
       send(val) {
         if (val===true){
           this.ISuperMapvisible = false;

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

@@ -250,6 +250,13 @@
               <el-input v-model="form.dataSource" placeholder="请输入数据来源" maxlength="200"/>
             </el-form-item>
           </el-col>
+      </el-row >
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="展示图片" prop="attachPaths">
+              <DataImageUpload ref="ImageUpload" :file-type="['png','jpg','jpeg']" :value="form.attachPaths" @input="getUrl"/>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -285,11 +292,11 @@
   import Treeselect from '@riophae/vue-treeselect'
   import '@riophae/vue-treeselect/dist/vue-treeselect.css'
   import ISuperMap from "@/views/data/common/ISuperMap.vue";
-
+  import DataImageUpload from "@/components/ImageUpload/dataUpload.vue"
   export default {
     name: "FilingsLivestock",
     dicts: ['centerdata_breeding_variety', 'sys_dept_type'],
-    components: {ISuperMap, Treeselect, Deptselector,supermap},
+    components: {ISuperMap, Treeselect, Deptselector,supermap,DataImageUpload},
     data() {
       return {
         ISuperMapvisible: false,
@@ -496,6 +503,9 @@
         this.single = selection.length !== 1
         this.multiple = !selection.length
       },
+      getUrl(url) {
+        this.form.attachPaths = url
+      },
       /** 新增按钮操作 */
       handleAdd() {
         this.reset();

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

@@ -259,8 +259,8 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="24">
-            <el-form-item label="图片" prop="parkUrl">
-              <image-upload v-model="form.parkUrl" :limit="1" :is-show-tip="false" :allow-upload="false"/>
+            <el-form-item label="展示图片" prop="attachPaths">
+              <DataImageUpload ref="ImageUpload" :file-type="['png','jpg','jpeg']" :value="form.attachPaths" @input="getUrl"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -301,11 +301,13 @@
   import Treeselect from '@riophae/vue-treeselect'
   import '@riophae/vue-treeselect/dist/vue-treeselect.css'
   import ISuperMap from "@/views/data/common/ISuperMap.vue";
+  import DataImageUpload from "@/components/ImageUpload/dataUpload.vue";
 
   export default {
     name: "Greenhousefilm",
     dicts: ['park_nature', 'plant_category'],
     components: {
+      DataImageUpload,
       ISuperMap,
       Deptselector,
       Treeselect,
@@ -448,6 +450,9 @@
         // if (this.sign === 2 || this.sign === 3) this.form.longitude = val.xiantude;
         this.ISuperMapvisible = false
       },
+      getUrl(url) {
+        this.form.attachPaths = url
+      },
       /** 查询部门下拉树结构 */
       getTreeselect() {
         treeselect().then(response => {

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

@@ -224,6 +224,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="展示图片" prop="attachPaths">
+              <DataImageUpload ref="ImageUpload" :file-type="['png','jpg','jpeg']" :value="form.attachPaths" @input="getUrl"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -258,11 +265,11 @@
   import Treeselect from '@riophae/vue-treeselect'
   import '@riophae/vue-treeselect/dist/vue-treeselect.css'
   import ISuperMap from "@/views/data/common/ISuperMap.vue";
-
+  import DataImageUpload from "@/components/ImageUpload/dataUpload.vue";
   export default {
     name: "Livestock",
     dicts: ['centerdata_breeding_variety', 'sys_dept_type'],
-    components: {ISuperMap, Treeselect, Deptselector,supermap},
+    components: {DataImageUpload, ISuperMap, Treeselect, Deptselector,supermap},
     data() {
       return {
         ISuperMapvisible: false,
@@ -396,6 +403,9 @@
         // if (this.sign === 2 || this.sign === 3) this.form.longitude = val.xiantude;
         this.ISuperMapvisible = false
       },
+      getUrl(url) {
+        this.form.attachPaths = url
+      },
       /** 查询部门下拉树结构 */
       getTreeselect() {
         treeselect().then(response => {

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

@@ -173,6 +173,13 @@
             </el-form-item>
           </el-col>-->
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="展示图片" prop="attachPaths">
+              <DataImageUpload ref="ImageUpload" :file-type="['png','jpg','jpeg']" :value="form.attachPaths" @input="getUrl"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -209,10 +216,12 @@
   import Treeselect from '@riophae/vue-treeselect'
   import '@riophae/vue-treeselect/dist/vue-treeselect.css'
   import ISuperMap from "@/views/data/common/ISuperMap.vue";
+  import DataImageUpload from "@/components/ImageUpload/dataUpload.vue";
 
   export default {
     name: "Modification",
     components: {
+      DataImageUpload,
       Deptselector,
       Treeselect,
       supermap,
@@ -352,6 +361,9 @@
         this.open = false;
         this.reset();
       },
+      getUrl(url) {
+        this.form.attachPaths = url
+      },
       // 表单重置
       reset() {
         this.form = {

data-ui/src/views/data/digitalwater/battlefield/index.vue

@@ -229,6 +229,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="展示图片" prop="attachPaths">
+              <DataImageUpload ref="ImageUpload" :file-type="['png','jpg','jpeg']" :value="form.attachPaths" @input="getUrl"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -256,9 +263,10 @@
   import {treeselect} from "@/api/system/dept";
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+  import DataImageUpload from "@/components/ImageUpload/dataUpload.vue";
   export default {
     name: "Battlefield",
-    components: {Deptselector, fileUpload, Supermap,ISuperMap,Treeselect},
+    components: {DataImageUpload, Deptselector, fileUpload, Supermap,ISuperMap,Treeselect},
     data() {
       return {
         // 遮罩层
@@ -405,6 +413,9 @@
         this.queryParams.pageNum = 1;
         this.getList();
       },
+      getUrl(url) {
+        this.form.attachPaths = url
+      },
       /** 重置按钮操作 */
       resetQuery() {
         this.resetForm("queryForm");

src/main/java/com/sooka/sponest/data/digitalagriculture/controller/CenterdataTFarmComplexModificationController.java

@@ -12,6 +12,7 @@ import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalagriculture.domain.CenterdataTFarmComplexModification;
 import com.sooka.sponest.data.digitalagriculture.service.ICenterdataTFarmComplexModificationService;
+import com.sooka.sponest.data.utils.DataAttachUtil;
 import com.sooka.sponest.data.utils.DataProducerUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -68,7 +69,9 @@ public class CenterdataTFarmComplexModificationController extends BaseController
     @RequiresPermissions("modification:modification:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id) {
-        return AjaxResult.success(centerdataTFarmComplexModificationService.selectCenterdataTFarmComplexModificationById(id));
+        CenterdataTFarmComplexModification centerdataTFarmComplexModification = centerdataTFarmComplexModificationService.selectCenterdataTFarmComplexModificationById(id);
+        centerdataTFarmComplexModification.setAttachPaths(DataAttachUtil.getDataAttachUpload(id));
+        return AjaxResult.success(centerdataTFarmComplexModification);
     }
 
     /**
@@ -79,8 +82,10 @@ public class CenterdataTFarmComplexModificationController extends BaseController
     @Log(title = "肉牛基层繁改站", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CenterdataTFarmComplexModification centerdataTFarmComplexModification) {
+
         int result = centerdataTFarmComplexModificationService.insertCenterdataTFarmComplexModification(centerdataTFarmComplexModification);
-        DataProducerUtil.getInstance().publish(new ESVo(DocumentNameConstants.FARM_COMPLEX_MODIFICATION,BusinessType.INSERT, JSON.toJSONString(centerdataTFarmComplexModification)));
+        DataProducerUtil.getInstance().publish(new ESVo(DocumentNameConstants.FARM_COMPLEX_MODIFICATION,BusinessType.INSERT,
+                JSON.toJSONString(centerdataTFarmComplexModification)));
         return toAjax(result);
     }
 
@@ -93,7 +98,13 @@ public class CenterdataTFarmComplexModificationController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CenterdataTFarmComplexModification centerdataTFarmComplexModification) {
         int result = centerdataTFarmComplexModificationService.updateCenterdataTFarmComplexModification(centerdataTFarmComplexModification);
-        DataProducerUtil.getInstance().publish(new ESVo(DocumentNameConstants.FARM_COMPLEX_MODIFICATION,BusinessType.UPDATE, JSON.toJSONString(centerdataTFarmComplexModification)));
+        DataAttachUtil.dataAttachUpload(centerdataTFarmComplexModification.getId(),
+                centerdataTFarmComplexModification.getAttachPaths(),
+                DocumentNameConstants.FARM_EXCREMENT_DISPOSE,
+                centerdataTFarmComplexModification.getBusSource());
+        DataProducerUtil.getInstance().publish(new ESVo(DocumentNameConstants.FARM_COMPLEX_MODIFICATION,
+                BusinessType.UPDATE,
+                JSON.toJSONString(centerdataTFarmComplexModification)));
         return toAjax(result);
     }
 

src/main/java/com/sooka/sponest/data/digitalagriculture/controller/CenterdataTFarmEnterpriseController.java

@@ -11,6 +11,7 @@ import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalagriculture.domain.CenterdataTFarmEnterprise;
 import com.sooka.sponest.data.digitalagriculture.service.ICenterdataTFarmEnterpriseService;
+import com.sooka.sponest.data.utils.DataAttachUtil;
 import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.ExcelUtil;
 import io.swagger.annotations.Api;
@@ -69,7 +70,9 @@ public class CenterdataTFarmEnterpriseController extends BaseController {
     @RequiresPermissions("digitalagriculture:enterprise:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id) {
-        return AjaxResult.success(centerdataTFarmEnterpriseService.selectCenterdataTFarmEnterpriseById(id));
+        CenterdataTFarmEnterprise centerdataTFarmEnterprise = centerdataTFarmEnterpriseService.selectCenterdataTFarmEnterpriseById(id);
+        centerdataTFarmEnterprise.setAttachPaths(DataAttachUtil.getDataAttachUpload(id));
+        return AjaxResult.success(centerdataTFarmEnterprise);
     }
 
     /**
@@ -81,6 +84,13 @@ public class CenterdataTFarmEnterpriseController extends BaseController {
     @PostMapping
     public AjaxResult add(@Validated @RequestBody CenterdataTFarmEnterprise centerdataTFarmEnterprise) {
         int result = centerdataTFarmEnterpriseService.insertCenterdataTFarmEnterprise(centerdataTFarmEnterprise);
+        if ("1".equals(centerdataTFarmEnterprise.getType())) {
+            DataAttachUtil.dataAttachUpload(centerdataTFarmEnterprise.getId(), centerdataTFarmEnterprise.getAttachPaths(), DocumentNameConstants.FARM_ENTERPRISE1, centerdataTFarmEnterprise.getBusSource());
+        }else if ("2".equals(centerdataTFarmEnterprise.getType())){
+            DataAttachUtil.dataAttachUpload(centerdataTFarmEnterprise.getId(), centerdataTFarmEnterprise.getAttachPaths(), DocumentNameConstants.FARM_ENTERPRISE2, centerdataTFarmEnterprise.getBusSource());
+        }else {
+            DataAttachUtil.dataAttachUpload(centerdataTFarmEnterprise.getId(), centerdataTFarmEnterprise.getAttachPaths(), DocumentNameConstants.FARM_ENTERPRISE3, centerdataTFarmEnterprise.getBusSource());
+        }
         DataProducerUtil.getInstance().publish(new ESVo(DocumentNameConstants.FARM_ENTERPRISE1, BusinessType.INSERT, JSON.toJSONString(centerdataTFarmEnterprise)));
         return toAjax(result);
     }
@@ -93,6 +103,13 @@ public class CenterdataTFarmEnterpriseController extends BaseController {
     @Log(title = "生鲜乳收购站、屠宰企业、饲料企业", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody CenterdataTFarmEnterprise centerdataTFarmEnterprise) {
+        if ("1".equals(centerdataTFarmEnterprise.getType())) {
+            DataAttachUtil.dataAttachUpload(centerdataTFarmEnterprise.getId(), centerdataTFarmEnterprise.getAttachPaths(), DocumentNameConstants.FARM_ENTERPRISE1, centerdataTFarmEnterprise.getBusSource());
+        }else if ("2".equals(centerdataTFarmEnterprise.getType())){
+            DataAttachUtil.dataAttachUpload(centerdataTFarmEnterprise.getId(), centerdataTFarmEnterprise.getAttachPaths(), DocumentNameConstants.FARM_ENTERPRISE2, centerdataTFarmEnterprise.getBusSource());
+        }else {
+            DataAttachUtil.dataAttachUpload(centerdataTFarmEnterprise.getId(), centerdataTFarmEnterprise.getAttachPaths(), DocumentNameConstants.FARM_ENTERPRISE3, centerdataTFarmEnterprise.getBusSource());
+        }
         int result = centerdataTFarmEnterpriseService.updateCenterdataTFarmEnterprise(centerdataTFarmEnterprise);
         DataProducerUtil.getInstance().publish(new ESVo(DocumentNameConstants.FARM_ENTERPRISE1, BusinessType.UPDATE, JSON.toJSONString(centerdataTFarmEnterprise)));
         return toAjax(result);

src/main/java/com/sooka/sponest/data/digitalagriculture/controller/CenterdataTFarmExcrementDisposeController.java

@@ -12,6 +12,7 @@ import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalagriculture.domain.CenterdataTFarmExcrementDispose;
 import com.sooka.sponest.data.digitalagriculture.service.ICenterdataTFarmExcrementDisposeService;
+import com.sooka.sponest.data.utils.DataAttachUtil;
 import com.sooka.sponest.data.utils.DataProducerUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -68,7 +69,9 @@ public class CenterdataTFarmExcrementDisposeController extends BaseController {
     @RequiresPermissions("excrementdispose:excrementdispose:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id) {
-        return AjaxResult.success(centerdataTFarmExcrementDisposeService.selectCenterdataTFarmExcrementDisposeById(id));
+        CenterdataTFarmExcrementDispose centerdataTFarmExcrementDispose = centerdataTFarmExcrementDisposeService.selectCenterdataTFarmExcrementDisposeById(id);
+        centerdataTFarmExcrementDispose.setAttachPaths(DataAttachUtil.getDataAttachUpload(id));
+        return AjaxResult.success(centerdataTFarmExcrementDispose);
     }
 
     /**
@@ -80,6 +83,7 @@ public class CenterdataTFarmExcrementDisposeController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestBody CenterdataTFarmExcrementDispose centerdataTFarmExcrementDispose) {
         int result = centerdataTFarmExcrementDisposeService.insertCenterdataTFarmExcrementDispose(centerdataTFarmExcrementDispose);
+        DataAttachUtil.dataAttachUpload(centerdataTFarmExcrementDispose.getId(), centerdataTFarmExcrementDispose.getAttachPaths(), DocumentNameConstants.FARM_EXCREMENT_DISPOSE, centerdataTFarmExcrementDispose.getBusSource());
         DataProducerUtil.getInstance().publish(new ESVo(DocumentNameConstants.FARM_EXCREMENT_DISPOSE,BusinessType.INSERT, JSON.toJSONString(centerdataTFarmExcrementDispose)));
         return toAjax(result);
     }
@@ -93,6 +97,7 @@ public class CenterdataTFarmExcrementDisposeController extends BaseController {
     @PutMapping
     public AjaxResult edit(@RequestBody CenterdataTFarmExcrementDispose centerdataTFarmExcrementDispose) {
         int result = centerdataTFarmExcrementDisposeService.updateCenterdataTFarmExcrementDispose(centerdataTFarmExcrementDispose);
+        DataAttachUtil.dataAttachUpload(centerdataTFarmExcrementDispose.getId(), centerdataTFarmExcrementDispose.getAttachPaths(), DocumentNameConstants.FARM_EXCREMENT_DISPOSE, centerdataTFarmExcrementDispose.getBusSource());
         DataProducerUtil.getInstance().publish(new ESVo(DocumentNameConstants.FARM_EXCREMENT_DISPOSE,BusinessType.UPDATE, JSON.toJSONString(centerdataTFarmExcrementDispose)));
         return toAjax(result);
     }

src/main/java/com/sooka/sponest/data/digitalagriculture/controller/CenterdataTFarmFilingsLivestockController.java

@@ -12,6 +12,7 @@ import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalagriculture.domain.CenterdataTFarmFilingsLivestock;
 import com.sooka.sponest.data.digitalagriculture.service.ICenterdataTFarmFilingsLivestockService;
+import com.sooka.sponest.data.utils.DataAttachUtil;
 import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.ExcelUtil;
 import io.swagger.annotations.Api;
@@ -70,7 +71,9 @@ public class CenterdataTFarmFilingsLivestockController extends BaseController {
     @RequiresPermissions("digitalagriculture:filingsLivestock:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id) {
-        return AjaxResult.success(centerdataTFarmFilingsLivestockService.selectCenterdataTFarmFilingsLivestockById(id));
+        CenterdataTFarmFilingsLivestock centerdataTFarmFilingsLivestock = centerdataTFarmFilingsLivestockService.selectCenterdataTFarmFilingsLivestockById(id);
+        centerdataTFarmFilingsLivestock.setAttachPaths(DataAttachUtil.getDataAttachUpload(id));
+        return AjaxResult.success(centerdataTFarmFilingsLivestock);
     }
 
     /**
@@ -82,6 +85,7 @@ public class CenterdataTFarmFilingsLivestockController extends BaseController {
     @PostMapping
     public AjaxResult add(@Validated @RequestBody CenterdataTFarmFilingsLivestock centerdataTFarmFilingsLivestock) {
         int result = centerdataTFarmFilingsLivestockService.insertCenterdataTFarmFilingsLivestock(centerdataTFarmFilingsLivestock);
+        DataAttachUtil.dataAttachUpload(centerdataTFarmFilingsLivestock.getId(), centerdataTFarmFilingsLivestock.getAttachPaths(), DocumentNameConstants.FARM_FILINGS_LIVESTOCK, centerdataTFarmFilingsLivestock.getBusSource());
         DataProducerUtil.getInstance().publish(new ESVo(DocumentNameConstants.FARM_FILINGS_LIVESTOCK,BusinessType.INSERT, JSON.toJSONString(centerdataTFarmFilingsLivestock)));
         return toAjax(result);
     }
@@ -95,6 +99,7 @@ public class CenterdataTFarmFilingsLivestockController extends BaseController {
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody CenterdataTFarmFilingsLivestock centerdataTFarmFilingsLivestock) {
         int result = centerdataTFarmFilingsLivestockService.updateCenterdataTFarmFilingsLivestock(centerdataTFarmFilingsLivestock);
+        DataAttachUtil.dataAttachUpload(centerdataTFarmFilingsLivestock.getId(), centerdataTFarmFilingsLivestock.getAttachPaths(), DocumentNameConstants.FARM_FILINGS_LIVESTOCK, centerdataTFarmFilingsLivestock.getBusSource());
         DataProducerUtil.getInstance().publish(new ESVo(DocumentNameConstants.FARM_FILINGS_LIVESTOCK,BusinessType.UPDATE, JSON.toJSONString(centerdataTFarmFilingsLivestock)));
         return toAjax(result);
     }

src/main/java/com/sooka/sponest/data/digitalagriculture/controller/CenterdataTFarmGreenhouseFilmController.java

@@ -14,6 +14,7 @@ import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalagriculture.domain.CenterdataTFarmGreenhouseFilm;
 import com.sooka.sponest.data.digitalagriculture.domain.vo.CenterdataTFarmGreenhouseFilmVo;
 import com.sooka.sponest.data.digitalagriculture.service.ICenterdataTFarmGreenhouseFilmService;
+import com.sooka.sponest.data.utils.DataAttachUtil;
 import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.ExcelUtil;
 import io.swagger.annotations.Api;
@@ -95,7 +96,9 @@ public class CenterdataTFarmGreenhouseFilmController extends BaseController {
     @RequiresPermissions("greenhousefilm:greenhousefilm:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id) {
-        return AjaxResult.success(centerdataTFarmGreenhouseFilmService.selectCenterdataTFarmGreenhouseFilmById(id));
+        CenterdataTFarmGreenhouseFilmVo centerdataTFarmGreenhouseFilmVo = centerdataTFarmGreenhouseFilmService.selectCenterdataTFarmGreenhouseFilmById(id);
+       centerdataTFarmGreenhouseFilmVo.setAttachPaths(DataAttachUtil.getDataAttachUpload(id));
+        return AjaxResult.success(centerdataTFarmGreenhouseFilmVo);
     }
 
     /**
@@ -107,6 +110,7 @@ public class CenterdataTFarmGreenhouseFilmController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestBody CenterdataTFarmGreenhouseFilmVo centerdataTFarmGreenhouseFilm) {
         int result = centerdataTFarmGreenhouseFilmService.insertCenterdataTFarmGreenhouseFilm(centerdataTFarmGreenhouseFilm);
+        DataAttachUtil.dataAttachUpload(centerdataTFarmGreenhouseFilm.getId(), centerdataTFarmGreenhouseFilm.getAttachPaths(), DocumentNameConstants.FARM_GREENHOUSE_FILM, centerdataTFarmGreenhouseFilm.getBusSource());
         DataProducerUtil.getInstance().publish(new ESVo(DocumentNameConstants.FARM_GREENHOUSE_FILM,BusinessType.INSERT, JSON.toJSONString(centerdataTFarmGreenhouseFilm)));
         return toAjax(result);
     }
@@ -120,6 +124,7 @@ public class CenterdataTFarmGreenhouseFilmController extends BaseController {
     @PutMapping
     public AjaxResult edit(@RequestBody CenterdataTFarmGreenhouseFilmVo centerdataTFarmGreenhouseFilm) {
         int result = centerdataTFarmGreenhouseFilmService.updateCenterdataTFarmGreenhouseFilm(centerdataTFarmGreenhouseFilm);
+        DataAttachUtil.dataAttachUpload(centerdataTFarmGreenhouseFilm.getId(), centerdataTFarmGreenhouseFilm.getAttachPaths(), DocumentNameConstants.FARM_GREENHOUSE_FILM, centerdataTFarmGreenhouseFilm.getBusSource());
         DataProducerUtil.getInstance().publish(new ESVo(DocumentNameConstants.FARM_GREENHOUSE_FILM,BusinessType.UPDATE, JSON.toJSONString(centerdataTFarmGreenhouseFilm)));
         return toAjax(result);
     }

src/main/java/com/sooka/sponest/data/digitalagriculture/controller/CenterdataTFarmLivestockController.java

@@ -12,6 +12,7 @@ import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalagriculture.domain.CenterdataTFarmLivestock;
 import com.sooka.sponest.data.digitalagriculture.service.ICenterdataTFarmLivestockService;
+import com.sooka.sponest.data.utils.DataAttachUtil;
 import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.ExcelUtil;
 import io.swagger.annotations.Api;
@@ -70,7 +71,9 @@ public class CenterdataTFarmLivestockController extends BaseController {
     @RequiresPermissions("digitalagriculture:livestock:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id) {
-        return AjaxResult.success(centerdataTFarmLivestockService.selectCenterdataTFarmLivestockById(id));
+        CenterdataTFarmLivestock centerdataTFarmLivestock = centerdataTFarmLivestockService.selectCenterdataTFarmLivestockById(id);
+        centerdataTFarmLivestock.setAttachPaths(DataAttachUtil.getDataAttachUpload(id));
+        return AjaxResult.success(centerdataTFarmLivestock);
     }
 
     /**
@@ -82,6 +85,7 @@ public class CenterdataTFarmLivestockController extends BaseController {
     @PostMapping
     public AjaxResult add(@Validated @RequestBody CenterdataTFarmLivestock centerdataTFarmLivestock) {
         int result = centerdataTFarmLivestockService.insertCenterdataTFarmLivestock(centerdataTFarmLivestock);
+        DataAttachUtil.dataAttachUpload(centerdataTFarmLivestock.getId(), centerdataTFarmLivestock.getAttachPaths(), DocumentNameConstants.FARM_LIVESTOCK, centerdataTFarmLivestock.getBusSource());
         DataProducerUtil.getInstance().publish(new ESVo(DocumentNameConstants.FARM_LIVESTOCK,BusinessType.INSERT, JSON.toJSONString(centerdataTFarmLivestock)));
         return toAjax(result);
     }
@@ -95,6 +99,7 @@ public class CenterdataTFarmLivestockController extends BaseController {
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody CenterdataTFarmLivestock centerdataTFarmLivestock) {
         int result = centerdataTFarmLivestockService.updateCenterdataTFarmLivestock(centerdataTFarmLivestock);
+        DataAttachUtil.dataAttachUpload(centerdataTFarmLivestock.getId(), centerdataTFarmLivestock.getAttachPaths(), DocumentNameConstants.FARM_LIVESTOCK, centerdataTFarmLivestock.getBusSource());
         DataProducerUtil.getInstance().publish(new ESVo(DocumentNameConstants.FARM_LIVESTOCK,BusinessType.UPDATE, JSON.toJSONString(centerdataTFarmLivestock)));
         return toAjax(result);
     }

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

@@ -111,5 +111,14 @@ public class CenterdataTFarmComplexModification 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/CenterdataTFarmEnterprise.java

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

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

@@ -112,4 +112,14 @@ public class CenterdataTFarmExcrementDispose 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/CenterdataTFarmFilingsLivestock.java

@@ -160,5 +160,14 @@ public class CenterdataTFarmFilingsLivestock 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/CenterdataTFarmGreenhouseFilm.java

@@ -158,13 +158,6 @@ public class CenterdataTFarmGreenhouseFilm extends BaseBusinessEntity {
     private String phone;
 
     /**
-     * 图片(附件)
-     */
-    @ApiModelProperty(value = "图片地址", required = false)
-//    @Excel(name = "图片(附件)")
-    private String parkUrl;
-
-    /**
      * 备注
      */
 //    @Excel(name = "备注")
@@ -195,5 +188,14 @@ public class CenterdataTFarmGreenhouseFilm 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/CenterdataTFarmLivestock.java

@@ -170,4 +170,14 @@ public class CenterdataTFarmLivestock 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/vo/CenterdataTFarmGreenhouseFilmVo.java

@@ -203,5 +203,15 @@ public class CenterdataTFarmGreenhouseFilmVo 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/CenterdataTFarmComplexModificationServiceImpl.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.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.digitalagriculture.mapper.CenterdataTFarmComplexMo
 import com.sooka.sponest.data.digitalagriculture.service.ICenterdataTFarmComplexModificationService;
 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;
 
@@ -71,6 +73,10 @@ public class CenterdataTFarmComplexModificationServiceImpl extends BaseServiceIm
         centerdataTFarmComplexModification.setCreateBy(SecurityUtils.getUserId().toString());
         centerdataTFarmComplexModification.setCreateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTFarmComplexModification.setCreateTime(DateUtils.getNowDate());
+        DataAttachUtil.dataAttachUpload(centerdataTFarmComplexModification.getId(),
+                centerdataTFarmComplexModification.getAttachPaths(),
+                DocumentNameConstants.FARM_COMPLEX_MODIFICATION,
+                centerdataTFarmComplexModification.getBusSource());
         if (StringUtils.isNotEmpty(centerdataTFarmComplexModification.getDeviceList())) {
             centerdataTFarmComplexModification.getDeviceList().forEach(item -> {
                 CenterdataTEquipmentCamera camera = new CenterdataTEquipmentCamera();

src/main/java/com/sooka/sponest/data/digitalwater/controller/CenterdataTHydraulicBattlefieldController.java

@@ -12,6 +12,7 @@ import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalwater.domain.CenterdataTHydraulicBattlefield;
 import com.sooka.sponest.data.digitalwater.service.ICenterdataTHydraulicBattlefieldService;
+import com.sooka.sponest.data.utils.DataAttachUtil;
 import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.ExcelUtil;
 import io.swagger.annotations.Api;
@@ -82,7 +83,9 @@ public class  CenterdataTHydraulicBattlefieldController extends BaseController {
             @ApiImplicitParam(name = "id", value = "主键id", dataType = "String", required = true)
     })
     public AjaxResult getInfo(@PathVariable("id") String id) {
-        return AjaxResult.success(centerdataTHydraulicBattlefieldService.selectCenterdataTHydraulicBattlefieldById(id));
+        CenterdataTHydraulicBattlefield centerdataTHydraulicBattlefield = centerdataTHydraulicBattlefieldService.selectCenterdataTHydraulicBattlefieldById(id);
+        centerdataTHydraulicBattlefield.setAttachPaths(DataAttachUtil.getDataAttachUpload(id));
+        return AjaxResult.success(centerdataTHydraulicBattlefield);
     }
 
     /**
@@ -93,6 +96,7 @@ public class  CenterdataTHydraulicBattlefieldController extends BaseController {
     @Log(title = "沙场资源", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody CenterdataTHydraulicBattlefield centerdataTHydraulicBattlefield) {
+        DataAttachUtil.dataAttachUpload(centerdataTHydraulicBattlefield.getId(), centerdataTHydraulicBattlefield.getAttachPaths(), DocumentNameConstants.HYDRAULIC_BATTLEFIELD, centerdataTHydraulicBattlefield.getBusSource());
         int result = centerdataTHydraulicBattlefieldService.insertCenterdataTHydraulicBattlefield(centerdataTHydraulicBattlefield);
         DataProducerUtil.getInstance().publish(new ESVo(DocumentNameConstants.HYDRAULIC_BATTLEFIELD,BusinessType.INSERT, JSON.toJSONString(centerdataTHydraulicBattlefield)));
         return toAjax(result);
@@ -106,6 +110,7 @@ public class  CenterdataTHydraulicBattlefieldController extends BaseController {
     @Log(title = "沙场资源", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody CenterdataTHydraulicBattlefield centerdataTHydraulicBattlefield) {
+        DataAttachUtil.dataAttachUpload(centerdataTHydraulicBattlefield.getId(), centerdataTHydraulicBattlefield.getAttachPaths(), DocumentNameConstants.HYDRAULIC_BATTLEFIELD, centerdataTHydraulicBattlefield.getBusSource());
         int result = centerdataTHydraulicBattlefieldService.updateCenterdataTHydraulicBattlefield(centerdataTHydraulicBattlefield);
         DataProducerUtil.getInstance().publish(new ESVo(DocumentNameConstants.HYDRAULIC_BATTLEFIELD,BusinessType.UPDATE, JSON.toJSONString(centerdataTHydraulicBattlefield)));
         return toAjax(result);

src/main/java/com/sooka/sponest/data/digitalwater/domain/CenterdataTHydraulicBattlefield.java

@@ -138,7 +138,16 @@ public class CenterdataTHydraulicBattlefield extends BaseBusinessEntity {
 
     private List<String> fileUrlList;
     private List<String> fileNameList;
-
+    /**
+     * 图片上传路径
+     */
+    @ApiModelProperty(value = "图片上传路径",required = false)
+    private String attachPaths;
+    /**
+     * 图片来源
+     */
+    @ApiModelProperty(value = "图片来源",required = false)
+    private String busSource;
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

src/main/resources/mapper/digitalagriculture/CenterdataTFarmGreenhouseFilmMapper.xml

@@ -37,7 +37,7 @@
     </resultMap>
 
     <sql id="selectCenterdataTFarmGreenhouseFilmVo">
-        select a.id, a.name, a.address, a.longitude, a.latitude, a.operate_name, a.park_nature, a.park_scale, a.plant_type, a.plant_breed, a.contacts, a.phone, a.park_url,
+        select a.id, a.name, a.address, a.longitude, a.latitude, a.operate_name, a.park_nature, a.park_scale, a.plant_type, a.plant_breed, a.contacts, a.phone,
         a.create_by,  a.update_by,  a.remarks, a.del_flag, a.dept_id, a.dept_name, a.park_builds, a.park_total_area, a.greenhouse_builds, a.greenhouse_area, a.hothouse_builds, a.hothouse_area,a.update_name, a.update_time, a.create_name, a.create_time
         from centerdata_t_farm_greenhouse_film a
     </sql>
@@ -59,7 +59,6 @@
             <if test="plantBreed != null  and plantBreed != ''">and a.plant_breed = #{plantBreed}</if>
             <if test="contacts != null  and contacts != ''">and a.contacts like concat('%', #{contacts}, '%')</if>
             <if test="phone != null  and phone != ''">and a.phone = #{phone}</if>
-            <if test="parkUrl != null  and parkUrl != ''">and a.park_url = #{parkUrl}</if>
             <if test="remarks != null  and remarks != ''">and a.remarks = #{remarks}</if>
             <if test="deptId != null ">and a.dept_id = #{deptId}</if>
             <if test="deptName != null  and deptName != ''">and a.dept_name like concat('%', #{deptName}, '%')</if>
@@ -89,7 +88,6 @@
             <if test="plantBreed != null">plant_breed,</if>
             <if test="contacts != null">contacts,</if>
             <if test="phone != null">phone,</if>
-            <if test="parkUrl != null">park_url,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="remarks != null">remarks,</if>
@@ -118,7 +116,6 @@
             <if test="plantBreed != null">#{plantBreed},</if>
             <if test="contacts != null">#{contacts},</if>
             <if test="phone != null">#{phone},</if>
-            <if test="parkUrl != null">#{parkUrl},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="remarks != null">#{remarks},</if>
@@ -150,7 +147,6 @@
             <if test="plantBreed != null">plant_breed = #{plantBreed},</if>
             <if test="contacts != null">contacts = #{contacts},</if>
             <if test="phone != null">phone = #{phone},</if>
-            <if test="parkUrl != null">park_url = #{parkUrl},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>