Merge remote-tracking branch 'origin/dev' into dev

data-ui/src/views/data/digitalresources/construction/index.vue

@@ -191,17 +191,24 @@
               :value="dict.id"
             ></el-option>
           </el-select>
-        </el-form-item></el-col>
+        </el-form-item>
+        </el-col>
         <!--        <el-form-item label="备注" prop="remark" label-width="120px">
                   <el-input v-model="form.remark" placeholder="请输入备注" maxlength="255" />
                 </el-form-item>-->
 
-          <el-col :span="24">
-            <el-form-item label="图片" prop="attachId" label-width="120px">
-              <ImageUpload ref="ImageUpload" :limit="1" :fileType="['png', 'jpg', 'jpeg']" :value="form.attachId"
-                           @input="getUrl"></ImageUpload>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="24">-->
+<!--            <el-form-item label="图片" prop="attachId" label-width="120px">-->
+<!--              <ImageUpload ref="ImageUpload" :limit="1" :fileType="['png', 'jpg', 'jpeg']" :value="form.attachId"-->
+<!--                           @input="getUrl"></ImageUpload>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+        <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-form>
       <div slot="footer" class="dialog-footer">
@@ -229,12 +236,13 @@ import {selectCenterMonitorlList} from "@/api/data/digitalforest/animal/animal";
 import ISuperMap from "@/views/data/common/ISuperMap";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {treeselect} from "@/api/system/dept";
+import DataImageUpload from "@/components/ImageUpload/dataUpload.vue";
 export default {
   components: {
     deptselector,
     Treeselect,
     supermap,
-    ISuperMap
+    ISuperMap, DataImageUpload
   },
   dicts: ['centerdata_construction_type'],
   name: "Construction",
@@ -348,11 +356,13 @@ export default {
         this.deptOptions = response.data
       })
     },
-
     getUrl(url) {
-      this.form.dialogImageUrl = url;
-      this.form.attachId = url;
+      this.form.attachPaths = url
     },
+    // getUrl(url) {
+    //   this.form.dialogImageUrl = url;
+    //   this.form.attachId = url;
+    // },
     setDataDeptId(e) {
       this.form.deptId = e.deptId
       this.form.deptName = e.deptName

src/main/java/com/sooka/sponest/data/digitalresource/domain/CenterdataTResourcesIllegalConstruction.java

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.annotation.Excel;
 import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import javax.validation.constraints.NotBlank;
@@ -17,6 +18,7 @@ import java.util.List;
  * @date 2023-02-21
  */
 @ApiModel(description = "违建信息对象")
+@Data
 public class CenterdataTResourcesIllegalConstruction extends BaseBusinessEntity {
 
     private static final long serialVersionUID = 1L;
@@ -148,239 +150,30 @@ public class CenterdataTResourcesIllegalConstruction extends BaseBusinessEntity
     @NotBlank(message = "所属部门不能为空")
     private String deptName;
 
-    public String getAttachId() {
-        return attachId;
-    }
+    /**
+     * 图片上传路径
+     */
+    @ApiModelProperty(value = "图片上传路径", required = false)
+    private String attachPaths;
+
+    /**
+     * 图片来源
+     */
+    @ApiModelProperty(value = "图片来源", required = false)
+    private String busSource;
 
-    public void setAttachId(String attachId) {
-        this.attachId = attachId;
-    }
 
     private String attachId;
 
 
     private List<String> deviceList;
 
-    public List<String> getDeviceList() {
-        return deviceList;
-    }
-
-    public void setDeviceList(List<String> deviceList) {
-        this.deviceList = deviceList;
-    }
-
-    public String getDialogImageUrl() {
-        return dialogImageUrl;
-    }
-
-    public void setDialogImageUrl(String dialogImageUrl) {
-        this.dialogImageUrl = dialogImageUrl;
-    }
-
     /**
      * 数据状态
      */
     private String dialogImageUrl;
     private String dataStatus;
 
-    public String getConstructionTypeLabel() {
-        return constructionTypeLabel;
-    }
-
-    public void setConstructionTypeLabel(String constructionTypeLabel) {
-        this.constructionTypeLabel = constructionTypeLabel;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
     private String remark;
 
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setConstructionType(String constructionType) {
-        this.constructionType = constructionType;
-    }
-
-    public String getConstructionType() {
-        return constructionType;
-    }
-
-    public void setLongitude(String longitude) {
-        this.longitude = longitude;
-    }
-
-    public String getLongitude() {
-        return longitude;
-    }
-
-    public void setLatitude(String latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getLatitude() {
-        return latitude;
-    }
-
-    public void setArea(String area) {
-        this.area = area;
-    }
-
-    public String getArea() {
-        return area;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPerson(String person) {
-        this.person = person;
-    }
-
-    public String getPerson() {
-        return person;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-
-    public String getDeptName() {
-        return deptName;
-    }
-
-
-    public void setDataStatus(String dataStatus) {
-        this.dataStatus = dataStatus;
-    }
-
-    public String getDataStatus() {
-        return dataStatus;
-    }
-
-    public String getPhone2() {
-        return phone2;
-    }
-
-    public void setPhone2(String phone2) {
-        this.phone2 = phone2;
-    }
-
-    public String getPhone3() {
-        return phone3;
-    }
-
-    public void setPhone3(String phone3) {
-        this.phone3 = phone3;
-    }
-
-    public String getPhone4() {
-        return phone4;
-    }
-
-    public void setPhone4(String phone4) {
-        this.phone4 = phone4;
-    }
-
-    public String getPhone5() {
-        return phone5;
-    }
-
-    public void setPhone5(String phone5) {
-        this.phone5 = phone5;
-    }
-
-    public String getPerson2() {
-        return person2;
-    }
-
-    public void setPerson2(String person2) {
-        this.person2 = person2;
-    }
-
-    public String getPerson3() {
-        return person3;
-    }
-
-    public void setPerson3(String person3) {
-        this.person3 = person3;
-    }
-
-    public String getPerson4() {
-        return person4;
-    }
-
-    public void setPerson4(String person4) {
-        this.person4 = person4;
-    }
-
-    public String getPerson5() {
-        return person5;
-    }
-
-    public void setPerson5(String person5) {
-        this.person5 = person5;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this)
-                .append("id", id)
-                .append("name", name)
-                .append("constructionType", constructionType)
-                .append("constructionTypeLabel", constructionTypeLabel)
-                .append("longitude", longitude)
-                .append("latitude", latitude)
-                .append("area", area)
-                .append("phone", phone)
-                .append("phone2", phone2)
-                .append("phone3", phone3)
-                .append("phone4", phone4)
-                .append("phone5", phone5)
-                .append("person", person)
-                .append("person2", person2)
-                .append("person3", person3)
-                .append("person4", person4)
-                .append("person5", person5)
-                .append("deptId", deptId)
-                .append("deptName", deptName)
-                .append("attachId", attachId)
-                .append("deviceList", deviceList)
-                .append("dialogImageUrl", dialogImageUrl)
-                .append("dataStatus", dataStatus)
-                .append("remark", remark)
-                .toString();
-    }
 }

src/main/java/com/sooka/sponest/data/digitalresource/service/impl/CenterdataTResourcesIllegalConstructionServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sooka.sponest.data.digitalresource.service.impl;
 
+import com.ruoyi.common.core.constant.DocumentNameConstants;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.core.utils.StringUtils;
@@ -15,6 +16,7 @@ import com.sooka.sponest.data.digitalresource.service.ICenterdataTResourcesIlleg
 import com.sooka.sponest.data.digitalwater.domain.CenterdataTHydraulicOutletSewage;
 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;
 
@@ -65,6 +67,7 @@ public class CenterdataTResourcesIllegalConstructionServiceImpl extends BaseServ
         }
         centerdataTResourcesIllegalConstruction.setDeviceList(centerdataTEquipmentCameraService.selectCenterdataTEquipmentCameraByBusinessId(id));
         centerdataTResourcesIllegalConstruction.setConstructionTypeLabel(DictUtils.getDictDataByValue("centerdata_construction_type",centerdataTResourcesIllegalConstruction.getConstructionType()));
+        centerdataTResourcesIllegalConstruction.setAttachPaths(DataAttachUtil.getDataAttachUpload(id));
         return centerdataTResourcesIllegalConstruction;
     }
 
@@ -90,6 +93,7 @@ public class CenterdataTResourcesIllegalConstructionServiceImpl extends BaseServ
                 centerdataTEquipmentCameraService.insertCenterdataTEquipmentCamera(camera);
             });
         }
+        DataAttachUtil.dataAttachUpload(centerdataTResourcesIllegalConstruction.getId(),centerdataTResourcesIllegalConstruction.getAttachPaths(), DocumentNameConstants.RESOURCES_ILLEGAL_CONSTRUCTION, centerdataTResourcesIllegalConstruction.getBusSource());
         return centerdataTResourcesIllegalConstructionMapper.insertCenterdataTResourcesIllegalConstruction(centerdataTResourcesIllegalConstruction);
     }
 
@@ -115,6 +119,7 @@ public class CenterdataTResourcesIllegalConstructionServiceImpl extends BaseServ
                 centerdataTEquipmentCameraService.insertCenterdataTEquipmentCamera(camera);
             });
         }
+        DataAttachUtil.dataAttachUpload(centerdataTResourcesIllegalConstruction.getId(),centerdataTResourcesIllegalConstruction.getAttachPaths(), DocumentNameConstants.RESOURCES_ILLEGAL_CONSTRUCTION, centerdataTResourcesIllegalConstruction.getBusSource());
         return centerdataTResourcesIllegalConstructionMapper.updateCenterdataTResourcesIllegalConstruction(centerdataTResourcesIllegalConstruction);
     }